wok-next diff bash/receipt @ rev 20333

Up bmpanel2, urxvt, usbip
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Nov 15 16:27:09 2017 +0200 (2017-11-15)
parents e9bd4eca24b2
children 90a5eb560fd6
line diff
     1.1 --- a/bash/receipt	Sat Dec 24 05:45:18 2016 +0200
     1.2 +++ b/bash/receipt	Wed Nov 15 16:27:09 2017 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="bash"
     1.8 -VERSION="4.3.48"
     1.9 +VERSION="4.4.12"
    1.10  BASEVERSION="${VERSION%.*}"
    1.11  CATEGORY="shells"
    1.12  SHORT_DESC="The GNU bourne shell"
    1.13 @@ -18,8 +18,8 @@
    1.14  BASHPATCHES="$(for i in $(seq 1 ${VERSION##*.}); do printf "bash${BASEVERSION/./}-%03d " $i; done)"
    1.15  EXTRA_SOURCE_FILES="$BASHCHECK $BASHPATCHES"
    1.16  
    1.17 -DEPENDS="ncurses readline"
    1.18  BUILD_DEPENDS="ncurses-dev readline-dev texinfo gettext patch"
    1.19 +SPLIT="bash-dev"
    1.20  
    1.21  patch_bash()
    1.22  {
    1.23 @@ -75,6 +75,10 @@
    1.24  	# Bash doesn't care about DESTDIR in environnment variable.
    1.25  	make DESTDIR=$DESTDIR install
    1.26  
    1.27 +	# Config files
    1.28 +	cp -a $stuff/etc $install
    1.29 +	chown -R root:root $install
    1.30 +
    1.31  	# Check bash against vulnerabilities
    1.32  	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] ||
    1.33  		wget -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL
    1.34 @@ -88,13 +92,17 @@
    1.35  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.36  genpkg_rules()
    1.37  {
    1.38 -	cook_copy_folders bin
    1.39 -	# Config files
    1.40 -	cp -a $stuff/etc $fs
    1.41 +	case $PACKAGE in
    1.42 +		bash)
    1.43 +			copy @std
    1.44 +			DEPENDS="ncurses readline"
    1.45 +			;;
    1.46 +		*-dev) copy @dev;;
    1.47 +	esac
    1.48  }
    1.49  
    1.50  
    1.51 -post_install()
    1.52 +post_install_bash()
    1.53  {
    1.54  	mkdir -p "$1/etc/skel"; cp -a "$1/etc/bashrc" "$1/etc/skel/.bashrc"
    1.55  
    1.56 @@ -118,7 +126,7 @@
    1.57  }
    1.58  
    1.59  
    1.60 -pre_remove()
    1.61 +pre_remove_bash()
    1.62  {
    1.63  	echo
    1.64  	echo 'Setting /bin/sh as default shell for all users'