Date: Friday, November 4, 2011 @ 19:35:47 Author: allan Revision: 142059
db-move: moved bash from [testing] to [core] (i686) Added: bash/repos/core-i686/PKGBUILD (from rev 142056, bash/repos/testing-i686/PKGBUILD) bash/repos/core-i686/bash.install (from rev 142056, bash/repos/testing-i686/bash.install) bash/repos/core-i686/dot.bash_logout (from rev 142056, bash/repos/testing-i686/dot.bash_logout) bash/repos/core-i686/dot.bash_profile (from rev 142056, bash/repos/testing-i686/dot.bash_profile) bash/repos/core-i686/dot.bashrc (from rev 142056, bash/repos/testing-i686/dot.bashrc) bash/repos/core-i686/system.bash_logout (from rev 142056, bash/repos/testing-i686/system.bash_logout) bash/repos/core-i686/system.bashrc (from rev 142056, bash/repos/testing-i686/system.bashrc) Deleted: bash/repos/core-i686/PKGBUILD bash/repos/core-i686/bash.install bash/repos/core-i686/dot.bash_logout bash/repos/core-i686/dot.bash_profile bash/repos/core-i686/dot.bashrc bash/repos/core-i686/system.bash_logout bash/repos/core-i686/system.bashrc bash/repos/testing-i686/ --------------------+ PKGBUILD | 192 ++++++++++++++++++++++++++------------------------- bash.install | 40 +++++----- dot.bash_logout | 6 - dot.bash_profile | 10 +- dot.bashrc | 18 ++-- system.bash_logout | 6 - system.bashrc | 46 ++++++------ 7 files changed, 164 insertions(+), 154 deletions(-) Deleted: core-i686/PKGBUILD =================================================================== --- core-i686/PKGBUILD 2011-11-04 23:35:45 UTC (rev 142058) +++ core-i686/PKGBUILD 2011-11-04 23:35:47 UTC (rev 142059) @@ -1,91 +0,0 @@ -# $Id$ -# Maintainer: Aaron Griffin <aa...@archlinux.org> -# Maintainer: Allan McRae <al...@archlinux.org> - -pkgname=bash -_basever=4.2 -_patchlevel=010 #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/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) -depends=('readline>=6.1' 'glibc') -provides=('sh') -install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz - dot.bashrc - dot.bash_profile - dot.bash_logout - system.bashrc - system.bash_logout) -if [ $_patchlevel -gt 000 ]; then - 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}-$_basever - for p in ../bash${_basever//./}-*; do - [[ -e "$p" ]] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} - done - - _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 -} - -check() { - cd ${srcdir}/${pkgname}-$_basever - make check -} - -package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - # for now, bash is our default /bin/sh - cd ${pkgdir}/bin - ln -s bash sh - - 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=('3fb927c7c33022f1c327f14a81c0d4b0' - '027d6bd8f5f6a06b75bb7698cb478089' - '2902e0fee7a9168f3a4fd2ccd60ff047' - '42f4400ed2314bd7519c020d0187edc5' - 'fe5d3a367f7d5f754214dc05e3d958ab' - '472f536d7c9e8250dc4568ec4cfaf294' - '1100bc1dda2cdc06ac44d7e5d17864a3' - '30e7948079921d3261efcc6a40722135' - '9ea06decec43a198f3d7cf29acc602f8' - 'fb48f6134d7b013135929476aa0c250c' - 'e70e45de33426b38153b390be0dbbcd4' - 'ce4e5c484993705b27daa151eca242c2' - '88d1f96db29461767602e2546803bda7' - '24c574bf6d6a581e300823d9c1276af6' - '4c5835f2fbab36c4292bb334977e5b6d' - '0a51602b535ef661ee707be6c8bdb373') Copied: bash/repos/core-i686/PKGBUILD (from rev 142056, bash/repos/testing-i686/PKGBUILD) =================================================================== --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2011-11-04 23:35:47 UTC (rev 142059) @@ -0,0 +1,101 @@ +# $Id$ +# Maintainer: Aaron Griffin <aa...@archlinux.org> +# Maintainer: Allan McRae <al...@archlinux.org> + +pkgname=bash +_basever=4.2 +_patchlevel=010 #prepare for some patches +pkgver=$_basever.$_patchlevel +pkgrel=2 +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/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) +depends=('readline>=6.1' 'glibc') +provides=('sh') +install=bash.install +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} + dot.bashrc + dot.bash_profile + dot.bash_logout + system.bashrc + system.bash_logout) +if [ $_patchlevel -gt 000 ]; then + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) + done +fi + +build() { + cd ${srcdir}/${pkgname}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) + done + + _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 +} + +check() { + cd ${srcdir}/${pkgname}-$_basever + make check +} + +package() { + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install + + # for now, bash is our default /bin/sh + cd ${pkgdir}/bin + ln -s bash sh + + 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=('3fb927c7c33022f1c327f14a81c0d4b0' + '8d37a3f97a48c1e56e1a4ded877ed944' + '027d6bd8f5f6a06b75bb7698cb478089' + '2902e0fee7a9168f3a4fd2ccd60ff047' + '42f4400ed2314bd7519c020d0187edc5' + 'fe5d3a367f7d5f754214dc05e3d958ab' + '472f536d7c9e8250dc4568ec4cfaf294' + '1100bc1dda2cdc06ac44d7e5d17864a3' + 'a7184b76eb4a079f10174a0a8f574819' + '30e7948079921d3261efcc6a40722135' + 'c4d45307f7e69fe508ce347c4cec1955' + '9ea06decec43a198f3d7cf29acc602f8' + '74bddae6eeb9227a04a467d42597a34d' + 'fb48f6134d7b013135929476aa0c250c' + '3e6a18226b16c773229246abd07a1f5e' + 'e70e45de33426b38153b390be0dbbcd4' + 'e667dc9348ebc3e0e14bfdd87f4b6ff2' + 'ce4e5c484993705b27daa151eca242c2' + '41cbd8e57589bc081a546a014ddb12f8' + '88d1f96db29461767602e2546803bda7' + 'b8b781520f4c7493a2a1ac3010a44a44' + '24c574bf6d6a581e300823d9c1276af6' + '354a0899a7c4b446454c52546562b55b' + '4c5835f2fbab36c4292bb334977e5b6d' + 'ff4547ca7b508d52101729d61f5b77b6' + '0a51602b535ef661ee707be6c8bdb373' + 'cec7c92a4d8052ea4b29216365d16566') Deleted: core-i686/bash.install =================================================================== --- core-i686/bash.install 2011-11-04 23:35:45 UTC (rev 142058) +++ core-i686/bash.install 2011-11-04 23:35:47 UTC (rev 142059) @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(bash.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} Copied: bash/repos/core-i686/bash.install (from rev 142056, bash/repos/testing-i686/bash.install) =================================================================== --- core-i686/bash.install (rev 0) +++ core-i686/bash.install 2011-11-04 23:35:47 UTC (rev 142059) @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(bash.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} Deleted: core-i686/dot.bash_logout =================================================================== --- core-i686/dot.bash_logout 2011-11-04 23:35:45 UTC (rev 142058) +++ core-i686/dot.bash_logout 2011-11-04 23:35:47 UTC (rev 142059) @@ -1,3 +0,0 @@ -# -# ~/.bash_logout -# Copied: bash/repos/core-i686/dot.bash_logout (from rev 142056, bash/repos/testing-i686/dot.bash_logout) =================================================================== --- core-i686/dot.bash_logout (rev 0) +++ core-i686/dot.bash_logout 2011-11-04 23:35:47 UTC (rev 142059) @@ -0,0 +1,3 @@ +# +# ~/.bash_logout +# Deleted: core-i686/dot.bash_profile =================================================================== --- core-i686/dot.bash_profile 2011-11-04 23:35:45 UTC (rev 142058) +++ core-i686/dot.bash_profile 2011-11-04 23:35:47 UTC (rev 142059) @@ -1,5 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc Copied: bash/repos/core-i686/dot.bash_profile (from rev 142056, bash/repos/testing-i686/dot.bash_profile) =================================================================== --- core-i686/dot.bash_profile (rev 0) +++ core-i686/dot.bash_profile 2011-11-04 23:35:47 UTC (rev 142059) @@ -0,0 +1,5 @@ +# +# ~/.bash_profile +# + +[[ -f ~/.bashrc ]] && . ~/.bashrc Deleted: core-i686/dot.bashrc =================================================================== --- core-i686/dot.bashrc 2011-11-04 23:35:45 UTC (rev 142058) +++ core-i686/dot.bashrc 2011-11-04 23:35:47 UTC (rev 142059) @@ -1,9 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' Copied: bash/repos/core-i686/dot.bashrc (from rev 142056, bash/repos/testing-i686/dot.bashrc) =================================================================== --- core-i686/dot.bashrc (rev 0) +++ core-i686/dot.bashrc 2011-11-04 23:35:47 UTC (rev 142059) @@ -0,0 +1,9 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +PS1='[\u@\h \W]\$ ' Deleted: core-i686/system.bash_logout =================================================================== --- core-i686/system.bash_logout 2011-11-04 23:35:45 UTC (rev 142058) +++ core-i686/system.bash_logout 2011-11-04 23:35:47 UTC (rev 142059) @@ -1,3 +0,0 @@ -# -# /etc/bash.bash_logout -# Copied: bash/repos/core-i686/system.bash_logout (from rev 142056, bash/repos/testing-i686/system.bash_logout) =================================================================== --- core-i686/system.bash_logout (rev 0) +++ core-i686/system.bash_logout 2011-11-04 23:35:47 UTC (rev 142059) @@ -0,0 +1,3 @@ +# +# /etc/bash.bash_logout +# Deleted: core-i686/system.bashrc =================================================================== --- core-i686/system.bashrc 2011-11-04 23:35:45 UTC (rev 142058) +++ core-i686/system.bashrc 2011-11-04 23:35:47 UTC (rev 142059) @@ -1,23 +0,0 @@ -# -# /etc/bash.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -PS4='+ ' - -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 Copied: bash/repos/core-i686/system.bashrc (from rev 142056, bash/repos/testing-i686/system.bashrc) =================================================================== --- core-i686/system.bashrc (rev 0) +++ core-i686/system.bashrc 2011-11-04 23:35:47 UTC (rev 142059) @@ -0,0 +1,23 @@ +# +# /etc/bash.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +PS1='[\u@\h \W]\$ ' +PS2='> ' +PS3='> ' +PS4='+ ' + +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