wok rev 23944

Up tazinst (107)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Sep 18 15:48:56 2020 +0000 (5 weeks ago)
parents df7ee1e0dc61
children a17c0b257e47
files radare2/receipt slitaz-base-files/receipt syslinux-extra/receipt syslinux-modules/receipt tazinst-gui/receipt tazinst/receipt tazpkg/receipt
line diff
     1.1 --- a/radare2/receipt	Thu Sep 17 10:31:38 2020 +0000
     1.2 +++ b/radare2/receipt	Fri Sep 18 15:48:56 2020 +0000
     1.3 @@ -10,6 +10,12 @@
     1.4  WEB_SITE="http://radare.org/"
     1.5  WGET_URL="https://github.com/radareorg/radare2/archive/$VERSION.tar.gz"
     1.6  
     1.7 +current_version()
     1.8 +{
     1.9 +	wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \
    1.10 +	sed '/archive.[0-9].*tar/!d;s|.*archive/\(.*\).tar.*|\1|;q'
    1.11 +}
    1.12 +
    1.13  # Rules to configure and make the package.
    1.14  compile_rules()
    1.15  {
     2.1 --- a/slitaz-base-files/receipt	Thu Sep 17 10:31:38 2020 +0000
     2.2 +++ b/slitaz-base-files/receipt	Fri Sep 18 15:48:56 2020 +0000
     2.3 @@ -108,7 +108,9 @@
     2.4  #
     2.5  pre_install()
     2.6  {
     2.7 -	# cp -a "$1/etc" "$1/tmp/etc.bak" 2>/dev/null
     2.8 +	for i in passwd shadow group gshadow ; do
     2.9 +		[ -s /etc/$i ] && cp /etc/$i /etc/$i.orig
    2.10 +	done
    2.11  	[ -x "$1/usr/bin/sudo" ] && mv "$1/usr/bin/sudo" "$1/usr/bin/sudo.orig"
    2.12  	# Remove old /var/run symlink
    2.13  	[ -h "$1/var/run" ] && rm -f "$1/var/run"
    2.14 @@ -117,9 +119,13 @@
    2.15  
    2.16  post_install()
    2.17  {
    2.18 -	# if cp -a "$1/tmp/etc.bak"/* "$1/etc"; then
    2.19 -	# 	rm -r "$1/tmp/etc.bak"
    2.20 -	# fi 2>/dev/null
    2.21 +	for i in passwd shadow group gshadow ; do
    2.22 +		[ -s $1/etc/$i.orig ] || continue
    2.23 +		while read line; do
    2.24 +			grep -q "^${line%%:*}:" $1/etc/$i.orig || echo "$line" >> $1/etc/$i.orig
    2.25 +		done < $1/etc/$i
    2.26 +		mv -f $1/etc/$i.orig $1/etc/$i
    2.27 +	done
    2.28  
    2.29  	[ -x "$1/usr/bin/sudo.orig" ] && mv -f "$1/usr/bin/sudo.orig" "$1/usr/bin/sudo"
    2.30  
     3.1 --- a/syslinux-extra/receipt	Thu Sep 17 10:31:38 2020 +0000
     3.2 +++ b/syslinux-extra/receipt	Fri Sep 18 15:48:56 2020 +0000
     3.3 @@ -22,6 +22,7 @@
     3.4      lzma e $src/core/pxelinux.0 $fs/usr/share/boot/pxelinux.0.lzma 2> /dev/null
     3.5      #lzma e $src/com32/menu/vesamenu.c32 $fs/usr/share/boot/vesamenu.c32
     3.6      #lzma e $src/com32/modules/mboot.c32 $fs/usr/share/boot/mboot.c32
     3.7 +    lzma e $src/com32/modules/chain.c32 $fs/usr/share/boot/chain.c32
     3.8      lzma e $src/com32/modules/sdi.c32 $fs/usr/share/boot/sdi.c32
     3.9      cp -a $src/linux/syslinux-nomtools $fs/bin/syslinux
    3.10      cp -a $src/extlinux/extlinux $fs/bin
     4.1 --- a/syslinux-modules/receipt	Thu Sep 17 10:31:38 2020 +0000
     4.2 +++ b/syslinux-modules/receipt	Fri Sep 18 15:48:56 2020 +0000
     4.3 @@ -16,7 +16,7 @@
     4.4      mkdir -p $fs/usr/share/boot
     4.5      for i in $src/com32/*/*.c32 ; do
     4.6  	case "$i" in
     4.7 -	*/reboot.c32|*/ifmem.c32|*/vesamenu.c32) continue;;
     4.8 +	*/reboot.c32|*/ifmem.c32|*/vesamenu.c32|*/chain.c32) continue;;
     4.9  	esac
    4.10  	lzma e $i $fs/usr/share/boot/$(basename $i) 2> /dev/null
    4.11      done
     5.1 --- a/tazinst-gui/receipt	Thu Sep 17 10:31:38 2020 +0000
     5.2 +++ b/tazinst-gui/receipt	Fri Sep 18 15:48:56 2020 +0000
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="tazinst-gui"
     5.7 -VERSION="105"
     5.8 +VERSION="107"
     5.9  CATEGORY="base-system"
    5.10  SHORT_DESC="SliTaz installer (GUI frontend)"
    5.11  MAINTAINER="domcox@slitaz.org"
     6.1 --- a/tazinst/receipt	Thu Sep 17 10:31:38 2020 +0000
     6.2 +++ b/tazinst/receipt	Fri Sep 18 15:48:56 2020 +0000
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="tazinst"
     6.7 -VERSION="105"
     6.8 +VERSION="107"
     6.9  CATEGORY="base-system"
    6.10  SHORT_DESC="SliTaz installer"
    6.11  MAINTAINER="domcox@slitaz.org"
    6.12 @@ -12,7 +12,7 @@
    6.13  WGET_URL="http://hg.slitaz.org/tazinst/archive/$VERSION.tar.bz2"
    6.14  TAGS="slitaz"
    6.15  
    6.16 -DEPENDS="util-linux-blkid lzma parted"
    6.17 +DEPENDS="util-linux-blkid lzma parted efibootmgr"
    6.18  SUGGESTED="tazpanel"
    6.19  SIBLINGS="tazinst-gui"
    6.20  
     7.1 --- a/tazpkg/receipt	Thu Sep 17 10:31:38 2020 +0000
     7.2 +++ b/tazpkg/receipt	Fri Sep 18 15:48:56 2020 +0000
     7.3 @@ -39,6 +39,9 @@
     7.4  	cp -a $install/* $fs
     7.5  	chown -R root.root $fs
     7.6  
     7.7 +	# A tiny bug fix
     7.8 +	sed 's|= "\$NEWVER|= "${NEWVER:-$VERSION}|;s|\$NEWMD5|${NEWMD5:-$OLDMD5}|' \
     7.9 +		-i $fs/usr/libexec/tazpkg/info
    7.10  	# Default icon for mimetype (freedesktop standard compliant file
    7.11  	# manager will diplay a tazpkg icon for SliTaz packages).
    7.12  	icons="$fs/usr/share/icons/hicolor/32x32/mimetypes"