wok diff backuppc/receipt @ rev 18807

openssh: CVE-2016-0777 and CVE-2016-0778
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 14 18:33:14 2016 +0100 (2016-01-14)
parents fca172c323cf
children 74a3c282b4ca
line diff
     1.1 --- a/backuppc/receipt	Fri Dec 04 17:18:44 2015 +0200
     1.2 +++ b/backuppc/receipt	Thu Jan 14 18:33:14 2016 +0100
     1.3 @@ -54,17 +54,17 @@
     1.4  
     1.5  post_install()
     1.6  {
     1.7 -	grep -qs backuppc $1/etc/rcS.conf ||
     1.8 -	sed -i 's/^RUN_DAEMONS="/RUN_DAEMONS="backuppc /' $1/etc/rcS.conf
     1.9 +	grep -qs backuppc "$1/etc/rcS.conf" ||
    1.10 +	sed -i 's/^RUN_DAEMONS="/RUN_DAEMONS="backuppc /' "$1/etc/rcS.conf"
    1.11  	loc=$LANG
    1.12 -	[ -s $1/usr/lib/BackupPC/Lang/$loc.pm ] || loc=${loc:0:2}
    1.13 -	[ -s $1/usr/lib/BackupPC/Lang/$loc.pm ] &&
    1.14 -	sed -i "s/'en'/'$loc'/" $1/etc/BackupPC/config.pl
    1.15 +	[ -s "$1/usr/lib/BackupPC/Lang/$loc.pm" ] || loc=${loc:0:2}
    1.16 +	[ -s "$1/usr/lib/BackupPC/Lang/$loc.pm" ] &&
    1.17 +	sed -i "s/'en'/'$loc'/" "$1/etc/BackupPC/config.pl"
    1.18  	[ -x /usr/bin/par2 ] &&
    1.19 -	sed -i 's/{ArchivePar} =.*/{ArchivePar} = 5;/' $1/etc/BackupPC/config.pl
    1.20 -	if [ ! -d $1/etc/BackupPC/.ssh ]; then
    1.21 -		mkdir $1/etc/BackupPC/.ssh
    1.22 -		chroot $1/ ssh-keygen -t rsa -f /etc/BackupPC/.ssh/id_rsa -C '' -N ''
    1.23 +	sed -i 's/{ArchivePar} =.*/{ArchivePar} = 5;/' "$1/etc/BackupPC/config.pl"
    1.24 +	if [ ! -d "$1/etc/BackupPC/.ssh" ]; then
    1.25 +		mkdir "$1/etc/BackupPC/.ssh"
    1.26 +		chroot "$1/" ssh-keygen -t rsa -f /etc/BackupPC/.ssh/id_rsa -C '' -N ''
    1.27  	fi
    1.28  	if [ -z "$1" ]; then
    1.29  		/etc/init.d/apache stop
    1.30 @@ -75,8 +75,8 @@
    1.31  	cat <<EOT
    1.32  
    1.33  Now you should :
    1.34 -- append $1/etc/BackupPC/.ssh/id_rsa.pub to every unix client /root/.ssh/authorized_keys file
    1.35 -- update \$Conf{CgiAdminUsers} in $1/etc/BackupPC/config.pl 
    1.36 +- append /etc/BackupPC/.ssh/id_rsa.pub to every unix client /root/.ssh/authorized_keys file
    1.37 +- update \$Conf{CgiAdminUsers} in /etc/BackupPC/config.pl 
    1.38  - enable web access with 'htpasswd -c root /etc/BackupPC/BackupPC.users'
    1.39  - update passwords in /etc/BackupPC/*.sh
    1.40  EOT