wok-next rev 20472
Add new LFS packages meson, ninja; py3k -> python3; gcc49, gcc54, gcc61: fix $ARCH_ARGS, --disable-multilib; misc. unsuccessful patches...
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Mar 10 13:48:53 2018 +0200 (2018-03-10) |
| parents | 0a97a00fbc28 |
| children | e1c0edabdcb2 |
| files | cacerts/receipt clamav/receipt file/receipt gcc49/receipt gcc54/receipt gcc61/receipt intel-microcode/receipt libmodplug/receipt libpng12/receipt meson/description.txt meson/receipt meson/stuff/meson-wrapper ninja/receipt ninja/stuff/patches/ninja-1.8.2-add_NINJAJOBS_var-1.patch ninja/stuff/patches/series p910nd/description.txt py3k/receipt python3/receipt qt5/stuff/patches/series qt5/stuff/patches/std.patch sshfs-fuse/receipt sshttp/description.txt |
line diff
1.1 --- a/cacerts/receipt Thu Mar 08 23:29:32 2018 +0200 1.2 +++ b/cacerts/receipt Sat Mar 10 13:48:53 2018 +0200 1.3 @@ -2,7 +2,7 @@ 1.4 1.5 # This receipt will follow actual version on each recook 1.6 PACKAGE="cacerts" 1.7 -VERSION="20180212" 1.8 +VERSION="20180309" 1.9 CATEGORY="security" 1.10 SHORT_DESC="Certificate Authority Certificates" 1.11 MAINTAINER="al.bobylev@gmail.com"
2.1 --- a/clamav/receipt Thu Mar 08 23:29:32 2018 +0200 2.2 +++ b/clamav/receipt Sat Mar 10 13:48:53 2018 +0200 2.3 @@ -1,17 +1,18 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="clamav" 2.7 -VERSION="0.98.1" 2.8 +VERSION="0.99.4" 2.9 CATEGORY="security" 2.10 -SHORT_DESC="Antivirus." 2.11 +SHORT_DESC="Antivirus" 2.12 MAINTAINER="paul@slitaz.org" 2.13 LICENSE="GPL2" 2.14 -WEB_SITE="http://www.clamav.net/" 2.15 +WEB_SITE="https://www.clamav.net/" 2.16 2.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.18 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 2.19 +WGET_URL="https://www.clamav.net/downloads/production/$TARBALL" 2.20 2.21 -BUILD_DEPENDS="zlib-dev gmp gmp-dev bzip2-dev ncurses-dev bash" 2.22 +BUILD_DEPENDS="zlib-dev gmp gmp-dev bzip2-dev ncurses-dev bash \ 2.23 +libxml2-dev openssl-dev" 2.24 SPLIT="clamav-dev" 2.25 2.26 compile_rules() {
3.1 --- a/file/receipt Thu Mar 08 23:29:32 2018 +0200 3.2 +++ b/file/receipt Sat Mar 10 13:48:53 2018 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="file" 3.7 -VERSION="5.31" 3.8 +VERSION="5.32" 3.9 CATEGORY="system-tools" 3.10 SHORT_DESC="Determines file type using 'magic' numbers" 3.11 MAINTAINER="erjo@slitaz.org"
4.1 --- a/gcc49/receipt Thu Mar 08 23:29:32 2018 +0200 4.2 +++ b/gcc49/receipt Sat Mar 10 13:48:53 2018 +0200 4.3 @@ -19,7 +19,11 @@ 4.4 SPLIT="gcc49-lib-base" 4.5 4.6 compile_rules() { 4.7 - ARCH_ARGS="--with-tune=$ARCH" 4.8 + case $ARCH in 4.9 + arm*) ARCH_ARGS="--with-tune=armv6";; 4.10 + i?86) ARCH_ARGS="--with-tune=$ARCH";; 4.11 + x86_64) ARCH_ARGS="--with-tune=nocona";; 4.12 + esac 4.13 pkgversion="SliTaz" 4.14 languages="c,c++" 4.15 4.16 @@ -30,7 +34,8 @@ 4.17 4.18 sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in 4.19 4.20 - mkdir -p ../gcc-build && cd ../gcc-build 4.21 + mkdir build 4.22 + cd build 4.23 4.24 $src/configure \ 4.25 --libexecdir=/usr/lib \ 4.26 @@ -47,7 +52,9 @@ 4.27 --program-suffix=-49 \ 4.28 --libdir=/usr/libgcc49 \ 4.29 --with-pkgversion="$pkgversion" \ 4.30 - ${CONFIGURE_ARGS} ${ARCH_ARGS} && 4.31 + --disable-multilib \ 4.32 + $ARCH_ARGS \ 4.33 + $CONFIGURE_ARGS && 4.34 make && make install 4.35 } 4.36
5.1 --- a/gcc54/receipt Thu Mar 08 23:29:32 2018 +0200 5.2 +++ b/gcc54/receipt Sat Mar 10 13:48:53 2018 +0200 5.3 @@ -18,7 +18,12 @@ 5.4 SPLIT="gcc54-lib-base" 5.5 5.6 compile_rules() { 5.7 - ARCH_ARGS="--with-tune=$ARCH" 5.8 + case $ARCH in 5.9 + arm*) ARCH_ARGS="--with-tune=armv6";; 5.10 + i?86) ARCH_ARGS="--with-tune=$ARCH";; 5.11 + x86_64) ARCH_ARGS="--with-tune=nocona";; 5.12 + esac 5.13 + 5.14 pkgversion="SliTaz" 5.15 languages="c,c++" 5.16 5.17 @@ -44,7 +49,9 @@ 5.18 --program-suffix=-54 \ 5.19 --libdir=/usr/libgcc54 \ 5.20 --with-pkgversion="$pkgversion" \ 5.21 - ${CONFIGURE_ARGS} ${ARCH_ARGS} && 5.22 + --disable-multilib \ 5.23 + $ARCH_ARGS \ 5.24 + $CONFIGURE_ARGS && 5.25 make && make install 5.26 } 5.27
6.1 --- a/gcc61/receipt Thu Mar 08 23:29:32 2018 +0200 6.2 +++ b/gcc61/receipt Sat Mar 10 13:48:53 2018 +0200 6.3 @@ -18,7 +18,12 @@ 6.4 SPLIT="gcc61-lib-base" 6.5 6.6 compile_rules() { 6.7 - ARCH_ARGS="--with-tune=$ARCH" 6.8 + case $ARCH in 6.9 + arm*) ARCH_ARGS="--with-tune=armv6";; 6.10 + i?86) ARCH_ARGS="--with-tune=$ARCH";; 6.11 + x86_64) ARCH_ARGS="--with-tune=nocona";; 6.12 + esac 6.13 + 6.14 pkgversion="SliTaz" 6.15 languages="c,c++" 6.16 6.17 @@ -44,7 +49,9 @@ 6.18 --program-suffix=-61 \ 6.19 --libdir=/usr/libgcc61 \ 6.20 --with-pkgversion="$pkgversion" \ 6.21 - ${CONFIGURE_ARGS} ${ARCH_ARGS} && 6.22 + --disable-multilib \ 6.23 + $ARCH_ARGS \ 6.24 + $CONFIGURE_ARGS && 6.25 make && make install 6.26 } 6.27
7.1 --- a/intel-microcode/receipt Thu Mar 08 23:29:32 2018 +0200 7.2 +++ b/intel-microcode/receipt Sat Mar 10 13:48:53 2018 +0200 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="intel-microcode" 7.7 -VERSION="20180108" # version hidden by Intel, redirected to -> 20171117 7.8 +VERSION="20171117" 7.9 CATEGORY="kernel" 7.10 SHORT_DESC="Intel processor microcode update for Linux" 7.11 MAINTAINER="al.bobylev@gmail.com" 7.12 @@ -12,9 +12,9 @@ 7.13 # https://www.kernel.org/doc/Documentation/x86/early-microcode.txt 7.14 # http://linuxfromscratch.org/blfs/view/svn/postlfs/firmware.html#early-microcode 7.15 7.16 -TARBALL="$PACKAGE-$VERSION.tar.gz" 7.17 -WGET_URL="https://downloadmirror.intel.com/27431/eng/microcode-$VERSION.tgz" 7.18 -TARBALL_SHA1="2392dcf585a9d6313cd00d8b21cb2f54ae1d8ce3" 7.19 +TARBALL="$PACKAGE-$VERSION.tgz" 7.20 +WGET_URL="https://downloadmirror.intel.com/27337/eng/microcode-$VERSION.tgz" 7.21 +TARBALL_MD5="b294245d1f7f6c20f01edba53185f258" 7.22 SPLIT="intel-microcode-initrd" 7.23 7.24 compile_rules() { 7.25 @@ -57,9 +57,13 @@ 7.26 post_install_intel_microcode_initrd() { 7.27 if [ -n "$quiet" ]; then 7.28 cat <<EOT 7.29 -In order to update the Intel CPU microcode on boot, add the file 7.30 - /boot/intel-ucode.img 7.31 -as the first initrd to your bootloader. 7.32 + 7.33 + .------------------------------------------------------------------. 7.34 + | In order to update the Intel CPU microcode on boot, add the file | 7.35 + | /boot/intel-ucode.img | 7.36 + | as the first initrd to your bootloader. | 7.37 + '------------------------------------------------------------------' 7.38 + 7.39 EOT 7.40 fi 7.41 }
8.1 --- a/libmodplug/receipt Thu Mar 08 23:29:32 2018 +0200 8.2 +++ b/libmodplug/receipt Sat Mar 10 13:48:53 2018 +0200 8.3 @@ -13,15 +13,11 @@ 8.4 8.5 SPLIT="libmodplug-dev" 8.6 8.7 -# Rules to configure and make the package. 8.8 -compile_rules() 8.9 -{ 8.10 +compile_rules() { 8.11 ./configure $CONFIGURE_ARGS && make && make install 8.12 } 8.13 8.14 -# Rules to gen a SliTaz package suitable for Tazpkg. 8.15 -genpkg_rules() 8.16 -{ 8.17 +genpkg_rules() { 8.18 case $PACKAGE in 8.19 libmodplug) copy @std;; 8.20 *-dev) copy @dev;;
9.1 --- a/libpng12/receipt Thu Mar 08 23:29:32 2018 +0200 9.2 +++ b/libpng12/receipt Sat Mar 10 13:48:53 2018 +0200 9.3 @@ -8,7 +8,7 @@ 9.4 LICENSE="zlib/libpng" 9.5 WEB_SITE="http://www.libpng.org/pub/png/libpng.html" 9.6 9.7 -TARBALL="libpng-$VERSION.tar.xz" 9.8 +TARBALL="libpng-$VERSION.tar.gz" 9.9 WGET_URL="$SF_MIRROR/libpng/$TARBALL" 9.10 9.11 PATCH="libpng-$VERSION-apng.patch.gz"
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/meson/description.txt Sat Mar 10 13:48:53 2018 +0200 10.3 @@ -0,0 +1,4 @@ 10.4 +Meson is a cross-platform build system designed to be both as fast and as user 10.5 +friendly as possible. It supports many languages and compilers, including GCC, 10.6 +Clang and Visual Studio. Its build definitions are written in a simple 10.7 +non-turing complete DSL.
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/meson/receipt Sat Mar 10 13:48:53 2018 +0200 11.3 @@ -0,0 +1,27 @@ 11.4 +# SliTaz package receipt v2. 11.5 + 11.6 +PACKAGE="meson" 11.7 +VERSION="0.44.0" 11.8 +CATEGORY="development" 11.9 +SHORT_DESC="A high performance build system" 11.10 +MAINTAINER="al.bobylev@gmail.com" 11.11 +LICENSE="Apache" 11.12 +WEB_SITE="http://mesonbuild.com/" 11.13 +LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/meson.html" 11.14 + 11.15 +TARBALL="$PACKAGE-$VERSION.tar.gz" 11.16 +WGET_URL="https://github.com/mesonbuild/meson/releases/download/$VERSION/$TARBALL" 11.17 + 11.18 +BUILD_DEPENDS="python3" 11.19 + 11.20 +compile_rules() { 11.21 + python3 setup.py install --root=$install --optimize=0 || return 1 11.22 + 11.23 + install -m755 $stuff/meson-wrapper $install/usr/bin/ 11.24 +} 11.25 + 11.26 +genpkg_rules() { 11.27 + copy @std 11.28 + DEPENDS="python3" 11.29 + TAGS="LFS" 11.30 +}
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/meson/stuff/meson-wrapper Sat Mar 10 13:48:53 2018 +0200 12.3 @@ -0,0 +1,21 @@ 12.4 +#!/bin/sh -ex 12.5 +# Meson wrapper for SliTaz Linux packaging 12.6 + 12.7 +exec meson setup \ 12.8 + --prefix /usr \ 12.9 + --libdir /usr/lib \ 12.10 + --libexecdir /usr/lib \ 12.11 + --bindir /usr/bin \ 12.12 + --sbindir /usr/bin \ 12.13 + --includedir /usr/include \ 12.14 + --datadir /usr/share \ 12.15 + --mandir /usr/share/man \ 12.16 + --infodir /usr/share/info \ 12.17 + --localedir /usr/share/locale \ 12.18 + --sysconfdir /etc \ 12.19 + --localstatedir /var \ 12.20 + --sharedstatedir /var/lib \ 12.21 + --buildtype release \ 12.22 + --wrap-mode nofallback \ 12.23 + "$@" \ 12.24 + -D b_lto=true
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/ninja/receipt Sat Mar 10 13:48:53 2018 +0200 13.3 @@ -0,0 +1,31 @@ 13.4 +# SliTaz package receipt v2. 13.5 + 13.6 +PACKAGE="ninja" 13.7 +VERSION="1.8.2" 13.8 +CATEGORY="development" 13.9 +SHORT_DESC="Small build system with a focus on speed" 13.10 +MAINTAINER="al.bobylev@gmail.com" 13.11 +LICENSE="Apache" 13.12 +WEB_SITE="https://ninja-build.org/" 13.13 +LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/ninja.html" 13.14 + 13.15 +TARBALL="$PACKAGE-$VERSION.tar.gz" 13.16 +WGET_URL="https://github.com/ninja-build/ninja/archive/v$VERSION/$TARBALL" 13.17 + 13.18 +BUILD_DEPENDS="python" 13.19 + 13.20 +compile_rules() { 13.21 + export NINJAJOBS=4 # Should be OK for our 6x Intel(R) Xeon(R) CPU W3530 @ 2.8GHz 13.22 + 13.23 + python configure.py --bootstrap || return 1 13.24 + 13.25 + install -Dm755 ninja $install/usr/bin/ninja 13.26 + install -Dm644 misc/bash-completion $install/usr/share/bash-completion/completions/ninja 13.27 + install -Dm644 misc/zsh-completion $install/usr/share/zsh/site-functions/_ninja 13.28 + cook_pick_docs doc/manual.asciidoc 13.29 +} 13.30 + 13.31 +genpkg_rules() { 13.32 + copy /usr/bin/ninja 13.33 + TAGS="LFS" 13.34 +}
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/ninja/stuff/patches/ninja-1.8.2-add_NINJAJOBS_var-1.patch Sat Mar 10 13:48:53 2018 +0200 14.3 @@ -0,0 +1,65 @@ 14.4 +Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org> 14.5 +Date: 2017-10-14 14.6 +Initial Package Version: 1.9.2 14.7 +Upstream Status: Not submitted 14.8 +Origin: Self 14.9 +Description: Ninja normally uses all cores+2 when building 14.10 + a package. This patch allows useers to limit the 14.11 + cores used by setting an environment variable: 14.12 + NINJAJOBS to an integer. 14.13 + 14.14 + The patch also fixes a few warnings. 14.15 + 14.16 + 14.17 +diff -Naur ninja-1.8.2.orig/src/build_log.cc ninja-1.8.2/src/build_log.cc 14.18 +--- ninja-1.8.2.orig/src/build_log.cc 2017-09-10 20:20:10.000000000 -0500 14.19 ++++ ninja-1.8.2/src/build_log.cc 2017-10-12 14:38:00.988957823 -0500 14.20 +@@ -75,12 +75,12 @@ 14.21 + } 14.22 + switch (len & 7) 14.23 + { 14.24 +- case 7: h ^= uint64_t(data[6]) << 48; 14.25 +- case 6: h ^= uint64_t(data[5]) << 40; 14.26 +- case 5: h ^= uint64_t(data[4]) << 32; 14.27 +- case 4: h ^= uint64_t(data[3]) << 24; 14.28 +- case 3: h ^= uint64_t(data[2]) << 16; 14.29 +- case 2: h ^= uint64_t(data[1]) << 8; 14.30 ++ case 7: h ^= uint64_t(data[6]) << 48; __attribute__ ((fallthrough)); 14.31 ++ case 6: h ^= uint64_t(data[5]) << 40; __attribute__ ((fallthrough)); 14.32 ++ case 5: h ^= uint64_t(data[4]) << 32; __attribute__ ((fallthrough)); 14.33 ++ case 4: h ^= uint64_t(data[3]) << 24; __attribute__ ((fallthrough)); 14.34 ++ case 3: h ^= uint64_t(data[2]) << 16; __attribute__ ((fallthrough)); 14.35 ++ case 2: h ^= uint64_t(data[1]) << 8; __attribute__ ((fallthrough)); 14.36 + case 1: h ^= uint64_t(data[0]); 14.37 + h *= m; 14.38 + }; 14.39 +diff -Naur ninja-1.8.2.orig/src/hash_map.h ninja-1.8.2/src/hash_map.h 14.40 +--- ninja-1.8.2.orig/src/hash_map.h 2017-09-10 20:20:10.000000000 -0500 14.41 ++++ ninja-1.8.2/src/hash_map.h 2017-10-12 14:30:29.563974429 -0500 14.42 +@@ -39,8 +39,8 @@ 14.43 + len -= 4; 14.44 + } 14.45 + switch (len) { 14.46 +- case 3: h ^= data[2] << 16; 14.47 +- case 2: h ^= data[1] << 8; 14.48 ++ case 3: h ^= data[2] << 16; __attribute__ ((fallthrough)); 14.49 ++ case 2: h ^= data[1] << 8; __attribute__ ((fallthrough)); 14.50 + case 1: h ^= data[0]; 14.51 + h *= m; 14.52 + }; 14.53 +diff -Naur ninja-1.8.2.orig/src/ninja.cc ninja-1.8.2/src/ninja.cc 14.54 +--- ninja-1.8.2.orig/src/ninja.cc 2017-09-10 20:20:10.000000000 -0500 14.55 ++++ ninja-1.8.2/src/ninja.cc 2017-10-12 14:47:34.143936739 -0500 14.56 +@@ -221,6 +221,12 @@ 14.57 + 14.58 + /// Choose a default value for the -j (parallelism) flag. 14.59 + int GuessParallelism() { 14.60 ++ 14.61 ++ int j = 0; 14.62 ++ char* jobs = getenv( "NINJAJOBS" ); 14.63 ++ if ( jobs != NULL ) j = atoi( jobs ); 14.64 ++ if ( j > 0 ) return j; 14.65 ++ 14.66 + switch (int processors = GetProcessorCount()) { 14.67 + case 0: 14.68 + case 1:
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/ninja/stuff/patches/series Sat Mar 10 13:48:53 2018 +0200 15.3 @@ -0,0 +1,1 @@ 15.4 +ninja-1.8.2-add_NINJAJOBS_var-1.patch
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/p910nd/description.txt Sat Mar 10 13:48:53 2018 +0200 16.3 @@ -0,0 +1,7 @@ 16.4 +p910nd implements the port 9100 network printer protocol which simply 16.5 +copies any incoming data on the port to the printer (and in the reverse 16.6 +direction, if bidirectional mode is selected). Both parallel and USB 16.7 +printers are supported. This protocol was used in HP's printers and is 16.8 +called JetDirect (probably TM). p910nd is particularly useful for 16.9 +diskless hosts and embedded devices because it does not require any disk 16.10 +space for spooling as this is done at the sending host.
17.1 --- a/py3k/receipt Thu Mar 08 23:29:32 2018 +0200 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,58 +0,0 @@ 17.4 -# SliTaz package receipt v2. 17.5 - 17.6 -PACKAGE="py3k" 17.7 -VERSION="3.6.3" 17.8 -CATEGORY="development" 17.9 -SHORT_DESC="The Python 3000 programming language" 17.10 -MAINTAINER="pascal.bellard@slitaz.org" 17.11 -LICENSE="GPL" 17.12 -WEB_SITE="https://www.python.org/download/releases/" 17.13 - 17.14 -SOURCE="Python" 17.15 -TARBALL="$SOURCE-$VERSION.tar.xz" 17.16 -WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL" 17.17 - 17.18 -BUILD_DEPENDS="readline-dev gdbm-dev openssl-dev sqlite3-dev zlib-dev tk-dev \ 17.19 -ncurses-dev xz-dev bzip2-dev" 17.20 -SPLIT="py3k-dev" 17.21 -COOKOPTS="!zip" 17.22 - 17.23 -# Rules to configure and make the package. 17.24 -compile_rules() 17.25 -{ 17.26 - mkdir -p $DESTDIR/usr/lib/pkgconfig 17.27 - 17.28 - ./configure \ 17.29 - --enable-shared \ 17.30 - $CONFIGURE_ARGS && 17.31 - make && 17.32 - make DESTDIR=$DESTDIR install 17.33 -} 17.34 - 17.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 17.36 -genpkg_rules() 17.37 -{ 17.38 - case $PACKAGE in 17.39 - py3k) 17.40 - python_version=${VERSION:0:3} 17.41 - mkdir -p $fs/usr/include/python${python_version}m 17.42 - cp -a $install/usr/bin $fs/usr 17.43 - cp -a $install/usr/lib $fs/usr 17.44 - # needed for python3 to work 17.45 - cp -a $install/usr/include/python${python_version}m/pyconfig.h \ 17.46 - $fs/usr/include/python${python_version}m 17.47 - rm -f $fs/usr/bin/*-config 17.48 - DEPENDS="openssl bzlib readline sqlite3 zlib xorg-libXScrnSaver \ 17.49 - ncurses gdbm tk xorg-libXext" 17.50 - ;; 17.51 - *-dev) 17.52 - mkdir -p $fs/usr/bin 17.53 - cp -a $install/usr/include $fs/usr 17.54 - cp -a $install/usr/bin/*-config $fs/usr/bin 17.55 - chmod 755 $fs/usr/bin/*-config 17.56 - # in py3k package now 17.57 - python_version=${VERSION:0:3} 17.58 - rm $fs/usr/include/python${python_version}m/pyconfig.h 17.59 - ;; 17.60 - esac 17.61 -}
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/python3/receipt Sat Mar 10 13:48:53 2018 +0200 18.3 @@ -0,0 +1,50 @@ 18.4 +# SliTaz package receipt v2. 18.5 + 18.6 +PACKAGE="python3" 18.7 +VERSION="3.6.4" 18.8 +CATEGORY="development" 18.9 +SHORT_DESC="The Python 3 programming language" 18.10 +MAINTAINER="pascal.bellard@slitaz.org" 18.11 +LICENSE="GPL" 18.12 +WEB_SITE="https://www.python.org/download/releases/" 18.13 +LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/Python.html" 18.14 + 18.15 +TARBALL="Python-$VERSION.tar.xz" 18.16 +WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL" 18.17 + 18.18 +BUILD_DEPENDS="readline-dev gdbm-dev openssl-dev sqlite3-dev zlib-dev tk-dev \ 18.19 +ncurses-dev xz-dev bzip2-dev expat-dev" 18.20 +SPLIT="python3-dev" 18.21 +COOKOPTS="!zip" 18.22 + 18.23 +compile_rules() { 18.24 + mkdir -p $install/usr/lib/pkgconfig 18.25 + 18.26 + ./configure \ 18.27 + --enable-shared \ 18.28 + --with-system-expat \ 18.29 + --with-system-ffi \ 18.30 + --with-ensurepip=yes \ 18.31 + $CONFIGURE_ARGS && 18.32 + make && 18.33 + make DESTDIR=$DESTDIR install || return 1 18.34 + 18.35 + chmod 755 $install/usr/lib/libpython${VERSION%.*}m.so 18.36 + chmod 755 $install/usr/lib/libpython${VERSION%%.*}.so 18.37 +} 18.38 + 18.39 +genpkg_rules() { 18.40 + case $PACKAGE in 18.41 + python3) 18.42 + copy @std pyconfig.h 18.43 + DEPENDS="bzlib expat gdbm liblzma libsqlite3 ncurses \ 18.44 + ncurses-libpanel openssl readline tcl tk xorg-libX11 zlib" 18.45 + PROVIDE="py3k" 18.46 + TAGS="LFS" 18.47 + ;; 18.48 + *-dev) 18.49 + copy @dev @rm 18.50 + PROVIDE="py3k-dev" 18.51 + ;; 18.52 + esac 18.53 +}
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/qt5/stuff/patches/series Sat Mar 10 13:48:53 2018 +0200 19.3 @@ -0,0 +1,1 @@ 19.4 +std.patch
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/qt5/stuff/patches/std.patch Sat Mar 10 13:48:53 2018 +0200 20.3 @@ -0,0 +1,34 @@ 20.4 +--- a/qtbase/src/corelib/global/qnumeric_p.h 20.5 ++++ b/qtbase/src/corelib/global/qnumeric_p.h 20.6 +@@ -101,12 +101,12 @@ 20.7 + static inline bool isinf(float f) { return math_h_isinf(f); } 20.8 + static inline bool isfinite(float f) { return math_h_isfinite(f); } 20.9 + #else 20.10 +-static inline bool isnan(double d) { return std::isnan(d); } 20.11 +-static inline bool isinf(double d) { return std::isinf(d); } 20.12 +-static inline bool isfinite(double d) { return std::isfinite(d); } 20.13 +-static inline bool isnan(float f) { return std::isnan(f); } 20.14 +-static inline bool isinf(float f) { return std::isinf(f); } 20.15 +-static inline bool isfinite(float f) { return std::isfinite(f); } 20.16 ++static inline bool isnan(double d) { return isnan(d); } 20.17 ++static inline bool isinf(double d) { return isinf(d); } 20.18 ++static inline bool isfinite(double d) { return isfinite(d); } 20.19 ++static inline bool isnan(float f) { return isnan(f); } 20.20 ++static inline bool isinf(float f) { return isinf(f); } 20.21 ++static inline bool isfinite(float f) { return isfinite(f); } 20.22 + #endif 20.23 + } 20.24 + 20.25 +--- a/qtbase/src/corelib/kernel/qvariant.cpp 20.26 ++++ b/qtbase/src/corelib/kernel/qvariant.cpp 20.27 +@@ -3486,8 +3486,8 @@ 20.28 + return 0; 20.29 + 20.30 + // only do fuzzy comparisons for finite, non-zero numbers 20.31 +- int c1 = std::fpclassify(r1); 20.32 +- int c2 = std::fpclassify(r2); 20.33 ++ int c1 = fpclassify(r1); 20.34 ++ int c2 = fpclassify(r2); 20.35 + if ((c1 == FP_NORMAL || c1 == FP_SUBNORMAL) && (c2 == FP_NORMAL || c2 == FP_SUBNORMAL)) { 20.36 + if (qFuzzyCompare(r1, r2)) 20.37 + return 0;
21.1 --- a/sshfs-fuse/receipt Thu Mar 08 23:29:32 2018 +0200 21.2 +++ b/sshfs-fuse/receipt Sat Mar 10 13:48:53 2018 +0200 21.3 @@ -1,33 +1,28 @@ 21.4 -# SliTaz package receipt. 21.5 +# SliTaz package receipt v2. 21.6 21.7 PACKAGE="sshfs-fuse" 21.8 -VERSION="2.5" 21.9 +VERSION="3.3.1" 21.10 CATEGORY="system-tools" 21.11 -SHORT_DESC="SSH Filesystem implemented with FUSE." 21.12 +SHORT_DESC="SSH Filesystem implemented with FUSE" 21.13 MAINTAINER="pascal.bellard@slitaz.org" 21.14 LICENSE="GPL2" 21.15 -TARBALL="$PACKAGE-$VERSION.tar.gz" 21.16 -WEB_SITE="http://fuse.sourceforge.net/sshfs.html" 21.17 -WGET_URL="$SF_MIRROR/fuse/$TARBALL" 21.18 -PROVIDE="rsshfs sshfs" 21.19 -TAGS="ssh" 21.20 +WEB_SITE="https://github.com/libfuse/sshfs" 21.21 21.22 -DEPENDS="fuse openssh sftp-server glib" 21.23 -BUILD_DEPENDS="fuse-dev gettext glib-dev pkg-config" 21.24 +TARBALL="sshfs-$VERSION.tar.xz" 21.25 +WGET_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-$VERSION/$TARBALL" 21.26 21.27 -# Rules to configure and make the package. 21.28 -compile_rules() 21.29 -{ 21.30 - ./configure --prefix=/usr \ 21.31 - --mandir=/usr/share/man $CONFIGURE_ARGS && 21.32 +BUILD_DEPENDS="fuse3-dev" 21.33 +# gettext glib-dev pkg-config" 21.34 + 21.35 +compile_rules() { 21.36 + ./configure $CONFIGURE_ARGS && 21.37 make && 21.38 - make DESTDIR=$DESTDIR install 21.39 + make install 21.40 } 21.41 21.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 21.43 -genpkg_rules() 21.44 -{ 21.45 - mkdir -p $fs/usr 21.46 - cp -a $install/usr/bin $fs/usr 21.47 - cp -a $stuff/rsshfs $fs/usr/bin 21.48 +genpkg_rules() { 21.49 + copy @std 21.50 + DEPENDS="fuse openssh sftp-server glib" 21.51 + PROVIDE="rsshfs sshfs" 21.52 + TAGS="ssh" 21.53 }
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/sshttp/description.txt Sat Mar 10 13:48:53 2018 +0200 22.3 @@ -0,0 +1,133 @@ 22.4 +sshttp - hiding SSH servers behind HTTP 22.5 +======================================= 22.6 + 22.7 + 22.8 + 22.9 +[](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9MVF8BRMX2CWA) 22.10 + 22.11 +# 0. Intro 22.12 + 22.13 +In case your FW policy forbids __SSH__ access to the DMZ or internal 22.14 +network from outside, but you still want to use ssh on machines 22.15 +which only have one open port, e.g. __HTTP__, you can use `sshttpd`. 22.16 + 22.17 +_sshttpd_ can multiplex the following protocol pairs: 22.18 + 22.19 +* SSH/HTTP 22.20 +* SSH/HTTPS 22.21 +* SSH/SMTP (without SMTP multiline banners) 22.22 +* HTTPS SNI multiplexing 22.23 +* SSH/HTTPS with SNI multiplexing 22.24 + 22.25 +# 1. Build 22.26 + 22.27 +Be sure you run recent Linux kernel and install `nf-conntrack` as well 22.28 +as `libcap` and `libcap-devel` if you want to use the capability feature. 22.29 + 22.30 +``` 22.31 +$ make 22.32 +``` 22.33 + 22.34 +There is a new `splice` branch inside the git. `git checkout splice` 22.35 +before `make`, if you want to test this new branch. It implements 22.36 +zero-copy in terms of the __splice(2)__ system call which has a performance 22.37 +benefit since it avoids copying the network data between user and kernel 22.38 +land back and forth (__read()/write()__), which could also just be spliced kernel-internally 22.39 +at the "extra cost" of two additional pipe descriptors per connection. 22.40 + 22.41 +# 2. Setup for single host 22.42 + 22.43 +This paragraph describes the setup where all services run on the same host 22.44 +as _sshttpd_ itself. The muxing happens to the same IP/IP6 address that 22.45 +the outside connects arrive to, so basically just the ports are changing per 22.46 +detected service. 22.47 + 22.48 +_sshttpd_ is an easy to use OSI-Layer5 switching daemon. It runs 22.49 +transparently on __HTTP(S)__ port (`-L` switch, default 80) and decides 22.50 +on incoming connections whether this is __SSH__ or __HTTP(S)__ traffic. 22.51 +If its __HTTP(S)__ traffic, it switches the traffic to the `HTTP_PORT` 22.52 +(`-H`, default 8080) and if its __SSH__ traffic to `SSH_PORT` (`-S`, default 22.53 +22) respectively. 22.54 + 22.55 +You need to edit `nf-setup` script to match your network device and `$PORTS` (`22` and `8080` 22.56 +are just fine for the SSH/HTTP case) and run it to install the proxy rules. 22.57 +Your _sshd_ has to run on `$SSH_PORT` and your webserver on `$HTTP_PORT`. 22.58 +Thats basically it. Go ahead and run _sshttpd_ (as root) and it will layer5-switch 22.59 +your traffic destinated to TCP port 80: 22.60 + 22.61 +``` 22.62 +# ./nf-setup 22.63 +Using network device eth0 22.64 +Setting up port 22 ... 22.65 +Setting up port 8080 ... 22.66 +# ./sshttpd -S 22 -L 80 -H 8080 -U nobody -R /var/empty 22.67 +sshttpd: Using HTTP_PORT=8080 SSH_PORT=22 and local port=80. Going background. Using caps/chroot. 22.68 +# 22.69 +``` 22.70 + 22.71 +If you want to mux __SMTP__ with _sshttpd_, just give `25` as `-L` parameter, `2525` 22.72 +as `-H` parameter, and setup your smtp daemon to listen on 2525. Then 22.73 +edit the `nf-setup` script to match these ports. In the `Makefile`, change the 22.74 +`SMTP_DOMAIN` and `SSH_BANNER` to your needs (`SSH_BANNER` must match exactly 22.75 +yours of the running _sshd_). 22.76 +SMTP/SSH muxing was tested with OpenSSH client and Postfix client and server. 22.77 + 22.78 +When muxing IPv6 connections, the setup is basically the same; just use the `nf6-setup` 22.79 +script and invoke _sshttpd_ with `-6`. 22.80 + 22.81 +# 3. Transparent proxy setup 22.82 + 22.83 +You can run _sshttpd_ also on your gateway machine and transparently proxy/mux 22.84 +all of your __HTTP(S)/SSH__ traffic to your internal LAN. To do so, run _sshttpd_ with 22.85 +`-T` and use `nf-tproxy` rather than `nf-setup` as a template for your FW setup. 22.86 +Carefully read `nf-tproxy` so you dont lock yourself out of the network and all 22.87 +the network devices and IP addresses match your setup. 22.88 + 22.89 +# 4. SNI Mux 22.90 + 22.91 +With _sshttpd_ you can also mux based on the HTTPS SNI. Just set up your 22.92 +`nf-setup` to contain the SNI ports (there are already samples) and invoke 22.93 +_sshttpd_ with `-N name:port` e.g. `sshttpd -S 22 -H 4433 -L 443 -N drops.v2:7350` 22.94 +to hide a sshd on 22 and a [drops setup](https://github.com/stealth/drops) on port 7350 behind port 443, and at the same time serving 22.95 +your webserver from port 4433 to be visible to outside on port 443. 22.96 +This works because _drops_ sets the SNI of `drops.v2` in outgoing connects. 22.97 +Multiple `-N` switches are allowed so you could mux a lot of services 22.98 +via SNI. The ports/services must run all on the same machine where the original request 22.99 +was destinated to. If you just want to mux based on SNI, you can set the SSH port to 0 via `-S 0`. 22.100 + 22.101 +# 5. Misc 22.102 + 22.103 +You dont need to patch any of your ssh/web/smtp client or server software. It 22.104 +works as is. _sshttpd_ runs only on Linux and needs `IP_TRANSPARENT` support. 22.105 +It would work without, but by using `IP_TRANSPARENT` it is possible to even 22.106 +have unmodified syslogs, e.g. the original source IP/port of incoming connections 22.107 +is passed as-is to the SSH/HTTP/SMTP servers. 22.108 + 22.109 +Make sure the `nf_conntrack` and `nf_conntrack_ipv4` or `nf_conntrack_ipv6` modules are loaded. 22.110 +_sshttpd_ is also a tricky anti-SSH0day (if ever:) and anti SSH-scanning/bruteforcing 22.111 +measurement. 22.112 +_sshttpd_ has small footprint and was optimized for speed so it also runs 22.113 +on heavily loaded web servers. 22.114 + 22.115 +Since version 0.24, _sshttpd_ also supports multiple CPU cores. Unless 22.116 +`-n 1` is used as switch, _sshttpd_ binds one thread per CPU core, 22.117 +to better exploit the hardware if running on heavily used web servers. 22.118 +It still runs this fixed number of threads no matter how many 1000s connection 22.119 +it handles at the same time. 22.120 +_sshttpd_ runs as `nobody` user inside a `chroot()` (configurable via `-U` and `-R` switch) 22.121 +if compiled with `USE_CAPS`. It can also distinguish between __SSH__ and __SSL__ 22.122 +sessions, you just have to use an `LOCAL_PORT (-L)` of 443 or 4433 and change 22.123 +the `HTTP_PORT` in the `nf-setup` script to match your webservers __HTTPS__ port. 22.124 +You cannot mix HTTP/SSH and HTTPS/SSH in one _sshttpd_ instance but you can 22.125 +run two sshttpd's to reach that goal: one on `LOCAL_PORT 80` and one on 22.126 +`LOCAL_PORT 443`. 22.127 + 22.128 +# 6. Alternative docu 22.129 + 22.130 +As per 2017 it seems you have to provide alternative facts for everything, 22.131 +so here are some good writeups from other people for better understanding or in case my 22.132 +description was too brief: 22.133 + 22.134 +* [by stalkr](http://blog.stalkr.net/2012/02/sshhttps-multiplexing-with-sshttp.html) 22.135 +* [by Will Rouesnel](http://blog.wrouesnel.com/articles/Setting%20up%20sshttp/) 22.136 +* [by Yves](http://yalis.fr/cms/index.php/post/2014/02/22/Multiplex-SSH-and-HTTPS-on-a-single-port)