wok rev 21506

Update some web_site
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu May 02 18:27:43 2019 +0200 (18 months ago)
parents 3d04aad6c72c
children e7c6d93c6e42
files bchunk/receipt memo/receipt sozi/receipt syslinux/stuff/iso2exe/init vrrpd/receipt
line diff
     1.1 --- a/bchunk/receipt	Thu May 02 16:34:14 2019 +0100
     1.2 +++ b/bchunk/receipt	Thu May 02 18:27:43 2019 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  SHORT_DESC="Converts a CD image in a '.bin / .cue' format to '.iso'."
     1.5  MAINTAINER="pascal.bellard@slitaz.org"
     1.6  LICENSE="GPL2"
     1.7 -WEB_SITE="http://he.fi/bchunk"
     1.8 +WEB_SITE="https://github.com/hessu/bchunk"
     1.9  
    1.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.11  WGET_URL="$WEB_SITE/$TARBALL"
    1.12 @@ -16,7 +16,6 @@
    1.13  compile_rules()
    1.14  {
    1.15  	make
    1.16 -
    1.17  	cook_pick_manpages bchunk.1
    1.18  }
    1.19  
     2.1 --- a/memo/receipt	Thu May 02 16:34:14 2019 +0100
     2.2 +++ b/memo/receipt	Thu May 02 18:27:43 2019 +0200
     2.3 @@ -7,7 +7,7 @@
     2.4  MAINTAINER="paul@slitaz.org"
     2.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     2.6  LICENSE="GPL3"
     2.7 -WEB_SITE="http://palovandalo.com/memo/"
     2.8 +WEB_SITE="https://github.com/mrVanDalo/memo/"
     2.9  WGET_URL="http://www.ideabyte.net/memo/$TARBALL"
    2.10  
    2.11  DEPENDS="ncurses"
    2.12 @@ -25,4 +25,3 @@
    2.13  	mkdir -p $fs/usr/bin
    2.14  	cp -a $src/$PACKAGE $fs/usr/bin
    2.15  }
    2.16 -
     3.1 --- a/sozi/receipt	Thu May 02 16:34:14 2019 +0100
     3.2 +++ b/sozi/receipt	Thu May 02 18:27:43 2019 +0200
     3.3 @@ -6,7 +6,7 @@
     3.4  SHORT_DESC="A small program that can play animated presentations."
     3.5  MAINTAINER="pascal.bellard@slitaz.org"
     3.6  LICENSE="GPL3"
     3.7 -WEB_SITE="http://sozi.baierouge.fr/"
     3.8 +WEB_SITE="https://github.com/senshu/Sozi"
     3.9  TARBALL="$PACKAGE-release-$VERSION.zip"
    3.10  WGET_URL="https://github.com/downloads/senshu/Sozi/$TARBALL"
    3.11  
     4.1 --- a/syslinux/stuff/iso2exe/init	Thu May 02 16:34:14 2019 +0100
     4.2 +++ b/syslinux/stuff/iso2exe/init	Thu May 02 18:27:43 2019 +0200
     4.3 @@ -125,7 +125,7 @@
     4.4  
     4.5  gettazboot()
     4.6  {
     4.7 -	echo "Creating $(basename $1) ..."
     4.8 +	echo -e "\nCreating $(basename $1) ..."
     4.9  	X=$(($(get 20 /mnt/$ISO) - 0xC0))
    4.10  	[ $X -lt 30000 ] && X=$((0x7FF0))
    4.11  	O=$(($(get 64 /mnt/$ISO) - 0xC0))
    4.12 @@ -206,7 +206,6 @@
    4.13  #!/bin/sh
    4.14  
    4.15  mount -t proc /proc /proc
    4.16 -  grep -q debug /proc/cmdline && debug=true && set -x
    4.17  for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
    4.18  v=\$(sed '/\\/home=/!d;s|.*/home=\\([^ ]*\\).*|\\1|' /proc/cmdline /cmdline 2> /dev/null)
    4.19  mount / -o remount,rw
    4.20 @@ -219,7 +218,7 @@
    4.21  mount \$dev /mnt/dos
    4.22  mount.posixovl -F \$mnt -- -oallow_other -odefault_permissions -osuid
    4.23  mount --bind \$mnt /home
    4.24 -  [ "\$debug" = "true" ] && sh
    4.25 +mount -o size=0,ro -t tmpfs tmpfs \$mnt
    4.26  umount /proc
    4.27  exec /sbin/init
    4.28  EOT
    4.29 @@ -235,8 +234,7 @@
    4.30  	for i in bin lib dev proc tmp mnt etc ; do
    4.31  		mkdir -p /tmp/fs/$i
    4.32  	done
    4.33 -	for i in /dev/console /dev/null /dev/tty /dev/tty0 /dev/tty1 /dev/tty2 \
    4.34 -		 /dev/fuse /dev/hd* /dev/sd* ; do
    4.35 +	for i in /dev/console /dev/null /dev/tty /dev/tty[012] /dev/fuse /dev/[hs]d* ; do
    4.36  		cp -a $i /tmp/fs$i
    4.37  	done
    4.38  	for i in /bin/busybox $(which mount.posixovl) $(which blkid); do
    4.39 @@ -264,7 +262,6 @@
    4.40  }
    4.41  
    4.42  mount -t proc /proc /proc
    4.43 -  arg debug "shell" && debug=true && set -x
    4.44  for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
    4.45  arg mount "Mount device"
    4.46  mount \$( (blkid /dev/[sh]d* || blkid) | grep \$val | sed 's/:.*//;q') /mnt
    4.47 @@ -274,7 +271,6 @@
    4.48  mount -o size=0,ro -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val
    4.49  LDSO=\$(ls /mnt/\$val/lib/ld-* | sed q)
    4.50  export LD_LIBRARY_PATH=\$val/lib:\$val/usr/lib:/lib
    4.51 -  [ "$debug" = "true" ] && sh
    4.52  umount /proc
    4.53  exec /bin/switch_root /mnt \${LDSO#/mnt/} \$val/usr/sbin/chroot \$val /sbin/init
    4.54  EOT
    4.55 @@ -316,22 +312,18 @@
    4.56  		if [ -d /media/cdrom/fs ]; then
    4.57  			cp -a /media/cdrom/fs/. /mnt/slitaz
    4.58  		elif is_loram ; then
    4.59 -			for i in /media/cdrom/boot/rootfs?*.* ; do
    4.60 -				[ -s $(basename $i) ] && continue
    4.61 -				cpio -i $i
    4.62 -			done
    4.63  			for i in $(ls_r /media/cdrom/boot/rootfs*gz); do
    4.64 -				mount -o loop,ro $i /sqfs/mnt
    4.65 +				losetup -o 124 /dev/loop7 $i
    4.66 +				mount -t squashfs -o ro /dev/loop7 /sqfs/mnt
    4.67  				cp -a /sqfs/mnt/. /mnt/slitaz
    4.68 -				umount -d /sqfs/mnt
    4.69 +				umount /sqfs/mnt
    4.70 +				losetup -d /dev/loop7
    4.71  			done
    4.72  		else
    4.73  			for i in $(ls_r /media/cdrom/boot/rootfs*gz); do
    4.74  				uncpio $i /mnt/slitaz
    4.75  			done
    4.76  		fi
    4.77 -		cp -a /etc/locale.conf /mnt/slitaz/etc 2> /dev/null
    4.78 -		cp -a /etc/keymap.conf /mnt/slitaz/etc 2> /dev/null
    4.79  		mkinitrd /mnt/slitaz/boot/initrd
    4.80  		initrd=initrd
    4.81  		extraargs="mount=$(getuuid) subroot=slitaz"
    4.82 @@ -346,6 +338,7 @@
    4.83  		[ $(get 0 $i 2> /dev/null || echo 0) -eq 23117 ] &&
    4.84  		mv $i $i.exe
    4.85  	done
    4.86 +	cp /etc/keymap.conf /etc/locale.conf /mnt/slitaz/etc 2> /dev/null
    4.87  	gettazboot /mnt/slitaz/boot/tazboot.exe
    4.88  	unix2dos > /mnt/slitaz/boot/tazboot.cmd <<EOT
    4.89  kernel=/slitaz/boot/bzimage
    4.90 @@ -1041,6 +1034,7 @@
    4.91  		mkdir /sqfs
    4.92  		mount -o loop,ro -t squashfs /rootfs*.gz /sqfs
    4.93  	fi
    4.94 +	cp -a /sqfs/dev/fuse /sqfs/dev/tty[12] /sqfs/dev/[hs]d* /dev
    4.95  	ln -s /sqfs/lib/* lib
    4.96  	ln -fs /sqfs/usr /sqfs/var /
    4.97  	mkdir /etc && cp /sqfs/etc/dialogrc /etc 2> /dev/null
     5.1 --- a/vrrpd/receipt	Thu May 02 16:34:14 2019 +0100
     5.2 +++ b/vrrpd/receipt	Thu May 02 18:27:43 2019 +0200
     5.3 @@ -7,7 +7,7 @@
     5.4  MAINTAINER="pascal.bellard@slitaz.org"
     5.5  LICENSE="GPL2"
     5.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     5.7 -WEB_SITE="http://numsys.eu/"
     5.8 +WEB_SITE="https://github.com/fredbcode/Vrrpd/"
     5.9  WGET_URL="https://github.com/fredbcode/Vrrpd/archive/v$VERSION.tar.gz"
    5.10  CONFIG_FILES="/etc/vrrpd /etc/vrrp.conf"
    5.11  TAGS="High availability HA"