[arch-commits] Commit in bash/trunk (3 files)

[Pierre Schmitz]

    Date: Sunday, November 28, 2010 @ 12:27:10
  Author: pierre
Revision: 101280

* Remove profile.bash which is no longer sourced by the filesystem package
* Remove enable-system-config-files.patch which does not work at all

Modified:
  bash/trunk/PKGBUILD
Deleted:
  bash/trunk/enable-system-config-files.patch
  bash/trunk/profile.bash

----------------------------------+
 PKGBUILD                         |   13 +++----------
 enable-system-config-files.patch |   15 ---------------
 profile.bash                     |   11 -----------
 3 files changed, 3 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-28 17:20:26 UTC (rev 101279)
+++ PKGBUILD	2010-11-28 17:27:10 UTC (rev 101280)
@@ -5,20 +5,18 @@
 pkgname=bash
 _patchlevel=009 #prepare for some patches
 pkgver=4.1.$_patchlevel
-pkgrel=1
+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/profile.bash etc/skel/.bashrc etc/skel/.bash_profile)
+backup=(etc/skel/.bashrc etc/skel/.bash_profile)
 depends=('readline>=6.1' 'glibc')
 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)
 if [ $_patchlevel -gt 000 ]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
@@ -34,8 +32,6 @@
     patch -Np0 -i ${p}
   done
 
-  patch -Np0 -i $srcdir/enable-system-config-files.patch
-
   ./configure --prefix=/usr --with-curses --enable-readline \
     --without-bash-malloc --with-installed-readline \
     --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
@@ -47,7 +43,6 @@
   cd ${srcdir}/${pkgname}-4.1
   make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/profile.bash ${pkgdir}/etc/profile.bash
   install -Dm644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
 
   # for now, bash is our default /bin/sh
@@ -58,11 +53,9 @@
   install -D -m644 ${srcdir}/bashrc ${pkgdir}/etc/skel/.bashrc
   echo ". \$HOME/.bashrc" >${pkgdir}/etc/skel/.bash_profile
 }
-    
+
 md5sums=('9800d8724815fd84994d9be65ab5e7b8'
-         '17f20ec69535a2f50f2112a8c700630d'
          '3d2837e84645eac9bde399b58014bafa'
-         '51725defa4c2dec49c1bc15883e0bee2'
          '196697769f1667a8a1aed608811129c6'
          '582dea5671b557f783e18629c2f77b68'
          '118d465095d4a4706eb1d34696a2666a'

Deleted: enable-system-config-files.patch
===================================================================
--- enable-system-config-files.patch	2010-11-28 17:20:26 UTC (rev 101279)
+++ enable-system-config-files.patch	2010-11-28 17:27:10 UTC (rev 101280)
@@ -1,15 +0,0 @@
---- 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. */

Deleted: profile.bash
===================================================================
--- profile.bash	2010-11-28 17:20:26 UTC (rev 101279)
+++ profile.bash	2010-11-28 17:27:10 UTC (rev 101280)
@@ -1,11 +0,0 @@
-#
-# /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