wok rev 22531

updated bash (4.4.5 -> 5.0.11)
author Hans-G?nter Theisgen
date Fri Jan 03 07:52:13 2020 +0100 (17 months ago)
parents 2d2aa67a5236
children 443034656373
files bash/receipt
line diff
     1.1 --- a/bash/receipt	Fri Jan 03 07:13:19 2020 +0100
     1.2 +++ b/bash/receipt	Fri Jan 03 07:52:13 2020 +0100
     1.3 @@ -1,52 +1,57 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="bash"
     1.7 -VERSION="4.4.5"
     1.8 +VERSION="5.0.11"
     1.9  BASEVERSION="${VERSION%.*}"
    1.10  CATEGORY="system-tools"
    1.11 +TAGS="shell"
    1.12  SHORT_DESC="The GNU bourne SHell."
    1.13  MAINTAINER="pankso@slitaz.org"
    1.14  LICENSE="GPL3"
    1.15 +WEB_SITE="https://www.gnu.org/software/bash/"
    1.16 +
    1.17  TARBALL="$PACKAGE-$BASEVERSION.tar.gz"
    1.18 -WEB_SITE="http://www.gnu.org/software/bash/"
    1.19  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    1.20 +
    1.21  BASHCHECKURL="https://raw.githubusercontent.com/hannob/bashcheck/master/bashcheck"
    1.22  BASHCHECK="$(basename $BASHCHECKURL)"
    1.23 +
    1.24  BASHPATCHES="$(for i in $(seq 1 ${VERSION##*.}); do printf "bash${BASEVERSION/./}-%03d " $i; done)"
    1.25  EXTRA_SOURCE_FILES="$BASHCHECK $BASHPATCHES"
    1.26 -TAGS="shell"
    1.27  
    1.28  DEPENDS="libtinfo"
    1.29 -BUILD_DEPENDS="bison wget texinfo"
    1.30 +BUILD_DEPENDS="bison texinfo"
    1.31  
    1.32  patch_bash()
    1.33  {
    1.34 -	for i in $BASHPATCHES ; do
    1.35 -		if [ ! -s "$SOURCES_REPOSITORY/$i" ]; then
    1.36 +	for i in $BASHPATCHES
    1.37 +	  do
    1.38 +		if [ ! -s "$SOURCES_REPOSITORY/$i" ]
    1.39 +		  then
    1.40  			echo  "Downloading $i"
    1.41  			busybox wget -O "$SOURCES_REPOSITORY/$i" \
    1.42  			http://ftp.gnu.org/gnu/bash/bash-$BASEVERSION-patches/$i
    1.43  		fi
    1.44  		echo "Apply $i ..."
    1.45  		patch -p0 < $SOURCES_REPOSITORY/$i
    1.46 -	done
    1.47 +	  done
    1.48  }
    1.49  
    1.50  # Rules to compile & install the temporary toolchain.
    1.51  cook_tmp_toolchain()
    1.52  {
    1.53 -	cd $src
    1.54  	patch_bash
    1.55  	./configure --without-bash-malloc &&
    1.56 -	make && make install
    1.57 +	make &&
    1.58 +	make install
    1.59  }
    1.60  
    1.61  # Rules to configure and make the package.
    1.62  compile_rules()
    1.63  {
    1.64  	# Patch and then build.
    1.65 -	cd $src
    1.66  	patch_bash
    1.67 +
    1.68  	# Skip tests that can not run while cross-compiling.
    1.69  	cat > config.cache << "EOF"
    1.70  ac_cv_func_mmap_fixed_mapped=yes
    1.71 @@ -62,17 +67,21 @@
    1.72  bash_cv_unusable_rtsigs=no
    1.73  gt_cv_int_divbyzero_sigfpe=yes
    1.74  EOF
    1.75 -	./configure \
    1.76 -		$CONFIGURE_ARGS \
    1.77 -		--cache-file=config.cache \
    1.78 -		--bindir=/bin \
    1.79 -		--enable-history --enable-alias  \
    1.80 -		--disable-nls --without-bash-malloc \
    1.81 -		--disable-help-builtin \
    1.82 -		--with-installed-readline=no &&
    1.83 +
    1.84 +	./configure					\
    1.85 +		--cache-file=config.cache		\
    1.86 +		--bindir=/bin				\
    1.87 +		--enable-history			\
    1.88 +		--enable-alias				\
    1.89 +		--disable-nls				\
    1.90 +		--without-bash-malloc			\
    1.91 +		--disable-help-builtin			\
    1.92 +		--with-installed-readline=no		\
    1.93 +		$CONFIGURE_ARGS &&
    1.94  	make &&
    1.95  	# Bash doesn't care about DESTDIR in environnment variable.
    1.96  	make DESTDIR=$DESTDIR install
    1.97 +
    1.98  	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] || 
    1.99  		busybox wget --no-check-certificate -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL
   1.100  	$DESTDIR/bin/bash $SOURCES_REPOSITORY/$BASHCHECK $DESTDIR/bin/bash | tee bashcheck.log
   1.101 @@ -82,17 +91,18 @@
   1.102  # Rules to gen a SliTaz package suitable for Tazpkg.
   1.103  genpkg_rules()
   1.104  {
   1.105 -	cp -a $install/bin $fs
   1.106 -	# Config files.
   1.107 -	#
   1.108 +	cp -a $install/bin	$fs
   1.109 +
   1.110 +	# Configuration files.
   1.111  	mkdir $fs/etc
   1.112 -	cp $stuff/example.bashrc $fs/etc/bashrc
   1.113 +	cp $stuff/example.bashrc	$fs/etc/bashrc
   1.114  }
   1.115  
   1.116  
   1.117  post_install()
   1.118  {
   1.119 -	mkdir -p "$1/etc/skel"; cp -a "$1/etc/bashrc" "$1/etc/skel/.bashrc"
   1.120 +	mkdir -p "$1/etc/skel"
   1.121 +	cp -a "$1/etc/bashrc"	"$1/etc/skel/.bashrc"
   1.122  
   1.123  	# Exit function in non-interactive mode (when user can't answer question)
   1.124  	! tty -s && return
   1.125 @@ -107,11 +117,12 @@
   1.126  	sed -i 's|:/bin/[ckz]*sh$|:/bin/bash|' "$1/etc/passwd"
   1.127  
   1.128  	echo 'Creating ~/.bashrc file for all users'
   1.129 -	for i in $(awk -F: '$7=="/bin/bash"{print $6}' "$1/etc/passwd"); do
   1.130 +	for i in $(awk -F: '$7=="/bin/bash"{print $6}' "$1/etc/passwd")
   1.131 +	  do
   1.132  		[ -e "$1$i/.bashrc" ] && continue
   1.133 -		cp "$1/etc/bashrc" "$1$i/.bashrc"
   1.134 -		chown $(stat -c%U:%G "$1$i") "$1$i/.bashrc"
   1.135 -	done
   1.136 +		cp "$1/etc/bashrc"		"$1$i/.bashrc"
   1.137 +		chown $(stat -c%U:%G "$1$i")	"$1$i/.bashrc"
   1.138 +	  done
   1.139  }
   1.140  
   1.141