Commit f7960276 authored by Manuel's avatar Manuel

Update bash

parent a088ff9d
......@@ -4,69 +4,84 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=bash
_patchlevel=005 #prepare for some patches
pkgver=4.1.$_patchlevel
_basever=4.2
_patchlevel=008 #prepare for some patches
pkgver=$_basever.$_patchlevel
pkgrel=1
pkgdesc="The GNU Bourne Again shell"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.gnu.org/software/bash/bash.html"
groups=('base')
backup=(etc/profile.bash etc/skel/.bashrc etc/skel/.bash_profile)
backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
depends=('readline>=6.1' 'glibc')
makedepends=(gzip)
provides=('sh')
install=bash.install
source=(http://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz
profile.bash
bashrc
enable-system-config-files.patch
system.bashrc)
source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz
dot.bashrc
dot.bash_profile
dot.bash_logout
system.bashrc
system.bash_logout)
md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
'027d6bd8f5f6a06b75bb7698cb478089'
'2902e0fee7a9168f3a4fd2ccd60ff047'
'42f4400ed2314bd7519c020d0187edc5'
'fe5d3a367f7d5f754214dc05e3d958ab'
'472f536d7c9e8250dc4568ec4cfaf294'
'1100bc1dda2cdc06ac44d7e5d17864a3'
'30e7948079921d3261efcc6a40722135'
'9ea06decec43a198f3d7cf29acc602f8'
'fb48f6134d7b013135929476aa0c250c'
'e70e45de33426b38153b390be0dbbcd4'
'ce4e5c484993705b27daa151eca242c2'
'88d1f96db29461767602e2546803bda7'
'24c574bf6d6a581e300823d9c1276af6')
if [ $_patchlevel -gt 000 ]; then
for p in $(seq -w 001 $_patchlevel); do
source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-$p)
done
for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p))
done
fi
build() {
cd ${srcdir}/${pkgname}-4.1
for p in ../bash41-*; do
[ -e "$p" ] || continue
msg "applying patch ${p}"
patch -Np0 -i ${p} || return 1
done
cd ${srcdir}/${pkgname}-$_basever
for p in ../bash${_basever//./}-*; do
[[ -e "$p" ]] || continue
msg "applying patch ${p}"
patch -Np0 -i ${p}
done
patch -Np0 -i $srcdir/enable-system-config-files.patch || return 1
_bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\'
-DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\'
-DSYS_BASHRC=\'\"/etc/bash.bashrc\"\'
-DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\')
export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
./configure --prefix=/usr --with-curses --enable-readline \
--without-bash-malloc --with-installed-readline \
--bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
make || return 1
make DESTDIR=${pkgdir} install
./configure --prefix=/usr --with-curses --enable-readline \
--without-bash-malloc --with-installed-readline \
--bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
make
}
install -D -m644 ${srcdir}/profile.bash ${pkgdir}/etc/profile.bash || return 1
install -D -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc || return 1
package() {
cd ${srcdir}/${pkgname}-$_basever
make DESTDIR=${pkgdir} install
# for now, bash is our default /bin/sh
cd ${pkgdir}/bin
ln -s bash sh
# for now, bash is our default /bin/sh
cd ${pkgdir}/bin
ln -s bash sh
mkdir -p ${pkgdir}/etc/skel/
install -D -m644 ${srcdir}/bashrc ${pkgdir}/etc/skel/.bashrc
echo ". \$HOME/.bashrc" >${pkgdir}/etc/skel/.bash_profile
install -dm755 ${pkgdir}/etc/skel/
# system-wide configuration files
install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout
# user configuration file skeletons
install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc
install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile
install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
}
md5sums=('9800d8724815fd84994d9be65ab5e7b8'
'17f20ec69535a2f50f2112a8c700630d'
'3d2837e84645eac9bde399b58014bafa'
'51725defa4c2dec49c1bc15883e0bee2'
'196697769f1667a8a1aed608811129c6'
'582dea5671b557f783e18629c2f77b68'
'118d465095d4a4706eb1d34696a2666a'
'120f7cf039a40d35fe375e59d6f17adc'
'336ee037fc2cc1e2350b05097fbdc87c'
'9471e666797f0b03eb2175ed752a9550')
info_dir=/usr/share/info
info_dir=usr/share/info
info_files=(bash.info)
post_install() {
......@@ -18,4 +18,3 @@ pre_remove() {
usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
done
}
# vim:set ts=2 sw=2 et:
# Check for an interactive session
[ -z "$PS1" ] && return
alias ls='ls --color=auto'
PS1='[\u@\h \W]\$ '
--- src/bash-4.0/config-top.h 2009-01-04 11:32:23.000000000 -0800
+++ config-top.h 2009-08-25 08:41:08.000000000 -0700
@@ -75,10 +75,10 @@
#define KSH_COMPATIBLE_SELECT
/* System-wide .bashrc file for interactive shells. */
-/* #define SYS_BASHRC "/etc/bash.bashrc" */
+#define SYS_BASHRC "/etc/bash.bashrc"
/* System-wide .bash_logout for login shells. */
-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
/* Define this to make non-interactive shells begun with argv[0][0] == '-'
run the startup files when not in posix mode. */
#
# /etc/profile.bash
# Global settings for bash shells
#
#In the future we may want to add more ulimit entries here,
# in the offchance that /etc/security/limits.conf is skipped
ulimit -Sc 0 #Don't create core files
# Source our global bashrc file, to remove duplication of effort
[ -r /etc/bash.bashrc ] && . /etc/bash.bashrc
#
# /etc/bash.bashrc
#
# This file is the systemwide bashrc file. While most of the
# environment is preserved when running an interactive shell
# the PS[1-4] variables, aliases and functions are reset.
#
# When running a non-login shell, apply the following settings:
# - Prompt defaults (PS[1-4], PROMPT_COMMAND)
# - bash_completion if it exists
# - source /etc/bash.bashrc.local
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
PS1='[\u@\h \W]\$ '
PS2='> '
PS3='> '
PS4='+ '
export PS1 PS2 PS3 PS4
if test "$TERM" = "xterm" -o \
"$TERM" = "xterm-color" -o \
"$TERM" = "xterm-256color" -o \
"$TERM" = "rxvt" -o \
"$TERM" = "rxvt-unicode" -o \
"$TERM" = "xterm-xfree86"; then
PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"'
export PROMPT_COMMAND
fi
case ${TERM} in
xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
;;
screen)
PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
;;
esac
[ -r /etc/bash_completion ] && . /etc/bash_completion
[ -r /etc/bash.bashrc.local ] && . /etc/bash.bashrc.local
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment