diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-02-21 23:03:48 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-21 23:03:48 +0000 |
commit | 72c61bffe4395640fc43bd48657b8078a2b878c9 (patch) | |
tree | 3b7e14602ca5805be3dc8637b6ebc739f98d6e4b /app-shells | |
parent | add short documentation (diff) | |
download | gentoo-2-72c61bffe4395640fc43bd48657b8078a2b878c9.tar.gz gentoo-2-72c61bffe4395640fc43bd48657b8078a2b878c9.tar.bz2 gentoo-2-72c61bffe4395640fc43bd48657b8078a2b878c9.zip |
Version bump #254994 by Peter Alfredsen.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'app-shells')
-rw-r--r-- | app-shells/bash/ChangeLog | 9 | ||||
-rw-r--r-- | app-shells/bash/bash-4.0.ebuild | 195 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.0-ldflags-for-build.patch | 15 | ||||
-rw-r--r-- | app-shells/bash/files/bash-4.0-protos.patch | 35 |
4 files changed, 253 insertions, 1 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog index 594327dbf452..51ab545a0e22 100644 --- a/app-shells/bash/ChangeLog +++ b/app-shells/bash/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-shells/bash # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.195 2009/02/21 23:01:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.196 2009/02/21 23:03:47 vapier Exp $ + +*bash-4.0 (21 Feb 2009) + + 21 Feb 2009; Mike Frysinger <vapier@gentoo.org> + +files/bash-4.0-ldflags-for-build.patch, +files/bash-4.0-protos.patch, + +bash-4.0.ebuild: + Version bump #254994 by Peter Alfredsen. 21 Feb 2009; Mike Frysinger <vapier@gentoo.org> bash-3.2_p48-r1.ebuild: Fix net redirection flags -- it's use_enable, not use_with. diff --git a/app-shells/bash/bash-4.0.ebuild b/app-shells/bash/bash-4.0.ebuild new file mode 100644 index 000000000000..fdc3effdda2a --- /dev/null +++ b/app-shells/bash/bash-4.0.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0.ebuild,v 1.1 2009/02/21 23:03:47 vapier Exp $ + +EAPI="1" + +inherit eutils flag-o-matic toolchain-funcs multilib + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_P=${PN}-${MY_PV} +[[ ${PV} != *_p* ]] && PLEVEL=0 +READLINE_VER=6.0 +READLINE_PLEVEL=0 # both readline patches are also released as bash patches + +DESCRIPTION="The standard GNU Bourne again shell" +HOMEPAGE="http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" +SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz + ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz + $(for ((i=1; i<=PLEVEL; i++)); do + printf 'ftp://ftp.cwru.edu/pub/bash/bash-%s-patches/bash%s-%03d\n' \ + ${MY_PV} ${MY_PV/\.} ${i} + printf 'mirror://gnu/bash/bash-%s-patches/bash%s-%03d\n' \ + ${MY_PV} ${MY_PV/\.} ${i} + done) + $(for ((i=1; i<=READLINE_PLEVEL; i++)); do + printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \ + ${READLINE_VER} ${READLINE_VER/\.} ${i} + printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \ + ${READLINE_VER} ${READLINE_VER/\.} ${i} + done)" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="afs bashlogger examples +net nls plugins vanilla" + +DEPEND=">=sys-libs/ncurses-5.2-r2" +RDEPEND="${DEPEND} + !<sys-apps/portage-2.1.5 + !<sys-apps/paludis-0.26.0_alpha5" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + if is-flag -malign-double ; then #7332 + eerror "Detected bad CFLAGS '-malign-double'. Do not use this" + eerror "as it breaks LFS (struct stat64) on x86." + die "remove -malign-double from your CFLAGS mr ricer" + fi +} + +src_unpack() { + unpack ${MY_P}.tar.gz + cd "${S}" + + # Include official patches + local i + for ((i=1; i<=PLEVEL; i++)); do + epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i}) + done + cd lib/readline + for ((i=1; i<=READLINE_PLEVEL; i++)); do + epatch "${DISTDIR}"/readline${READLINE_VER/\.}-$(printf '%03d' ${i}) + done + cd ../.. + + if ! use vanilla ; then + epatch "${FILESDIR}"/${PN}-4.0-protos.patch + epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671 + epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947 + epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch + # Log bash commands to syslog #91327 + if use bashlogger ; then + ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." + ewarn "This will log ALL output you enter into the shell, you have been warned." + ebeep + epause + epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch + fi + fi +} + +src_compile() { + local myconf= + + # For descriptions of these, see config-top.h + # bashrc/#26952 bash_logout/#90488 ssh/#24762 + append-cppflags \ + -DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \ + -DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \ + -DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \ + -DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \ + -DNON_INTERACTIVE_LOGIN_SHELLS \ + -DSSH_SOURCE_BASHRC + + # Always use the buildin readline, else if we update readline + # bash gets borked as readline is usually not binary compadible + # between minor versions. + #myconf="${myconf} $(use_with !readline installed-readline)" + myconf="${myconf} --without-installed-readline" + + # Don't even think about building this statically without + # reading Bug 7714 first. If you still build it statically, + # don't come crying to us with bugs ;). + #use static && export LDFLAGS="${LDFLAGS} -static" + use nls || myconf="${myconf} --disable-nls" + + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses + myconf="${myconf} --with-curses" + + use plugins && append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash + econf \ + $(use_with afs) \ + $(use_enable net net-redirections) \ + --disable-profiling \ + --without-gnu-malloc \ + ${myconf} || die + emake || die "make failed" + + if use plugins ; then + emake -C examples/loadables all others || die + fi +} + +src_install() { + emake install DESTDIR="${D}" || die + + dodir /bin + mv "${D}"/usr/bin/bash "${D}"/bin/ || die + dosym bash /bin/rbash + + insinto /etc/bash + doins "${FILESDIR}"/{bashrc,bash_logout} + insinto /etc/skel + for f in bash{_logout,_profile,rc} ; do + newins "${FILESDIR}"/dot-${f} .${f} + done + + sed -i -e "s:#${USERLAND}#@::" "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc + sed -i -e '/#@/d' "${D}"/etc/skel/.bashrc "${D}"/etc/bash/bashrc + + if use plugins ; then + exeinto /usr/$(get_libdir)/bash + doexe $(echo examples/loadables/*.o | sed 's:\.o::g') || die + fi + + if use examples ; then + for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do + exeinto /usr/share/doc/${PF}/${d} + insinto /usr/share/doc/${PF}/${d} + for f in ${d}/* ; do + if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then + doexe ${f} + else + doins ${f} + fi + done + done + fi + + doman doc/*.1 + dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO + dosym bash.info /usr/share/info/bashref.info +} + +pkg_preinst() { + if [[ -e ${ROOT}/etc/bashrc ]] && [[ ! -d ${ROOT}/etc/bash ]] ; then + mkdir -p "${ROOT}"/etc/bash + mv -f "${ROOT}"/etc/bashrc "${ROOT}"/etc/bash/ + fi + + # our bash_logout is just a place holder so dont + # force users to go through etc-update all the time + if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then + rm -f "${D}"/etc/bash/bash_logout + fi + + if [[ -L ${ROOT}/bin/sh ]]; then + # rewrite the symlink to ensure that its mtime changes. having /bin/sh + # missing even temporarily causes a fatal error with paludis. + local target=$(readlink "${ROOT}"/bin/sh) + ln -sf "${target}" "${ROOT}"/bin/sh + fi +} + +pkg_postinst() { + # If /bin/sh does not exist, provide it + if [[ ! -e ${ROOT}/bin/sh ]]; then + ln -sf bash "${ROOT}"/bin/sh + fi +} diff --git a/app-shells/bash/files/bash-4.0-ldflags-for-build.patch b/app-shells/bash/files/bash-4.0-ldflags-for-build.patch new file mode 100644 index 000000000000..089264f97e40 --- /dev/null +++ b/app-shells/bash/files/bash-4.0-ldflags-for-build.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/211947 + +fix from Takashi YOSHII: dont use target ldflags for build apps + +--- bash/Makefile.in ++++ bash/Makefile.in +@@ -143,7 +143,7 @@ + CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) + + LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS) +-LDFLAGS_FOR_BUILD = $(LDFLAGS) ++LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD) + + INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC) + diff --git a/app-shells/bash/files/bash-4.0-protos.patch b/app-shells/bash/files/bash-4.0-protos.patch new file mode 100644 index 000000000000..6b38e6849973 --- /dev/null +++ b/app-shells/bash/files/bash-4.0-protos.patch @@ -0,0 +1,35 @@ +move prototypes around so they show up when needed + +--- a/lib/glob/strmatch.c ++++ b/lib/glob/strmatch.c +@@ -25,9 +25,6 @@ + #include "strmatch.h" + + extern int xstrmatch __P((char *, char *, int)); +-#if defined (HANDLE_MULTIBYTE) +-extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); +-#endif + + int + strmatch (pattern, string, flags) +--- a/lib/glob/strmatch.h ++++ b/lib/glob/strmatch.h +@@ -57,6 +57,7 @@ + + #if HANDLE_MULTIBYTE + extern int wcsmatch __P((wchar_t *, wchar_t *, int)); ++extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int)); + #endif + + #endif /* _STRMATCH_H */ +--- a/quit.h ++++ b/quit.h +@@ -21,6 +21,8 @@ + #if !defined (_QUIT_H_) + #define _QUIT_H_ + ++#include "sig.h" ++ + /* Non-zero means SIGINT has already ocurred. */ + extern volatile int interrupt_state; + extern volatile int terminating_signal; |