[arch-commits] Commit in bash/repos (18 files)
Allan McRae
allan at nymeria.archlinux.org
Wed Feb 26 17:17:00 UTC 2014
Date: Wednesday, February 26, 2014 @ 18:17:00
Author: allan
Revision: 206448
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
bash/repos/testing-i686/
bash/repos/testing-i686/PKGBUILD
(from rev 206447, bash/trunk/PKGBUILD)
bash/repos/testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
(from rev 206447, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
bash/repos/testing-i686/bash.install
(from rev 206447, bash/trunk/bash.install)
bash/repos/testing-i686/dot.bash_logout
(from rev 206447, bash/trunk/dot.bash_logout)
bash/repos/testing-i686/dot.bash_profile
(from rev 206447, bash/trunk/dot.bash_profile)
bash/repos/testing-i686/dot.bashrc
(from rev 206447, bash/trunk/dot.bashrc)
bash/repos/testing-i686/system.bash_logout
(from rev 206447, bash/trunk/system.bash_logout)
bash/repos/testing-i686/system.bashrc
(from rev 206447, bash/trunk/system.bashrc)
bash/repos/testing-x86_64/
bash/repos/testing-x86_64/PKGBUILD
(from rev 206447, bash/trunk/PKGBUILD)
bash/repos/testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch
(from rev 206447, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
bash/repos/testing-x86_64/bash.install
(from rev 206447, bash/trunk/bash.install)
bash/repos/testing-x86_64/dot.bash_logout
(from rev 206447, bash/trunk/dot.bash_logout)
bash/repos/testing-x86_64/dot.bash_profile
(from rev 206447, bash/trunk/dot.bash_profile)
bash/repos/testing-x86_64/dot.bashrc
(from rev 206447, bash/trunk/dot.bashrc)
bash/repos/testing-x86_64/system.bash_logout
(from rev 206447, bash/trunk/system.bash_logout)
bash/repos/testing-x86_64/system.bashrc
(from rev 206447, bash/trunk/system.bashrc)
-----------------------------------------------------------------------+
testing-i686/PKGBUILD | 83 ++++++++++
testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch | 12 +
testing-i686/bash.install | 16 +
testing-i686/dot.bash_logout | 3
testing-i686/dot.bash_profile | 5
testing-i686/dot.bashrc | 9 +
testing-i686/system.bash_logout | 3
testing-i686/system.bashrc | 23 ++
testing-x86_64/PKGBUILD | 83 ++++++++++
testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch | 12 +
testing-x86_64/bash.install | 16 +
testing-x86_64/dot.bash_logout | 3
testing-x86_64/dot.bash_profile | 5
testing-x86_64/dot.bashrc | 9 +
testing-x86_64/system.bash_logout | 3
testing-x86_64/system.bashrc | 23 ++
16 files changed, 308 insertions(+)
Copied: bash/repos/testing-i686/PKGBUILD (from rev 206447, bash/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=bash
+_basever=4.3
+_patchlevel=000 #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.3' '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
+
+prepare() {
+ cd ${srcdir}/${pkgname}-$_basever
+
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
+ patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
+ done
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-$_basever
+
+ _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\'
+ -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\'
+ -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
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-$_basever
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-$_basever
+ make DESTDIR=${pkgdir} install
+
+ ln -s bash ${pkgdir}/usr/bin/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=('81348932d5da294953e15d4814c74dd1'
+ 'SKIP'
+ '027d6bd8f5f6a06b75bb7698cb478089'
+ '2902e0fee7a9168f3a4fd2ccd60ff047'
+ '42f4400ed2314bd7519c020d0187edc5'
+ '3546099a1b2f667adc9794f52e78e35b'
+ '472f536d7c9e8250dc4568ec4cfaf294')
Copied: bash/repos/testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (from rev 206447, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
===================================================================
--- testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (rev 0)
+++ testing-i686/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,12 @@
+diff -Naur bash-4.2-orig/general.c bash-4.2/general.c
+--- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000
++++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000
+@@ -766,7 +766,7 @@
+ *nbeg++ = '.';
+
+ nlen = nend - ntail;
+- memcpy (nbeg, ntail, nlen);
++ memmove (nbeg, ntail, nlen);
+ nbeg[nlen] = '\0';
+
+ return name;
Copied: bash/repos/testing-i686/bash.install (from rev 206447, bash/trunk/bash.install)
===================================================================
--- testing-i686/bash.install (rev 0)
+++ testing-i686/bash.install 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,16 @@
+info_dir=usr/share/info
+info_files=(bash.info)
+
+post_upgrade() {
+ [ -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
+}
+
+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/testing-i686/dot.bash_logout (from rev 206447, bash/trunk/dot.bash_logout)
===================================================================
--- testing-i686/dot.bash_logout (rev 0)
+++ testing-i686/dot.bash_logout 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,3 @@
+#
+# ~/.bash_logout
+#
Copied: bash/repos/testing-i686/dot.bash_profile (from rev 206447, bash/trunk/dot.bash_profile)
===================================================================
--- testing-i686/dot.bash_profile (rev 0)
+++ testing-i686/dot.bash_profile 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,5 @@
+#
+# ~/.bash_profile
+#
+
+[[ -f ~/.bashrc ]] && . ~/.bashrc
Copied: bash/repos/testing-i686/dot.bashrc (from rev 206447, bash/trunk/dot.bashrc)
===================================================================
--- testing-i686/dot.bashrc (rev 0)
+++ testing-i686/dot.bashrc 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,9 @@
+#
+# ~/.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+alias ls='ls --color=auto'
+PS1='[\u@\h \W]\$ '
Copied: bash/repos/testing-i686/system.bash_logout (from rev 206447, bash/trunk/system.bash_logout)
===================================================================
--- testing-i686/system.bash_logout (rev 0)
+++ testing-i686/system.bash_logout 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,3 @@
+#
+# /etc/bash.bash_logout
+#
Copied: bash/repos/testing-i686/system.bashrc (from rev 206447, bash/trunk/system.bashrc)
===================================================================
--- testing-i686/system.bashrc (rev 0)
+++ testing-i686/system.bashrc 2014-02-26 17:17:00 UTC (rev 206448)
@@ -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 /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
Copied: bash/repos/testing-x86_64/PKGBUILD (from rev 206447, bash/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=bash
+_basever=4.3
+_patchlevel=000 #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.3' '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
+
+prepare() {
+ cd ${srcdir}/${pkgname}-$_basever
+
+ for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+ msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
+ patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
+ done
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-$_basever
+
+ _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\'
+ -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\'
+ -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
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-$_basever
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-$_basever
+ make DESTDIR=${pkgdir} install
+
+ ln -s bash ${pkgdir}/usr/bin/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=('81348932d5da294953e15d4814c74dd1'
+ 'SKIP'
+ '027d6bd8f5f6a06b75bb7698cb478089'
+ '2902e0fee7a9168f3a4fd2ccd60ff047'
+ '42f4400ed2314bd7519c020d0187edc5'
+ '3546099a1b2f667adc9794f52e78e35b'
+ '472f536d7c9e8250dc4568ec4cfaf294')
Copied: bash/repos/testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (from rev 206447, bash/trunk/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch)
===================================================================
--- testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch (rev 0)
+++ testing-x86_64/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,12 @@
+diff -Naur bash-4.2-orig/general.c bash-4.2/general.c
+--- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000
++++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000
+@@ -766,7 +766,7 @@
+ *nbeg++ = '.';
+
+ nlen = nend - ntail;
+- memcpy (nbeg, ntail, nlen);
++ memmove (nbeg, ntail, nlen);
+ nbeg[nlen] = '\0';
+
+ return name;
Copied: bash/repos/testing-x86_64/bash.install (from rev 206447, bash/trunk/bash.install)
===================================================================
--- testing-x86_64/bash.install (rev 0)
+++ testing-x86_64/bash.install 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,16 @@
+info_dir=usr/share/info
+info_files=(bash.info)
+
+post_upgrade() {
+ [ -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
+}
+
+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/testing-x86_64/dot.bash_logout (from rev 206447, bash/trunk/dot.bash_logout)
===================================================================
--- testing-x86_64/dot.bash_logout (rev 0)
+++ testing-x86_64/dot.bash_logout 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,3 @@
+#
+# ~/.bash_logout
+#
Copied: bash/repos/testing-x86_64/dot.bash_profile (from rev 206447, bash/trunk/dot.bash_profile)
===================================================================
--- testing-x86_64/dot.bash_profile (rev 0)
+++ testing-x86_64/dot.bash_profile 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,5 @@
+#
+# ~/.bash_profile
+#
+
+[[ -f ~/.bashrc ]] && . ~/.bashrc
Copied: bash/repos/testing-x86_64/dot.bashrc (from rev 206447, bash/trunk/dot.bashrc)
===================================================================
--- testing-x86_64/dot.bashrc (rev 0)
+++ testing-x86_64/dot.bashrc 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,9 @@
+#
+# ~/.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+alias ls='ls --color=auto'
+PS1='[\u@\h \W]\$ '
Copied: bash/repos/testing-x86_64/system.bash_logout (from rev 206447, bash/trunk/system.bash_logout)
===================================================================
--- testing-x86_64/system.bash_logout (rev 0)
+++ testing-x86_64/system.bash_logout 2014-02-26 17:17:00 UTC (rev 206448)
@@ -0,0 +1,3 @@
+#
+# /etc/bash.bash_logout
+#
Copied: bash/repos/testing-x86_64/system.bashrc (from rev 206447, bash/trunk/system.bashrc)
===================================================================
--- testing-x86_64/system.bashrc (rev 0)
+++ testing-x86_64/system.bashrc 2014-02-26 17:17:00 UTC (rev 206448)
@@ -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 /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
More information about the arch-commits
mailing list