# HG changeset patch # User Aleksej Bobylev # Date 1541684072 -7200 # Node ID 21ab7a6eb1921f137a6e70899b68ff9b5413d3bb # Parent 5e01e6d2531a2b31ef9889ced41b8480cda49c40 Small updates diff -r 5e01e6d2531a -r 21ab7a6eb192 acct/receipt --- a/acct/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/acct/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,25 +1,26 @@ # SliTaz package receipt v2. PACKAGE="acct" -VERSION="6.6.2" +VERSION="6.6.4" CATEGORY="utilities" SHORT_DESC="Utilities that report data about users logged on GNU/Linux" MAINTAINER="devel@slitaz.org" LICENSE="GPL3" -WEB_SITE="http://savannah.gnu.org/projects/acct/" +WEB_SITE="https://www.gnu.org/software/acct/" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" compile_rules() { - ./configure $CONFIGURE_ARGS && + ./configure \ + --enable-linux-multiformat \ + $CONFIGURE_ARGS && fix libtool && - make $MAKEFLAGS && - make DESTDIR=$install install + make && + make install } genpkg_rules() { copy @std - DEPENDS="gcc-lib-base glibc" TAGS="analysis network utilities" } diff -r 5e01e6d2531a -r 21ab7a6eb192 aircrack-ng/receipt --- a/aircrack-ng/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/aircrack-ng/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="aircrack-ng" -VERSION="1.3" +VERSION="1.4" CATEGORY="network" SHORT_DESC="802.11 WEP and WPA-PSK keys cracking program" MAINTAINER="pascal.bellard@slitaz.org" @@ -23,7 +23,9 @@ $CONFIGURE_ARGS && fix libtool && make && - make install + make install || return 1 + + find $install -type f -name '*.pyc' -delete } genpkg_rules() { diff -r 5e01e6d2531a -r 21ab7a6eb192 aisleriot/receipt --- a/aisleriot/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/aisleriot/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="aisleriot" -VERSION="3.22.6" +VERSION="3.22.7" CATEGORY="games" SHORT_DESC="A collection of patience games" MAINTAINER="al.bobylev@gmail.com" diff -r 5e01e6d2531a -r 21ab7a6eb192 ajaxterm/receipt --- a/ajaxterm/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/ajaxterm/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,53 +1,68 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="ajaxterm" -VERSION="0.10" +VERSION="0.11" +COMMIT="2eaa3e989782d8259a12c8cb7d6204433ae19264" CATEGORY="network" SHORT_DESC="Login terminal for the web" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="PublicDomain LGPL" -WEB_SITE="http://antony.lesuisse.org/software/ajaxterm/" +WEB_SITE="https://github.com/antonylesuisse/qweb/tree/master/ajaxterm" -SOURCE="Ajaxterm" -TARBALL="$SOURCE-$VERSION.tar.gz" -WGET_URL="${WEB_SITE}files/$TARBALL" +TARBALL="ajaxterm-$VERSION-$COMMIT.tar.gz" +WGET_URL="https://sources.archlinux.org/other/community/ajaxterm/$TARBALL" compile_rules() { + ./configure --prefix=/usr + + install -Dm755 ajaxterm.bin $install/usr/bin/ajaxterm + + mkdir -p $install/usr/share/ajaxterm/ + install -m644 ajaxterm.css ajaxterm.html qweb.py *.js $install/usr/share/ajaxterm/ + install -m755 ajaxterm.py $install/usr/share/ajaxterm/ + + install -Dm755 $stuff/etc/init.d/ajaxterm $install/etc/init.d/ajaxterm + cook_pick_manpages $src/ajaxterm.1 + + cook_pick_docs $stuff/README.md + + # Note, $stuff/usr/ still contain some rewritten files for the previous + # Ajaxterm version. I don't know how they are compatible with this newer + # version and don't use them at the moment. It would be much better if + # the patch were used... } genpkg_rules() { - mkdir -p $fs/usr/share/ajaxterm - cp -a $src/*.py $src/*.js $src/*.css $src/*.html $fs/usr/share/ajaxterm - cp -a $stuff/* $fs/ - chown -R root:root $fs - find $fs -type f -name '*.py' -exec chmod a+x \{\} \; + copy @std DEPENDS="python" SUGGESTED="apache lighttpd-ssl lighttpd-modules" TAGS="web application" } post_install() { - grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "ajaxterm" || sed -i \ - 's/RUN_DAEMONS="/RUN_DAEMONS="ajaxterm /' "$1/etc/rcS.conf" + grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "ajaxterm" || + sed -i 's|RUN_DAEMONS="|RUN_DAEMONS="ajaxterm |' "$1/etc/rcS.conf" + # Configure lighttpd server if [ -f "$1/usr/lib/lighttpd/mod_proxy.so" ]; then - grep -q mod_proxy "$1/etc/lighttpd/lighttpd.conf" || + grep -q mod_proxy "$1/etc/lighttpd/lighttpd.conf" || cat >> "$1/etc/lighttpd/lighttpd.conf" <> "$1/etc/lighttpd/lighttpd.conf" < ( ( "host" => "127.0.0.1", "port" => 8022 ) ) ) EOT - if [ -z "$1" ]; then - # Start Web server. - /etc/init.d/lighttpd stop - /etc/init.d/lighttpd start - fi + if [ -z "$1" ]; then + # Start Web server. + /etc/init.d/lighttpd stop + /etc/init.d/lighttpd start + fi fi + # Configure apache server if [ -f "$1/etc/apache/httpd.conf" ]; then if [ ! -f "$1/etc/apache/conf.d/ajaxterm" ]; then @@ -70,22 +85,23 @@ fi fi fi + [ -z "$1" ] && /etc/init.d/ajaxterm start [ ! -f "$1/usr/lib/lighttpd/mod_proxy.so" -a \ ! -f "$1/etc/apache/httpd.conf" ] && [ -z "$quiet" ] && cat < + +## Screenshot + +
ajaxterm screenshot
+ + +## Documentation and Caveats + + * Ajaxterm only support latin1, if you use Ubuntu or any `LANG==en_US.UTF-8` + distribution don't forget to `unset LANG`. + * If run as root ajaxterm will run `/bin/login`, otherwise it will run `ssh` + localhost. To use an other command use the `-c` option. + * By default Ajaxterm only listen at 127.0.0.1:8022. For remote access, it is + strongly recommended to use **https SSL/TLS**, and that is simple to + configure if you use the apache web server using mod_proxy. + Using ssl will also speed up ajaxterm (probably because of keepalive). + Here is an configuration example: + +``` + Listen 443 + NameVirtualHost *:443 + + + ServerName localhost + SSLEngine On + SSLCertificateKeyFile ssl/apache.pem + SSLCertificateFile ssl/apache.pem + + ProxyRequests Off + + Order deny,allow + Allow from all + + ProxyPass /ajaxterm/ http://localhost:8022/ + ProxyPassReverse /ajaxterm/ http://localhost:8022/ + +``` + + * Using GET HTTP request seems to speed up ajaxterm, just click on GET in the + interface, but be warned that your keystrokes might be loggued (by apache or + any proxy). I usually enable it after the login. + + * Ajaxterm commandline usage: + +``` +usage: ajaxterm.py [options] + +options: + -h, --help show this help message and exit + -pPORT, --port=PORT Set the TCP port (default: 8022) + -cCMD, --command=CMD set the command (default: /bin/login or ssh localhost) + -l, --log log requests to stderr (default: quiet mode) + -d, --daemon run as daemon in the background + -PPIDFILE, --pidfile=PIDFILE + set the pidfile (default: /var/run/ajaxterm.pid) + -iINDEX_FILE, --index=INDEX_FILE + default index file (default: ajaxterm.html) + -uUID, --uid=UID Set the daemon's user id +``` + + * Ajaxterm was first written as a demo for qweb (my web framework), but + actually doesn't use many features of qweb. + + * Compared to anyterm: + * There are no partial updates, ajaxterm updates either all the screen or + nothing. That make the code simpler and I also think it's faster. HTTP + replies are always gzencoded. When used in 80x25 mode, almost all of + them are below the 1500 bytes (size of an ethernet frame) and we just + replace the screen with the reply (no javascript string handling). + * Ajaxterm polls the server for updates with an exponentially growing + timeout when the screen hasn't changed. The timeout is also resetted as + soon as a key is pressed. Anyterm blocks on a pending request and use a + parallel connection for keypresses. The anyterm approch is better + when there aren't any keypress. + + * Ajaxterm files are released in the Public Domain, (except + [sarissa*](http://sarissa.sourceforge.net/doc/) which are LGPL). + +## TODO + + * insert mode ESC [ 4 h + * change size x,y from gui (sending signal) + * vt102 graphic codepage + * use innerHTML or prototype instead of sarissa + diff -r 5e01e6d2531a -r 21ab7a6eb192 ajaxterm/stuff/patches/ajaxterm-css.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ajaxterm/stuff/patches/ajaxterm-css.patch Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,71 @@ +diff --git a/ajaxterm.css b/ajaxterm.css +index b9a5f87..bfa0d38 100644 +--- a/ajaxterm.css ++++ b/ajaxterm.css +@@ -23,7 +23,8 @@ pre.stat .off { + color: white; + cursor: pointer; + } +-pre.term { ++#term { ++ float: left; + margin: 0px; + padding: 4px; + display: block; +@@ -33,32 +34,29 @@ pre.term { + border-top: 1px solid white; + color: #eee; + } +-pre.term span.f0 { color: #000; } +-pre.term span.f1 { color: #b00; } +-pre.term span.f2 { color: #0b0; } +-pre.term span.f3 { color: #bb0; } +-pre.term span.f4 { color: #00b; } +-pre.term span.f5 { color: #b0b; } +-pre.term span.f6 { color: #0bb; } +-pre.term span.f7 { color: #bbb; } +-pre.term span.f8 { color: #666; } +-pre.term span.f9 { color: #f00; } +-pre.term span.f10 { color: #0f0; } +-pre.term span.f11 { color: #ff0; } +-pre.term span.f12 { color: #00f; } +-pre.term span.f13 { color: #f0f; } +-pre.term span.f14 { color: #0ff; } +-pre.term span.f15 { color: #fff; } +-pre.term span.b0 { background-color: #000; } +-pre.term span.b1 { background-color: #b00; } +-pre.term span.b2 { background-color: #0b0; } +-pre.term span.b3 { background-color: #bb0; } +-pre.term span.b4 { background-color: #00b; } +-pre.term span.b5 { background-color: #b0b; } +-pre.term span.b6 { background-color: #0bb; } +-pre.term span.b7 { background-color: #bbb; } ++span.f0 { color: #000; } ++span.f1 { color: #b00; } ++span.f2 { color: #0b0; } ++span.f3 { color: #bb0; } ++span.f4 { color: #00b; } ++span.f5 { color: #b0b; } ++span.f6 { color: #0bb; } ++span.f7 { color: #bbb; } ++span.f8 { color: #666; } ++span.f9 { color: #f00; } ++span.f10 { color: #0f0; } ++span.f11 { color: #ff0; } ++span.f12 { color: #00f; } ++span.f13 { color: #f0f; } ++span.f14 { color: #0ff; } ++span.f15 { color: #fff; } ++span.b0 { background-color: #000; } ++span.b1 { background-color: #b00; } ++span.b2 { background-color: #0b0; } ++span.b3 { background-color: #bb0; } ++span.b4 { background-color: #00b; } ++span.b5 { background-color: #b0b; } ++span.b6 { background-color: #0bb; } ++span.b7 { background-color: #bbb; } + + body { background-color: #888; } +-#term { +- float: left; +-} diff -r 5e01e6d2531a -r 21ab7a6eb192 ajaxterm/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ajaxterm/stuff/patches/series Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,3 @@ +# From Alpine Linux: +# https://git.alpinelinux.org/cgit/aports/tree/community/ajaxterm?h=master +ajaxterm-css.patch diff -r 5e01e6d2531a -r 21ab7a6eb192 astromenace/receipt --- a/astromenace/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/astromenace/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,38 +1,48 @@ # SliTaz package receipt v2. PACKAGE="astromenace" -VERSION="1.3.2" +VERSION="1.4.0" CATEGORY="games" -SHORT_DESC="Hardcore 3D space shooter with spaceship upgrade possibilities" -MAINTAINER="devel@slitaz.org" +SHORT_DESC="Hardcore 3D space scroll-shooter with spaceship upgrade possibilities" +MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL3" WEB_SITE="https://viewizard.com/" -TARBALL="$PACKAGE-src-$VERSION.tar.bz2" -WGET_URL="$SF_MIRROR/openastromenace/$TARBALL" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://github.com/viewizard/astromenace/archive/v$VERSION.tar.gz" -BUILD_DEPENDS="gcc cmake make libsdl-dev libogg-dev libvorbis-dev glu-dev \ -openal-dev freealut-dev xorg-libXinerama-dev freetype-dev mesa-dev \ -fontconfig-dev" +BUILD_DEPENDS="cmake libsdl2-dev mesa-dev openal-dev freealut-dev libogg-dev \ +libvorbis-dev freetype-dev glu-dev" +SPLIT="$PACKAGE-data" compile_rules() { - cmake . && - make && - ./AstroMenace --pack --rawdata=./RAW_VFS_DATA || return 1 + mkdir build + cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=/usr/share/astromenace \ + .. && + make || return 1 - chmod +x AstroMenace - - mkdir -p $install/usr/games/AstroMenace/ - cp AstroMenace astromenace_64.png astromenace_128.png ChangeLog.txt \ - gamedata.vfs gpl-3.0.txt $install/usr/games/AstroMenace/ - - mkdir -p $install/usr/share/pixmaps/ - cp astromenace_64.png $install/usr/share/pixmaps/astromenace.png + install -Dm755 $src/build/astromenace $install/usr/bin/astromenace + install -Dm644 $src/build/gamedata.vfs $install/usr/share/astromenace/gamedata.vfs + install -Dm644 $src/share/astromenace_64.png $install/usr/share/icons/hicolor/64x64/apps/astromenace.png + install -Dm644 $src/share/astromenace_128.png $install/usr/share/icons/hicolor/128x128/apps/astromenace.png + install -Dm644 $src/share/astromenace.desktop $install/usr/share/applications/astromenace.desktop + install -Dm644 $src/share/astromenace.appdata.xml $install/usr/share/appdata/astromenace.appdata.xml } genpkg_rules() { - copy @std - TAGS="arcade game shooting space" - DEPENDS="freealut freetype glu libsdl libvorbis mesa openal xorg-libX11 \ - xorg-libXinerama" + case $PACKAGE in + astromenace) + copy bin/ + DEPENDS="astromenace-data \ + freealut freetype glu libsdl2 libvorbis mesa openal" + TAGS="arcade game shooting space" + ;; + *-data) + copy @std icons/ @rm + CAT="games|game data" + ;; + esac } diff -r 5e01e6d2531a -r 21ab7a6eb192 astromenace/stuff/astromenace.desktop --- a/astromenace/stuff/astromenace.desktop Tue Nov 06 16:35:54 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=AstroMenace -Exec=/usr/games/AstroMenace/AstroMenace -Icon=astromenace -Terminal=false -X-MultipleArgs=false -StartupNotify=false -Categories=Game;ActionGame; diff -r 5e01e6d2531a -r 21ab7a6eb192 autofs/receipt --- a/autofs/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/autofs/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="autofs" -VERSION="5.1.4" +VERSION="5.1.5" CATEGORY="system-tools" SHORT_DESC="Linux automounter" MAINTAINER="pascal.bellard@slitaz.org" diff -r 5e01e6d2531a -r 21ab7a6eb192 bird/.icon.png Binary file bird/.icon.png has changed diff -r 5e01e6d2531a -r 21ab7a6eb192 bird/receipt --- a/bird/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/bird/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,10 +1,10 @@ # SliTaz package receipt v2. PACKAGE="bird" -VERSION="1.6.3" +VERSION="2.0.2" CATEGORY="network" SHORT_DESC="Internet routing daemon" -MAINTAINER="allan316@gmail.com" +MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2" WEB_SITE="https://bird.network.cz/" @@ -22,5 +22,6 @@ genpkg_rules() { copy @std DEPENDS="ncurses readline" + CONFIG_FILES="/etc/bird.conf" TAGS="route routing daemon" } diff -r 5e01e6d2531a -r 21ab7a6eb192 blackbox/receipt --- a/blackbox/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/blackbox/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,32 +1,44 @@ # SliTaz package receipt v2. PACKAGE="blackbox" -VERSION="0.70.1" +VERSION="0.74" CATEGORY="x-window" SHORT_DESC="A small, fast, full-featured window manager for X" -MAINTAINER="devl547@gmail.com" +MAINTAINER="al.bobylev@gmail.com" LICENSE="MIT" -WEB_SITE="https://sourceforge.net/projects/blackboxwm/" +WEB_SITE="https://github.com/bbidulock/blackboxwm" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="$SF_MIRROR/blackboxwm/$TARBALL" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="https://github.com/bbidulock/blackboxwm/releases/download/$VERSION/$TARBALL" -BUILD_DEPENDS="xorg-libXt-dev xorg-libXft-dev xorg-xorgproto libxml2-dev" +BUILD_DEPENDS="cmark-gfm asciidoc links gettext xorg-libX11-dev \ +xorg-libICE-dev xorg-libXext-dev xorg-libXft-dev" +SPLIT="$PACKAGE-dev" # TODO: modify tazx for blackbox so it will creat a correct ~/.xinitrc # to let user use the wm via slim/F1 or by default with 'tazx blackbox'. compile_rules() { + MARKDOWN=cmark-gfm \ ./configure \ - --libexecdir=/usr/bin \ + --disable-static \ + --enable-shared \ $CONFIGURE_ARGS && fix libtool && make && - make DESTDIR=$install install + make install } genpkg_rules() { - copy @std - DEPENDS="xorg-libXt xorg-libXft" - TAGS="window-manager" + case $PACKAGE in + blackbox) + copy @std + DEPENDS="xorg-libX11 xorg-libXext xorg-libXft" + TAGS="window-manager" + ;; + *-dev) + copy @dev + DEPENDS="blackbox xorg-libXft-dev" + ;; + esac } diff -r 5e01e6d2531a -r 21ab7a6eb192 blackbox/stuff/patches/blackbox-0.70.1-asneeded.patch --- a/blackbox/stuff/patches/blackbox-0.70.1-asneeded.patch Tue Nov 06 16:35:54 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -Fixing build with as-needed. Enabling shared libs. - -http://bugs.gentoo.org/show_bug.cgi?id=248549 - ---- src/Makefile.am -+++ src/Makefile.am -@@ -22,7 +22,7 @@ - - DEFAULT_MENU = $(pkgdatadir)/menu - DEFAULT_STYLE = $(pkgdatadir)/styles/Gray --CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ -+AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ - -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ - -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ - -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ ---- lib/Makefile.am -+++ lib/Makefile.am -@@ -62,7 +62,8 @@ - Util.hh \ - XDG.hh - --libbt_la_LIBADD = @ICONV@ @LOCALE@ -+libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ -+libbt_la_CFLAGS = @xft_CFLAGS@ - - pkgconfigdir = $(libdir)/pkgconfig - nodist_pkgconfig_DATA = libbt.pc ---- util/Makefile.am -+++ util/Makefile.am -@@ -21,7 +21,7 @@ - # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - # DEALINGS IN THE SOFTWARE. - --CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ -+AM_CPPFLAGS = @DEBUG@ @NLS@ \ - -I$(top_srcdir)/lib - - bin_SCRIPTS = bsetbg ---- configure.ac -+++ configure.ac -@@ -29,7 +29,7 @@ - AC_PROG_INSTALL - - dnl libbt shouldn't be shared by default (yet) --AC_DISABLE_SHARED -+dnl AC_DISABLE_SHARED - AC_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) - diff -r 5e01e6d2531a -r 21ab7a6eb192 blackbox/stuff/patches/blackbox-0.70.1-gcc-4.3.patch --- a/blackbox/stuff/patches/blackbox-0.70.1-gcc-4.3.patch Tue Nov 06 16:35:54 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc ---- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200 -+++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100 -@@ -42,8 +42,9 @@ - - #include - #include --#include --#include -+#include -+#include -+#include - - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG -diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc ---- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200 -+++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100 -@@ -28,7 +28,8 @@ - #include - #include - --#include -+#include -+#include - - - bt::Resource::Resource(void) -diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc ---- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200 -+++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100 -@@ -25,7 +25,8 @@ - #include "Util.hh" - #include "XDG.hh" - --#include -+#include -+#include - - - // make sure directory names end with a slash -diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc ---- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200 -+++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100 -@@ -33,6 +33,8 @@ - #include - #include - -+#include -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc ---- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100 -+++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100 -@@ -34,7 +34,8 @@ - #include "blackbox.hh" - #include "../version.h" - --#include -+#include -+#include - - - static void showHelp(int exitval) { -diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc ---- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200 -+++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100 -@@ -45,8 +45,9 @@ - #include - #include - #include --#include - #include -+#include -+#include - - - static bool running = true; -diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc ---- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200 -+++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100 -@@ -33,6 +33,8 @@ - - #include - -+#include -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc ---- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100 -+++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100 -@@ -30,7 +30,9 @@ - #include - - #include --#include -+#include -+#include -+#include - - - // ignore all X errors diff -r 5e01e6d2531a -r 21ab7a6eb192 blackbox/stuff/patches/series --- a/blackbox/stuff/patches/series Tue Nov 06 16:35:54 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ --p1|blackbox-0.70.1-gcc-4.3.patch --p0|blackbox-0.70.1-asneeded.patch --p1|textpropertytostring-unconditional.patch diff -r 5e01e6d2531a -r 21ab7a6eb192 blackbox/stuff/patches/textpropertytostring-unconditional.patch --- a/blackbox/stuff/patches/textpropertytostring-unconditional.patch Tue Nov 06 16:35:54 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -Description: Declare bt::textPropertyToString unconditionally. -Author: Jakub Wilk -Forwarded: no -Bug-Debian: http://bugs.debian.org/614468 -Last-Update: 2011-03-12 - ---- a/lib/Util.hh -+++ b/lib/Util.hh -@@ -25,6 +25,8 @@ - #ifndef __Util_hh - #define __Util_hh - -+#include -+ - #include - #include - -@@ -94,10 +96,8 @@ - - std::string tolower(const std::string &string); - --#ifdef _XUTIL_H_ - std::string textPropertyToString(::Display *display, - ::XTextProperty& text_prop); --#endif - - } // namespace bt - diff -r 5e01e6d2531a -r 21ab7a6eb192 exiftool/receipt --- a/exiftool/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/exiftool/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,28 +1,31 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="exiftool" -VERSION="8.40" +VERSION="11.17" CATEGORY="system-tools" -SHORT_DESC="Reading, writing and editing meta information in a wide variety of files" -MAINTAINER="devel@slitaz.org" +SHORT_DESC="Read, write and edit meta information in a wide variety of files" +MAINTAINER="al.bobylev@gmail.com" LICENSE="Artistic" WEB_SITE="http://owl.phy.queensu.ca/~phil/exiftool/" +HOST_ARCH="any" -SOURCE="Image-ExifTool" -TARBALL="$SOURCE-$VERSION.tar.gz" +TARBALL="Image-ExifTool-$VERSION.tar.gz" WGET_URL="http://owl.phy.queensu.ca/~phil/exiftool/$TARBALL" +TARBALL_SHA1="9ad727f0b588fd08212591654b93c095649d26da" +TARBALL_MD5="c7d93ac2a472c9843845a4ff152b4eb7" BUILD_DEPENDS="perl" compile_rules() { perl Makefile.PL && make && - make DESTDIR=$install install + make DESTDIR=$install install || return 1 + + find $install -type f -exec chmod u+w '{}' \; } genpkg_rules() { - cp -a $install/usr $fs - rm -rf $fs/usr/share + copy @std DEPENDS="perl" SUGGESTED="perl-archive-zip perl-io-compress" } diff -r 5e01e6d2531a -r 21ab7a6eb192 faac/receipt --- a/faac/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/faac/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="faac" -VERSION="1.28" +VERSION="1.29.9.2" CATEGORY="multimedia" SHORT_DESC="Open source MPEG-4 and MPEG-2 AAC encoder" MAINTAINER="paul@slitaz.org" @@ -9,15 +9,12 @@ WEB_SITE="https://www.audiocoding.com/" LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/faac.html" -TARBALL="$PACKAGE-$VERSION.tar.bz2" +TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/faac/$TARBALL" SPLIT="$PACKAGE-dev" compile_rules() { - sed -i '/obj-type/d; /Long Term/d' frontend/main.c - - CFLAGS=-std=c99 CXXFLAGS=-std=c++98 \ ./configure \ --disable-static \ $CONFIGURE_ARGS && @@ -30,7 +27,7 @@ case $PACKAGE in faac) copy @std - TAGS="mp4 mpeg encoder" + TAGS="aac mp4 mpeg encoder" ;; *-dev) copy @dev diff -r 5e01e6d2531a -r 21ab7a6eb192 faac/stuff/patches/faac-1.28-glibc_fixes-1.patch --- a/faac/stuff/patches/faac-1.28-glibc_fixes-1.patch Tue Nov 06 16:35:54 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -Submitted By: Guy Dalziel -Date: 2009-08-04 -Initial Package Version: 1.28 -Origin: Guy Dalziel -Upstream Status: Not submitted. -Description: Fixes a function conflict between FAAC and Glibc. - -diff -Naur faac-1.28-orig/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h ---- faac-1.28-orig/common/mp4v2/mpeg4ip.h 2009-01-26 22:42:35.000000000 +0000 -+++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-08-04 13:45:47.728062591 +0100 -@@ -120,14 +120,6 @@ - #endif - #include - --#ifdef __cplusplus --extern "C" { --#endif --char *strcasestr(const char *haystack, const char *needle); --#ifdef __cplusplus --} --#endif -- - #define OPEN_RDWR O_RDWR - #define OPEN_CREAT O_CREAT - #define OPEN_RDONLY O_RDONLY diff -r 5e01e6d2531a -r 21ab7a6eb192 faac/stuff/patches/series --- a/faac/stuff/patches/series Tue Nov 06 16:35:54 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -faac-1.28-glibc_fixes-1.patch diff -r 5e01e6d2531a -r 21ab7a6eb192 faad2/receipt --- a/faad2/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/faad2/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,12 +1,12 @@ # SliTaz package receipt v2. PACKAGE="faad2" -VERSION="2.8.6" +VERSION="2.8.8" CATEGORY="multimedia" SHORT_DESC="ISO AAC audio decoder" -MAINTAINER="devel@slitaz.org" +MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2" -WEB_SITE="http://faac.sourceforge.net/" +WEB_SITE="https://www.audiocoding.com/" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/faac/$TARBALL" @@ -14,7 +14,9 @@ SPLIT="$PACKAGE-dev" compile_rules() { - ./configure $CONFIGURE_ARGS && + ./configure \ + --disable-static \ + $CONFIGURE_ARGS && fix libtool && make && make install diff -r 5e01e6d2531a -r 21ab7a6eb192 mariadb/receipt --- a/mariadb/receipt Tue Nov 06 16:35:54 2018 +0200 +++ b/mariadb/receipt Thu Nov 08 15:34:32 2018 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="mariadb" -VERSION="10.0.11" +VERSION="10.2.18" CATEGORY="office" SHORT_DESC="SQL database system" MAINTAINER="devel@slitaz.org" @@ -9,26 +9,89 @@ WEB_SITE="https://mariadb.org/" TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://pangolin.slitaz.org/downloads/sources/$TARBALL" +WGET_URL="https://downloads.mariadb.org/interstitial/mariadb-$VERSION/source/$TARBALL" BUILD_DEPENDS="cmake ncurses-dev bison openssl-dev" +BUILD_DEPENDS="cmake libaio-dev valgrind-dev zlib-dev openssl-dev ncurses-dev \ +pcre-dev curl-dev libxml2-dev xz-dev " SPLIT="libmariadbclient $PACKAGE-client $PACKAGE-dev $PACKAGE-test" compile_rules() { + case $ARCH in + i?86) ARCH_ARGS='-DPLUGIN_ROCKSDB=NO';; + *) ARCH_ARGS='-DPLUGIN_ROCKSDB=YES';; + esac + cmake \ + -DBUILD_CONFIG=mysql_release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL-DOCREADMEDIR=/usr/share/doc \ - -DINSTALL_MYSQLDATADIR=/var/lib/mysql \ - -DINSTALL_SYSCONFDIR=/etc \ - -DINSTALL_LIBDIR=lib/mysql \ - -DINSTALL_INFODIR=share/doc/mysql \ + -DSYSCONFDIR=/etc \ + -DSYSCONF2DIR=/etc/my.cnf.d \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_general_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/info \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SHAREDIR=share \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_UNIX_ADDRDIR=/var/run/mysqld/mysqld.sock \ + -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_DOCREADMEDIR=share/doc/mariadb \ + -DINSTALL_SUPPORTFILESDIR=share/mariadb \ + -DINSTALL_MYSQLSHAREDIR=share/mariadb \ + -DINSTALL_DOCDIR=share/doc/mariadb \ + -DTMPDIR=/var/tmp \ + -DCONNECT_WITH_MYSQL=ON \ + -DCONNECT_WITH_LIBXML2=system \ + -DCONNECT_WITH_ODBC=NO \ + -DCONNECT_WITH_JDBC=NO \ + -DPLUGIN_ARCHIVE=YES \ + -DPLUGIN_ARIA=YES \ + -DPLUGIN_BLACKHOLE=YES \ + -DPLUGIN_CASSANDRA=NO \ + -DPLUGIN_CSV=YES \ + -DPLUGIN_MYISAM=YES \ + -DPLUGIN_MROONGA=NO \ + -DPLUGIN_OQGRAPH=NO \ + -DPLUGIN_PARTITION=YES \ + -DPLUGIN_SPHINX=NO \ + -DPLUGIN_TOKUDB=NO \ + -DPLUGIN_AUTH_PAM=NO \ + -DPLUGIN_AUTH_GSSAPI=NO \ + -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \ + -DPLUGIN_CRACKLIB_PASSWORD_CHECK=NO \ + -DWITH_ASAN=OFF \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_INNODB_BZIP2=OFF \ + -DWITH_INNODB_LZ4=OFF \ + -DWITH_INNODB_LZMA=ON \ + -DWITH_INNODB_LZO=OFF \ + -DWITH_INNODB_SNAPPY=OFF \ + -DWITH_ROCKSDB_BZIP2=OFF \ + -DWITH_ROCKSDB_JEMALLOC=OFF \ + -DWITH_ROCKSDB_LZ4=OFF \ + -DWITH_ROCKSDB_ZSTD=OFF \ + -DWITH_ROCKSDB_SNAPPY=OFF \ + -DWITH_JEMALLOC=NO \ + -DWITH_LIBARCHIVE=system \ + -DWITH_LIBNUMA=NO \ + -DWITH_LIBWRAP=OFF \ + -DWITH_LIBWSEP=OFF \ + -DWITH_MARIABACKUP=ON \ + -DWITH_PCRE=system \ + -DWITH_READLINE=ON \ + -DWITH_SYSTEMD=no \ + -DWITH_SSL=system \ + -DWITH_VALGRIND=OFF \ + -DWITH_ZLIB=system \ + -DSKIP_TESTS=ON \ + $ARCH_ARGS \ . && - make $MAKEFLAGS && + # print config options to log + cmake -L && + make && make install } diff -r 5e01e6d2531a -r 21ab7a6eb192 mariadb/stuff/patches/fix-mysql-install-db-path.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mariadb/stuff/patches/fix-mysql-install-db-path.patch Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,41 @@ +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 464c00d..d75874e 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -166,29 +166,13 @@ SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") + ENDIF(UNIX) + +-# Really ugly, one script, "mysql_install_db", needs prefix set to ".", +-# i.e. makes access relative the current directory. This matches +-# the documentation, so better not change this. +- +-IF(INSTALL_LAYOUT MATCHES "STANDALONE") +- SET(prefix ".") +- SET(bindir ${prefix}/${INSTALL_BINDIR}) +- SET(sbindir ${prefix}/${INSTALL_SBINDIR}) +- SET(scriptdir ${prefix}/${INSTALL_BINDIR}) +- SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) +- SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +- SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) +- SET(localstatedir ${prefix}/data) +-ELSE() +- SET(prefix "${CMAKE_INSTALL_PREFIX}") +- SET(bindir ${INSTALL_BINDIRABS}) +- SET(sbindir ${INSTALL_SBINDIRABS}) +- SET(scriptdir ${INSTALL_BINDIRABS}) +- SET(libexecdir ${INSTALL_SBINDIRABS}) +- SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) +- SET(pkgplugindir ${INSTALL_PLUGINDIRABS}) +- SET(localstatedir ${MYSQL_DATADIR}) +-ENDIF() ++SET(prefix "${CMAKE_INSTALL_PREFIX}") ++SET(bindir ${prefix}/${INSTALL_BINDIR}) ++SET(sbindir ${prefix}/${INSTALL_SBINDIR}) ++SET(scriptdir ${prefix}/${INSTALL_BINDIR}) ++SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) ++SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) ++SET(localstatedir ${MYSQL_DATADIR}) + + SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") + SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin") diff -r 5e01e6d2531a -r 21ab7a6eb192 mariadb/stuff/patches/fix-pthread-detach.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mariadb/stuff/patches/fix-pthread-detach.patch Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,39 @@ +From c45b4a774b6d1404a080a1c1759f780fa78f223b Mon Sep 17 00:00:00 2001 +From: Sergey Vojtovich +Date: Fri, 21 Sep 2018 16:04:16 +0400 +Subject: [PATCH] MDEV-17200 - pthread_detach called for already detached + threads + +pthread_detach_this_thread() was intended to be defined to something +meaningful only on some ancient unixes, which don't have +pthread_attr_setdetachstate() defined. Otherwise, on normal unixes, +threads are created detached in the first place. + +This was broken in 0f01bf267680244ec488adaf65a42838756ed48e so that +we started calling pthread_detach() for already detached threads. +Intention was to detach aria checkpoint thread. + +However in 87007dc2f71634cc460271eb277ad851ec69c04b aria service threads +were made joinable with appropriate handling, which makes breaking +revision unneccessary. + +Revert remnants of 0f01bf267680244ec488adaf65a42838756ed48e, so that +pthread_detach_this_thread() is meaningful only on some ancient unixes +again. +--- + include/my_pthread.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/my_pthread.h b/include/my_pthread.h +index 6b830ca36d24..ae2f912f979b 100644 +--- a/include/my_pthread.h ++++ b/include/my_pthread.h +@@ -184,7 +184,7 @@ int pthread_cancel(pthread_t thread); + #define pthread_key(T,V) pthread_key_t V + #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V)) + #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V)) +-#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); } ++#define pthread_detach_this_thread() + #define pthread_handler_t EXTERNC void * + typedef void *(* pthread_handler)(void *); + diff -r 5e01e6d2531a -r 21ab7a6eb192 mariadb/stuff/patches/fix-ucontext-check.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mariadb/stuff/patches/fix-ucontext-check.patch Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,18 @@ +--- a/configure.cmake ++++ b/configure.cmake +@@ -1018,9 +1018,12 @@ + + SET(CMAKE_EXTRA_INCLUDE_FILES) + +-CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) +-IF(NOT HAVE_UCONTEXT_H) +- CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) ++CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_HEADER) ++IF(NOT HAVE_UCONTEXT_HEADER) ++ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_HEADER) ++ENDIF() ++IF(HAVE_UCONTEXT_HEADER) ++ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) + ENDIF() + IF(HAVE_UCONTEXT_H) + CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) diff -r 5e01e6d2531a -r 21ab7a6eb192 mariadb/stuff/patches/pcre.cmake.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mariadb/stuff/patches/pcre.cmake.patch Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,15 @@ +--- a/cmake/pcre.cmake ++++ b/cmake/pcre.cmake +@@ -8,11 +8,7 @@ + CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD) + IF(NOT CMAKE_CROSSCOMPILING) + SET(CMAKE_REQUIRED_LIBRARIES "pcre") +- CHECK_C_SOURCE_RUNS(" +- #include +- int main() { +- return -pcre_exec(NULL, NULL, NULL, -999, -999, 0, NULL, 0) < 256; +- }" PCRE_STACK_SIZE_OK) ++ SET(PCRE_STACK_SIZE_OK TRUE) + SET(CMAKE_REQUIRED_LIBRARIES) + ENDIF() + ENDIF() diff -r 5e01e6d2531a -r 21ab7a6eb192 mariadb/stuff/patches/ppc-remove-glibc-dep.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mariadb/stuff/patches/ppc-remove-glibc-dep.patch Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,49 @@ +diff --git a/include/my_cpu.h b/include/my_cpu.h +index f2e26fca..94599b74 100644 +--- a/include/my_cpu.h ++++ b/include/my_cpu.h +@@ -24,17 +24,16 @@ + */ + + #ifdef _ARCH_PWR8 +-#include + /* Very low priority */ +-#define HMT_very_low() __ppc_set_ppr_very_low() ++#define HMT_very_low() asm volatile("or 31,31,31") + /* Low priority */ +-#define HMT_low() __ppc_set_ppr_low() ++#define HMT_low() asm volatile ("or 1,1,1") + /* Medium low priority */ +-#define HMT_medium_low() __ppc_set_ppr_med_low() ++#define HMT_medium_low() asm volatile ("or 6,6,6") + /* Medium priority */ +-#define HMT_medium() __ppc_set_ppr_med() ++#define HMT_medium() asm volatile ("or 2,2,2") + /* Medium high priority */ +-#define HMT_medium_high() __ppc_set_ppr_med_high() ++#define HMT_medium_high() asm volatile("or 5,5,5") + /* High priority */ + #define HMT_high() asm volatile("or 3,3,3") + #else +@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void) + */ + YieldProcessor(); + #elif defined(_ARCH_PWR8) +- __ppc_get_timebase(); ++ __builtin_ppc_get_timebase(); + #else + int32 var, oldval = 0; + my_atomic_cas32_strong_explicit(&var, &oldval, 1, MY_MEMORY_ORDER_RELAXED, +diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h +index c4c45b8e..2f7a07f5 100644 +--- a/storage/tokudb/PerconaFT/portability/toku_time.h ++++ b/storage/tokudb/PerconaFT/portability/toku_time.h +@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) { + __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result)); + return result; + #elif defined(__powerpc__) +- return __ppc_get_timebase(); ++ return __builtin_ppc_get_timebase(); + #else + #error No timer implementation for this platform + #endif diff -r 5e01e6d2531a -r 21ab7a6eb192 mariadb/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mariadb/stuff/patches/series Thu Nov 08 15:34:32 2018 +0200 @@ -0,0 +1,7 @@ +# From Alpine Linux: +# https://git.alpinelinux.org/cgit/aports/tree/main/mariadb?h=master +fix-mysql-install-db-path.patch +fix-ucontext-check.patch +fix-pthread-detach.patch +#ppc-remove-glibc-dep.patch +pcre.cmake.patch