SliTaz Repositories

     1.1 --- a/bash/receipt	Tue Dec 13 17:27:04 2016 +0200
     1.2 +++ b/bash/receipt	Fri Dec 16 01:16:56 2016 +0200
     1.3 @@ -1,34 +1,34 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="bash"
     1.7 -VERSION="4.3.42"
     1.8 +VERSION="4.3.48"
     1.9  BASEVERSION="${VERSION%.*}"
    1.10 -CATEGORY="system-tools"
    1.11 -SHORT_DESC="The GNU bourne SHell."
    1.12 +CATEGORY="shells"
    1.13 +SHORT_DESC="The GNU bourne shell"
    1.14  MAINTAINER="pankso@slitaz.org"
    1.15  LICENSE="GPL3"
    1.16 +WEB_SITE="https://www.gnu.org/software/bash/"
    1.17 +TAGS="shell"
    1.18 +
    1.19  TARBALL="$PACKAGE-$BASEVERSION.tar.gz"
    1.20 -WEB_SITE="http://www.gnu.org/software/bash/"
    1.21  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    1.22 +
    1.23  BASHCHECKURL="https://raw.githubusercontent.com/hannob/bashcheck/master/bashcheck"
    1.24  BASHCHECK="$(basename $BASHCHECKURL)"
    1.25  BASHPATCHES="$(for i in $(seq 1 ${VERSION##*.}); do printf "bash${BASEVERSION/./}-%03d " $i; done)"
    1.26  EXTRA_SOURCE_FILES="$BASHCHECK $BASHPATCHES"
    1.27 -TAGS="shell"
    1.28  
    1.29 -DEPENDS="libtinfo" # readline
    1.30 -BUILD_DEPENDS="readline bison wget texinfo"
    1.31 -#configure: WARNING: installed readline library is too old to be linked with bash
    1.32 -#configure: WARNING: using private bash version
    1.33 +DEPENDS="readline libtinfo"
    1.34 +BUILD_DEPENDS="readline texinfo gettext patch"
    1.35  
    1.36  patch_bash()
    1.37  {
    1.38 -	for i in $BASHPATCHES ; do
    1.39 -		[ -s "$SOURCES_REPOSITORY/$i" ] || 
    1.40 +	for i in $BASHPATCHES; do
    1.41 +		[ -s "$SOURCES_REPOSITORY/$i" ] ||
    1.42  			wget -O "$SOURCES_REPOSITORY/$i" \
    1.43  			http://ftp.gnu.org/gnu/bash/bash-$BASEVERSION-patches/$i
    1.44 -		echo "Apply $i ..."
    1.45 -		patch -p0 < $SOURCES_REPOSITORY/$i
    1.46 +		echo "Apply $i patch..."
    1.47 +		patch -p0 -i $SOURCES_REPOSITORY/$i | awk '{print "  * " $0;}'
    1.48  	done
    1.49  }
    1.50  
    1.51 @@ -45,10 +45,9 @@
    1.52  compile_rules()
    1.53  {
    1.54  	# Patch and then build.
    1.55 -	cd $src
    1.56  	patch_bash
    1.57  	# Skip tests that can not run while cross-compiling.
    1.58 -	cat > config.cache << "EOF"
    1.59 +	cat > config.cache <<EOF
    1.60  ac_cv_func_mmap_fixed_mapped=yes
    1.61  ac_cv_func_strcoll_works=yes
    1.62  ac_cv_func_working_mktime=yes
    1.63 @@ -66,27 +65,32 @@
    1.64  		$CONFIGURE_ARGS \
    1.65  		--cache-file=config.cache \
    1.66  		--bindir=/bin \
    1.67 -		--enable-history --enable-alias  \
    1.68 -		--disable-nls --without-bash-malloc \
    1.69 +		--enable-history \
    1.70 +		--enable-alias  \
    1.71 +		--disable-nls \
    1.72 +		--without-bash-malloc \
    1.73  		--disable-help-builtin \
    1.74  		--with-installed-readline &&
    1.75  	make &&
    1.76  	# Bash doesn't care about DESTDIR in environnment variable.
    1.77  	make DESTDIR=$DESTDIR install
    1.78 -	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] || 
    1.79 -		wget --no-check-certificate -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL
    1.80 -	$DESTDIR/bin/bash $SOURCES_REPOSITORY/$BASHCHECK $DESTDIR/bin/bash | tee bashcheck.log
    1.81 +
    1.82 +	# Check bash against vulnerabilities
    1.83 +	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] ||
    1.84 +		wget -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL
    1.85 +	echo
    1.86 +	$DESTDIR/bin/bash $SOURCES_REPOSITORY/$BASHCHECK $DESTDIR/bin/bash | \
    1.87 +	tee bashcheck.log
    1.88 +	echo
    1.89  	grep Vulnerable bashcheck.log && echo "ERROR: Vulnerable"
    1.90  }
    1.91  
    1.92  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.93  genpkg_rules()
    1.94  {
    1.95 -	cp -a $install/bin $fs
    1.96 -	# Config files.
    1.97 -	#
    1.98 -	mkdir $fs/etc
    1.99 -	cp $stuff/example.bashrc $fs/etc/bashrc
   1.100 +	cook_copy_folders bin
   1.101 +	# Config files
   1.102 +	cp -a $stuff/etc $fs
   1.103  }
   1.104  
   1.105  
   1.106 @@ -97,12 +101,12 @@
   1.107  	# Exit function in non-interactive mode (when user can't answer question)
   1.108  	! tty -s && return
   1.109  
   1.110 -	echo -n 'Do you want to set Bash to default (y/N) ? : '
   1.111 +	echo -n 'Do you want to set /bin/bash to default (y/N) ? : '
   1.112  	read -t 30 answer
   1.113  	[ "$answer" != 'y' ] && return
   1.114  
   1.115  	echo
   1.116 -	echo 'Setting bash as default shell for all users'
   1.117 +	echo 'Setting /bin/bash as default shell for all users'
   1.118  	sed -i 's|:/bin/[ckz]*sh$|:/bin/bash|' "$1/etc/passwd"
   1.119  
   1.120  	echo 'Creating ~/.bashrc file for all users'
   1.121 @@ -117,7 +121,7 @@
   1.122  pre_remove()
   1.123  {
   1.124  	echo
   1.125 -	echo 'Setting sh as default shell for all users'
   1.126 +	echo 'Setting /bin/sh as default shell for all users'
   1.127  	sed -i 's|:/bin/bash$|:/bin/sh|' "$1/etc/passwd"
   1.128  	[ -f "$1/etc/skel/.bashrc" ] && rm "$1/etc/skel/.bashrc"
   1.129  }