wok-next rev 21038
Small updates
line diff
1.1 --- a/acct/receipt Tue Nov 06 16:35:54 2018 +0200 1.2 +++ b/acct/receipt Thu Nov 08 15:34:32 2018 +0200 1.3 @@ -1,25 +1,26 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="acct" 1.7 -VERSION="6.6.2" 1.8 +VERSION="6.6.4" 1.9 CATEGORY="utilities" 1.10 SHORT_DESC="Utilities that report data about users logged on GNU/Linux" 1.11 MAINTAINER="devel@slitaz.org" 1.12 LICENSE="GPL3" 1.13 -WEB_SITE="http://savannah.gnu.org/projects/acct/" 1.14 +WEB_SITE="https://www.gnu.org/software/acct/" 1.15 1.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.17 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 1.18 1.19 compile_rules() { 1.20 - ./configure $CONFIGURE_ARGS && 1.21 + ./configure \ 1.22 + --enable-linux-multiformat \ 1.23 + $CONFIGURE_ARGS && 1.24 fix libtool && 1.25 - make $MAKEFLAGS && 1.26 - make DESTDIR=$install install 1.27 + make && 1.28 + make install 1.29 } 1.30 1.31 genpkg_rules() { 1.32 copy @std 1.33 - DEPENDS="gcc-lib-base glibc" 1.34 TAGS="analysis network utilities" 1.35 }
2.1 --- a/aircrack-ng/receipt Tue Nov 06 16:35:54 2018 +0200 2.2 +++ b/aircrack-ng/receipt Thu Nov 08 15:34:32 2018 +0200 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="aircrack-ng" 2.7 -VERSION="1.3" 2.8 +VERSION="1.4" 2.9 CATEGORY="network" 2.10 SHORT_DESC="802.11 WEP and WPA-PSK keys cracking program" 2.11 MAINTAINER="pascal.bellard@slitaz.org" 2.12 @@ -23,7 +23,9 @@ 2.13 $CONFIGURE_ARGS && 2.14 fix libtool && 2.15 make && 2.16 - make install 2.17 + make install || return 1 2.18 + 2.19 + find $install -type f -name '*.pyc' -delete 2.20 } 2.21 2.22 genpkg_rules() {
3.1 --- a/aisleriot/receipt Tue Nov 06 16:35:54 2018 +0200 3.2 +++ b/aisleriot/receipt Thu Nov 08 15:34:32 2018 +0200 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="aisleriot" 3.7 -VERSION="3.22.6" 3.8 +VERSION="3.22.7" 3.9 CATEGORY="games" 3.10 SHORT_DESC="A collection of patience games" 3.11 MAINTAINER="al.bobylev@gmail.com"
4.1 --- a/ajaxterm/receipt Tue Nov 06 16:35:54 2018 +0200 4.2 +++ b/ajaxterm/receipt Thu Nov 08 15:34:32 2018 +0200 4.3 @@ -1,53 +1,68 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="ajaxterm" 4.8 -VERSION="0.10" 4.9 +VERSION="0.11" 4.10 +COMMIT="2eaa3e989782d8259a12c8cb7d6204433ae19264" 4.11 CATEGORY="network" 4.12 SHORT_DESC="Login terminal for the web" 4.13 MAINTAINER="pascal.bellard@slitaz.org" 4.14 LICENSE="PublicDomain LGPL" 4.15 -WEB_SITE="http://antony.lesuisse.org/software/ajaxterm/" 4.16 +WEB_SITE="https://github.com/antonylesuisse/qweb/tree/master/ajaxterm" 4.17 4.18 -SOURCE="Ajaxterm" 4.19 -TARBALL="$SOURCE-$VERSION.tar.gz" 4.20 -WGET_URL="${WEB_SITE}files/$TARBALL" 4.21 +TARBALL="ajaxterm-$VERSION-$COMMIT.tar.gz" 4.22 +WGET_URL="https://sources.archlinux.org/other/community/ajaxterm/$TARBALL" 4.23 4.24 compile_rules() { 4.25 + ./configure --prefix=/usr 4.26 + 4.27 + install -Dm755 ajaxterm.bin $install/usr/bin/ajaxterm 4.28 + 4.29 + mkdir -p $install/usr/share/ajaxterm/ 4.30 + install -m644 ajaxterm.css ajaxterm.html qweb.py *.js $install/usr/share/ajaxterm/ 4.31 + install -m755 ajaxterm.py $install/usr/share/ajaxterm/ 4.32 + 4.33 + install -Dm755 $stuff/etc/init.d/ajaxterm $install/etc/init.d/ajaxterm 4.34 + 4.35 cook_pick_manpages $src/ajaxterm.1 4.36 + 4.37 + cook_pick_docs $stuff/README.md 4.38 + 4.39 + # Note, $stuff/usr/ still contain some rewritten files for the previous 4.40 + # Ajaxterm version. I don't know how they are compatible with this newer 4.41 + # version and don't use them at the moment. It would be much better if 4.42 + # the patch were used... 4.43 } 4.44 4.45 genpkg_rules() { 4.46 - mkdir -p $fs/usr/share/ajaxterm 4.47 - cp -a $src/*.py $src/*.js $src/*.css $src/*.html $fs/usr/share/ajaxterm 4.48 - cp -a $stuff/* $fs/ 4.49 - chown -R root:root $fs 4.50 - find $fs -type f -name '*.py' -exec chmod a+x \{\} \; 4.51 + copy @std 4.52 DEPENDS="python" 4.53 SUGGESTED="apache lighttpd-ssl lighttpd-modules" 4.54 TAGS="web application" 4.55 } 4.56 4.57 post_install() { 4.58 - grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "ajaxterm" || sed -i \ 4.59 - 's/RUN_DAEMONS="/RUN_DAEMONS="ajaxterm /' "$1/etc/rcS.conf" 4.60 + grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "ajaxterm" || 4.61 + sed -i 's|RUN_DAEMONS="|RUN_DAEMONS="ajaxterm |' "$1/etc/rcS.conf" 4.62 + 4.63 # Configure lighttpd server 4.64 if [ -f "$1/usr/lib/lighttpd/mod_proxy.so" ]; then 4.65 - grep -q mod_proxy "$1/etc/lighttpd/lighttpd.conf" || 4.66 + grep -q mod_proxy "$1/etc/lighttpd/lighttpd.conf" || 4.67 cat >> "$1/etc/lighttpd/lighttpd.conf" <<EOT 4.68 server.modules += ( "mod_proxy" ) 4.69 EOT 4.70 - grep -q ajaxterm "$1/etc/lighttpd/lighttpd.conf" || 4.71 + grep -q ajaxterm "$1/etc/lighttpd/lighttpd.conf" || 4.72 cat >> "$1/etc/lighttpd/lighttpd.conf" <<EOT 4.73 proxy.server = ( "/ajaxterm/" => 4.74 ( ( "host" => "127.0.0.1", "port" => 8022 ) ) 4.75 ) 4.76 EOT 4.77 - if [ -z "$1" ]; then 4.78 - # Start Web server. 4.79 - /etc/init.d/lighttpd stop 4.80 - /etc/init.d/lighttpd start 4.81 - fi 4.82 + if [ -z "$1" ]; then 4.83 + # Start Web server. 4.84 + /etc/init.d/lighttpd stop 4.85 + /etc/init.d/lighttpd start 4.86 + fi 4.87 fi 4.88 + 4.89 # Configure apache server 4.90 if [ -f "$1/etc/apache/httpd.conf" ]; then 4.91 if [ ! -f "$1/etc/apache/conf.d/ajaxterm" ]; then 4.92 @@ -70,22 +85,23 @@ 4.93 fi 4.94 fi 4.95 fi 4.96 + 4.97 [ -z "$1" ] && /etc/init.d/ajaxterm start 4.98 4.99 [ ! -f "$1/usr/lib/lighttpd/mod_proxy.so" -a \ 4.100 ! -f "$1/etc/apache/httpd.conf" ] && 4.101 [ -z "$quiet" ] && cat <<EOT 4.102 4.103 - .---------------------------------------. 4.104 - | You should install either lighttpd: | 4.105 - | # tazpkg get-install lighttpd-ssl | 4.106 - | # tazpkg get-install lighttpd-modules | 4.107 - | | 4.108 - | or apache: | 4.109 - | # tazpkg get-install apache | 4.110 - | | 4.111 - | and reconfigure: | 4.112 - | # tazpkg reconfigure ajaxterm | 4.113 - '---------------------------------------' 4.114 + .-------------------------------------. 4.115 + | You should install either lighttpd: | 4.116 + | # tazpkg -gi lighttpd-ssl | 4.117 + | # tazpkg -gi lighttpd-modules | 4.118 + | | 4.119 + | or apache: | 4.120 + | # tazpkg -gi apache | 4.121 + | | 4.122 + | and reconfigure: | 4.123 + | # tazpkg reconfigure ajaxterm | 4.124 + '-------------------------------------' 4.125 EOT 4.126 }
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/ajaxterm/stuff/README.md Thu Nov 08 15:34:32 2018 +0200 5.3 @@ -0,0 +1,126 @@ 5.4 +# [Ajaxterm](http://antony.lesuisse.org/qweb/trac/wiki/AjaxTerm) 5.5 + 5.6 +Ajaxterm is a web based terminal. It was totally inspired and works almost 5.7 +exactly like http://anyterm.org/ except it's much easier to install (see 5.8 +comparaison with anyterm below). 5.9 + 5.10 +Ajaxterm written in python (and some AJAX javascript for client side) and 5.11 +depends only on python2.3 or better. 5.12 +Ajaxterm is **very simple to install** on Linux, MacOS X, FreeBSD, Solaris, 5.13 +cygwin and any Unix that runs python2.3. 5.14 +Ajaxterm was written by Antony Lesuisse (email: al AT udev.org), License Public 5.15 +Domain. 5.16 + 5.17 +Use the [Forum](/qweb/forum/viewforum.php?id=2), if you have any question or 5.18 +remark. 5.19 + 5.20 +## News 5.21 + 5.22 + * 2006-10-29: v0.10 allow space in login, cgi launch fix, redhat init 5.23 + * 2006-07-12: v0.9 change uid, daemon fix (Daniel Fischer) 5.24 + * 2006-07-04: v0.8 add login support to ssh (Sven Geggus), change max width 5.25 + to 256 5.26 + * 2006-05-31: v0.7 minor fixes, daemon option 5.27 + * 2006-05-23: v0.6 Applied debian and gentoo patches, renamed to Ajaxterm, 5.28 + default port 8022 5.29 + 5.30 +## Download and Install 5.31 + 5.32 + * Release: [Ajaxterm-0.10.tar.gz](/qweb/files/Ajaxterm-0.10.tar.gz) 5.33 + * Browse src: [ajaxterm/](/qweb/trac/browser/trunk/ajaxterm/) 5.34 + 5.35 +To install Ajaxterm issue the following commands: 5.36 + 5.37 +```bash 5.38 +wget http://antony.lesuisse.org/qweb/files/Ajaxterm-0.10.tar.gz 5.39 +tar zxvf Ajaxterm-0.10.tar.gz 5.40 +cd Ajaxterm-0.10 5.41 +./ajaxterm.py 5.42 +``` 5.43 + 5.44 +Then point your browser to this URL: <http://localhost:8022/> 5.45 + 5.46 +## Screenshot 5.47 + 5.48 +<center><img src="/qweb/trac/attachment/wiki/AjaxTerm/scr.png?format=raw" alt="ajaxterm screenshot" style=""/></center> 5.49 + 5.50 + 5.51 +## Documentation and Caveats 5.52 + 5.53 + * Ajaxterm only support latin1, if you use Ubuntu or any `LANG==en_US.UTF-8` 5.54 + distribution don't forget to `unset LANG`. 5.55 + * If run as root ajaxterm will run `/bin/login`, otherwise it will run `ssh` 5.56 + localhost. To use an other command use the `-c` option. 5.57 + * By default Ajaxterm only listen at 127.0.0.1:8022. For remote access, it is 5.58 + strongly recommended to use **https SSL/TLS**, and that is simple to 5.59 + configure if you use the apache web server using mod_proxy. 5.60 + Using ssl will also speed up ajaxterm (probably because of keepalive). 5.61 + Here is an configuration example: 5.62 + 5.63 +``` 5.64 + Listen 443 5.65 + NameVirtualHost *:443 5.66 + 5.67 + <VirtualHost *:443> 5.68 + ServerName localhost 5.69 + SSLEngine On 5.70 + SSLCertificateKeyFile ssl/apache.pem 5.71 + SSLCertificateFile ssl/apache.pem 5.72 + 5.73 + ProxyRequests Off 5.74 + <Proxy *> 5.75 + Order deny,allow 5.76 + Allow from all 5.77 + </Proxy> 5.78 + ProxyPass /ajaxterm/ http://localhost:8022/ 5.79 + ProxyPassReverse /ajaxterm/ http://localhost:8022/ 5.80 + </VirtualHost> 5.81 +``` 5.82 + 5.83 + * Using GET HTTP request seems to speed up ajaxterm, just click on GET in the 5.84 + interface, but be warned that your keystrokes might be loggued (by apache or 5.85 + any proxy). I usually enable it after the login. 5.86 + 5.87 + * Ajaxterm commandline usage: 5.88 + 5.89 +``` 5.90 +usage: ajaxterm.py [options] 5.91 + 5.92 +options: 5.93 + -h, --help show this help message and exit 5.94 + -pPORT, --port=PORT Set the TCP port (default: 8022) 5.95 + -cCMD, --command=CMD set the command (default: /bin/login or ssh localhost) 5.96 + -l, --log log requests to stderr (default: quiet mode) 5.97 + -d, --daemon run as daemon in the background 5.98 + -PPIDFILE, --pidfile=PIDFILE 5.99 + set the pidfile (default: /var/run/ajaxterm.pid) 5.100 + -iINDEX_FILE, --index=INDEX_FILE 5.101 + default index file (default: ajaxterm.html) 5.102 + -uUID, --uid=UID Set the daemon's user id 5.103 +``` 5.104 + 5.105 + * Ajaxterm was first written as a demo for qweb (my web framework), but 5.106 + actually doesn't use many features of qweb. 5.107 + 5.108 + * Compared to anyterm: 5.109 + * There are no partial updates, ajaxterm updates either all the screen or 5.110 + nothing. That make the code simpler and I also think it's faster. HTTP 5.111 + replies are always gzencoded. When used in 80x25 mode, almost all of 5.112 + them are below the 1500 bytes (size of an ethernet frame) and we just 5.113 + replace the screen with the reply (no javascript string handling). 5.114 + * Ajaxterm polls the server for updates with an exponentially growing 5.115 + timeout when the screen hasn't changed. The timeout is also resetted as 5.116 + soon as a key is pressed. Anyterm blocks on a pending request and use a 5.117 + parallel connection for keypresses. The anyterm approch is better 5.118 + when there aren't any keypress. 5.119 + 5.120 + * Ajaxterm files are released in the Public Domain, (except 5.121 + [sarissa*](http://sarissa.sourceforge.net/doc/) which are LGPL). 5.122 + 5.123 +## TODO 5.124 + 5.125 + * insert mode ESC [ 4 h 5.126 + * change size x,y from gui (sending signal) 5.127 + * vt102 graphic codepage 5.128 + * use innerHTML or prototype instead of sarissa 5.129 +
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/ajaxterm/stuff/patches/ajaxterm-css.patch Thu Nov 08 15:34:32 2018 +0200 6.3 @@ -0,0 +1,71 @@ 6.4 +diff --git a/ajaxterm.css b/ajaxterm.css 6.5 +index b9a5f87..bfa0d38 100644 6.6 +--- a/ajaxterm.css 6.7 ++++ b/ajaxterm.css 6.8 +@@ -23,7 +23,8 @@ pre.stat .off { 6.9 + color: white; 6.10 + cursor: pointer; 6.11 + } 6.12 +-pre.term { 6.13 ++#term { 6.14 ++ float: left; 6.15 + margin: 0px; 6.16 + padding: 4px; 6.17 + display: block; 6.18 +@@ -33,32 +34,29 @@ pre.term { 6.19 + border-top: 1px solid white; 6.20 + color: #eee; 6.21 + } 6.22 +-pre.term span.f0 { color: #000; } 6.23 +-pre.term span.f1 { color: #b00; } 6.24 +-pre.term span.f2 { color: #0b0; } 6.25 +-pre.term span.f3 { color: #bb0; } 6.26 +-pre.term span.f4 { color: #00b; } 6.27 +-pre.term span.f5 { color: #b0b; } 6.28 +-pre.term span.f6 { color: #0bb; } 6.29 +-pre.term span.f7 { color: #bbb; } 6.30 +-pre.term span.f8 { color: #666; } 6.31 +-pre.term span.f9 { color: #f00; } 6.32 +-pre.term span.f10 { color: #0f0; } 6.33 +-pre.term span.f11 { color: #ff0; } 6.34 +-pre.term span.f12 { color: #00f; } 6.35 +-pre.term span.f13 { color: #f0f; } 6.36 +-pre.term span.f14 { color: #0ff; } 6.37 +-pre.term span.f15 { color: #fff; } 6.38 +-pre.term span.b0 { background-color: #000; } 6.39 +-pre.term span.b1 { background-color: #b00; } 6.40 +-pre.term span.b2 { background-color: #0b0; } 6.41 +-pre.term span.b3 { background-color: #bb0; } 6.42 +-pre.term span.b4 { background-color: #00b; } 6.43 +-pre.term span.b5 { background-color: #b0b; } 6.44 +-pre.term span.b6 { background-color: #0bb; } 6.45 +-pre.term span.b7 { background-color: #bbb; } 6.46 ++span.f0 { color: #000; } 6.47 ++span.f1 { color: #b00; } 6.48 ++span.f2 { color: #0b0; } 6.49 ++span.f3 { color: #bb0; } 6.50 ++span.f4 { color: #00b; } 6.51 ++span.f5 { color: #b0b; } 6.52 ++span.f6 { color: #0bb; } 6.53 ++span.f7 { color: #bbb; } 6.54 ++span.f8 { color: #666; } 6.55 ++span.f9 { color: #f00; } 6.56 ++span.f10 { color: #0f0; } 6.57 ++span.f11 { color: #ff0; } 6.58 ++span.f12 { color: #00f; } 6.59 ++span.f13 { color: #f0f; } 6.60 ++span.f14 { color: #0ff; } 6.61 ++span.f15 { color: #fff; } 6.62 ++span.b0 { background-color: #000; } 6.63 ++span.b1 { background-color: #b00; } 6.64 ++span.b2 { background-color: #0b0; } 6.65 ++span.b3 { background-color: #bb0; } 6.66 ++span.b4 { background-color: #00b; } 6.67 ++span.b5 { background-color: #b0b; } 6.68 ++span.b6 { background-color: #0bb; } 6.69 ++span.b7 { background-color: #bbb; } 6.70 + 6.71 + body { background-color: #888; } 6.72 +-#term { 6.73 +- float: left; 6.74 +-}
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/ajaxterm/stuff/patches/series Thu Nov 08 15:34:32 2018 +0200 7.3 @@ -0,0 +1,3 @@ 7.4 +# From Alpine Linux: 7.5 +# https://git.alpinelinux.org/cgit/aports/tree/community/ajaxterm?h=master 7.6 +ajaxterm-css.patch
8.1 --- a/astromenace/receipt Tue Nov 06 16:35:54 2018 +0200 8.2 +++ b/astromenace/receipt Thu Nov 08 15:34:32 2018 +0200 8.3 @@ -1,38 +1,48 @@ 8.4 # SliTaz package receipt v2. 8.5 8.6 PACKAGE="astromenace" 8.7 -VERSION="1.3.2" 8.8 +VERSION="1.4.0" 8.9 CATEGORY="games" 8.10 -SHORT_DESC="Hardcore 3D space shooter with spaceship upgrade possibilities" 8.11 -MAINTAINER="devel@slitaz.org" 8.12 +SHORT_DESC="Hardcore 3D space scroll-shooter with spaceship upgrade possibilities" 8.13 +MAINTAINER="al.bobylev@gmail.com" 8.14 LICENSE="GPL3" 8.15 WEB_SITE="https://viewizard.com/" 8.16 8.17 -TARBALL="$PACKAGE-src-$VERSION.tar.bz2" 8.18 -WGET_URL="$SF_MIRROR/openastromenace/$TARBALL" 8.19 +TARBALL="$PACKAGE-$VERSION.tar.gz" 8.20 +WGET_URL="https://github.com/viewizard/astromenace/archive/v$VERSION.tar.gz" 8.21 8.22 -BUILD_DEPENDS="gcc cmake make libsdl-dev libogg-dev libvorbis-dev glu-dev \ 8.23 -openal-dev freealut-dev xorg-libXinerama-dev freetype-dev mesa-dev \ 8.24 -fontconfig-dev" 8.25 +BUILD_DEPENDS="cmake libsdl2-dev mesa-dev openal-dev freealut-dev libogg-dev \ 8.26 +libvorbis-dev freetype-dev glu-dev" 8.27 +SPLIT="$PACKAGE-data" 8.28 8.29 compile_rules() { 8.30 - cmake . && 8.31 - make && 8.32 - ./AstroMenace --pack --rawdata=./RAW_VFS_DATA || return 1 8.33 + mkdir build 8.34 + cd build 8.35 + cmake \ 8.36 + -DCMAKE_INSTALL_PREFIX=/usr \ 8.37 + -DDATADIR=/usr/share/astromenace \ 8.38 + .. && 8.39 + make || return 1 8.40 8.41 - chmod +x AstroMenace 8.42 - 8.43 - mkdir -p $install/usr/games/AstroMenace/ 8.44 - cp AstroMenace astromenace_64.png astromenace_128.png ChangeLog.txt \ 8.45 - gamedata.vfs gpl-3.0.txt $install/usr/games/AstroMenace/ 8.46 - 8.47 - mkdir -p $install/usr/share/pixmaps/ 8.48 - cp astromenace_64.png $install/usr/share/pixmaps/astromenace.png 8.49 + install -Dm755 $src/build/astromenace $install/usr/bin/astromenace 8.50 + install -Dm644 $src/build/gamedata.vfs $install/usr/share/astromenace/gamedata.vfs 8.51 + install -Dm644 $src/share/astromenace_64.png $install/usr/share/icons/hicolor/64x64/apps/astromenace.png 8.52 + install -Dm644 $src/share/astromenace_128.png $install/usr/share/icons/hicolor/128x128/apps/astromenace.png 8.53 + install -Dm644 $src/share/astromenace.desktop $install/usr/share/applications/astromenace.desktop 8.54 + install -Dm644 $src/share/astromenace.appdata.xml $install/usr/share/appdata/astromenace.appdata.xml 8.55 } 8.56 8.57 genpkg_rules() { 8.58 - copy @std 8.59 - TAGS="arcade game shooting space" 8.60 - DEPENDS="freealut freetype glu libsdl libvorbis mesa openal xorg-libX11 \ 8.61 - xorg-libXinerama" 8.62 + case $PACKAGE in 8.63 + astromenace) 8.64 + copy bin/ 8.65 + DEPENDS="astromenace-data \ 8.66 + freealut freetype glu libsdl2 libvorbis mesa openal" 8.67 + TAGS="arcade game shooting space" 8.68 + ;; 8.69 + *-data) 8.70 + copy @std icons/ @rm 8.71 + CAT="games|game data" 8.72 + ;; 8.73 + esac 8.74 }
9.1 --- a/astromenace/stuff/astromenace.desktop Tue Nov 06 16:35:54 2018 +0200 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,9 +0,0 @@ 9.4 -[Desktop Entry] 9.5 -Type=Application 9.6 -Name=AstroMenace 9.7 -Exec=/usr/games/AstroMenace/AstroMenace 9.8 -Icon=astromenace 9.9 -Terminal=false 9.10 -X-MultipleArgs=false 9.11 -StartupNotify=false 9.12 -Categories=Game;ActionGame;
10.1 --- a/autofs/receipt Tue Nov 06 16:35:54 2018 +0200 10.2 +++ b/autofs/receipt Thu Nov 08 15:34:32 2018 +0200 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt v2. 10.5 10.6 PACKAGE="autofs" 10.7 -VERSION="5.1.4" 10.8 +VERSION="5.1.5" 10.9 CATEGORY="system-tools" 10.10 SHORT_DESC="Linux automounter" 10.11 MAINTAINER="pascal.bellard@slitaz.org"
11.1 Binary file bird/.icon.png has changed
12.1 --- a/bird/receipt Tue Nov 06 16:35:54 2018 +0200 12.2 +++ b/bird/receipt Thu Nov 08 15:34:32 2018 +0200 12.3 @@ -1,10 +1,10 @@ 12.4 # SliTaz package receipt v2. 12.5 12.6 PACKAGE="bird" 12.7 -VERSION="1.6.3" 12.8 +VERSION="2.0.2" 12.9 CATEGORY="network" 12.10 SHORT_DESC="Internet routing daemon" 12.11 -MAINTAINER="allan316@gmail.com" 12.12 +MAINTAINER="al.bobylev@gmail.com" 12.13 LICENSE="GPL2" 12.14 WEB_SITE="https://bird.network.cz/" 12.15 12.16 @@ -22,5 +22,6 @@ 12.17 genpkg_rules() { 12.18 copy @std 12.19 DEPENDS="ncurses readline" 12.20 + CONFIG_FILES="/etc/bird.conf" 12.21 TAGS="route routing daemon" 12.22 }
13.1 --- a/blackbox/receipt Tue Nov 06 16:35:54 2018 +0200 13.2 +++ b/blackbox/receipt Thu Nov 08 15:34:32 2018 +0200 13.3 @@ -1,32 +1,44 @@ 13.4 # SliTaz package receipt v2. 13.5 13.6 PACKAGE="blackbox" 13.7 -VERSION="0.70.1" 13.8 +VERSION="0.74" 13.9 CATEGORY="x-window" 13.10 SHORT_DESC="A small, fast, full-featured window manager for X" 13.11 -MAINTAINER="devl547@gmail.com" 13.12 +MAINTAINER="al.bobylev@gmail.com" 13.13 LICENSE="MIT" 13.14 -WEB_SITE="https://sourceforge.net/projects/blackboxwm/" 13.15 +WEB_SITE="https://github.com/bbidulock/blackboxwm" 13.16 13.17 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 13.18 -WGET_URL="$SF_MIRROR/blackboxwm/$TARBALL" 13.19 +TARBALL="$PACKAGE-$VERSION.tar.xz" 13.20 +WGET_URL="https://github.com/bbidulock/blackboxwm/releases/download/$VERSION/$TARBALL" 13.21 13.22 -BUILD_DEPENDS="xorg-libXt-dev xorg-libXft-dev xorg-xorgproto libxml2-dev" 13.23 +BUILD_DEPENDS="cmark-gfm asciidoc links gettext xorg-libX11-dev \ 13.24 +xorg-libICE-dev xorg-libXext-dev xorg-libXft-dev" 13.25 +SPLIT="$PACKAGE-dev" 13.26 13.27 # TODO: modify tazx for blackbox so it will creat a correct ~/.xinitrc 13.28 # to let user use the wm via slim/F1 or by default with 'tazx blackbox'. 13.29 13.30 compile_rules() { 13.31 + MARKDOWN=cmark-gfm \ 13.32 ./configure \ 13.33 - --libexecdir=/usr/bin \ 13.34 + --disable-static \ 13.35 + --enable-shared \ 13.36 $CONFIGURE_ARGS && 13.37 fix libtool && 13.38 make && 13.39 - make DESTDIR=$install install 13.40 + make install 13.41 } 13.42 13.43 genpkg_rules() { 13.44 - copy @std 13.45 - DEPENDS="xorg-libXt xorg-libXft" 13.46 - TAGS="window-manager" 13.47 + case $PACKAGE in 13.48 + blackbox) 13.49 + copy @std 13.50 + DEPENDS="xorg-libX11 xorg-libXext xorg-libXft" 13.51 + TAGS="window-manager" 13.52 + ;; 13.53 + *-dev) 13.54 + copy @dev 13.55 + DEPENDS="blackbox xorg-libXft-dev" 13.56 + ;; 13.57 + esac 13.58 }
14.1 --- a/blackbox/stuff/patches/blackbox-0.70.1-asneeded.patch Tue Nov 06 16:35:54 2018 +0200 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,49 +0,0 @@ 14.4 -Fixing build with as-needed. Enabling shared libs. 14.5 - 14.6 -http://bugs.gentoo.org/show_bug.cgi?id=248549 14.7 - 14.8 ---- src/Makefile.am 14.9 -+++ src/Makefile.am 14.10 -@@ -22,7 +22,7 @@ 14.11 - 14.12 - DEFAULT_MENU = $(pkgdatadir)/menu 14.13 - DEFAULT_STYLE = $(pkgdatadir)/styles/Gray 14.14 --CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ 14.15 -+AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ 14.16 - -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ 14.17 - -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ 14.18 - -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ 14.19 ---- lib/Makefile.am 14.20 -+++ lib/Makefile.am 14.21 -@@ -62,7 +62,8 @@ 14.22 - Util.hh \ 14.23 - XDG.hh 14.24 - 14.25 --libbt_la_LIBADD = @ICONV@ @LOCALE@ 14.26 -+libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ 14.27 -+libbt_la_CFLAGS = @xft_CFLAGS@ 14.28 - 14.29 - pkgconfigdir = $(libdir)/pkgconfig 14.30 - nodist_pkgconfig_DATA = libbt.pc 14.31 ---- util/Makefile.am 14.32 -+++ util/Makefile.am 14.33 -@@ -21,7 +21,7 @@ 14.34 - # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 14.35 - # DEALINGS IN THE SOFTWARE. 14.36 - 14.37 --CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ 14.38 -+AM_CPPFLAGS = @DEBUG@ @NLS@ \ 14.39 - -I$(top_srcdir)/lib 14.40 - 14.41 - bin_SCRIPTS = bsetbg 14.42 ---- configure.ac 14.43 -+++ configure.ac 14.44 -@@ -29,7 +29,7 @@ 14.45 - AC_PROG_INSTALL 14.46 - 14.47 - dnl libbt shouldn't be shared by default (yet) 14.48 --AC_DISABLE_SHARED 14.49 -+dnl AC_DISABLE_SHARED 14.50 - AC_PROG_LIBTOOL 14.51 - AC_SUBST(LIBTOOL_DEPS) 14.52 -
15.1 --- a/blackbox/stuff/patches/blackbox-0.70.1-gcc-4.3.patch Tue Nov 06 16:35:54 2018 +0200 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,106 +0,0 @@ 15.4 -diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc 15.5 ---- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200 15.6 -+++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100 15.7 -@@ -42,8 +42,9 @@ 15.8 - 15.9 - #include <assert.h> 15.10 - #include <math.h> 15.11 --#include <stdio.h> 15.12 --#include <stdlib.h> 15.13 -+#include <cstdio> 15.14 -+#include <cstdlib> 15.15 -+#include <cstring> 15.16 - 15.17 - // #define COLORTABLE_DEBUG 15.18 - // #define MITSHM_DEBUG 15.19 -diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc 15.20 ---- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200 15.21 -+++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100 15.22 -@@ -28,7 +28,8 @@ 15.23 - #include <X11/Xlib.h> 15.24 - #include <X11/Xresource.h> 15.25 - 15.26 --#include <stdio.h> 15.27 -+#include <cstdio> 15.28 -+#include <cstring> 15.29 - 15.30 - 15.31 - bt::Resource::Resource(void) 15.32 -diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc 15.33 ---- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200 15.34 -+++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100 15.35 -@@ -25,7 +25,8 @@ 15.36 - #include "Util.hh" 15.37 - #include "XDG.hh" 15.38 - 15.39 --#include <stdlib.h> 15.40 -+#include <cstdlib> 15.41 -+#include <algorithm> 15.42 - 15.43 - 15.44 - // make sure directory names end with a slash 15.45 -diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc 15.46 ---- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200 15.47 -+++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100 15.48 -@@ -33,6 +33,8 @@ 15.49 - #include <X11/Xutil.h> 15.50 - #include <X11/cursorfont.h> 15.51 - 15.52 -+#include <cstring> 15.53 -+ 15.54 - 15.55 - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { 15.56 - screen_resources = 0; 15.57 -diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc 15.58 ---- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100 15.59 -+++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100 15.60 -@@ -34,7 +34,8 @@ 15.61 - #include "blackbox.hh" 15.62 - #include "../version.h" 15.63 - 15.64 --#include <stdio.h> 15.65 -+#include <cstdio> 15.66 -+#include <cstring> 15.67 - 15.68 - 15.69 - static void showHelp(int exitval) { 15.70 -diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc 15.71 ---- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200 15.72 -+++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100 15.73 -@@ -45,8 +45,9 @@ 15.74 - #include <sys/types.h> 15.75 - #include <sys/stat.h> 15.76 - #include <assert.h> 15.77 --#include <ctype.h> 15.78 - #include <dirent.h> 15.79 -+#include <cctype> 15.80 -+#include <cstring> 15.81 - 15.82 - 15.83 - static bool running = true; 15.84 -diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc 15.85 ---- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200 15.86 -+++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100 15.87 -@@ -33,6 +33,8 @@ 15.88 - 15.89 - #include <assert.h> 15.90 - 15.91 -+#include <cstring> 15.92 -+ 15.93 - 15.94 - static const int iconify_width = 9; 15.95 - static const int iconify_height = 9; 15.96 -diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc 15.97 ---- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100 15.98 -+++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100 15.99 -@@ -30,7 +30,9 @@ 15.100 - #include <cctype> 15.101 - 15.102 - #include <X11/Xatom.h> 15.103 --#include <stdio.h> 15.104 -+#include <cstdio> 15.105 -+#include <cstdlib> 15.106 -+#include <cstring> 15.107 - 15.108 - 15.109 - // ignore all X errors
16.1 --- a/blackbox/stuff/patches/series Tue Nov 06 16:35:54 2018 +0200 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,3 +0,0 @@ 16.4 --p1|blackbox-0.70.1-gcc-4.3.patch 16.5 --p0|blackbox-0.70.1-asneeded.patch 16.6 --p1|textpropertytostring-unconditional.patch
17.1 --- a/blackbox/stuff/patches/textpropertytostring-unconditional.patch Tue Nov 06 16:35:54 2018 +0200 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,28 +0,0 @@ 17.4 -Description: Declare bt::textPropertyToString unconditionally. 17.5 -Author: Jakub Wilk <jwilk@debian.org> 17.6 -Forwarded: no 17.7 -Bug-Debian: http://bugs.debian.org/614468 17.8 -Last-Update: 2011-03-12 17.9 - 17.10 ---- a/lib/Util.hh 17.11 -+++ b/lib/Util.hh 17.12 -@@ -25,6 +25,8 @@ 17.13 - #ifndef __Util_hh 17.14 - #define __Util_hh 17.15 - 17.16 -+#include <X11/Xutil.h> 17.17 -+ 17.18 - #include <limits.h> 17.19 - #include <string> 17.20 - 17.21 -@@ -94,10 +96,8 @@ 17.22 - 17.23 - std::string tolower(const std::string &string); 17.24 - 17.25 --#ifdef _XUTIL_H_ 17.26 - std::string textPropertyToString(::Display *display, 17.27 - ::XTextProperty& text_prop); 17.28 --#endif 17.29 - 17.30 - } // namespace bt 17.31 -
18.1 --- a/exiftool/receipt Tue Nov 06 16:35:54 2018 +0200 18.2 +++ b/exiftool/receipt Thu Nov 08 15:34:32 2018 +0200 18.3 @@ -1,28 +1,31 @@ 18.4 -# SliTaz package receipt. 18.5 +# SliTaz package receipt v2. 18.6 18.7 PACKAGE="exiftool" 18.8 -VERSION="8.40" 18.9 +VERSION="11.17" 18.10 CATEGORY="system-tools" 18.11 -SHORT_DESC="Reading, writing and editing meta information in a wide variety of files" 18.12 -MAINTAINER="devel@slitaz.org" 18.13 +SHORT_DESC="Read, write and edit meta information in a wide variety of files" 18.14 +MAINTAINER="al.bobylev@gmail.com" 18.15 LICENSE="Artistic" 18.16 WEB_SITE="http://owl.phy.queensu.ca/~phil/exiftool/" 18.17 +HOST_ARCH="any" 18.18 18.19 -SOURCE="Image-ExifTool" 18.20 -TARBALL="$SOURCE-$VERSION.tar.gz" 18.21 +TARBALL="Image-ExifTool-$VERSION.tar.gz" 18.22 WGET_URL="http://owl.phy.queensu.ca/~phil/exiftool/$TARBALL" 18.23 +TARBALL_SHA1="9ad727f0b588fd08212591654b93c095649d26da" 18.24 +TARBALL_MD5="c7d93ac2a472c9843845a4ff152b4eb7" 18.25 18.26 BUILD_DEPENDS="perl" 18.27 18.28 compile_rules() { 18.29 perl Makefile.PL && 18.30 make && 18.31 - make DESTDIR=$install install 18.32 + make DESTDIR=$install install || return 1 18.33 + 18.34 + find $install -type f -exec chmod u+w '{}' \; 18.35 } 18.36 18.37 genpkg_rules() { 18.38 - cp -a $install/usr $fs 18.39 - rm -rf $fs/usr/share 18.40 + copy @std 18.41 DEPENDS="perl" 18.42 SUGGESTED="perl-archive-zip perl-io-compress" 18.43 }
19.1 --- a/faac/receipt Tue Nov 06 16:35:54 2018 +0200 19.2 +++ b/faac/receipt Thu Nov 08 15:34:32 2018 +0200 19.3 @@ -1,7 +1,7 @@ 19.4 # SliTaz package receipt v2. 19.5 19.6 PACKAGE="faac" 19.7 -VERSION="1.28" 19.8 +VERSION="1.29.9.2" 19.9 CATEGORY="multimedia" 19.10 SHORT_DESC="Open source MPEG-4 and MPEG-2 AAC encoder" 19.11 MAINTAINER="paul@slitaz.org" 19.12 @@ -9,15 +9,12 @@ 19.13 WEB_SITE="https://www.audiocoding.com/" 19.14 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/faac.html" 19.15 19.16 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 19.17 +TARBALL="$PACKAGE-$VERSION.tar.gz" 19.18 WGET_URL="$SF_MIRROR/faac/$TARBALL" 19.19 19.20 SPLIT="$PACKAGE-dev" 19.21 19.22 compile_rules() { 19.23 - sed -i '/obj-type/d; /Long Term/d' frontend/main.c 19.24 - 19.25 - CFLAGS=-std=c99 CXXFLAGS=-std=c++98 \ 19.26 ./configure \ 19.27 --disable-static \ 19.28 $CONFIGURE_ARGS && 19.29 @@ -30,7 +27,7 @@ 19.30 case $PACKAGE in 19.31 faac) 19.32 copy @std 19.33 - TAGS="mp4 mpeg encoder" 19.34 + TAGS="aac mp4 mpeg encoder" 19.35 ;; 19.36 *-dev) 19.37 copy @dev
20.1 --- a/faac/stuff/patches/faac-1.28-glibc_fixes-1.patch Tue Nov 06 16:35:54 2018 +0200 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,25 +0,0 @@ 20.4 -Submitted By: Guy Dalziel <gdalziel at linuxfromscratch dot org> 20.5 -Date: 2009-08-04 20.6 -Initial Package Version: 1.28 20.7 -Origin: Guy Dalziel 20.8 -Upstream Status: Not submitted. 20.9 -Description: Fixes a function conflict between FAAC and Glibc. 20.10 - 20.11 -diff -Naur faac-1.28-orig/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h 20.12 ---- faac-1.28-orig/common/mp4v2/mpeg4ip.h 2009-01-26 22:42:35.000000000 +0000 20.13 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-08-04 13:45:47.728062591 +0100 20.14 -@@ -120,14 +120,6 @@ 20.15 - #endif 20.16 - #include <sys/param.h> 20.17 - 20.18 --#ifdef __cplusplus 20.19 --extern "C" { 20.20 --#endif 20.21 --char *strcasestr(const char *haystack, const char *needle); 20.22 --#ifdef __cplusplus 20.23 --} 20.24 --#endif 20.25 -- 20.26 - #define OPEN_RDWR O_RDWR 20.27 - #define OPEN_CREAT O_CREAT 20.28 - #define OPEN_RDONLY O_RDONLY
21.1 --- a/faac/stuff/patches/series Tue Nov 06 16:35:54 2018 +0200 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,1 +0,0 @@ 21.4 -faac-1.28-glibc_fixes-1.patch
22.1 --- a/faad2/receipt Tue Nov 06 16:35:54 2018 +0200 22.2 +++ b/faad2/receipt Thu Nov 08 15:34:32 2018 +0200 22.3 @@ -1,12 +1,12 @@ 22.4 # SliTaz package receipt v2. 22.5 22.6 PACKAGE="faad2" 22.7 -VERSION="2.8.6" 22.8 +VERSION="2.8.8" 22.9 CATEGORY="multimedia" 22.10 SHORT_DESC="ISO AAC audio decoder" 22.11 -MAINTAINER="devel@slitaz.org" 22.12 +MAINTAINER="al.bobylev@gmail.com" 22.13 LICENSE="GPL2" 22.14 -WEB_SITE="http://faac.sourceforge.net/" 22.15 +WEB_SITE="https://www.audiocoding.com/" 22.16 22.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 22.18 WGET_URL="$SF_MIRROR/faac/$TARBALL" 22.19 @@ -14,7 +14,9 @@ 22.20 SPLIT="$PACKAGE-dev" 22.21 22.22 compile_rules() { 22.23 - ./configure $CONFIGURE_ARGS && 22.24 + ./configure \ 22.25 + --disable-static \ 22.26 + $CONFIGURE_ARGS && 22.27 fix libtool && 22.28 make && 22.29 make install
23.1 --- a/mariadb/receipt Tue Nov 06 16:35:54 2018 +0200 23.2 +++ b/mariadb/receipt Thu Nov 08 15:34:32 2018 +0200 23.3 @@ -1,7 +1,7 @@ 23.4 # SliTaz package receipt v2. 23.5 23.6 PACKAGE="mariadb" 23.7 -VERSION="10.0.11" 23.8 +VERSION="10.2.18" 23.9 CATEGORY="office" 23.10 SHORT_DESC="SQL database system" 23.11 MAINTAINER="devel@slitaz.org" 23.12 @@ -9,26 +9,89 @@ 23.13 WEB_SITE="https://mariadb.org/" 23.14 23.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 23.16 -WGET_URL="http://pangolin.slitaz.org/downloads/sources/$TARBALL" 23.17 +WGET_URL="https://downloads.mariadb.org/interstitial/mariadb-$VERSION/source/$TARBALL" 23.18 23.19 BUILD_DEPENDS="cmake ncurses-dev bison openssl-dev" 23.20 +BUILD_DEPENDS="cmake libaio-dev valgrind-dev zlib-dev openssl-dev ncurses-dev \ 23.21 +pcre-dev curl-dev libxml2-dev xz-dev " 23.22 SPLIT="libmariadbclient $PACKAGE-client $PACKAGE-dev $PACKAGE-test" 23.23 23.24 compile_rules() { 23.25 + case $ARCH in 23.26 + i?86) ARCH_ARGS='-DPLUGIN_ROCKSDB=NO';; 23.27 + *) ARCH_ARGS='-DPLUGIN_ROCKSDB=YES';; 23.28 + esac 23.29 + 23.30 cmake \ 23.31 + -DBUILD_CONFIG=mysql_release \ 23.32 -DCMAKE_INSTALL_PREFIX=/usr \ 23.33 - -DINSTALL-DOCREADMEDIR=/usr/share/doc \ 23.34 - -DINSTALL_MYSQLDATADIR=/var/lib/mysql \ 23.35 - -DINSTALL_SYSCONFDIR=/etc \ 23.36 - -DINSTALL_LIBDIR=lib/mysql \ 23.37 - -DINSTALL_INFODIR=share/doc/mysql \ 23.38 + -DSYSCONFDIR=/etc \ 23.39 + -DSYSCONF2DIR=/etc/my.cnf.d \ 23.40 + -DMYSQL_DATADIR=/var/lib/mysql \ 23.41 + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ 23.42 + -DDEFAULT_CHARSET=utf8 \ 23.43 + -DDEFAULT_COLLATION=utf8_general_ci \ 23.44 + -DENABLED_LOCAL_INFILE=ON \ 23.45 + -DINSTALL_INFODIR=share/info \ 23.46 -DINSTALL_MANDIR=share/man \ 23.47 - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ 23.48 - -DINSTALL_SHAREDIR=share \ 23.49 - -DINSTALL_MYSQLSHAREDIR=share/mysql \ 23.50 - -DINSTALL_UNIX_ADDRDIR=/var/run/mysqld/mysqld.sock \ 23.51 + -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ 23.52 + -DINSTALL_SCRIPTDIR=bin \ 23.53 + -DINSTALL_INCLUDEDIR=include/mysql \ 23.54 + -DINSTALL_DOCREADMEDIR=share/doc/mariadb \ 23.55 + -DINSTALL_SUPPORTFILESDIR=share/mariadb \ 23.56 + -DINSTALL_MYSQLSHAREDIR=share/mariadb \ 23.57 + -DINSTALL_DOCDIR=share/doc/mariadb \ 23.58 + -DTMPDIR=/var/tmp \ 23.59 + -DCONNECT_WITH_MYSQL=ON \ 23.60 + -DCONNECT_WITH_LIBXML2=system \ 23.61 + -DCONNECT_WITH_ODBC=NO \ 23.62 + -DCONNECT_WITH_JDBC=NO \ 23.63 + -DPLUGIN_ARCHIVE=YES \ 23.64 + -DPLUGIN_ARIA=YES \ 23.65 + -DPLUGIN_BLACKHOLE=YES \ 23.66 + -DPLUGIN_CASSANDRA=NO \ 23.67 + -DPLUGIN_CSV=YES \ 23.68 + -DPLUGIN_MYISAM=YES \ 23.69 + -DPLUGIN_MROONGA=NO \ 23.70 + -DPLUGIN_OQGRAPH=NO \ 23.71 + -DPLUGIN_PARTITION=YES \ 23.72 + -DPLUGIN_SPHINX=NO \ 23.73 + -DPLUGIN_TOKUDB=NO \ 23.74 + -DPLUGIN_AUTH_PAM=NO \ 23.75 + -DPLUGIN_AUTH_GSSAPI=NO \ 23.76 + -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \ 23.77 + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=NO \ 23.78 + -DWITH_ASAN=OFF \ 23.79 + -DWITH_EMBEDDED_SERVER=ON \ 23.80 + -DWITH_EXTRA_CHARSETS=complex \ 23.81 + -DWITH_INNODB_BZIP2=OFF \ 23.82 + -DWITH_INNODB_LZ4=OFF \ 23.83 + -DWITH_INNODB_LZMA=ON \ 23.84 + -DWITH_INNODB_LZO=OFF \ 23.85 + -DWITH_INNODB_SNAPPY=OFF \ 23.86 + -DWITH_ROCKSDB_BZIP2=OFF \ 23.87 + -DWITH_ROCKSDB_JEMALLOC=OFF \ 23.88 + -DWITH_ROCKSDB_LZ4=OFF \ 23.89 + -DWITH_ROCKSDB_ZSTD=OFF \ 23.90 + -DWITH_ROCKSDB_SNAPPY=OFF \ 23.91 + -DWITH_JEMALLOC=NO \ 23.92 + -DWITH_LIBARCHIVE=system \ 23.93 + -DWITH_LIBNUMA=NO \ 23.94 + -DWITH_LIBWRAP=OFF \ 23.95 + -DWITH_LIBWSEP=OFF \ 23.96 + -DWITH_MARIABACKUP=ON \ 23.97 + -DWITH_PCRE=system \ 23.98 + -DWITH_READLINE=ON \ 23.99 + -DWITH_SYSTEMD=no \ 23.100 + -DWITH_SSL=system \ 23.101 + -DWITH_VALGRIND=OFF \ 23.102 + -DWITH_ZLIB=system \ 23.103 + -DSKIP_TESTS=ON \ 23.104 + $ARCH_ARGS \ 23.105 . && 23.106 - make $MAKEFLAGS && 23.107 + # print config options to log 23.108 + cmake -L && 23.109 + make && 23.110 make install 23.111 } 23.112
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/mariadb/stuff/patches/fix-mysql-install-db-path.patch Thu Nov 08 15:34:32 2018 +0200 24.3 @@ -0,0 +1,41 @@ 24.4 +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt 24.5 +index 464c00d..d75874e 100644 24.6 +--- a/scripts/CMakeLists.txt 24.7 ++++ b/scripts/CMakeLists.txt 24.8 +@@ -166,29 +166,13 @@ SET(HOSTNAME "hostname") 24.9 + SET(MYSQLD_USER "mysql") 24.10 + ENDIF(UNIX) 24.11 + 24.12 +-# Really ugly, one script, "mysql_install_db", needs prefix set to ".", 24.13 +-# i.e. makes access relative the current directory. This matches 24.14 +-# the documentation, so better not change this. 24.15 +- 24.16 +-IF(INSTALL_LAYOUT MATCHES "STANDALONE") 24.17 +- SET(prefix ".") 24.18 +- SET(bindir ${prefix}/${INSTALL_BINDIR}) 24.19 +- SET(sbindir ${prefix}/${INSTALL_SBINDIR}) 24.20 +- SET(scriptdir ${prefix}/${INSTALL_BINDIR}) 24.21 +- SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) 24.22 +- SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) 24.23 +- SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) 24.24 +- SET(localstatedir ${prefix}/data) 24.25 +-ELSE() 24.26 +- SET(prefix "${CMAKE_INSTALL_PREFIX}") 24.27 +- SET(bindir ${INSTALL_BINDIRABS}) 24.28 +- SET(sbindir ${INSTALL_SBINDIRABS}) 24.29 +- SET(scriptdir ${INSTALL_BINDIRABS}) 24.30 +- SET(libexecdir ${INSTALL_SBINDIRABS}) 24.31 +- SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) 24.32 +- SET(pkgplugindir ${INSTALL_PLUGINDIRABS}) 24.33 +- SET(localstatedir ${MYSQL_DATADIR}) 24.34 +-ENDIF() 24.35 ++SET(prefix "${CMAKE_INSTALL_PREFIX}") 24.36 ++SET(bindir ${prefix}/${INSTALL_BINDIR}) 24.37 ++SET(sbindir ${prefix}/${INSTALL_SBINDIR}) 24.38 ++SET(scriptdir ${prefix}/${INSTALL_BINDIR}) 24.39 ++SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) 24.40 ++SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) 24.41 ++SET(localstatedir ${MYSQL_DATADIR}) 24.42 + 24.43 + SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") 24.44 + SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin")
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/mariadb/stuff/patches/fix-pthread-detach.patch Thu Nov 08 15:34:32 2018 +0200 25.3 @@ -0,0 +1,39 @@ 25.4 +From c45b4a774b6d1404a080a1c1759f780fa78f223b Mon Sep 17 00:00:00 2001 25.5 +From: Sergey Vojtovich <svoj@mariadb.org> 25.6 +Date: Fri, 21 Sep 2018 16:04:16 +0400 25.7 +Subject: [PATCH] MDEV-17200 - pthread_detach called for already detached 25.8 + threads 25.9 + 25.10 +pthread_detach_this_thread() was intended to be defined to something 25.11 +meaningful only on some ancient unixes, which don't have 25.12 +pthread_attr_setdetachstate() defined. Otherwise, on normal unixes, 25.13 +threads are created detached in the first place. 25.14 + 25.15 +This was broken in 0f01bf267680244ec488adaf65a42838756ed48e so that 25.16 +we started calling pthread_detach() for already detached threads. 25.17 +Intention was to detach aria checkpoint thread. 25.18 + 25.19 +However in 87007dc2f71634cc460271eb277ad851ec69c04b aria service threads 25.20 +were made joinable with appropriate handling, which makes breaking 25.21 +revision unneccessary. 25.22 + 25.23 +Revert remnants of 0f01bf267680244ec488adaf65a42838756ed48e, so that 25.24 +pthread_detach_this_thread() is meaningful only on some ancient unixes 25.25 +again. 25.26 +--- 25.27 + include/my_pthread.h | 2 +- 25.28 + 1 file changed, 1 insertion(+), 1 deletion(-) 25.29 + 25.30 +diff --git a/include/my_pthread.h b/include/my_pthread.h 25.31 +index 6b830ca36d24..ae2f912f979b 100644 25.32 +--- a/include/my_pthread.h 25.33 ++++ b/include/my_pthread.h 25.34 +@@ -184,7 +184,7 @@ int pthread_cancel(pthread_t thread); 25.35 + #define pthread_key(T,V) pthread_key_t V 25.36 + #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V)) 25.37 + #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V)) 25.38 +-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); } 25.39 ++#define pthread_detach_this_thread() 25.40 + #define pthread_handler_t EXTERNC void * 25.41 + typedef void *(* pthread_handler)(void *); 25.42 +
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/mariadb/stuff/patches/fix-ucontext-check.patch Thu Nov 08 15:34:32 2018 +0200 26.3 @@ -0,0 +1,18 @@ 26.4 +--- a/configure.cmake 26.5 ++++ b/configure.cmake 26.6 +@@ -1018,9 +1018,12 @@ 26.7 + 26.8 + SET(CMAKE_EXTRA_INCLUDE_FILES) 26.9 + 26.10 +-CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) 26.11 +-IF(NOT HAVE_UCONTEXT_H) 26.12 +- CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) 26.13 ++CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_HEADER) 26.14 ++IF(NOT HAVE_UCONTEXT_HEADER) 26.15 ++ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_HEADER) 26.16 ++ENDIF() 26.17 ++IF(HAVE_UCONTEXT_HEADER) 26.18 ++ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) 26.19 + ENDIF() 26.20 + IF(HAVE_UCONTEXT_H) 26.21 + CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H)
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/mariadb/stuff/patches/pcre.cmake.patch Thu Nov 08 15:34:32 2018 +0200 27.3 @@ -0,0 +1,15 @@ 27.4 +--- a/cmake/pcre.cmake 27.5 ++++ b/cmake/pcre.cmake 27.6 +@@ -8,11 +8,7 @@ 27.7 + CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD) 27.8 + IF(NOT CMAKE_CROSSCOMPILING) 27.9 + SET(CMAKE_REQUIRED_LIBRARIES "pcre") 27.10 +- CHECK_C_SOURCE_RUNS(" 27.11 +- #include <pcre.h> 27.12 +- int main() { 27.13 +- return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256; 27.14 +- }" PCRE_STACK_SIZE_OK) 27.15 ++ SET(PCRE_STACK_SIZE_OK TRUE) 27.16 + SET(CMAKE_REQUIRED_LIBRARIES) 27.17 + ENDIF() 27.18 + ENDIF()
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/mariadb/stuff/patches/ppc-remove-glibc-dep.patch Thu Nov 08 15:34:32 2018 +0200 28.3 @@ -0,0 +1,49 @@ 28.4 +diff --git a/include/my_cpu.h b/include/my_cpu.h 28.5 +index f2e26fca..94599b74 100644 28.6 +--- a/include/my_cpu.h 28.7 ++++ b/include/my_cpu.h 28.8 +@@ -24,17 +24,16 @@ 28.9 + */ 28.10 + 28.11 + #ifdef _ARCH_PWR8 28.12 +-#include <sys/platform/ppc.h> 28.13 + /* Very low priority */ 28.14 +-#define HMT_very_low() __ppc_set_ppr_very_low() 28.15 ++#define HMT_very_low() asm volatile("or 31,31,31") 28.16 + /* Low priority */ 28.17 +-#define HMT_low() __ppc_set_ppr_low() 28.18 ++#define HMT_low() asm volatile ("or 1,1,1") 28.19 + /* Medium low priority */ 28.20 +-#define HMT_medium_low() __ppc_set_ppr_med_low() 28.21 ++#define HMT_medium_low() asm volatile ("or 6,6,6") 28.22 + /* Medium priority */ 28.23 +-#define HMT_medium() __ppc_set_ppr_med() 28.24 ++#define HMT_medium() asm volatile ("or 2,2,2") 28.25 + /* Medium high priority */ 28.26 +-#define HMT_medium_high() __ppc_set_ppr_med_high() 28.27 ++#define HMT_medium_high() asm volatile("or 5,5,5") 28.28 + /* High priority */ 28.29 + #define HMT_high() asm volatile("or 3,3,3") 28.30 + #else 28.31 +@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void) 28.32 + */ 28.33 + YieldProcessor(); 28.34 + #elif defined(_ARCH_PWR8) 28.35 +- __ppc_get_timebase(); 28.36 ++ __builtin_ppc_get_timebase(); 28.37 + #else 28.38 + int32 var, oldval = 0; 28.39 + my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED, 28.40 +diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h 28.41 +index c4c45b8e..2f7a07f5 100644 28.42 +--- a/storage/tokudb/PerconaFT/portability/toku_time.h 28.43 ++++ b/storage/tokudb/PerconaFT/portability/toku_time.h 28.44 +@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) { 28.45 + __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result)); 28.46 + return result; 28.47 + #elif defined(__powerpc__) 28.48 +- return __ppc_get_timebase(); 28.49 ++ return __builtin_ppc_get_timebase(); 28.50 + #else 28.51 + #error No timer implementation for this platform 28.52 + #endif
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/mariadb/stuff/patches/series Thu Nov 08 15:34:32 2018 +0200 29.3 @@ -0,0 +1,7 @@ 29.4 +# From Alpine Linux: 29.5 +# https://git.alpinelinux.org/cgit/aports/tree/main/mariadb?h=master 29.6 +fix-mysql-install-db-path.patch 29.7 +fix-ucontext-check.patch 29.8 +fix-pthread-detach.patch 29.9 +#ppc-remove-glibc-dep.patch 29.10 +pcre.cmake.patch