diff options
Diffstat (limited to 'system')
226 files changed, 3973 insertions, 1616 deletions
diff --git a/system/EpsonTMXCUPS/EpsonTMXCUPS.SlackBuild b/system/EpsonTMXCUPS/EpsonTMXCUPS.SlackBuild new file mode 100644 index 0000000000..e6c7e4ee6a --- /dev/null +++ b/system/EpsonTMXCUPS/EpsonTMXCUPS.SlackBuild @@ -0,0 +1,124 @@ +#!/bin/bash +# +# Slackware Package build script for Epson TM Series Receipt Printer +# drivers for CUPS under Linux +# +# Copyright 2024 Adan Calderon | adancalderon@gmail.com +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 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) + +PRGNAM=EpsonTMXCUPS +VERSION=${VERSION:-3.0.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} +OUTPUT=${OUTPUT:-/tmp} +INSTALL=/usr/bin/install + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM + +if [ "$ARCH" = "i586" ]; then + LIB="lib" +elif [ "$ARCH" = "x86_64" ]; then + LIB="lib64" +else + LIB="lib" +fi + +FILTERDIR=$PKG/usr/$LIB/cups/filter +PPDDIR=$PKG/usr/share/cups/model/EPSON +DOCDIR=$PKG/usr/doc/EpsonTMXCUPS-3.0.0 + +set -e +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT $FILTERDIR $PPDDIR $DOCDIR +cd $TMP +rm -rf tmx-cups-src-ImpactReceipt-3.0.0.0_pck +rm -rf $PRGNAM-$VERSION +cp $CWD/README $DOCDIR +cp $CWD/EpsonTMXCUPS.SlackBuild $DOCDIR +unzip $CWD/tmx-cups-src-ImpactReceipt-3.0.0.0_pck_e.zip +cd tmx-cups-src-ImpactReceipt-3.0.0.0_pck +tar xvfz tmx-cups-src-ImpactReceipt-3.0.0.0.tar.gz +tar xvfz tmx-cups-src-ImpactSlip-3.0.0.0.tar.gz +tar xvfz tmx-cups-src-ThermalReceipt-3.0.0.0.tar.gz + +cd Impact\ Receipt 2>/dev/null +./build.sh +#Installing filter driver +$INSTALL -s ./build/rastertotmir $FILTERDIR + +#Installing ppd files +$INSTALL -m 755 -d $PPDDIR +$INSTALL -m 755 ./ppd/*.ppd $PPDDIR + +#Copying DOCs +cp README $DOCDIR/README.ir +cd .. 2>/dev/null + +cd Impact\ Slip 2>/dev/null +./build.sh + +#Installing filter driver +$INSTALL -s ./build/rastertotmis $FILTERDIR + +#Installing ppd files +$INSTALL -m 755 -d $PPDDIR +$INSTALL -m 755 ./ppd/*.ppd $PPDDIR + +#Copying DOCs +cp README $DOCDIR/README.is +cd .. 2>/dev/null + +cd Thermal\ Receipt 2>/dev/null +./build.sh + +#Installing filter driver +$INSTALL -s ./build/rastertotmtr $FILTERDIR + +#Installing ppd files +$INSTALL -m 755 -d $PPDDIR +$INSTALL -m 755 ./ppd/*.ppd $PPDDIR + +#Copying DOCs +cp README $DOCDIR/README.tr +cd .. 2>/dev/null + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/EpsonTMXCUPS/EpsonTMXCUPS.info b/system/EpsonTMXCUPS/EpsonTMXCUPS.info new file mode 100644 index 0000000000..d34975d88c --- /dev/null +++ b/system/EpsonTMXCUPS/EpsonTMXCUPS.info @@ -0,0 +1,10 @@ +PRGNAM="EpsonTMXCUPS" +VERSION="3.0.0" +HOMEPAGE="https://download.epson-biz.com/modules/pos/index.php?page=single_soft&cid=6918" +DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/15/35/42/b1a708bb8b21d7a68ae7394287db440974b68a0e/tmx-cups-src-ImpactReceipt-3.0.0.0_pck_e.zip" +MD5SUM="313283e1c927fe011895ca2e44d28eb5" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Adan Calderon" +EMAIL="adancalderon@gmail.com" diff --git a/system/EpsonTMXCUPS/README b/system/EpsonTMXCUPS/README new file mode 100644 index 0000000000..95fdd369ac --- /dev/null +++ b/system/EpsonTMXCUPS/README @@ -0,0 +1,20 @@ +These are the Epson TM Series receipt printer drivers for CUPS +They are distributed under the GPL version 2. + +Epson's new support site (https://epson.sn/) does not seem +to list them. + +Supported Models are as follows: + +Impact Receipt: +TM-U220 + +Impact Slip: +TM-H6000V + +Thermal Receipt: +TM-H6000V, TM-m10, TM-m30, TM-m30II, TM-m30II-H, TM-m30II-NT, +TM-m30II-S, TM-m30II-SL, TM-m30III, TM-m30III-H, TM-m50, +TM-m50II, TM-m50II-H, TM-T20III, TM-T20IIIL, TM-T20X, TM-T81III, +TM-T82III, TM-T82IIIL, TM-T82X, TM-T83III, TM-T88VI, TM-T88VII, +TM-T100, TM-L100 diff --git a/system/EpsonTMXCUPS/doinst.sh b/system/EpsonTMXCUPS/doinst.sh new file mode 100644 index 0000000000..e66b68ce38 --- /dev/null +++ b/system/EpsonTMXCUPS/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /etc/rc.d/rc.cups ]; then + /etc/rc.d/rc.cups stop + /etc/rc.d/rc.cups start +fi diff --git a/system/EpsonTMXCUPS/slack-desc b/system/EpsonTMXCUPS/slack-desc new file mode 100644 index 0000000000..b0a40f8524 --- /dev/null +++ b/system/EpsonTMXCUPS/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +EpsonTMXCUPS: EpsonTMXCUPS (Epson TM Series receipt printer drivers for CUPS.) +EpsonTMXCUPS: +EpsonTMXCUPS: Impact Receipt: TM-U220 +EpsonTMXCUPS: +EpsonTMXCUPS: Impact Slip: TM-H6000V +EpsonTMXCUPS: +EpsonTMXCUPS: Thermal Receipt: TM-H6000V, TM-m10, TM-m30, TM-m30II, TM-m30II-H, +EpsonTMXCUPS: TM-m30II-NT, TM-m30II-S, TM-m30II-SL, TM-m30III, TM-m30III-H, +EpsonTMXCUPS: TM-m50, TM-m50II, TM-m50II-H, TM-T20III, TM-T20IIIL, TM-T20X, +EpsonTMXCUPS: TM-T81III, TM-T82III, TM-T82IIIL, TM-T82X, TM-T83III, TM-T88VI, +EpsonTMXCUPS: TM-T88VII, TM-T100, TM-L100 diff --git a/system/FreeFileSync/FreeFileSync.SlackBuild b/system/FreeFileSync/FreeFileSync.SlackBuild index d3bb3a3a9a..cef00e0792 100644 --- a/system/FreeFileSync/FreeFileSync.SlackBuild +++ b/system/FreeFileSync/FreeFileSync.SlackBuild @@ -2,7 +2,7 @@ # Slackware repackaging script for FreeFileSync -# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal +# Copyright 2023-2024 Antonio Leal, Porto Salvo, Oeiras, Portugal # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=FreeFileSync -VERSION=${VERSION:-13.5} +VERSION=${VERSION:-13.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/FreeFileSync/FreeFileSync.info b/system/FreeFileSync/FreeFileSync.info index 2bb1bbac44..686cf4e9a0 100644 --- a/system/FreeFileSync/FreeFileSync.info +++ b/system/FreeFileSync/FreeFileSync.info @@ -1,8 +1,8 @@ PRGNAM="FreeFileSync" -VERSION="13.5" +VERSION="13.6" HOMEPAGE="https://freefilesync.org/" -DOWNLOAD="https://raw.githubusercontent.com/antonioleal/myslackbuilds/main/system/FreeFileSync/FreeFileSync_13.5_Linux.tar.gz" -MD5SUM="54c1cd44eebf7d4834b519e1193e8c2b" +DOWNLOAD="https://raw.githubusercontent.com/antonioleal/myslackbuilds/main/system/FreeFileSync/FreeFileSync_13.6_Linux.tar.gz" +MD5SUM="05d33c93e01ea14e6daa0dca114e7b54" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="p7zip" diff --git a/system/Iosevka-aile/Iosevka-aile.SlackBuild b/system/Iosevka-aile/Iosevka-aile.SlackBuild index 8770915724..8dea3169c1 100644 --- a/system/Iosevka-aile/Iosevka-aile.SlackBuild +++ b/system/Iosevka-aile/Iosevka-aile.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Iosevka-aile SRCNAM=PkgTTC-IosevkaAile -VERSION=${VERSION:-30.0.0} +VERSION=${VERSION:-30.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/Iosevka-aile/Iosevka-aile.info b/system/Iosevka-aile/Iosevka-aile.info index be404d94f4..7c7a8aed5f 100644 --- a/system/Iosevka-aile/Iosevka-aile.info +++ b/system/Iosevka-aile/Iosevka-aile.info @@ -1,8 +1,8 @@ PRGNAM="Iosevka-aile" -VERSION="30.0.0" +VERSION="30.1.2" HOMEPAGE="https://typeof.net/Iosevka" -DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.0.0/PkgTTC-IosevkaAile-30.0.0.zip" -MD5SUM="cbbefa5695cbbb60ee1df5bd667f3bac" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.1.2/PkgTTC-IosevkaAile-30.1.2.zip" +MD5SUM="909bcf6ea37a5365b567e88318705393" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/Iosevka-etoile/Iosevka-etoile.SlackBuild b/system/Iosevka-etoile/Iosevka-etoile.SlackBuild index 87906bfedb..8495181b4c 100644 --- a/system/Iosevka-etoile/Iosevka-etoile.SlackBuild +++ b/system/Iosevka-etoile/Iosevka-etoile.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Iosevka-etoile SRCNAM=PkgTTC-IosevkaEtoile -VERSION=${VERSION:-30.0.0} +VERSION=${VERSION:-30.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/Iosevka-etoile/Iosevka-etoile.info b/system/Iosevka-etoile/Iosevka-etoile.info index cdd6dac910..7177ef94b3 100644 --- a/system/Iosevka-etoile/Iosevka-etoile.info +++ b/system/Iosevka-etoile/Iosevka-etoile.info @@ -1,8 +1,8 @@ PRGNAM="Iosevka-etoile" -VERSION="30.0.0" +VERSION="30.1.2" HOMEPAGE="https://typeof.net/Iosevka" -DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.0.0/PkgTTC-IosevkaEtoile-30.0.0.zip" -MD5SUM="8c2b7b8f31f0235697f7f215addd6c40" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.1.2/PkgTTC-IosevkaEtoile-30.1.2.zip" +MD5SUM="2f87cf33ecfc187532ebfdcebe373cc1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/Iosevka-slab/Iosevka-slab.SlackBuild b/system/Iosevka-slab/Iosevka-slab.SlackBuild index 962f27443f..fb3d81b494 100644 --- a/system/Iosevka-slab/Iosevka-slab.SlackBuild +++ b/system/Iosevka-slab/Iosevka-slab.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Iosevka-slab -VERSION=${VERSION:-29.1.0} +VERSION=${VERSION:-30.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/Iosevka-slab/Iosevka-slab.info b/system/Iosevka-slab/Iosevka-slab.info index 59576d9a50..f28b78ef88 100644 --- a/system/Iosevka-slab/Iosevka-slab.info +++ b/system/Iosevka-slab/Iosevka-slab.info @@ -1,8 +1,8 @@ PRGNAM="Iosevka-slab" -VERSION="29.1.0" +VERSION="30.1.2" HOMEPAGE="https://typeof.net/Iosevka/" -DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.1.0/PkgTTC-IosevkaSlab-29.1.0.zip" -MD5SUM="a4133e4ec480ba65ce5dfaee12fc6f43" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.1.2/PkgTTC-IosevkaSlab-30.1.2.zip" +MD5SUM="453ab6083411846293b62e1cc5bb7c41" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild index 8a6c14de82..45ccff4a97 100644 --- a/system/Iosevka/Iosevka.SlackBuild +++ b/system/Iosevka/Iosevka.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Iosevka -VERSION=${VERSION:-29.1.0} +VERSION=${VERSION:-30.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info index 361db3d74e..6f506d80ee 100644 --- a/system/Iosevka/Iosevka.info +++ b/system/Iosevka/Iosevka.info @@ -1,8 +1,8 @@ PRGNAM="Iosevka" -VERSION="29.1.0" +VERSION="30.1.2" HOMEPAGE="https://typeof.net/Iosevka/" -DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v29.1.0/PkgTTC-Iosevka-29.1.0.zip" -MD5SUM="bf725be14592dca7ab1165a4a1844fcb" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v30.1.2/PkgTTC-Iosevka-30.1.2.zip" +MD5SUM="3859c44a193432d9460ff0037b95bea7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/PrintNode/PrintNode.SlackBuild b/system/PrintNode/PrintNode.SlackBuild new file mode 100644 index 0000000000..2b11c03b94 --- /dev/null +++ b/system/PrintNode/PrintNode.SlackBuild @@ -0,0 +1,78 @@ +#!/bin/bash + +# Slackware Package build script for installer of PrintNode + +# Copyright 2024 Adan Calderon | adancalderon@gmail.com +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 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) + +PRGNAM=PrintNode +VERSION=${VERSION:-4.27.17} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +OS=ubuntu-20.04 + +if [ "$ARCH" != "x86_64" ] ; then + printf "%s is not supported.\n" "$ARCH" + exit 1 +fi + +set -e +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION-$OS-$ARCH +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION-$OS-$ARCH.tar.gz +mv $PRGNAM-$VERSION-$OS-$ARCH $PRGNAM-$VERSION +cd $PRGNAM-$VERSION 2>/dev/null +chown -R root:root . +mkdir -p $PKG/install +mkdir -p $PKG/$PRGNAM +mkdir -p $PKG/etc/rc.d +cp -a * $PKG/$PRGNAM +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/rc.PrintNode > $PKG/etc/rc.d/rc.PrintNode + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/PrintNode/PrintNode.info b/system/PrintNode/PrintNode.info new file mode 100644 index 0000000000..0c7b51c625 --- /dev/null +++ b/system/PrintNode/PrintNode.info @@ -0,0 +1,10 @@ +PRGNAM="PrintNode" +VERSION="4.27.17" +HOMEPAGE="https://www.printnode.com" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://dl.printnode.com/client/printnode/4.27.17/PrintNode-4.27.17-ubuntu-20.04-x86_64.tar.gz" +MD5SUM_x86_64="b92c7a81b9c726715b9c18e14c2a54a6" +REQUIRES="" +MAINTAINER="Adan Calderon" +EMAIL="adancalderon@gmail.com" diff --git a/system/PrintNode/README b/system/PrintNode/README new file mode 100644 index 0000000000..e7e1583f52 --- /dev/null +++ b/system/PrintNode/README @@ -0,0 +1,15 @@ +PrintNode is a hosted printing service that can help you quickly, +easily and securely add remote printing to your application. +You can submit print jobs with PDF documents or links to PDF files. +PrintNode also supports RAW printing. + +Edit /etc/rc.d/rc.PrintNode with correct values for +COMPUTERNAME, EMAIL, and PASSWORD + +make sure chmod 755 /etc/rc.d/rc.PrintNode is performed + +Add the following to rc.local for startup: + +if [ -x /etc/rc.d/rc.PrintNode ]; then + /etc/rc.d/rc.PrintNode start +fi diff --git a/system/PrintNode/rc.PrintNode b/system/PrintNode/rc.PrintNode new file mode 100644 index 0000000000..bd1ccc74df --- /dev/null +++ b/system/PrintNode/rc.PrintNode @@ -0,0 +1,92 @@ +#!/bin/sh + +user="" #<--- EDIT THIS LINE IF YOU WANT TO RUN AS A SPECIFIC USER +COMPUTERNAME=somehostname +EMAIL=someone@somewhere.com +PASSWORD=mysecretpassword +dir="/PrintNode" +cmd="/PrintNode/PrintNode --headless --shutdown-on-sigint --web-interface --remove-scales-support --computer-name=$COMPUTERNAME --email=$EMAIL --password=$PASSWORD" + +name=`basename $0` +pid_file="/var/run/$name.pid" +stdout_log="/var/log/$name.log" +stderr_log="/var/log/$name.err" + +get_pid() { + cat "$pid_file" +} + +is_running() { + [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 +} + +case "$1" in + start) + if is_running; then + echo "Already started" + else + echo "Starting $name" + cd "$dir" + if [ -z "$user" ]; then + sudo $cmd >> "$stdout_log" 2>> "$stderr_log" & + else + sudo su -l "$user" -c "$cmd" >> "$stdout_log" 2>> "$stderr_log" & + fi + echo $! > "$pid_file" + if ! is_running; then + echo "Unable to start, see $stdout_log and $stderr_log" + exit 1 + fi + fi + ;; + stop) + if is_running; then + echo -n "Stopping $name.." + kill `get_pid` + for i in {1..10} + do + if ! is_running; then + break + fi + + echo -n "." + sleep 1 + done + echo + + if is_running; then + echo "Not stopped; may still be shutting down or shutdown may have failed" + exit 1 + else + echo "Stopped" + if [ -f "$pid_file" ]; then + rm "$pid_file" + fi + fi + else + echo "Not running" + fi + ;; + restart) + $0 stop + if is_running; then + echo "Unable to stop, will not attempt to start" + exit 1 + fi + $0 start + ;; + status) + if is_running; then + echo "Running" + else + echo "Stopped" + exit 1 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/system/PrintNode/slack-desc b/system/PrintNode/slack-desc new file mode 100644 index 0000000000..6a31b57744 --- /dev/null +++ b/system/PrintNode/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +PrintNode: PrintNode (Remote Printing for Web Apps) +PrintNode: +PrintNode: PrintNode is a hosted printing service that can help you quickly, +PrintNode: easily and securely add remote printing to your application. +PrintNode: You can submit print jobs with PDF documents or links to PDF files. +PrintNode: PrintNode also supports RAW printing. +PrintNode: +PrintNode: Edit /etc/rc.d/rc.PrintNode with correct values +PrintNode: Add rc.PrintNode to rc.local for startup +PrintNode: +PrintNode: Homepage: https://www.printnode.com diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild index b739b40052..33828e1260 100644 --- a/system/Solaar/Solaar.SlackBuild +++ b/system/Solaar/Solaar.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=Solaar -VERSION=${VERSION:-1.1.11} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.1.12} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,7 +77,7 @@ sed -i 's/#MODE="0660", GROUP="plugdev"/MODE="0660", GROUP="plugdev"/g' $PKG/lib mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING COPYRIGHT ChangeLog.md README.md Release_Notes.md docs \ + COPYRIGHT CHANGELOG.md LICENSE.txt README.md Release_Notes.md docs \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/Solaar/Solaar.info b/system/Solaar/Solaar.info index 3cebd904ad..a04d852b96 100644 --- a/system/Solaar/Solaar.info +++ b/system/Solaar/Solaar.info @@ -1,8 +1,8 @@ PRGNAM="Solaar" -VERSION="1.1.11" +VERSION="1.1.12" HOMEPAGE="https://pwr-solaar.github.io/Solaar/" -DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.1.11/Solaar-1.1.11.tar.gz" -MD5SUM="00c5238277ef60d8a091ba28f3220b9e" +DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.1.12/Solaar-1.1.12.tar.gz" +MD5SUM="587450bdca02f0b43982b1d642d88181" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-evdev pyudev python3-xlib python3-psutil" diff --git a/system/ansible-core/ansible-core.SlackBuild b/system/ansible-core/ansible-core.SlackBuild index fba03e2c59..bf18a14874 100644 --- a/system/ansible-core/ansible-core.SlackBuild +++ b/system/ansible-core/ansible-core.SlackBuild @@ -25,7 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ansible-core -VERSION=${VERSION:-2.15.9} +SRCNAM=$(echo $PRGNAM|tr '-' '_') +VERSION=${VERSION:-2.15.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -69,9 +70,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/ansible-core/ansible-core.info b/system/ansible-core/ansible-core.info index 63eecc2a28..7c8fcc337e 100644 --- a/system/ansible-core/ansible-core.info +++ b/system/ansible-core/ansible-core.info @@ -1,8 +1,8 @@ PRGNAM="ansible-core" -VERSION="2.15.9" +VERSION="2.15.12" HOMEPAGE="https://www.ansible.com" -DOWNLOAD="https://files.pythonhosted.org/packages/47/0b/5e46aeee6c72adc3507d9909e57fa1e9a66b3f4929c463bdbe102441a062/ansible-core-2.15.9.tar.gz" -MD5SUM="101644e55f0f2e13630aeaba3809298f" +DOWNLOAD="https://files.pythonhosted.org/packages/a1/fc/e81a2e2a6e4247444fe632c8ffaff5c1bcc3adf85ae87d08158724f419fd/ansible_core-2.15.12.tar.gz" +MD5SUM="287866768b35f344db7ccf2d28e7579e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cryptography importlib-resources python3-resolvelib" diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild index baf85c9b38..45aca7c2a1 100644 --- a/system/audit/audit.SlackBuild +++ b/system/audit/audit.SlackBuild @@ -79,6 +79,9 @@ find -L . \ # Init should check /etc/rc.d/rc.auditd.conf instead of /etc/sysconfig/auditd patch -p1 < $CWD/audit-2.3.6-sysconfig.diff +# python binding are disabled ATM, see +# https://listman.redhat.com/archives/linux-audit/2022-February/msg00085.html +# thanks to fourtysixandtwo for the pointers CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -94,6 +97,8 @@ CFLAGS="$SLKCFLAGS" \ --enable-systemd=no \ --with-libcap-ng=yes \ --enable-gssapi-krb5=yes \ + --without-python \ + --without-python3 \ --build=$ARCH-slackware-linux make diff --git a/system/cc1541/01-fix-manpage.patch b/system/cc1541/01-fix-manpage.patch new file mode 100644 index 0000000000..aae7cfb3dd --- /dev/null +++ b/system/cc1541/01-fix-manpage.patch @@ -0,0 +1,34 @@ +commit 6d53fb4cd3939f0b1ede46cff7ab74e13c87aacf +Author: Claus <claus@protovision.games> +Date: Wed Feb 28 21:48:51 2024 +0100 + + Fix build buster for man page and update copyright year + +diff --git a/cc1541.1.txt.in b/cc1541.1.txt.in +index 1f7c68c..271d326 100644 +--- a/cc1541.1.txt.in ++++ b/cc1541.1.txt.in +@@ -12,13 +12,7 @@ Björn Esser + == Name + + cc1541 - A tool for creating Commodore floppy disk images in +-D64 (35 and 40 track), D71 or D81 format, providing a lot of +-control over the layout of the data on the disk. It also +-supports writing the file format for the Transwarp loader by +-Krill. +- +-Find a more extensive online documentation here: +-https://acoustic-velocity.com/cc1541 ++D64, D71 or D81 format + + == Synopsis + +@@ -216,7 +210,7 @@ https://bitbucket.org/PTV_Claus/cc1541/issues/new + + == License + +-Copyright (C) 2008-2021 {author}. + ++Copyright (C) 2008-2024 {author}. + + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the diff --git a/system/cc1541/README b/system/cc1541/README new file mode 100644 index 0000000000..b2e44d0308 --- /dev/null +++ b/system/cc1541/README @@ -0,0 +1,4 @@ +cc1541 is a tool for creating Commodore floppy disk images in D64 +(35 and 40 track), D71 or D81 format, providing a lot of control over +the layout of the data on the disk. It also supports writing the file +format for the Transwarp loader by Krill. diff --git a/system/cc1541/cc1541.SlackBuild b/system/cc1541/cc1541.SlackBuild new file mode 100644 index 0000000000..ee69cf1169 --- /dev/null +++ b/system/cc1541/cc1541.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/bash + +# Slackware build script for cc1541 + +# Copyright 2024 ilmich < ardutu at gmail dot com > +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 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) + +PRGNAM=cc1541 +VERSION=${VERSION:-4.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# patch from https://aur.archlinux.org/cgit/aur.git/tree/asciidoc.patch?h=cc1541 +patch -p1 < $CWD/01-fix-manpage.patch + +CFLAGS=$SLKCFLAGS make install bindir=$PKG/usr/bin mandir=$PKG/usr/man ENABLE_MAN=1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README.md LICENSE.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/cc1541/cc1541.info b/system/cc1541/cc1541.info new file mode 100644 index 0000000000..31722539ed --- /dev/null +++ b/system/cc1541/cc1541.info @@ -0,0 +1,10 @@ +PRGNAM="cc1541" +VERSION="4.2" +HOMEPAGE="https://acoustic-velocity.com/cc1541" +DOWNLOAD="https://bitbucket.org/ptv_claus/cc1541/downloads/cc1541-4.2.tar.gz" +MD5SUM="d0f752b56485766642031f6197d56e16" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="ilmich" +EMAIL="ardutu@gmail.com" diff --git a/system/cc1541/slack-desc b/system/cc1541/slack-desc new file mode 100644 index 0000000000..e0e223a8d0 --- /dev/null +++ b/system/cc1541/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +cc1541: cc1541 (tool for creating Commodore 1541 Floppy disk images) +cc1541: +cc1541: cc1541 is a tool for creating Commodore 1541 Floppy disk images +cc1541: in D64, D71 or D81 format with custom sector interleaving etc. +cc1541: +cc1541: +cc1541: +cc1541: +cc1541: Homepage: https://acoustic-velocity.com/cc1541/ +cc1541: +cc1541: diff --git a/system/chronograf/chronograf.SlackBuild b/system/chronograf/chronograf.SlackBuild index 38449a9219..427e17fef8 100644 --- a/system/chronograf/chronograf.SlackBuild +++ b/system/chronograf/chronograf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=chronograf -VERSION=${VERSION:-1.10.3} +VERSION=${VERSION:-1.10.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/chronograf/chronograf.info b/system/chronograf/chronograf.info index 9991aff83a..55960fff7b 100644 --- a/system/chronograf/chronograf.info +++ b/system/chronograf/chronograf.info @@ -1,10 +1,10 @@ PRGNAM="chronograf" -VERSION="1.10.3" +VERSION="1.10.5" HOMEPAGE="https://www.influxdata.com" -DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.10.3_linux_i386.tar.gz" -MD5SUM="72385f53ae4dffff70a17973e172f7f6" -DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.10.3_linux_amd64.tar.gz" -MD5SUM_x86_64="493fe3362a03082472de8f83e57cdfc7" +DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.10.5_linux_i386.tar.gz" +MD5SUM="c7d6b1edb5814729b7f3e5175cbf2ec9" +DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.10.5_linux_amd64.tar.gz" +MD5SUM_x86_64="14dc097b436d21d896ce49b2df14ab4b" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index 9aed1b322e..10676bb0f6 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=conky -VERSION=${VERSION:-1.20.2} +VERSION=${VERSION:-1.21.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -102,7 +102,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \ - -DMAINTAINER_MODE=ON \ + -DMAINTAINER_MODE=OFF \ -DBUILD_DOCS=OFF \ -DBUILD_EXTRAS=ON \ -DBUILD_XDBE=ON \ diff --git a/system/conky/conky.info b/system/conky/conky.info index 34225d0c8d..aaa4486a97 100644 --- a/system/conky/conky.info +++ b/system/conky/conky.info @@ -1,8 +1,8 @@ PRGNAM="conky" -VERSION="1.20.2" +VERSION="1.21.2" HOMEPAGE="https://github.com/brndnmtthws/conky" -DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.20.2/conky-1.20.2.tar.gz" -MD5SUM="45a6f5da697b5fb55e3ef8c401c8ef03" +DOWNLOAD="https://github.com/brndnmtthws/conky/archive/v1.21.2/conky-1.21.2.tar.gz" +MD5SUM="c1080eef8c0973aaa45c43881b6d1f12" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lua53 imlib2" diff --git a/system/corectrl/corectrl.SlackBuild b/system/corectrl/corectrl.SlackBuild index 198120e66e..e2c2e5fb96 100644 --- a/system/corectrl/corectrl.SlackBuild +++ b/system/corectrl/corectrl.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=corectrl -VERSION=${VERSION:-v1.3.2} +VERSION=${VERSION:-v1.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/corectrl/corectrl.info b/system/corectrl/corectrl.info index 681b3e7e29..1df92bae08 100644 --- a/system/corectrl/corectrl.info +++ b/system/corectrl/corectrl.info @@ -1,10 +1,10 @@ PRGNAM="corectrl" -VERSION="v1.3.2" +VERSION="v1.4.0" HOMEPAGE="https://gitlab.com/corectrl/corectrl/" -DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.3.2/corectrl-v1.3.2.tar.gz" -MD5SUM="656d7d307c7f0185794d08239bf00d58" +DOWNLOAD="https://gitlab.com/corectrl/corectrl/-/archive/v1.4.0/corectrl-v1.4.0.tar.gz" +MD5SUM="b5f9571d64905a7594c54b9a419fe139" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Botan" +REQUIRES="Botan pugixml spdlog" MAINTAINER="Matthew Miller" EMAIL="mattallmill@gmail.com" diff --git a/system/docker-buildx/docker-buildx.SlackBuild b/system/docker-buildx/docker-buildx.SlackBuild index 37a65556b7..52259b24e0 100644 --- a/system/docker-buildx/docker-buildx.SlackBuild +++ b/system/docker-buildx/docker-buildx.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=docker-buildx -VERSION=${VERSION:-0.14.0} -GITHASH=${GITHASH:-171fcbeb69d67c90ba7f44f41a9e418f6a6ec1da} +VERSION=${VERSION:-0.14.1} +GITHASH=${GITHASH:-59582a88fca7858dbe1886fd1556b2a0d79e43a3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/docker-buildx/docker-buildx.info b/system/docker-buildx/docker-buildx.info index 4fea8e5bc4..6eaddbf1aa 100644 --- a/system/docker-buildx/docker-buildx.info +++ b/system/docker-buildx/docker-buildx.info @@ -1,10 +1,10 @@ PRGNAM="docker-buildx" -VERSION="0.14.0" +VERSION="0.14.1" HOMEPAGE="https://github.com/docker/buildx" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/buildx/archive/v0.14.0/buildx-0.14.0.tar.gz" -MD5SUM_x86_64="44115354337df52c9c609c9d41411c3b" +DOWNLOAD_x86_64="https://github.com/docker/buildx/archive/v0.14.1/buildx-0.14.1.tar.gz" +MD5SUM_x86_64="efcbe9edd7ab354ec51e3a52adf2378a" REQUIRES="google-go-lang" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/system/docker-compose/docker-compose.SlackBuild b/system/docker-compose/docker-compose.SlackBuild index b34eeb8d87..eb74bc4069 100644 --- a/system/docker-compose/docker-compose.SlackBuild +++ b/system/docker-compose/docker-compose.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=docker-compose -VERSION=${VERSION:-2.27.0} +VERSION=${VERSION:-2.27.1} GITHASH=${GITHASH:-b929810} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/docker-compose/docker-compose.info b/system/docker-compose/docker-compose.info index 1f77fc084d..5be9a8da64 100644 --- a/system/docker-compose/docker-compose.info +++ b/system/docker-compose/docker-compose.info @@ -1,10 +1,10 @@ PRGNAM="docker-compose" -VERSION="2.27.0" +VERSION="2.27.1" HOMEPAGE="https://docs.docker.com/compose/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/compose/archive/v2.27.0/compose-2.27.0.tar.gz" -MD5SUM_x86_64="19c94f1323a155d19afbfeda1cdecbcc" +DOWNLOAD_x86_64="https://github.com/docker/compose/archive/v2.27.1/compose-2.27.1.tar.gz" +MD5SUM_x86_64="6f206486ea13ea8ccfe9c0a696bbb515" REQUIRES="docker-cli" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/system/doublecmd-qt5/doublecmd-qt5.SlackBuild b/system/doublecmd-qt5/doublecmd-qt5.SlackBuild index add4b121b6..4350ad0c21 100644 --- a/system/doublecmd-qt5/doublecmd-qt5.SlackBuild +++ b/system/doublecmd-qt5/doublecmd-qt5.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=doublecmd-qt5 UPSTR_PRGNAME=doublecmd -VERSION=${VERSION:-1.1.12} +VERSION=${VERSION:-1.1.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/doublecmd-qt5/doublecmd-qt5.info b/system/doublecmd-qt5/doublecmd-qt5.info index 1703ce0fbd..05e57bc005 100644 --- a/system/doublecmd-qt5/doublecmd-qt5.info +++ b/system/doublecmd-qt5/doublecmd-qt5.info @@ -1,8 +1,8 @@ PRGNAM="doublecmd-qt5" -VERSION="1.1.12" +VERSION="1.1.15" HOMEPAGE="http://doublecmd.sourceforge.net/" -DOWNLOAD="https://downloads.sourceforge.net/project/doublecmd/Double%20Commander%20Source/doublecmd-1.1.12-src.tar.gz" -MD5SUM="c3a5c06c9ba44b51d454aca00b42ca4c" +DOWNLOAD="https://downloads.sourceforge.net/project/doublecmd/Double%20Commander%20Source/doublecmd-1.1.15-src.tar.gz" +MD5SUM="7fc4b07d1e3a4003301d83583419dbfe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lazarus libqtpas" diff --git a/system/edk2-ovmf/edk2-ovmf.SlackBuild b/system/edk2-ovmf/edk2-ovmf.SlackBuild index f12da413ae..538a7aeb95 100644 --- a/system/edk2-ovmf/edk2-ovmf.SlackBuild +++ b/system/edk2-ovmf/edk2-ovmf.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=edk2-ovmf -VERSION=${VERSION:-202402} -FEDVER=${FEDVER:-14-2.fc40} +VERSION=${VERSION:-202405} +FEDVER=${FEDVER:-24-1.fc41} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/edk2-ovmf/edk2-ovmf.info b/system/edk2-ovmf/edk2-ovmf.info index 3df5cccb30..cd91c61fc0 100644 --- a/system/edk2-ovmf/edk2-ovmf.info +++ b/system/edk2-ovmf/edk2-ovmf.info @@ -1,10 +1,10 @@ PRGNAM="edk2-ovmf" -VERSION="202402" +VERSION="202405" HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/OVMF" -DOWNLOAD="https://kojipkgs.fedoraproject.org/packages/edk2/20240214/2.fc40/noarch/edk2-ovmf-20240214-2.fc40.noarch.rpm \ - https://kojipkgs.fedoraproject.org/packages/edk2/20240214/2.fc40/noarch/edk2-ovmf-ia32-20240214-2.fc40.noarch.rpm" -MD5SUM="236712d5db08e01dde16dde8e1797237 \ - e919fa16b67cf12b9f976d76d838e020" +DOWNLOAD="https://kojipkgs.fedoraproject.org/packages/edk2/20240524/1.fc41/noarch/edk2-ovmf-20240524-1.fc41.noarch.rpm \ + https://kojipkgs.fedoraproject.org/packages/edk2/20240524/1.fc41/noarch/edk2-ovmf-ia32-20240524-1.fc41.noarch.rpm" +MD5SUM="cbee3e30cedfdf7ed4bcd4fe744c54a0 \ + b78b8dfd3b6344f256e3a603c006c0f3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild index dd98940f61..e52e490562 100644 --- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild +++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for escpr2 -# Copyright 2018-2023 Tim Dickson +# Copyright 2018-2024 Tim Dickson # All rights reserved. # # thanks to Ruben Schuller for escpr slack build, which this is @@ -33,7 +33,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=epson-inkjet-printer-escpr2 -VERSION=${VERSION:-1.2.9} +VERSION=${VERSION:-1.2.10} EXTRABIT=1 TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz BUILD=${BUILD:-1} diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info index ffb32306bc..4816df0ef0 100644 --- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info +++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info @@ -1,8 +1,8 @@ PRGNAM="epson-inkjet-printer-escpr2" -VERSION="1.2.9" +VERSION="1.2.10" HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.2.9-1.src.rpm" -MD5SUM="6cd6c9d35866fa17f62893acb1d52c73" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.2.10-1.src.rpm" +MD5SUM="da11534078ce2ae775e79b43a1338340" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/erofs-utils/README b/system/erofs-utils/README new file mode 100644 index 0000000000..2dd8f989c2 --- /dev/null +++ b/system/erofs-utils/README @@ -0,0 +1,4 @@ +EROFS filesystem stands for Enhanced Read-Only File System. It aims +to form a generic read-only filesystem solution for various +read-only use cases instead of just focusing on storage space saving +without considering any side effects of runtime performance. diff --git a/system/erofs-utils/erofs-utils.SlackBuild b/system/erofs-utils/erofs-utils.SlackBuild new file mode 100644 index 0000000000..a15cb1d575 --- /dev/null +++ b/system/erofs-utils/erofs-utils.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/bash + +# Slackware build script for erofs-utils + +# Copyright 2024 +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 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) + +PRGNAM=erofs-utils +VERSION=${VERSION:-1.7.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +./autogen.sh + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --enable-fuse \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +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 + + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + docs \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/erofs-utils/erofs-utils.info b/system/erofs-utils/erofs-utils.info new file mode 100644 index 0000000000..d3590147d3 --- /dev/null +++ b/system/erofs-utils/erofs-utils.info @@ -0,0 +1,10 @@ +PRGNAM="erofs-utils" +VERSION="1.7.1" +HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/" +DOWNLOAD="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-1.7.1.tar.gz" +MD5SUM="d42bf460c06eade30570417faac84682" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Lockywolf" +EMAIL="for_sbo.erofs-utils_2024-06-03@lockywolf.net" diff --git a/system/erofs-utils/slack-desc b/system/erofs-utils/slack-desc new file mode 100644 index 0000000000..86f2cbeaf4 --- /dev/null +++ b/system/erofs-utils/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +erofs-utils: erofs-utils (Userspace tools for EROFS filesystem) +erofs-utils: +erofs-utils: EROFS filesystem stands for Enhanced Read-Only File System. It aims +erofs-utils: to form a generic read-only filesystem solution for various +erofs-utils: read-only use cases instead of just focusing on storage space saving +erofs-utils: without considering any side effects of runtime performance. +erofs-utils: +erofs-utils: +erofs-utils: +erofs-utils: +erofs-utils: diff --git a/system/execline/execline.SlackBuild b/system/execline/execline.SlackBuild index 9f6c55eaa3..e58d50ee41 100644 --- a/system/execline/execline.SlackBuild +++ b/system/execline/execline.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=execline -VERSION=${VERSION:-2.9.4.0} +VERSION=${VERSION:-2.9.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/execline/execline.info b/system/execline/execline.info index 079aaac2e0..28996b32ca 100644 --- a/system/execline/execline.info +++ b/system/execline/execline.info @@ -1,8 +1,8 @@ PRGNAM="execline" -VERSION="2.9.4.0" +VERSION="2.9.5.1" HOMEPAGE="https://skarnet.org/software/execline/" -DOWNLOAD="https://skarnet.org/software/execline/execline-2.9.4.0.tar.gz" -MD5SUM="ab98d90c068f99c854277c6c8c696072" +DOWNLOAD="https://skarnet.org/software/execline/execline-2.9.5.1.tar.gz" +MD5SUM="0c4a770a8aaeedc61c8e209711d008a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="skalibs" diff --git a/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch b/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch deleted file mode 100644 index 31c2dd7843..0000000000 --- a/system/fakechroot/fakechroot-2.20.1-glibc-2.33.patch +++ /dev/null @@ -1,469 +0,0 @@ -From 534e6d555736b97211523970d378dfb0db2608e9 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> -Date: Mon, 22 Feb 2021 21:44:07 -0800 -Subject: [PATCH 1/6] tmpnam.c: fix heap overflow - -Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> ---- - src/tmpnam.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tmpnam.c b/src/tmpnam.c -index ce60817..917ee6b 100644 ---- a/src/tmpnam.c -+++ b/src/tmpnam.c -@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s)) - - expand_chroot_path(ptr); - -- ptr2 = malloc(strlen(ptr)); -+ ptr2 = malloc(strlen(ptr) + 1); - if (ptr2 == NULL) return NULL; - - strcpy(ptr2, ptr); - -From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> -Date: Mon, 22 Feb 2021 21:46:36 -0800 -Subject: [PATCH 2/6] declare missing bufs, remove ver from lstat - -Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> ---- - src/lstat.c | 8 +++++--- - src/lstat.h | 2 +- - src/mknod.c | 2 ++ - src/stat.c | 2 ++ - src/stat64.c | 2 ++ - 5 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/src/lstat.c b/src/lstat.c -index 3f6d819..54e3263 100644 ---- a/src/lstat.c -+++ b/src/lstat.c -@@ -28,9 +28,11 @@ - #include "lstat.h" - - --wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) -+wrapper(lstat, int, (const char * filename, struct stat * buf)) - { -- debug("lstat(%d, \"%s\", &buf)", ver, filename); -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; -+ debug("lstat(\"%s\", &buf)", filename); - - if (!fakechroot_localdir(filename)) { - if (filename != NULL) { -@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) - } - } - -- return lstat_rel(ver, filename, buf); -+ return lstat_rel(filename, buf); - } - - -diff --git a/src/lstat.h b/src/lstat.h -index 751c1ea..ee48303 100644 ---- a/src/lstat.h -+++ b/src/lstat.h -@@ -26,7 +26,7 @@ - - #ifndef HAVE___LXSTAT - --wrapper_proto(lstat, int, (int, const char *, struct stat *)); -+wrapper_proto(lstat, int, (const char *, struct stat *)); - - int lstat_rel(const char *, struct stat *); - -diff --git a/src/mknod.c b/src/mknod.c -index 52fd33b..2771037 100644 ---- a/src/mknod.c -+++ b/src/mknod.c -@@ -28,6 +28,8 @@ - - wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev)) - { -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; - debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev); - expand_chroot_path(pathname); - return nextcall(mknod)(pathname, mode, dev); -diff --git a/src/stat.c b/src/stat.c -index 7845662..7b37793 100644 ---- a/src/stat.c -+++ b/src/stat.c -@@ -33,6 +33,8 @@ - - wrapper(stat, int, (const char * file_name, struct stat * buf)) - { -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; - debug("stat(\"%s\", &buf)", file_name); - expand_chroot_path(file_name); - return nextcall(stat)(file_name, buf); -diff --git a/src/stat64.c b/src/stat64.c -index aac9c75..a360f66 100644 ---- a/src/stat64.c -+++ b/src/stat64.c -@@ -34,6 +34,8 @@ - - wrapper(stat64, int, (const char * file_name, struct stat64 * buf)) - { -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; - debug("stat64(\"%s\", &buf)", file_name); - expand_chroot_path(file_name); - return nextcall(stat64)(file_name, buf); - -From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> -Date: Mon, 22 Feb 2021 21:47:09 -0800 -Subject: [PATCH 3/6] fix glibc 2.33+ compatibility - -Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> ---- - configure.ac | 20 ++++++++++++++++++++ - src/ftw.c | 2 +- - src/ftw64.c | 14 +++++++++++--- - src/libfakechroot.h | 15 +++++++++++++++ - src/lstat.c | 2 +- - src/lstat.h | 2 +- - src/lstat64.c | 2 +- - src/mknod.c | 2 +- - src/mknodat.c | 2 +- - src/stat.c | 2 +- - src/stat64.c | 2 +- - 11 files changed, 54 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f8cdb32..9cc2e77 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY - # Checks for libraries. - AC_CHECK_LIB([dl], [dlsym]) - -+AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33]) -+AC_MSG_CHECKING([for glibc 2.33+]) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #include <sys/stat.h> -+ ]], [[ -+#ifdef __GLIBC__ -+#if !__GLIBC_PREREQ(2,33) -+#error glibc<2.33 -+#endif -+#else -+#error not glibc -+#endif -+ ]])],[ -+ AC_DEFINE(NEW_GLIBC,1) -+ AC_MSG_RESULT([yes]) -+ ],[ -+ AC_DEFINE(NEW_GLIBC,0) -+ AC_MSG_RESULT([no]) -+ ]) -+ - # Checks for header files. - AC_HEADER_DIRENT - AC_HEADER_STDC -diff --git a/src/ftw.c b/src/ftw.c -index 92fc126..a9abc85 100644 ---- a/src/ftw.c -+++ b/src/ftw.c -@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *); - # define NFTW_NEW_NAME __new_nftw - # define INO_T ino_t - # define STAT stat --# ifdef _LIBC -+# if defined(_LIBC) && !NEW_GLIBC - # define LXSTAT __lxstat - # define XSTAT __xstat - # define FXSTATAT __fxstatat -diff --git a/src/ftw64.c b/src/ftw64.c -index 7cc8cdf..cee1f2b 100644 ---- a/src/ftw64.c -+++ b/src/ftw64.c -@@ -18,6 +18,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include "config.h" -+ - #define __FTW64_C - #define FTW_NAME ftw64 - #define NFTW_NAME nftw64 -@@ -25,9 +27,15 @@ - #define NFTW_NEW_NAME __new_nftw64 - #define INO_T ino64_t - #define STAT stat64 --#define LXSTAT __lxstat64 --#define XSTAT __xstat64 --#define FXSTATAT __fxstatat64 -+#if NEW_GLIBC -+# define LXSTAT(V,f,sb) lstat64 (f,sb) -+# define XSTAT(V,f,sb) stat64 (f,sb) -+# define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m) -+#else -+# define LXSTAT __lxstat64 -+# define XSTAT __xstat64 -+# define FXSTATAT __fxstatat64 -+#endif - #define FTW_FUNC_T __ftw64_func_t - #define NFTW_FUNC_T __nftw64_func_t - -diff --git a/src/libfakechroot.h b/src/libfakechroot.h -index 4cf199f..64ff15f 100644 ---- a/src/libfakechroot.h -+++ b/src/libfakechroot.h -@@ -200,6 +200,21 @@ - # endif - #endif - -+#ifndef _STAT_VER -+ #if defined (__aarch64__) -+ #define _STAT_VER 0 -+ #elif defined (__powerpc__) && __WORDSIZE == 64 -+ #define _STAT_VER 1 -+ #elif defined (__riscv) && __riscv_xlen==64 -+ #define _STAT_VER 0 -+ #elif defined (__s390x__) -+ #define _STAT_VER 1 -+ #elif defined (__x86_64__) -+ #define _STAT_VER 1 -+ #else -+ #define _STAT_VER 3 -+ #endif -+#endif - - typedef void (*fakechroot_wrapperfn_t)(void); - -diff --git a/src/lstat.c b/src/lstat.c -index 54e3263..fa38323 100644 ---- a/src/lstat.c -+++ b/src/lstat.c -@@ -20,7 +20,7 @@ - - #include <config.h> - --#ifndef HAVE___LXSTAT -+#if !defined(HAVE___LXSTAT) || NEW_GLIBC - - #include <sys/stat.h> - #include <unistd.h> -diff --git a/src/lstat.h b/src/lstat.h -index ee48303..c46a2b9 100644 ---- a/src/lstat.h -+++ b/src/lstat.h -@@ -24,7 +24,7 @@ - #include <config.h> - #include "libfakechroot.h" - --#ifndef HAVE___LXSTAT -+#if !defined(HAVE___LXSTAT) || NEW_GLIBC - - wrapper_proto(lstat, int, (const char *, struct stat *)); - -diff --git a/src/lstat64.c b/src/lstat64.c -index b6212fc..a332d7c 100644 ---- a/src/lstat64.c -+++ b/src/lstat64.c -@@ -20,7 +20,7 @@ - - #include <config.h> - --#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64) -+#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC) - - #define _LARGEFILE64_SOURCE - #define _BSD_SOURCE -diff --git a/src/mknod.c b/src/mknod.c -index 2771037..aeb750b 100644 ---- a/src/mknod.c -+++ b/src/mknod.c -@@ -20,7 +20,7 @@ - - #include <config.h> - --#ifndef HAVE___XMKNOD -+#if !defined(HAVE___XMKNOD) || NEW_GLIBC - - #include <sys/stat.h> - #include "libfakechroot.h" -diff --git a/src/mknodat.c b/src/mknodat.c -index 732a22b..3239b35 100644 ---- a/src/mknodat.c -+++ b/src/mknodat.c -@@ -20,7 +20,7 @@ - - #include <config.h> - --#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT) -+#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC) - - #define _ATFILE_SOURCE - #include <sys/stat.h> -diff --git a/src/stat.c b/src/stat.c -index 7b37793..5ef57ba 100644 ---- a/src/stat.c -+++ b/src/stat.c -@@ -20,7 +20,7 @@ - - #include <config.h> - --#ifndef HAVE___XSTAT -+#if !defined(HAVE___XSTAT) || NEW_GLIBC - - #define _BSD_SOURCE - #define _DEFAULT_SOURCE -diff --git a/src/stat64.c b/src/stat64.c -index a360f66..993ce80 100644 ---- a/src/stat64.c -+++ b/src/stat64.c -@@ -20,7 +20,7 @@ - - #include <config.h> - --#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64) -+#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC) - - #define _BSD_SOURCE - #define _LARGEFILE64_SOURCE - -From e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5 Mon Sep 17 00:00:00 2001 -From: neok-m4700 <neok-m4700@users.noreply.github.com> -Date: Wed, 24 Feb 2021 17:36:57 +0100 -Subject: [PATCH 6/6] wrap fstatat and fstatat64 - ---- - configure.ac | 2 ++ - src/Makefile.am | 2 ++ - src/fstatat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ - src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 89 insertions(+) - create mode 100644 src/fstatat.c - create mode 100644 src/fstatat64.c - -diff --git a/configure.ac b/configure.ac -index 9cc2e77..5b3053e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([ - freopen64 - fstat - fstat64 -+ fstatat -+ fstatat64 - fts_children - fts_open - fts_read -diff --git a/src/Makefile.am b/src/Makefile.am -index 6066345..eb311c0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \ - fopen64.c \ - freopen.c \ - freopen64.c \ -+ fstatat.c \ -+ fstatat64.c \ - fts.c \ - fts64.c \ - ftw.c \ -diff --git a/src/fstatat.c b/src/fstatat.c -new file mode 100644 -index 0000000..ca7578b ---- /dev/null -+++ b/src/fstatat.c -@@ -0,0 +1,42 @@ -+/* -+ libfakechroot -- fake chroot environment -+ Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+ -+ -+#include <config.h> -+ -+#ifdef HAVE_FSTATAT -+ -+#define _ATFILE_SOURCE -+#define _POSIX_C_SOURCE 200809L -+#include <sys/stat.h> -+#include <limits.h> -+#include "libfakechroot.h" -+ -+wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags)) -+{ -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; -+ debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); -+ expand_chroot_path_at(dirfd, pathname); -+ return nextcall(fstatat)(dirfd, pathname, buf, flags); -+} -+ -+#else -+typedef int empty_translation_unit; -+#endif -diff --git a/src/fstatat64.c b/src/fstatat64.c -new file mode 100644 -index 0000000..1863372 ---- /dev/null -+++ b/src/fstatat64.c -@@ -0,0 +1,43 @@ -+/* -+ libfakechroot -- fake chroot environment -+ Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org> -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+ -+ -+#include <config.h> -+ -+#ifdef HAVE_FSTATAT64 -+ -+#define _ATFILE_SOURCE -+#define _POSIX_C_SOURCE 200809L -+#define _LARGEFILE64_SOURCE -+#include <sys/stat.h> -+#include <limits.h> -+#include "libfakechroot.h" -+ -+wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags)) -+{ -+ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; -+ char fakechroot_buf[FAKECHROOT_PATH_MAX]; -+ debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); -+ expand_chroot_path_at(dirfd, pathname); -+ return nextcall(fstatat64)(dirfd, pathname, buf, flags); -+} -+ -+#else -+typedef int empty_translation_unit; -+#endif diff --git a/system/fakechroot/fakechroot.SlackBuild b/system/fakechroot/fakechroot.SlackBuild index ae5854880a..db97a1ba6c 100644 --- a/system/fakechroot/fakechroot.SlackBuild +++ b/system/fakechroot/fakechroot.SlackBuild @@ -72,8 +72,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -# thanks gentoo maintainers -patch -p1 < $CWD/fakechroot-2.20.1-glibc-2.33.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -81,6 +79,10 @@ 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 {} \; +# get patches from fedora (thanks!) +for i in $CWD/patches/* ; do patch -p1 < $i ; done +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/fakechroot/patches/104.patch b/system/fakechroot/patches/104.patch new file mode 100644 index 0000000000..0e7d7f0b52 --- /dev/null +++ b/system/fakechroot/patches/104.patch @@ -0,0 +1,1727 @@ +From 11589e1037372c5ad719e1e46d7462fd196caa56 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Thu, 24 Jun 2021 10:38:28 +0200 +Subject: [PATCH 01/11] src/lckpwdf.c: create an empty /etc/.pwd.lock + +--- + src/lckpwdf.c | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +diff --git a/src/lckpwdf.c b/src/lckpwdf.c +index dc0e68b5..66a058de 100644 +--- a/src/lckpwdf.c ++++ b/src/lckpwdf.c +@@ -22,12 +22,37 @@ + + #ifdef HAVE_LCKPWDF + ++#include <unistd.h> ++#include <fcntl.h> + #include "libfakechroot.h" ++#include "open.h" + + + wrapper(lckpwdf, int, (void)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ ++ int file; + debug("lckpwdf()"); ++ // lckpwdf will create an empty /etc/.pwd.lock ++ // if that file doesn't exist yet, we create it here as well ++ char* pwdlockfile = "/etc/.pwd.lock"; ++ expand_chroot_path(pwdlockfile); ++ ++ if ((file = nextcall(open)(pwdlockfile, O_RDONLY)) == 0) { ++ // if the file already exists, don't touch it ++ close(file); ++ return 0; ++ } ++ ++ if ((file = nextcall(open)(pwdlockfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) == -1) { ++ // we ignore any errors (maybe /etc doesn't exist or we don't have the ++ // necessary permissions) ++ return 0; ++ } ++ // the file remains empty ++ close(file); + return 0; + } + + +From 3cdb9b5426ef508c9220b4b0316954e3b7dff9ac Mon Sep 17 00:00:00 2001 +From: Hajime Yoshimori <lugia.kun@gmail.com> +Date: Fri, 1 May 2020 21:14:32 +0900 +Subject: [PATCH 02/11] check return value of dladdr + +https://github.com/dex4er/fakechroot/pull/70 +--- + src/dladdr.c | 12 +++++++----- + test/Makefile.am | 1 + + test/src/Makefile.am | 1 + + test/src/test-dladdr.c | 14 ++++++++++++++ + test/t/dladdr.t | 14 ++++++++++++++ + 5 files changed, 37 insertions(+), 5 deletions(-) + create mode 100644 test/src/test-dladdr.c + create mode 100755 test/t/dladdr.t + +diff --git a/src/dladdr.c b/src/dladdr.c +index fef32579..3dffdb3f 100644 +--- a/src/dladdr.c ++++ b/src/dladdr.c +@@ -36,11 +36,13 @@ wrapper(dladdr, int, (const void * addr, Dl_info * info)) + + ret = nextcall(dladdr)(addr, info); + +- if (info->dli_fname) { +- narrow_chroot_path(info->dli_fname); +- } +- if (info->dli_sname) { +- narrow_chroot_path(info->dli_sname); ++ if (ret != 0) { ++ if (info->dli_fname) { ++ narrow_chroot_path(info->dli_fname); ++ } ++ if (info->dli_sname) { ++ narrow_chroot_path(info->dli_sname); ++ } + } + + return ret; +diff --git a/test/Makefile.am b/test/Makefile.am +index aba29538..0021b0a1 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -9,6 +9,7 @@ TESTS = \ + t/cmd-subst.t \ + t/cp.t \ + t/dedotdot.t \ ++ t/dladdr.t \ + t/execlp.t \ + t/execve-elfloader.t \ + t/execve-null-envp.t \ +diff --git a/test/src/Makefile.am b/test/src/Makefile.am +index 7fb3075b..5f5fde8d 100644 +--- a/test/src/Makefile.am ++++ b/test/src/Makefile.am +@@ -3,6 +3,7 @@ check_PROGRAMS = \ + test-chroot \ + test-clearenv \ + test-dedotdot \ ++ test-dladdr \ + test-execlp \ + test-execve-null-envp \ + test-fts \ +diff --git a/test/src/test-dladdr.c b/test/src/test-dladdr.c +new file mode 100644 +index 00000000..5ec8d248 +--- /dev/null ++++ b/test/src/test-dladdr.c +@@ -0,0 +1,14 @@ ++#define _GNU_SOURCE ++#include <dlfcn.h> ++#include <stdlib.h> ++#include <string.h> ++#include <stdio.h> ++ ++int main(int argc, char** argv) ++{ ++ Dl_info info; ++ memset(&info, 0xfe, sizeof(info)); /* fill with inaccessible address */ ++ int ret = dladdr(NULL, &info); ++ printf("%ld\n", ret); ++ return 0; ++} +diff --git a/test/t/dladdr.t b/test/t/dladdr.t +new file mode 100755 +index 00000000..fc7f9397 +--- /dev/null ++++ b/test/t/dladdr.t +@@ -0,0 +1,14 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++prepare 1 ++ ++PATH=$srcdir/bin:$PATH ++ ++t=`$srcdir/fakechroot.sh $testtree /bin/test-dladdr` ++[ "$t" != "0" ] && not ++ok "dladdr returns" $t ++ ++cleanup + +From 63c2cbed6dca6196940b439736ca2c069cb9358b Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +Date: Mon, 22 Feb 2021 21:44:07 -0800 +Subject: [PATCH 03/11] tmpnam.c: fix heap overflow + +https://github.com/dex4er/fakechroot/pull/85 + +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +--- + src/tmpnam.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tmpnam.c b/src/tmpnam.c +index ce60817a..917ee6b7 100644 +--- a/src/tmpnam.c ++++ b/src/tmpnam.c +@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s)) + + expand_chroot_path(ptr); + +- ptr2 = malloc(strlen(ptr)); ++ ptr2 = malloc(strlen(ptr) + 1); + if (ptr2 == NULL) return NULL; + + strcpy(ptr2, ptr); + +From be3a291ef37ace606ec2845f6c1b645b981805cb Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +Date: Mon, 22 Feb 2021 21:46:36 -0800 +Subject: [PATCH 04/11] declare missing bufs, remove ver from lstat + +https://github.com/dex4er/fakechroot/pull/85 + +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +--- + src/lstat.c | 8 +++++--- + src/lstat.h | 2 +- + src/mknod.c | 2 ++ + src/stat.c | 2 ++ + src/stat64.c | 2 ++ + 5 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/src/lstat.c b/src/lstat.c +index 3f6d819f..54e3263f 100644 +--- a/src/lstat.c ++++ b/src/lstat.c +@@ -28,9 +28,11 @@ + #include "lstat.h" + + +-wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) ++wrapper(lstat, int, (const char * filename, struct stat * buf)) + { +- debug("lstat(%d, \"%s\", &buf)", ver, filename); ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("lstat(\"%s\", &buf)", filename); + + if (!fakechroot_localdir(filename)) { + if (filename != NULL) { +@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf)) + } + } + +- return lstat_rel(ver, filename, buf); ++ return lstat_rel(filename, buf); + } + + +diff --git a/src/lstat.h b/src/lstat.h +index 751c1ead..ee483033 100644 +--- a/src/lstat.h ++++ b/src/lstat.h +@@ -26,7 +26,7 @@ + + #ifndef HAVE___LXSTAT + +-wrapper_proto(lstat, int, (int, const char *, struct stat *)); ++wrapper_proto(lstat, int, (const char *, struct stat *)); + + int lstat_rel(const char *, struct stat *); + +diff --git a/src/mknod.c b/src/mknod.c +index 52fd33b2..27710372 100644 +--- a/src/mknod.c ++++ b/src/mknod.c +@@ -28,6 +28,8 @@ + + wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev); + expand_chroot_path(pathname); + return nextcall(mknod)(pathname, mode, dev); +diff --git a/src/stat.c b/src/stat.c +index 78456620..7b377933 100644 +--- a/src/stat.c ++++ b/src/stat.c +@@ -33,6 +33,8 @@ + + wrapper(stat, int, (const char * file_name, struct stat * buf)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("stat(\"%s\", &buf)", file_name); + expand_chroot_path(file_name); + return nextcall(stat)(file_name, buf); +diff --git a/src/stat64.c b/src/stat64.c +index aac9c75f..a360f66f 100644 +--- a/src/stat64.c ++++ b/src/stat64.c +@@ -34,6 +34,8 @@ + + wrapper(stat64, int, (const char * file_name, struct stat64 * buf)) + { ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; + debug("stat64(\"%s\", &buf)", file_name); + expand_chroot_path(file_name); + return nextcall(stat64)(file_name, buf); + +From 26f69c2c3120b9b059209c7566850ef5187de56a Mon Sep 17 00:00:00 2001 +From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +Date: Mon, 22 Feb 2021 21:47:09 -0800 +Subject: [PATCH 05/11] fix glibc 2.33+ compatibility + +https://github.com/dex4er/fakechroot/pull/85 + +Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> +--- + configure.ac | 20 ++++++++++++++++++++ + src/ftw.c | 2 +- + src/ftw64.c | 14 +++++++++++--- + src/libfakechroot.h | 15 +++++++++++++++ + src/lstat.c | 2 +- + src/lstat.h | 2 +- + src/lstat64.c | 2 +- + src/mknod.c | 2 +- + src/mknodat.c | 2 +- + src/stat.c | 2 +- + src/stat64.c | 2 +- + 11 files changed, 54 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f8cdb323..9cc2e779 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY + # Checks for libraries. + AC_CHECK_LIB([dl], [dlsym]) + ++AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33]) ++AC_MSG_CHECKING([for glibc 2.33+]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ #include <sys/stat.h> ++ ]], [[ ++#ifdef __GLIBC__ ++#if !__GLIBC_PREREQ(2,33) ++#error glibc<2.33 ++#endif ++#else ++#error not glibc ++#endif ++ ]])],[ ++ AC_DEFINE(NEW_GLIBC,1) ++ AC_MSG_RESULT([yes]) ++ ],[ ++ AC_DEFINE(NEW_GLIBC,0) ++ AC_MSG_RESULT([no]) ++ ]) ++ + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +diff --git a/src/ftw.c b/src/ftw.c +index 92fc126c..a9abc853 100644 +--- a/src/ftw.c ++++ b/src/ftw.c +@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *); + # define NFTW_NEW_NAME __new_nftw + # define INO_T ino_t + # define STAT stat +-# ifdef _LIBC ++# if defined(_LIBC) && !NEW_GLIBC + # define LXSTAT __lxstat + # define XSTAT __xstat + # define FXSTATAT __fxstatat +diff --git a/src/ftw64.c b/src/ftw64.c +index 7cc8cdfd..cee1f2bc 100644 +--- a/src/ftw64.c ++++ b/src/ftw64.c +@@ -18,6 +18,8 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#include "config.h" ++ + #define __FTW64_C + #define FTW_NAME ftw64 + #define NFTW_NAME nftw64 +@@ -25,9 +27,15 @@ + #define NFTW_NEW_NAME __new_nftw64 + #define INO_T ino64_t + #define STAT stat64 +-#define LXSTAT __lxstat64 +-#define XSTAT __xstat64 +-#define FXSTATAT __fxstatat64 ++#if NEW_GLIBC ++# define LXSTAT(V,f,sb) lstat64 (f,sb) ++# define XSTAT(V,f,sb) stat64 (f,sb) ++# define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m) ++#else ++# define LXSTAT __lxstat64 ++# define XSTAT __xstat64 ++# define FXSTATAT __fxstatat64 ++#endif + #define FTW_FUNC_T __ftw64_func_t + #define NFTW_FUNC_T __nftw64_func_t + +diff --git a/src/libfakechroot.h b/src/libfakechroot.h +index 4cf199ff..64ff15fb 100644 +--- a/src/libfakechroot.h ++++ b/src/libfakechroot.h +@@ -200,6 +200,21 @@ + # endif + #endif + ++#ifndef _STAT_VER ++ #if defined (__aarch64__) ++ #define _STAT_VER 0 ++ #elif defined (__powerpc__) && __WORDSIZE == 64 ++ #define _STAT_VER 1 ++ #elif defined (__riscv) && __riscv_xlen==64 ++ #define _STAT_VER 0 ++ #elif defined (__s390x__) ++ #define _STAT_VER 1 ++ #elif defined (__x86_64__) ++ #define _STAT_VER 1 ++ #else ++ #define _STAT_VER 3 ++ #endif ++#endif + + typedef void (*fakechroot_wrapperfn_t)(void); + +diff --git a/src/lstat.c b/src/lstat.c +index 54e3263f..fa383234 100644 +--- a/src/lstat.c ++++ b/src/lstat.c +@@ -20,7 +20,7 @@ + + #include <config.h> + +-#ifndef HAVE___LXSTAT ++#if !defined(HAVE___LXSTAT) || NEW_GLIBC + + #include <sys/stat.h> + #include <unistd.h> +diff --git a/src/lstat.h b/src/lstat.h +index ee483033..c46a2b9b 100644 +--- a/src/lstat.h ++++ b/src/lstat.h +@@ -24,7 +24,7 @@ + #include <config.h> + #include "libfakechroot.h" + +-#ifndef HAVE___LXSTAT ++#if !defined(HAVE___LXSTAT) || NEW_GLIBC + + wrapper_proto(lstat, int, (const char *, struct stat *)); + +diff --git a/src/lstat64.c b/src/lstat64.c +index b6212fc8..a332d7c3 100644 +--- a/src/lstat64.c ++++ b/src/lstat64.c +@@ -20,7 +20,7 @@ + + #include <config.h> + +-#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64) ++#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC) + + #define _LARGEFILE64_SOURCE + #define _BSD_SOURCE +diff --git a/src/mknod.c b/src/mknod.c +index 27710372..aeb750b0 100644 +--- a/src/mknod.c ++++ b/src/mknod.c +@@ -20,7 +20,7 @@ + + #include <config.h> + +-#ifndef HAVE___XMKNOD ++#if !defined(HAVE___XMKNOD) || NEW_GLIBC + + #include <sys/stat.h> + #include "libfakechroot.h" +diff --git a/src/mknodat.c b/src/mknodat.c +index 732a22bc..3239b357 100644 +--- a/src/mknodat.c ++++ b/src/mknodat.c +@@ -20,7 +20,7 @@ + + #include <config.h> + +-#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT) ++#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC) + + #define _ATFILE_SOURCE + #include <sys/stat.h> +diff --git a/src/stat.c b/src/stat.c +index 7b377933..5ef57bab 100644 +--- a/src/stat.c ++++ b/src/stat.c +@@ -20,7 +20,7 @@ + + #include <config.h> + +-#ifndef HAVE___XSTAT ++#if !defined(HAVE___XSTAT) || NEW_GLIBC + + #define _BSD_SOURCE + #define _DEFAULT_SOURCE +diff --git a/src/stat64.c b/src/stat64.c +index a360f66f..993ce808 100644 +--- a/src/stat64.c ++++ b/src/stat64.c +@@ -20,7 +20,7 @@ + + #include <config.h> + +-#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64) ++#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC) + + #define _BSD_SOURCE + #define _LARGEFILE64_SOURCE + +From 5366e9a366b213b879abf0f0a3aeb3409d3b57ed Mon Sep 17 00:00:00 2001 +From: neok-m4700 <neok-m4700@users.noreply.github.com> +Date: Wed, 24 Feb 2021 17:36:57 +0100 +Subject: [PATCH 06/11] wrap fstatat and fstatat64 + +https://github.com/dex4er/fakechroot/pull/86 +--- + configure.ac | 2 ++ + src/Makefile.am | 2 ++ + src/fstatat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 89 insertions(+) + create mode 100644 src/fstatat.c + create mode 100644 src/fstatat64.c + +diff --git a/configure.ac b/configure.ac +index 9cc2e779..5b3053e1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([ + freopen64 + fstat + fstat64 ++ fstatat ++ fstatat64 + fts_children + fts_open + fts_read +diff --git a/src/Makefile.am b/src/Makefile.am +index 60663452..eb311c0a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \ + fopen64.c \ + freopen.c \ + freopen64.c \ ++ fstatat.c \ ++ fstatat64.c \ + fts.c \ + fts64.c \ + ftw.c \ +diff --git a/src/fstatat.c b/src/fstatat.c +new file mode 100644 +index 00000000..ca7578b3 +--- /dev/null ++++ b/src/fstatat.c +@@ -0,0 +1,42 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE_FSTATAT ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include <sys/stat.h> ++#include <limits.h> ++#include "libfakechroot.h" ++ ++wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(fstatat)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/fstatat64.c b/src/fstatat64.c +new file mode 100644 +index 00000000..18633725 +--- /dev/null ++++ b/src/fstatat64.c +@@ -0,0 +1,43 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE_FSTATAT64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#define _LARGEFILE64_SOURCE ++#include <sys/stat.h> ++#include <limits.h> ++#include "libfakechroot.h" ++ ++wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(fstatat64)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif + +From bc7ef087c17a475ec03768053fa22c2193ae7fc2 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Wed, 24 Aug 2022 08:26:04 +0200 +Subject: [PATCH 07/11] Wrap all functions accessing /etc/passwd, /etc/group + and /etc/shadow + +Starting with glibc 2.32 the compat nss module for getpwnam calls +__nss_files_fopen (which is a GLIBC_PRIVATE symbol provided by glibc) +instead of fopen (see 299210c1fa67e2dfb564475986fce11cd33db9ad). This +leads to getpwnam calls accessing /etc/passwd from *outside* the chroot +and as a result programs like adduser do not work correctly anymore +under fakechroot. + +Starting with glibc 2.34 the __nss_files_fopen was moved from nss to +libc.so and thus wrapping it with LD_PRELOAD has no affect anymore +(see 6212bb67f4695962748a5981e1b9fea105af74f6). + +So now we also wrap all the functions accessing /etc/passwd, /etc/group +and /etc/shadow. This solution will ignore NIS, LDAP or other local files +as potentially configured in /etc/nsswitch.conf. + +https://github.com/dex4er/fakechroot/pull/98 +--- + src/Makefile.am | 1 + + src/passwd.c | 296 +++++++++++++++++++++++++++++++++++++++++ + test/Makefile.am | 1 + + test/src/Makefile.am | 1 + + test/src/test-passwd.c | 28 ++++ + test/t/passwd.t | 23 ++++ + test/testtree.sh | 6 + + 7 files changed, 356 insertions(+) + create mode 100644 src/passwd.c + create mode 100644 test/src/test-passwd.c + create mode 100755 test/t/passwd.t + +diff --git a/src/Makefile.am b/src/Makefile.am +index eb311c0a..6e9d9ae1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -120,6 +120,7 @@ libfakechroot_la_SOURCES = \ + openat64.c \ + opendir.c \ + opendir.h \ ++ passwd.c \ + pathconf.c \ + popen.c \ + posix_spawn.c \ +diff --git a/src/passwd.c b/src/passwd.c +new file mode 100644 +index 00000000..d4cee86c +--- /dev/null ++++ b/src/passwd.c +@@ -0,0 +1,296 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++/* ++ * Starting with glibc 2.32 the compat nss module for getpwnam calls ++ * __nss_files_fopen (which is a GLIBC_PRIVATE symbol provided by glibc) ++ * instead of fopen (see 299210c1fa67e2dfb564475986fce11cd33db9ad). This ++ * leads to getpwnam calls accessing /etc/passwd from *outside* the chroot ++ * and as a result programs like adduser do not work correctly anymore ++ * under fakechroot. ++ * ++ * Starting with glibc 2.34 the __nss_files_fopen was moved from nss to ++ * libc.so and thus wrapping it with LD_PRELOAD has no affect anymore ++ * (see 6212bb67f4695962748a5981e1b9fea105af74f6). ++ * ++ * So now we also wrap all the functions accessing /etc/passwd, /etc/group ++ * and /etc/shadow. This solution will ignore NIS, LDAP or other local files ++ * as potentially configured in /etc/nsswitch.conf. ++ */ ++ ++#include <gnu/libc-version.h> ++#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 32) ++ ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <pwd.h> ++#include <grp.h> ++#include <shadow.h> ++#include "libfakechroot.h" ++ ++/* getpwent, setpwent, endpwent, getpwuid, getpwnam */ ++ ++static FILE *pw_f; ++ ++wrapper(getpwent, struct passwd *, (void)) ++{ ++ if (!pw_f) pw_f = fopen("/etc/passwd", "rbe"); ++ if (!pw_f) return 0; ++ return fgetpwent(pw_f); ++} ++ ++wrapper (getpwent_r, int, (struct passwd *pwbuf, char *buf, size_t buflen, struct passwd **pwbufp)) ++{ ++ if (!pw_f) pw_f = fopen("/etc/passwd", "rbe"); ++ if (!pw_f) return 0; ++ return fgetpwent_r(pw_f, pwbuf, buf, buflen, pwbufp); ++} ++ ++wrapper(setpwent, void, (void)) ++{ ++ if (pw_f) fclose(pw_f); ++ pw_f = 0; ++} ++ ++wrapper(endpwent, void, (void)) ++{ ++ if (pw_f) fclose(pw_f); ++ pw_f = 0; ++} ++ ++wrapper(getpwuid, struct passwd *, (uid_t uid)) ++{ ++ debug("getpwuid(\"%ul\")", uid); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct passwd *res = NULL; ++ while ((res = fgetpwent(f))) { ++ if (res->pw_uid == uid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getpwuid_r, int, (uid_t uid, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result)) ++{ ++ debug("getpwuid_r(\"%ul\")", uid); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetpwent_r(f, pwd, buf, buflen, result))) { ++ if (pwd->pw_uid == uid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getpwnam, struct passwd *, (const char *name)) ++{ ++ debug("getpwnam(\"%s\")", name); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct passwd *res = NULL; ++ while ((res = fgetpwent(f))) { ++ if (name && !strcmp(name, res->pw_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getpwnam_r, int, (const char *name, struct passwd *pwd, char *buf, size_t buflen, struct passwd **result)) ++{ ++ debug("getpwnam_r(\"%s\")", name); ++ FILE *f = fopen("/etc/passwd", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetpwent_r(f, pwd, buf, buflen, result))) { ++ if (name && !strcmp(name, pwd->pw_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++/* getgrent, setgrent, endgrent, getgrgid, getgrnam */ ++ ++static FILE *gr_f; ++ ++wrapper(getgrent, struct group *, (void)) ++{ ++ if (!gr_f) gr_f = fopen("/etc/group", "rbe"); ++ if (!gr_f) return 0; ++ return fgetgrent(gr_f); ++} ++ ++wrapper (getgrent_r, int, (struct group *gbuf, char *buf, size_t buflen, struct group **gbufp)) ++{ ++ if (!gr_f) gr_f = fopen("/etc/group", "rbe"); ++ if (!gr_f) return 0; ++ return fgetgrent_r(gr_f, gbuf, buf, buflen, gbufp); ++} ++ ++wrapper(setgrent, void, (void)) ++{ ++ if (gr_f) fclose(gr_f); ++ gr_f = 0; ++} ++ ++wrapper(endgrent, void, (void)) ++{ ++ if (gr_f) fclose(gr_f); ++ gr_f = 0; ++} ++ ++wrapper(getgrgid, struct group *, (gid_t gid)) ++{ ++ debug("getgrgid(\"%ul\")", gid); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct group *res = NULL; ++ while ((res = fgetgrent(f))) { ++ if (res->gr_gid == gid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getgrgid_r, int, (gid_t gid, struct group *grp, char *buf, size_t buflen, struct group **result)) ++{ ++ debug("getgrgid_r(\"%ul\")", gid); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetgrent_r(f, grp, buf, buflen, result))) { ++ if (grp->gr_gid == gid) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getgrnam, struct group *, (const char *name)) ++{ ++ debug("getgrnam(\"%s\")", name); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct group *res = NULL; ++ while ((res = fgetgrent(f))) { ++ if (name && !strcmp(name, res->gr_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getgrnam_r, int, (const char *name, struct group *grp, char *buf, size_t buflen, struct group **result)) ++{ ++ debug("getgrnam_r(\"%s\")", name); ++ FILE *f = fopen("/etc/group", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetgrent_r(f, grp, buf, buflen, result))) { ++ if (name && !strcmp(name, grp->gr_name)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++/* getspent, setspent, endspent, getspnam */ ++ ++static FILE *sp_f; ++ ++wrapper(getspent, struct spwd *, (void)) ++{ ++ if (!sp_f) sp_f = fopen("/etc/shadow", "rbe"); ++ if (!sp_f) return 0; ++ return fgetspent(sp_f); ++} ++ ++wrapper(setspent, void, (void)) ++{ ++ if (sp_f) fclose(sp_f); ++ sp_f = 0; ++} ++ ++wrapper(endspent, void, (void)) ++{ ++ if (sp_f) fclose(sp_f); ++ sp_f = 0; ++} ++ ++wrapper(getspnam, struct spwd *, (const char *name)) ++{ ++ debug("getspnam(\"%s\")", name); ++ FILE *f = fopen("/etc/shadow", "rbe"); ++ if (!f) { ++ return NULL; ++ } ++ struct spwd *res = NULL; ++ while ((res = fgetspent(f))) { ++ if (name && !strcmp(name, res->sp_namp)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++wrapper(getspnam_r, int, (const char *name, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp)) ++{ ++ debug("getspnam_r(\"%s\")", name); ++ FILE *f = fopen("/etc/shadow", "rbe"); ++ if (!f) { ++ return errno; ++ } ++ int res; ++ while (!(res = fgetspent_r(f, spbuf, buf, buflen, spbufp))) { ++ if (name && !strcmp(name, spbuf->sp_namp)) ++ break; ++ } ++ fclose(f); ++ return res; ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/test/Makefile.am b/test/Makefile.am +index 0021b0a1..a1ec743d 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -22,6 +22,7 @@ TESTS = \ + t/mkstemps.t \ + t/mktemp.t \ + t/opendir.t \ ++ t/passwd.t \ + t/popen.t \ + t/posix_spawn.t \ + t/posix_spawnp.t \ +diff --git a/test/src/Makefile.am b/test/src/Makefile.am +index 5f5fde8d..594a8e0f 100644 +--- a/test/src/Makefile.am ++++ b/test/src/Makefile.am +@@ -15,6 +15,7 @@ check_PROGRAMS = \ + test-mkstemps \ + test-mktemp \ + test-opendir \ ++ test-passwd \ + test-popen \ + test-posix_spawn \ + test-posix_spawnp \ +diff --git a/test/src/test-passwd.c b/test/src/test-passwd.c +new file mode 100644 +index 00000000..fb9c8c4c +--- /dev/null ++++ b/test/src/test-passwd.c +@@ -0,0 +1,28 @@ ++#include <stdlib.h> ++#include <stdio.h> ++#include <pwd.h> ++#include <errno.h> ++#include <stdint.h> ++#include <unistd.h> ++ ++int main (int argc, char *argv[]) { ++ struct passwd *pwd; ++ ++ if (argc != 2) { ++ fprintf(stderr, "Usage: %s username\n", argv[0]); ++ exit(EXIT_FAILURE); ++ } ++ ++ pwd = getpwnam(argv[1]); ++ if (pwd == NULL) { ++ if (errno == 0) { ++ printf("Not found\n"); ++ } else { ++ perror("getpwnam"); ++ } ++ exit(EXIT_FAILURE); ++ } ++ ++ printf("%jd\n", (intmax_t)(pwd->pw_uid)); ++ exit(EXIT_SUCCESS); ++} +diff --git a/test/t/passwd.t b/test/t/passwd.t +new file mode 100755 +index 00000000..5c3414e0 +--- /dev/null ++++ b/test/t/passwd.t +@@ -0,0 +1,23 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++prepare 4 ++ ++for chroot in chroot fakechroot; do ++ if [ $chroot = "chroot" ] && ! is_root; then ++ skip $(( $tap_plan / 2 )) "not root" ++ else ++ ++ t=`$srcdir/$chroot.sh $testtree /bin/test-passwd user 2>&1` ++ test "$t" = "1337" || not ++ ok "$chroot uid is" $t ++ ++ t=`$srcdir/$chroot.sh $testtree getent group user 2>&1` ++ test "$t" = "user:x:1337:" || not ++ ok "$chroot getent group user is" $t ++ fi ++done ++ ++cleanup +diff --git a/test/testtree.sh b/test/testtree.sh +index ee35fc26..d857a195 100755 +--- a/test/testtree.sh ++++ b/test/testtree.sh +@@ -32,6 +32,10 @@ do + mkdir -p $destdir/$d + done + ++echo "user:x:1337:1337:user:/home/user:/bin/bash" > $destdir/etc/passwd ++echo "root:x:0:" > $destdir/etc/group ++echo "user:x:1337:" >> $destdir/etc/group ++ + for d in \ + /dev \ + /proc +@@ -64,6 +68,7 @@ for p in \ + '/usr/bin/dirname' \ + '/usr/bin/env' \ + '/usr/bin/find' \ ++ '/usr/bin/getent' \ + '/usr/bin/id' \ + '/usr/bin/ischroot' \ + '/usr/bin/less' \ +@@ -116,6 +121,7 @@ for p in \ + 'libm.so.*' \ + 'libncurses.so.*' \ + 'libncursesw.so.*' \ ++ 'libnss_*.so.*' \ + 'libpcre*.so.*' \ + 'libpthread.so.*' \ + 'libreadline.so.*' \ + +From d9a47178203931231987d10117acb5684d12ed4c Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Tue, 1 Nov 2022 00:47:56 +0100 +Subject: [PATCH 08/11] add test/t/rm.t and amend test/t/touch.t with + --no-dereference test + + - test/t/rm.t will fail under glibc 2.34 unless __stat64_time64 functions are + wrapped + - test/t/touch.t will fail under glibc 2.34 unless __lstat64_time64 is + wrapped +--- + test/Makefile.am | 1 + + test/t/rm.t | 25 +++++++++++++++++++++++++ + test/t/touch.t | 17 +++++++++++++++-- + 3 files changed, 41 insertions(+), 2 deletions(-) + create mode 100755 test/t/rm.t + +diff --git a/test/Makefile.am b/test/Makefile.am +index a1ec743d..88e740e5 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -29,6 +29,7 @@ TESTS = \ + t/pwd.t \ + t/readlink.t \ + t/realpath.t \ ++ t/rm.t \ + t/socket-af_unix.t \ + t/statfs.t \ + t/statvfs.t \ +diff --git a/test/t/rm.t b/test/t/rm.t +new file mode 100755 +index 00000000..9ecf88c9 +--- /dev/null ++++ b/test/t/rm.t +@@ -0,0 +1,25 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++prepare 2 ++ ++for chroot in chroot fakechroot; do ++ ++ if [ $chroot = "chroot" ] && ! is_root; then ++ skip $(( $tap_plan / 2 )) "not root" ++ else ++ ++ mkdir -p $testtree/dir-$chroot ++ echo 'something' > $testtree/dir-$chroot/file ++ ++ $srcdir/$chroot.sh $testtree /bin/sh -c "rm -r /dir-$chroot" ++ test -e $testtree/dir-$chroot && not ++ ok "$chroot rm -r /dir-$chroot:" $t ++ ++ fi ++ ++done ++ ++cleanup +diff --git a/test/t/touch.t b/test/t/touch.t +index fbea316b..cc05a2ba 100755 +--- a/test/t/touch.t ++++ b/test/t/touch.t +@@ -3,12 +3,12 @@ + srcdir=${srcdir:-.} + . $srcdir/common.inc.sh + +-prepare 16 ++prepare 24 + + . $srcdir/touch.inc.sh + + if [ -z "$touch" ]; then +- skip 16 "touch not found" ++ skip 24 "touch not found" + else + + for chroot in chroot fakechroot; do +@@ -37,6 +37,19 @@ else + + sleep 1 + ++ # with --no-dereference, on 32bit, touch will use __lstat64_time64 ++ t=`$srcdir/$chroot.sh $testtree $touch -h -r /tmp/$chroot-touch.txt /tmp/$chroot-touch2.txt 2>&1` ++ test "$t" = "" || not ++ ok "$chroot touch -r" $t ++ test -f $testtree/tmp/$chroot-touch2.txt || not ++ ok "$chroot $chroot-touch2.txt exists" ++ test $testtree/tmp/$chroot-touch2.txt -nt $testtree/tmp/$chroot-touch.txt && not ++ ok "$chroot $chroot-touch2.txt is not newer than touch.txt" ++ test $testtree/tmp/$chroot-touch2.txt -ot $testtree/tmp/$chroot-touch.txt && not ++ ok "$chroot $chroot-touch2.txt is not older than $chroot-touch.txt" ++ ++ sleep 1 ++ + t=`$srcdir/$chroot.sh $testtree $touch -m /tmp/$chroot-touch.txt 2>&1` + test "$t" = "" || not + ok "$chroot touch -m" $t + +From dac74cd68cfb6eeaae9cd13bdc48737a44980df9 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Tue, 1 Nov 2022 00:48:23 +0100 +Subject: [PATCH 09/11] support glibc 2.34 by wrapping + __{f,l,}stat{at,}64_time64 and__utime{nsat,s,}64 + +These functions are only wrapped on 32 bit platforms like i386, armel or +armhf. On 64 bit platforms, the corresponding HAVE_* macros will not be +defined. + + * __fstatat64_time64 + * __lstat64_time64 + * __stat64_time64 + * __utime64 + * __utimensat64 + * __utimes64 +--- + configure.ac | 6 +++++ + src/Makefile.am | 6 +++++ + src/__fstatat64_time64.c | 44 ++++++++++++++++++++++++++++++++++++ + src/__lstat64_time64.c | 49 ++++++++++++++++++++++++++++++++++++++++ + src/__stat64_time64.c | 47 ++++++++++++++++++++++++++++++++++++++ + src/__utime64.c | 41 +++++++++++++++++++++++++++++++++ + src/__utimensat64.c | 42 ++++++++++++++++++++++++++++++++++ + src/__utimes64.c | 42 ++++++++++++++++++++++++++++++++++ + 8 files changed, 277 insertions(+) + create mode 100644 src/__fstatat64_time64.c + create mode 100644 src/__lstat64_time64.c + create mode 100644 src/__stat64_time64.c + create mode 100644 src/__utime64.c + create mode 100644 src/__utimensat64.c + create mode 100644 src/__utimes64.c + +diff --git a/configure.ac b/configure.ac +index 5b3053e1..26c06116 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -158,11 +158,13 @@ ACX_CHECK_FTS_NAME_TYPE + # Checks for library functions. + AC_CHECK_FUNCS(m4_normalize([ + __chk_fail ++ __fstatat64_time64 + __fxstat64 + __fxstatat + __fxstatat64 + __getcwd_chk + __getwd_chk ++ __lstat64_time64 + __lxstat + __lxstat64 + __open +@@ -175,7 +177,11 @@ AC_CHECK_FUNCS(m4_normalize([ + __realpath_chk + __readlink_chk + __readlinkat_chk ++ __stat64_time64 + __statfs ++ __utime64 ++ __utimensat64 ++ __utimes64 + __xmknod + __xmknodat + __xstat +diff --git a/src/Makefile.am b/src/Makefile.am +index 6e9d9ae1..55193a96 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,9 +1,11 @@ + pkglib_LTLIBRARIES = libfakechroot.la + libfakechroot_la_SOURCES = \ ++ __fstatat64_time64.c \ + __fxstatat.c \ + __fxstatat64.c \ + __getcwd_chk.c \ + __getwd_chk.c \ ++ __lstat64_time64.c \ + __lxstat.c \ + __lxstat64.c \ + __lxstat64.h \ +@@ -18,7 +20,11 @@ libfakechroot_la_SOURCES = \ + __readlinkat_chk.c \ + __realpath_chk.c \ + __realpath_chk.h \ ++ __stat64_time64.c \ + __statfs.c \ ++ __utime64.c \ ++ __utimensat64.c \ ++ __utimes64.c \ + __xmknod.c \ + __xmknodat.c \ + __xstat.c \ +diff --git a/src/__fstatat64_time64.c b/src/__fstatat64_time64.c +new file mode 100644 +index 00000000..47a401f2 +--- /dev/null ++++ b/src/__fstatat64_time64.c +@@ -0,0 +1,44 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE___FSTATAT64_TIME64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include <sys/stat.h> ++#include <limits.h> ++#include "libfakechroot.h" ++ ++struct __stat64_t64; ++ ++wrapper(__fstatat64_time64, int, (int dirfd, const char *pathname, struct __stat64_t64 *buf, int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__fstatat64_time64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(__fstatat64_time64)(dirfd, pathname, buf, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__lstat64_time64.c b/src/__lstat64_time64.c +new file mode 100644 +index 00000000..e3e84002 +--- /dev/null ++++ b/src/__lstat64_time64.c +@@ -0,0 +1,49 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE___LSTAT64_TIME64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include <sys/stat.h> ++#include <limits.h> ++#include "libfakechroot.h" ++ ++struct __stat64_t64; ++ ++wrapper(__lstat64_time64, int, (const char *filename, struct __stat64_t64 *buf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ char resolved[FAKECHROOT_PATH_MAX]; ++ debug("__lstat64_time64(\"%s\", &buf)", filename); ++ if (rel2abs(filename, resolved) == NULL) { ++ return -1; ++ } ++ filename = resolved; ++ expand_chroot_path(filename); ++ return nextcall(__lstat64_time64)(filename, buf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__stat64_time64.c b/src/__stat64_time64.c +new file mode 100644 +index 00000000..1b65345e +--- /dev/null ++++ b/src/__stat64_time64.c +@@ -0,0 +1,47 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010-2015 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE___STAT64_TIME64 ++ ++#define _BSD_SOURCE ++#define _LARGEFILE64_SOURCE ++#define _DEFAULT_SOURCE ++#include <sys/stat.h> ++#include <limits.h> ++#include <stdlib.h> ++ ++#include "libfakechroot.h" ++ ++struct __stat64_t64; ++ ++wrapper(__stat64_time64, int, (const char * file_name, struct __stat64_t64 * buf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__stat64_time64(\"%s\", &buf)", file_name); ++ expand_chroot_path(file_name); ++ return nextcall(__stat64_time64)(file_name, buf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__utime64.c b/src/__utime64.c +new file mode 100644 +index 00000000..65d6e831 +--- /dev/null ++++ b/src/__utime64.c +@@ -0,0 +1,41 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE___UTIME64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include <utime.h> ++#include "libfakechroot.h" ++ ++wrapper(__utime64, int, (const char * filename, const struct utimbuf * buf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__utime64(\"%s\", &buf)", filename); ++ expand_chroot_path(filename); ++ return nextcall(__utime64)(filename, buf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__utimensat64.c b/src/__utimensat64.c +new file mode 100644 +index 00000000..3973d64c +--- /dev/null ++++ b/src/__utimensat64.c +@@ -0,0 +1,42 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE___UTIMENSAT64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++#include <sys/time.h> ++#include "libfakechroot.h" ++ ++ ++wrapper(__utimensat64, int, (int dirfd, const char * pathname, const struct timespec times [2], int flags)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("utimeat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(__utimensat64)(dirfd, pathname, times, flags); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif +diff --git a/src/__utimes64.c b/src/__utimes64.c +new file mode 100644 +index 00000000..03e57d16 +--- /dev/null ++++ b/src/__utimes64.c +@@ -0,0 +1,42 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010, 2013 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE___UTIMES64 ++ ++#define _ATFILE_SOURCE ++#define _POSIX_C_SOURCE 200809L ++ ++#include <sys/time.h> ++#include "libfakechroot.h" ++ ++wrapper(__utimes64, int, (const char * filename, UTIMES_TYPE_ARG2(tv))) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("__utimes64(\"%s\", &tv)", filename); ++ expand_chroot_path(filename); ++ return nextcall(__utimes64)(filename, tv); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif + +From 117d2e6e741bc4ff47e41e6879ca9e9821755ffd Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Tue, 31 Jan 2023 11:43:33 +0100 +Subject: [PATCH 10/11] also investigate .interp section for architectures that + do not list the linker in `objdump -p` like mips64el, ppc64el and s390x + +--- + scripts/ldd.fakechroot.pl | 33 +++++++++++++++++++++++++++++++++ + test/Makefile.am | 1 + + test/t/ldd_interp.t | 26 ++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+) + create mode 100755 test/t/ldd_interp.t + +diff --git a/scripts/ldd.fakechroot.pl b/scripts/ldd.fakechroot.pl +index b4bb2a8c..13a94540 100755 +--- a/scripts/ldd.fakechroot.pl ++++ b/scripts/ldd.fakechroot.pl +@@ -124,6 +124,38 @@ sub objdump { + } + } + ++# mips64el, ppc64el and s390x do not list the linker itself ++# if it's missing, obtain it from the .interp section ++# ++# mips64el: /lib64/ld.so.1 ++# ppc64el: /lib64/ld64.so.2 ++# s390x: /lib/ld64.so.1 ++sub elfinterp { ++ my $file = shift; ++ my $res = ''; ++ local *PIPE; ++ open PIPE, "objdump -sj .interp '$file' 2>/dev/null |"; ++ while (my $line = <PIPE>) { ++ if ( $line !~ /^ [a-f0-9]+ ([a-f0-9][a-f0-9][a-f0-9 ]{6} [a-f0-9 ]{8} [a-f0-9 ]{8} [a-f0-9 ]{8}) /) { ++ next; ++ } ++ $line = $1; ++ $line =~ s/ //g; ++ $line =~ s/(..)/chr(hex($1))/eg; ++ $res .= $line; ++ } ++ close PIPE; ++ ++ # remove trailing NUL byte ++ $res =~ s/\000$//; ++ ++ # only add if it is missing ++ if ( $res && !exists $Libs{$res} ) { ++ push @Libs, $res; ++ $Libs{$res} = ''; ++ } ++} ++ + + sub load_ldsoconf { + my ($file) = @_; +@@ -191,6 +223,7 @@ sub load_ldsoconf { + } + + objdump($file); ++ elfinterp($file_in_chroot); + + if ($Dynamic == 0) { + print "\tnot a dynamic executable\n"; +diff --git a/test/Makefile.am b/test/Makefile.am +index 88e740e5..d7f98f03 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -19,6 +19,7 @@ TESTS = \ + t/host.t \ + t/java.t \ + t/jemalloc.t \ ++ t/ldd_interp.t \ + t/mkstemps.t \ + t/mktemp.t \ + t/opendir.t \ +diff --git a/test/t/ldd_interp.t b/test/t/ldd_interp.t +new file mode 100755 +index 00000000..7c968bb8 +--- /dev/null ++++ b/test/t/ldd_interp.t +@@ -0,0 +1,26 @@ ++#!/bin/sh ++ ++srcdir=${srcdir:-.} ++. $srcdir/common.inc.sh ++ ++plan 1 ++ ++pwd=`dirname $0` ++abs_top_srcdir=${abs_top_srcdir:-`cd "$pwd/../.." 2>/dev/null && pwd -P`} ++ ++interp_file=$(file /bin/true | sed 's/^.*, interpreter \([^,]\+\), .*$/\1/') ++interp_readelf=$(readelf --string-dump=.interp /bin/true | sed -ne 's/^ \[ \+[0-9]\+\] //p') ++ ++# diag "$interp_file" "$interp_readelf" ++ ++test "$interp_file" = "$interp_readelf" || not ++ ++# ldd /bin/true | diag ++ ++ldd /bin/true | grep --quiet "^[[:space:]]$interp_file (" || not ++ ++# "$abs_top_srcdir/scripts/ldd.fakechroot" /bin/true | diag ++ ++"$abs_top_srcdir/scripts/ldd.fakechroot" /bin/true | grep --quiet "^[[:space:]]$interp_file (" || not ++ ++ok "ldd lists interpreter $interp_file" + +From 1617833d4bfa415cbe2fc1e961cb751e47697c24 Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Mon, 6 Feb 2023 10:42:40 +0100 +Subject: [PATCH 11/11] test/touch.inc.sh: use testtree variable + + - the variable is set in test/common.inc.sh and includes `basename $0 .t` + - otherwise test/t/touch.t will always get skipped +--- + test/touch.inc.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/touch.inc.sh b/test/touch.inc.sh +index 25e0dc01..76c21321 100644 +--- a/test/touch.inc.sh ++++ b/test/touch.inc.sh +@@ -1,6 +1,6 @@ +-if [ -x testtree/usr/bin/touch ]; then ++if [ -x $testtree/usr/bin/touch ]; then + touch=/usr/bin/touch +-elif [ -x testtree/bin/touch ]; then ++elif [ -x $testtree/bin/touch ]; then + touch=/bin/touch + else + touch= diff --git a/system/fakechroot/patches/80.patch b/system/fakechroot/patches/80.patch new file mode 100644 index 0000000000..86e586017d --- /dev/null +++ b/system/fakechroot/patches/80.patch @@ -0,0 +1,22 @@ +From e291eb96db42f20a55f917aae660d416d624acaa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com> +Date: Fri, 4 Dec 2020 09:30:42 -0500 +Subject: [PATCH] Fix typo in AC_PATH_PROG for ldconfig + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f8cdb323..d391494d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_PATH_PROG([ENV], [env], [/usr/bin/env], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/l + AC_PATH_PROG([FAKEROOT], [fakeroot], [/usr/bin/fakeroot], [/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) + AC_PATH_PROG([INSSERV], [insserv], [/sbin/insserv], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH]) + AC_PATH_PROG([ISCHROOT], [ischroot], [/usr/bin/ischroot], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) +-AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/chroot], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH]) ++AC_PATH_PROG([LDCONFIG], [ldconfig], [/sbin/ldconfig], [/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin:$PATH]) + AC_PATH_PROG([LDD], [ldd], [/usr/bin/ldd], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) + AC_PATH_PROG([LS], [ls], [/bin/ls], [/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) + AC_PATH_PROG([MKFIFO], [mkfifo], [/usr/bin/mkfifo], [/usr/bin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:$PATH]) diff --git a/system/fakechroot/patches/autoupdate.patch b/system/fakechroot/patches/autoupdate.patch new file mode 100644 index 0000000000..9393713497 --- /dev/null +++ b/system/fakechroot/patches/autoupdate.patch @@ -0,0 +1,40 @@ +--- fakechroot-2.20.1.orig/configure.ac 2019-03-22 21:02:42.000000000 +0000 ++++ fakechroot-2.20.1/configure.ac 2023-02-09 00:46:10.059938547 +0000 +@@ -1,10 +1,10 @@ +-AC_PREREQ(2.64) +-AC_INIT([fakechroot], [2.20.1], [dexter@debian.org], [fakechroot], [https://github.com/dex4er/fakechroot]) ++AC_PREREQ([2.71]) ++AC_INIT([fakechroot],[2.20.1],[dexter@debian.org],[fakechroot],[https://github.com/dex4er/fakechroot]) + + AC_CONFIG_SRCDIR([src/libfakechroot.c]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) +-AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + AM_INIT_AUTOMAKE([1.10 foreign]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +@@ -19,8 +19,8 @@ AM_PROG_AR + AC_PROG_CC + AC_PROG_MAKE_SET + AC_PROG_LN_S +-AM_PROG_LIBTOOL +-AM_PROG_NM ++LT_INIT ++LT_PATH_NM + LT_INIT + + AC_CANONICAL_HOST +@@ -77,7 +77,11 @@ AC_CHECK_LIB([dl], [dlsym]) + + # Checks for header files. + AC_HEADER_DIRENT +-AC_HEADER_STDC ++# Autoupdate added the next two lines to ensure that your configure ++# script's behavior did not change. They are probably safe to remove. ++AC_CHECK_INCLUDES_DEFAULT ++AC_PROG_EGREP ++ + AC_CHECK_HEADERS(m4_normalize([ + alloca.h + dirent.h diff --git a/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch b/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch new file mode 100644 index 0000000000..5e4a96e709 --- /dev/null +++ b/system/fakechroot/patches/b42d1fb9538f680af2f31e864c555414ccba842a.patch @@ -0,0 +1,102 @@ +From b42d1fb9538f680af2f31e864c555414ccba842a Mon Sep 17 00:00:00 2001 +From: Piotr Roszatycki <piotr.roszatycki@gmail.com> +Date: Mon, 10 Feb 2020 13:59:10 -0800 +Subject: [PATCH] New `statx` function + +--- + NEWS.md | 1 + + configure.ac | 1 + + src/Makefile.am | 1 + + src/statx.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 47 insertions(+) + create mode 100644 src/statx.c + +diff --git a/NEWS.md b/NEWS.md +index 9de12fe..f1210bf 100644 +--- a/NEWS.md ++++ b/NEWS.md +@@ -1,5 +1,10 @@ + # NEWS + ++XX Xxx XXXX ++ ++* UNRELEASED ++* New `statx(2)` function was added: glibc supports it since 2.28. ++ + ## Version 2.20.1 + + 22 Mar 2019 +diff --git a/configure.ac b/configure.ac +index a654edd..f8cdb32 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -277,6 +277,7 @@ AC_CHECK_FUNCS(m4_normalize([ + statfs64 + statvfs + statvfs64 ++ statx + stpcpy + strchrnul + strlcpy +diff --git a/src/Makefile.am b/src/Makefile.am +index d729b0e..6066345 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -152,6 +152,7 @@ libfakechroot_la_SOURCES = \ + statfs64.c \ + statvfs.c \ + statvfs64.c \ ++ statx.c \ + stpcpy.c \ + strchrnul.c \ + strchrnul.h \ +diff --git a/src/statx.c b/src/statx.c +new file mode 100644 +index 0000000..524f73e +--- /dev/null ++++ b/src/statx.c +@@ -0,0 +1,44 @@ ++/* ++ libfakechroot -- fake chroot environment ++ Copyright (c) 2010-2020 Piotr Roszatycki <dexter@debian.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++ ++ ++#include <config.h> ++ ++#ifdef HAVE_STATX ++ ++#define _GNU_SOURCE ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <unistd.h> ++ ++#include "libfakechroot.h" ++ ++ ++wrapper(statx, int, (int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf)) ++{ ++ char fakechroot_abspath[FAKECHROOT_PATH_MAX]; ++ char fakechroot_buf[FAKECHROOT_PATH_MAX]; ++ debug("statx(%d, \"%s\", %d, %u, &statxbuf)", dirfd, pathname, flags, mask); ++ expand_chroot_path_at(dirfd, pathname); ++ return nextcall(statx)(dirfd, pathname, flags, mask, statxbuf); ++} ++ ++#else ++typedef int empty_translation_unit; ++#endif diff --git a/system/fakechroot/patches/disable_cp.t.patch b/system/fakechroot/patches/disable_cp.t.patch new file mode 100644 index 0000000000..1a7f90105d --- /dev/null +++ b/system/fakechroot/patches/disable_cp.t.patch @@ -0,0 +1,11 @@ +t/cp.t is problematic since RHEL 6 and 7 seems to me is a problem with the test and not with coreutils version +--- ./test/Makefile.am.orig 2023-04-06 02:04:58.107925212 +0100 ++++ ./test/Makefile.am 2023-04-06 02:05:03.453907064 +0100 +@@ -7,7 +7,6 @@ TESTS = \ + t/chroot.t \ + t/clearenv.t \ + t/cmd-subst.t \ +- t/cp.t \ + t/dedotdot.t \ + t/dladdr.t \ + t/execlp.t \ diff --git a/system/fakechroot/patches/fix_test_on_32bits.patch b/system/fakechroot/patches/fix_test_on_32bits.patch new file mode 100644 index 0000000000..26687f7f61 --- /dev/null +++ b/system/fakechroot/patches/fix_test_on_32bits.patch @@ -0,0 +1,38 @@ +removing leading / for some reason cp doesn't like it + +new coreutils already have -a and can replace -dp + +man cp + +-a, --archive same as -dR --preserve=all +-d same as --no-dereference --preserve=links +-p same as --preserve=mode,ownership,timestamps +--- fakechroot-2.20.1/test/t/cp.t 2019-03-22 21:02:42.000000000 +0000 ++++ fakechroot-2.20.1/test/t/cp.t 2022-03-04 02:07:11.511455404 +0000 +@@ -7,7 +7,7 @@ prepare 4 + + case "`uname -s`" in + Linux|KFreeBSD) +- CP_ARGS=-dp;; ++ CP_ARGS="--preserve=all";; + *) + CP_ARGS=-a;; + esac +@@ -19,13 +19,13 @@ for chroot in chroot fakechroot; do + else + + echo 'something' > $testtree/file-$chroot +- ln -s /file-$chroot $testtree/symlink-$chroot ++ ln -s file-$chroot $testtree/symlink-$chroot + +- t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /file-$chroot /file2-$chroot; cat /file2-$chroot" 2>&1` ++ t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS file-$chroot file2-$chroot; cat /file2-$chroot" 2>&1` + test "$t" = "something" || not +- ok "$chroot cp $CP_ARGS /file-$chroot /file2-$chroot:" $t ++ ok "$chroot cp $CP_ARGS file-$chroot file2-$chroot:" $t + +- t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS /symlink-$chroot /symlink2-$chroot; cat /symlink2-$chroot" 2>&1` ++ t=`$srcdir/$chroot.sh $testtree /bin/sh -c "cp $CP_ARGS symlink-$chroot symlink2-$chroot; cat /symlink2-$chroot" 2>&1` + test "$t" = "something" || not + ok "$chroot cp $CP_ARGS /symlink-$chroot /symlink2-$chroot:" $t + diff --git a/system/fastfetch/fastfetch.SlackBuild b/system/fastfetch/fastfetch.SlackBuild index 13516a551f..478e3739ae 100644 --- a/system/fastfetch/fastfetch.SlackBuild +++ b/system/fastfetch/fastfetch.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fastfetch -VERSION=${VERSION:-2.11.5} +VERSION=${VERSION:-2.15.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/fastfetch/fastfetch.info b/system/fastfetch/fastfetch.info index 6fe544f1f1..8eb5e68c98 100644 --- a/system/fastfetch/fastfetch.info +++ b/system/fastfetch/fastfetch.info @@ -1,8 +1,8 @@ PRGNAM="fastfetch" -VERSION="2.11.5" +VERSION="2.15.0" HOMEPAGE="https://github.com/fastfetch-cli/fastfetch" -DOWNLOAD="https://github.com/fastfetch-cli/fastfetch/archive/2.11.5/fastfetch-2.11.5.tar.gz" -MD5SUM="2c55a47e0d7b6d61beae91a45af32a15" +DOWNLOAD="https://github.com/fastfetch-cli/fastfetch/archive/2.15.0/fastfetch-2.15.0.tar.gz" +MD5SUM="997cd0dfe8cd8efb62ac85d9d7d2cbd2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild index d50cffa0f7..c4e5506c41 100644 --- a/system/fish/fish.SlackBuild +++ b/system/fish/fish.SlackBuild @@ -114,6 +114,8 @@ cd build -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -128,7 +130,7 @@ mkdir -p $PKG/usr/man/man1 mv $PKG/usr/share/$PRGNAM/man/man1/* $PKG/usr/man/man1 rm -rf $PKG/usr/share/$PRGNAM/man/ rm -rf $PKG/usr/share/man/ -gzip $PKG/usr/man/man*/* +gzip -9 $PKG/usr/man/man*/* # Remove manual pages that overwrites coreutils' man pages rm -f $PKG/usr/man/man1/{echo,false,pwd,test,true,printf,time}.1.gz diff --git a/system/fsv/fsv.SlackBuild b/system/fsv/fsv.SlackBuild index 9384da8e2f..fa8f6ee2f4 100644 --- a/system/fsv/fsv.SlackBuild +++ b/system/fsv/fsv.SlackBuild @@ -79,7 +79,7 @@ sed -i \ sed -i 's/@DATADIRNAME@/share/' po/Makefile.in.in ./autogen.sh -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh index 489536e95b..75c960ecd9 100644 --- a/system/fwupd/doinst.sh +++ b/system/fwupd/doinst.sh @@ -9,11 +9,9 @@ config() { } config etc/fwupd/fwupd.conf.new -config etc/fwupd/remotes.d/fwupd-tests.conf.new config etc/fwupd/remotes.d/lvfs-testing.conf.new config etc/fwupd/remotes.d/lvfs.conf.new config etc/fwupd/remotes.d/vendor-directory.conf.new -config etc/fwupd/remotes.d/vendor.conf.new config etc/grub.d/35_fwupd.new if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then diff --git a/system/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild index 7d8312a4db..d3ce666a24 100644 --- a/system/fwupd/fwupd.SlackBuild +++ b/system/fwupd/fwupd.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fwupd -VERSION=${VERSION:-1.9.12} +VERSION=${VERSION:-1.9.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -126,11 +126,9 @@ mv $PKG/usr/bin/{,fwupd-}dbxtool mv $PKG/usr/man/man1/{,fwupd-}dbxtool.1.gz mv $PKG/etc/fwupd/fwupd.conf $PKG/etc/fwupd/fwupd.conf.new -mv $PKG/etc/fwupd/remotes.d/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new -mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new mv $PKG/etc/fwupd/remotes.d/lvfs.conf $PKG/etc/fwupd/remotes.d/lvfs.conf.new +mv $PKG/etc/fwupd/remotes.d/lvfs-testing.conf $PKG/etc/fwupd/remotes.d/lvfs-testing.conf.new mv $PKG/etc/fwupd/remotes.d/vendor-directory.conf $PKG/etc/fwupd/remotes.d/vendor-directory.conf.new -mv $PKG/etc/fwupd/remotes.d/vendor.conf $PKG/etc/fwupd/remotes.d/vendor.conf.new mv $PKG/etc/grub.d/35_fwupd $PKG/etc/grub.d/35_fwupd.new rm -rf $PKG/usr/share/installed-tests diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info index 582d503eed..7227c754aa 100644 --- a/system/fwupd/fwupd.info +++ b/system/fwupd/fwupd.info @@ -1,8 +1,8 @@ PRGNAM="fwupd" -VERSION="1.9.12" +VERSION="1.9.20" HOMEPAGE="https://www.fwupd.org" -DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.9.12/fwupd-1.9.12.tar.gz" -MD5SUM="37ed2352146d1caf78f9c453b1b905ac" +DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.9.20/fwupd-1.9.20.tar.gz" +MD5SUM="7912c641e5dc3bf90aa91d2a5a84b5b9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gcab libjcat libxmlb libgusb libsmbios pefile protobuf-c python3-toml python3-meson-opt python3-typogrify" diff --git a/system/fzf/fzf.SlackBuild b/system/fzf/fzf.SlackBuild index b207e0740d..284516261f 100644 --- a/system/fzf/fzf.SlackBuild +++ b/system/fzf/fzf.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fzf -VERSION=${VERSION:-0.52.0} +VERSION=${VERSION:-0.52.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/fzf/fzf.info b/system/fzf/fzf.info index da0c38d8e7..e686eca16c 100644 --- a/system/fzf/fzf.info +++ b/system/fzf/fzf.info @@ -1,7 +1,7 @@ PRGNAM="fzf" -VERSION="0.52.0" +VERSION="0.52.1" HOMEPAGE="https://github.com/junegunn/fzf" -DOWNLOAD="https://github.com/junegunn/fzf/archive/0.52.0/fzf-0.52.0.tar.gz \ +DOWNLOAD="https://github.com/junegunn/fzf/archive/0.52.1/fzf-0.52.1.tar.gz \ https://github.com/charlievieth/fastwalk/archive/v1.0.3/fastwalk-1.0.3.tar.gz \ https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \ https://github.com/gdamore/tcell/archive/v2.7.4/tcell-2.7.4.tar.gz \ @@ -14,7 +14,7 @@ DOWNLOAD="https://github.com/junegunn/fzf/archive/0.52.0/fzf-0.52.0.tar.gz \ https://github.com/golang/sys/archive/v0.20.0/sys-0.20.0.tar.gz \ https://github.com/golang/term/archive/v0.20.0/term-0.20.0.tar.gz \ https://github.com/golang/text/archive/v0.14.0/text-0.14.0.tar.gz" -MD5SUM="4096cfaf447b597623f95ac250c805ad \ +MD5SUM="eb55cb5328f22d07faa9ce6ddf5557a3 \ ab5a2274c5ccac2d968e768ac2415209 \ fbadc383bc1ace79fa769fe2de36b87b \ a03c6d4612a12e949e05ea7d67624142 \ diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild index c30e90ed9b..2f145faf48 100644 --- a/system/gnome-vfs/gnome-vfs.SlackBuild +++ b/system/gnome-vfs/gnome-vfs.SlackBuild @@ -79,7 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p0 < $CWD/openssl-1.1.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done # Fix for the newer glib sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.* diff --git a/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch new file mode 100644 index 0000000000..438a89de6e --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs-2.8.2-browser_default.patch @@ -0,0 +1,20 @@ +--- gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in.browser_default 2004-10-18 21:38:08.605885937 -0400 ++++ gnome-vfs-2.8.2/schemas/desktop_gnome_url_handlers.schemas.in 2004-10-18 21:38:20.470253994 -0400 +@@ -153,7 +153,7 @@ + <applyto>/desktop/gnome/url-handlers/http/command</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>epiphany %s</default> ++ <default>gio open %s</default> + <locale name="C"> + <short>The handler for "http" URLs</short> + <long>The command used to handle "http" URLs, if enabled.</long> +@@ -187,7 +187,7 @@ + <applyto>/desktop/gnome/url-handlers/https/command</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>epiphany %s</default> ++ <default>gio open %s</default> + <locale name="C"> + <short>The handler for "https" URLs</short> + <long>The command used to handle "https" URLs, if enabled.</long> diff --git a/system/gnome-vfs/patches/gnome-vfs2-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-c99.patch new file mode 100644 index 0000000000..a8b9b5d416 --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs2-c99.patch @@ -0,0 +1,16 @@ +Include <glib/gprintf.h> for the g_printf function. This avoids an +implicit function declaration and build failures with future +compilers. + +diff --git a/test/test-async-directory.c b/test/test-async-directory.c +index 2698d8e6e41f9ead..8d7e0f320edbb5fc 100644 +--- a/test/test-async-directory.c ++++ b/test/test-async-directory.c +@@ -24,6 +24,7 @@ + #include <config.h> + + #include <glib.h> ++#include <glib/gprintf.h> + #include <libgnomevfs/gnome-vfs-async-ops.h> + #include <libgnomevfs/gnome-vfs-init.h> + #include <stdio.h> diff --git a/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch new file mode 100644 index 0000000000..829c31f0c6 --- /dev/null +++ b/system/gnome-vfs/patches/gnome-vfs2-configure-c99.patch @@ -0,0 +1,21 @@ +Avoid an implicit int and an implicit declaration of exit. This +prevents build failures with future compilers. + +diff --git a/configure.in b/configure.in +index 1a0ad1be03f9f9fe..011c1d919885536a 100644 +--- a/configure.in ++++ b/configure.in +@@ -366,11 +366,11 @@ AC_TRY_RUN([ + + struct linger li; + +-main () ++int main (void) + { + li.l_onoff = 1; + li.l_linger = 120; +- exit (0); ++ return 0; + } + ],[ + AC_DEFINE(HAVE_STRUCT_LINGER, 1, [Define to 1 if struct linger is available]) diff --git a/system/gnome-vfs/openssl-1.1.patch b/system/gnome-vfs/patches/openssl-1.1.patch index 14207f28d1..3ed1d5edad 100644 --- a/system/gnome-vfs/openssl-1.1.patch +++ b/system/gnome-vfs/patches/openssl-1.1.patch @@ -4,8 +4,8 @@ struct SSL is opaque in openssl-1.1; and the SSL_free() man page says that one should not free members of it manually (in both the openssl-1.0 and openssl-1.1 man pages). ---- libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 -+++ libgnomevfs/gnome-vfs-ssl.c +--- ./libgnomevfs/gnome-vfs-ssl.c.orig 2010-02-09 12:16:14.000000000 +0000 ++++ ./libgnomevfs/gnome-vfs-ssl.c @@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS } } diff --git a/system/greetd/greetd.SlackBuild b/system/greetd/greetd.SlackBuild index 611b57090d..c163ceb98e 100644 --- a/system/greetd/greetd.SlackBuild +++ b/system/greetd/greetd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=greetd PRGUID=greeter PRGGID=greeter -VERSION=${VERSION:-0.10.0} +VERSION=${VERSION:-0.10.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/greetd/greetd.info b/system/greetd/greetd.info index 07cbb542b6..3e6ffea427 100644 --- a/system/greetd/greetd.info +++ b/system/greetd/greetd.info @@ -1,7 +1,7 @@ PRGNAM="greetd" -VERSION="0.10.0" +VERSION="0.10.3" HOMEPAGE="https://git.sr.ht/~kennylevinsen/greetd" -DOWNLOAD="https://github.com/kennylevinsen/greetd/archive/0.10.0/greetd-0.10.0.tar.gz \ +DOWNLOAD="https://github.com/kennylevinsen/greetd/archive/0.10.3/greetd-0.10.3.tar.gz \ https://static.crates.io/crates/addr2line/addr2line-0.21.0.crate \ https://static.crates.io/crates/adler/adler-1.0.2.crate \ https://static.crates.io/crates/async-trait/async-trait-0.1.80.crate \ @@ -62,7 +62,7 @@ DOWNLOAD="https://github.com/kennylevinsen/greetd/archive/0.10.0/greetd-0.10.0.t https://static.crates.io/crates/windows_x86_64_gnullvm/windows_x86_64_gnullvm-0.52.5.crate \ https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.48.5.crate \ https://static.crates.io/crates/windows_x86_64_msvc/windows_x86_64_msvc-0.52.5.crate" -MD5SUM="c7caa14a01035f4d80444e8ce4359ee2 \ +MD5SUM="72ed0ce68d0cd22911d486e4e407c733 \ 55e15000c4c210f0bb2aca6f38fbe424 \ 669215548c64019c08c92b2c1afd3deb \ 1b41868d6e1277abee3b6c84a7b7ff83 \ diff --git a/system/grub2-theme-mint/README b/system/grub2-theme-mint/README new file mode 100644 index 0000000000..a938c13c3f --- /dev/null +++ b/system/grub2-theme-mint/README @@ -0,0 +1,10 @@ +This is the GRUB 2 theme for Linux Mint. + +After installing grub2-theme-mint, please add the following lines to +/etc/default/grub: +GRUB_FONT="/boot/grub/fonts/UbuntuMono16.pf2" +GRUB_THEME="/boot/grub/themes/linuxmint/theme.txt" + +Note that the Ubuntu font provided by the source tarball may display +glyphs incorrectly. Other fonts (ex. Dejavu Sans Mono, GNU Unifont) +may be a better choice. diff --git a/system/nvidia-firmware/nvidia-firmware.SlackBuild b/system/grub2-theme-mint/grub2-theme-mint.SlackBuild index 95d6a9a646..ff2d1983e6 100644 --- a/system/nvidia-firmware/nvidia-firmware.SlackBuild +++ b/system/grub2-theme-mint/grub2-theme-mint.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for nvidia-firmware +# Slackware build script for grub2-theme-mint -# Copyright 2015, 2018 Hunter Sezen California, USA +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,33 +24,31 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=nvidia-firmware -VERSION=${VERSION:-325.15} +PRGNAM=grub2-theme-mint +VERSION=${VERSION:-1.2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi TMP=${TMP:-/tmp/SBo} -SRC=$TMP/$PRGNAM-$VERSION PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -eu +set -e -rm -rf $PKG $SRC -mkdir -p $TMP $SRC $PKG $OUTPUT -cd $SRC -sh $CWD/NVIDIA-Linux-x86-$VERSION.run --extract-only +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM"_"$VERSION.tar.gz +cd $PRGNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -58,10 +56,11 @@ 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 {} \; -python $CWD/extract_firmware.py +mkdir -p $PKG/boot/grub/fonts +cp boot/grub/fonts/UbuntuMono16.pf2 $PKG/boot/grub/fonts/UbuntuMono16.pf2 -mkdir -p $PKG/lib/firmware/nouveau/ -cp -av nv* vuc-* $PKG/lib/firmware/nouveau/ +mkdir -p $PKG/boot/grub/themes +cp -r boot/grub/themes/linuxmint $PKG/boot/grub/themes mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/grub2-theme-mint/grub2-theme-mint.info b/system/grub2-theme-mint/grub2-theme-mint.info new file mode 100644 index 0000000000..e886c75246 --- /dev/null +++ b/system/grub2-theme-mint/grub2-theme-mint.info @@ -0,0 +1,10 @@ +PRGNAM="grub2-theme-mint" +VERSION="1.2.3" +HOMEPAGE="http://packages.linuxmint.com/pool/main/g/grub2-theme-mint/" +DOWNLOAD="http://packages.linuxmint.com/pool/main/g/grub2-theme-mint/grub2-theme-mint_1.2.3.tar.gz" +MD5SUM="86bc16ad6196fdc3e5f030e9b5b9c29f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/system/grub2-theme-mint/slack-desc b/system/grub2-theme-mint/slack-desc new file mode 100644 index 0000000000..d55131b197 --- /dev/null +++ b/system/grub2-theme-mint/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +grub2-theme-mint: grub2-theme-mint (GRUB 2 theme for Linux Mint) +grub2-theme-mint: +grub2-theme-mint: This is the GRUB 2 theme for Linux Mint. +grub2-theme-mint: +grub2-theme-mint: +grub2-theme-mint: +grub2-theme-mint: +grub2-theme-mint: +grub2-theme-mint: +grub2-theme-mint: +grub2-theme-mint: diff --git a/system/heirloom-sh/heirloom-sh-glibc-2.34.patch b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch new file mode 100644 index 0000000000..35cb565526 --- /dev/null +++ b/system/heirloom-sh/heirloom-sh-glibc-2.34.patch @@ -0,0 +1,18 @@ +--- a/fault.c ++++ b/fault.c +@@ -43,6 +43,15 @@ + #include <errno.h> + #include <string.h> + ++#if __GLIBC__ >= 2 ++# undef SIGSTKSZ ++# if defined __ia64__ ++# define SIGSTKSZ 262144 ++# else ++# define SIGSTKSZ 65536 ++# endif ++#endif ++ + static void (*psig0_func)() = SIG_ERR; /* previous signal handler for signal 0 */ + static char sigsegv_stack[SIGSTKSZ]; + diff --git a/system/heirloom-sh/heirloom-sh.SlackBuild b/system/heirloom-sh/heirloom-sh.SlackBuild index b805981e57..ce9edf218e 100644 --- a/system/heirloom-sh/heirloom-sh.SlackBuild +++ b/system/heirloom-sh/heirloom-sh.SlackBuild @@ -61,6 +61,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/heirloom-sh-glibc-2.34.patch + # configure is the worst way to build a package except for all the others # 1. make static changes to the makefile with a patch patch -p1 < $CWD/makefile.patch diff --git a/system/inotify-info/inotify-info.SlackBuild b/system/inotify-info/inotify-info.SlackBuild index 5de56ed254..38c694c497 100644 --- a/system/inotify-info/inotify-info.SlackBuild +++ b/system/inotify-info/inotify-info.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=inotify-info -VERSION=${VERSION:-0.0.1} +VERSION=${VERSION:-0.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -65,9 +65,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-v$VERSION -tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz -cd $PRGNAM-v$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -75,8 +75,7 @@ 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 {} \; -# redefining unimportant flags to not patch Makefile -make WARNINGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" +CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make install -D -t $PKG/usr/bin _release/inotify-info find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/inotify-info/inotify-info.info b/system/inotify-info/inotify-info.info index 3107d693ed..5fa3ca5e9e 100644 --- a/system/inotify-info/inotify-info.info +++ b/system/inotify-info/inotify-info.info @@ -1,8 +1,8 @@ PRGNAM="inotify-info" -VERSION="0.0.1" +VERSION="0.0.2" HOMEPAGE="https://github.com/mikesart/inotify-info" -DOWNLOAD="https://github.com/mikesart/inotify-info/releases/download/v0.0.1/inotify-info-v0.0.1.tar.gz" -MD5SUM="e63e740fc3fcf91c03bbcbc5045937b3" +DOWNLOAD="https://github.com/mikesart/inotify-info/archive/v0.0.2/inotify-info-0.0.2.tar.gz" +MD5SUM="c5c4e1842a828b9c37ff9e993e5bbdb6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/intel-microcode/intel-microcode.SlackBuild b/system/intel-microcode/intel-microcode.SlackBuild index 7a559f3cb3..baacfcd19f 100644 --- a/system/intel-microcode/intel-microcode.SlackBuild +++ b/system/intel-microcode/intel-microcode.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for intel-microcode -# Copyright 2023 Andrzej Telszewski, Koszalin +# Copyright 2024 Andrzej Telszewski, Koszalin # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=intel-microcode SRCNAM=Intel-Linux-Processor-Microcode-Data-Files-microcode -VERSION=${VERSION:-20231114} +VERSION=${VERSION:-20240514} SRCVER=$(printf "%s" "${VERSION}" | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/intel-microcode/intel-microcode.info b/system/intel-microcode/intel-microcode.info index ae14367a08..dacccca07f 100644 --- a/system/intel-microcode/intel-microcode.info +++ b/system/intel-microcode/intel-microcode.info @@ -1,8 +1,8 @@ PRGNAM="intel-microcode" -VERSION="20231114" +VERSION="20240514" HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files" -DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20231114/Intel-Linux-Processor-Microcode-Data-Files-microcode-20231114.tar.gz" -MD5SUM="1648cf08cb7176db32aff82889e5cb1d" +DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20240514/Intel-Linux-Processor-Microcode-Data-Files-microcode-20240514.tar.gz" +MD5SUM="0cebf1e441f98ba590f10b5b7e4c0c58" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="iucode_tool" diff --git a/system/irqbalance/irqbalance.SlackBuild b/system/irqbalance/irqbalance.SlackBuild index f0f0566a88..72c2ddb2c1 100644 --- a/system/irqbalance/irqbalance.SlackBuild +++ b/system/irqbalance/irqbalance.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2006 by Yalla-One <yallaone@gmail.com> # Copyright 2013-2015 by LukenShiro, Italy -# Copyright 2019-2023 Logan Rathbone <poprocks@gmail.com> +# Copyright © 2019-2024 Logan Rathbone <poprocks@gmail.com> # # All rights reserved. # @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=irqbalance -VERSION=${VERSION:-1.9.3} +VERSION=${VERSION:-1.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/irqbalance/irqbalance.info b/system/irqbalance/irqbalance.info index d05bb9e3a1..2f92103aff 100644 --- a/system/irqbalance/irqbalance.info +++ b/system/irqbalance/irqbalance.info @@ -1,8 +1,8 @@ PRGNAM="irqbalance" -VERSION="1.9.3" +VERSION="1.9.4" HOMEPAGE="https://github.com/Irqbalance/irqbalance" -DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.9.3/irqbalance-1.9.3.tar.gz" -MD5SUM="f05bdb5e2a519706ec038dbe54971e08" +DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.9.4/irqbalance-1.9.4.tar.gz" +MD5SUM="ca879d124b74436522d7f8a4c63534bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild index 0475d03e96..2f7f4518ba 100644 --- a/system/jenkins/jenkins.SlackBuild +++ b/system/jenkins/jenkins.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jenkins -VERSION=${VERSION:-2.440.3} +VERSION=${VERSION:-2.452.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info index 7ecbae78fe..04ea30e7be 100644 --- a/system/jenkins/jenkins.info +++ b/system/jenkins/jenkins.info @@ -1,8 +1,8 @@ PRGNAM="jenkins" -VERSION="2.440.3" +VERSION="2.452.1" HOMEPAGE="https://www.jenkins.io/" -DOWNLOAD="https://get.jenkins.io/war-stable/2.440.3/jenkins.war" -MD5SUM="c381bfdfb6d30ddd6e5aedc669d14764" +DOWNLOAD="https://get.jenkins.io/war-stable/2.452.1/jenkins.war" +MD5SUM="32f6d38ccad25bc93839d621d0bf0e08" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk21" diff --git a/system/kapacitor/kapacitor.SlackBuild b/system/kapacitor/kapacitor.SlackBuild index 2a9d276b46..056705a749 100644 --- a/system/kapacitor/kapacitor.SlackBuild +++ b/system/kapacitor/kapacitor.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kapacitor -VERSION=${VERSION:-1.7.3} +VERSION=${VERSION:-1.7.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/kapacitor/kapacitor.info b/system/kapacitor/kapacitor.info index 820cd24e14..b6d6952189 100644 --- a/system/kapacitor/kapacitor.info +++ b/system/kapacitor/kapacitor.info @@ -1,10 +1,10 @@ PRGNAM="kapacitor" -VERSION="1.7.3" +VERSION="1.7.4" HOMEPAGE="https://www.influxdata.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.7.3_linux_amd64.tar.gz" -MD5SUM_x86_64="3760718ff184d7405783cc875ed4efb3" +DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.7.4_linux_amd64.tar.gz" +MD5SUM_x86_64="f7a66fd6d4c2e432fa83e056abcc0247" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/system/kbfs/kbfs.SlackBuild b/system/kbfs/kbfs.SlackBuild index 59cbaca0c0..ead8770c87 100644 --- a/system/kbfs/kbfs.SlackBuild +++ b/system/kbfs/kbfs.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kbfs SRCNAM=keybase -VERSION=${VERSION:-6.2.4_20240101011938} -COMMITVER=ae7e4a1c15 +VERSION=${VERSION:-6.2.8_20240306193933} +COMMITVER=e38523abbe SRCVER=$(echo $VERSION | tr _ - ) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -49,7 +49,7 @@ fi if [ "${ARCH}" = "i586" ] then - VERSION="6.0.2-20220610191041" + VERSION="6.0.2_20220610191041" COMMITVER=a459abf326 SRCVER=$(echo $VERSION | tr _ - ) fi diff --git a/system/kbfs/kbfs.info b/system/kbfs/kbfs.info index dd632f7818..bda19fe21c 100644 --- a/system/kbfs/kbfs.info +++ b/system/kbfs/kbfs.info @@ -1,10 +1,10 @@ PRGNAM="kbfs" -VERSION="6.2.4_20240101011938" +VERSION="6.2.8_20240306193933" HOMEPAGE="https://github.com/keybase/client" DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_6.0.2-20220610191041.a459abf326_i386.deb" MD5SUM="933745e5f392074a4b964ef8fa8c3156" -DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_6.2.4-20240101011938.ae7e4a1c15_amd64.deb" -MD5SUM_x86_64="8aaa3183e1a2fe2805b2605a4d50e2b8" +DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_6.2.8-20240306193933.e38523abbe_amd64.deb" +MD5SUM_x86_64="0e4aafac21a1f7421e6edfdc795fe9d5" REQUIRES="google-go-lang" MAINTAINER="pyllyukko" EMAIL="pyllyukko@maimed.org" diff --git a/system/kitty/kitty.SlackBuild b/system/kitty/kitty.SlackBuild index 81d907d472..60530cf589 100644 --- a/system/kitty/kitty.SlackBuild +++ b/system/kitty/kitty.SlackBuild @@ -12,7 +12,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kitty -VERSION=${VERSION:-0.34.1} +VERSION=${VERSION:-0.35.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/kitty/kitty.info b/system/kitty/kitty.info index aadc6f8ac2..6adbdee73b 100644 --- a/system/kitty/kitty.info +++ b/system/kitty/kitty.info @@ -1,8 +1,8 @@ PRGNAM="kitty" -VERSION="0.34.1" +VERSION="0.35.1" HOMEPAGE="https://sw.kovidgoyal.net/kitty/" -DOWNLOAD="https://download.dlackware.com/hosted-sources/kitty/kitty-0.34.1.tar.xz" -MD5SUM="992c3ed6c2209a4aa8446afda0c8ee72" +DOWNLOAD="https://download.dlackware.com/hosted-sources/kitty/kitty-0.35.1.tar.xz" +MD5SUM="6109e7e488562e682763b8febe548aa9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="librsync google-go-lang simde" diff --git a/system/kiwix-tools-bin/README b/system/kiwix-tools-bin/README index 44081c35d2..3535a683bd 100644 --- a/system/kiwix-tools-bin/README +++ b/system/kiwix-tools-bin/README @@ -5,7 +5,16 @@ On a boat, in the middle of nowhere or in Jail, Kiwix gives you access to the whole human knowledge. You don't need Internet, everything is stored on your computer, USB flash drive or DVD! -This is a repack of the official binary; it does not compile from +kiwix-tools-bin provides all the three binaries by default: + kiwix-serve - Kiwix HTTP Server + kiwix-manage - Kiwix Library Manager + kiwix-search - Find articles using a fulltext search pattern + +All this above is used for manipulate ZIM files. + +--- + +This is a repack of the official binaries; it does not compile from source. Only 32-bit x86, 64-bit x86_64, and 64-bit aarch64 are supported. @@ -14,7 +23,7 @@ URL in the .info file, you'll have to download it manually. The file is: https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-aarch64-3.7.0.tar.gz -md5 hash of this package: 12ab8a0d67dee5f63c0a85d9d089b5f2 +MD5 hash of that: 12ab8a0d67dee5f63c0a85d9d089b5f2 Note: currently there is no kiwix-tools build that compiles from source. If someday someone submits one, be aware that it will likely conflict diff --git a/system/kiwix-tools-bin/docs/COPYING b/system/kiwix-tools-bin/docs/COPYING index 4432540474..bf0f7d37fd 100644 --- a/system/kiwix-tools-bin/docs/COPYING +++ b/system/kiwix-tools-bin/docs/COPYING @@ -77,7 +77,7 @@ modification follow. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. @@ -510,7 +510,7 @@ actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - + If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties diff --git a/system/kiwix-tools-bin/docs/README.md b/system/kiwix-tools-bin/docs/README.md index 81457d8eba..684b0ebdc5 100644 --- a/system/kiwix-tools-bin/docs/README.md +++ b/system/kiwix-tools-bin/docs/README.md @@ -113,7 +113,7 @@ Like for the installation, you might need to run the command as `root` Docker ------ -An official Docker image of the Kiwix tools can be found on +An official Docker image of the Kiwix tools can be found on [GHCR](https://ghcr.io/kiwix/kiwix-tools). A `kiwix-serve` dedicated Docker image [exists too](https://ghcr.io/kiwix/kiwix-serve). diff --git a/system/kiwix-tools-bin/kiwix-tools-bin.SlackBuild b/system/kiwix-tools-bin/kiwix-tools-bin.SlackBuild index 4e9e4115be..83cb05513a 100644 --- a/system/kiwix-tools-bin/kiwix-tools-bin.SlackBuild +++ b/system/kiwix-tools-bin/kiwix-tools-bin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for kiwix-tools-bin -# Copyright 2024 G. Galdini <jake@dioniso.com.br> Brazil +# Copyright 2024 G. Galdini <jake@dioniso.com.br> Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -34,7 +34,7 @@ case "${ARCH:-$(uname -m)}" in i?86) ARCH=i586 ;; aarch64) ARCH=aarch64 ;; x86_64) ARCH=x86_64 ;; - *) echo 'This script not support your architecture.' ; exit 1 ;; + *) echo "This script not support your architecture - ($ARCH)" ; exit 1 ;; esac if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then @@ -46,26 +46,27 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Binaries already stripped -PBIN=${PRGNAM%-bin}_linux-${ARCH}-${VERSION} +# Package with the three binaries +PKGBIN=${PRGNAM%-bin}_linux-${ARCH}-${VERSION} set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PBIN -tar xvf $CWD/$PBIN.tar.gz -cd $PBIN +rm -rf $PKGBIN +tar xvf $CWD/$PKGBIN.tar.gz +cd $PKGBIN mkdir -p $PKG/usr/{bin,man/man1} -install -m0755 -oroot -groot * $PKG/usr/bin -install -m0644 -oroot -groot $CWD/docs/man/*.? $PKG/usr/man/man1 + +install -m 755 -oroot -groot * $PKG/usr/bin +cp -a $CWD/docs/man/*.? $PKG/usr/man/man1 gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -install -m0644 -oroot -groot $CWD/docs/{README.md,AUTHORS,COPYING,Changelog} \ +cp -a $CWD/docs/{README.md,AUTHORS,COPYING,Changelog} \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild index 30aa229826..8688d0415d 100644 --- a/system/letsencrypt/letsencrypt.SlackBuild +++ b/system/letsencrypt/letsencrypt.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=letsencrypt SRCNAM=certbot -VERSION=${VERSION:-2.10.0} +VERSION=${VERSION:-2.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info index 318e59fc28..6a0bc47a89 100644 --- a/system/letsencrypt/letsencrypt.info +++ b/system/letsencrypt/letsencrypt.info @@ -1,8 +1,8 @@ PRGNAM="letsencrypt" -VERSION="2.10.0" +VERSION="2.11.0" HOMEPAGE="https://letsencrypt.org/" -DOWNLOAD="https://github.com/certbot/certbot/archive/v2.10.0/certbot-2.10.0.tar.gz" -MD5SUM="6de5a7810a2157c632b4343f895d2f59" +DOWNLOAD="https://github.com/certbot/certbot/archive/v2.11.0/certbot-2.11.0.tar.gz" +MD5SUM="3d0ad5e1474062397bd6b9cb223e4828" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="configobj pytz python3-pythondialog zope.component pyrfc3339 python3-psutil python-parsedatetime python3-configargparse werkzeug ndg_httpsclient python3-augeas josepy funcsigs requests-toolbelt python-importlib_metadata" diff --git a/system/libtrash/README b/system/libtrash/README index c3855a5825..05a9ee5c17 100644 --- a/system/libtrash/README +++ b/system/libtrash/README @@ -3,4 +3,4 @@ trash can under GNU/Linux. For instance, with libtrash, Midnight Commander will move files to the trash directory: -LD_PRELOAD=/usr/lib/libtrash.so.3.8 mc +LD_PRELOAD=/usr/lib/libtrash.so.3.9 mc diff --git a/system/libtrash/libtrash.SlackBuild b/system/libtrash/libtrash.SlackBuild index 0990b54eee..8b8b9cc33d 100644 --- a/system/libtrash/libtrash.SlackBuild +++ b/system/libtrash/libtrash.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libtrash -VERSION=${VERSION:-3.8} +VERSION=${VERSION:-3.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -93,17 +93,16 @@ make install DESTDIR=$PKG rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -# Compress man page gzip -9 $PKG/usr/man/man2/$PRGNAM.2 +gzip -9 $PKG/usr/man/man5/$PRGNAM.conf.5 mv $PKG/etc/libtrash.conf $PKG/etc/libtrash.conf.new find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -rm -f $PKG/usr/doc/$PRGNAM-$VERSION/{AUTHORS,INSTALL} -cp -a BUILD ChangeLog config.txt COPYING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION +# The SlackBuild has already copied all the text files (AUTHORS, Changelog, etc.) to /usr/doc/libtrash-* +rm -f $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL # Installation file is irrelevant for binary package users cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/libtrash/libtrash.info b/system/libtrash/libtrash.info index c0e0dce671..4a7730cd70 100644 --- a/system/libtrash/libtrash.info +++ b/system/libtrash/libtrash.info @@ -1,8 +1,8 @@ PRGNAM="libtrash" -VERSION="3.8" +VERSION="3.9" HOMEPAGE="https://github.com/pete4abw/libtrash" -DOWNLOAD="https://github.com/pete4abw/libtrash/archive/v3.8/libtrash-3.8.tar.gz" -MD5SUM="c0e6ad84375fffc5f5eacf0028b28d7e" +DOWNLOAD="https://github.com/pete4abw/libtrash/archive/v3.9/libtrash-3.9.tar.gz" +MD5SUM="4c071df11bd77e66836d0572477fea5e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/limine/limine.SlackBuild b/system/limine/limine.SlackBuild index a0c89610d1..fded6b7dc3 100644 --- a/system/limine/limine.SlackBuild +++ b/system/limine/limine.SlackBuild @@ -25,7 +25,7 @@ cd "$(dirname "$0")" ; CWD=$(pwd) PRGNAM=limine -VERSION=${VERSION:-7.4.1} +VERSION=${VERSION:-7.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -98,7 +98,6 @@ cat "$SRC/COPYING" > "$PKG/usr/share/$NAMVER/LICENSE" cat "$SRC/PHILOSOPHY.md" > "$PKG/usr/share/$NAMVER/PHILOSOPHY.md" cat "$SRC/PROTOCOL.md" > "$PKG/usr/share/$NAMVER/PROTOCOL.md" cat "$SRC/ChangeLog" > "$PKG/usr/share/$NAMVER/ChangeLog" -cat "$SRC/README.md" > "$PKG/usr/doc/$NAMVER/repository-README.md" cd "$PKG" /sbin/makepkg -l y -c n "$OUTPUT/$NAMVER-$ARCH-$BUILD$TAG.$PKGTYPE" diff --git a/system/limine/limine.info b/system/limine/limine.info index 51c11a7990..4638bedfb0 100644 --- a/system/limine/limine.info +++ b/system/limine/limine.info @@ -1,8 +1,8 @@ PRGNAM="limine" -VERSION="7.4.1" +VERSION="7.7.1" HOMEPAGE="https://limine-bootloader.org/" -DOWNLOAD="https://github.com/limine-bootloader/limine/releases/download/v7.4.1/limine-7.4.1.tar.gz" -MD5SUM="9ef991b2c130b5156cbf180b2543c331" +DOWNLOAD="https://github.com/limine-bootloader/limine/releases/download/v7.7.1/limine-7.7.1.tar.gz" +MD5SUM="d39ba7ced7015a0f953e680354b639ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/locust/locust.SlackBuild b/system/locust/locust.SlackBuild index c8ea999554..d30635bf09 100644 --- a/system/locust/locust.SlackBuild +++ b/system/locust/locust.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=locust -VERSION=${VERSION:-2.27.0} +VERSION=${VERSION:-2.29.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,7 +89,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/locust/locust.info b/system/locust/locust.info index 3c70d198a5..619d3aa12c 100644 --- a/system/locust/locust.info +++ b/system/locust/locust.info @@ -1,8 +1,8 @@ PRGNAM="locust" -VERSION="2.27.0" +VERSION="2.29.0" HOMEPAGE="https://github.com/locustio/locust" -DOWNLOAD="https://files.pythonhosted.org/packages/4b/73/77a94b1b07dbce20dbaa0b5a5c97c890a42334a1429f2dd67839c412cffc/locust-2.27.0.tar.gz" -MD5SUM="ff83ce98a0501ba0ad4e752b30dc4ab2" +DOWNLOAD="https://files.pythonhosted.org/packages/4a/02/7b50fbee3f55f561fd76e035624ced58f4692d62087cc03ccf95a6b939c2/locust-2.29.0.tar.gz" +MD5SUM="eb18b970d67c0651395a9a29dca82aa0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-geventhttpclient python3-Flask-Basicauth python3-pyzmq msgpack-python zope.interface zope.event python3-psutil python3-configargparse typing-extensions roundrobin python3-Flask-Cors python3-blinker python3-Flask-Login" diff --git a/system/lxqt-powermanagement/README b/system/lxqt-powermanagement/README new file mode 100644 index 0000000000..051cc6a8ac --- /dev/null +++ b/system/lxqt-powermanagement/README @@ -0,0 +1 @@ +lxqt-powermanagement provides the power management module for LXQt. diff --git a/system/lxqt-powermanagement/doinst.sh b/system/lxqt-powermanagement/doinst.sh new file mode 100644 index 0000000000..3e5691a052 --- /dev/null +++ b/system/lxqt-powermanagement/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/system/lxqt-powermanagement/lxqt-powermanagement.SlackBuild b/system/lxqt-powermanagement/lxqt-powermanagement.SlackBuild new file mode 100644 index 0000000000..6aa94a3132 --- /dev/null +++ b/system/lxqt-powermanagement/lxqt-powermanagement.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/bash + +# Slackware build script for lxqt-powermanagement + +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 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) + +PRGNAM=lxqt-powermanagement +VERSION=${VERSION:-1.3.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Remove "Ask" option from lid and idle watchers +# See https://github.com/lxqt/lxqt-powermanagement/pull/380 +patch -p1 < $CWD/remove-ask-from-lid-and-idle-watchers.patch + +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +sed -i '/^Categories/s,LXQt;,X-&,' $PKG/usr/share/applications/*desktop + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS CHANGELOG LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/lxqt-powermanagement/lxqt-powermanagement.info b/system/lxqt-powermanagement/lxqt-powermanagement.info new file mode 100644 index 0000000000..583c129e80 --- /dev/null +++ b/system/lxqt-powermanagement/lxqt-powermanagement.info @@ -0,0 +1,10 @@ +PRGNAM="lxqt-powermanagement" +VERSION="1.3.0" +HOMEPAGE="https://github.com/lxqt/lxqt-powermanagement" +DOWNLOAD="https://github.com/lxqt/lxqt-powermanagement/releases/download/1.3.0/lxqt-powermanagement-1.3.0.tar.xz" +MD5SUM="5f371fc66093704acd891a3175595e98" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="lxqt-globalkeys" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/system/lxqt-powermanagement/remove-ask-from-lid-and-idle-watchers.patch b/system/lxqt-powermanagement/remove-ask-from-lid-and-idle-watchers.patch new file mode 100644 index 0000000000..7aba259ce8 --- /dev/null +++ b/system/lxqt-powermanagement/remove-ask-from-lid-and-idle-watchers.patch @@ -0,0 +1,56 @@ +--- a/config/batterywatchersettings.cpp ++++ b/config/batterywatchersettings.cpp +@@ -54,7 +54,7 @@ + + { + mUi->setupUi(this); +- fillComboBox(mUi->actionComboBox); ++ fillComboBox(mUi->actionComboBox, true); + fillIconTypeCombo(mUi->iconTypeComboBox); + mUi->chargeLevelSlider->setValue(53); + mChargingIconProducer.updateState(Solid::Battery::Charging); +--- a/config/helpers.cpp ++++ b/config/helpers.cpp +@@ -29,11 +29,14 @@ + + #include "helpers.h" + +-void fillComboBox(QComboBox* comboBox) ++void fillComboBox(QComboBox* comboBox, bool ask) + { + comboBox->clear(); + comboBox->addItem(QObject::tr("Nothing"), -1); +- comboBox->addItem(QObject::tr("Ask"), LXQt::Power::PowerShowLeaveDialog); ++ if (ask) ++ { ++ comboBox->addItem(QObject::tr("Ask"), LXQt::Power::PowerShowLeaveDialog); ++ } + comboBox->addItem(QObject::tr("Lock screen"), -2); // FIXME + comboBox->addItem(QObject::tr("Suspend"), LXQt::Power::PowerSuspend); + comboBox->addItem(QObject::tr("Hibernate"), LXQt::Power::PowerHibernate); +--- a/config/helpers.h ++++ b/config/helpers.h +@@ -10,7 +10,7 @@ + + #include <QComboBox> + +-void fillComboBox(QComboBox* comboBox); ++void fillComboBox(QComboBox* comboBox, bool ask = false); + + void setComboBoxToValue(QComboBox* comboBox, int value); + +--- a/config/powerkeyssettings.cpp ++++ b/config/powerkeyssettings.cpp +@@ -35,9 +35,9 @@ + mUi(new Ui::PowerKeysSettings) + { + mUi->setupUi(this); +- fillComboBox(mUi->powerKeyActionComboBox); +- fillComboBox(mUi->suspendKeyActionComboBox); +- fillComboBox(mUi->hibernateKeyActionComboBox); ++ fillComboBox(mUi->powerKeyActionComboBox, true); ++ fillComboBox(mUi->suspendKeyActionComboBox, true); ++ fillComboBox(mUi->hibernateKeyActionComboBox, true); + + connect(mUi->powerKeyActionComboBox, QOverload<int>::of(&QComboBox::activated), this, &PowerKeysSettings::saveSettings); + connect(mUi->suspendKeyActionComboBox, QOverload<int>::of(&QComboBox::activated), this, &PowerKeysSettings::saveSettings); diff --git a/system/lxqt-powermanagement/slack-desc b/system/lxqt-powermanagement/slack-desc new file mode 100644 index 0000000000..ab14b48df5 --- /dev/null +++ b/system/lxqt-powermanagement/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +lxqt-powermanagement: lxqt-powermanagement (Power management module for LXQt) +lxqt-powermanagement: +lxqt-powermanagement: lxqt-powermanagement provides the power management module for LXQt. +lxqt-powermanagement: +lxqt-powermanagement: +lxqt-powermanagement: +lxqt-powermanagement: +lxqt-powermanagement: +lxqt-powermanagement: +lxqt-powermanagement: +lxqt-powermanagement: diff --git a/system/lxsession/gcc14.patch b/system/lxsession/gcc14.patch new file mode 100644 index 0000000000..5e612edc6a --- /dev/null +++ b/system/lxsession/gcc14.patch @@ -0,0 +1,89 @@ +From a0d8f8b865ce25867983cd45720adfff33b3fdfb Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Sun, 25 Feb 2024 16:58:43 +0900 +Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types. +To support compilation with gcc14, cast GTK related objects +properly. +--- + lxpolkit/lxpolkit-listener.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lxpolkit/lxpolkit-listener.c b/lxpolkit/lxpolkit-listener.c +index 00bda42..819d2c5 100644 +--- a/lxpolkit/lxpolkit-listener.c ++++ b/lxpolkit/lxpolkit-listener.c +@@ -85,13 +85,13 @@ static void on_completed(PolkitAgentSession* session, gboolean authorized, DlgDa + + if(!authorized && !g_cancellable_is_cancelled(data->cancellable)) + { +- show_msg(data->dlg, GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?")); ++ show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, _("Authentication failed!\nWrong password?")); + /* initiate a new session */ + g_object_unref(data->session); + data->session = NULL; +- gtk_entry_set_text(data->request, ""); ++ gtk_entry_set_text(GTK_ENTRY(data->request), ""); + gtk_widget_grab_focus(data->request); +- on_user_changed(data->id, data); ++ on_user_changed(GTK_COMBO_BOX(data->id), data); + return; + } + g_simple_async_result_complete(data->result); +@@ -106,20 +106,20 @@ static void on_request(PolkitAgentSession* session, gchar* request, gboolean ech + msg = _("Password: "); + else + msg = request; +- gtk_label_set_text(data->request_label, msg); +- gtk_entry_set_visibility(data->request, echo_on); ++ gtk_label_set_text(GTK_LABEL(data->request_label), msg); ++ gtk_entry_set_visibility(GTK_ENTRY(data->request), echo_on); + } + + static void on_show_error(PolkitAgentSession* session, gchar* text, DlgData* data) + { + DEBUG("on error: %s", text); +- show_msg(data->dlg, GTK_MESSAGE_ERROR, text); ++ show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_ERROR, text); + } + + static void on_show_info(PolkitAgentSession* session, gchar* text, DlgData* data) + { + DEBUG("on info: %s", text); +- show_msg(data->dlg, GTK_MESSAGE_INFO, text); ++ show_msg(GTK_WINDOW(data->dlg), GTK_MESSAGE_INFO, text); + } + + void on_dlg_response(GtkDialog* dlg, int response, DlgData* data) +@@ -127,7 +127,7 @@ void on_dlg_response(GtkDialog* dlg, int response, DlgData* data) + DEBUG("on_response: %d", response); + if(response == GTK_RESPONSE_OK) + { +- const char* request = gtk_entry_get_text(data->request); ++ const char* request = gtk_entry_get_text(GTK_ENTRY(data->request)); + polkit_agent_session_response(data->session, request); + gtk_widget_set_sensitive(data->dlg, FALSE); + } +@@ -195,7 +195,7 @@ static void initiate_authentication(PolkitAgentListener *listener, + DEBUG("%s: %s", *p, polkit_details_lookup(details, *p)); + #endif + data->listener = (LXPolkitListener*)listener; +- data->result = g_simple_async_result_new(listener, callback, user_data, initiate_authentication); ++ data->result = g_simple_async_result_new(G_OBJECT(listener), callback, user_data, initiate_authentication); + + data->action_id = g_strdup(action_id); + data->cancellable = (GCancellable*)g_object_ref(cancellable); +@@ -260,10 +260,10 @@ static void initiate_authentication(PolkitAgentListener *listener, + g_free(str); + } + } +- gtk_combo_box_set_model(data->id, GTK_TREE_MODEL(store)); ++ gtk_combo_box_set_model(GTK_COMBO_BOX(data->id), GTK_TREE_MODEL(store)); + g_object_unref(store); + /* select the fist user in the list */ +- gtk_combo_box_set_active(data->id, 0); ++ gtk_combo_box_set_active(GTK_COMBO_BOX(data->id), 0); + } + else + { diff --git a/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild index f900a0f37c..16ca1227b8 100644 --- a/system/lxsession/lxsession.SlackBuild +++ b/system/lxsession/lxsession.SlackBuild @@ -73,8 +73,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxsession -VERSION=${VERSION:-0.5.5} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20240415_f68f477} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -129,8 +129,9 @@ 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 {} \; -rm *.stamp -autoreconf -fi +patch -p1 < $CWD/gcc14.patch + +./autogen.sh || true CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info index 116fd62cde..b773231844 100644 --- a/system/lxsession/lxsession.info +++ b/system/lxsession/lxsession.info @@ -1,8 +1,8 @@ PRGNAM="lxsession" -VERSION="0.5.5" +VERSION="20240415_f68f477" HOMEPAGE="https://wiki.lxde.org/en/LXSession" -DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz" -MD5SUM="e8380acef215ee7c99c067a2241c2c7b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxsession-20240415_f68f477.tar.xz" +MD5SUM="4903b76d535be464c20e57e7a5aea6c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libunique3" diff --git a/system/lxterminal/gcc14.patch b/system/lxterminal/gcc14.patch new file mode 100644 index 0000000000..5eecd92e74 --- /dev/null +++ b/system/lxterminal/gcc14.patch @@ -0,0 +1,49 @@ +From c947b9065b470c24064ac1b1c4935e8093970531 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedoraproject.org> +Date: Wed, 21 Feb 2024 17:01:14 +0900 +Subject: [PATCH] Fix: support gcc14 -Werror=incompatible-pointer-types + +gcc14 now defaults to -Werror=incompatible-pointer-types . +Fix code to support this. + +* Add GTK cast for GTK_STYLE_PROVIDER +* VteRegex must be deref'ed with vte_regex_unref + +Fixes #121 . +--- + src/lxterminal.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lxterminal.c b/src/lxterminal.c +index 680e411..dcd7405 100644 +--- a/src/lxterminal.c ++++ b/src/lxterminal.c +@@ -1208,7 +1208,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + GtkStyleContext* box_style_ctx = + gtk_widget_get_style_context(GTK_WIDGET(terminal->box)); + gtk_style_context_add_provider( +- box_style_ctx, box_css_provider, ++ box_style_ctx, GTK_STYLE_PROVIDER(box_css_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + #endif + +@@ -1232,6 +1232,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); + ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0); + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); ++ vte_regex_unref(dingus1); ++ vte_regex_unref(dingus2); + #else + GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL); + GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL); +@@ -1239,9 +1241,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); + ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0); + vte_terminal_match_set_cursor_name(VTE_TERMINAL(term->vte), ret, "pointer"); +-#endif + g_regex_unref(dingus1); + g_regex_unref(dingus2); ++#endif + + /* Create a horizontal box inside an event box as the toplevel for the tab label. */ + term->tab = gtk_event_box_new(); diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild index 6f4515229e..4a04a1d835 100644 --- a/system/lxterminal/lxterminal.SlackBuild +++ b/system/lxterminal/lxterminal.SlackBuild @@ -71,6 +71,8 @@ # * Update. # 0.4.0-2: 24/apr/2024 by Matteo Bernardini <ponce@slackbuilds.org> # * Switch to gtk+3. +# 20230917_9b4299c: 15/may/2024 by Matteo Bernardini <ponce@slackbuilds.org> +# * Fix building with gcc14. # # Run 'sh lxterminal.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -81,8 +83,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lxterminal -VERSION=${VERSION:-0.4.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20230917_9b4299c} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -136,6 +138,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 {} \; +patch -p1 < $CWD/gcc14.patch + sh autogen.sh || true CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info index d8fecdbf39..b724fc5081 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -1,8 +1,8 @@ PRGNAM="lxterminal" -VERSION="0.4.0" +VERSION="20230917_9b4299c" HOMEPAGE="https://wiki.lxde.org/en/LXTerminal" -DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz" -MD5SUM="7938dbd50e3826c11f4735a742b278d3" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/lxterminal-20230917_9b4299c.tar.xz" +MD5SUM="d10f0f84b2a5c44eaa338d3b6cf6cfdb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/mongodb/README b/system/mongodb/README index f2e41d4aff..8898ea3511 100644 --- a/system/mongodb/README +++ b/system/mongodb/README @@ -13,9 +13,4 @@ if [ -x /etc/rc.d/rc.mongodb ]; then /etc/rc.d/rc.mongodb start fi -NOTE: mongodb 5.0 requires use of the AVX instruction set: check if -your cpu supports it with - - grep avx /proc/cpuinfo | uniq - -(no output means it doesn't) +NOTE: This script repackage binary source diff --git a/system/mongodb/doinst.sh b/system/mongodb/doinst.sh index 8721b3d5ee..a23b6a9f1f 100644 --- a/system/mongodb/doinst.sh +++ b/system/mongodb/doinst.sh @@ -23,6 +23,6 @@ preserve_perms() { } preserve_perms etc/rc.d/rc.mongodb.new -config etc/mongodb.conf.new +config etc/mongod.conf.new config etc/mongos.conf.new config etc/logrotate.d/mongodb.new diff --git a/system/mongodb/files/mongodb.conf b/system/mongodb/files/mongodb.conf deleted file mode 100644 index 83b4cc0589..0000000000 --- a/system/mongodb/files/mongodb.conf +++ /dev/null @@ -1,34 +0,0 @@ -# !! IMPORTANT !! -# -# This file uses the YAML format as described in the documentation: -# http://docs.mongodb.org/manual/reference/configuration-options/ - -storage: - dbPath: "/var/lib/mongodb" - #engine: wiredTiger - -systemLog: - destination: file - path: "/var/log/mongodb/mongodb.log" - quiet: true - logAppend: true - -net: - port: 27017 - bindIp: 127.0.0.1 - #ssl: - # mode: disabled - -#security: - #keyFile: - #clusterAuthMode: - -#replication: - #replSetName: - -# Specifies one of the MongoDB parameters described here: -# http://docs.mongodb.org/manual/reference/parameters/ -# -# You can specify multiple setParameter fields such as: -# setParameter: {enableTestCommands: 1} -#setParameter: diff --git a/system/mongodb/mongodb.SlackBuild b/system/mongodb/mongodb.SlackBuild index e1b70f5443..d6bbe0ea2f 100644 --- a/system/mongodb/mongodb.SlackBuild +++ b/system/mongodb/mongodb.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM="mongodb" -VERSION=${VERSION:-7.0.9} +VERSION=${VERSION:-7.0.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -52,9 +52,6 @@ OUTPUT=${OUTPUT:-/tmp} MONGO_USER=${MONGO_USER:-285} MONGO_GROUP=${MONGO_GROUP:-285} -SRC_FILE=$PRGNAM-src-r$VERSION.tar.gz -SRC_FLDR=$PRGNAM-src-r$VERSION - if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" @@ -81,15 +78,11 @@ EOF getent passwd mongo &>/dev/null || bailout getent group mongo &>/dev/null || bailout -rm -fr $TMP/$SRC_FLDR $PKG +rm -fr $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP -tar xvf $CWD/$SRC_FILE -cd $SRC_FLDR -# remove bundled libs -rm -fR src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} -# remove compass -rm -fR src/mongo/installer/compass +cd $PKG +ar p $CWD/mongodb-org-server_${VERSION}_amd64.deb data.tar.zst | zstd --decompress | tar xv +ar p $CWD/mongodb-org-mongos_${VERSION}_amd64.deb data.tar.zst | zstd --decompress | tar xv chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -97,63 +90,24 @@ 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 {} \; -# thanks gentoo, also for these patches -for i in $CWD/patches/* ; do patch -p1 < $i ; done - -sed -i "s|GCC 11.3|GCC 11.2|g" SConstruct -sed -i "s|__GNUC_MINOR__ < 3|__GNUC_MINOR__ < 2|g" SConstruct - -scons_opts=( - --disable-warnings-as-errors - --use-system-boost - --use-system-pcre2 - --use-system-snappy - --use-system-yaml - --use-system-zlib - --use-system-zstd - --use-sasl-client - --use-system-libbson - --use-system-mongo-c - --ssl -) - -# Thanks to Lockywolf -# scons can use multiple jobs. For convenience, read MAKEFLAGS from the environment, if set -JOBS="$( echo $MAKEFLAGS | sed 's,.*-j *\([0-9][0-9]*\)*.*,\1,' )" -# or if no MAKEFLAGS, use the number of cores minus 1 -JOBS="${JOBS:-$(( $( nproc ) - 1 ))}" -# or 1, if we really have one core -[ "$JOBS" = "0" ] && JOBS=1 - -if [ "$ARCH" = "x86_64" ]; then - PREFIX=${PKG}/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-L /lib$LIBDIRSUFFIX -L/usr/lib$LIBDIRSUFFIX" \ - ./buildscripts/scons.py "${scons_opts[@]}" --force-jobs --jobs="$JOBS" install-core -else - PREFIX=${PKG}/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-L /lib$LIBDIRSUFFIX -L/usr/lib$LIBDIRSUFFIX" \ - ./buildscripts/scons.py "${scons_opts[@]}" --force-jobs --jobs="$JOBS" --wiredtiger=off install-core -fi - -# manual install -( cd build/install/bin - for i in * ; do install -D -m 0755 $i $PKG/usr/bin/$i ; done ) -( cd debian - for i in *.1 ; do install -D -m 0644 $i $PKG/usr/man/man1/$i ; done ) +# We don't need systemd files +rm -rf lib find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -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 +mv usr/share/man usr/ mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION} -cp distsrc/* ${PKG}/usr/doc/${PRGNAM}-${VERSION} +mv usr/share/doc/mongodb-org-* ${PKG}/usr/doc/${PRGNAM}-${VERSION} cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -rf usr/share/doc mkdir -p $PKG/etc/{logrotate,rc}.d -cat $CWD/files/mongodb.conf > $PKG/etc/mongodb.conf.new cat $CWD/files/mongos.conf > $PKG/etc/mongos.conf.new cat $CWD/files/mongodb.logrotate > $PKG/etc/logrotate.d/mongodb.new cat $CWD/files/rc.mongodb > $PKG/etc/rc.d/rc.mongodb.new +mv etc/mongod.conf etc/mongod.conf.new mkdir -p $PKG/var/{lib,log}/mongodb chmod 750 $PKG/var/{lib,log}/mongodb diff --git a/system/mongodb/mongodb.info b/system/mongodb/mongodb.info index 7e2ff199e5..af80b90952 100644 --- a/system/mongodb/mongodb.info +++ b/system/mongodb/mongodb.info @@ -1,10 +1,12 @@ PRGNAM="mongodb" -VERSION="7.0.9" +VERSION="7.0.11" HOMEPAGE="https://www.mongodb.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://fastdl.mongodb.org/src/mongodb-src-r7.0.9.tar.gz" -MD5SUM_x86_64="96815d47735f5caf1bb024c7b4df8f6a" -REQUIRES="cheetah3 python3-psutil snappy snowballstemmer yaml-cpp python3-jsonschema mongo-c-driver pymongo" +DOWNLOAD_x86_64="https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/7.0/multiverse/binary-amd64/mongodb-org-server_7.0.11_amd64.deb \ + https://repo.mongodb.org/apt/ubuntu/dists/jammy/mongodb-org/7.0/multiverse/binary-amd64/mongodb-org-mongos_7.0.11_amd64.deb" +MD5SUM_x86_64="c09692d4887afbba5c6f5974da2c14b9 \ + a6ccbd543b3b9febdb74515f30e1a1f7" +REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/mongodb/patches/mongodb-5.0.2-no-compass.patch b/system/mongodb/patches/mongodb-5.0.2-no-compass.patch deleted file mode 100644 index 7772515772..0000000000 --- a/system/mongodb/patches/mongodb-5.0.2-no-compass.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/mongo/installer/SConscript b/src/mongo/installer/SConscript -index 5bd89fe9..489e70ac 100644 ---- a/src/mongo/installer/SConscript -+++ b/src/mongo/installer/SConscript -@@ -7,7 +7,6 @@ env = env.Clone() - - env.SConscript( - dirs=[ -- 'compass', - 'msi', - ], - exports=[ diff --git a/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch b/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch deleted file mode 100644 index 823d481c20..0000000000 --- a/system/mongodb/patches/mongodb-5.0.2-skip-reqs-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/buildscripts/scons.py b/buildscripts/scons.py -index 534fca32..c38f64df 100755 ---- a/buildscripts/scons.py -+++ b/buildscripts/scons.py -@@ -19,13 +19,13 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scons') - sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path - - # pylint: disable=C0413 --from mongo.pip_requirements import verify_requirements, MissingRequirements -+#from mongo.pip_requirements import verify_requirements, MissingRequirements - --try: -- verify_requirements('etc/pip/compile-requirements.txt') --except MissingRequirements as ex: -- print(ex) -- sys.exit(1) -+#try: -+# verify_requirements('etc/pip/compile-requirements.txt') -+#except MissingRequirements as ex: -+# print(ex) -+# sys.exit(1) - - try: - import SCons.Script diff --git a/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch b/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch deleted file mode 100644 index 822bd81d0b..0000000000 --- a/system/mongodb/patches/mongodb-7.0.2-sconstruct.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index 92d557b..80ee9e8 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -23,7 +23,6 @@ from pkg_resources import parse_version - - import SCons - import SCons.Script --from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics - from site_scons.mongo import build_profiles - - # This must be first, even before EnsureSConsVersion, if -@@ -1649,13 +1648,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption - - # The placement of this is intentional. Here we setup an atexit method to store tooling metrics. - # We should only register this function after env, env_vars and the parser have been properly initialized. --SConsToolingMetrics.register_metrics( -- utc_starttime=datetime.utcnow(), -- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(), -- env_vars=env_vars, -- env=env, -- parser=_parser, --) - - if get_option('build-metrics'): - env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR' -@@ -3026,7 +3018,6 @@ if env.TargetOSIs('posix'): - env.Append( - CCFLAGS=[ - "-fasynchronous-unwind-tables", -- "-g2" if not env.TargetOSIs('emscripten') else "-g", - "-Wall", - "-Wsign-compare", - "-Wno-unknown-pragmas", -@@ -3093,6 +3084,8 @@ if env.TargetOSIs('posix'): - - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - env.Append(CXXFLAGS=["-Woverloaded-virtual"]) -+ env.Append(CXXFLAGS=os.environ['CXXFLAGS']) -+ env.Append(LINKFLAGS=os.environ['LDFLAGS']) - - # On OS X, clang doesn't want the pthread flag at link time, or it - # issues warnings which make it impossible for us to declare link -@@ -3143,7 +3136,7 @@ if env.TargetOSIs('posix'): - ], ) - - #make scons colorgcc friendly -- for key in ('HOME', 'TERM'): -+ for key in ('HOME', 'TERM', 'PATH'): - try: - env['ENV'][key] = os.environ[key] - except KeyError: -@@ -3543,33 +3536,6 @@ def doConfigure(myenv): - myenv.AddMethod( - functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported") - -- if myenv.ToolchainIs('gcc', 'clang'): -- # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker -- # because it is much faster. Don't use it if the user has already configured another linker -- # selection manually. -- if any(flag.startswith('-fuse-ld=') for flag in env['LINKFLAGS']): -- myenv.FatalError( -- f"Use the '--linker' option instead of modifying the LINKFLAGS directly.") -- -- linker_ld = get_option('linker') -- if linker_ld == 'auto': -- if not env.TargetOSIs('darwin', 'macOS'): -- if not myenv.AddToLINKFLAGSIfSupported('-fuse-ld=lld'): -- myenv.FatalError( -- f"The recommended linker 'lld' is not supported with the current compiler configuration, you can try the 'gold' linker with '--linker=gold'." -- ) -- elif link_model.startswith("dynamic") and linker_ld == 'bfd': -- # BFD is not supported due to issues with it causing warnings from some of -- # the third party libraries that mongodb is linked with: -- # https://jira.mongodb.org/browse/SERVER-49465 -- myenv.FatalError(f"Linker {linker_ld} is not supported with dynamic link model builds.") -- else: -- if not myenv.AddToLINKFLAGSIfSupported(f'-fuse-ld={linker_ld}'): -- myenv.FatalError(f"Linker {linker_ld} could not be configured.") -- -- if has_option('gcov') and myenv.AddToCCFLAGSIfSupported('-fprofile-update=single'): -- myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single']) -- - detectCompiler = Configure( - myenv, - help=False, -@@ -4621,43 +4587,6 @@ def doConfigure(myenv): - if optBuild == "off" and myenv.ToolchainIs('clang') and env.TargetOSIs('darwin'): - myenv.AddToLINKFLAGSIfSupported("-Wl,-no_deduplicate") - -- # Apply any link time optimization settings as selected by the 'lto' option. -- if has_option('lto'): -- if myenv.ToolchainIs('msvc'): -- # Note that this is actually more aggressive than LTO, it is whole program -- # optimization due to /GL. However, this is historically what we have done for -- # windows, so we are keeping it. -- # -- # /GL implies /LTCG, so no need to say it in CCFLAGS, but we do need /LTCG on the -- # link flags. -- myenv.Append(CCFLAGS=['/GL']) -- myenv.Append(LINKFLAGS=['/LTCG']) -- myenv.Append(ARFLAGS=['/LTCG']) -- elif myenv.ToolchainIs('gcc', 'clang'): -- # For GCC and clang, the flag is -flto, and we need to pass it both on the compile -- # and link lines. -- if not myenv.AddToCCFLAGSIfSupported('-flto') or \ -- not myenv.AddToLINKFLAGSIfSupported('-flto'): -- myenv.ConfError("Link time optimization requested, " -- "but selected compiler does not honor -flto") -- -- if myenv.TargetOSIs('darwin'): -- myenv.AddToLINKFLAGSIfSupported('-Wl,-object_path_lto,${TARGET}.lto') -- else: -- # According to intel benchmarks -fno-plt increases perf -- # See PM-2215 -- if linker_ld != "gold": -- myenv.ConfError("lto compilation currently only works with the --linker=gold") -- if link_model != "object": -- myenv.ConfError( -- "lto compilation currently only works with the --link-model=object") -- if not myenv.AddToCCFLAGSIfSupported('-fno-plt') or \ -- not myenv.AddToLINKFLAGSIfSupported('-fno-plt'): -- myenv.ConfError("-fno-plt is not supported by the compiler") -- -- else: -- myenv.ConfError("Don't know how to enable --lto on current toolchain") -- - if get_option('runtime-hardening') == "on" and optBuild != "off": - # Older glibc doesn't work well with _FORTIFY_SOURCE=2. Selecting 2.11 as the minimum was an - # emperical decision, as that is the oldest non-broken glibc we seem to require. It is possible -@@ -5120,17 +5049,13 @@ def doConfigure(myenv): - "BOOST_LOG_NO_SHORTHAND_NAMES", - "BOOST_LOG_USE_NATIVE_SYSLOG", - "BOOST_LOG_WITHOUT_THREAD_ATTR", -+ "BOOST_LOG_DYN_LINK", - "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS", - "BOOST_SYSTEM_NO_DEPRECATED", - "BOOST_THREAD_USES_DATETIME", - ("BOOST_THREAD_VERSION", "5"), - ]) - -- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk': -- conf.env.AppendUnique(CPPDEFINES=[ -- "BOOST_LOG_DYN_LINK", -- ]) -- - if use_system_version_of_library("boost"): - if not conf.CheckCXXHeader("boost/filesystem/operations.hpp"): - myenv.ConfError("can't find boost headers") -@@ -5327,6 +5252,9 @@ def doConfigure(myenv): - - mongoc_mode = get_option('use-system-mongo-c') - conf.env['MONGO_HAVE_LIBMONGOC'] = False -+ conf.env.ParseConfig('pkg-config libbson-1.0 libmongoc-1.0 --cflags') -+ conf.env['LIBDEPS_LIBBSON_SYSLIBDEP'] = 'bson-1.0' -+ - if mongoc_mode != 'off': - if conf.CheckLibWithHeader( - ["mongoc-1.0"], diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild index 2551034909..823efddcb8 100644 --- a/system/netdata/netdata.SlackBuild +++ b/system/netdata/netdata.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=netdata -VERSION=${VERSION:-1.45.4} +VERSION=${VERSION:-1.45.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info index a76638b3f7..03018e8f87 100644 --- a/system/netdata/netdata.info +++ b/system/netdata/netdata.info @@ -1,8 +1,8 @@ PRGNAM="netdata" -VERSION="1.45.4" +VERSION="1.45.6" HOMEPAGE="https://github.com/netdata/netdata" -DOWNLOAD="https://github.com/netdata/netdata/releases/download/v1.45.4/netdata-v1.45.4.tar.gz" -MD5SUM="a4ec6d65c2cf1159e7c93d5415dc2782" +DOWNLOAD="https://github.com/netdata/netdata/releases/download/v1.45.6/netdata-v1.45.6.tar.gz" +MD5SUM="626153780364f3e8769ff6c970abaf04" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python2-PyYAML google-go-lang freeipmi" diff --git a/system/nut/README b/system/nut/README deleted file mode 100644 index bf5ba069e1..0000000000 --- a/system/nut/README +++ /dev/null @@ -1,8 +0,0 @@ -The Network UPS Tools is a collection of programs which provide a -common interface for monitoring and administering UPS hardware. It -uses a layered apporoach to connect all the components. Drivers are -provided for a wide assortment of equipment. The primary goal of the -NUT project is to provide reliable monitoring of UPS hardware and -ensure safe shutdowns of the systems which are connected. - -See README.SLACKWARE for configuration hints. diff --git a/system/nut/README.SLACKWARE b/system/nut/README.SLACKWARE deleted file mode 100644 index a73275956c..0000000000 --- a/system/nut/README.SLACKWARE +++ /dev/null @@ -1,43 +0,0 @@ -README.SLACKWARE -Written by V'yacheslav Stetskevych <slava18 dont_spam_me gmail com> - -In order to configure Network UPS tools on Slackware you need to rename -or make copies of the sample config files in /etc/nut and edit them -to suit your needs. See documentation in /usr/doc/nut-* for reference. -As you make your new config files, don't forget to secure them: - chown root:nut /etc/nut/*.conf /etc/nut/*.users - chmod 640 /etc/nut/*.conf /etc/nut/*.users - -If you are using a serial-connected UPS, be sure to add the nut user to -the 'dialout' group: - usermod -a -G dialout nut - -A startup script /etc/rc.d/rc.ups is provided with this build. -You can add these lines to /etc/rc.d/rc.local to launch it on system start: - if [ -x /etc/rc.d/rc.ups ]; then - /etc/rc.d/rc.ups start - fi - -If you have more than one box sitting on the same UPS, you should only use -'start' on the one box that is connected to the device using a signal cable. -On the other boxes, start rc.ups with the 'start_upsmon' parameter to only -monitor the power status (client mode). Configure access permissions on the -server box accordingly. - -If you wish for your UPS to turn off it's power during an extended power outage -in order not to drain it's battery completely, you should make two simple edits -to the Slackware shutdown script /etc/rc.d/rc.6 near the end of it. -These are only needed on the server box, one that is connected to the UPS: -1) Insert after the rootfs has been remounted read-only: - if [ -x /usr/libexec/nut/nut_restart_udev ]; then - . /usr/libexec/nut/nut_restart_udev - fi -2) Insert after the genpowerd block and before the actual halt: - if [ -x /usr/libexec/nut/nut_kill_inverter ]; then - . /usr/libexec/nut/nut_kill_inverter - fi - -Don't forget to set your motherboard BIOS to automatically turn the machine on -when the power comes back. - -Have fun! diff --git a/system/nut/doinst.sh b/system/nut/doinst.sh deleted file mode 100644 index ea64d25add..0000000000 --- a/system/nut/doinst.sh +++ /dev/null @@ -1,21 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Keep same perms on rc.ups.new: -if [ -e etc/rc.d/rc.ups ]; then - cp -a etc/rc.d/rc.ups etc/rc.d/rc.ups.new.incoming - cat etc/rc.d/rc.ups.new > etc/rc.d/rc.ups.new.incoming - mv etc/rc.d/rc.ups.new.incoming etc/rc.d/rc.ups.new -fi - -config etc/rc.d/rc.ups.new diff --git a/system/nut/nut.SlackBuild b/system/nut/nut.SlackBuild deleted file mode 100644 index d4b19e36ee..0000000000 --- a/system/nut/nut.SlackBuild +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash - -# Slackware build script for nut (Network UPS Tools) - -# Copyright 2010 V'yacheslav Stetskevych <slava18 dont_spam_me gmail com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 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) - -PRGNAM=nut -VERSION=${VERSION:-2.7.4} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} -PKGTYPE=${PKGTYPE:-tgz} - -NUTUSER=${NUTUSER:-nut} -NUTGROUP=${NUTGROUP:-nut} - -# The user and group accounts have to be created manually. -# For slackbuilds.org, assigned nut uid/gid are 218/218. -# See http://slackbuilds.org/uid_gid.txt -if ! grep -q ^$NUTGROUP: /etc/group; then - echo " You must have a \"$NUTGROUP\" group to run this script." - echo " # groupadd -g 218 $NUTGROUP" - exit 1 -elif ! grep -q ^$NUTUSER: /etc/passwd; then - echo " You must have a \"$NUTUSER\" user to run this script." - echo " # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER" - exit 1 -fi - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++14" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc/$PRGNAM \ - --localstatedir=/var \ - --datadir=/usr/share/nut \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --enable-strip \ - --disable-static \ - --with-dev \ - --with-serial \ - --with-usb \ - --with-snmp \ - --with-neon \ - --with-wrap \ - --with-cgi\ - --with-cgipath=/var/www/cgi-bin/nut \ - --with-htmlpath=/var/www/htdocs/ups \ - --with-drvpath=/usr/libexec/nut \ - --with-statepath=/var/run/nut \ - --with-pidpath=/var/run/nut \ - --with-altpidpath=/var/run/nut \ - --with-user=nut \ - --with-group=nut -make -make install DESTDIR=$PKG - -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 - -# Install the bash_completion script -install -d $PKG/usr/share/bash-completion/completions -install -m 755 scripts/misc/nut.bash_completion $PKG/usr/share/bash-completion/completions/nut - -# Install the startup script -install -d $PKG/etc/rc.d -install -m 644 $CWD/rc.ups $PKG/etc/rc.d/rc.ups.new - -# Create the state and run dirs -install -d -o root -g $NUTGROUP -m 770 $PKG/var/state/ups -install -d -o $NUTUSER -g $NUTGROUP -m 770 $PKG/var/run/nut - -# Install shutdown helper files -install -m 755 $CWD/nut_restart_udev $CWD/nut_kill_inverter $PKG/usr/libexec/nut - -# Install documentation -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar docs \ - AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING \ - $PKG/usr/doc/$PRGNAM-$VERSION -rm $PKG/usr/doc/$PRGNAM-$VERSION/docs/Makefile* -cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -rm -f $PKG/usr/lib*/*.la - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/nut/nut.info b/system/nut/nut.info deleted file mode 100644 index b6e4db3b0c..0000000000 --- a/system/nut/nut.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nut" -VERSION="2.7.4" -HOMEPAGE="http://www.networkupstools.org/" -DOWNLOAD="http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz" -MD5SUM="3ba53656933d7471f95140b32a5b8d5c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="V'yacheslav Stetskevych" -EMAIL="slava18@gmail.com" diff --git a/system/nut/nut_kill_inverter b/system/nut/nut_kill_inverter deleted file mode 100644 index 251a047df7..0000000000 --- a/system/nut/nut_kill_inverter +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# This file is part of Network UPS Tools build for Slackware Linux. -# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence. -# Here, we signal the UPS to shut off the power. -# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html -# To be sourced after the genpowerd block and before the actual halt. - -if [ -f /etc/killpower ]; then - echo "----------------------------------------Shutting down UPS power!" - /etc/rc.d/rc.ups shutdown - sleep 40 - echo "The UPS was not shut off properly, or the power came back in the" - echo "middle of the shutdown process, or USB communication failed." - sleep 10 -fi diff --git a/system/nut/nut_restart_udev b/system/nut/nut_restart_udev deleted file mode 100644 index d289c0f87a..0000000000 --- a/system/nut/nut_restart_udev +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# This file is part of Network UPS Tools build for Slackware Linux. -# It should be sourced in /etc/rc.d/rc.0 as part of the poweroff sequence. -# Here, we restart udev so that the system is able to kill off the UPS inverter. -# Reference: http://www.mail-archive.com/nut-upsdev@lists.alioth.debian.org/msg01099.html -# To be sourced after the rootfs has been remounted read-only. - -if [ -f /etc/killpower ]; then -echo "Restarting udev to be able to shut the UPS inverter off..." -/etc/rc.d/rc.udev start -sleep 10 -fi diff --git a/system/nut/rc.ups b/system/nut/rc.ups deleted file mode 100644 index 37916951bd..0000000000 --- a/system/nut/rc.ups +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# Slackware startup script for Network UPS Tools -# Copyright 2010 V'yacheslav Stetskevych - -# UPS drivers live here -DRIVERPATH=/usr/libexec/nut -export PATH=$DRIVERPATH:$PATH - -POWERDOWNFLAG=/etc/killpower -NUTUSER=nut -NUTGROUP=nut -UPSDCONF=/etc/ups/upsd.conf -UPSCONF=/etc/ups/ups.conf -UPSMONCONF=/etc/ups/upsmon.conf - -# Check for existense of the nut user and group -# For slackbuilds.org, assigned nut uid/gid are 218/218. -# See http://slackbuilds.org/uid_gid.txt -if ! grep -q ^$NUTGROUP: /etc/group; then - echo " You must have a \"$NUTGROUP\" group to run this script." - echo " # groupadd -g 218 $NUTGROUP" - exit 1 -elif ! grep -q ^$NUTUSER: /etc/passwd; then - echo " You must have a \"$NUTUSER\" user to run this script." - echo " # useradd -u 218 -g $NUTGROUP -s /bin/false $NUTUSER" - exit 1 -fi - -start_driver() { - upsdrvctl -u $NUTUSER start || exit 1 -} - -start_upsd() { - upsd -u $NUTUSER || exit 1 -} - -start_upsmon() { - upsmon -u $NUTUSER || exit 1 -} - -stop() { - echo "Stopping the UPS services... " - if pgrep upsd 2>&1 >/dev/null; then - upsd -c stop; fi - if pgrep upsmon 2>&1 >/dev/null; then - upsmon -c stop; fi - upsdrvctl stop -} - -case "$1" in - start) # starts everything (for a ups server box) - mkdir -p /var/run/nut - chown $NUTUSER:$NUTGROUP /var/run/nut - chmod 0770 /var/run/nut - start_driver - start_upsd - start_upsmon - ;; - start_upsmon) # starts upsmon only (for a ups client box) - start_upsmon - ;; - stop) # stops all UPS-related daemons - stop - ;; - shutdown) # shuts down the UPS - echo "Killing inverter..." - upsdrvctl shutdown - ;; - reload) - echo "Reloading config files..." - upsd -c reload - upsmon -c reload - ;; - *) - echo "Usage: $0 {start|start_upsmon|stop|shutdown|reload}" -esac diff --git a/system/nut/slack-desc b/system/nut/slack-desc deleted file mode 100644 index c4c8a99c23..0000000000 --- a/system/nut/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nut: nut (Network UPS Tools) -nut: -nut: The Network UPS Tools is a collection of programs which provide a -nut: common interface for monitoring and administering UPS hardware. -nut: It uses a layered apporoach to connect all the components. Drivers -nut: are provided for a wide assortment of equipment. The primary goal of -nut: the NUT project is to provide reliable monitoring of UPS hardware -nut: and ensure safe shutdowns of the systems which are connected. -nut: -nut: Homepage: http://www.networkupstools.org -nut: diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 62f2d75100..f86ced3d25 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-driver -VERSION=${VERSION:-550.76} +VERSION=${VERSION:-550.90.07} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index 1c4648cef1..a049d3694b 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,20 +1,20 @@ PRGNAM="nvidia-driver" -VERSION="550.76" +VERSION="550.90.07" HOMEPAGE="https://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.76/NVIDIA-Linux-x86_64-550.76.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.76.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.76.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.76.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.76.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.76.tar.bz2" -MD5SUM_x86_64="5f8b7b1f439e5ded0a092bcb22e856a6 \ - e180babbc004a7c3619a0dc902904234 \ - 93ed775d26a16bab7be611a8877081b5 \ - f4c4c7209fc7f5cc2587f677a9115ac5 \ - d13fc7da6aab55f1ac8445c9c6fe73e3 \ - 8d058fe472b3fca86c3a77830b33e575" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.90.07/NVIDIA-Linux-x86_64-550.90.07.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.90.07.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.90.07.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.90.07.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-550.90.07.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.90.07.tar.bz2" +MD5SUM_x86_64="fa8d3ff7dd40cc67ea448f0a2227942c \ + 218677cc3e767e8c464c4bce6d97e73f \ + 10568a8c9a1e0c6ba9cc228f86f3d77a \ + df5d52818eddc3f690fd741548f9ab2a \ + 90c0b11b2189bac8e2ec0f0d02f3747c \ + 9a6a33314103d0402b2b00a4491ca06e" REQUIRES="nvidia-kernel" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-firmware/README b/system/nvidia-firmware/README deleted file mode 100644 index ba64cbc845..0000000000 --- a/system/nvidia-firmware/README +++ /dev/null @@ -1,7 +0,0 @@ -This is the proprietary firmware extracted from the NVIDIA binary driver -needed by nouveau for video decoding. - -See the documentation at freedesktop.org to see if your hardware is -supported or not. One way to find out which chip you have is by running: - - lspci -nn -d 10de: diff --git a/system/nvidia-firmware/nvidia-firmware.info b/system/nvidia-firmware/nvidia-firmware.info deleted file mode 100644 index 2e848a4635..0000000000 --- a/system/nvidia-firmware/nvidia-firmware.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="nvidia-firmware" -VERSION="325.15" -HOMEPAGE="https://wiki.freedesktop.org/nouveau/VideoAcceleration/" -DOWNLOAD="http://us.download.nvidia.com/XFree86/Linux-x86/325.15/NVIDIA-Linux-x86-325.15.run \ - https://raw.githubusercontent.com/imirkin/re-vp2/d19d818d1e05c7c68afb052073cc8a487cac8f5d/extract_firmware.py" -MD5SUM="528fc538584de6446384b9cec3099d6c \ - 7975d50a07d9cd9131dba60aef32a86f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@riseup.net" diff --git a/system/nvidia-firmware/slack-desc b/system/nvidia-firmware/slack-desc deleted file mode 100644 index 6632852ec0..0000000000 --- a/system/nvidia-firmware/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nvidia-firmware: nvidia-firmware (video firmware for nouveau) -nvidia-firmware: -nvidia-firmware: This is the proprietary firmware extracted from the NVIDIA -nvidia-firmware: binary driver needed by nouveau for video decoding. -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: -nvidia-firmware: diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild index 056961d308..79360dca24 100644 --- a/system/nvidia-kernel/nvidia-kernel.SlackBuild +++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-kernel -VERSION=${VERSION:-550.76} +VERSION=${VERSION:-550.90.07} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info index dddbed4cb7..37b78f0136 100644 --- a/system/nvidia-kernel/nvidia-kernel.info +++ b/system/nvidia-kernel/nvidia-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-kernel" -VERSION="550.76" +VERSION="550.90.07" HOMEPAGE="https://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.76/NVIDIA-Linux-x86_64-550.76.run" -MD5SUM_x86_64="5f8b7b1f439e5ded0a092bcb22e856a6" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/550.90.07/NVIDIA-Linux-x86_64-550.90.07.run" +MD5SUM_x86_64="fa8d3ff7dd40cc67ea448f0a2227942c" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild index 8b370895b2..cb37105a47 100644 --- a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild +++ b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-legacy470-driver -VERSION=${VERSION:-470.239.06} +VERSION=${VERSION:-470.256.02} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.info b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.info index 47823b7eb4..767531a67c 100644 --- a/system/nvidia-legacy470-driver/nvidia-legacy470-driver.info +++ b/system/nvidia-legacy470-driver/nvidia-legacy470-driver.info @@ -1,20 +1,20 @@ PRGNAM="nvidia-legacy470-driver" -VERSION="470.239.06" +VERSION="470.256.02" HOMEPAGE="https://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.239.06/NVIDIA-Linux-x86_64-470.239.06.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.239.06.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.239.06.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.239.06.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.239.06.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.239.06.tar.bz2" -MD5SUM_x86_64="4d007f78ef892929399aaf02152f4c38 \ - 586ae414f1479c24d1bada70d2b66dce \ - 3f5dc7b95501fe705cad6ca6cc0e3abf \ - acf01b956ddcf46eb587bf5e23a74721 \ - 16741b7af49a2ce2f81bcb837d0f1edc \ - 4b8c7cac9d3f215d3bd9ec6388383a81" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.256.02.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.256.02.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.256.02.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.256.02.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.256.02.tar.bz2" +MD5SUM_x86_64="57f54d5f6ddef5417215645aabbf9b9c \ + 0dc7b08465ec40079d0ba511469050ee \ + 0c092caf2db758abe29b24c696755749 \ + 5895b69bf3181dd29965a64aac1036f7 \ + 604fffd2f08762fa554ac608ecc51097 \ + cb4c05d860da31ceb6141ffb5761b94c" REQUIRES="nvidia-legacy470-kernel" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-legacy470-kernel/README b/system/nvidia-legacy470-kernel/README index 453a636378..7793219958 100644 --- a/system/nvidia-legacy470-kernel/README +++ b/system/nvidia-legacy470-kernel/README @@ -15,3 +15,6 @@ xorg.conf. The xf86-video-nouveau-blacklist package from /extra is required. The Nvidia 470.xx series will be supported through December 2024. + +NOTE: To build in -current with gcc14 against the new 6.9.x kernel, +pass "CURRENT=yes" to the script. diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-gcc14.patch b/system/nvidia-legacy470-kernel/nvidia-legacy470-gcc14.patch new file mode 100644 index 0000000000..772236e5cf --- /dev/null +++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-gcc14.patch @@ -0,0 +1,29 @@ +diff --git a/conftest.sh b/conftest.sh +index 6e6da83..678b79c 100755 +--- a/conftest.sh ++++ b/conftest.sh +@@ -101,7 +101,8 @@ test_header_presence() { + build_cflags() { + BASE_CFLAGS="-O2 -D__KERNEL__ \ + -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \ +--nostdinc -isystem $ISYSTEM" ++-nostdinc -isystem $ISYSTEM -fshort-wchar \ ++-Wno-implicit-function-declaration -Wno-strict-prototypes" + + if [ "$OUTPUT" != "$SOURCES" ]; then + OUTPUT_CFLAGS="-I$OUTPUT/include2 -I$OUTPUT/include" +@@ -4592,8 +4592,13 @@ compile_test() { + # + CODE=" + #include <drm/drm_gem.h> ++ #if defined(NV_LINUX_IOSYS_MAP_H_PRESENT) ++ typedef struct iosys_map nv_sysio_map_t; ++ #else ++ typedef struct dma_buf_map nv_sysio_map_t; ++ #endif + int conftest_drm_gem_object_vmap_has_map_arg( +- struct drm_gem_object *obj, struct dma_buf_map *map) { ++ struct drm_gem_object *obj, nv_sysio_map_t *map) { + return obj->funcs->vmap(obj, map); + }" + diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild index ac68713929..64f9ed29ad 100644 --- a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild +++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-legacy470-kernel -VERSION=${VERSION:-470.239.06} +VERSION=${VERSION:-470.256.02} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,6 +89,11 @@ find -L . \ unset ARCH +# Patch for gcc-14 in current: +if [ "${CURRENT:-no}" = "yes" ]; then + patch -p1 < $CWD/nvidia-legacy470-gcc14.patch +fi + # CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch" # message. If you custom-build your kernel with clang, # then pass CC=clang to this script. diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info index 7bde5b3a4b..74ba25fda0 100644 --- a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info +++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-legacy470-kernel" -VERSION="470.239.06" +VERSION="470.256.02" HOMEPAGE="https://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.239.06/NVIDIA-Linux-x86_64-470.239.06.run" -MD5SUM_x86_64="4d007f78ef892929399aaf02152f4c38" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run" +MD5SUM_x86_64="57f54d5f6ddef5417215645aabbf9b9c" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild index fd6f73d27c..6483c0ac3f 100644 --- a/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild +++ b/system/nvidia-open-kernel/nvidia-open-kernel.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-open-kernel -VERSION=${VERSION:-550.76} +VERSION=${VERSION:-550.90.07} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/nvidia-open-kernel/nvidia-open-kernel.info b/system/nvidia-open-kernel/nvidia-open-kernel.info index b8d696e994..4b0e087c45 100644 --- a/system/nvidia-open-kernel/nvidia-open-kernel.info +++ b/system/nvidia-open-kernel/nvidia-open-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-open-kernel" -VERSION="550.76" +VERSION="550.90.07" HOMEPAGE="https://github.com/NVIDIA/open-gpu-kernel-modules/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.76.tar.xz" -MD5SUM_x86_64="e908e40e476d62d7bb85a22862302593" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-550.90.07.tar.xz" +MD5SUM_x86_64="f30957c3fe680e7970faf0c08379f773" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmail.com" diff --git a/system/osinfo-db-tools/libxml-2.12.patch b/system/osinfo-db-tools/libxml-2.12.patch new file mode 100644 index 0000000000..af42e41229 --- /dev/null +++ b/system/osinfo-db-tools/libxml-2.12.patch @@ -0,0 +1,85 @@ +From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:04:43 +0100 +Subject: [PATCH 1/2] Make xmlError structs constant + +In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so +that: + +1) xmlGetLastError() returns pointer to a constant xmlError + struct, and + +2) xmlSetStructuredErrorFunc() changed the signature of callback + (validate_structured_error_nop()), it too is passed pointer to + a constant xmlError struct. + +But of course, older libxml2 expects different callback +signature. Therefore, we need to typecast it anyway. + +Also, drop obviously incorrect @error annotation in +validate_structured_error_nop; the variable is used. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index a721b4d..b1434a6 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, + } + + static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, +- xmlErrorPtr error G_GNUC_UNUSED) ++ const xmlError *error) + { + if (error->file) + g_printerr("%s:%d %s", error->file, error->line, error->message); +@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro + g_autofree gchar *schemapath = NULL; + + xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); +- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); ++ /* Drop this typecast when >=libxml2-2.12.0 is required */ ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); + + schemapath = g_file_get_path(schema); + rngParser = xmlRelaxNGNewParserCtxt(schemapath); +-- +GitLab + + +From 019487cbc79925e49988789bf533c78dab7e1842 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:06:04 +0100 +Subject: [PATCH 2/2] osinfo-db-validate: Add more libxml/ includes + +In its 2.12.0 release, libxml reworked their header files (some +might even call it cleaning up, I call it API incompatible +change) and now we don't get all declarations we need by just +including one file. Add missing includes. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index b1434a6..f3275db 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -20,7 +20,9 @@ + * Daniel P. Berrange <berrange@redhat.com> + */ + ++#include <libxml/parser.h> + #include <libxml/relaxng.h> ++#include <libxml/tree.h> + #include <locale.h> + #include <glib/gi18n.h> + +-- +GitLab + diff --git a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild index c689e31156..368b4424a6 100644 --- a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild +++ b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for osinfo-db-tools -# Copyright 2016-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=osinfo-db-tools -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -81,6 +81,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 {} \; +patch -p1 < $CWD/libxml-2.12.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info index ad699ecdc1..99dae01bac 100644 --- a/system/osinfo-db-tools/osinfo-db-tools.info +++ b/system/osinfo-db-tools/osinfo-db-tools.info @@ -1,8 +1,8 @@ PRGNAM="osinfo-db-tools" -VERSION="1.10.0" +VERSION="1.11.0" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.10.0.tar.xz" -MD5SUM="f0c83772ce612b5d0befb77a8d6f309b" +DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.11.0.tar.xz" +MD5SUM="8fed1cfc692b6fa1a80f002b0a8447ac" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild index f1d803ad2f..36b70adec7 100644 --- a/system/osinfo-db/osinfo-db.SlackBuild +++ b/system/osinfo-db/osinfo-db.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for osinfo-db -# Copyright 2016-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=osinfo-db -VERSION=${VERSION:-20230308} +VERSION=${VERSION:-20231215} SLVERSION=${SLVERSION:-20220214} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info index c61d3a665e..4ce4d8ae5b 100644 --- a/system/osinfo-db/osinfo-db.info +++ b/system/osinfo-db/osinfo-db.info @@ -1,9 +1,9 @@ PRGNAM="osinfo-db" -VERSION="20230308" +VERSION="20231215" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20230308.tar.xz \ +DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20231215.tar.xz \ https://harrier.slackbuilds.org/misc/osinfo-db-slackware-20220214.tar.xz" -MD5SUM="0293bded4e2b7b22fe87bd629d2b71ce \ +MD5SUM="45021bc702e722d1f5dd062f4823d160 \ 65ed4d991bdab6ab00bc34bcbb5d16ff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/osquery-bin/osquery-bin.SlackBuild b/system/osquery-bin/osquery-bin.SlackBuild index 3f85678ad1..958a3ff01e 100644 --- a/system/osquery-bin/osquery-bin.SlackBuild +++ b/system/osquery-bin/osquery-bin.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=osquery-bin SRCNAM=${PRGNAM%-bin} -VERSION=${VERSION:-5.12.1} +VERSION=${VERSION:-5.12.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -61,7 +61,7 @@ if [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "aarch64" ]; then ar p "$CWD/$SRCNAM"_"$VERSION-$DEBBUILD.linux_arm64.deb" data.tar.gz | tar xzv else - printf "$ARCH is not supported...\n" + printf "%s\n" "$ARCH is not supported..." exit 1 fi diff --git a/system/osquery-bin/osquery-bin.info b/system/osquery-bin/osquery-bin.info index c2a3d51277..47c0630d74 100644 --- a/system/osquery-bin/osquery-bin.info +++ b/system/osquery-bin/osquery-bin.info @@ -1,12 +1,12 @@ PRGNAM="osquery-bin" -VERSION="5.12.1" +VERSION="5.12.2" HOMEPAGE="https://osquery.io/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/osquery/osquery/releases/download/5.12.1/osquery_5.12.1-1.linux_amd64.deb \ - https://github.com/osquery/osquery/releases/download/5.12.1/osquery_5.12.1-1.linux_arm64.deb" -MD5SUM_x86_64="85eace3a95a804a0dae3e99a80961912 \ - 2b907b8053a658ba4cc79eb2d9cd0595" +DOWNLOAD_x86_64="https://github.com/osquery/osquery/releases/download/5.12.2/osquery_5.12.2-1.linux_amd64.deb \ + https://github.com/osquery/osquery/releases/download/5.12.2/osquery_5.12.2-1.linux_arm64.deb" +MD5SUM_x86_64="c005defd4db9c8d6afce8ca49748bffd \ + c6c7925084113f2f471f68c13d7266b8" REQUIRES="" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild index 852d5f2cae..b599e98d70 100644 --- a/system/pcmanfm/pcmanfm.SlackBuild +++ b/system/pcmanfm/pcmanfm.SlackBuild @@ -31,8 +31,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pcmanfm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-3} +VERSION=${VERSION:-20230917_e6b422b} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -88,7 +88,7 @@ find -L . \ sh autogen.sh || true -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info index d3546b675e..0a347feab9 100644 --- a/system/pcmanfm/pcmanfm.info +++ b/system/pcmanfm/pcmanfm.info @@ -1,8 +1,8 @@ PRGNAM="pcmanfm" -VERSION="1.3.2" +VERSION="20230917_e6b422b" HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz" -MD5SUM="ef7c4417d2697ef138d175db7aeae15a" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/lxde/pcmanfm-20230917_e6b422b.tar.xz" +MD5SUM="8b263571312ea14fde719831f61b8be1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm" diff --git a/system/qemu/README b/system/qemu/README index 987806c423..be1fde0db3 100644 --- a/system/qemu/README +++ b/system/qemu/README @@ -41,15 +41,17 @@ your processor) prior to launching qemu-system-ARCH with kvm enabled. For older/unmaintained qemu frontends, this build also creates a symlink to qemu-system-ARCH at /usr/bin/qemu-kvm. -libiscsi (to access iSCSI targets directly), libslirp (user mode -networking), libcacard, spice, usbredir, virglrenderer, libnfs, snappy, -glusterfs, and vde2, sphinx-rtd-theme and Sphinx (to build documentation) -are optional dependencies that will be automatically detected during -compilation, if present (all avialable on SBo). +libiscsi (to access iSCSI targets directly), libcacard, spice, usbredir +virglrenderer, libnfs, snappy, glusterfs, vde2, sphinx-rtd-theme and +Sphinx (to build documentation) are optional dependencies that will be +automatically detected during compilation, if present (all avialable on +SBo). -To enable user mode networking, install libslirp, then compile qemu: +To disable user mode networking compile qemu with: -SLIRP=yes ./qemu.SlackBuild + SLIRP=no ./qemu.SlackBuild + +The dependency virtiofsd isn't usable on a 32bit operating system. NOTES: This version breaks some backward compatibility with earlier versions. diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index 1f6ebfffbb..2d7fa89f7d 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qemu -VERSION=${VERSION:-8.2.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-8.2.5} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -116,10 +116,10 @@ else fi # To enable user mode networking use SLIRP=yes -if [ "$SLIRP" = "yes" ]; then - with_slirp="--enable-slirp" +if [ "$SLIRP" = "no" ]; then + with_slirp="--disable-slirp" else - with_slirp="" + with_slirp="--enable-slirp" fi CFLAGS="$SLKCFLAGS" \ diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index 48d9efdf8c..79ab105e85 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,10 +1,10 @@ PRGNAM="qemu" -VERSION="8.2.2" +VERSION="8.2.5" HOMEPAGE="https://www.qemu.org" -DOWNLOAD="https://download.qemu.org/qemu-8.2.2.tar.xz" -MD5SUM="e43091262671c1728b09522932b75b1d" +DOWNLOAD="https://download.qemu.org/qemu-8.2.5.tar.xz" +MD5SUM="80b7901822373d69ebdd60cb03b8515b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="device-tree-compiler python3-meson-opt" +REQUIRES="device-tree-compiler libslirp python3-meson-opt virtiofsd" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@linuxgalaxy.org" diff --git a/system/readpe/readpe.SlackBuild b/system/readpe/readpe.SlackBuild index dd36510809..bc560a2695 100644 --- a/system/readpe/readpe.SlackBuild +++ b/system/readpe/readpe.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=readpe -VERSION=${VERSION:-20240131_3c4163e} -GITHASH=${GITHASH:-3c4163e30896c9a22e996815d5e0f7876b3fc64f} +VERSION=${VERSION:-20240427_d94c794} +GITHASH=${GITHASH:-d94c79459692cd6abbf6051328b225319e2caadf} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/readpe/readpe.info b/system/readpe/readpe.info index dbc828f761..be049f4715 100644 --- a/system/readpe/readpe.info +++ b/system/readpe/readpe.info @@ -1,8 +1,8 @@ PRGNAM="readpe" -VERSION="20240131_3c4163e" +VERSION="20240427_d94c794" HOMEPAGE="https://github.com/mentebinaria/readpe" -DOWNLOAD="https://github.com/mentebinaria/readpe/archive/3c4163e/readpe-3c4163e30896c9a22e996815d5e0f7876b3fc64f.tar.gz" -MD5SUM="85f1fa2212a7d996efbab4fe2d5e238b" +DOWNLOAD="https://github.com/mentebinaria/readpe/archive/d94c794/readpe-d94c79459692cd6abbf6051328b225319e2caadf.tar.gz" +MD5SUM="7dcf55ee3a582febfa447732cecc62a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/redis-py/redis-py.SlackBuild b/system/redis-py/redis-py.SlackBuild index 092f9b088f..3ca9327fdb 100644 --- a/system/redis-py/redis-py.SlackBuild +++ b/system/redis-py/redis-py.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=redis-py -VERSION=${VERSION:-5.0.4} +VERSION=${VERSION:-5.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/redis-py/redis-py.info b/system/redis-py/redis-py.info index 3869928087..d53f7a7486 100644 --- a/system/redis-py/redis-py.info +++ b/system/redis-py/redis-py.info @@ -1,8 +1,8 @@ PRGNAM="redis-py" -VERSION="5.0.4" +VERSION="5.0.5" HOMEPAGE="https://github.com/andymccurdy/redis-py" -DOWNLOAD="https://github.com/andymccurdy/redis-py/archive/v5.0.4/redis-py-5.0.4.tar.gz" -MD5SUM="bb43da83c49bc851f91b686da9a2afef" +DOWNLOAD="https://github.com/andymccurdy/redis-py/archive/v5.0.5/redis-py-5.0.5.tar.gz" +MD5SUM="a04b669743ce048e3ad5f462e800fbbe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="redis" diff --git a/system/redis/redis.SlackBuild b/system/redis/redis.SlackBuild index 1045eebe69..cc9efc6599 100644 --- a/system/redis/redis.SlackBuild +++ b/system/redis/redis.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=redis -VERSION=${VERSION:-7.2.4} +VERSION=${VERSION:-7.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/redis/redis.info b/system/redis/redis.info index c5a41e3483..31ae4225c9 100644 --- a/system/redis/redis.info +++ b/system/redis/redis.info @@ -1,8 +1,8 @@ PRGNAM="redis" -VERSION="7.2.4" +VERSION="7.2.5" HOMEPAGE="https://redis.io/" -DOWNLOAD="https://download.redis.io/releases/redis-7.2.4.tar.gz" -MD5SUM="5ec126130d702828d98fed8e0c71fc1d" +DOWNLOAD="https://download.redis.io/releases/redis-7.2.5.tar.gz" +MD5SUM="b2a5dde2024516d431fc1e4f360020b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/s6/s6.SlackBuild b/system/s6/s6.SlackBuild index a644b72fdd..a04d7dca71 100644 --- a/system/s6/s6.SlackBuild +++ b/system/s6/s6.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=s6 -VERSION=${VERSION:-2.12.0.3} +VERSION=${VERSION:-2.12.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/s6/s6.info b/system/s6/s6.info index 5d6a2f186d..951f079e8c 100644 --- a/system/s6/s6.info +++ b/system/s6/s6.info @@ -1,8 +1,8 @@ PRGNAM="s6" -VERSION="2.12.0.3" +VERSION="2.12.0.4" HOMEPAGE="https://skarnet.org/software/s6/" -DOWNLOAD="https://skarnet.org/software/s6/s6-2.12.0.3.tar.gz" -MD5SUM="0af573a178274c16d1a22f2c0de51695" +DOWNLOAD="https://skarnet.org/software/s6/s6-2.12.0.4.tar.gz" +MD5SUM="0d4a2b072575e8d3c529663228142f8e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="execline" diff --git a/system/sarasa-gothic/sarasa-gothic.SlackBuild b/system/sarasa-gothic/sarasa-gothic.SlackBuild index d9c8887468..9e861472e0 100644 --- a/system/sarasa-gothic/sarasa-gothic.SlackBuild +++ b/system/sarasa-gothic/sarasa-gothic.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sarasa-gothic SRCNAM=Sarasa-TTC -VERSION=${VERSION:-1.0.11} +VERSION=${VERSION:-1.0.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/sarasa-gothic/sarasa-gothic.info b/system/sarasa-gothic/sarasa-gothic.info index a12a31e713..403533d8b0 100644 --- a/system/sarasa-gothic/sarasa-gothic.info +++ b/system/sarasa-gothic/sarasa-gothic.info @@ -1,8 +1,8 @@ PRGNAM="sarasa-gothic" -VERSION="1.0.11" +VERSION="1.0.13" HOMEPAGE="https://github.com/be5invis/Sarasa-Gothic" -DOWNLOAD="https://github.com/be5invis/Sarasa-Gothic/releases/download/v1.0.11/Sarasa-TTC-1.0.11.zip" -MD5SUM="763d25f6787de708cb3f7b1f9905168d" +DOWNLOAD="https://github.com/be5invis/Sarasa-Gothic/releases/download/v1.0.13/Sarasa-TTC-1.0.13.zip" +MD5SUM="9af64fe827ce724af16075306db44335" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/sbpkg/sbpkg.SlackBuild b/system/sbpkg/sbpkg.SlackBuild index 69b783e868..dc48a7df11 100644 --- a/system/sbpkg/sbpkg.SlackBuild +++ b/system/sbpkg/sbpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=sbpkg -VERSION=${VERSION:-1.0.8} +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/sbpkg/sbpkg.info b/system/sbpkg/sbpkg.info index 23f9f43c76..b3c8274537 100644 --- a/system/sbpkg/sbpkg.info +++ b/system/sbpkg/sbpkg.info @@ -1,8 +1,8 @@ PRGNAM="sbpkg" -VERSION="1.0.8" +VERSION="1.1.0" HOMEPAGE="https://gitlab.com/dslackw/sbpkg" -DOWNLOAD="https://gitlab.com/dslackw/sbpkg/-/archive/1.0.8/sbpkg-1.0.8.tar.gz" -MD5SUM="f83fdff3ae389575c09ea9cbec0def09" +DOWNLOAD="https://gitlab.com/dslackw/sbpkg/-/archive/1.1.0/sbpkg-1.1.0.tar.gz" +MD5SUM="a97c871f68aefb4ad948ba9fca741d22" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/slackrepo-hints/slackrepo-hints.SlackBuild b/system/slackrepo-hints/slackrepo-hints.SlackBuild index 6c83a08e51..405d14cafe 100644 --- a/system/slackrepo-hints/slackrepo-hints.SlackBuild +++ b/system/slackrepo-hints/slackrepo-hints.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=slackrepo-hints -VERSION=${VERSION:-20240503} +VERSION=${VERSION:-20240601} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/slackrepo-hints/slackrepo-hints.info b/system/slackrepo-hints/slackrepo-hints.info index 6dc5175d70..d586bd932b 100644 --- a/system/slackrepo-hints/slackrepo-hints.info +++ b/system/slackrepo-hints/slackrepo-hints.info @@ -1,8 +1,8 @@ PRGNAM="slackrepo-hints" -VERSION="20240503" +VERSION="20240601" HOMEPAGE="https://github.com/aclemons/slackrepo-hints" -DOWNLOAD="https://github.com/aclemons/slackrepo-hints/archive/v20240503/slackrepo-hints-20240503.tar.gz" -MD5SUM="24441ebdae1c13bcef96a719e7fe05af" +DOWNLOAD="https://github.com/aclemons/slackrepo-hints/archive/v20240601/slackrepo-hints-20240601.tar.gz" +MD5SUM="036ee1078109037158ca817420efc236" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/slackrepo/slackrepo.SlackBuild b/system/slackrepo/slackrepo.SlackBuild index aed39e8448..c8b376df28 100644 --- a/system/slackrepo/slackrepo.SlackBuild +++ b/system/slackrepo/slackrepo.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=slackrepo -VERSION=${VERSION:-20240420} +VERSION=${VERSION:-20240601} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/slackrepo/slackrepo.info b/system/slackrepo/slackrepo.info index d2d6cd746a..964220616f 100644 --- a/system/slackrepo/slackrepo.info +++ b/system/slackrepo/slackrepo.info @@ -1,8 +1,8 @@ PRGNAM="slackrepo" -VERSION="20240420" +VERSION="20240601" HOMEPAGE="https://github.com/aclemons/slackrepo" -DOWNLOAD="https://github.com/aclemons/slackrepo/archive/v20240420/slackrepo-20240420.tar.gz" -MD5SUM="2145692548db7aa7c81b4627ca5e4941" +DOWNLOAD="https://github.com/aclemons/slackrepo/archive/v20240601/slackrepo-20240601.tar.gz" +MD5SUM="4e6ee343a03e2f19c51c3a41a7093337" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild index d2ff762ba2..7c219db719 100644 --- a/system/slpkg/slpkg.SlackBuild +++ b/system/slpkg/slpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=slpkg -VERSION=${VERSION:-5.0.8} +VERSION=${VERSION:-5.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info index 1d35a96f20..3d40bcd56c 100644 --- a/system/slpkg/slpkg.info +++ b/system/slpkg/slpkg.info @@ -1,10 +1,10 @@ PRGNAM="slpkg" -VERSION="5.0.8" +VERSION="5.1.0" HOMEPAGE="https://dslackw.gitlab.io/slpkg" -DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/5.0.8/slpkg-5.0.8.tar.gz" -MD5SUM="4030e14f0a955c641636f630ba4e784c" +DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/5.1.0/slpkg-5.1.0.tar.gz" +MD5SUM="b2ab9a20630e4b5892ab0ac24241bd2a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-build python3-pythondialog" +REQUIRES="python3-tomlkit python3-pythondialog" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/system/stressapptest/stressapptest.SlackBuild b/system/stressapptest/stressapptest.SlackBuild index 24ef170a42..ce0e6848bc 100644 --- a/system/stressapptest/stressapptest.SlackBuild +++ b/system/stressapptest/stressapptest.SlackBuild @@ -58,14 +58,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# This patch is based on Debian's support_i586_builds for -# stressapptest-1.0.6. Extra logic here to avoid running autoreconf if -# we don't need to (since it's slow). Allow PATCH=yes in the env for my -# own testing purposes. -if [ "${PATCH:-no}" = "yes" ]; then - patch -p1 < $CWD/support_i586.diff - autoreconf -if -fi +patch -p1 < $CWD/support_i586.diff +autoreconf -if CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/stressapptest/support_i586.diff b/system/stressapptest/support_i586.diff index ca9d1302cd..18826c8076 100644 --- a/system/stressapptest/support_i586.diff +++ b/system/stressapptest/support_i586.diff @@ -1,23 +1,22 @@ -diff -Naur stressapptest-1.0.9/configure.ac stressapptest-1.0.9.patched/configure.ac ---- stressapptest-1.0.9/configure.ac 2018-08-09 20:01:24.000000000 -0400 -+++ stressapptest-1.0.9.patched/configure.ac 2020-06-06 13:34:23.000966542 -0400 -@@ -19,6 +19,10 @@ +--- stressapptest-1.0.11/configure.ac.orig 2024-05-16 06:24:36.806255976 +0700 ++++ stressapptest-1.0.11/configure.ac 2024-05-16 06:25:18.914725236 +0700 +@@ -26,6 +26,10 @@ AC_DEFINE([STRESSAPPTEST_CPU_X86_64],[], [Defined if the target CPU is x86_64]) - ], + ], + [*i586*], [ -+ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], ++ AC_DEFINE([STRESSAPPTEST_CPU_I586],[], + [Defined if the target CPU is i586]) -+ ], ++ ], [*i686*], [ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i686]) -@@ -35,7 +39,7 @@ - AC_DEFINE([STRESSAPPTEST_CPU_AARCH64],[], - [Defined if the target CPU is aarch64]) +@@ -50,7 +54,7 @@ + AC_DEFINE([STRESSAPPTEST_CPU_LOONGARCH],[], + [Defined if the target CPU is LOONGARCH]) ], --[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, powerpc, armv7a, or aarch64])] -+[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i586, i686, powerpc, armv7a, or aarch64])] +-[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, mips, powerpc, armv7a, aarch64 or loongarch])] ++[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i586, i686, mips, powerpc, armv7a, aarch64 or loongarch])] ) ## The following allows like systems to share settings. This is not meant to diff --git a/system/telegraf/telegraf.SlackBuild b/system/telegraf/telegraf.SlackBuild index 779f723af2..1054fde969 100644 --- a/system/telegraf/telegraf.SlackBuild +++ b/system/telegraf/telegraf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=telegraf -VERSION=${VERSION:-1.30.1} +VERSION=${VERSION:-1.30.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/telegraf/telegraf.info b/system/telegraf/telegraf.info index f78a096890..ebfc28e489 100644 --- a/system/telegraf/telegraf.info +++ b/system/telegraf/telegraf.info @@ -1,10 +1,10 @@ PRGNAM="telegraf" -VERSION="1.30.1" +VERSION="1.30.3" HOMEPAGE="https://www.influxdata.com" -DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.30.1_linux_i386.tar.gz" -MD5SUM="d765bebe51033ec8bfd8098b52da5ac1" -DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.30.1_linux_amd64.tar.gz" -MD5SUM_x86_64="b592f7423f327991ff178a40460f73ea" +DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.30.3_linux_i386.tar.gz" +MD5SUM="2271506a678b3f8a6c004c241443609a" +DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.30.3_linux_amd64.tar.gz" +MD5SUM_x86_64="b246be1b3e0d0167cf9bb9118105983c" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="slackbuilds@dscp.org" diff --git a/system/trash-cli/README b/system/trash-cli/README index 3d1f4c8749..94d4c378b7 100644 --- a/system/trash-cli/README +++ b/system/trash-cli/README @@ -9,3 +9,6 @@ trash-empty : empty the trashcan(s). trash-list : list trashed files. trash-restore : restore a trashed file. trash-rm : remove individual files from trash can. + +python3-shtab is additionally required for installing trash-cli with +shell completion support. diff --git a/system/trash-cli/trash-cli.SlackBuild b/system/trash-cli/trash-cli.SlackBuild index 828d82c064..3f483b4c46 100644 --- a/system/trash-cli/trash-cli.SlackBuild +++ b/system/trash-cli/trash-cli.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=trash-cli -VERSION=${VERSION:-0.24.4.17} +VERSION=${VERSION:-0.24.5.26} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,6 +70,17 @@ sed 's|share/man/|man/|' -i setup.cfg python3 setup.py install --root=$PKG +# Add trash-cli shell completions (requires python3-shtab) +# Reference: https://github.com/zsh-users/zsh-completions/pull/895 +if $(python3 -c 'import pkgutil; exit(not pkgutil.find_loader("shtab"))'); then + mkdir -p $PKG/usr/share/bash-completion/completions + mkdir -p $PKG/usr/share/zsh/site-functions + for CMD in trash-empty trash-list trash-restore trash-put trash; do + $CMD --print-completion bash > "$PKG/usr/share/bash-completion/completions/$CMD" + $CMD --print-completion zsh > "$PKG/usr/share/zsh/site-functions/_$CMD" + done +fi + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -78,8 +89,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING CREDITS.txt DONE.txt HISTORY.txt README.rst TODO.txt \ - bugs.txt requirements-dev.txt docs \ + COPYING CREDITS.txt HISTORY.txt README.rst requirements-dev.txt docs \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/trash-cli/trash-cli.info b/system/trash-cli/trash-cli.info index 5a5aee45b6..9ab849adc1 100644 --- a/system/trash-cli/trash-cli.info +++ b/system/trash-cli/trash-cli.info @@ -1,8 +1,8 @@ PRGNAM="trash-cli" -VERSION="0.24.4.17" +VERSION="0.24.5.26" HOMEPAGE="https://github.com/andreafrancia/trash-cli" -DOWNLOAD="https://github.com/andreafrancia/trash-cli/archive/0.24.4.17/trash-cli-0.24.4.17.tar.gz" -MD5SUM="7ac2a44c193d45f992f036c38ccf17b8" +DOWNLOAD="https://github.com/andreafrancia/trash-cli/archive/0.24.5.26/trash-cli-0.24.5.26.tar.gz" +MD5SUM="e3d0c09b2c411313ec64aa8cb00c4758" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-psutil" diff --git a/system/trrntzip/slack-desc b/system/trrntzip/slack-desc index eecb353ad1..ae8002db6d 100644 --- a/system/trrntzip/slack-desc +++ b/system/trrntzip/slack-desc @@ -15,5 +15,5 @@ trrntzip: trrntzip: trrntzip: trrntzip: -trrntzip: https://sourceforge.net/projects/trrntzip/ +trrntzip: https://github.com/0-wiz-0/trrntzip/ trrntzip: diff --git a/system/trrntzip/trrntzip.SlackBuild b/system/trrntzip/trrntzip.SlackBuild index 1a8fa43f80..2e59a1dd86 100644 --- a/system/trrntzip/trrntzip.SlackBuild +++ b/system/trrntzip/trrntzip.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=trrntzip -VERSION=${VERSION:-v02} +VERSION=${VERSION:-1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,9 +64,9 @@ set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM -tar xvf $CWD/${PRGNAM}_${VERSION}_src.tar.gz -cd $PRGNAM +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -74,20 +74,18 @@ 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 {} \; -# A small patch to fix a permissions issue: -patch -p1 < $CWD/trrntzip_permission_fix.diff - -./autogen.sh -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr - -make -make install-strip DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/trrntzip/trrntzip.info b/system/trrntzip/trrntzip.info index 7858763586..e5af1235a9 100644 --- a/system/trrntzip/trrntzip.info +++ b/system/trrntzip/trrntzip.info @@ -1,8 +1,8 @@ PRGNAM="trrntzip" -VERSION="v02" -HOMEPAGE="https://sourceforge.net/projects/trrntzip/" -DOWNLOAD="https://downloads.sourceforge.net/trrntzip/trrntzip_v02_src.tar.gz" -MD5SUM="2635a4042b3cf5611ffdffb4019ec8b7" +VERSION="1.3" +HOMEPAGE="https://github.com/0-wiz-0/trrntzip/" +DOWNLOAD="https://github.com/0-wiz-0/trrntzip/archive/v1.3/trrntzip-1.3.tar.gz" +MD5SUM="712ebea3daf181bce4c67473bafed513" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild index 54aa0051ed..5e8171fa21 100644 --- a/system/uhd/uhd.SlackBuild +++ b/system/uhd/uhd.SlackBuild @@ -85,6 +85,15 @@ 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 {} \+ +# fix building with gcc >= 13.x +sed -i s/\#include\ \<stddef.h\>/\#include\ \<stddef.h\>\\n\#include\ \<cstdint\>/ ./include/uhd/cal/database.hpp +sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./include/uhd/rfnoc/defaults.hpp +sed -i s/\#include\ \<cstddef\>/\#include\ \<cstddef\>\\n\#include\ \<cstdint\>/ ./lib/usrp/dboard/magnesium/magnesium_constants.hpp +sed -i s/\#include\ \<cstddef\>/\#include\ \<cstddef\>\\n\#include\ \<cstdint\>/ ./lib/usrp/dboard/rhodium/rhodium_constants.hpp +sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./include/uhd/types/eeprom.hpp +sed -i s/\#include\ \<string\>/\#include\ \<string\>\\n\#include\ \<cstdint\>/ ./lib/include/uhdlib/utils/serial_number.hpp +sed -i s/\#include\ "cast.h"/\#include\ "cast.h"\\n\#include\ \<cstdint\>/ ./lib/deps/pybind11/include/pybind11/attr.h + mkdir -p build cd build cmake \ diff --git a/system/upx/upx.SlackBuild b/system/upx/upx.SlackBuild index 6033d7cf61..d3d233bdd6 100644 --- a/system/upx/upx.SlackBuild +++ b/system/upx/upx.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=upx -VERSION=${VERSION:-4.2.3} +VERSION=${VERSION:-4.2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/upx/upx.info b/system/upx/upx.info index 8fc7f70dcf..49f49f79ca 100644 --- a/system/upx/upx.info +++ b/system/upx/upx.info @@ -1,8 +1,8 @@ PRGNAM="upx" -VERSION="4.2.3" +VERSION="4.2.4" HOMEPAGE="https://upx.github.io/" -DOWNLOAD="https://github.com/upx/upx/releases/download/v4.2.3/upx-4.2.3-src.tar.xz" -MD5SUM="cf9244fbadac63faf210fb356aa120f0" +DOWNLOAD="https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-src.tar.xz" +MD5SUM="e00bd2fef36a86e8916a4b61d6807e2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/usbredir/usbredir.SlackBuild b/system/usbredir/usbredir.SlackBuild index 93d9db22bc..b260b01ac9 100644 --- a/system/usbredir/usbredir.SlackBuild +++ b/system/usbredir/usbredir.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for usbredir -# Copyright 2013-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=usbredir -VERSION=${VERSION:-0.13.0} +VERSION=${VERSION:-0.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -37,9 +37,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/system/usbredir/usbredir.info b/system/usbredir/usbredir.info index 0924b9aa87..0778f58168 100644 --- a/system/usbredir/usbredir.info +++ b/system/usbredir/usbredir.info @@ -1,8 +1,8 @@ PRGNAM="usbredir" -VERSION="0.13.0" +VERSION="0.14.0" HOMEPAGE="https://www.spice-space.org" -DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.13.0.tar.xz" -MD5SUM="8b6766c0de82cb686486ea141b25f5f2" +DOWNLOAD="https://www.spice-space.org/download/usbredir/usbredir-0.14.0.tar.xz" +MD5SUM="68f232c87c086a25c13fc71ddbdc28a5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/veracrypt/32bit.patch b/system/veracrypt/32bit.patch new file mode 100644 index 0000000000..b5d78d2578 --- /dev/null +++ b/system/veracrypt/32bit.patch @@ -0,0 +1,23 @@ +diff -Naur veracrypt-1.26.7.orig/src/Common/PCSCException.cpp veracrypt-1.26.7/src/Common/PCSCException.cpp +--- veracrypt-1.26.7.orig/src/Common/PCSCException.cpp 2023-10-01 18:52:55.000000000 +0200 ++++ veracrypt-1.26.7/src/Common/PCSCException.cpp 2024-06-04 10:00:30.424227000 +0200 +@@ -140,14 +140,17 @@ + { + Exception::Deserialize(stream); + Serializer sr(stream); +- sr.Deserialize("ErrorCode", ErrorCode); ++ int64 v; ++ sr.Deserialize("ErrorCode", v); ++ ErrorCode = (LONG_PCSC)v; + } + + void PCSCException::Serialize(shared_ptr <Stream> stream) const + { + Exception::Serialize(stream); + Serializer sr(stream); +- sr.Serialize("ErrorCode", ErrorCode); ++ int64 v = (int64)ErrorCode; ++ sr.Serialize("ErrorCode", v); + } + + # define TC_EXCEPTION(TYPE) TC_SERIALIZER_FACTORY_ADD(TYPE) diff --git a/system/veracrypt/veracrypt.SlackBuild b/system/veracrypt/veracrypt.SlackBuild index 530c4fa8fb..8aa1e4b054 100644 --- a/system/veracrypt/veracrypt.SlackBuild +++ b/system/veracrypt/veracrypt.SlackBuild @@ -32,8 +32,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=veracrypt -VERSION=${VERSION:-1.25.7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.26.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -85,8 +85,11 @@ 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 {} \+ +# https://sourceforge.net/p/veracrypt/discussion/general/thread/a8003fa49c/#3eae +if [[ $(uname -m) =~ i*86 ]]; then patch -p1 < $CWD/32bit.patch ; fi + cd src -make WX_CONFIG=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.0 +make WX_CONFIG=/usr/lib$LIBDIRSUFFIX/wx/config/gtk3-unicode-3.2 make package cp -av Setup/Linux/usr $PKG rm -f $PKG/usr/bin/veracrypt-uninstall.sh diff --git a/system/veracrypt/veracrypt.info b/system/veracrypt/veracrypt.info index 7d86631c14..5682764804 100644 --- a/system/veracrypt/veracrypt.info +++ b/system/veracrypt/veracrypt.info @@ -1,10 +1,10 @@ PRGNAM="veracrypt" -VERSION="1.25.7" +VERSION="1.26.7" HOMEPAGE="https://www.veracrypt.fr/" -DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.25.7/+download/VeraCrypt_1.25.7_Source.tar.bz2" -MD5SUM="0a874ac3d109974de33cf10c9860b03f" +DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.26.7/+download/VeraCrypt_1.26.7_Source.tar.bz2" +MD5SUM="014748dc89e9e31351cff984bc8b9386" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxGTK3 makeself" +REQUIRES="wxWidgets makeself" MAINTAINER="Thomas Szteliga" EMAIL="ts@websafe.pl" diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 38aa08d8c5..1a47be3e2c 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -166,14 +166,14 @@ config() { # at all. # 20230504 bkw: note to self: -w means disable all warnings. - CFLAGS="$SLKCFLAGS -w -fcommon" \ + CFLAGS="$SLKCFLAGS -w -fcommon -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ DOS2UNIX=/bin/true \ XA=/bin/true \ XDG_DESKTOP_MENU=/bin/true \ ./configure \ $configarg \ - $ffmpeg \ + --disable-ffmpeg \ $pulseopt \ --enable-html-docs \ --enable-platformdox \ diff --git a/system/vim-airline-themes/vim-airline-themes.SlackBuild b/system/vim-airline-themes/vim-airline-themes.SlackBuild index 957569adfb..b949f2a3a8 100644 --- a/system/vim-airline-themes/vim-airline-themes.SlackBuild +++ b/system/vim-airline-themes/vim-airline-themes.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vim-airline-themes -# Copyright 2023 Isaac Yu <isaacyu@protonmail.com> +# Copyright 2023-2024 Isaac Yu <isaacyu@protonmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,12 +25,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vim-airline-themes -VERSION=${VERSION:-20221108} +VERSION=${VERSION:-20240106} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -COMMIT=${COMMIT:-dd81554c2231e438f6d0e8056ea38fd0e80ac02a} +COMMIT=${COMMIT:-a9aa25ce323b2dd04a52706f4d1b044f4feb7617} ARCH=noarch if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then diff --git a/system/vim-airline-themes/vim-airline-themes.info b/system/vim-airline-themes/vim-airline-themes.info index 215c0eb092..4098be9d76 100644 --- a/system/vim-airline-themes/vim-airline-themes.info +++ b/system/vim-airline-themes/vim-airline-themes.info @@ -1,8 +1,8 @@ PRGNAM="vim-airline-themes" -VERSION="20221108" +VERSION="20240106" HOMEPAGE="https://github.com/vim-airline/vim-airline-themes" -DOWNLOAD="https://github.com/vim-airline/vim-airline-themes/archive/dd81554/vim-airline-themes-dd81554c2231e438f6d0e8056ea38fd0e80ac02a.tar.gz" -MD5SUM="c730e4ad77d008705f727117fdf6a667" +DOWNLOAD="https://github.com/vim-airline/vim-airline-themes/archive/a9aa25c/vim-airline-themes-a9aa25ce323b2dd04a52706f4d1b044f4feb7617.tar.gz" +MD5SUM="cbecf78f8170882972b574bb0f92ad94" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/vinterm/includes.diff b/system/vinterm/includes.diff new file mode 100644 index 0000000000..28b9096c59 --- /dev/null +++ b/system/vinterm/includes.diff @@ -0,0 +1,10 @@ +--- vinterm-0.5.0/terminal/pty.h 2013-08-20 01:34:06.000000000 +0900 ++++ vinterm-0.5.0.patched/terminal/pty.h 2023-07-01 09:41:53.057899502 +0900 +@@ -3,6 +3,7 @@ + + #include <string> + #include <ostream> ++#include <cstdint> + using namespace std; + + class Options; diff --git a/system/vinterm/vinterm.SlackBuild b/system/vinterm/vinterm.SlackBuild index 05afe5718c..5d88b5236d 100644 --- a/system/vinterm/vinterm.SlackBuild +++ b/system/vinterm/vinterm.SlackBuild @@ -15,7 +15,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vinterm VERSION=${VERSION:-0.5.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -66,6 +66,8 @@ sed -i -e "s,-Os,$SLKCFLAGS," -e "s,usr/lib,usr/lib$LIBDIRSUFFIX," config.mk # GRR. "make install" respects DESTDIR... except for the icons and .desktop. patch -p1 < $CWD/fix_destdir.diff +# Add an include statement for GCC compatibility. +patch -p1 < $CWD/includes.diff export TERMINFO=$PKG/usr/share/terminfo mkdir -p $TERMINFO diff --git a/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch new file mode 100644 index 0000000000..46c708b9d3 --- /dev/null +++ b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch @@ -0,0 +1,36 @@ +https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch +https://bugs.gentoo.org/831963 + +From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001 +From: Michal Vasilek <michal@vasilek.cz> +Date: Sat, 22 Jan 2022 23:28:20 +0100 +Subject: [PATCH] meson: fix build with meson 0.61 + +i18n.merge_file doesn't accept positional arguments +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ if host_machine.system() != 'windows' + desktop = 'remote-viewer.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -14,7 +13,6 @@ if host_machine.system() != 'windows' + mimetypes = 'virt-viewer-mime.xml' + + i18n.merge_file ( +- mimetypes, + type: 'xml', + input: mimetypes + '.in', + output: mimetypes, +@@ -27,7 +25,6 @@ if host_machine.system() != 'windows' + metainfo = 'remote-viewer.appdata.xml' + + i18n.merge_file ( +- metainfo, + type: 'xml', + input: metainfo + '.in', + output: metainfo, +GitLab diff --git a/system/virt-viewer/virt-viewer.SlackBuild b/system/virt-viewer/virt-viewer.SlackBuild index c0601c673f..01d6ef5068 100644 --- a/system/virt-viewer/virt-viewer.SlackBuild +++ b/system/virt-viewer/virt-viewer.SlackBuild @@ -68,6 +68,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/virt-viewer-10.0_p20210730-meson-0.61.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ diff --git a/system/virtiofsd/README b/system/virtiofsd/README new file mode 100644 index 0000000000..45d12f2526 --- /dev/null +++ b/system/virtiofsd/README @@ -0,0 +1,19 @@ +virtiofsd is a vhost-user virtio-fs device backend written in Rust. + +This won't work on a 32bit operating system. + +NOTE: if you wish to update virtiofsd yourself you need to create a +tarball first with the vendored versions of the rust dependencies: +to create the "vendor" source dir yourself unpack the virtiofsd +tarball, enter its directory and execute these three commands + + export LD_LIBRARY_PATH="/opt/rust16/lib64:$LD_LIBRARY_PATH" + export PATH="/opt/rust16/bin:$PATH" + cargo vendor + +then you can create a tarball with + + tar Jcf ../virtiofsd-vendor-$VERSION.tar.xz vendor + +this is necessary to avoid downloading stuff during execution of +the SlackBuild. diff --git a/system/virtiofsd/slack-desc b/system/virtiofsd/slack-desc new file mode 100644 index 0000000000..a1e87c22f0 --- /dev/null +++ b/system/virtiofsd/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +virtiofsd: virtiofsd (vhost-user virtio-fs device backend) +virtiofsd: +virtiofsd: virtiofsd is a vhost-user virtio-fs device backend written in Rust. +virtiofsd: +virtiofsd: homepage: https://virtio-fs.gitlab.io +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: +virtiofsd: diff --git a/system/virtiofsd/virtiofsd.SlackBuild b/system/virtiofsd/virtiofsd.SlackBuild new file mode 100644 index 0000000000..fa42211bc3 --- /dev/null +++ b/system/virtiofsd/virtiofsd.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/bash + +# Slackware build script for virtiofsd + +# Copyright 2023-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 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) + +PRGNAM=virtiofsd +VERSION=${VERSION:-1.10.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + x86_64) ARCH=x86_64 ;; +# arm*) ARCH=arm ;; + *) echo "ARCH $(uname -m) is unsupported."; exit 1 ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.?z* +cd $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-$VERSION-vendor.tar.xz +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +export PATH="/opt/rust16/bin:$PATH" +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" +else + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" +fi + +mkdir .cargo +cat <<EOT >>.cargo/config.toml +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOT + +cargo build --release +install -D -p -s -m 0755 target/release/$PRGNAM $PKG/usr/libexec/$PRGNAM +install -D -p -m 0644 50-virtiofsd.json $PKG/usr/share/qemu/vhost-user/50-virtiofsd.json + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.md doc/*.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/virtiofsd/virtiofsd.info b/system/virtiofsd/virtiofsd.info new file mode 100644 index 0000000000..4f10e98319 --- /dev/null +++ b/system/virtiofsd/virtiofsd.info @@ -0,0 +1,12 @@ +PRGNAM="virtiofsd" +VERSION="1.10.1" +HOMEPAGE="https://virtio-fs.gitlab.io" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://gitlab.com/virtio-fs/virtiofsd/-/archive/v1.10.1/virtiofsd-v1.10.1.tar.bz2 \ + https://ponce.cc/slackware/sources/repo/virtiofsd-1.10.1-vendor.tar.xz" +MD5SUM_x86_64="c6fd3f5b7a83c908f9e08127ec92edc6 \ + d4538be9ccd5f48561e9dc5d98981eb6" +REQUIRES="rust16" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/virtualbox-addons/gcc13.patch b/system/virtualbox-addons/gcc13.patch new file mode 100644 index 0000000000..40701d717f --- /dev/null +++ b/system/virtualbox-addons/gcc13.patch @@ -0,0 +1,11 @@ +--- Config.kmk.orig 2023-04-13 03:15:13.000000000 -0600 ++++ Config.kmk 2023-06-16 09:59:19.820597642 -0600 +@@ -7485,7 +7485,7 @@ + TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64 + endif + TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-pie -fno-merge-constants -std=c99 -ffreestanding +-TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants -ffreestanding ++TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-pie -fno-merge-constants + TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h + TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h + TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild index 298cb1ef80..d2445314c4 100644 --- a/system/virtualbox-addons/virtualbox-addons.SlackBuild +++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild @@ -89,6 +89,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 {} \; +patch -p0 < $CWD/gcc13.patch + ./configure \ --only-additions \ --disable-kmods \ diff --git a/system/warp-terminal/warp-terminal.info b/system/warp-terminal/warp-terminal.info index 4266303ab4..9e0a11c572 100644 --- a/system/warp-terminal/warp-terminal.info +++ b/system/warp-terminal/warp-terminal.info @@ -5,6 +5,6 @@ DOWNLOAD="UNSUPPORTED" MD5SUM="" DOWNLOAD_x86_64="https://releases.warp.dev/stable/v0.2024.02.20.08.01.stable_02/warp-terminal_0.2024.02.20.08.01.stable.02_amd64.deb" MD5SUM_x86_64="2df4c0844ed983ac84a25f2341b77a05" -REQUIRES="%README%" +REQUIRES="" MAINTAINER="Dimitar Nikov" EMAIL="dimitar at nikov dot net" diff --git a/system/xbindkeys/xbindkeys.SlackBuild b/system/xbindkeys/xbindkeys.SlackBuild index 9d66578e8e..9d033bda91 100644 --- a/system/xbindkeys/xbindkeys.SlackBuild +++ b/system/xbindkeys/xbindkeys.SlackBuild @@ -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 {} \; +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/xbindkeys/xbindkeys.info b/system/xbindkeys/xbindkeys.info index 2856be1820..2621e201b0 100644 --- a/system/xbindkeys/xbindkeys.info +++ b/system/xbindkeys/xbindkeys.info @@ -5,6 +5,6 @@ DOWNLOAD="http://www.nongnu.org/xbindkeys/xbindkeys-1.8.7.tar.gz" MD5SUM="b5e1a9668ba13ff8673836d1d965d951" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="guile2.2" +REQUIRES="" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" diff --git a/system/xchm/doinst.sh b/system/xchm/doinst.sh new file mode 100644 index 0000000000..65c7e2eeb9 --- /dev/null +++ b/system/xchm/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild index 3ac57e98a1..cff147c1b5 100644 --- a/system/xchm/xchm.SlackBuild +++ b/system/xchm/xchm.SlackBuild @@ -9,7 +9,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xchm -VERSION=${VERSION:-1.23} +SRCNAM=xCHM +VERSION=${VERSION:-1.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,9 +51,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -62,10 +63,11 @@ find -L . \ CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ -./configure \ - --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \ +./bootstrap +./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux @@ -73,14 +75,18 @@ make make install DESTDIR=$PKG strip --strip-unneeded $PKG/usr/bin/$PRGNAM 2> /dev/null +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 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL README README.xmlrpc \ + ABOUT-NLS AUTHORS ChangeLog COPYING README README.xmlrpc \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/xchm/xchm.info b/system/xchm/xchm.info index c8429ae450..cb1f366bca 100644 --- a/system/xchm/xchm.info +++ b/system/xchm/xchm.info @@ -1,10 +1,10 @@ PRGNAM="xchm" -VERSION="1.23" -HOMEPAGE="http://xchm.sourceforge.net/" -DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/xchm-1.23.tar.gz" -MD5SUM="486d029bd81071a2d04e7181909b1602" +VERSION="1.36" +HOMEPAGE="https://github.com/rzvncj/xCHM/" +DOWNLOAD="https://github.com/rzvncj/xCHM/archive/1.36/xCHM-1.36.tar.gz" +MD5SUM="8bc0d01cb95b6495cccde0d1ec9a851f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxPython" +REQUIRES="wxWidgets" MAINTAINER="Michael Gehring" EMAIL="mg@ebfe.org" diff --git a/system/yubico-piv-tool/yubico-piv-tool.SlackBuild b/system/yubico-piv-tool/yubico-piv-tool.SlackBuild index 6edd4e7d78..2f6eb89ed4 100644 --- a/system/yubico-piv-tool/yubico-piv-tool.SlackBuild +++ b/system/yubico-piv-tool/yubico-piv-tool.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yubico-piv-tool -VERSION=${VERSION:-2.5.1} +VERSION=${VERSION:-2.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/yubico-piv-tool/yubico-piv-tool.info b/system/yubico-piv-tool/yubico-piv-tool.info index 40f274a826..e6a887b987 100644 --- a/system/yubico-piv-tool/yubico-piv-tool.info +++ b/system/yubico-piv-tool/yubico-piv-tool.info @@ -1,8 +1,8 @@ PRGNAM="yubico-piv-tool" -VERSION="2.5.1" +VERSION="2.5.2" HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/" -DOWNLOAD="https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.5.1.tar.gz" -MD5SUM="f354366991e45c5206eabdd9fee8f81c" +DOWNLOAD="https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-2.5.2.tar.gz" +MD5SUM="793fc9c00cc5b1e8edcc867fcc6637a9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gengetopt pcsc-lite" diff --git a/system/zutty/zutty.SlackBuild b/system/zutty/zutty.SlackBuild index d67cc5137f..ead7ee64e6 100644 --- a/system/zutty/zutty.SlackBuild +++ b/system/zutty/zutty.SlackBuild @@ -25,21 +25,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zutty -VERSION=${VERSION:-0.15} -COMMIT=3fb1516 +VERSION=${VERSION:-0.16} +COMMIT=a578956 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# This SlackBuild searches for tarball named $VERSION.tar.gz (wget) or -# $PRGNAM-$VERSION-$COMMIT.tar.gz (browser). I couldn't find a link to a tarball -# with a dedicated filename, so this will have to do. -if [ -f $CWD/$VERSION.tar.gz ]; then - TARNAM=$VERSION -else - TARNAM=$PRGNAM-$VERSION-$COMMIT -fi - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -73,7 +64,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION-$COMMIT -tar xvf $CWD/$TARNAM.tar.gz +tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION-$COMMIT.tar.gz cd $PRGNAM-$VERSION-$COMMIT chown -R root:root . find -L . \ diff --git a/system/zutty/zutty.info b/system/zutty/zutty.info index 026f69e474..da128cdf88 100644 --- a/system/zutty/zutty.info +++ b/system/zutty/zutty.info @@ -1,8 +1,8 @@ PRGNAM="zutty" -VERSION="0.15" +VERSION="0.16" HOMEPAGE="https://tomscii.sig7.se/zutty/" -DOWNLOAD="https://git.hq.sig7.se/zutty.git/snapshot/0.15.tar.gz" -MD5SUM="45301e40ce2e8ef18a18ef6eb808f559" +DOWNLOAD="https://git.hq.sig7.se/zutty.git/snapshot/0.16.tar.gz" +MD5SUM="9bd65d967c42763e461fd115ce3443f9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |