SliTaz Repositories

     1.1 --- a/bash/receipt	Thu Feb 03 16:07:00 2022 +0000
     1.2 +++ b/bash/receipt	Thu Feb 03 17:12:14 2022 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="bash"
     1.7 -VERSION="5.0.11"
     1.8 +VERSION="5.1.16"
     1.9  BASEVERSION="${VERSION%.*}"
    1.10  CATEGORY="system-tools"
    1.11  TAGS="shell"
    1.12 @@ -47,7 +47,7 @@
    1.13  # Rules to compile & install the temporary toolchain.
    1.14  cook_tmp_toolchain()
    1.15  {
    1.16 -	patch_bash
    1.17 +	patch_bash &&
    1.18  	./configure --without-bash-malloc &&
    1.19  	make &&
    1.20  	make install
    1.21 @@ -86,25 +86,32 @@
    1.22  		--with-installed-readline=no		\
    1.23  		$CONFIGURE_ARGS &&
    1.24  	make &&
    1.25 -	# Bash doesn't care about DESTDIR in environnment variable.
    1.26 -	make DESTDIR=$DESTDIR install
    1.27 -
    1.28 -	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] || 
    1.29 -		busybox wget --no-check-certificate -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL
    1.30 -	$DESTDIR/bin/bash $SOURCES_REPOSITORY/$BASHCHECK $DESTDIR/bin/bash | tee bashcheck.log
    1.31 -	grep Vulnerable bashcheck.log && echo "ERROR: Vulnerable"
    1.32 +	# Bash doesn't care about DESTDIR in environment variable.
    1.33 +	make install DESTDIR=$DESTDIR
    1.34  }
    1.35  
    1.36  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.37  genpkg_rules()
    1.38  {
    1.39 -	cp -a $install/bin	$fs
    1.40 +	mkdir $fs/etc
    1.41 +
    1.42 +	cook_copy_folders		bin
    1.43  
    1.44  	# Configuration files.
    1.45 -	mkdir $fs/etc
    1.46  	cp $stuff/example.bashrc	$fs/etc/bashrc
    1.47  }
    1.48  
    1.49 +testsuite()
    1.50 +{
    1.51 +	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] ||
    1.52 +	busybox wget	--no-check-certificate			\
    1.53 +			-O "$SOURCES_REPOSITORY/$BASHCHECK"	\
    1.54 +			$BASHCHECKURL
    1.55 +	$DESTDIR/bin/bash $SOURCES_REPOSITORY/$BASHCHECK $DESTDIR/bin/bash | \
    1.56 +	tee bashcheck.log
    1.57 +	grep Vulnerable bashcheck.log &&
    1.58 +	echo "ERROR: Vulnerable"
    1.59 +}
    1.60  
    1.61  post_install()
    1.62  {
    1.63 @@ -117,11 +124,12 @@
    1.64  	echo
    1.65  	echo -n 'Do you want to set Bash to default (y/N) ? : '
    1.66  	read -t 30 answer
    1.67 -	[ "$answer" != 'y' ] && return
    1.68 +	[ "$answer" != 'y' ] &&
    1.69 +	return
    1.70  
    1.71  	echo
    1.72  	echo 'Setting bash as default shell for all users'
    1.73 -	sed -i 's|:/bin/[ckz]*sh$|:/bin/bash|' "$1/etc/passwd"
    1.74 +	sed -i 's|:/bin/[ckz]*sh$|:/bin/bash|'	"$1/etc/passwd"
    1.75  
    1.76  	echo 'Creating ~/.bashrc file for all users'
    1.77  	for i in $(awk -F: '$7=="/bin/bash"{print $6}' "$1/etc/passwd")
    1.78 @@ -137,6 +145,7 @@
    1.79  {
    1.80  	echo
    1.81  	echo 'Setting sh as default shell for all users'
    1.82 -	sed -i 's|:/bin/bash$|:/bin/sh|' "$1/etc/passwd"
    1.83 -	[ -f "$1/etc/skel/.bashrc" ] && rm "$1/etc/skel/.bashrc"
    1.84 +	sed -i 's|:/bin/bash$|:/bin/sh|'	"$1/etc/passwd"
    1.85 +	[ -f "$1/etc/skel/.bashrc" ] &&
    1.86 +	rm "$1/etc/skel/.bashrc"
    1.87  }