Author: ranger Date: Wed Feb 7 23:17:11 2007 New Revision: 630 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=630&repname=user%3a+ranger> Log: bash 3.2 taken over
Added: trunk/experimental/common/main/finkinfo/shells/bash.info trunk/experimental/common/main/finkinfo/shells/bash.patch Added: trunk/experimental/common/main/finkinfo/shells/bash.info URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/shells/bash.info&rev=630&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/shells/bash.info (added) +++ trunk/experimental/common/main/finkinfo/shells/bash.info Wed Feb 7 23:17:11 2007 @@ -1,0 +1,72 @@ +Package: bash +Version: 3.2 +Revision: 1 +Depends: libgettext3-shlibs, libiconv +Recommends: bash-completion, bash-doc +BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev +Source: gnu +Source-MD5: 00bfa16d58e034e3c2aa27f390390d30 +Source2: mirror:gnu:bash/bash-3.2-patches/bash32-001 +Source2-MD5: d8e10c754f477e3f3a581af566b89301 +Source3: mirror:gnu:bash/bash-3.2-patches/bash32-002 +Source3-MD5: d38a5288b2f0ea6c9ac76b66cc74ef7d +Source4: mirror:gnu:bash/bash-3.2-patches/bash32-003 +Source4-MD5: 0b90d37911827d8cb95f3b4353cc225e +Source5: mirror:gnu:bash/bash-3.2-patches/bash32-004 +Source5-MD5: 8062f3a59631f58d78b180d83759b68a +Source6: mirror:gnu:bash/bash-3.2-patches/bash32-005 +Source6-MD5: 585b5943fadf0875ced243b245adde58 +Source7: mirror:gnu:bash/bash-3.2-patches/bash32-006 +Source7-MD5: 1d5732e01ea938aeed42f3def131fa4d +Source8: mirror:gnu:bash/bash-3.2-patches/bash32-007 +Source8-MD5: dcd0cc5d801607827f7c851e72b0eabc +Source9: mirror:gnu:bash/bash-3.2-patches/bash32-008 +Source9-MD5: bb3c7dd11198c0ab93d0e960bebf6256 +Source10: mirror:gnu:bash/bash-3.2-patches/bash32-009 +Source10-MD5: 434a6f29b0ca5f1ab784b2437ae8eaed +ConfigureParams: --enable-restricted --with-curses +PatchScript: << +#!/bin/sh -ev + + sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 + for patch in ../bash32*; do + patch -p0 < $patch + done +<< +InstallScript: << + make -j1 install DESTDIR=%d infodir=%p/share/info mandir=%p/share/man htmldir=%p/share/doc/%N/html + mkdir -p %i/share/init/bash + mv init/* %i/share/init/bash/ + mkdir -p %i/etc + mv profile.fink %i/etc/profile + (cd %i/bin; ln -s bash rbash;) + install -m 644 doc/rbash.1 %i/share/man/man1/ + rm -r %i/share/info + rm -r %i/share/doc/bash-doc +<< +DocFiles: doc/FAQ doc/INTRO CHANGES COPYING NEWS COMPAT README.Fink +Description: The GNU Bourne Again Shell +DescDetail: << + Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). + + Bash is ultimately intended to be a conformant implementation of the IEEE + Posix Shell and Tools specification (IEEE Working Group 1003.2). +<< +DescUsage: << + See /sw/share/doc/bash/README.Fink for configuration advice. +<< +DescPort: << + version >= 2.05a can now use the system version of readline instead + of building its own local copy. Installs correctly after + commenting out the install-info line in doc/Makefile.in. Compilation + fails if you define CPPFLAGS, so relevant switches are put into + CFLAGS instead. + + Incorporates patch from bash-bug mailing list for tab-completion + of ./ +<< +License: GPL +Maintainer: Benjamin Reed <[EMAIL PROTECTED]> +Homepage: http://www.gnu.org/software/bash/bash.html Added: trunk/experimental/common/main/finkinfo/shells/bash.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/shells/bash.patch&rev=630&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/shells/bash.patch (added) +++ trunk/experimental/common/main/finkinfo/shells/bash.patch Wed Feb 7 23:17:11 2007 @@ -1,0 +1,447 @@ +diff -uNr bash-3.2/Makefile.in bash-3.2-patched/Makefile.in +--- bash-3.2/Makefile.in 2006-08-17 14:03:35.000000000 -0400 ++++ bash-3.2-patched/Makefile.in 2007-02-07 17:09:54.000000000 -0500 +@@ -384,7 +384,7 @@ + $(BASHINCDIR)/shtty.h $(BASHINCDIR)/typemax.h \ + $(BASHINCDIR)/ocache.h + +-LIBRARIES = $(SHLIB_LIB) $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ ++LIBRARIES = $(SHLIB_LIB) ./lib/readline/libreadline.a ./lib/readline/libhistory.a $(TERMCAP_LIB) $(GLOB_LIB) \ + $(TILDE_LIB) $(MALLOC_LIB) $(INTL_LIB) $(LOCAL_LIBS) + + LIBDEP = $(SHLIB_DEP) $(INTL_DEP) $(READLINE_DEP) $(HISTORY_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \ +diff -uNr bash-3.2/README.Fink bash-3.2-patched/README.Fink +--- bash-3.2/README.Fink 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/README.Fink 2007-02-07 17:10:16.000000000 -0500 +@@ -0,0 +1,29 @@ ++This installation of bash has been set up to use an init system similar ++to the tcsh installed by OS X. ++ ++In order to use this configuration: ++ ++ echo "source ~/.bashrc" > ~/.bash_profile ++ echo "source @PREFIX@/share/init/bash/rc" > ~/.bashrc ++ echo "source @PREFIX@/bin/init.sh" >> ~/.bashrc ++ ++In order to customize this setup: ++ ++ mkdir ~/Library/init/bash ++ ++and create the following files there as necessary: ++ ++ aliases.mine - shell aliases ++ completions.mine - completions ++ environment.mine - environment ++ rc.mine - run commands ++ path - command search path ++ ++See the corresponding file in @PREFIX@/share/init/bash for more ++information about the role of each file. You can easily extend or ++override the configuration provided by the default file. For example, ++you can add more aliases by adding the appropriate commands in ++aliases.mine. ++ ++The init files were originally written by Wilfredo Sanchez, but they contained ++a few errors which I've taken the liberty of correcting. +diff -uNr bash-3.2/doc/Makefile.in bash-3.2-patched/doc/Makefile.in +--- bash-3.2/doc/Makefile.in 2004-07-27 08:57:48.000000000 -0400 ++++ bash-3.2-patched/doc/Makefile.in 2007-02-07 17:09:54.000000000 -0500 +@@ -228,7 +228,7 @@ + -$(INSTALL_DATA) $(srcdir)/bash.info $(DESTDIR)$(infodir)/bash.info + # run install-info if it is present to update the info directory + if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ +- install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/bash.info; \ ++ echo "Not installing info now, will wait until package is installed." \ + else true; fi + # if htmldir is set, install the html files into that directory + -if test -n "${htmldir}" ; then \ +diff -uNr bash-3.2/doc/bash.1 bash-3.2-patched/doc/bash.1 +--- bash-3.2/doc/bash.1 2006-10-03 08:54:26.000000000 -0400 ++++ bash-3.2-patched/doc/bash.1 2007-02-07 17:09:54.000000000 -0500 +@@ -202,7 +202,7 @@ + .TP + .B \-\-noprofile + Do not read either the system-wide startup file +-.FN /etc/profile ++.FN @PREFIX@/etc/profile + or any of the personal initialization files + .IR ~/.bash_profile , + .IR ~/.bash_login , +@@ -308,7 +308,7 @@ + .B bash + is invoked as an interactive login shell, or as a non-interactive shell + with the \fB\-\-login\fP option, it first reads and +-executes commands from the file \fI/etc/profile\fP, if that ++executes commands from the file [EMAIL PROTECTED]@/etc/profile\fP, if that + file exists. + After reading that file, it looks for \fI~/.bash_profile\fP, + \fI~/.bash_login\fP, and \fI~/.profile\fP, in that order, and reads +@@ -364,7 +364,7 @@ + When invoked as an interactive login shell, or a non-interactive + shell with the \fB\-\-login\fP option, it first attempts to + read and execute commands from +-.I /etc/profile ++.I @PREFIX@/etc/profile + and + .IR ~/.profile , + in that order. +@@ -8783,10 +8783,10 @@ + .SH FILES + .PD 0 + .TP +-.FN /bin/bash ++.FN @PREFIX@/bin/bash + The \fBbash\fP executable + .TP +-.FN /etc/profile ++.FN @PREFIX@/etc/profile + The systemwide initialization file, executed for login shells + .TP + .FN ~/.bash_profile +diff -uNr bash-3.2/doc/bashref.texi bash-3.2-patched/doc/bashref.texi +--- bash-3.2/doc/bashref.texi 2006-09-28 10:25:28.000000000 -0400 ++++ bash-3.2-patched/doc/bashref.texi 2007-02-07 17:09:55.000000000 -0500 +@@ -4881,7 +4881,7 @@ + to read command lines when the shell is interactive. + + @item --noprofile +-Don't load the system-wide startup file @file{/etc/profile} ++Don't load the system-wide startup file @[EMAIL PROTECTED]@/etc/profile} + or any of the personal initialization files + @file{~/.bash_profile}, @file{~/.bash_login}, or @file{~/.profile} + when Bash is invoked as a login shell. +@@ -5006,7 +5006,7 @@ + + When Bash is invoked as an interactive login shell, or as a + non-interactive shell with the @option{--login} option, it first reads and +-executes commands from the file @file{/etc/profile}, if that file exists. ++executes commands from the file @[EMAIL PROTECTED]@/etc/profile}, if that file exists. + After reading that file, it looks for @file{~/.bash_profile}, + @file{~/.bash_login}, and @file{~/.profile}, in that order, and reads + and executes commands from the first one that exists and is readable. +@@ -5057,7 +5057,7 @@ + + When invoked as an interactive login shell, or as a non-interactive + shell with the @option{--login} option, it first attempts to read +-and execute commands from @file{/etc/profile} and @file{~/.profile}, in ++and execute commands from @[EMAIL PROTECTED]@/etc/profile} and @file{~/.profile}, in + that order. + The @option{--noprofile} option may be used to inhibit this behavior. + When invoked as an interactive shell with the name @code{sh}, Bash +diff -uNr bash-3.2/doc/rbash.1 bash-3.2-patched/doc/rbash.1 +--- bash-3.2/doc/rbash.1 2004-05-24 10:19:39.000000000 -0400 ++++ bash-3.2-patched/doc/rbash.1 2007-02-07 17:09:55.000000000 -0500 +@@ -3,6 +3,6 @@ + rbash \- restricted bash, see \fBbash\fR(1) + .SH RESTRICTED SHELL + .nr zY 1 +-.so bash.1 ++.so man1/bash.1 + .SH SEE ALSO + bash(1) +diff -uNr bash-3.2/init/README bash-3.2-patched/init/README +--- bash-3.2/init/README 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/README 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,28 @@ ++This directory contains some useful bash files. ++ ++In order to use this configuration: ++ ++ echo "source ~/.bashrc" > ~/.bash_profile ++ echo "source @PREFIX@/share/init/bash/rc" > ~/.bashrc ++ echo "source @PREFIX@/bin/init.sh" >> ~/.bashrc ++ ++In order to customize this setup: ++ ++ mkdir ~/Library/init/bash ++ ++and create the following files there as necessary: ++ ++ aliases.mine - shell aliases ++ completions.mine - completions ++ environment.mine - environment ++ rc.mine - run commands ++ path - command search path ++ ++See the corresponding file in @PREFIX@/share/init/bash for more ++information about the role of each file. You can easily extend or ++override the configuration provided by the default file. For example, ++you can add more aliases by adding the appropriate commands in ++aliases.mine. ++ ++ -christian ++ [EMAIL PROTECTED] +diff -uNr bash-3.2/init/aliases bash-3.2-patched/init/aliases +--- bash-3.2/init/aliases 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/aliases 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,39 @@ ++## ++# Bash aliases file ++# ++# Wilfredo Sanchez Jr. | [EMAIL PROTECTED] ++## ++ ++## ++# Aliases ++## ++ ++#alias .='cwd' ++alias ..='cd ..' ++alias cd..='cd ..' ++alias cdwd='cd $(/bin/pwd)' ++alias cwd='echo $PWD' ++alias l='ls -lg' ++ ++## ++# Functions ++## ++ ++function files () { find ${1} -type f -print ; } ++function ff () { find . -name ${1} -print ; } ++function ll () { ls -lag "$@" | more ; } ++function word () { fgrep -i "$*" /usr/dict/web2 ; } ++function wordcount () { cat "${1}" | tr -s ' .,;:?\!()[]"' '\012' | \ ++ cat -n | tail -1 | awk '{print $1}' ; } ++ ++## ++# Read user's aliases ++## ++if [ -r ${bash_initdir}/aliases.mine ]; then ++ source ${bash_initdir}/aliases.mine ++fi ++ ++# Local Variables: ++# mode:shell-script ++# sh-shell:bash ++# End: +diff -uNr bash-3.2/init/bash.defaults bash-3.2-patched/init/bash.defaults +--- bash-3.2/init/bash.defaults 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/bash.defaults 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,27 @@ ++## ++# Bash ++# User preferences file ++# Override these in rc.mine ++# ++# Wilfredo Sanchez Jr. | [EMAIL PROTECTED] ++# July 09, 1992 ++# ++# MIT Project Athena ++## ++ ++if [ -n "$PS1" ]; then ++ ++ # Prompts ++ PS1='[\h:\w] \u\$ ' ++ PS2=' -> ' ++ #PS3= ++ #PS4= ++ ++ set -o emacs ++ ++fi ++ ++# Local Variables: ++# mode:shell-script ++# sh-shell:bash ++# End: +diff -uNr bash-3.2/init/completions bash-3.2-patched/init/completions +--- bash-3.2/init/completions 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/completions 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,17 @@ ++## ++# Add completions for the fink command ++## ++complete -W "--help --version apropos configure describe install list selfupdate selfupdate-cvs remove update-all" fink ++ ++## ++# Read user's completions ++## ++if [ -r ${bash_initdir}/completions.mine ]; then ++ source ${bash_initdir}/completions.mine ++fi ++ ++ ++# Local Variables: ++# mode:shell-script ++# sh-shell:bash ++# End: +diff -uNr bash-3.2/init/environment bash-3.2-patched/init/environment +--- bash-3.2/init/environment 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/environment 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,29 @@ ++## ++# Bourne Again Shell environment file ++# Global environment setup ++# ++# Wilfredo Sanchez Jr. | [EMAIL PROTECTED] ++# July 09, 1992 ++# ++# MIT Project Athena ++# ++# ORIGINAL SOURCES: /usr/athena/lib/init/cshrc (ATHENA REL 7.3P) ++## ++ ++export ENV_SET="YES" # avoid repeat ++ ++# File creation mask ++umask 022 # all files created are -rw-r--r-- ++ ++## ++# Load user environment ++## ++ ++if [ -f ${bash_initdir}/environment.mine ]; then ++ source ${bash_initdir}/environment.mine ++fi ++ ++# Local Variables: ++# mode:shell-script ++# sh-shell:bash ++# End: +diff -uNr bash-3.2/init/logout bash-3.2-patched/init/logout +--- bash-3.2/init/logout 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/logout 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,15 @@ ++## ++# Destroy credentials ++## ++ ++if [ -z "${TERM_PROGRAM}" ]; then ++ # Don't run these commands if the shell is launched by Terminal, ++ # even if it's a login shell. ++ ++ if klist -s; then kdestroy; fi ++fi ++ ++# Local Variables: ++# mode:shell-script ++# sh-shell:bash ++# End: +diff -uNr bash-3.2/init/profile bash-3.2-patched/init/profile +--- bash-3.2/init/profile 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/profile 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,31 @@ ++## ++# Set path ++## ++ ++export PATH="${HOME}/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" ++export MANPATH="${HOME}/man:/usr/local/share/man:/usr/share/man" ++ ++## ++# Read user's .profile ++## ++ [EMAIL PROTECTED]@/share/init ++default_bash_initdir=${default_initdir}/bash ++ user_initdir=~/Library/init ++ user_bash_initdir=${user_initdir}/bash ++ ++if [ -r ${user_bash_initdir} ]; then ++ initdir=${user_initdir} ++ bash_initdir=${user_bash_initdir} ++else ++ initdir=${default_initdir} ++ bash_initdir=${default_bash_initdir} ++fi ++ ++if [ -r ${bash_initdir}/profile.mine ]; then ++ source ${bash_initdir}/profile.mine ++fi ++ ++# Local Variables: ++# mode:shell-script ++# sh-shell:bash ++# End: +diff -uNr bash-3.2/init/rc bash-3.2-patched/init/rc +--- bash-3.2/init/rc 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/init/rc 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1,71 @@ ++## ++# Bourne Again Shell config file ++# ++# Wilfredo Sanchez Jr. | [EMAIL PROTECTED] ++# July 09, 1992 ++# ++# MIT Project Athena ++# ++# ORIGINAL SOURCES: /usr/athena/lib/init/cshrc (ATHENA REL 7.3P) ++## ++ ++ [EMAIL PROTECTED]@/share/init ++default_bash_initdir=${default_initdir}/bash ++ user_initdir=~/Library/init ++ user_bash_initdir=${user_initdir}/bash ++ ++if [ -r ${user_bash_initdir} ]; then ++ initdir=${user_initdir} ++ bash_initdir=${user_bash_initdir} ++else ++ initdir=${default_initdir} ++ bash_initdir=${default_bash_initdir} ++fi ++ ++# SET UP HOST-DEPENDANT VARIABLES, ETC. ++ ++host=$(echo $(hostname) | tr A-Z a-z) ++ ++user=`whoami` ++ ++export HOST=${host} ++export USER=${user} ++ ++# User ID ++if [ -z "${uid}" ]; then uid=$(id | cut -d = -f 2 | cut -d \( -f 1); fi ++ ++# SET COMMAND SEARCH PATH AND MAN PATH ++if [ -f ${bash_initdir}/path ]; then source ${bash_initdir}/path; fi ++ ++# ENVIRONMENT SETUP ++ ++if [ -n "${PS1}" ]; then interactive="YES"; fi ++ ++if [ -z "${ENV_SET}" ]; then ++ if [ -f ${default_bash_initdir}/environment ]; then ++ #echo "Initializing environment..." ++ source ${default_bash_initdir}/environment ++ fi ++fi ++ ++if [ -r ${default_bash_initdir}/bash.defaults ]; then ++ source ${default_bash_initdir}/bash.defaults ++fi ++ ++if [ "${interactive}" = "YES" ]; then ++ # These aren't useful for non-interactive sessions ++ if [ -f ${default_bash_initdir}/aliases ]; then ++ source ${default_bash_initdir}/aliases ++ fi ++ if [ -f ${default_bash_initdir}/completions ]; then ++ source ${default_bash_initdir}/completions ++ fi ++fi ++ ++# DEFAULT LOGIN SOURCES ++if [ -f ${bash_initdir}/rc.mine ]; then source ${bash_initdir}/rc.mine; fi ++ ++# Local Variables: ++# mode:shell-script ++# sh-shell:bash ++# End: +diff -uNr bash-3.2/pathnames.h.in bash-3.2-patched/pathnames.h.in +--- bash-3.2/pathnames.h.in 2003-02-25 11:31:46.000000000 -0500 ++++ bash-3.2-patched/pathnames.h.in 2007-02-07 17:09:55.000000000 -0500 +@@ -25,7 +25,7 @@ + #define DEFAULT_HOSTS_FILE "/etc/hosts" + + /* The default login shell startup file. */ +-#define SYS_PROFILE "/etc/profile" ++#define SYS_PROFILE "@PREFIX@/etc/profile" + + /* The default location of the bash debugger initialization/startup file. */ + #define DEBUGGER_START_FILE "@DEBUGGER_START_FILE@" +diff -uNr bash-3.2/profile.fink bash-3.2-patched/profile.fink +--- bash-3.2/profile.fink 1969-12-31 19:00:00.000000000 -0500 ++++ bash-3.2-patched/profile.fink 2007-02-07 17:09:55.000000000 -0500 +@@ -0,0 +1 @@ ++source @PREFIX@/share/init/bash/profile ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits