SliTaz Repositories

     1.1 --- a/bash/receipt	Tue Jun 06 17:37:54 2017 +0300
     1.2 +++ b/bash/receipt	Wed Feb 21 19:48:17 2018 +0200
     1.3 @@ -1,14 +1,14 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="bash"
     1.7 -VERSION="4.4.12"
     1.8 +VERSION="4.4.18"
     1.9  BASEVERSION="${VERSION%.*}"
    1.10  CATEGORY="shells"
    1.11  SHORT_DESC="The GNU bourne shell"
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL3"
    1.14  WEB_SITE="https://www.gnu.org/software/bash/"
    1.15 -TAGS="shell"
    1.16 +LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/bash.html"
    1.17  
    1.18  TARBALL="$PACKAGE-$BASEVERSION.tar.gz"
    1.19  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    1.20 @@ -21,8 +21,7 @@
    1.21  BUILD_DEPENDS="ncurses-dev readline-dev texinfo gettext patch"
    1.22  SPLIT="bash-dev"
    1.23  
    1.24 -patch_bash()
    1.25 -{
    1.26 +patch_bash() {
    1.27  	for i in $BASHPATCHES; do
    1.28  		[ -s "$SOURCES_REPOSITORY/$i" ] ||
    1.29  			wget -O "$SOURCES_REPOSITORY/$i" \
    1.30 @@ -33,19 +32,17 @@
    1.31  }
    1.32  
    1.33  # Rules to compile & install the temporary toolchain.
    1.34 -cook_tmp_toolchain()
    1.35 -{
    1.36 +cook_tmp_toolchain() {
    1.37  	cd $src
    1.38  	patch_bash
    1.39  	./configure --without-bash-malloc &&
    1.40  	make && make install
    1.41  }
    1.42  
    1.43 -# Rules to configure and make the package.
    1.44 -compile_rules()
    1.45 -{
    1.46 +compile_rules() {
    1.47  	# Patch and then build.
    1.48  	patch_bash
    1.49 +
    1.50  	# Skip tests that can not run while cross-compiling.
    1.51  	cat > config.cache <<EOF
    1.52  ac_cv_func_mmap_fixed_mapped=yes
    1.53 @@ -61,19 +58,20 @@
    1.54  bash_cv_unusable_rtsigs=no
    1.55  gt_cv_int_divbyzero_sigfpe=yes
    1.56  EOF
    1.57 +
    1.58  	./configure \
    1.59 -		$CONFIGURE_ARGS \
    1.60  		--cache-file=config.cache \
    1.61  		--bindir=/bin \
    1.62  		--enable-history \
    1.63 -		--enable-alias  \
    1.64 +		--enable-alias \
    1.65  		--disable-nls \
    1.66  		--without-bash-malloc \
    1.67  		--disable-help-builtin \
    1.68 -		--with-installed-readline &&
    1.69 +		--with-installed-readline \
    1.70 +		$CONFIGURE_ARGS &&
    1.71  	make &&
    1.72  	# Bash doesn't care about DESTDIR in environnment variable.
    1.73 -	make DESTDIR=$DESTDIR install
    1.74 +	make DESTDIR=$DESTDIR install || return 1
    1.75  
    1.76  	# Config files
    1.77  	cp -a $stuff/etc $install
    1.78 @@ -87,23 +85,22 @@
    1.79  	tee bashcheck.log
    1.80  	echo
    1.81  	grep Vulnerable bashcheck.log && echo "ERROR: Vulnerable"
    1.82 +	:
    1.83  }
    1.84  
    1.85 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.86 -genpkg_rules()
    1.87 -{
    1.88 +genpkg_rules() {
    1.89  	case $PACKAGE in
    1.90  		bash)
    1.91  			copy @std
    1.92  			DEPENDS="ncurses readline"
    1.93 +			TAGS="LFS shell"
    1.94  			;;
    1.95  		*-dev) copy @dev;;
    1.96  	esac
    1.97  }
    1.98  
    1.99  
   1.100 -post_install_bash()
   1.101 -{
   1.102 +post_install_bash() {
   1.103  	mkdir -p "$1/etc/skel"; cp -a "$1/etc/bashrc" "$1/etc/skel/.bashrc"
   1.104  
   1.105  	# Exit function in non-interactive mode (when user can't answer question)
   1.106 @@ -126,8 +123,7 @@
   1.107  }
   1.108  
   1.109  
   1.110 -pre_remove_bash()
   1.111 -{
   1.112 +pre_remove_bash() {
   1.113  	echo
   1.114  	echo 'Setting /bin/sh as default shell for all users'
   1.115  	sed -i 's|:/bin/bash$|:/bin/sh|' "$1/etc/passwd"