# HG changeset patch # User Pascal Bellard # Date 1600444136 0 # Node ID b57d2cbc7c42515c813bcc62e9174d2c796c0447 # Parent df7ee1e0dc61e20f4a25faa0dc9d61215d401a9b Up tazinst (107) diff -r df7ee1e0dc61 -r b57d2cbc7c42 radare2/receipt --- a/radare2/receipt Thu Sep 17 10:31:38 2020 +0000 +++ b/radare2/receipt Fri Sep 18 15:48:56 2020 +0000 @@ -10,6 +10,12 @@ WEB_SITE="http://radare.org/" WGET_URL="https://github.com/radareorg/radare2/archive/$VERSION.tar.gz" +current_version() +{ + wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \ + sed '/archive.[0-9].*tar/!d;s|.*archive/\(.*\).tar.*|\1|;q' +} + # Rules to configure and make the package. compile_rules() { diff -r df7ee1e0dc61 -r b57d2cbc7c42 slitaz-base-files/receipt --- a/slitaz-base-files/receipt Thu Sep 17 10:31:38 2020 +0000 +++ b/slitaz-base-files/receipt Fri Sep 18 15:48:56 2020 +0000 @@ -108,7 +108,9 @@ # pre_install() { - # cp -a "$1/etc" "$1/tmp/etc.bak" 2>/dev/null + for i in passwd shadow group gshadow ; do + [ -s /etc/$i ] && cp /etc/$i /etc/$i.orig + done [ -x "$1/usr/bin/sudo" ] && mv "$1/usr/bin/sudo" "$1/usr/bin/sudo.orig" # Remove old /var/run symlink [ -h "$1/var/run" ] && rm -f "$1/var/run" @@ -117,9 +119,13 @@ post_install() { - # if cp -a "$1/tmp/etc.bak"/* "$1/etc"; then - # rm -r "$1/tmp/etc.bak" - # fi 2>/dev/null + for i in passwd shadow group gshadow ; do + [ -s $1/etc/$i.orig ] || continue + while read line; do + grep -q "^${line%%:*}:" $1/etc/$i.orig || echo "$line" >> $1/etc/$i.orig + done < $1/etc/$i + mv -f $1/etc/$i.orig $1/etc/$i + done [ -x "$1/usr/bin/sudo.orig" ] && mv -f "$1/usr/bin/sudo.orig" "$1/usr/bin/sudo" diff -r df7ee1e0dc61 -r b57d2cbc7c42 syslinux-extra/receipt --- a/syslinux-extra/receipt Thu Sep 17 10:31:38 2020 +0000 +++ b/syslinux-extra/receipt Fri Sep 18 15:48:56 2020 +0000 @@ -22,6 +22,7 @@ lzma e $src/core/pxelinux.0 $fs/usr/share/boot/pxelinux.0.lzma 2> /dev/null #lzma e $src/com32/menu/vesamenu.c32 $fs/usr/share/boot/vesamenu.c32 #lzma e $src/com32/modules/mboot.c32 $fs/usr/share/boot/mboot.c32 + lzma e $src/com32/modules/chain.c32 $fs/usr/share/boot/chain.c32 lzma e $src/com32/modules/sdi.c32 $fs/usr/share/boot/sdi.c32 cp -a $src/linux/syslinux-nomtools $fs/bin/syslinux cp -a $src/extlinux/extlinux $fs/bin diff -r df7ee1e0dc61 -r b57d2cbc7c42 syslinux-modules/receipt --- a/syslinux-modules/receipt Thu Sep 17 10:31:38 2020 +0000 +++ b/syslinux-modules/receipt Fri Sep 18 15:48:56 2020 +0000 @@ -16,7 +16,7 @@ mkdir -p $fs/usr/share/boot for i in $src/com32/*/*.c32 ; do case "$i" in - */reboot.c32|*/ifmem.c32|*/vesamenu.c32) continue;; + */reboot.c32|*/ifmem.c32|*/vesamenu.c32|*/chain.c32) continue;; esac lzma e $i $fs/usr/share/boot/$(basename $i) 2> /dev/null done diff -r df7ee1e0dc61 -r b57d2cbc7c42 tazinst-gui/receipt --- a/tazinst-gui/receipt Thu Sep 17 10:31:38 2020 +0000 +++ b/tazinst-gui/receipt Fri Sep 18 15:48:56 2020 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="tazinst-gui" -VERSION="105" +VERSION="107" CATEGORY="base-system" SHORT_DESC="SliTaz installer (GUI frontend)" MAINTAINER="domcox@slitaz.org" diff -r df7ee1e0dc61 -r b57d2cbc7c42 tazinst/receipt --- a/tazinst/receipt Thu Sep 17 10:31:38 2020 +0000 +++ b/tazinst/receipt Fri Sep 18 15:48:56 2020 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="tazinst" -VERSION="105" +VERSION="107" CATEGORY="base-system" SHORT_DESC="SliTaz installer" MAINTAINER="domcox@slitaz.org" @@ -12,7 +12,7 @@ WGET_URL="http://hg.slitaz.org/tazinst/archive/$VERSION.tar.bz2" TAGS="slitaz" -DEPENDS="util-linux-blkid lzma parted" +DEPENDS="util-linux-blkid lzma parted efibootmgr" SUGGESTED="tazpanel" SIBLINGS="tazinst-gui" diff -r df7ee1e0dc61 -r b57d2cbc7c42 tazpkg/receipt --- a/tazpkg/receipt Thu Sep 17 10:31:38 2020 +0000 +++ b/tazpkg/receipt Fri Sep 18 15:48:56 2020 +0000 @@ -39,6 +39,9 @@ cp -a $install/* $fs chown -R root.root $fs + # A tiny bug fix + sed 's|= "\$NEWVER|= "${NEWVER:-$VERSION}|;s|\$NEWMD5|${NEWMD5:-$OLDMD5}|' \ + -i $fs/usr/libexec/tazpkg/info # Default icon for mimetype (freedesktop standard compliant file # manager will diplay a tazpkg icon for SliTaz packages). icons="$fs/usr/share/icons/hicolor/32x32/mimetypes"