# HG changeset patch # User Aleksej Bobylev # Date 1510748492 -7200 # Node ID fbd490ef13ef145315ea2c9f54b4bd08306bf7c3 # Parent de370e2d85416f90dd9c4f8f4aa80f9ded04b2b8 Up exosip, httpfs-fuse, libvncserver, upx; add upx391 (for httpfs-fuse) diff -r de370e2d8541 -r fbd490ef13ef exosip-dev/receipt --- a/exosip-dev/receipt Wed Nov 15 06:36:18 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="exosip-dev" -VERSION="3.6.0" -CATEGORY="development" -SHORT_DESC="extended SIP development library." -MAINTAINER="pascal.bellard@slitaz.org" -LICENSE="GPL2" -WEB_SITE="http://savannah.nongnu.org/projects/exosip/" -WANTED="exosip" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib $fs/usr - rm -rf $fs/usr/lib/*.so* -} diff -r de370e2d8541 -r fbd490ef13ef exosip/receipt --- a/exosip/receipt Wed Nov 15 06:36:18 2017 +0200 +++ b/exosip/receipt Wed Nov 15 14:21:32 2017 +0200 @@ -1,32 +1,32 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="exosip" VERSION="3.6.0" CATEGORY="network" -SHORT_DESC="extended SIP library." +SHORT_DESC="Extended Open SIP library" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -SOURCE="libeXosip2" -TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://savannah.nongnu.org/projects/exosip/" + +TARBALL="libeXosip2-$VERSION.tar.gz" WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL" -DEPENDS="osip openssl" -BUILD_DEPENDS="osip-dev openssl-dev" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS && - make && - make DESTDIR=$DESTDIR install +BUILD_DEPENDS="c-ares-dev osip-dev openssl-dev" +SPLIT="exosip-dev" + +compile_rules() { + ./configure $CONFIGURE_ARGS && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib +genpkg_rules() { + case $PACKAGE in + exosip) + copy @std + DEPENDS="c-ares libcrypto libssl osip" + ;; + *-dev) + copy @dev + DEPENDS="exosip c-ares-dev openssl-dev osip-dev" + ;; + esac } diff -r de370e2d8541 -r fbd490ef13ef httpfs-fuse-static/receipt --- a/httpfs-fuse-static/receipt Wed Nov 15 06:36:18 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="httpfs-fuse-static" -VERSION="2.06.08.26" -CATEGORY="system-tools" -SHORT_DESC="HTTP Filesystem implemented with FUSE." -MAINTAINER="pascal.bellard@slitaz.org" -LICENSE="GPL" -WEB_SITE="http://httpfs.sourceforge.net/" -WANTED="httpfs-fuse" -TAGS="filesystem" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr - cp -a $WOK/$WANTED/install/usr/share $fs/usr -} diff -r de370e2d8541 -r fbd490ef13ef httpfs-fuse/receipt --- a/httpfs-fuse/receipt Wed Nov 15 06:36:18 2017 +0200 +++ b/httpfs-fuse/receipt Wed Nov 15 14:21:32 2017 +0200 @@ -1,43 +1,46 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="httpfs-fuse" VERSION="2.06.08.26" CATEGORY="system-tools" -SHORT_DESC="HTTP Filesystem implemented with FUSE." +SHORT_DESC="HTTP Filesystem implemented with FUSE" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -SOURCE="httpfs_with_static_binaries" -TARBALL="${SOURCE}_$VERSION.tar.gz" WEB_SITE="http://httpfs.sourceforge.net/" + +TARBALL="httpfs_with_static_binaries_$VERSION.tar.gz" WGET_URL="$SF_MIRROR/httpfs/$TARBALL" -TAGS="filesystem" -DEPENDS="fuse" -BUILD_DEPENDS="fuse-dev upx" +BUILD_DEPENDS="fuse-dev upx391" +SPLIT="httpfs-fuse-static" -# Rules to configure and make the package. -compile_rules() -{ - patch -p0 < $stuff/httpfs.u - mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/boot - # keep uclibc prebuilt. Glibc version is 10x bigger ! +compile_rules() { + mkdir -p $install/usr/bin $install/usr/share/boot + # keep uclibc prebuilt. Glibc version is 10x bigger! if true; then - install -m 755 static_uclibc/httpfs $DESTDIR/usr/share/boot/httpfs-static - upx -d $DESTDIR/usr/share/boot/httpfs-static + install -m 755 static_uclibc/httpfs $install/usr/share/boot/httpfs-static + upx -d $install/usr/share/boot/httpfs-static else sed 's/lpthread/& -ldl -lrt/' static_uclibc/make_httpfs | sh - cp -a httpfs $DESTDIR/usr/share/boot/httpfs-static + cp -a httpfs $install/usr/share/boot/httpfs-static fi - . ./make_httpfs && cp -a httpfs $DESTDIR/usr/bin - install -m 755 static_uclibc/fusermount $DESTDIR/usr/share/boot/fusermount-static - upx -d $DESTDIR/usr/share/boot/fusermount-static - chmod 4755 $DESTDIR/usr/share/boot/fusermount-static - chmod 555 $DESTDIR/usr/share/boot/httpfs-static + . ./make_httpfs && cp -a httpfs $install/usr/bin + install -m 755 static_uclibc/fusermount $install/usr/share/boot/fusermount-static + upx -d $install/usr/share/boot/fusermount-static + chmod 4755 $install/usr/share/boot/fusermount-static + chmod 555 $install/usr/share/boot/httpfs-static } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr +genpkg_rules() { + case $PACKAGE in + httpfs-fuse) + copy /usr/bin/ + DEPENDS="fuse" + ;; + httpfs-fuse-static) + copy /usr/share/ + CAT="system-tools|static files" + ;; + esac + TAGS="filesystem" } diff -r de370e2d8541 -r fbd490ef13ef httpfs-fuse/stuff/httpfs.u --- a/httpfs-fuse/stuff/httpfs.u Wed Nov 15 06:36:18 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ ---- httpfs.c -+++ httpfs.c -@@ -313,6 +313,7 @@ - struct timeval timeout; - int bytes, status; - -+moved: - #ifdef USE_SSL - if (protocol == PROTO_HTTPS) { - /* Make SSL connection. */ -@@ -371,6 +372,27 @@ - #endif - - (void) sscanf(buf, "HTTP/1.1 %d ", &status); -+ if (status == 301 || status == 302) { -+ static int movedcnt = 0; -+ b = strstr(buf,"Location:"); -+ if (b != NULL && ++movedcnt < 5) { -+ char *eol = strchr(b, '\r'); -+ b = strstr(b,"http"); -+ if (eol == NULL || b == NULL) -+ goto notmoved; -+ *eol = 0; -+ fprintf(stderr, "%s: HEAD (read) Status %d moved to %s\n", -+ argv0, status, b); -+ protocol = parseURL(b, host, &file_name, &port); -+ if (protocol == -1) -+ goto notmoved; -+ close(sockfd); -+ sockfd = open_client_socket(host, port); -+ if (sockfd >= 0) -+ goto moved; -+ } -+ } -+notmoved: - if (status != 200) { - fprintf(stderr, "%s: HEAD (read) failed with Status %d\n", argv0, status); - return -1; -@@ -892,6 +914,7 @@ - struct stat mpstat; - int sr; - char* ri; -+ char* s; - char* fusev[4]; - - argv0 = argv[0]; -@@ -911,6 +934,14 @@ - if (sockfd < 0) - return 1; - -+ s = httpfs_path; -+ ri = rindex(file_name, '/'); -+ if (ri == (char *) 0) { -+ ri = file_name; -+ *s++ = '/'; -+ } -+ strcpy(s, ri); -+ - if (getSize() != 0) - return 1; - -@@ -930,13 +961,6 @@ - return 1; - } - -- ri = rindex(file_name, '/'); -- if (ri == (char *) 0) { -- httpfs_path[0] = '/'; -- strcpy(&httpfs_path[1], file_name); -- } else -- strcpy(httpfs_path, ri); -- - fusev[0] = argv0; - fusev[1] = "-o"; - fusev[2] = "nonempty"; diff -r de370e2d8541 -r fbd490ef13ef httpfs-fuse/stuff/patches/httpfs.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpfs-fuse/stuff/patches/httpfs.u Wed Nov 15 14:21:32 2017 +0200 @@ -0,0 +1,75 @@ +--- httpfs.c ++++ httpfs.c +@@ -313,6 +313,7 @@ + struct timeval timeout; + int bytes, status; + ++moved: + #ifdef USE_SSL + if (protocol == PROTO_HTTPS) { + /* Make SSL connection. */ +@@ -371,6 +372,27 @@ + #endif + + (void) sscanf(buf, "HTTP/1.1 %d ", &status); ++ if (status == 301 || status == 302) { ++ static int movedcnt = 0; ++ b = strstr(buf,"Location:"); ++ if (b != NULL && ++movedcnt < 5) { ++ char *eol = strchr(b, '\r'); ++ b = strstr(b,"http"); ++ if (eol == NULL || b == NULL) ++ goto notmoved; ++ *eol = 0; ++ fprintf(stderr, "%s: HEAD (read) Status %d moved to %s\n", ++ argv0, status, b); ++ protocol = parseURL(b, host, &file_name, &port); ++ if (protocol == -1) ++ goto notmoved; ++ close(sockfd); ++ sockfd = open_client_socket(host, port); ++ if (sockfd >= 0) ++ goto moved; ++ } ++ } ++notmoved: + if (status != 200) { + fprintf(stderr, "%s: HEAD (read) failed with Status %d\n", argv0, status); + return -1; +@@ -892,6 +914,7 @@ + struct stat mpstat; + int sr; + char* ri; ++ char* s; + char* fusev[4]; + + argv0 = argv[0]; +@@ -911,6 +934,14 @@ + if (sockfd < 0) + return 1; + ++ s = httpfs_path; ++ ri = rindex(file_name, '/'); ++ if (ri == (char *) 0) { ++ ri = file_name; ++ *s++ = '/'; ++ } ++ strcpy(s, ri); ++ + if (getSize() != 0) + return 1; + +@@ -930,13 +961,6 @@ + return 1; + } + +- ri = rindex(file_name, '/'); +- if (ri == (char *) 0) { +- httpfs_path[0] = '/'; +- strcpy(&httpfs_path[1], file_name); +- } else +- strcpy(httpfs_path, ri); +- + fusev[0] = argv0; + fusev[1] = "-o"; + fusev[2] = "nonempty"; diff -r de370e2d8541 -r fbd490ef13ef httpfs-fuse/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpfs-fuse/stuff/patches/series Wed Nov 15 14:21:32 2017 +0200 @@ -0,0 +1,1 @@ +-p0|httpfs.u diff -r de370e2d8541 -r fbd490ef13ef libvncserver-dev/receipt --- a/libvncserver-dev/receipt Wed Nov 15 06:36:18 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="libvncserver-dev" -VERSION="0.9.9" -CATEGORY="development" -SHORT_DESC="devel files for libvncserver" -MAINTAINER="slaxemulator@gmail.com" -LICENSE="GPL2" -WEB_SITE="http://libvncserver.sourceforge.net/" -WANTED="libvncserver" -SOURCE="LibVNCServer" - -DEPENDS="libvncserver pkg-config" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib -} - diff -r de370e2d8541 -r fbd490ef13ef libvncserver/receipt --- a/libvncserver/receipt Wed Nov 15 06:36:18 2017 +0200 +++ b/libvncserver/receipt Wed Nov 15 14:21:32 2017 +0200 @@ -1,33 +1,43 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="libvncserver" -VERSION="0.9.9" +VERSION="0.9.11" CATEGORY="network" -SHORT_DESC="The vnc library" +SHORT_DESC="VNC library" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" -SOURCE="LibVNCServer" -TARBALL="$SOURCE-$VERSION.tar.gz" -WEB_SITE="http://libvncserver.sourceforge.net/" -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" +WEB_SITE="http://libvnc.github.io/" -DEPENDS="jpeg zlib libssl" -BUILD_DEPENDS="jpeg-dev zlib openssl-dev" +TARBALL="LibVNCServer-$VERSION.tar.gz" +WGET_URL="https://github.com/LibVNC/libvncserver/archive/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - ./configure \ - $CONFIGURE_ARGS && - make && make install +BUILD_DEPENDS="automake libtool openssl-dev libjpeg-turbo-dev libpng16-dev" +SPLIT="libvncserver-novnc libvncserver-dev" + +compile_rules() { + ./autogen.sh $CONFIGURE_ARGS && + make && make install || return 1 + + mkdir -p $install/var/www + cp -r webclients/novnc $install/var/www } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib +genpkg_rules() { + case $PACKAGE in + libvncserver) + copy *.so* + DEPENDS="libcrypto libjpeg-turbo libpng16 libssl zlib" + ;; + libvncserver-novnc) + copy novnc/ + CAT="network|noVNC web client" + DEPENDS=" " + ;; + *-dev) + copy @dev + rm -r $fs/var # it includes 'include/' too and false recognized as dev files + DEPENDS="libvncserver libjpeg-turbo-dev libpng16-dev openssl-dev \ + zlib-dev" + ;; + esac } - diff -r de370e2d8541 -r fbd490ef13ef upx/receipt --- a/upx/receipt Wed Nov 15 06:36:18 2017 +0200 +++ b/upx/receipt Wed Nov 15 14:21:32 2017 +0200 @@ -1,7 +1,7 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="upx" -VERSION="3.93" +VERSION="3.94" CATEGORY="system-tools" SHORT_DESC="Ultimate Packer for eXecutables (free version using UCL compression)" MAINTAINER="devl547@gmail.com" @@ -13,19 +13,16 @@ TARBALL2="upx-lzma-sdk-$VERSION.tar.gz" WGET_URL2="https://github.com/upx/upx-lzma-sdk/archive/v$VERSION.tar.gz" -DEPENDS="ucl zlib" BUILD_DEPENDS="ucl-dev zlib-dev perl" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { [ -s $SOURCES_REPOSITORY/$TARBALL2 ] || wget -O $SOURCES_REPOSITORY/$TARBALL2 $WGET_URL2 tar -xf $SOURCES_REPOSITORY/$TARBALL2 rm -r $src/src/lzma-sdk mv $src/$(basename $TARBALL2 .tar.gz) $src/src/lzma-sdk - make CHECK_WHITESPACE=/bin/true all + make CHECK_WHITESPACE=/bin/true all || return 1 mkdir -p $install/usr/bin $install/usr/share/man/man1 cp -a $src/src/upx.out $install/usr/bin/upx @@ -34,8 +31,7 @@ mv $install/usr/share/doc/upx.1 $install/usr/share/man/man1 } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { copy upx + DEPENDS="ucl zlib" } diff -r de370e2d8541 -r fbd490ef13ef upx391/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upx391/receipt Wed Nov 15 14:21:32 2017 +0200 @@ -0,0 +1,41 @@ +# SliTaz package receipt v2. + +# Note. While the latest UPX works as expected, it can't decompress some +# executables packed with UPX-1.25 and shipped with the package httpfs-fuse. +# Error message produced with the UPX 3.92-3.94: +# upx: : Exception: compressed data violation + +PACKAGE="upx391" +VERSION="3.91" +CATEGORY="system-tools" +SHORT_DESC="Ultimate Packer for eXecutables (free version using UCL compression)" +MAINTAINER="devl547@gmail.com" +LICENSE="GPL2" +WEB_SITE="https://upx.github.io/" + +TARBALL="upx-$VERSION.tar.gz" +WGET_URL="https://github.com/upx/upx/archive/v$VERSION.tar.gz" +WGET_URL2="http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2" + +BUILD_DEPENDS="ucl-dev zlib-dev perl" + +compile_rules() { + TARBALL2="$(basename $WGET_URL2)" + SRC2="$SOURCES_REPOSITORY/$TARBALL2" + [ -s "$SRC2" ] || wget -O "$SRC2" "$WGET_URL2" + tar -xf "$SRC2" + + CXXFLAGS="$CXXFLAGS -DWITH_ZLIB=1 -Wno-error=misleading-indentation" + UPX_LZMADIR=$src make all || return 1 + + mkdir -p $install/usr/bin $install/usr/share/man/man1 + cp -a $src/src/upx.out $install/usr/bin/upx + cp -a $src/doc $install/usr/share + rm $install/usr/share/doc/Makefile + mv $install/usr/share/doc/upx.1 $install/usr/share/man/man1 +} + +genpkg_rules() { + copy upx + DEPENDS="ucl zlib" +}