# HG changeset patch # User Pascal Bellard # Date 1549643625 -3600 # Node ID 4c206553708a690718687f3ca31f3dc4d11b7a72 # Parent 24a8f373c227876c52fa72f5d553b18bac0380e5 Update some WEB_SITE diff -r 24a8f373c227 -r 4c206553708a corkscrew/receipt --- a/corkscrew/receipt Fri Feb 08 16:54:23 2019 +0100 +++ b/corkscrew/receipt Fri Feb 08 17:33:45 2019 +0100 @@ -6,17 +6,18 @@ SHORT_DESC="tool for tunneling ssh through proxies" MAINTAINER="allan316@gmail.com" LICENSE="GPL2" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.agroman.net/corkscrew" -WGET_URL="$WEB_SITE/$TARBALL" -TAGS="ssh" +TARBALL="$PACKAGE-git-$VERSION.tar.gz" +WEB_SITE="https://github.com/bryanpkc/corkscrew" +WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz" +TAGS="ssh https proxy" DEPENDS="openssh" +BUILD_DEPENDS="automake" # Rules to configure and make the package. compile_rules() { - cd $src + autoreconf --install ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ @@ -28,7 +29,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr + mkdir -p $fs/usr $install/usr/share/doc cp -a $install/usr/bin $fs/usr + cp $src/README $src/TODO $install/usr/share/doc } - diff -r 24a8f373c227 -r 4c206553708a encfs/receipt --- a/encfs/receipt Fri Feb 08 16:54:23 2019 +0100 +++ b/encfs/receipt Fri Feb 08 17:33:45 2019 +0100 @@ -7,7 +7,7 @@ MAINTAINER="b1+slitaz@nagel.org" LICENSE="GPL3" TARBALL="$PACKAGE-$VERSION.tgz" -WEB_SITE="http://www.arg0.net/encfs" +WEB_SITE="https://www.arg0.net/encfs" WGET_URL="http://encfs.googlecode.com/files/$TARBALL" TAGS="filesystem" diff -r 24a8f373c227 -r 4c206553708a python-pyparsing/receipt --- a/python-pyparsing/receipt Fri Feb 08 16:54:23 2019 +0100 +++ b/python-pyparsing/receipt Fri Feb 08 17:33:45 2019 +0100 @@ -7,7 +7,7 @@ SHORT_DESC="Python parsing module" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="MIT" -WEB_SITE="http://pyparsing.wikispaces.com/" +WEB_SITE="https://pyparsing.wikispaces.com/" TARBALL="$SOURCE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL" diff -r 24a8f373c227 -r 4c206553708a rlog-dev/receipt --- a/rlog-dev/receipt Fri Feb 08 16:54:23 2019 +0100 +++ b/rlog-dev/receipt Fri Feb 08 17:33:45 2019 +0100 @@ -7,7 +7,7 @@ MAINTAINER="b1+slitaz@nagel.org" LICENSE="LGPL2.1" WANTED="rlog" -WEB_SITE="http://www.arg0.net/rlog" +WEB_SITE="https://www.arg0.net/rlog" DEPENDS="pkg-config" diff -r 24a8f373c227 -r 4c206553708a rlog/receipt --- a/rlog/receipt Fri Feb 08 16:54:23 2019 +0100 +++ b/rlog/receipt Fri Feb 08 17:33:45 2019 +0100 @@ -7,7 +7,7 @@ MAINTAINER="b1+slitaz@nagel.org" LICENSE="LGPL2.1" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.arg0.net/rlog" +WEB_SITE="https://www.arg0.net/rlog" WGET_URL="http://rlog.googlecode.com/files/$TARBALL" TAGS="C++ log" diff -r 24a8f373c227 -r 4c206553708a shellinabox/receipt --- a/shellinabox/receipt Fri Feb 08 16:54:23 2019 +0100 +++ b/shellinabox/receipt Fri Feb 08 17:33:45 2019 +0100 @@ -7,9 +7,8 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://$PACKAGE.googlecode.com/" -WGET_URL="${WEB_SITE}files/$TARBALL" -WGET_URL="https://github.com/shellinabox/shellinabox/archive/v$VERSION.tar.gz" +WEB_SITE="https://github.com/shellinabox/shellinabox" +WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz" TAGS="web-application" DEPENDS="zlib" diff -r 24a8f373c227 -r 4c206553708a syslinux/stuff/iso2exe/iso2exe.sh --- a/syslinux/stuff/iso2exe/iso2exe.sh Fri Feb 08 16:54:23 2019 +0100 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Fri Feb 08 17:33:45 2019 +0100 @@ -173,7 +173,9 @@ tazboot.com) OFFSET=$(($(get 64 "$ISO") - 0xC0)) SIZE=$(($stub - $(get 24 "$ISO") - $OFFSET));; dosstub) OFFSET=$stub; SIZE=$((0x7FF0 - $OFFSET));; - boot.md5) OFFSET=$((0x7FF0)); SIZE=16;; + boot.md5) [ $(get 0 "$ISO") -eq 23117 ] && + [ $(get 18 "$ISO") -ne 0 ] && + OFFSET=$((0x7FF0)) && SIZE=16;; fs.iso) OFFSET=$((0x8000)) SIZE=$((2048*$c - $OFFSET));; custom.magic) ddq bs=2k skip=$c if="$ISO" | ddq bs=1 count=6 | \ diff -r 24a8f373c227 -r 4c206553708a syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Fri Feb 08 16:54:23 2019 +0100 +++ b/syslinux/stuff/iso2exe/taziso Fri Feb 08 17:33:45 2019 +0100 @@ -1096,13 +1096,14 @@ { [ $(get 1024 "$ISO") -eq 35615 ] && n=2 || n=$((1+$(get 417 "$ISO" 1))) [ $n -eq 4 ] && n=20 + [ $(get $(($n*512)) "$ISO") -eq 35615 ] || n=13 ddq if="$ISO" bs=512 skip=$n count=20 | zcat 2>/dev/null } hasflavinfo() { - [ "$(flavdata | ddq bs=1 count=8 | strings)" == \ - "07070100" ] && menuitem "$@" + [ "$(flavdata | ddq bs=1 count=7 | strings)" == \ + "0707010" ] && menuitem "$@" } showfavinfo() @@ -1404,9 +1405,9 @@ $(cdexe 'memtest*' "memtest" "Get Memtest86 DOS/EXE file") \ $(cdfilef 'memtest*' "fdmemtest" "Create a Memtest86 boot floppy") \ $(cdfilex 'memtest*' "runmemtest" "Start Memtest86") \ -$(cdexe '?pxe' "pxe" "Get SliTaz Web boot DOS/EXE utility") \ -$(cdfilef '?pxe' "fdpxe" "Create a SliTaz Web boot floppy") \ -$(cdfilex '?pxe' "runpxe" "Start the SliTaz Web boot utility") \ +$(cdexe '?pxe*' "pxe" "Get SliTaz Web boot DOS/EXE utility") \ +$(cdfilef '?pxe*' "fdpxe" "Create a SliTaz Web boot floppy") \ +$(cdfilex '?pxe*' "runpxe" "Start the SliTaz Web boot utility") \ $(misspkg "missing" "Install packages to get more options") \ $(menuitem "quit" "Quit this utility") EOT