# HG changeset patch # User Pascal Bellard # Date 1627405074 0 # Node ID a3b6dd3aac6ff4a67976dd29c7af6d20ae749e57 # Parent 01737061adb0082b60848bd2d4dea8ddc1f6d806 Up squashfs (4.5) diff -r 01737061adb0 -r a3b6dd3aac6f 0install/receipt --- a/0install/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/0install/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -14,6 +14,12 @@ DEPENDS="pygtk xdg-utils" BUILD_DEPENDS="python pygobject" +current_version() +{ + wget -O - https://github.com/0install/0install/releases 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f GConf/receipt --- a/GConf/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/GConf/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -18,6 +18,12 @@ BUILD_DEPENDS="dbus-dev dbus-glib-dev gettext gobject-introspection-dev intltool libcomerr3 libcrypto libxml2-dev ORBit2-dev polkit-dev" +current_version() +{ + wget -O - $(dirname $WGET_URL) 2>/dev/null | sed '/LATEST/!d;s|.*IS-||;s|<.*||' +} + +# Handle cross comilation. Use host Perl, Python, etc # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f Geomyidae/receipt --- a/Geomyidae/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/Geomyidae/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -13,6 +13,12 @@ #WGET_URL="${WEB_SITE}src/$PACKAGE/$TARBALL" WGET_URL="ftp://bitreich.org/releases/$SOURCE/$TARBALL" +current_version() +{ + wget -O - http://r-36.net/scm/geomyidae/refs.html | \ + cat X | sed '//!d;s|.*v||;s|<.*||' | sed '$!d' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f ORBit2/receipt --- a/ORBit2/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/ORBit2/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -8,12 +8,17 @@ LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="https://www.gnome.org/" -WGET_URL="ftp://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" CROSS="bug: Could not check for borked linking while cross-compiling" DEPENDS="glib libIDL dbus dbus-glib" BUILD_DEPENDS="glib-dev dbus-dev dbus-glib-dev libIDL pkg-config" +current_version() +{ + wget -O - $(dirname $WGET_URL) 2>/dev/null | sed '/LATEST/!d;s|.*IS-||;s|<.*||' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f PyQt-x11-gpl/receipt --- a/PyQt-x11-gpl/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/PyQt-x11-gpl/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -16,6 +16,12 @@ libQtDBus libQtClucene sip gcc-lib-base dbus" BUILD_DEPENDS="python-dev sip-dev Qt4-dev qmake" +current_version() +{ + wget -O - https://riverbankcomputing.com/software/pyqt/download 2>/dev/null | \ + sed "/$SOURCE/!d;s|.*$SOURCE-||;s|.tar.*||;q" +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f R/receipt --- a/R/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/R/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -15,6 +15,12 @@ midori pcre readline" BUILD_DEPENDS="bzip2-dev curl-dev gfortran liblzma-dev pcre-dev readline-dev" +current_version() +{ + wget -O - $WEB_SITE 2>/dev/null | \ + sed '/released on/!d;s|.*version ||;s| (.*||;q' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f TeXmacs/receipt --- a/TeXmacs/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/TeXmacs/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -14,6 +14,12 @@ # freetype and TeXmacs-windows-fonts avoid depending on TeX which is a *huge* system BUILD_DEPENDS="xorg-libX11-dev gmp-dev guile-dev freetype-dev imlib2-dev" +current_version() +{ + wget -O - http://ftp.texmacs.org/pub/$PACKAGE/targz/ 2>/dev/null | \ + sed "/src.tar/!d;s|.*$PACKAGE-\\(.*\\).src.*\".*|\\1|" | sort -Vr | sed q +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f TiMidity++/receipt --- a/TiMidity++/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/TiMidity++/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -16,6 +16,12 @@ BUILD_DEPENDS="alsa-lib-dev flac-dev gtk+-dev jack-audio-connection-kit-dev \ libao-dev libogg-dev libvorbis-dev portaudio-dev xorg-libXaw3d-dev" +current_version() +{ + wget -O - $WEB_SITE/files/ 2>/dev/null | sed '/scope="row/!d;s|.*href="|"https://sourceforge.net|;q' | \ + xargs wget -O - 2>/dev/null | sed "/${PACKAGE}-/!d;s|.*${PACKAGE}-\\([0-9\\.]*\\)*\".*|\\1|" | sed '/^[0-9]/!d;q' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f Xdialog/receipt --- a/Xdialog/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/Xdialog/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -16,6 +16,11 @@ xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender" BUILD_DEPENDS="autoconf automake m4 gettext gtk+-dev" +current_version() +{ + wget -O - $WEB_SITE 2>/dev/null | \ + sed '/current release is/!d;s|.*v||;s|. .*||' +} # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f btrfs-progs/receipt --- a/btrfs-progs/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/btrfs-progs/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -18,6 +18,12 @@ lzo-dev py3k-dev util-linux-blkid-dev util-linux-uuid-dev zlib-dev zstd-dev" +current_version() +{ + wget -O - https://github.com/kdave/btrfs-progs/releases 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f glib/receipt --- a/glib/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/glib/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -8,24 +8,24 @@ LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="https://www.gtk.org/" -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" HOST_ARCH="i486 arm" DEPENDS="pcre libffi libxml2 elfutils" BUILD_DEPENDS="pcre-dev libffi-dev gettext zlib-dev perl python-dev \ elfutils-dev libxml2-dev libxml2-tools automake" -current_version() -{ - wget -O - $(dirname $WGET_URL) 2>/dev/null | sed '/LATEST/!d;s|.*IS-||;s|<.*||' -} - # Handle cross comilation. Use host Perl, Python, etc case "$ARCH" in arm*) BUILD_DEPENDS="pcre-dev libffi-dev zlib-dev elfutils-dev libxml2-dev" ;; esac +current_version() +{ + wget -O - $(dirname $WGET_URL) 2>/dev/null | sed '/LATEST/!d;s|.*IS-||;s|<.*||' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f kbd/receipt --- a/kbd/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/kbd/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -22,6 +22,12 @@ arm) BUILD_DEPENDS="check-dev flex" ;; esac +current_version() +{ + wget -O - https://github.com/legionus/kbd/releases 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f mtd-utils/receipt --- a/mtd-utils/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/mtd-utils/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -14,6 +14,12 @@ DEPENDS="lzo util-linux-uuid zlib" BUILD_DEPENDS="acl-dev file lzo-dev openssl-dev util-linux-uuid-dev zlib-dev" +current_version() +{ + wget -O - http://git.infradead.org/mtd-utils.git 2> /dev/null | \ + sed '/mtd-utils.git\/tag\//!d;s|.*mtd-utils-||;s|<.*||;q' +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f scrounge-ntfs/receipt --- a/scrounge-ntfs/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/scrounge-ntfs/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -13,6 +13,12 @@ DEPENDS="" BUILD_DEPENDS="" +current_version() +{ + wget -O - $(dirname $WGET_URL) 2>/dev/null | \ + sed "/tar.gz/!d;s|.*$PACKAGE-||;s|.tar.*||;q" +} + # Rules to configure and make the package. compile_rules() { diff -r 01737061adb0 -r a3b6dd3aac6f squashfs/receipt --- a/squashfs/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/squashfs/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="squashfs" -VERSION="4.4" +VERSION="4.5" CATEGORY="base-system" SHORT_DESC="Linux squashfs userland tools." MAINTAINER="pascal.bellard@slitaz.org" @@ -11,8 +11,8 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz" -DEPENDS="liblzma linux-squashfs lz4-lib lzo zlib" -BUILD_DEPENDS="attr-dev liblzma-dev lz4-dev lzo-dev zlib-dev" +DEPENDS="liblzma linux-squashfs lz4-lib lzo zlib zstd" +BUILD_DEPENDS="attr-dev liblzma-dev lz4-dev lzo-dev zlib-dev zstd-dev" current_version() { @@ -24,13 +24,9 @@ compile_rules() { cd $src/squashfs-tools - # 4.3 -# sed -i -e 's/int file_size/off_t file_size/' \ -# -e 's/source_path.index ++./strdup(&)/' mksquashfs.c -# sed -i -e 's/~S_IFMT/S_IFMT/' -e 's/MOVE_ACTION, -2/MOVE_ACTION, 1/' action.c sed -i -e 's/~S_IFMT/S_IFMT/' action.c - for i in XZ LZMA_XZ LZO LZ4 + for i in XZ LZMA_XZ LZO LZ4 ZSTD do sed -i "s|^#\\(${i}_SUPPORT = 1\\)|\\1|g" Makefile done @@ -51,7 +47,9 @@ cp -a $install/usr $fs cp -a $install/sbin $fs + ln -s mksquashfs $fs/usr/sbin/sqfstar + ln -s unsquashfs $fs/sbin/sqfscat cp $src/README* $install/usr/share/doc - cp $src/[CP]* $install/usr/share/doc -# cp $src/*example $install/usr/share/doc # 4.3 + cp $src/A*README* $install/usr/share/doc + cp $src/[CPU]* $install/usr/share/doc } diff -r 01737061adb0 -r a3b6dd3aac6f syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Sun Jul 18 13:15:53 2021 +0000 +++ b/syslinux/stuff/iso2exe/taziso Tue Jul 27 16:57:54 2021 +0000 @@ -1525,9 +1525,10 @@ n=1; i=0; r=0 set -- $len ls fd$$* | while read file ; do - if [ $i -gt $(($1+$base)) ]; then + if [ $i -ge $(($1+$base)) ]; then + base=$(($1+$base-$i)) shift - r=$(($r+100)); n=0; i=0; base=0 + r=$(($r+100)); n=0; i=0 fi ddq of=$file bs=18k seek=80 count=0 i=$(($i+1474560)) diff -r 01737061adb0 -r a3b6dd3aac6f testdisk/receipt --- a/testdisk/receipt Sun Jul 18 13:15:53 2021 +0000 +++ b/testdisk/receipt Tue Jul 27 16:57:54 2021 +0000 @@ -18,6 +18,12 @@ DEPENDS="e2fsprogs jpeg krb5 libcomerr3 ncurses ncursesw ntfs-3g ntfsprogs zlib" BUILD_DEPENDS="e2fsprogs-dev jpeg-dev ncurses-dev ntfs-3g-dev ntfsprogs-dev" +current_version() +{ + wget -O - $WEB_SITE 2>/dev/null | \ + sed '/Download/!d;/^||;s|