diff options
Diffstat (limited to 'source')
27 files changed, 211 insertions, 246 deletions
diff --git a/source/ap/soma/README b/source/ap/soma/README index cb60a62c6..7a882b912 100644 --- a/source/ap/soma/README +++ b/source/ap/soma/README @@ -48,7 +48,8 @@ Key commands supported in status window: Dashboard indicators: -[S] Schedules are set [-] Schedules are temporarily disabled +[S] Schedules are set [-] Schedules are temporarily + disabled [R] A recording is in progress [0-100] Volume or [M] Mute Config Files: @@ -68,34 +69,35 @@ Name,URL You cannot use a comma , in the name or the URL. -User stations are listed before global in all stations list. Custom genre and -theme files can be made and will be listed along with the default set. +User stations are listed before global in all stations list. Custom +genre and theme files can be made and will be listed along with the +default set. I would be glad of any extra radio urls emailed to me so I can add to the default list. NOTES: -The Jack and NAS options for output device will only work if MPlayer is built -against them. +The Jack and NAS options for output device will only work if MPlayer is +built against them. -When changing/selecting soundcard output device you must press space on the -option. Just scrolling down and hitting Enter does nothing. +When changing/selecting soundcard output device you must press space on +the option. Just scrolling down and hitting Enter does nothing. BUGS: -Soma may induce the side effects of general well-being and profound spiritual -satisfaction. +Soma may induce the side effects of general well-being and profound +spiritual satisfaction. http://en.wikipedia.org/wiki/Soma http://en.wikipedia.org/wiki/Soma_(Brave_New_World) REAL BUGS: -Some people might find screen messes up the dialog colours. If you have this -line in ~/.screenrc: +Some people might find screen messes up the dialog colours. If you have +this line in ~/.screenrc: attrcolor b ".I" -You might want to comment it out and try again as it seems to turn off the bold -attribute. See the screen man page for more info. +You might want to comment it out and try again as it seems to turn off +the bold attribute. See the screen man page for more info. diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild index 8196b707e..5b9c366c6 100755 --- a/source/ap/soma/soma.SlackBuild +++ b/source/ap/soma/soma.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=soma -VERSION=${VERSION:-3.3.5} +VERSION=${VERSION:-3.3.6} ARCH=noarch BUILD=${BUILD:-1} diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info index e00563321..d6ab22059 100644 --- a/source/ap/soma/soma.info +++ b/source/ap/soma/soma.info @@ -1,8 +1,8 @@ PRGNAM="soma" -VERSION="3.3.5" +VERSION="3.3.6" HOMEPAGE="http://tty1.uk/slackbuilds/noversion/soma/" -DOWNLOAD="http://git.tty1.uk/cgit.cgi/soma/snapshot/soma-3.3.5.tar.gz" -MD5SUM="ccfab41ec585b44bd7f8e9c1cb273a93" +DOWNLOAD="http://git.tty1.uk/cgit.cgi/soma/snapshot/soma-3.3.6.tar.gz" +MD5SUM="0110186a251aa612a47bdc282f7b1709" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/source/ap/terminus-font/terminus-font.SlackBuild b/source/ap/terminus-font/terminus-font.SlackBuild index 71ecf3b13..6c100d006 100755 --- a/source/ap/terminus-font/terminus-font.SlackBuild +++ b/source/ap/terminus-font/terminus-font.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=terminus-font VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,6 +80,13 @@ find . \ make || exit 1 make install install-pcf-8bit install-psf-ref install-psf-vgaw DESTDIR=$PKG || exit 1 +# Install also the otb version (supported by the newer pango) +mkdir -p $PKG/usr/share/fonts/misc +for i in 12 14 16 18 20 22 24 26 28 32; do + fonttosfnt -o $PKG/usr/share/fonts/misc/ter-u${i}b.otb ter-u${i}b.pcf + fonttosfnt -o $PKG/usr/share/fonts/misc/ter-u${i}n.otb ter-u${i}n.pcf +done + mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS CHANGES COPYING* INSTALL NEWS OFL.TXT README* \ diff --git a/source/d/ninja/ninja.url b/source/d/ninja/ninja.url index e74aab2ae..3297b538c 100644 --- a/source/d/ninja/ninja.url +++ b/source/d/ninja/ninja.url @@ -1 +1 @@ -https://github.com/ninja-build/ninja/archive/v1.10.0/ninja-1.10.0.tar.gz +https://github.com/ninja-build/ninja diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index 4221f0e82..4ef816340 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,7 +1,16 @@ -# Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.45.2-src.tar.gz -gzip -d rustc-*tar.gz -plzip -9 -v rustc-*tar +# Source code (repacked to .tar.lz): +VERSION=1.45.2 +rm -f rustc-${VERSION}-src.tar.* +lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc +if gpg --verify rustc-${VERSION}-src.tar.gz.asc ; then + rm -f rustc-${VERSION}-src.tar.gz.asc + gzip -d rustc-*tar.gz + plzip -9 -v rustc-*tar +else + echo "FATAL ERROR: Not recompressing since GPG signature failed." + exit 1 +fi # Please note that the bootstrap binary packages listed below might not be kept # updated for later versions. The Rust compiler as shipped with Slackware diff --git a/source/d/yasm/yasm.SlackBuild b/source/d/yasm/yasm.SlackBuild index 8fde7a0ad..24dde5e60 100755 --- a/source/d/yasm/yasm.SlackBuild +++ b/source/d/yasm/yasm.SlackBuild @@ -1,68 +1,49 @@ #!/bin/bash -# $Id: yasm.SlackBuild,v 1.7 2009/05/12 20:24:31 root Exp root $ -# Copyright (c) 2008 Eric Hameleers <alien@slackware.com> -# Copyright 2010, 2018 Patrick Volkerding, Sebeka, MN, USA + +# Copyright 2008 Eric Hameleers <alien@slackware.com> +# Copyright 2010, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ----------------------------------------------------------------------------- +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# Slackware SlackBuild script -# =========================== -# By: Eric Hameleers <alien@slackware.com> -# For: yasm -# Descr: complete rewrite of the NASM assembler -# URL: http://www.tortall.net/projects/yasm/ -# Needs: -# Changelog: -# 0.7.1-1: 16/Jun/2008 by Eric Hameleers <alien@slackware.com> -# * Initial build. -# 0.7.2-1: 08/dec/2008 by Eric Hameleers <alien@slackware.com> -# * Update. -# 0.8.0-1: 12/may/2009 by Eric Hameleers <alien@slackware.com> -# * Update. -# 1.1.0-1: 2010-08-31 by volkerdi@slackware.com -# * Update. -# 1.3.0-1: 2014-11-09 by Heinz Wiesinger <pprkut@slackware.com> -# * Update. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. # -# Run 'sh yasm.SlackBuild' to build a Slackware package. -# The package (.txz) file is created in /tmp . -# Install using 'installpkg'. -# -# ----------------------------------------------------------------------------- - -# Where do we look for sources? -cd $(dirname $0) ; SRCDIR=$(pwd) +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=yasm -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} +# If you want to disable python bindings, set ENABLE_PYTHON to "YES". +ENABLE_PYTHON=${ENABLE_PYTHON:-"'NO"} +if [ "$ENABLE_PYTHON" = "YES" ]; then + PYTHONSTUFF="--enable-python --enable-python-bindings" +else + PYTHONSTUFF="" +fi + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi # If the variable PRINT_PACKAGE_NAME is set, then this script will report what @@ -73,111 +54,98 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* NEWS README *.txt" - -# If you want to disable python bindings, set ENABLE_PYTHON to "NO". -# Building python support requires Cython, which is not shipped with Slackware. -ENABLE_PYTHON=${ENABLE_PYTHON:-"'NO"} +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi -# Place to build (TMP) package (PKG) and output (OUTPUT) the program: -TMP=${TMP:-/tmp/build} +TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -OUTPUT=${OUTPUT:-/tmp} - -# Exit the script on errors: -set -e -trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PKGNAM}.log' ERR -# Catch unitialized variables: -set -u -P1=${1:-1} - -case "$ARCH" in - i586) SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - s390) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - powerpc) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - ;; - athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; -esac - -# Create working directories: -mkdir -p $OUTPUT # place for the package to be saved -mkdir -p $TMP/tmp-$PKGNAM # location to build the source -mkdir -p $PKG # place for the package to be built -rm -rf $PKG/* # always erase old package's contents -rm -rf $TMP/tmp-$PKGNAM/* # remove the remnants of previous build - -# --- PACKAGE BUILDING --- - -echo "++" -echo "|| $PKGNAM-$VERSION" -echo "++" - -cd $TMP/tmp-$PKGNAM -echo "Extracting the source archive(s) for $PKGNAM..." -tar xvf $SRCDIR/$PKGNAM-$VERSION.tar.?z* -cd ${PKGNAM}-${VERSION} -chown -R root:root . -chmod -R u+w,go+r-w,a-s . -if [ "$ENABLE_PYTHON" = "YES" ]; then - PYTHONSTUFF="--enable-python --enable-python-bindings" -else - PYTHONSTUFF="" -fi +rm -rf $PKG +mkdir -p $TMP $PKG -echo Building ... -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - ${PYTHONSTUFF} \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux - -make - -make DESTDIR=$PKG install - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION || true -rm $PKG/usr/doc/$PKGNAM-$VERSION/CMakeLists.txt -chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \+ - -# Remove empty share directory: -rmdir $PKG/usr/share || true - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi fi +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --infodir=/usr/info \ + $PYTHONSTUFF \ + --build=$ARCH-slackware-linux || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* Artistic.txt BSD.txt ChangeLog COPYING* GNU_* NEWS* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi -# Add a package description: mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +cat $CWD/slack-desc > $PKG/install/slack-desc -# Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 6ed80164e..dffcfeb7e 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Thu Aug 20 05:22:35 UTC 2020 + Include /usr/bin/env. ++--------------------------+ Sun Jul 26 18:30:17 UTC 2020 Add neofetch. Seems like a useful system information tool to have in the installer, and it's small enough. diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 15700c3d3..48268c98c 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -660,8 +660,6 @@ fi chown -R root:root . # Copy config: -# If we you rather like bash instead of busybox's ash, you'll need to adjust -# the symlinks in /bin and stuff. install -m644 $BUSYBOXCFG .config # Build: @@ -683,6 +681,11 @@ rm -f${VERBOSE1} bin/cp cp --remove-destination -fa${VERBOSE2} * $PKG/$ARCH-installer-filesystem/ +# If we built bin/env, make a link in usr/bin as well: +if [ -x $PKG/$ARCH-installer-filesystem/bin/env ]; then + ( cd $PKG/$ARCH-installer-filesystem/usr/bin ; ln -sf ../../bin/env . ) +fi + } diff --git a/source/k/kernel-configs/config-generic-5.4.58 b/source/k/kernel-configs/config-generic-5.4.60 index 8a6d369db..7ba442026 100644 --- a/source/k/kernel-configs/config-generic-5.4.58 +++ b/source/k/kernel-configs/config-generic-5.4.60 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.58 Kernel Configuration +# Linux/x86 5.4.60 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-5.4.58.x64 b/source/k/kernel-configs/config-generic-5.4.60.x64 index 0db509821..3ddba723a 100644 --- a/source/k/kernel-configs/config-generic-5.4.58.x64 +++ b/source/k/kernel-configs/config-generic-5.4.60.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.58 Kernel Configuration +# Linux/x86 5.4.60 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-5.4.58-smp b/source/k/kernel-configs/config-generic-smp-5.4.60-smp index f81b19f41..6e3c3a3c1 100644 --- a/source/k/kernel-configs/config-generic-smp-5.4.58-smp +++ b/source/k/kernel-configs/config-generic-smp-5.4.60-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.58 Kernel Configuration +# Linux/x86 5.4.60 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.58 b/source/k/kernel-configs/config-huge-5.4.60 index af22c35ff..9d4e8a145 100644 --- a/source/k/kernel-configs/config-huge-5.4.58 +++ b/source/k/kernel-configs/config-huge-5.4.60 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.58 Kernel Configuration +# Linux/x86 5.4.60 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.58.x64 b/source/k/kernel-configs/config-huge-5.4.60.x64 index 94756f422..8d2bbfd18 100644 --- a/source/k/kernel-configs/config-huge-5.4.58.x64 +++ b/source/k/kernel-configs/config-huge-5.4.60.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.58 Kernel Configuration +# Linux/x86 5.4.60 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-5.4.58-smp b/source/k/kernel-configs/config-huge-smp-5.4.60-smp index 0437ae3ff..d7cbe9577 100644 --- a/source/k/kernel-configs/config-huge-smp-5.4.58-smp +++ b/source/k/kernel-configs/config-huge-smp-5.4.60-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.58 Kernel Configuration +# Linux/x86 5.4.60 Kernel Configuration # # diff --git a/source/l/jemalloc/jemalloc.SlackBuild b/source/l/jemalloc/jemalloc.SlackBuild index ac72ac514..e4cad17de 100755 --- a/source/l/jemalloc/jemalloc.SlackBuild +++ b/source/l/jemalloc/jemalloc.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=jemalloc -VERSION=${VERSION:-$(echo jemalloc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo jemalloc-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -68,7 +68,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . diff --git a/source/l/jemalloc/jemalloc.url b/source/l/jemalloc/jemalloc.url new file mode 100644 index 000000000..9334dde38 --- /dev/null +++ b/source/l/jemalloc/jemalloc.url @@ -0,0 +1 @@ +https://github.com/jemalloc/jemalloc diff --git a/source/l/libcap-ng/libcap-ng.SlackBuild b/source/l/libcap-ng/libcap-ng.SlackBuild index 0180bd42b..7d58ec18b 100755 --- a/source/l/libcap-ng/libcap-ng.SlackBuild +++ b/source/l/libcap-ng/libcap-ng.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcap-ng VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libmpc/libmpc.SlackBuild b/source/l/libmpc/libmpc.SlackBuild index 76fe5793b..661deec9c 100755 --- a/source/l/libmpc/libmpc.SlackBuild +++ b/source/l/libmpc/libmpc.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) SRCNAM=mpc PKGNAM=libmpc VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libsndfile/libsndfile.SlackBuild b/source/l/libsndfile/libsndfile.SlackBuild index 0cef7a0e6..a2860b127 100755 --- a/source/l/libsndfile/libsndfile.SlackBuild +++ b/source/l/libsndfile/libsndfile.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libsndfile VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 7aa6e6529..076068cd4 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.55} -NSPR=${NSPR:-4.27} +VERSION=${VERSION:-3.56} +NSPR=${NSPR:-4.28} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index 783ef548a..1b7af8957 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild index edff743e5..965ba6235 100755 --- a/source/n/iputils/iputils.SlackBuild +++ b/source/n/iputils/iputils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=iputils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -75,7 +75,6 @@ find . \ -exec chmod 644 {} \+ zcat $CWD/iputils.docbook.revert.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/iputils.libcap-2.30.patch.gz | patch -p1 --verbose || exit 1 # Configure and build: export CFLAGS="$SLKCFLAGS" @@ -101,7 +100,7 @@ meson setup \ cd .. cd meson-build -strip arping clockdiff ninfod/ninfod ping rarpd rdisc tracepath traceroute6 +strip arping clockdiff ninfod/ninfod ping/ping rarpd rdisc tracepath traceroute6 mkdir -p $PKG/sbin cat arping > $PKG/sbin/arping chmod 755 $PKG/sbin/arping @@ -111,7 +110,7 @@ chmod 755 $PKG/usr/sbin/clockdiff cat ninfod/ninfod > $PKG/usr/sbin/ninfod chmod 755 $PKG/usr/sbin/ninfod mkdir -p $PKG/bin -cat ping > $PKG/bin/ping +cat ping/ping > $PKG/bin/ping chmod 4711 $PKG/bin/ping ( cd $PKG/bin ; ln -sf ping ping6 ) cat rarpd > $PKG/usr/sbin/rarpd diff --git a/source/n/iputils/iputils.libcap-2.30.patch b/source/n/iputils/iputils.libcap-2.30.patch deleted file mode 100644 index 1122d8693..000000000 --- a/source/n/iputils/iputils.libcap-2.30.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 18f9a84e0e702841d6cc4d5f593de4fbd1348e83 Mon Sep 17 00:00:00 2001 -From: Sami Kerola <kerolasa@iki.fi> -Date: Sat, 28 Dec 2019 17:16:27 +0000 -Subject: [PATCH] ninfod: change variable name to avoid colliding with function - name - -The sys/capability.h header has 'extern int cap_setuid(uid_t uid);' -function prototype. - -Addresses: https://github.com/iputils/iputils/issues/246 -Signed-off-by: Sami Kerola <kerolasa@iki.fi> ---- - ninfod/ninfod.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c -index 26112d0..95583de 100644 ---- a/ninfod/ninfod.c -+++ b/ninfod/ninfod.c -@@ -455,7 +455,7 @@ static void do_daemonize(void) - /* --------- */ - #ifdef HAVE_LIBCAP - static const cap_value_t cap_net_raw = CAP_NET_RAW; --static const cap_value_t cap_setuid = CAP_SETUID; -+static const cap_value_t cap_setuserid = CAP_SETUID; - static cap_flag_value_t cap_ok; - #else - static uid_t euid; -@@ -487,7 +487,7 @@ static void limit_capabilities(void) - - cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); - if (cap_ok != CAP_CLEAR) -- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); -+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); - - if (cap_set_proc(cap_p) < 0) { - DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); -@@ -520,8 +520,8 @@ static void drop_capabilities(void) - - /* setuid / setuid */ - if (cap_ok != CAP_CLEAR) { -- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); -- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); -+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); -+ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); - - if (cap_set_proc(cap_p) < 0) { - DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); - diff --git a/source/x/libinput/libinput.SlackBuild b/source/x/libinput/libinput.SlackBuild index f40a38d9b..531de3ff3 100755 --- a/source/x/libinput/libinput.SlackBuild +++ b/source/x/libinput/libinput.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libinput VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -79,6 +79,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +zcat $CWD/libinput.less.lag.complaining.diff.gz | patch -p1 --verbose || exit 1 + export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" mkdir build diff --git a/source/x/libinput/libinput.less.lag.complaining.diff b/source/x/libinput/libinput.less.lag.complaining.diff new file mode 100644 index 000000000..a8d8c489a --- /dev/null +++ b/source/x/libinput/libinput.less.lag.complaining.diff @@ -0,0 +1,20 @@ +--- ./src/evdev.c.orig 2020-08-12 22:50:03.612642300 -0500 ++++ ./src/evdev.c 2020-08-20 17:26:17.663305924 -0500 +@@ -1027,7 +1027,7 @@ + + /* if we have a current libinput_dispatch() snapshot, compare our + * event time with the one from the snapshot. If we have more than +- * 10ms delay, complain about it. This catches delays in processing ++ * 75ms delay, complain about it. This catches delays in processing + * where there is no steady event flow and thus SYN_DROPPED may not + * get hit by the kernel despite us being too slow. + */ +@@ -1035,7 +1035,7 @@ + return; + + tdelta = us2ms(libinput->dispatch_time - input_event_time(ev)); +- if (tdelta > 10) { ++ if (tdelta > 75) { + evdev_log_bug_client_ratelimit(device, + &device->delay_warning_limit, + "event processing lagging behind by %dms, your system is too slow\n", diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild index 6c799631c..2d8e8a88b 100755 --- a/source/xap/sane/sane.SlackBuild +++ b/source/xap/sane/sane.SlackBuild @@ -23,10 +23,10 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sane -VERSION=1.0.30 -BACKVER=1.0.30 +VERSION=1.0.31 +BACKVER=1.0.31 FRONTVER=1.0.14 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |