diff options
Diffstat (limited to 'system')
1722 files changed, 38831 insertions, 9268 deletions
diff --git a/system/CPU-X/CPU-X.SlackBuild b/system/CPU-X/CPU-X.SlackBuild new file mode 100644 index 0000000000..7136be3143 --- /dev/null +++ b/system/CPU-X/CPU-X.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/sh + +# Slackware build script for CPU-X + +# Copyright (c) 2019 Cristiano Urban, Gonars, 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. + +PRGNAM=CPU-X +VERSION=${VERSION:-4.2.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog.md COPYING 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:-tgz} diff --git a/system/CPU-X/CPU-X.info b/system/CPU-X/CPU-X.info new file mode 100644 index 0000000000..c38afb294d --- /dev/null +++ b/system/CPU-X/CPU-X.info @@ -0,0 +1,10 @@ +PRGNAM="CPU-X" +VERSION="4.2.0" +HOMEPAGE="https://x0rg.github.io/CPU-X/" +DOWNLOAD="https://github.com/X0rg/CPU-X/archive/v4.2.0/CPU-X-4.2.0.tar.gz" +MD5SUM="70c2f0626cdf3b193c0639c1395066a6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libcpuid" +MAINTAINER="Cristiano Urban" +EMAIL="cristiano.urban.slack@gmail.com" diff --git a/system/CPU-X/README b/system/CPU-X/README new file mode 100644 index 0000000000..ebacfe5e95 --- /dev/null +++ b/system/CPU-X/README @@ -0,0 +1,3 @@ +Free software that gathers information on CPU, motherboard and more. +CPU-X is similar to CPU-Z (Windows), but CPU-X is a Free and +Open Source software designed for GNU/Linux and FreeBSD. diff --git a/system/CPU-X/doinst.sh b/system/CPU-X/doinst.sh new file mode 100644 index 0000000000..401d987795 --- /dev/null +++ b/system/CPU-X/doinst.sh @@ -0,0 +1,15 @@ +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 + +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi diff --git a/system/isdct/slack-desc b/system/CPU-X/slack-desc index 3001005550..06f7f5051d 100644 --- a/system/isdct/slack-desc +++ b/system/CPU-X/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -isdct: isdct (Intel SSD Data Center Tool) -isdct: -isdct: The isdct is a proprietary command-line tool to manage Intel SSD Data -isdct: Center Family NVMe and SATA drives. It can be used to update SSD -isdct: firmware, calculate drive life expectancy, analyse the SMART -isdct: information, securely erase, and much more. -isdct: -isdct: Home page: -isdct: downloadcenter.intel.com/download/26221/Intel-SSD-Data-Center-Tool -isdct: -isdct: +CPU-X: CPU-X (System information tool) +CPU-X: +CPU-X: Free software that gathers information on CPU, motherboard and more. +CPU-X: CPU-X is similar to CPU-Z (Windows), but CPU-X is a Free and +CPU-X: Open Source software designed for GNU/Linux and FreeBSD. +CPU-X: +CPU-X: Homepage: https://x0rg.github.io/CPU-X/ +CPU-X: +CPU-X: +CPU-X: +CPU-X: diff --git a/system/I-Nex/I-Nex.SlackBuild b/system/I-Nex/I-Nex.SlackBuild index cccc0974f2..bf8428c4f9 100644 --- a/system/I-Nex/I-Nex.SlackBuild +++ b/system/I-Nex/I-Nex.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=I-Nex -VERSION=${VERSION:-7.6.0} +VERSION=${VERSION:-7.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,6 @@ 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 {} \; -sed -i 's|python3$|python2|' pastebinit sed -i -e 's|^STATIC.*|STATIC = false|' i-nex.mk cd $PRGNAM diff --git a/system/I-Nex/I-Nex.info b/system/I-Nex/I-Nex.info index 33cd77088d..434197af8a 100644 --- a/system/I-Nex/I-Nex.info +++ b/system/I-Nex/I-Nex.info @@ -1,8 +1,8 @@ PRGNAM="I-Nex" -VERSION="7.6.0" +VERSION="7.6.1" HOMEPAGE="https://github.com/eloaders/I-Nex" -DOWNLOAD="https://github.com/i-nex/I-Nex/archive/7.6.0/I-Nex-7.6.0.tar.gz" -MD5SUM="4fd4686e860b7dc47c8baccce5764d3b" +DOWNLOAD="https://github.com/i-nex/I-Nex/archive/7.6.1/I-Nex-7.6.1.tar.gz" +MD5SUM="03c2622075c15f24b3b3fa5dd7cf3597" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5 gambas3 libcpuid" diff --git a/system/Iosevka-slab/Iosevka-slab.SlackBuild b/system/Iosevka-slab/Iosevka-slab.SlackBuild new file mode 100644 index 0000000000..90175e9ce6 --- /dev/null +++ b/system/Iosevka-slab/Iosevka-slab.SlackBuild @@ -0,0 +1,64 @@ +#!/bin/sh + +# Slackware build script for Iosevka-slab + +# Copyright 2020-2021 Eugene M., <damagedone at gmx 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. + +PRGNAM=Iosevka-slab +VERSION=${VERSION:-5.1.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +unzip -o $CWD/ttc-iosevka-slab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION +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 {} \; + +mkdir -p $PKG/usr/share/fonts/TTF +cp -a *.ttc $PKG/usr/share/fonts/TTF + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE +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:-tgz} diff --git a/system/Iosevka-slab/Iosevka-slab.info b/system/Iosevka-slab/Iosevka-slab.info new file mode 100644 index 0000000000..1d011a5459 --- /dev/null +++ b/system/Iosevka-slab/Iosevka-slab.info @@ -0,0 +1,10 @@ +PRGNAM="Iosevka-slab" +VERSION="5.1.1" +HOMEPAGE="https://typeof.net/Iosevka/" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v5.1.1/ttc-iosevka-slab-5.1.1.zip" +MD5SUM="e0d5b48c59fc117a6fbbf7ee1b821461" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Eugene M." +EMAIL="damagedone@gmx.com" diff --git a/system/Iosevka-slab/LICENSE b/system/Iosevka-slab/LICENSE new file mode 100644 index 0000000000..d952d62c06 --- /dev/null +++ b/system/Iosevka-slab/LICENSE @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/system/Iosevka-slab/README b/system/Iosevka-slab/README new file mode 100644 index 0000000000..ccf6ccfb46 --- /dev/null +++ b/system/Iosevka-slab/README @@ -0,0 +1,3 @@ +Iosevka is an open-source, sans-serif, monospace quasi‑proportional +typeface family, designed for writing code, using in terminals, +and preparing technical documents. diff --git a/system/Iosevka-slab/doinst.sh b/system/Iosevka-slab/doinst.sh new file mode 100644 index 0000000000..f0ffee7710 --- /dev/null +++ b/system/Iosevka-slab/doinst.sh @@ -0,0 +1,10 @@ +# Update the X font indexes: + +if [ -x /usr/bin/mkfontdir ]; then + ( cd usr/share/fonts/TTF + /usr/bin/mkfontscale . + /usr/bin/mkfontdir . + ) + + [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f +fi diff --git a/system/Iosevka-slab/slack-desc b/system/Iosevka-slab/slack-desc new file mode 100644 index 0000000000..03734d2dd2 --- /dev/null +++ b/system/Iosevka-slab/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------------------------------------------------------| +Iosevka-slab: Iosevka-slab (Slender monospace slab-serif typeface) +Iosevka-slab: +Iosevka-slab: Iosevka is a monospace typeface inspired by Pragmata Pro, M+, and +Iosevka-slab: DIN Mono. It is designed to have a narrow shape to be space +Iosevka-slab: efficient and compatible to CJK characters. +Iosevka-slab: +Iosevka-slab: Homepage: https://typeof.net/Iosevka/ +Iosevka-slab: +Iosevka-slab: +Iosevka-slab: +Iosevka-slab: diff --git a/system/Iosevka/Iosevka.SlackBuild b/system/Iosevka/Iosevka.SlackBuild index e95887df6f..fcd4d2aca7 100644 --- a/system/Iosevka/Iosevka.SlackBuild +++ b/system/Iosevka/Iosevka.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Iosevka -# Copyright 2015-2018 Eugene M., <damagedone at gmx dot com> +# Copyright 2015-2021 Eugene M., <damagedone at gmx dot com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=Iosevka -VERSION=${VERSION:-2.0.2} +VERSION=${VERSION:-5.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,13 +40,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -mkdir $TMP/$PRGNAM-$VERSION -unzip -o $CWD/01-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION -unzip -o $CWD/02-iosevka-term-$VERSION.zip -d $TMP/$PRGNAM-$VERSION -unzip -o $CWD/03-iosevka-type-$VERSION.zip -d $TMP/$PRGNAM-$VERSION -unzip -o $CWD/04-iosevka-cc-$VERSION.zip -d $TMP/$PRGNAM-$VERSION -unzip -o $CWD/05-iosevka-slab-$VERSION.zip -d $TMP/$PRGNAM-$VERSION -cd $PRGNAM-$VERSION/ttf +unzip -o $CWD/ttc-iosevka-$VERSION.zip -d $TMP/$PRGNAM-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -55,7 +50,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p $PKG/usr/share/fonts/TTF -cp -a *.ttf $PKG/usr/share/fonts/TTF +cp -a *.ttc $PKG/usr/share/fonts/TTF mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE diff --git a/system/Iosevka/Iosevka.info b/system/Iosevka/Iosevka.info index 1d22a5d8de..13e3da213a 100644 --- a/system/Iosevka/Iosevka.info +++ b/system/Iosevka/Iosevka.info @@ -1,16 +1,8 @@ PRGNAM="Iosevka" -VERSION="2.0.2" +VERSION="5.1.1" HOMEPAGE="https://typeof.net/Iosevka/" -DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v2.0.2/01-iosevka-2.0.2.zip \ - https://github.com/be5invis/Iosevka/releases/download/v2.0.2/02-iosevka-term-2.0.2.zip \ - https://github.com/be5invis/Iosevka/releases/download/v2.0.2/03-iosevka-type-2.0.2.zip \ - https://github.com/be5invis/Iosevka/releases/download/v2.0.2/04-iosevka-cc-2.0.2.zip \ - https://github.com/be5invis/Iosevka/releases/download/v2.0.2/05-iosevka-slab-2.0.2.zip" -MD5SUM="37de80ce89c8476729525c34c4c61aa6 \ - 05cc679eb02560f6e8085269cc0dc0e8 \ - 38422787b131ea1870cc3e6444aca17d \ - bcaf522a82a02e7f118655dcebb54bfa \ - c4b887825be58bfb80ce0bb07fe2fcdb" +DOWNLOAD="https://github.com/be5invis/Iosevka/releases/download/v5.1.1/ttc-iosevka-5.1.1.zip" +MD5SUM="223ff002dcad132138f2b3b0602c5162" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/Iosevka/README b/system/Iosevka/README index cf9f1b1825..ccf6ccfb46 100644 --- a/system/Iosevka/README +++ b/system/Iosevka/README @@ -1,7 +1,3 @@ -Iosevka is a slender monospace, sans-serif and slab-serif typeface -inspired by Pragmata Pro, M+ and PF DIN Mono, designed to be the -ideal font for programming. - -- Four styles: Regular, Italic, Bold, and Bold Italic; -- Extended language support for most Latin-based Western, Central and - Northern European languages, as well as Greek and Cyrillic. +Iosevka is an open-source, sans-serif, monospace quasi‑proportional +typeface family, designed for writing code, using in terminals, +and preparing technical documents. diff --git a/system/Iosevka/doinst.sh b/system/Iosevka/doinst.sh index 883c47ac0a..f0ffee7710 100644 --- a/system/Iosevka/doinst.sh +++ b/system/Iosevka/doinst.sh @@ -1,10 +1,10 @@ # Update the X font indexes: + if [ -x /usr/bin/mkfontdir ]; then - ( cd /usr/share/fonts/TTF - mkfontscale . - mkfontdir . + ( cd usr/share/fonts/TTF + /usr/bin/mkfontscale . + /usr/bin/mkfontdir . ) -fi -if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache -f + + [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f fi diff --git a/system/Iosevka/slack-desc b/system/Iosevka/slack-desc index d2113d77a5..540e5c73cf 100644 --- a/system/Iosevka/slack-desc +++ b/system/Iosevka/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -Iosevka: Iosevka (Open source monospace coding font) +Iosevka: Iosevka (Slender monospace sans-serif typeface) Iosevka: Iosevka: Iosevka is a monospace typeface inspired by Pragmata Pro, M+, and Iosevka: DIN Mono. It is designed to have a narrow shape to be space Iosevka: efficient and compatible to CJK characters. Iosevka: -Iosevka: Iosevka: Homepage: https://typeof.net/Iosevka/ Iosevka: Iosevka: Iosevka: +Iosevka: diff --git a/system/JetBrainsMono/JetBrainsMono.SlackBuild b/system/JetBrainsMono/JetBrainsMono.SlackBuild new file mode 100644 index 0000000000..fc74eb4097 --- /dev/null +++ b/system/JetBrainsMono/JetBrainsMono.SlackBuild @@ -0,0 +1,60 @@ +#!/bin/sh + +# Slackware build script for JetBrainsMono + +# Copyright 2020 wainamoinen@gmail.com Liege, Belgium +# 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. + +PRGNAM=JetBrainsMono +VERSION=${VERSION:-2.001} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -eu + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION +cd $PRGNAM-$VERSION +unzip $CWD/$PRGNAM-$VERSION.zip +chown -R root:root . + +mkdir -p $PKG/usr/share/fonts/TTF +cp -a ttf/*.ttf ttf/"No ligatures"/*.ttf ttf/Variable/*\.ttf $PKG/usr/share/fonts/TTF + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/. +cp $CWD/README $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/. + +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:-tgz} diff --git a/system/JetBrainsMono/JetBrainsMono.info b/system/JetBrainsMono/JetBrainsMono.info new file mode 100644 index 0000000000..febfb8453c --- /dev/null +++ b/system/JetBrainsMono/JetBrainsMono.info @@ -0,0 +1,10 @@ +PRGNAM="JetBrainsMono" +VERSION="2.001" +HOMEPAGE="https://www.jetbrains.com/lp/mono/" +DOWNLOAD="https://download.jetbrains.com/fonts/JetBrainsMono-2.001.zip" +MD5SUM="62f02985bfef43a27dbdd17641fec210" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Wainamoinen" +EMAIL="wainamoinen@gmail.com" diff --git a/system/JetBrainsMono/README b/system/JetBrainsMono/README new file mode 100644 index 0000000000..c8b05b84d9 --- /dev/null +++ b/system/JetBrainsMono/README @@ -0,0 +1,15 @@ +JetBrainsMono (a typeface for developers) + +JetBrains Mono's typeface forms are simple and free from unnecessary +details. Rendered in small sizes, the text looks crisper. + +JetBrains Mono italic uses a 9 degree angle; this maintains the +optimal contrast to minimize distraction and eye strain. + +138 code-specific ligatures to reduce noise by merging symbols and +removing details so the eyes are processing less. + +A radical cut at the end of strokes fits the pixel grid better and +gives the typeface a stricter and more 'tech' personality. + +https://www.jetbrains.com/lp/mono/ diff --git a/system/JetBrainsMono/doinst.sh b/system/JetBrainsMono/doinst.sh new file mode 100644 index 0000000000..883c47ac0a --- /dev/null +++ b/system/JetBrainsMono/doinst.sh @@ -0,0 +1,10 @@ +# Update the X font indexes: +if [ -x /usr/bin/mkfontdir ]; then + ( cd /usr/share/fonts/TTF + mkfontscale . + mkfontdir . + ) +fi +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi diff --git a/system/JetBrainsMono/slack-desc b/system/JetBrainsMono/slack-desc new file mode 100644 index 0000000000..192fa9d8bb --- /dev/null +++ b/system/JetBrainsMono/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------------------------------------------------------| +JetBrainsMono: JetBrainsMono (a typeface for developers) +JetBrainsMono: +JetBrainsMono: JetBrains Mono's typeface forms are simple and free from unnecessary +JetBrainsMono: details. Rendered in small sizes, the text looks crisper. JetBrains +JetBrainsMono: Mono italic uses a 9 degree angle; this maintains the optimal +JetBrainsMono: contrast to minimize distraction and eye strain. +JetBrainsMono: 138 code-specific ligatures. To reduce noise by merging symbols and +JetBrainsMono: removing details so the eyes are processing less. +JetBrainsMono: A radical cut at the end of strokes fits the pixel grid better and +JetBrainsMono: gives the typeface a stricter and more 'tech' personality. +JetBrainsMono: diff --git a/system/ProFont/ProFont.info b/system/ProFont/ProFont.info index f878d43746..d92ff8798a 100644 --- a/system/ProFont/ProFont.info +++ b/system/ProFont/ProFont.info @@ -1,7 +1,7 @@ PRGNAM="ProFont" VERSION="20040610" HOMEPAGE="http://tobiasjung.name/profont/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/downloadfile.php?file=profont-x11.zip" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/profont-x11.zip" MD5SUM="2bf2826f0430c9c917021f3104cec9f4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/SavvyCAN/README b/system/SavvyCAN/README new file mode 100644 index 0000000000..d95fd3aad4 --- /dev/null +++ b/system/SavvyCAN/README @@ -0,0 +1,33 @@ +SavvyCAN (Qt based cross platform canbus tool) + +A Qt5 based cross platform tool which can be used to load, save, and +capture canbus frames. This tool is designed to help with visualization, +reverse engineering, debugging, and capturing of canbus frames. + +Really requires at a resolution of at least 1024x768. Fully multi-monitor +capable. Works on 4K monitors as well. + +You are highly recommended to use the CANDue board from EVTV. + +The CANDue board must be running the GVRET firmware which can also be +found within the collin80 repos. + +It is now possible to use any QT SerialBus driver (socketcan, Vector, +PeakCAN, TinyCAN). There may, however, be some loss of some functionality +as some functions of SavvyCAN are designed for use directly with the EVTVDue +and CANDue 2.0 boards. + +It should, however, be noted that use of a capture device is not required to +make use of this program. It can load and save in several formats: + +BusMaster log file +Microchip log file +CRTD format (OVMS log file format from Mark Webb-Johnson) +GVRET native format +Generic CSV file (ID,D0 D1 D2 D3 D4 D5 D6 D7) +Vector Trace files +IXXAT Minilog files +CAN-DO Logs +Vehicle Spy log files +CANDump / Kayak (Read only) +PCAN Viewer (Read Only) diff --git a/system/SavvyCAN/SavvyCAN.SlackBuild b/system/SavvyCAN/SavvyCAN.SlackBuild new file mode 100644 index 0000000000..4746c07978 --- /dev/null +++ b/system/SavvyCAN/SavvyCAN.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Slackware build script for SavvyCAN + +# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@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. + +PRGNAM=SavvyCAN +VERSION=${VERSION:-197} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +qmake-qt5 \ + QMAKE_CFLAGS+="$SLKCFLAGS" \ + QMAKE_CXXFLAGS+="$SLKCFLAGS" \ + SavvyCAN.pro + +make + +mkdir -p $PKG/usr/bin/ +install -m755 SavvyCAN $PKG/usr/bin/ + +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 +cp -a 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/SavvyCAN/SavvyCAN.info b/system/SavvyCAN/SavvyCAN.info new file mode 100644 index 0000000000..d44ac6762b --- /dev/null +++ b/system/SavvyCAN/SavvyCAN.info @@ -0,0 +1,10 @@ +PRGNAM="SavvyCAN" +VERSION="197" +HOMEPAGE="https://github.com/collin80/SavvyCAN/" +DOWNLOAD="https://github.com/collin80/SavvyCAN/archive/V197/SavvyCAN-197.tar.gz" +MD5SUM="7bfeb3e3faca1d26f785cc1bffe5af93" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="qt5" +MAINTAINER="Fernando Lopez Jr." +EMAIL="fernando.lopezjr@gmail.com" diff --git a/system/SavvyCAN/slack-desc b/system/SavvyCAN/slack-desc new file mode 100644 index 0000000000..decfa5f12b --- /dev/null +++ b/system/SavvyCAN/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------------------------------------------------------| +SavvyCAN: SavvyCAN (Qt based cross platform canbus tool) +SavvyCAN: +SavvyCAN: A Qt5 based cross platform tool which can be used to load, save, and +SavvyCAN: capture canbus frames. This tool is designed to help with visua- +SavvyCAN: lization, reverse engineering, debugging, and capturing of canbus +SavvyCAN: frames. +SavvyCAN: +SavvyCAN: Really requires at a resolution of at least 1024x768. Fully multi-moni- +SavvyCAN: tor capable. Works on 4K monitors as well. +SavvyCAN: +SavvyCAN: You are highly recommended to use the CANDue board from EVTV. diff --git a/system/Sl/README b/system/Sl/README new file mode 100644 index 0000000000..97058f6a3a --- /dev/null +++ b/system/Sl/README @@ -0,0 +1,24 @@ +Sl (ls with enhancements) + +sl takes the most common use of Unix ls, to display the files in a +directory compactly in multiple columns, and makes it substantially +more useful. + +sl groups files by purpose so you can mentally organize many files +quickly; for instance, it collects HTML and PHP files together, as +opposed to leaving them mixed up with supporting images, CSS, and +JavaScript. sl points out interesting files, which include those that +have been recently modified, read relatively recently, are relatively +large, have warnings, or need to be checked in to or out of version +control. + +sl is also aesthetically pleasing due to attention to layout and +filtering as well as limiting color and text annotations to salient +information. + +Since there's already an "sl" on SlackBuilds.org (in games/), this is +called Sl. If you install it on a system that doesn't have games/sl +installed, a /usr/bin/sl symlink will be created. + +The ".sl.tcl" referred to in the documentation is installed in the doc +dir as "sl.tcl.example". diff --git a/system/Sl/README.upstream b/system/Sl/README.upstream new file mode 100644 index 0000000000..e258bfe683 --- /dev/null +++ b/system/Sl/README.upstream @@ -0,0 +1,223 @@ + sl + +sl takes the most common use of Unix ls, to display the files in a directory +compactly in multiple columns, and makes it substantially more useful. + +sl groups files by purpose so you can mentally organize many files quickly; for +instance, it collects HTML and PHP files together, as opposed to leaving them +mixed up with supporting images, CSS, and JavaScript. sl points out interesting +files, which include those that have been recently modified, read relatively +recently, are relatively large, have warnings, or need to be checked in to or +out of version control. + +sl is also aesthetically pleasing due to attention to layout and filtering as +well as limiting color and text annotations to salient information. + + ---------------------------------------------------------------------------- + +Screen Shots + +ls vs sl on WWW site: + +sl on a software development directory: + +sl on a collection (photos, audio, video, even apps): +On this directory of music, which is managed by iTunes, we see all the albums by +an artist. sl also shows /number of songs in each album, the relatively recent +CD rips (which not coincidentally correspond to the latest two albums), which we +ripped about 2 months ago (58 days) and 7 months ago (228 days). The summary +line at bottom shows the total number of CDs and the (total number) of songs. +Note that the directories were determined to hold audio material, and sorting +works as it should with inital "The"s ignored. This display is useful for other +kinds of hierarchy. + +Features + + * sort + * group by purpose to organize and make understandable so many files + (like Apple II catalog arrangers, but automatically) + For subdirectories, look at the files they contain and if warranted + reclassify directory into image, audio, or video group. + * normalize: fold case for most groups (rather than all files starting + with an uppercase letter followed by all lowercase files), ignore + initial the/an/a, treat various word separators (space . _ -) as + equivalent + * numbers ordered properly (8.jpg before 10.jpg — no need for leading 0s + just for sorting) + * mark + * important (highlight in inverse colors) + * autosearch for keywords, such as "urgent" or "password" + * quickly see what's new by looking at recently changed files (think red + hot) + or recent relative to other files in that directory (think once hot now + still glowing orange) + * → files read relatively recently. The file you worked with more + recently than the others is often the one you're looking for now. + * large files relative to other files in that directory (indent by a + space — easy to pick out against column edge) + e.g., largest fonts may have CJK or extensive Unicode, largest among + source code may be site of heavy lifting, in directory of directories + call out ones with most files + * classification by trailing character (like ls -F): directory/, link->, + executable*, special_ + * colorize directory, executable*, special (like ls -G, though more + subtle since have groupings and warnings) + * info + * spot info: brief, particularly relevant additional information on a + highly limited number of files. Since few files are targeted, this is + fast and avoids visual clutter. Standard spot info details the recently + read (-age), recently changed (<age, with < implying it may be earlier + if a download or sloppy copy reset the last modified time), and + relatively large (size-in-bytes). Per-file customizations can display, + for example, latest build time and build number next to Ant build.xml, + count of critical bugs filed against source code file, number of lines + in TODO list, warning if HTML has not been validated, you name it. + * /number of files in subdirectories, which can be a useful if rough + survey (this is not slow) + e.g., only 2 files, 1000 files, TOSORT/27, tests/27, Yosemite 2007 + photos/316 vs Detroit photos/2 + * summary line with counts and totals. Includes a count of .dotfiles, + which are rare outside of the home directory. + * filter + * ignore clutter: Emacs auto backup (like GNU ls -B), generated (Java + .class, C .o), C .h, Macintosh Desktop DB, TAGS + * identify series (like audiobook ch 01.mp3 ... audiobook ch 27.mp3) and + condense to first one plus count + e.g., DSC00423.jpg, DSC00424.jpg, DSC00427.jpg ... DSC01072.jpg ⇒ + DSC00423.jpg...227. Also look at /dev. + * elision of shared prefixes reduces the amount of text to read and + implicitly clusters similar files. Here's one spectacular application. + * distill: If you are already familiar with a directory or it is very + large, use the -only command-line option to distill the listing to only + distinctive files. A file is considered distinctive if it's: recently + changed, recently read, a warning, or spot info. sl -only on /usr/bin + and OS X /Library/Fonts can be interesting. + * layout + * column widths tailored to what's needed by individual columns (as + opposed to uniform width by ls dictated by the single longest filename + in the directory), giving a more natural appearance and freeing space + for more columns + * if group title would be at bottom of column, bump to top of next column + if room + * shorten very f...ing long names if necessary to achieve multiple + columns. Shortened names retain the first characters of the file, file + suffix, and the first number which is usually a series number or year + or video resolution (1080p). + * warnings + * broken link X (base file moved, renamed, or deleted): symlink, ~ file + from Emacs backup or CVS previous version + * not readable by current user + * directory Writable by public + * directory not searchable/enterable (executable permission not set) by + current user + * peculiar permissions: owner can't read, group or public can write or + execute but not read, or owner has less permission than group or + public. For example, a dropbox directory may display permissions + rwx-wx-wx + * special permission bits: setuid, setgid, sticky. These are not errors, + but something to be aware of. + * file 0-length or directory is empty, directory contains only 1 file + (Strunk and White: "omit needless hierarchy") + * file has 2 or more ↠hard links. Under normal conditions, a file has + exactly 1 (from its parent directory). + * file changed vis-a-vis version control: either local copy has been + edited and needs to be uploaded^ to repository, or another worker + updated the repository rendering the local copy stale and in need of + downloadingv (stale files checked only in local repositories, not + remote servers, for performance). Support for RCS and CVS is built in, + and you can customize to add support for others. + +sl does not replace ls. Use ls to see all files and full metadata. + +Software + +for OS X, Solaris, Unix, and GNU/Linux +Licensed under the GNU Public License version 3. NO WARRANTY. + +Install: + 1. Download software, probably to /usr/local/bin or ~/bin. + * v1.1.2 of February 16. Support filenames that are not UTF-8 and not + ASCII (thanks Christian Neukirchen). + * v1.1 of February 12. Support file sizes larger than 4GB on 32-bit + systems (thanks Giuseppe Merigo), tightened tolerances, new feature: + autosearch. + * v1.0 of January 26, 2012 + 2. From the command line: + + chmod +x download-dir/sl + unalias sl + rehash + + 3. Install Tcl, if needed (which tclsh comes up empty). Install into + /usr/local/bin or change the first line of the sl script. Tcl is already + installed in OS X. + +Use: Now more-useful listings are as convenient to type as the usual ls. + + sl directory-path + +Convenience: Automatically see an overview and interesting files when switching +to a new directory: + + alias cd 'cd \!*; sl' + alias pd 'pushd \!*; sl' + alias pdo 'pushd \!*; sl -only' + +Customization + +Customization is done via a startup file, at the path ~/.sl.tcl. You can control +colors, new suffixes, localization of the most used text, switches that control +system operation, and even exactly what is shown for every file. For example, +here's a custom color scheme that makes files and directories brighter and +blends the text annotations into the background. + +The startup file is executed as Tcl code, so you can implement substantial +changes, such as adding support for another version control system. Rather than +hacking the source code, it is better to put customizations in the startup file +so that you can easily update to new versions without reapplying your hacks. Tcl +lets you go so far as redefining whole procedures, so any change you want can be +done in the startup file. + * .sl.tcl sample startup file, download to your home directory. It shows how + to make many of the most likely changes, as well as how to turn on features + that are too mind blowing to be the default settings, including prefix and + suffix elision. + +Support + +Troubleshooting: + * If you see lots of garbage that looks like ^[[31m, enable color for your + terminal or turn off color in your startup file. + * To change colors or bold on OS X, use Terminal's Preferences. Be sure to + pick a font that has a bold variation, such as Menlo. + * To view color output with less, set the LESS environment variable to include + --RAW-CONTROL-CHARS. + * Error reported no such file or directory, but file definitely exists. If you + have a legacy filesystem with filenames that are not encoded in Unicode + UTF-8 (or ASCII, which is a subset of UTF-8), you should migrate the names + to UTF-8 with a tool such as convmv. sl tries to handle this situation, but + for paths passed to it on the command line it is already too late. + * Previously, transposing the letters of ls was a misspelling. In some + systems, it resulted in a Command not found error. Some shells prepared for + this and aliased the transposition and other misspellings to in effect + autocorrect to what the user meant to type. If the output still looks like + ls, it's probably an alias. You can unalias in open terminals and take out + the line in the shell startup file. In another case, a Linux distribution + surprised you with ASCII art of a train. You can delete it, or if an ASCII + train is a key part of your problem-solving toolkit you can rename it. + +Known bugs: + * On OS X, the Spotlight search engine indexes the contents of files. As a + side effect of reading the content of a file, the file system updates the + file's last accessed time (atime). Because Spotlight is continuously + indexing, often within seconds of a file being changed, almost all files + have very recent atimes. For sl, this makes the atime useless for showing + recently accessed files: because everybody's special, nobody's special. + Spotlight should consider its work to be stealthy and reset the atime. + * Some file systems do not update atime, which is used to determine recently + read files. + +Send suggestions and bug reports to + + ---------------------------------------------------------------------------- + +Invented by Tom Phelps on December 30, 2011. diff --git a/system/Sl/Sl.1 b/system/Sl/Sl.1 new file mode 100644 index 0000000000..2bf8b8e26c --- /dev/null +++ b/system/Sl/Sl.1 @@ -0,0 +1,110 @@ +.\" Man page generated from reStructuredText. +. +.TH SL 1 "2020-11-13" "1.1.3" "SlackBuilds.org" +.SH NAME +Sl \- ls with enhancements +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for Sl(1) man page. Convert with: +. +.\" rst2man.py Sl.rst > Sl.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.SH SYNOPSIS +.sp +Sl [\fB\-1\fP] [\fB\-a\fP] [\fB\-atime\fP] [\fB\-only\fP] [\fB\-startup\fP] \fIstartup\-file\fP [\fB\-width\fP] \fIterminal\-width\fP [\fB\-log\fP] [\fB\-version\fP] +.SH SBO NOTE +.sp +\fBSl\fP may also be run as \fBsl\fP, unless \fIgames/sl\fP is installed. The +documentation here uses the lowercase version of the name. +.SH DESCRIPTION +.sp +sl takes the most common use of Unix ls, to display the files in a +directory compactly in multiple columns, and makes it substantially +more useful. +.sp +sl groups files by purpose so you can mentally organize many files +quickly; for instance, it collects HTML and PHP files together, as +opposed to leaving them mixed up with supporting images, CSS, and +JavaScript. sl points out interesting files, which include those that +have been recently modified, read relatively recently, are relatively +large, have warnings, or need to be checked in to or out of version +control. +.sp +sl is also aesthetically pleasing due to attention to layout and +filtering as well as limiting color and text annotations to salient +information. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \fB\-1\fP +Single column output (same as ls) +.TP +.B \fB\-a\fP +Show hidden (dot) files (same as ls) +.TP +.B \fB\-atime\fP +Use access time instead of modification time, for marking "recent" files. +.TP +.B \fB\-only\fP +Don\(aqt show summary (e.g. "6 files, 11K") at the end of the output +.TP +.B \fB\-startup\fP \fIfile.tcl\fP +Use this startup file instead of \fI~/.sl.tcl\fP\&. +.TP +.B \fB\-width\fP \fIterminal\-width\fP +Assume the terminal is this many columns wide. Default is to query the +terminal via \fBstty(1)\fP, or the \fB$COLUMNS\fP environment variable. +.TP +.B \fB\-log\fP +Print some debugging info (probably only useful if you\(aqre hacking sl\(aqs code) +.TP +.B \fB\-version\fP +Output version number +.UNINDENT +.SH FILES +.INDENT 0.0 +.TP +.B \fB~/.sl.tcl\fP +Startup file. See /usr/doc/Sl\-1.1.3/sl.tcl.example. +.UNINDENT +.SH COPYRIGHT +.sp +sl is licensed under the GNU Public License version 3. +.SH AUTHORS +.sp +sl was written by Tom Phelps. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +The complete documentation: /usr/doc/Sl\-1.1.3/README.upstream +.\" Generated by docutils manpage writer. +. diff --git a/system/Sl/Sl.SlackBuild b/system/Sl/Sl.SlackBuild new file mode 100644 index 0000000000..6dfc1440e3 --- /dev/null +++ b/system/Sl/Sl.SlackBuild @@ -0,0 +1,52 @@ +#!/bin/sh + +# Slackware build script for Sl + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# There's already an "sl" on SBo, so this is named Sl. The version number +# comes from the -version option. + +PRGNAM=Sl +VERSION=${VERSION:-1.1.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +SRCNAM="sl" + +PKGBIN=$PKG/usr/bin +PKGMAN1=$PKG/usr/man/man1 +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +PKGINST=$PKG/install + +set -e + +rm -rf $PKG +mkdir -p $OUTPUT $PKGBIN $PKGDOC $PKGMAN1 $PKGINST + +# Look, Ma, no source directory! +cat $SRCNAM > $PKGBIN/$PRGNAM +chmod 755 $PKGBIN/$PRGNAM + +gzip -9c < $PRGNAM.1 > $PKGMAN1/$PRGNAM.1.gz + +# README.upstream is just a text rendition of the homepage, sl.tcl-example +# is linked to by the homepage. +cat README.upstream > $PKGDOC/README.txt +cat sl.tcl.example > $PKGDOC/sl.tcl.example +cat README > $PKGDOC/README_SBo.txt +cat $PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild + +cat slack-desc > $PKGINST/slack-desc +cat doinst.sh > $PKGINST/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/Sl/Sl.info b/system/Sl/Sl.info new file mode 100644 index 0000000000..37bd254292 --- /dev/null +++ b/system/Sl/Sl.info @@ -0,0 +1,10 @@ +PRGNAM="Sl" +VERSION="1.1.3" +HOMEPAGE="http://web.archive.org/web/20131228142311/http://practicalthought.com/sl/" +DOWNLOAD="http://web.archive.org/web/20150726011829/http://practicalthought.com:80/sl/sl" +MD5SUM="ed4c22a531e957c95df5f41206d6ed2f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/Sl/Sl.rst b/system/Sl/Sl.rst new file mode 100644 index 0000000000..c6d417d809 --- /dev/null +++ b/system/Sl/Sl.rst @@ -0,0 +1,101 @@ +.. RST source for Sl(1) man page. Convert with: +.. rst2man.py Sl.rst > Sl.1 +.. rst2man.py comes from the SBo development/docutils package. + +.. |version| replace:: 1.1.3 +.. |date| date:: + +== +Sl +== + +-------------------- +ls with enhancements +-------------------- + +:Manual section: 1 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +Sl [**-1**] [**-a**] [**-atime**] [**-only**] [**-startup**] *startup-file* [**-width**] *terminal-width* [**-log**] [**-version**] + +SBO NOTE +======== + +**Sl** may also be run as **sl**, unless *games/sl* is installed. The +documentation here uses the lowercase version of the name. + +DESCRIPTION +=========== + +sl takes the most common use of Unix ls, to display the files in a +directory compactly in multiple columns, and makes it substantially +more useful. + +sl groups files by purpose so you can mentally organize many files +quickly; for instance, it collects HTML and PHP files together, as +opposed to leaving them mixed up with supporting images, CSS, and +JavaScript. sl points out interesting files, which include those that +have been recently modified, read relatively recently, are relatively +large, have warnings, or need to be checked in to or out of version +control. + +sl is also aesthetically pleasing due to attention to layout and +filtering as well as limiting color and text annotations to salient +information. + +OPTIONS +======= + +**-1** + Single column output (same as ls) + +**-a** + Show hidden (dot) files (same as ls) + +**-atime** + Use access time instead of modification time, for marking "recent" files. + +**-only** + Don't show summary (e.g. "6 files, 11K") at the end of the output + +**-startup** *file.tcl* + Use this startup file instead of *~/.sl.tcl*. + +**-width** *terminal-width* + Assume the terminal is this many columns wide. Default is to query the + terminal via **stty(1)**, or the **$COLUMNS** environment variable. + +**-log** + Print some debugging info (probably only useful if you're hacking sl's code) + +**-version** + Output version number + +FILES +===== + +**~/.sl.tcl** + Startup file. See /usr/doc/Sl-|version|/sl.tcl.example. + +COPYRIGHT +========= + +sl is licensed under the GNU Public License version 3. + +AUTHORS +======= + +sl was written by Tom Phelps. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. + +SEE ALSO +======== + +The complete documentation: /usr/doc/Sl-|version|/README.upstream diff --git a/system/Sl/doinst.sh b/system/Sl/doinst.sh new file mode 100644 index 0000000000..604a5c77f7 --- /dev/null +++ b/system/Sl/doinst.sh @@ -0,0 +1,8 @@ +# If there's no sl link, take over: +if [ ! -r usr/games/sl ]; then + ( cd usr/bin ; rm -rf sl ) + ( cd usr/bin ; ln -sf Sl sl ) + ( cd usr/man/man1 ; rm -rf sl.1.gz ) + ( cd usr/man/man1 ; ln -sf Sl.1.gz sl.1.gz ) +fi + diff --git a/system/Sl/sl.tcl.example b/system/Sl/sl.tcl.example new file mode 100644 index 0000000000..d5e0adf99d --- /dev/null +++ b/system/Sl/sl.tcl.example @@ -0,0 +1,110 @@ +# +# runtime configuration file for sl (http://www.PracticalThought.com/sl/) +# + + + +# 1. override variables + +# turn off color +#set COLORIZE 0 + +# if your terminal supports Unicode characters, use them +set I18N(...) "\u2026" + +set SWITCH(title) 1 ;# turn on prettyname +set SWITCH(nosfx) 1 ;# once you know it's audio or video, don't care what arcane file format it is +set SWITCH(prefix) 3 ;# turn on prefix elision + +# if your terminal supports 256 colors, these may be preferable +# For other color codes, see colortest (http://www.vim.org/scripts/script.php?script_id=1349). +array set STYLE { + file ";38;5;28" dir ";38;5;20" + relrec,file ";38;5;202" relrec,dir ";38;5;202" + warning ";38;5;196" + post ";38;5;232" +} + + +# add names to highlight or not show at all +#append NOTABLE {|TODO$|notes|TOSORT} +#append IGNORE {|^(tmp|old|obsolete|ignore|bkup)$} + +#set K 1000; # set K/M/G/T size suffixes to base 10 vs base 2 + +# set TIME(recent) [expr $TIME(DAY)*2] + +#set COLSEP 4 +#set NAMEMIN 1000; # turn off name shortening + +# see supporting files like C .h and .o +#set SWITCH(ignore) 2 + +# consider .xml a document, not data +#set EQ(.xml) doc + +# some Linux file systems do not update atime, so turn off to avoid stale information +#set SWITCH(relread) 0 + +# L10N +set I18N(file) fecho + + + +# 2. per file hook to override properties +# startup file gets tuple for each file fully loaded with data, just before display, to modify as he pleases +proc perfile {dir tuple} { + global EQ + + # a. unpack + lassign $tuple tail sfx type group sortkey style pre display warning post size mtime atime + + + # b. your changes here + + # example: negate dir reclassification + if {$type=="directory"} {set group "dir"} + + # example: show #lines of selected file + if {$tail=="sl" && $type=="file"} { + append post " [lindex [exec wc sl] 0]l" + + # example: on Ant build.xml, show date and number of last build (<buildnumber /> task) + } elseif {$tail=="build.xml" && [file readable [set f "$dir/build.number"]]} { + set fid [open $f]; set txt [read $fid]; close $fid +#puts $txt + regexp {build.number=(\d+)} $txt all num + if {$num!=""} {append post " #$num"} + append post "[reltime [file mtime $f]]" + } + + # example: auto search for filename matching regexp and highlight (show in black on magenta background) + #if {[regexp -nocase {license|password} $tail]} {set style ";30;46"} + + # example: local naming convention that puts date at start of file in form yyyymmdd-filename, + # but problematic for sorting by Tcl lsort -dictionary, so reformat + regsub {^(19|20)(\d\d)(\d\d)(\d\d\D)} $sortkey {\1\2.\3.\4} sortkey + regsub {^(19|20)(\d\d)(\d\d\D)} $sortkey {\1\2.\3} sortkey + + + # c. repack + return [list $tail $sfx $type $group $sortkey $style $pre $display $warning $post $size $mtime $atime] +} + + + +# 3. redefine procs + +#proc vc {} ... + +# turn off series construction +#set SWITCH(series) 0 + +# change how names are shortened +#proc shorten {txt w} {} + +# classify dir as plain dir, not audio/video and not separate uppercase/lowercase +#proc classifydir {dir tail l} {return "dir"} + +# change evaluation of what constitutes a distinctive file for -only +#proc distinctive {tuple} {return 1} diff --git a/system/Sl/slack-desc b/system/Sl/slack-desc new file mode 100644 index 0000000000..4b629ecc80 --- /dev/null +++ b/system/Sl/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------------------------------------------------------| +Sl: Sl (ls with enhancements) +Sl: +Sl: sl takes the most common use of Unix ls, to display the files in a +Sl: directory compactly in multiple columns, and makes it substantially +Sl: more useful. +Sl: +Sl: sl groups files by purpose so you can mentally organize many files +Sl: quickly; for instance, it collects HTML and PHP files together, as +Sl: opposed to leaving them mixed up with supporting images, CSS, and +Sl: JavaScript. +Sl: diff --git a/system/Solaar/README b/system/Solaar/README new file mode 100644 index 0000000000..cb67a12858 --- /dev/null +++ b/system/Solaar/README @@ -0,0 +1,26 @@ +Solaar is a Linux device manager for Logitech's Unifying Receiver +peripherals. It is able to pair/unpair devices to the receiver, and for +most devices read battery status. + +It comes in two flavors, command-line and GUI. Both are able to list the +devices paired to a Unifying Receiver, show detailed info for each +device, and also pair/unpair supported devices with the receiver. + +Solaar will detect all devices paired with your Unifying Receiver, and +at the very least display some basic information about them. For some +devices, extra settings (usually not available through the standard +Linux system configuration) are supported. + +By default, the udev rule +/etc/udev/rules.d/42-logitech-unifying-receiver.rules +allows all members of the plugdev group to have read/write access to the +Unifying Receiver device. Therefore, make sure all desktop users are +part of the plugdev group: +usermod -a -G plugdev <username> + +After installation, you must physically remove the Unifying Receiver and +re-insert it for the device node permissions to take effect for the +first time. + +NOTE: As of 1.0.2 Solaar has moved to python3, so all of its +dependencies must be built with python3 support. diff --git a/system/Solaar/Solaar.SlackBuild b/system/Solaar/Solaar.SlackBuild new file mode 100644 index 0000000000..02f2eb1027 --- /dev/null +++ b/system/Solaar/Solaar.SlackBuild @@ -0,0 +1,78 @@ +#!/bin/sh + +# Slackware build script for Solaar + +# Copyright 2019-2020 Erich Ritz, Scottsdale, Arizona, USA +# 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. + +PRGNAM=Solaar +VERSION=${VERSION:-1.0.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +if [ -e $CWD/$VERSION.tar.gz ]; then + tar xvf $CWD/$VERSION.tar.gz +else + tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +fi +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 {} \; + +python3 setup.py install --root=$PKG + +mkdir -p $PKG/etc/udev/rules.d +cp -a rules.d/42-logitech-unify-permissions.rules $PKG/etc/udev/rules.d + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING COPYRIGHT ChangeLog 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:-tgz} diff --git a/system/Solaar/Solaar.info b/system/Solaar/Solaar.info new file mode 100644 index 0000000000..b42550bf28 --- /dev/null +++ b/system/Solaar/Solaar.info @@ -0,0 +1,10 @@ +PRGNAM="Solaar" +VERSION="1.0.4" +HOMEPAGE="https://pwr-solaar.github.io/Solaar/" +DOWNLOAD="https://github.com/pwr-Solaar/Solaar/archive/1.0.4/Solaar-1.0.4.tar.gz" +MD5SUM="da7074a03814b42372b6aea31078c9f7" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="pyudev pygobject3-python3" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com" diff --git a/system/fs-uae-arcade/doinst.sh b/system/Solaar/doinst.sh index 65c7e2eeb9..65c7e2eeb9 100644 --- a/system/fs-uae-arcade/doinst.sh +++ b/system/Solaar/doinst.sh diff --git a/system/Solaar/slack-desc b/system/Solaar/slack-desc new file mode 100644 index 0000000000..d532bc432d --- /dev/null +++ b/system/Solaar/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------------------------------------------------------| +Solaar: Solaar (Linux device manager for Logitech's Unifying Receiver periphs) +Solaar: +Solaar: Solaar is a Linux device manager for Logitech's Unifying Receiver +Solaar: peripherals. It is able to pair/unpair devices to the receiver, and +Solaar: for most devices read battery status. +Solaar: +Solaar: It comes in two flavors, command-line and GUI. Both are able to list +Solaar: the devices paired to a Unifying Receiver, show detailed info for each +Solaar: device, and alos pair/unpair supported devices with the receiver. +Solaar: +Solaar: Homepage: https://pwr-solaar.github.io/Solaar/ diff --git a/system/TLP/49tlp b/system/TLP/49tlp new file mode 100644 index 0000000000..bfe0e81af1 --- /dev/null +++ b/system/TLP/49tlp @@ -0,0 +1,22 @@ +#!/bin/sh +# tlp - handle suspend/hibernate/resume tasks +# +# Copyright (c) 2018 Thomas Koch <linrunner at gmx.net> +# This software is licensed under the GPL v2 or later. + +. "${PM_FUNCTIONS}" + +case $1 in + hibernate|suspend) + tlp suspend + ;; + + thaw|resume) + tlp resume + ;; + + *) exit $NA + ;; +esac + +exit 0 diff --git a/system/TLP/README b/system/TLP/README index 3430cb7ecc..74d9bc935d 100644 --- a/system/TLP/README +++ b/system/TLP/README @@ -1,12 +1,12 @@ TLP implements advanced power management for Linux. -TLP is a pure command line tool with automated background tasks. -It does not contain a GUI. -Notes: -Remove any power saving settings/scripts (e.g.: in /etc/rc.local) or -laptop-mode-tools prior installing or TLP may not work properly +It is a command line tool with automated background tasks, +does not contain a GUI. -See README.SLACKWARE for more information about post-installation script +Remove any power saving settings/scripts (e.g.: in /etc/rc.local), and +uninstall laptop-mode-tools prior installing or TLP may not work properly. + +See README.SLACKWARE for more information about post-installation script. An additional configuration is available for Thinkpads. See the website for more details. diff --git a/system/TLP/TLP.SlackBuild b/system/TLP/TLP.SlackBuild index 494fb8fa5c..a69c0c6db1 100644 --- a/system/TLP/TLP.SlackBuild +++ b/system/TLP/TLP.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for TLP -# Copyright 2013-2017 Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Copyright 2013-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=TLP -VERSION=${VERSION:-1.1} +VERSION=${VERSION:-1.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,6 +81,9 @@ sed 's|. \/lib\/lsb\/init-functions|#. \/lib\/lsb\/init-functions|' -i tlp.init export TLP_MAN=/usr/man make install-tlp install-man DESTDIR=$PKG +# Install tlp pm-utils hook as we dont have elogind +install -D -m 755 $CWD/49tlp $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/49tlp + # Don't clobber configs mv $PKG/etc/default/tlp $PKG/etc/default/tlp.new @@ -92,7 +95,7 @@ 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 COPYING LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION +cp COPYING LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/TLP/TLP.info b/system/TLP/TLP.info index d6ad3fdae4..bd380f406f 100644 --- a/system/TLP/TLP.info +++ b/system/TLP/TLP.info @@ -1,8 +1,8 @@ PRGNAM="TLP" -VERSION="1.1" +VERSION="1.2.2" HOMEPAGE="https://github.com/linrunner/TLP" -DOWNLOAD="http://github.com/linrunner/TLP/archive/1.1.tar.gz" -MD5SUM="02c13e8023317e2e2df4742129ecee56" +DOWNLOAD="https://github.com/linrunner/TLP/archive/1.2.2.tar.gz" +MD5SUM="23dc1b2edcf4d01a37c67b12f023df22" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/TLP/slack-desc b/system/TLP/slack-desc index 7a9b772bab..16b264494e 100644 --- a/system/TLP/slack-desc +++ b/system/TLP/slack-desc @@ -15,5 +15,5 @@ TLP: life, so you may just install and forget it. TLP: Nevertheless TLP is highly customizable to fulfil your specific TLP: requirements. TLP: -TLP: Website - http://linrunner.de/en/tlp/tlp.html +TLP: Website - https://linrunner.de/en/tlp/tlp.html TLP: diff --git a/system/TermRecord/TermRecord.SlackBuild b/system/TermRecord/TermRecord.SlackBuild index e294f0eb14..ca45787fd1 100644 --- a/system/TermRecord/TermRecord.SlackBuild +++ b/system/TermRecord/TermRecord.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for TermRecord -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=TermRecord -VERSION=${VERSION:-1.2.4} +VERSION=${VERSION:-1.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/TermRecord/TermRecord.info b/system/TermRecord/TermRecord.info index 7495d05a4d..1fa107f82d 100644 --- a/system/TermRecord/TermRecord.info +++ b/system/TermRecord/TermRecord.info @@ -1,8 +1,8 @@ PRGNAM="TermRecord" -VERSION="1.2.4" +VERSION="1.2.5" HOMEPAGE="https://github.com/theonewolf/TermRecord" -DOWNLOAD="https://pypi.python.org/packages/source/T/TermRecord/TermRecord-1.2.4.tar.gz" -MD5SUM="bb416b214c6c7d8dc63ae42c6b1e8460" +DOWNLOAD="https://files.pythonhosted.org/packages/54/72/59139ff485c52ea829fb8e3c846c04c01ef513ad2b3f07d0594a4b6e9bad/TermRecord-1.2.5.tar.gz" +MD5SUM="3fbda3cfbde39f06033954c3d561894f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="Jinja2" diff --git a/system/USBdev/USBdev.SlackBuild b/system/USBdev/USBdev.SlackBuild index 324f1d110d..2b2f59af4a 100644 --- a/system/USBdev/USBdev.SlackBuild +++ b/system/USBdev/USBdev.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for USBdev -# Copyright 2016-2017 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=USBdev -VERSION=${VERSION:-2017.08.22} +VERSION=${VERSION:-2019.11.05} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,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 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$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 diff --git a/system/USBdev/USBdev.info b/system/USBdev/USBdev.info index 6fb9709902..8c48c4a196 100644 --- a/system/USBdev/USBdev.info +++ b/system/USBdev/USBdev.info @@ -1,10 +1,10 @@ PRGNAM="USBdev" -VERSION="2017.08.22" -HOMEPAGE="https://github.com/dslackw/USBdev" -DOWNLOAD="https://github.com/dslackw/USBdev/archive/v2017.08.22/USBdev-2017.08.22.tar.gz" -MD5SUM="0615330e9badca607a8e05d55db1c3a4" +VERSION="2019.11.05" +HOMEPAGE="https://gitlab.com/dslackw/USBdev" +DOWNLOAD="https://gitlab.com/dslackw/USBdev/-/archive/2019.11.05/USBdev-2019.11.05.tar.gz" +MD5SUM="b64b627197a6794869f328d3a3ae4030" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pyusb" +REQUIRES="python3 pyusb" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/system/USBdev/slack-desc b/system/USBdev/slack-desc index 1d4b5f609a..902a35aa13 100644 --- a/system/USBdev/slack-desc +++ b/system/USBdev/slack-desc @@ -13,7 +13,7 @@ USBdev: the USB devices that is connected before and after once you connect USBdev: to the further doors USB. USBdev use linux-usb.org repository to get USBdev: data devices. USBdev: -USBdev: Homepage: https://github.com/dslackw/USBdev +USBdev: Homepage: https://gitlab.com/dslackw/USBdev USBdev: USBdev: USBdev: diff --git a/system/ZoneMinder/README b/system/ZoneMinder/README index d96eb97904..44db1da50e 100644 --- a/system/ZoneMinder/README +++ b/system/ZoneMinder/README @@ -7,10 +7,10 @@ be controlled via web or semi-automatically using a variety of protocols. It can also be integrated into a home automation system via X.10 or other protocols. This build includes cambozola and jscalendar. -Optional dependencies are ffmpeg (video streaming and recoding support), -perl-Archive-Zip (automatic event uploading), perl-X10 -(integration with X10-based home automation), perl-Device-SerialPort -(RS232/RS485 PTZ camera control), perl-MIME-Lite, and perl-MIME-Entity -(automatic event mail notification). +Optional dependencies are php-apcu (to enable the ZoneMinder API), +perl-Archive-Zip (automatic event uploading), perl-X10 (integration with +X10-based home automation), perl-Device-SerialPort (RS232/RS485 PTZ camera +control), perl-MIME-Lite, and perl-MIME-Entity (automatic event mail +notification). See README.SLACKWARE for configuration information. diff --git a/system/ZoneMinder/ZoneMinder.SlackBuild b/system/ZoneMinder/ZoneMinder.SlackBuild index 1423b69fc4..222d092dc5 100644 --- a/system/ZoneMinder/ZoneMinder.SlackBuild +++ b/system/ZoneMinder/ZoneMinder.SlackBuild @@ -34,6 +34,7 @@ DOCGRP=${DOCGRP:-apache} DOCROOT=${DOCROOT:-"/srv/httpd/htdocs/zm"} CGIROOT=${CGIROOT:-"/srv/httpd/cgi-bin"} CACHEDIR=${CACHEDIR:-"/var/cache/ZoneMinder"} +CONTENTDIR=${CONTENTDIR:-"/var/lib/ZoneMinder"} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -80,6 +81,12 @@ 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 {} \; +# Fails to encode mp4 videos without this patch +patch -p0 < $CWD/fix_video_file_format.patch + +# Applies upstream commits 4937a686 and 4da95369 +patch -p0 < $CWD/fix_zone_area_calc.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ cd $TMP/$PRGNAM-$VERSION @@ -90,7 +97,8 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DZM_WEBDIR=$DOCROOT \ -DZM_CGIDIR=$CGIROOT \ -DZM_WEB_USER=$DOCOWN \ - -DZM_WEB_GROUP=$DOCGRP . + -DZM_WEB_GROUP=$DOCGRP \ + -DZM_CONTENTDIR=$CONTENTDIR . make make install DESTDIR=$PKG INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3 @@ -128,7 +136,7 @@ mkdir -p $PKG$CACHEDIR install -d -o $DOCOWN -g $DOCGRP $PKG$CACHEDIR for DIR in events images sound; do - install -d -o $DOCOWN -g $DOCGRP $PKG/var/lib/ZoneMinder/$DIR + install -d -o $DOCOWN -g $DOCGRP $PKG/$CONTENTDIR/$DIR done # Install logrotate script diff --git a/system/ZoneMinder/ZoneMinder.info b/system/ZoneMinder/ZoneMinder.info index 2bae7ed3f6..5e2c800c75 100644 --- a/system/ZoneMinder/ZoneMinder.info +++ b/system/ZoneMinder/ZoneMinder.info @@ -1,7 +1,7 @@ PRGNAM="ZoneMinder" VERSION="1.32.2" HOMEPAGE="https://www.ZoneMinder.com" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ZoneMinder-1.32.2.tar.gz \ +DOWNLOAD="https://slackware.uk/~urchlay/src/ZoneMinder-1.32.2.tar.gz \ http://www.andywilcock.com/code/cambozola/cambozola-0.936.tar.gz \ https://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip" MD5SUM="fc986fcb7601d3fe463a2970ead67cf7 \ @@ -9,6 +9,6 @@ MD5SUM="fc986fcb7601d3fe463a2970ead67cf7 \ 10f2160fe68294013efcd1473cd36f72" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-Sys-MemInfo perl-Date-Manip perl-Sys-Mmap perl-LWP-Protocol-https SDL2 perl-JSON-MaybeXS perl-Number-Bites-Human perl-TimeDate perl-Sys-CPU" +REQUIRES="perl-Sys-MemInfo perl-Date-Manip perl-Sys-Mmap perl-LWP-Protocol-https SDL2 perl-JSON-MaybeXS perl-Number-Bites-Human perl-TimeDate perl-Sys-CPU ffmpeg libmp4v2 x264" MAINTAINER="Geno Bob" EMAIL="GenoBob@gmail.com" diff --git a/system/ZoneMinder/fix_video_file_format.patch b/system/ZoneMinder/fix_video_file_format.patch new file mode 100644 index 0000000000..f238c77f37 --- /dev/null +++ b/system/ZoneMinder/fix_video_file_format.patch @@ -0,0 +1,11 @@ +--- src/zm_event.cpp 2019-01-21 23:17:19.881961455 -0500 ++++ src/zm_event.cpp.new 2019-01-21 23:17:38.452315254 -0500 +@@ -196,7 +196,7 @@ + + if ( monitor->GetOptVideoWriter() != 0 ) { + snprintf(video_name, sizeof(video_name), "%" PRIu64 "-%s", id, "video.mp4"); +- snprintf(video_file, sizeof(video_file), staticConfig.video_file_format, path, video_name); ++ snprintf(video_file, sizeof(video_file), "%s/%s", path, video_name); + Debug(1,"Writing video file to %s", video_file ); + + /* X264 MP4 video writer */ diff --git a/system/ZoneMinder/fix_zone_area_calc.patch b/system/ZoneMinder/fix_zone_area_calc.patch new file mode 100644 index 0000000000..d55488071d --- /dev/null +++ b/system/ZoneMinder/fix_zone_area_calc.patch @@ -0,0 +1,35 @@ +--- web/skins/classic/views/js/zone.js 2019-01-23 00:24:26.094085919 -0500 ++++ web/skins/classic/views/js/zone.js.new 2019-01-23 00:25:13.871710907 -0500 +@@ -347,6 +347,7 @@ + zone['Points'][index].x = x; + var Point = $('zonePoly').points.getItem(index); + Point.x = x; ++ updateArea(); + } + + function updateY( index ) { +@@ -359,6 +360,7 @@ + zone['Points'][index].y = y; + var Point = $('zonePoly').points.getItem(index); + Point.y = y; ++ updateArea(); + } + + function saveChanges( element ) { +@@ -697,11 +699,12 @@ + var n_coords = coords.length; + var float_area = 0.0; + +- for ( i = 0, j = n_coords-1; i < n_coords; j = i++ ) { +- var trap_area = ( ( coords[i].x - coords[j].x ) * ( coords[i].y + coords[j].y ) ) / 2; +- float_area += trap_area; +- //printf( "%.2f (%.2f)\n", float_area, trap_area ); ++ for ( i = 0; i < n_coords-1; i++ ) { ++ var trap_area = (coords[i].x*coords[i+1].y - coords[i+1].x*coords[i].y) / 2; ++ float_area += trap_area; + } ++ float_area += (coords[n_coords-1].x*coords[0].y - coords[0].x*coords[n_coords-1].y) / 2; ++ + return Math.round( Math.abs( float_area ) ); + } + diff --git a/system/ack/ack.SlackBuild b/system/ack/ack.SlackBuild index ceafd98e5b..7d14084397 100644 --- a/system/ack/ack.SlackBuild +++ b/system/ack/ack.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh # Slackware build script for ack -# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy + +# Copyright 2013-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ack -VERSION=${VERSION:-2.24} +VERSION=${VERSION:-3.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -37,7 +38,7 @@ set -e rm -rf $PKG mkdir -p $PKG $OUTPUT -install -m 0755 -o root -g root -D $CWD/$PRGNAM-$VERSION-single-file \ +install -m 0755 -o root -g root -D $CWD/$PRGNAM-v$VERSION \ $PKG/usr/bin/$PRGNAM mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/ack/ack.info b/system/ack/ack.info index 19a939ecb9..887de2ab3d 100644 --- a/system/ack/ack.info +++ b/system/ack/ack.info @@ -1,8 +1,8 @@ PRGNAM="ack" -VERSION="2.24" +VERSION="3.4.0" HOMEPAGE="https://beyondgrep.com" -DOWNLOAD="https://beyondgrep.com/ack-2.24-single-file" -MD5SUM="fa14a72bad20402306fe6c3f81910739" +DOWNLOAD="https://beyondgrep.com/ack-v3.4.0" +MD5SUM="f8537c7a1a89749f0130627cb7de1515" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/acpi_call/acpi_call.SlackBuild b/system/acpi_call/acpi_call.SlackBuild index 9be2bed29b..cbba19ee17 100644 --- a/system/acpi_call/acpi_call.SlackBuild +++ b/system/acpi_call/acpi_call.SlackBuild @@ -65,6 +65,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p0 < $CWD/fix-acpi-include.patch +patch -p0 < $CWD/fix-5.x-kernel.patch make KDIR=$KERNELPATH diff --git a/system/acpi_call/fix-5.x-kernel.patch b/system/acpi_call/fix-5.x-kernel.patch new file mode 100644 index 0000000000..5ed4392857 --- /dev/null +++ b/system/acpi_call/fix-5.x-kernel.patch @@ -0,0 +1,29 @@ +--- acpi_call.c.orig 2020-10-28 23:05:01.875849692 +0100 ++++ acpi_call.c 2020-10-28 23:07:50.658179392 +0100 +@@ -7,6 +7,7 @@ + #include <linux/slab.h> + #include <asm/uaccess.h> + #include <linux/acpi.h> ++#include <linux/uaccess.h> + + MODULE_LICENSE("GPL"); + +@@ -317,11 +318,18 @@ + return ret; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static struct proc_ops proc_acpi_operations = { ++ .proc_read = acpi_proc_read, ++ .proc_write = acpi_proc_write, ++}; ++#else + static struct file_operations proc_acpi_operations = { + .owner = THIS_MODULE, + .read = acpi_proc_read, + .write = acpi_proc_write, + }; ++#endif + + #else + static int acpi_proc_read(char *page, char **start, off_t off, diff --git a/system/acpitool/acpitool.SlackBuild b/system/acpitool/acpitool.SlackBuild index 2158cdd3a9..9f1d0e1865 100644 --- a/system/acpitool/acpitool.SlackBuild +++ b/system/acpitool/acpitool.SlackBuild @@ -1,6 +1,8 @@ #!/bin/sh # Copyright 2007 by ktabic (rdc@ktabic.co.uk) +# Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com> + # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that # the above copyright notice and this permission notice appear in all diff --git a/system/acpitool/acpitool.info b/system/acpitool/acpitool.info index dc3b540b34..6b9e652e62 100644 --- a/system/acpitool/acpitool.info +++ b/system/acpitool/acpitool.info @@ -6,5 +6,5 @@ MD5SUM="9e4ec55201be0be71ffbc56d38b42b57" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Rodney Cobb" -EMAIL="rdc@ktabic.co.uk" +MAINTAINER="Ricardo J. Barberis" +EMAIL="ricardo.barberis@gmail.com" diff --git a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info index af6541d4b0..30e23e99ac 100644 --- a/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info +++ b/system/adobe-source-code-pro-font/adobe-source-code-pro-font.info @@ -6,5 +6,5 @@ MD5SUM="5d11969eb0a5e243acdbcf046753aa03" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] com" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild index 8da987f567..01520ef778 100644 --- a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild +++ b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh # Copyright (c) 2012 Daniel LEVAI +# Copyright (c) 2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # * Redistribution and use in source and binary forms, with or without @@ -22,23 +23,10 @@ # 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. -# -# Currently maintained by Dugan Chen. PRGNAM=adobe-source-sans-pro-font - -# The version in the tarball -SRCVERSION=${VERSION:-1.065R-it} - -# The version in the package -VERSION=${PKG_VERSION:-2.010.ro.1.065.it} - -# The version in the untarred source directory -SRC_VERSION=2.010R-ro-1.065R-it - -SRC=${SRCVERSION}.tar.gz -SRCDIR=source-sans-pro-${SRC_VERSION} - +SRCNAM=source-sans-pro +VERSION=${VERSION:-3.006R} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,9 +42,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf ${SRCDIR} -tar xvf $CWD/$SRC || tar xvf $CWD/$SRCDIR.tar.gz -cd $SRCDIR +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 \ @@ -64,11 +52,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 {} \; -mkdir -p $PKG/usr/share/fonts/OTF/ -cp OTF/*.otf $PKG/usr/share/fonts/OTF/ +mkdir -p $PKG/usr/share/fonts/OTF +cp OTF/*.otf VAR/*.otf $PKG/usr/share/fonts/OTF/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt ReadMe.html SourceSansProReadMe.html $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info index 5d11a8ac25..f7cdb2b4ca 100644 --- a/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info +++ b/system/adobe-source-sans-pro-font/adobe-source-sans-pro-font.info @@ -1,10 +1,10 @@ PRGNAM="adobe-source-sans-pro-font" -VERSION="2.010.ro.1.065.it" +VERSION="3.006R" HOMEPAGE="http://adobe-fonts.github.io/source-sans-pro" -DOWNLOAD="https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz" -MD5SUM="5dfa6f327cdd4cb363f8887493696a4c" +DOWNLOAD="https://github.com/adobe-fonts/source-sans-pro/archive/3.006R/source-sans-pro-3.006R.tar.gz" +MD5SUM="7e8b5f1898287eb5242645abfdeb527b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] com" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info b/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info index 585ed40e45..a70ddff597 100644 --- a/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info +++ b/system/adobe-source-serif-pro-font/adobe-source-serif-pro-font.info @@ -6,5 +6,5 @@ MD5SUM="fee6b5d1fe3b21621b14fe342c32a398" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] com" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/aespipe/aespipe.SlackBuild b/system/aespipe/aespipe.SlackBuild index fcfa8c5f7a..dd20a66b2b 100644 --- a/system/aespipe/aespipe.SlackBuild +++ b/system/aespipe/aespipe.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for aespipe -# Copyright (c) 2010-2016 Markus Reichelt, Aachen, DE +# Copyright (c) 2010-2019 Markus Reichelt, Aachen, DE # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -26,8 +26,8 @@ # markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 PRGNAM=aespipe -VERSION=${VERSION:-2.4d} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.4f} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCVER="v${VERSION}" diff --git a/system/aespipe/aespipe.info b/system/aespipe/aespipe.info index 5459692675..a2ae6076d8 100644 --- a/system/aespipe/aespipe.info +++ b/system/aespipe/aespipe.info @@ -1,8 +1,8 @@ PRGNAM="aespipe" -VERSION="2.4d" +VERSION="2.4f" HOMEPAGE="http://loop-aes.sourceforge.net/" -DOWNLOAD="http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4d.tar.bz2" -MD5SUM="bcf49066053aabf9e291a00b20bc5f00" +DOWNLOAD="http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4f.tar.bz2" +MD5SUM="ed05c62c1954110f009bedda4bc1562f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/afdko/afdko.SlackBuild b/system/afdko/afdko.SlackBuild index 0ac5479534..63cc3aad8d 100644 --- a/system/afdko/afdko.SlackBuild +++ b/system/afdko/afdko.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=afdko VERSION=${VERSION:-2.5.65322} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/system/afdko/afdko.csh b/system/afdko/afdko.csh index ed45f133d1..a19e7eb286 100644 --- a/system/afdko/afdko.csh +++ b/system/afdko/afdko.csh @@ -1,7 +1,8 @@ #!/bin/csh -setenv FDK_EXE /opt/afdko/Tools/linux +set FDK_EXE = /opt/afdko/Tools/linux if ( $?PATH ) then echo :${PATH}: | grep -q :${FDK_EXE}: || setenv PATH ${PATH}:${FDK_EXE} else setenv PATH ${FDK_EXE} endif +unset FDK_EXE diff --git a/system/afdko/afdko.sh b/system/afdko/afdko.sh index 818eb40961..a2f8462cb2 100644 --- a/system/afdko/afdko.sh +++ b/system/afdko/afdko.sh @@ -5,4 +5,5 @@ if [ ! "$PATH" = "" ]; then else PATH=$FDK_EXE fi -export FDK_EXE +export PATH +unset FDK_EXE diff --git a/system/afio/README b/system/afio/README index 51e85268ab..6ff9ad41b5 100644 --- a/system/afio/README +++ b/system/afio/README @@ -1,8 +1,8 @@ -Afio makes compressed archives that are safer than compressed tar or -cpio archives, allowing better handling of input data corruption. Afio +Afio makes compressed archives that are safer than compressed tar or +cpio archives, allowing better handling of input data corruption. Afio also supports multi-volume archives during interactive operation. -Afio makes cpio archives with ASCII-formatted header information (odc). -Where the odc format cannot represent some files and file properties -that could be present on a modern UNIX filesystem, it uses an afio- +Afio makes cpio archives with ASCII-formatted header information (odc). +Where the odc format cannot represent some files and file properties +that could be present on a modern UNIX filesystem, it uses an afio- specific 'large ASCII' header for the files concerned. diff --git a/system/afio/afio.SlackBuild b/system/afio/afio.SlackBuild index a22fb9c783..c6b9c4e6ba 100644 --- a/system/afio/afio.SlackBuild +++ b/system/afio/afio.SlackBuild @@ -5,13 +5,13 @@ # Written by ruario <sbo@ruari.com> PRGNAM=afio -VERSION=${VERSION:-2.5.1} +VERSION=${VERSION:-2.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -38,7 +38,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tgz +tar xvf $CWD/v$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/afio/afio.info b/system/afio/afio.info index 161531dea5..93f2229d06 100644 --- a/system/afio/afio.info +++ b/system/afio/afio.info @@ -1,8 +1,8 @@ PRGNAM="afio" -VERSION="2.5.1" -HOMEPAGE="http://members.chello.nl/~k.holtman/afio.html" -DOWNLOAD="http://members.chello.nl/~k.holtman/afio-2.5.1.tgz" -MD5SUM="03a04d7b16684dce6c628eba5a4c7c93" +VERSION="2.5.2" +HOMEPAGE="https://github.com/kholtman/afio" +DOWNLOAD="https://github.com/kholtman/afio/archive/v2.5.2.tar.gz" +MD5SUM="2ab7c66d2b6c100aef5fce596baf2247" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/agedu/agedu.SlackBuild b/system/agedu/agedu.SlackBuild index 86fb1bc893..ad6f833c72 100644 --- a/system/agedu/agedu.SlackBuild +++ b/system/agedu/agedu.SlackBuild @@ -6,6 +6,9 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20201025 bkw: Update for v20200705.2a7d4a2. +# 20200302 bkw: Update for v20200206.963bc9d. +# 20191130 bkw: Update for v20190630.66cb14d. # 20180918 bkw: Update for v20180918.80c7beb. # 20180612 bkw: Update for v20180522.5b12791. # 20171219 bkw: Update for v20171202.8a8299e. @@ -13,7 +16,7 @@ # as upstream deletes the old version as soon as a new one is released. PRGNAM=agedu -VERSION=${VERSION:-20180918.80c7beb} +VERSION=${VERSION:-20200705.2a7d4a2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/agedu/agedu.info b/system/agedu/agedu.info index 0646ba10fe..0570282f19 100644 --- a/system/agedu/agedu.info +++ b/system/agedu/agedu.info @@ -1,8 +1,8 @@ PRGNAM="agedu" -VERSION="20180918.80c7beb" +VERSION="20200705.2a7d4a2" HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/agedu-20180918.80c7beb.tar.gz" -MD5SUM="7f4671dab1e8896b780f37166aba5f1f" +DOWNLOAD="https://slackware.uk/~urchlay/src/agedu-20200705.2a7d4a2.tar.gz" +MD5SUM="db17b0c0a7ee222e54e02e6a53ac10d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/aha/aha.SlackBuild b/system/aha/aha.SlackBuild index 3650feb9c5..360d780e10 100644 --- a/system/aha/aha.SlackBuild +++ b/system/aha/aha.SlackBuild @@ -7,13 +7,14 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ # for details. +# 20200927 bkw: update for 0.5.1 # 20181201 bkw: update for 0.5 # 20170328 bkw: update for 0.4.10.6, use 'make install' instead of manually # 20170301 bkw: update for 0.4.10.5, use long-form github URL # 20170122 bkw: update for 0.4.10.3 PRGNAM=aha -VERSION=${VERSION:-0.5} +VERSION=${VERSION:-0.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/aha/aha.info b/system/aha/aha.info index de779cecc8..ad321b92ed 100644 --- a/system/aha/aha.info +++ b/system/aha/aha.info @@ -1,8 +1,8 @@ PRGNAM="aha" -VERSION="0.5" +VERSION="0.5.1" HOMEPAGE="https://github.com/theZiz/aha" -DOWNLOAD="https://github.com/theZiz/aha/archive/0.5/aha-0.5.tar.gz" -MD5SUM="bac3269f6ec0218a62e4379ed9253c8a" +DOWNLOAD="https://github.com/theZiz/aha/archive/0.5.1/aha-0.5.1.tar.gz" +MD5SUM="ec74d076dd6c5e3a9a8b5e2cb1e2a48d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/aide/aide.SlackBuild b/system/aide/aide.SlackBuild index f0351f697b..a03e45be96 100644 --- a/system/aide/aide.SlackBuild +++ b/system/aide/aide.SlackBuild @@ -2,11 +2,11 @@ # Slackware build script for AIDE # Andy Bailey <GooseYArd@gmail.com> -# Emmanuel N. Millan <emmanueln@gmail.com> - 2018 +# Emmanuel N. Millan <emmanueln@gmail.com> - 2018,2021 PRGNAM=aide #PKGVER=`basename $PRGNAM*tar.gz .tar.gz | cut -d- -f2` -VERSION=${VERSION:-0.16} +VERSION=${VERSION:-0.17.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,6 +59,8 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ --prefix=/usr \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --with-posix-acl \ + --with-e2fsattrs \ --localstatedir=/var \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ diff --git a/system/aide/aide.info b/system/aide/aide.info index dbad654ee5..2fa8767204 100644 --- a/system/aide/aide.info +++ b/system/aide/aide.info @@ -1,8 +1,8 @@ PRGNAM="aide" -VERSION="0.16" -HOMEPAGE="https://sourceforge.net/projects/aide/" -DOWNLOAD="https://sourceforge.net/projects/aide/files/aide/0.16/aide-0.16.tar.gz" -MD5SUM="25c616f67c667acd4088747ae7f6a9a3" +VERSION="0.17.3" +HOMEPAGE="https://aide.github.io/" +DOWNLOAD="https://github.com/aide/aide/releases/download/v0.17.3/aide-0.17.3.tar.gz" +MD5SUM="b642b5da44e827da57ae24b3670e4b33" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/alacritty/6f4ad9bb4f82bfdc4d8aac883a65ddd8c6acd45d.patch.gz b/system/alacritty/6f4ad9bb4f82bfdc4d8aac883a65ddd8c6acd45d.patch.gz Binary files differdeleted file mode 100644 index c0ddc5f048..0000000000 --- a/system/alacritty/6f4ad9bb4f82bfdc4d8aac883a65ddd8c6acd45d.patch.gz +++ /dev/null diff --git a/system/alacritty/alacritty.SlackBuild b/system/alacritty/alacritty.SlackBuild index d7b5ac4b25..b776ff04fc 100644 --- a/system/alacritty/alacritty.SlackBuild +++ b/system/alacritty/alacritty.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for alacritty -# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=alacritty -VERSION=${VERSION:-0.2.3} +VERSION=${VERSION:-0.4.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,8 +69,6 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -zcat $CWD/6f4ad9bb4f82bfdc4d8aac883a65ddd8c6acd45d.patch.gz | patch -p1 - # build offline # configuration tells cargo to use the configured directory # for dependencies instead of downloading from crates.io @@ -85,318 +83,17 @@ directory = '$(pwd)/vendor' EOF # deps and versions come from Cargo.lock -# cargo vender can be used to generate the checksums mkdir vendor ( cd vendor - for dependency in adler32=1.0.3 \ - advapi32-sys=0.2.0 \ - aho-corasick=0.6.9 \ - andrew=0.1.4 \ - android_glue=0.2.3 \ - ansi_term=0.11.0 \ - approx=0.1.1 \ - approx=0.3.0 \ - argon2rs=0.2.5 \ - arraydeque=0.4.3 \ - arrayvec=0.4.7 \ - atty=0.2.11 \ - backtrace-sys=0.1.24 \ - backtrace=0.3.9 \ - base64=0.9.3 \ - bindgen=0.33.2 \ - bitflags=0.7.0 \ - bitflags=0.9.1 \ - bitflags=1.0.4 \ - blake2-rfc=0.2.18 \ - block=0.1.6 \ - build_const=0.2.1 \ - byteorder=1.2.7 \ - bytes=0.4.10 \ - bzip2-sys=0.1.6 \ - bzip2=0.3.3 \ - cc=1.0.25 \ - cexpr=0.2.3 \ - cfg-if=0.1.6 \ - cgl=0.2.3 \ - cgmath=0.16.1 \ - clang-sys=0.22.0 \ - clap=2.32.0 \ - clipboard-win=2.1.2 \ - clipboard=0.4.6 \ - cloudabi=0.0.3 \ - cmake=0.1.35 \ - cocoa=0.18.4 \ - color_quant=1.0.1 \ - constant_time_eq=0.1.3 \ - core-foundation-sys=0.2.3 \ - core-foundation-sys=0.5.1 \ - core-foundation-sys=0.6.2 \ - core-foundation=0.2.3 \ - core-foundation=0.5.1 \ - core-foundation=0.6.3 \ - core-graphics=0.13.0 \ - core-graphics=0.17.3 \ - core-text=13.1.1 \ - core-text=9.2.0 \ - crc=1.8.1 \ - crossbeam-deque=0.2.0 \ - crossbeam-deque=0.6.2 \ - crossbeam-epoch=0.3.1 \ - crossbeam-epoch=0.6.1 \ - crossbeam-utils=0.2.2 \ - crossbeam-utils=0.5.0 \ - crossbeam-utils=0.6.1 \ - deflate=0.7.19 \ - dirs=1.0.4 \ - dlib=0.4.1 \ - downcast-rs=1.0.3 \ - dtoa=0.4.3 \ - dunce=0.1.1 \ - either=1.5.0 \ - embed-resource=1.1.4 \ - encoding_rs=0.8.10 \ - env_logger=0.5.13 \ - errno-dragonfly=0.1.1 \ - errno=0.2.4 \ - error-chain=0.11.0 \ - euclid=0.17.3 \ - expat-sys=2.1.6 \ - failure=0.1.3 \ - failure_derive=0.1.3 \ - filetime=0.2.3 \ - flate2=1.0.4 \ - fnv=1.0.6 \ - font-loader=0.6.0 \ - foreign-types-shared=0.1.1 \ - foreign-types=0.3.2 \ - freetype-rs=0.19.0 \ - freetype-sys=0.7.0 \ - fsevent-sys=0.1.6 \ - fsevent=0.2.17 \ - fuchsia-zircon-sys=0.3.3 \ - fuchsia-zircon=0.3.3 \ - futures-cpupool=0.1.8 \ - futures=0.1.25 \ - gcc=0.3.55 \ - gdi32-sys=0.2.0 \ - gif=0.10.1 \ - gl_generator=0.10.0 \ - gl_generator=0.9.0 \ - gleam=0.6.6 \ - glob=0.2.11 \ - glutin=0.19.0 \ - httparse=1.3.3 \ - humantime=1.1.1 \ - hyper-tls=0.1.4 \ - hyper=0.11.27 \ - idna=0.1.5 \ - image=0.20.1 \ - inflate=0.4.3 \ - inotify-sys=0.1.3 \ - inotify=0.6.1 \ - iovec=0.1.2 \ - itoa=0.4.3 \ - jpeg-decoder=0.1.15 \ - kernel32-sys=0.2.2 \ - khronos_api=2.2.0 \ - khronos_api=3.0.0 \ - language-tags=0.2.2 \ - lazy_static=0.2.11 \ - lazy_static=1.2.0 \ - lazycell=0.4.0 \ - lazycell=1.2.0 \ - libc=0.2.43 \ - libflate=0.1.18 \ - libloading=0.5.0 \ - libz-sys=1.0.25 \ - line_drawing=0.7.0 \ - linked-hash-map=0.5.1 \ - lock_api=0.1.4 \ - log=0.3.9 \ - log=0.4.6 \ - lzw=0.10.0 \ - malloc_buf=0.0.6 \ - matches=0.1.8 \ - memchr=1.0.2 \ - memchr=2.1.1 \ - memmap=0.6.2 \ - memoffset=0.2.1 \ - mime=0.3.12 \ - mime_guess=2.0.0-alpha.6 \ - miniz_oxide=0.2.0 \ - miniz_oxide_c_api=0.2.0 \ - mio-extras=2.0.5 \ - mio-more=0.1.0 \ - mio-named-pipes=0.1.6 \ - mio-uds=0.6.7 \ - mio=0.6.16 \ - miow=0.2.1 \ - miow=0.3.3 \ - msdos_time=0.1.6 \ - named_pipe=0.3.0 \ - native-tls=0.1.5 \ - net2=0.2.33 \ - nix=0.11.0 \ - nodrop=0.1.13 \ - nom=3.2.1 \ - nom=4.1.1 \ - notify=4.0.6 \ - num-derive=0.2.3 \ - num-integer=0.1.39 \ - num-iter=0.1.37 \ - num-rational=0.2.1 \ - num-traits=0.1.43 \ - num-traits=0.2.6 \ - num_cpus=1.8.0 \ - objc-foundation=0.1.1 \ - objc=0.2.5 \ - objc_id=0.1.1 \ - openssl-sys=0.9.39 \ - openssl=0.9.24 \ - ordered-float=0.5.2 \ - ordered-float=1.0.1 \ - osmesa-sys=0.1.2 \ - owning_ref=0.3.3 \ - parking_lot=0.6.4 \ - parking_lot_core=0.3.1 \ - peeking_take_while=0.1.2 \ - percent-encoding=1.0.1 \ - phf=0.7.23 \ - phf_codegen=0.7.23 \ - phf_generator=0.7.23 \ - phf_shared=0.7.23 \ - pkg-config=0.3.14 \ - png=0.12.0 \ - podio=0.1.6 \ - proc-macro2=0.4.23 \ - quick-error=1.2.2 \ - quote=0.3.15 \ - quote=0.6.10 \ - rand=0.4.3 \ - rand=0.5.5 \ - rand_core=0.2.2 \ - rand_core=0.3.0 \ - rayon-core=1.4.1 \ - rayon=1.0.3 \ - redox_syscall=0.1.40 \ - redox_termios=0.1.1 \ - redox_users=0.2.0 \ - regex-syntax=0.5.6 \ - regex-syntax=0.6.3 \ - regex=0.2.11 \ - regex=1.0.6 \ - relay=0.1.1 \ - remove_dir_all=0.5.1 \ - reqwest=0.8.8 \ - rustc-demangle=0.1.9 \ - rustc_version=0.2.3 \ - rusttype=0.4.3 \ - rusttype=0.7.2 \ - ryu=0.2.7 \ - safemem=0.3.0 \ - same-file=1.0.4 \ - schannel=0.1.14 \ - scoped-tls=0.1.2 \ - scoped_threadpool=0.1.9 \ - scopeguard=0.3.3 \ - security-framework-sys=0.1.16 \ - security-framework=0.1.16 \ - semver-parser=0.7.0 \ - semver=0.9.0 \ - serde=1.0.80 \ - serde_derive=1.0.80 \ - serde_json=1.0.33 \ - serde_urlencoded=0.5.3 \ - serde_yaml=0.8.7 \ - servo-fontconfig-sys=4.0.7 \ - servo-fontconfig=0.4.0 \ - shared_library=0.1.9 \ - siphasher=0.2.3 \ - slab=0.3.0 \ - slab=0.4.1 \ - smallvec=0.6.5 \ - smithay-client-toolkit=0.4.1 \ - socket2=0.3.8 \ - stable_deref_trait=1.1.1 \ - static_assertions=0.2.5 \ - stb_truetype=0.2.4 \ - strsim=0.7.0 \ - syn=0.15.20 \ - synstructure=0.10.1 \ - tempdir=0.3.7 \ - termcolor=1.0.4 \ - terminfo=0.6.1 \ - termion=1.5.1 \ - textwrap=0.10.0 \ - thread_local=0.3.6 \ - tiff=0.2.1 \ - time=0.1.40 \ - tokio-codec=0.1.1 \ - tokio-core=0.1.17 \ - tokio-current-thread=0.1.3 \ - tokio-executor=0.1.5 \ - tokio-fs=0.1.4 \ - tokio-io=0.1.10 \ - tokio-reactor=0.1.6 \ - tokio-service=0.1.0 \ - tokio-tcp=0.1.2 \ - tokio-threadpool=0.1.8 \ - tokio-timer=0.2.7 \ - tokio-tls=0.1.4 \ - tokio-udp=0.1.2 \ - tokio-uds=0.2.3 \ - tokio=0.1.11 \ - try-lock=0.1.0 \ - ucd-util=0.1.2 \ - unicase=1.4.2 \ - unicase=2.2.0 \ - unicode-bidi=0.3.4 \ - unicode-normalization=0.1.7 \ - unicode-width=0.1.5 \ - unicode-xid=0.1.0 \ - unreachable=1.0.0 \ - url=1.7.2 \ - user32-sys=0.2.0 \ - utf8-ranges=1.0.2 \ - utf8parse=0.1.1 \ - uuid=0.6.5 \ - vcpkg=0.2.6 \ - vec_map=0.8.1 \ - version_check=0.1.5 \ - void=1.0.2 \ - vte=0.3.3 \ - walkdir=2.2.7 \ - want=0.0.4 \ - wayland-client=0.21.4 \ - wayland-commons=0.21.4 \ - wayland-protocols=0.21.4 \ - wayland-scanner=0.21.4 \ - wayland-sys=0.21.4 \ - which=1.0.5 \ - widestring=0.2.2 \ - winapi-build=0.1.1 \ - winapi-i686-pc-windows-gnu=0.4.0 \ - winapi-util=0.1.1 \ - winapi-x86_64-pc-windows-gnu=0.4.0 \ - winapi=0.2.8 \ - winapi=0.3.6 \ - wincolor=1.0.1 \ - winit=0.18.0 \ - winpty-sys=0.4.3 \ - winreg=0.4.0 \ - ws2_32-sys=0.2.1 \ - x11-clipboard=0.2.2 \ - x11-dl=2.18.3 \ - xcb=0.8.2 \ - xdg=2.1.0 \ - xml-rs=0.7.0 \ - xml-rs=0.8.0 \ - yaml-rust=0.4.2 \ - zip=0.4.2; do - dep="$(echo "$dependency" | cut -d= -f1)" - ver="$(echo "$dependency" | cut -d= -f2)" + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" tar xvf $CWD/$dep-$ver.crate @@ -418,7 +115,7 @@ mkdir vendor sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' printf "}\n" - } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + } > $dep-$ver/.cargo-checksum.json done ) @@ -441,26 +138,53 @@ 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/man/man1 -install -m644 alacritty.man $PKG/usr/man/man1/alacritty.1 + +if [ -e alacritty.man ] ; then + install -m644 alacritty.man $PKG/usr/man/man1/alacritty.1 +elif [ -e extra/alacritty.man ] ; then + install -m644 extra/alacritty.man $PKG/usr/man/man1/alacritty.1 +fi 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/share/bash-completion/completions -install -m644 alacritty-completions.bash $PKG/usr/share/bash-completion/completions/alacritty +if [ -e alacritty-completions.bash ] ; then + install -m644 alacritty-completions.bash $PKG/usr/share/bash-completion/completions/alacritty +elif [ -e extra/completions/alacritty.bash ] ; then + install -m644 extra/completions/alacritty.bash $PKG/usr/share/bash-completion/completions/alacritty +fi mkdir -p $PKG/usr/share/zsh/site-functions -install -m644 alacritty-completions.zsh $PKG/usr/share/zsh/site-functions/_alacritty +if [ -e alacritty-completions.zsh ] ; then + install -m644 alacritty-completions.zsh $PKG/usr/share/zsh/site-functions/_alacritty +elif [ -e extra/completions/_alacritty ] ; then + install -m644 extra/completions/_alacritty $PKG/usr/share/zsh/site-functions/_alacritty +fi mkdir -p $PKG/usr/share/terminfo -tic -o $PKG/usr/share/terminfo alacritty.info +if [ -e alacritty.info ] ; then + tic -o $PKG/usr/share/terminfo alacritty.info +elif [ -e extra/alacritty.info ] ; then + tic -o $PKG/usr/share/terminfo -xe alacritty,alacritty-direct extra/alacritty.info +fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE-APACHE README.md alacritty.yml $PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $PKG/usr/share/applications -install -m 644 $PRGNAM.desktop $PKG/usr/share/applications cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/share/applications +if [ -e $PRGNAM.desktop ] ; then + install -m 644 $PRGNAM.desktop $PKG/usr/share/applications +elif [ -e extra/linux/$PRGNAM.desktop ] ; then + install -m 644 extra/linux/$PRGNAM.desktop $PKG/usr/share/applications +fi + +if [ -e extra/logo/alacritty-term.svg ] ; then + mkdir -p $PKG/usr/share/pixmaps + install -m 644 extra/logo/alacritty-term.svg $PKG/usr/share/pixmaps/Alacritty.svg +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/system/alacritty/alacritty.info b/system/alacritty/alacritty.info index 3833c8434c..a2b156f48f 100644 --- a/system/alacritty/alacritty.info +++ b/system/alacritty/alacritty.info @@ -1,620 +1,526 @@ PRGNAM="alacritty" -VERSION="0.2.3" +VERSION="0.4.3" HOMEPAGE="https://github.com/jwilm/alacritty" -DOWNLOAD="https://github.com/jwilm/alacritty/archive/v0.2.3/alacritty-0.2.3.tar.gz \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/advapi32-sys/advapi32-sys-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/andrew/andrew-0.1.4.crate \ +DOWNLOAD="https://github.com/jwilm/alacritty/archive/v0.4.3/alacritty-0.4.3.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/adler32/adler32-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/andrew/andrew-0.2.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/android_glue/android_glue-0.2.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/android_log-sys/android_log-sys-0.1.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/approx/approx-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/approx/approx-0.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/argon2rs/argon2rs-0.2.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/arraydeque/arraydeque-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.24.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.9.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bindgen/bindgen-0.33.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-0.9.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2-rfc/blake2-rfc-0.2.18.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/approx/approx-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/arc-swap/arc-swap-0.4.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bindgen/bindgen-0.53.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.10.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/block/block-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/build_const/build_const-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.2.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bytes/bytes-0.4.10.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2-sys/bzip2-sys-0.1.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bytemuck/bytemuck-1.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2-sys/bzip2-sys-0.1.8+1.0.8.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/bzip2/bzip2-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.25.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cexpr/cexpr-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cgl/cgl-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cgmath/cgmath-0.16.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/clang-sys/clang-sys-0.22.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.32.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/clipboard-win/clipboard-win-2.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/clipboard/clipboard-0.4.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/calloop/calloop-0.4.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.53.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cexpr/cexpr-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cgl/cgl-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clang-sys/clang-sys-0.29.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clipboard-win/clipboard-win-2.2.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cmake/cmake-0.1.35.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cocoa/cocoa-0.18.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/color_quant/color_quant-1.0.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.5.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cmake/cmake-0.1.43.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cocoa/cocoa-0.19.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cocoa/cocoa-0.20.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/copypasta/copypasta-0.6.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.6.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.6.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-graphics/core-graphics-0.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation-sys/core-foundation-sys-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.6.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/core-foundation/core-foundation-0.7.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/core-graphics/core-graphics-0.17.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-text/core-text-13.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/core-text/core-text-9.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crc/crc-1.8.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.6.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.3.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.6.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.5.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.6.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/deflate/deflate-0.7.19.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/core-graphics/core-graphics-0.19.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/core-text/core-text-15.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/core-video-sys/core-video-sys-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/deflate/deflate-0.8.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/derivative/derivative-2.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dispatch/dispatch-0.2.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/dlib/dlib-0.4.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/downcast-rs/downcast-rs-1.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/dunce/dunce-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.5.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/embed-resource/embed-resource-1.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.10.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.5.13.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/errno-dragonfly/errno-dragonfly-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/errno/errno-0.2.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.11.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/euclid/euclid-0.17.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/downcast-rs/downcast-rs-1.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dwrote/dwrote-0.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/embed-resource/embed-resource-1.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.7.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/euclid/euclid-0.20.11.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/expat-sys/expat-sys-2.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/failure/failure-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/failure_derive/failure_derive-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/font-loader/font-loader-0.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-macros/foreign-types-macros-0.2.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types-shared/foreign-types-shared-0.3.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types/foreign-types-0.3.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-rs/freetype-rs-0.19.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-sys/freetype-sys-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent-sys/fsevent-sys-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent/fsevent-0.2.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/foreign-types/foreign-types-0.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-rs/freetype-rs-0.23.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/freetype-sys/freetype-sys-0.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent-sys/fsevent-sys-2.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fsevent/fsevent-0.4.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-cpupool/futures-cpupool-0.1.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/futures/futures-0.1.25.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gcc/gcc-0.3.55.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gdi32-sys/gdi32-sys-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gif/gif-0.10.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.10.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.9.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gleam/gleam-0.6.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin/glutin-0.19.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/httparse/httparse-1.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper-tls/hyper-tls-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/hyper/hyper-0.11.27.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/image/image-0.20.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/inflate/inflate-0.4.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.13.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/gl_generator/gl_generator-0.14.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin/glutin-0.24.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_egl_sys/glutin_egl_sys-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_emscripten_sys/glutin_emscripten_sys-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_gles2_sys/glutin_gles2_sys-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_glx_sys/glutin_glx_sys-0.1.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glutin_wgl_sys/glutin_wgl_sys-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/http_req/http_req-0.5.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-1.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/image/image-0.23.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/inflate/inflate-0.4.5.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify-sys/inotify-sys-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.6.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/jpeg-decoder/jpeg-decoder-0.1.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/instant/instant-0.1.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jni-sys/jni-sys-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/khronos_api/khronos_api-2.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/khronos_api/khronos_api-3.0.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/language-tags/language-tags-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.43.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libflate/libflate-0.1.18.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libloading/libloading-0.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/khronos_api/khronos_api-3.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lexical-core/lexical-core-0.6.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.70.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libloading/libloading-0.5.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.25.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/line_drawing/line_drawing-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.3.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lzw/lzw-0.10.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/malloc_buf/malloc_buf-0.0.6.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.6.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/mime/mime-0.3.12.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/mime_guess/mime_guess-2.0.0-alpha.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide_c_api/miniz_oxide_c_api-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-extras/mio-extras-2.0.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-more/mio-more-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.3.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-anonymous-pipes/mio-anonymous-pipes-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-extras/mio-extras-2.0.6.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-named-pipes/mio-named-pipes-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-uds/mio-uds-0.6.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.16.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.22.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/msdos_time/msdos_time-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/named_pipe/named_pipe-0.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/native-tls/native-tls-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.33.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.11.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.13.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-3.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-4.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/notify/notify-4.0.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-derive/num-derive-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.39.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-iter/num-iter-0.1.37.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-rational/num-rational-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.1.43.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/native-tls/native-tls-0.2.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk-glue/ndk-glue-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk-sys/ndk-sys-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ndk/ndk-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.34.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.14.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.17.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-5.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/notify/notify-4.0.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.42.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-iter/num-iter-0.1.40.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-rational/num-rational-0.2.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_enum/num_enum-0.4.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_enum_derive/num_enum_derive-0.4.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/objc-foundation/objc-foundation-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/objc/objc-0.2.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/objc/objc-0.2.7.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/objc_id/objc_id-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.39.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl/openssl-0.9.24.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ordered-float/ordered-float-0.5.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ordered-float/ordered-float-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-probe/openssl-probe-0.1.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.56.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl/openssl-0.10.29.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ordered-float/ordered-float-1.0.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/osmesa-sys/osmesa-sys-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/owning_ref/owning_ref-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.6.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.10.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.7.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/peeking_take_while/peeking_take_while-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-1.0.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/phf/phf-0.7.23.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_codegen/phf_codegen-0.7.23.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_generator/phf_generator-0.7.23.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_shared/phf_shared-0.7.23.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.14.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/png/png-0.12.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/phf/phf-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_codegen/phf_codegen-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_generator/phf_generator-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/phf_shared/phf_shared-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/png/png-0.16.3.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/podio/podio-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.23.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.3.15.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.10.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.5.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.4.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.40.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_termios/redox_termios-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.5.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.0.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/relay/relay-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/reqwest/reqwest-0.8.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-demangle/rustc-demangle-0.1.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-crate/proc-macro-crate-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.30.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/quick-error/quick-error-1.2.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.7.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.2.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.5.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/raw-window-handle/raw-window-handle-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.56.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc-hash/rustc-hash-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_tools_util/rustc_tools_util-0.2.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.7.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-0.2.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/safemem/safemem-0.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/schannel/schannel-0.1.14.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped-tls/scoped-tls-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped_threadpool/scoped_threadpool-0.1.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework-sys/security-framework-sys-0.1.16.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework/security-framework-0.1.16.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.7.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rusttype/rusttype-0.8.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/schannel/schannel-0.1.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework-sys/security-framework-sys-0.4.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/security-framework/security-framework-0.4.4.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.80.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.80.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.33.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_urlencoded/serde_urlencoded-0.5.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig-sys/servo-fontconfig-sys-4.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.110.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.110.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.53.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig-sys/servo-fontconfig-sys-4.0.9.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/servo-fontconfig/servo-fontconfig-0.4.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/shared_library/shared_library-0.1.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/siphasher/siphasher-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-0.6.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-client-toolkit/smithay-client-toolkit-0.4.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/stable_deref_trait/stable_deref_trait-1.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/static_assertions/static_assertions-0.2.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/stb_truetype/stb_truetype-0.2.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.20.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.10.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tempdir/tempdir-0.3.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.0.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/terminfo/terminfo-0.6.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/termion/termion-1.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.10.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tiff/tiff-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.40.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-codec/tokio-codec-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-core/tokio-core-0.1.17.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-current-thread/tokio-current-thread-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-executor/tokio-executor-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-fs/tokio-fs-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-io/tokio-io-0.1.10.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-reactor/tokio-reactor-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-service/tokio-service-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-tcp/tokio-tcp-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-threadpool/tokio-threadpool-0.1.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-timer/tokio-timer-0.2.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-tls/tokio-tls-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-udp/tokio-udp-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-uds/tokio-uds-0.2.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.1.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/try-lock/try-lock-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicase/unicase-1.4.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicase/unicase-2.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/shlex/shlex-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook-registry/signal-hook-registry-1.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook/signal-hook-0.1.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/siphasher/siphasher-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-client-toolkit/smithay-client-toolkit-0.6.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/smithay-clipboard/smithay-clipboard-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/socket2/socket2-0.3.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/spsc-buffer/spsc-buffer-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/static_assertions/static_assertions-0.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/stb_truetype/stb_truetype-0.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.22.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/terminfo/terminfo-0.7.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.43.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/toml/toml-0.5.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicase/unicase-2.6.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unreachable/unreachable-1.0.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-1.7.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/user32-sys/user32-sys-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/uuid/uuid-0.6.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/urlocator/urlocator-0.1.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.2.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/want/want-0.0.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-client/wayland-client-0.21.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-commons/wayland-commons-0.21.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-protocols/wayland-protocols-0.21.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-scanner/wayland-scanner-0.21.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-sys/wayland-sys-0.21.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/which/which-1.0.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/widestring/widestring-0.2.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vswhom-sys/vswhom-sys-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vswhom/vswhom-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-client/wayland-client-0.23.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-commons/wayland-commons-0.23.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-protocols/wayland-protocols-0.23.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-scanner/wayland-scanner-0.23.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wayland-sys/wayland-sys-0.23.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/which/which-3.1.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wincolor/wincolor-1.0.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winit/winit-0.18.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty-sys/winpty-sys-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winit/winit-0.22.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty-sys/winpty-sys-0.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winpty/winpty-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winreg/winreg-0.6.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-clipboard/x11-clipboard-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-dl/x11-dl-2.18.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/xcb/xcb-0.8.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/xdg/xdg-2.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-clipboard/x11-clipboard-0.5.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/x11-dl/x11-dl-2.18.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/xcb/xcb-0.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/xdg/xdg-2.2.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.8.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/zip/zip-0.4.2.crate" -MD5SUM="c08b8fa3811275cdc74bd384a44a7653 \ - 94e5e4da83397101dcac50eba7f31787 \ - 0a69ff70029371bf4d7fa89e2fe6c10b \ - d26d000426208c255a95368923467618 \ - 435230c2a607ce76b87cb6dbd505c1fb \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/zip/zip-0.5.5.crate" +MD5SUM="bf062ba33330ef00d5ad7fe5c0209964 \ + 853b409f126727af3ee29ae2de887271 \ + abc51f82118d86e83165ba87e2521e96 \ + 6cceeb8df4bc23fa37bfcd31dfa3277d \ 196a2eb81627baf71f6677a3c669e6ac \ + 55fb1d6c71bdf258f91759517ac64c8e \ 294a49d3c53865fa7ac5d0ce2f5d5735 \ - 582c9467bc156df82e5f76249a54bc03 \ - b8280b57b9b68d4d6800668de12624a4 \ - e1efb9a37395a38bd80ccfc911d4a6e8 \ - de8248362b2a750327097290599be566 \ - f31fdfa8e7d7c1a6707ba071f7e83ada \ - 5d7155b7fbc0e234c017f418f0dc9d64 \ - ba6e371a9a197673d52165be88cc3b64 \ - 9589900bcef3f72593483ce5b717fe3c \ - 496ce53f8d4d95bf19e48bb2f31e4a7e \ - 18b867a604c1e8303d01bd107179cffa \ - 1dd9b755c91f0f7bb401e393a9ed69f2 \ - 8db34042da9ec719905b996a5b7182e1 \ - e5767560aad375059c975285c07022c0 \ - 027635e453eccbfd0a2b02a440e334a6 \ + 711b149cf4767597fc265983750f4da3 \ + da0c3fb9229aa468e48f73aa614b9823 \ + 6ff474dd60c839a9c788844b7a42c72c \ + 11364a62687e5682d652aeafe1a13ed2 \ + 38a5278571eefda86428a8ebfc1cedc2 \ + 142cb4b9a653e56e56311f0c883b8582 \ + 7c6515c4b7f4c7723a3c6d1f07acc261 \ + bbaf2cabce203fecd54c0c294eb7fb2b \ + 064762ae7ae5feb9af472e8e8900aea9 \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + 085f6f44e54f62691bf3cf3365f5544a \ ea2d23ceb9f98853a7dffc6c02884464 \ - 39ef2c15a85f895d18ca6088a7a6d0bd \ - dbfdc6d9340b64bdce144b250ef1b7ca \ - a14c99757ab46089fe051c8c037a7188 \ - 054cd8c2a9b0bf5a56e0e90d55383b0a \ + 3b74244d96b3c60d2bf930a363679415 \ + e502e6c6b0dca9c1ae2d99e92b26f645 \ + ff4e1560b7d0ac5c4ae2688bc27f9c98 \ e0bf3b40b2d51cb52f40647b368efb50 \ - 47b86728f2d479bd97148b8da4497027 \ - 759bdda054c794e4e553ed446e6ac8ce \ - daa64e5a0e1b6d710877be51f27ccd3c \ - c7423534a43c27cdc442119c42084350 \ - e8b46383d7709d5d41b4b7056bdb5479 \ - f203b3252adb458272effbcc3c7dbe6e \ - cff9adf6952db7c0442bd9639440bb90 \ - f370eedaa22b1bed840df3de48c8c7c7 \ - 57ef19d6246b0fe318e21beb776bc76d \ + 0935eb9ddb26216e9dfd44bb249457b2 \ + 547dbf225c61b70c81f74f79a83affc9 \ + dcb58f182347515cab229f836dd8e6d1 \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 5739f950bcce803d986d189b128861b0 \ + 20cac860cf8ea29dd8e7e6f76eae9639 \ + 42af3a1e965585d80dcc1e0324fda6eb \ + eb6e4217d79aefec36a4d1068b4ae278 \ 1c8b50f8528dd37df7d984e0e4b61bd5 \ - caf5396ed6a6909ff15bc1b66f69fe9e \ - e64cf567826858b7e0f15478d275da4d \ - 7faf8117463c4b739c6660436a8fbe21 \ - 701334c674b3fc3ace74045e3a2fae50 \ - 96fb525f8968620537854e15f9dd1df6 \ - 0ebe7dd9b0076b267d6e6f2089aa3d05 \ + bfa12a07125b5aadf803aa3b5f939aa8 \ + 8de0c85238890738ff538f1548be52f0 \ + 50a7fcd4cdc347a06d3702c8dea6e926 \ + ec9751a4c0d35e7313e52ddb7147376b \ + a31d6dd3fb5148b9f87bf0b5e2761585 \ 6a97194aa07f7993298563f012b05a73 \ - 8902b787fa4fd19b8cbca0b2e1a7c259 \ - 82f0ce1687868353f220c829638b3bed \ - b6dfb52a280e664d2cb4b55d295384a1 \ - 71b89fdb9e155715cf7c5a104e969e32 \ + 9754db1eb3e8b15807f05a3540d2ab39 \ + ee7b2dc49246abc5b91ed9feccbde82f \ + f0682cfdc40af509c98f46f6350c1ba5 \ 868723b977d47531ecfc00d431362acd \ - ee04ee68a3166f5ae7d219a2dc1ebf2f \ - d045f9507638170b3666a42adc73ddbb \ - c07d2bd46a0fb313b00d1241e6024527 \ - b257e50658bf3a23d905c5ff778fa5fe \ - 2c5bee825d973ddfce297565c84ede76 \ - d6e5f8acee1145e6d15934f8d1f61e3c \ - 9e517a46d3b89406e482d208b4c6e0d9 \ - 60ab65d5a410da93a69fb4c668c8b229 \ - d447a68c467150d94b4e63c55d23f179 \ - 2e12122f476209ee74e3fc02ee84639f \ - 386f954916833e36520d464e6df280ca \ - 701d24caea00efef86966950d11900da \ + 2a9cc9f6b6f7399263d93df520be6ff6 \ + bae239f1a0c474035926b65a8b271305 \ + ba5527be251aede09ca0c45331f0feca \ + 3c153e21729b743f5127dec47670de17 \ + ff67cf2eb9668167782b8012d3b48e7b \ + ba7b8f06debf4491d6d530caaa4d3e66 \ + 1bb3b5328fdb89edf639fd9c3613e61f \ + 1946cef415cbf82cdcb975d813dd9696 \ + 8b418106a3968619300a2af8f6b4f200 \ + 03f2b7eae8b6491dbd3caacd842cb8cb \ 1886bdaca29d3af3cc1178fe96dc3876 \ - 81894ef30c7c23fa698f3c3adb9aef58 \ - 7df898854fe0cffd2e7ea284aff9f3df \ - 585ebd70650092eceaa5c381f36c15d5 \ - 31c7688a06efcd06bc98fffd915a5272 \ - 456474c9f3aa63c247889ee1bf7b4ea0 \ - 786c0905f4a6bb832c9e0cc840fd32c6 \ - 3986bd8fb612a68cf2b3c6fd81464457 \ - 79ebbe1e2546bb4181125af1ccf7a1e5 \ - 24336494a47aa7a99a43c81d57e7e71f \ - de27db5abafd137e664dc3436bea7939 \ - 7b3b48a7b08242510f79eec498ca5975 \ + 8cf354694bfabc868c506a648839b84c \ + f8e21d57a92cfe87510176559f2118f0 \ + a227f79f30fea6e06777524ce2602f18 \ + 146047ba26d24cfcfc6cf91979df6bc4 \ + 081ed755ceb8e0b7c78cffde40fd084d \ + 788b783fe3389534dc509539c20b7612 \ d318084a7a361875006cd156c19db3dc \ - aea67af76e8072168f5346f166f9f573 \ - 3af6cdff911dc3d76b9a5b3c2443d91f \ - a360748f21279a559c2a0135b6a6eb05 \ - d7bb1dd1089e319c6b071308e552c39b \ - b0fd8ad50f5e64c71f0daf8af79ca952 \ - cfe8318d6d40ff8d748e7544b0874388 \ + b9f03f84345e22eae7858abc75dea31c \ + 5941f4a3d3435767e79260f61093ecd3 \ + 8dab3b3ec00dc56cffde0b0c410d47b5 \ + 506b571683460afdd2674576c022ff76 \ 667e86b8b8d96ab4e9605627ce7dcc9a \ + 13c3c9f696793ecdc507877849cd3e02 \ 78c898fdaa3968e23904bf8538c4a271 \ - a0a0e08161808758a06e0d7e1e27e532 \ - 2f3a4829521147ee8994c8b770e8aa94 \ - f674063e8f2d60813bd3f036efa82118 \ - 88fddf6adf1f767dba359fdc6e85cde7 \ + 24210500b0b946ed658dd20037cdf5b4 \ + 4f87f1d369fc881d9c09b8c60f08e40e \ + 9337eab4f601d1770903c6d3f3bde679 \ + 7c292ae288fae4b3dd8f4871f7ec54e9 \ + 49c7c8d8dff092a63277ed8d8a3b383b \ 54cfab480b7a5f7302eadf44129d3f4b \ dd7c80c2d04d2e9ceba82826cf69764d \ - c9a5f223bcdf318649575cc13c85e833 \ - 246d11565784a0e6ccb92715d434c310 \ - d024d23a2c7e5dae75422a514daa686f \ - 91a909fb67277086a0a8c542a9a652b4 \ - b5fc31dab453d4422169ddd04b1d00dd \ - e56b98459ae2d7c780638479a17408a9 \ - f68e2254c541d0da363bff9ac1bfc0d6 \ - 46b13c0a43408bbfc9e00fb41a7213f8 \ - f8ece52bd2dc2019f8ccc8401d259ecf \ - 456c401290f5c9048bc7261ccfc2d29a \ - 919a832a1a1e2ab1d3ef41b044da7726 \ - 0bb37c61bb7fffabbd71cd7b71c3100a \ - 0ec6773f3e0ef894a30feb85a30f4d9a \ - 58ca40fb06a940f8f1063d5ea191a260 \ - 89cabfcb37602a7b200b1a9cd660ee2e \ - 80bc5ad29325543d370950a49498f51b \ - 4894d3a20e9bee4f40d771e34102e9ff \ + de1228e571c94ef53ec4c21db57279ab \ + 849054e0df3292687cc1a3971d65ec2e \ + cd6875725af793cd82db47d68b00ee93 \ + e7c07242a95ee1df865efe9534e10a34 \ + 8d6d77db0129da96cc9bbf3f7649d5af \ + a2532fe5c5af23f578e58f47c8b512f0 \ + 443d79d3dc7fbcd8b2ca67a3caa717b1 \ + 197834cb95fbe6ee356760ede252f4d1 \ + 42111d38dc2b5b6f96aae7ea6412605f \ + c6384052cffdc4f368edd4efd5c67c42 \ + be4d52524ec8485abc40efba317b1e4c \ + edc41639aa4527c8cd965e601d4a1b4d \ + bb2582cae7b3d837f5da1df153001db5 \ + 54ac4c56d9ec2800b8428020f24be67c \ + c93dba5222b7abb3e2377590fcdb0d13 \ + 8ece65b4db64f81379cbd293e2f04d39 \ 50929c2de8a472031f43c9fc371f2111 \ - 66dc0bb75af270eaae7297cab2268102 \ - e3c41d159635384c1fcacb375d490ec1 \ - 7bebca3c6217218fb42f89544d1499db \ - f044f1455445ddd8d3ad7bdb6d69b224 \ + 2be25e9b80e7d5a98393dc83069dc1b9 \ + f73657307861e5406065d5171ad8ccdc \ + f1c40b9836035b69e464df711a1d2950 \ + 493f4bd45cf2a6c3963f66f58884f622 \ + 73272fe4aadb91d550dca8fc7ead8bf7 \ + 04a84513cdad48c92d8363d627904227 \ 9d033cc2daa6924420a4a89e6705773f \ - 857477e3d9568691c7758ef41f8bdf71 \ - 8dbb3a6b87a7ebfd1201b3cf5808a2f7 \ - 70d98bc08018458ae5f7109b52aa1acc \ - 527a21498a2024a22701808bfc3eba54 \ - 330c760718d1130f318457fe4725b0dd \ - c540b8e438549909cabf8ff3ec00f7ea \ - 5ecb5e7d9fe5a836a5eb706db9f299cc \ - 5524b53de0aad9352ca0d4d899f87046 \ - 49a5f2d3658e04e77ec70a94812f1041 \ - 5a7a2d021a5da877f3a6043f8cb59625 \ + 8bc92e2d422193be1d498146e34a0b85 \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 09c2a456bd4064675a0c53ca70f5eea1 \ + a2f5808f8787bdbcf577f560c70b5dba \ + 6db136a3e060ff39fc699991b77b0170 \ + 16b94c53885cc430711a85db2ea665e4 \ 8a79353ba205d0a86f695053dd4d15be \ 4e3c46643b83ce53618c9bcd211f111a \ - 3267f0cf9c396b358749f0cdb5daa0c1 \ - e041beab1a34b9c83936c1f34f45b2d4 \ - 33f0dff2bb670d9307fea18d579b5494 \ - cc65f96341390c0f60f5216e829486e7 \ - 7d95c53a33d0c550267b89a19899a6fa \ + ccfdc823f169bd2016cb508b117dae67 \ + 19466d8edb3c032438026125770b17f9 \ + 61e508ca2eee543023c5e1ba777e5ede \ 7c81e7a61ec172a229d6fdbc553e883d \ 7916dcd738a8fa6a2798754c20d6e146 \ - b961d154bd164250ba7b651a1643db72 \ - 316cfef2d10cd9b3484b4161495026d8 \ - 390733563cb6464678c4536423fd8ccf \ - 43452a6296aea71bef32661bee169d21 \ - 181e44ea1c689dabd80c83cbf8826fd5 \ - e23d7a443ddc88c3c6ad88b4736e6b76 \ - 0d277ee1008e51854eb0cc88bf59ea56 \ - abc16775e41a8fa6412fd9d97a8d40ad \ - d239185493ee6c699d6b582eecbf34be \ - c9ada2901d4abce0d999f8422213a899 \ + b5cf10e268e8a3bee2de8a734104245e \ + 124ec4f35274a0e9c1a4ef3dc0958643 \ + bdb38691302aeb63500e053919f5f0f7 \ + 6ad7c30338903afc3521369ecd826cfb \ + eb7a07c42356ca50832d5a7ca0e738d3 \ + 0d4dc4bd76fdb66114874a4afae6834b \ 0e68149cff6d0663d9d70dc88a3f124a \ - 9bbda7eebf6492e19b5168690e5b1251 \ - 1950db46cfb941645fd663b5f4ca9047 \ + e820082de1cf13e1111d2acbae898fcc \ a82e0b9efe7f6385071c9fd9b3bccfa3 \ 6217ae55f37fa0c9a37595276ead194a \ - c24b5fe087abe69f7548a9e6c8789d61 \ - 3ccff603a5f886b5a2ac727c05e83ef5 \ - f5b770fd1e16e0270ec2a0e353ec1c2c \ - 2ab09fa67b2a6b3b33eb15d8f23814ec \ - 50a9b3ddba8c0723171ea61d78cb25c8 \ - 8a39d8bd95f15af0840d2049f0e78a37 \ - 1ee36ecee72339333335c8dbc5a5f501 \ - 6cbf90988c6463632af31824c34402f3 \ - ebfbd3fe4eff8e11bdb04ffe02d72a52 \ - 1cce968b5f6a99e77543b46c3c026f15 \ - 4092ed5c67c6ff1c6a7bcf463bc40a53 \ - 154068a7f42fce75e909710e0ae14591 \ - f7b7a4ecf919acf2c802ce47391961b8 \ - 4667779e8bc2c1c564a2f8ee1d431b35 \ - cbdebc326641fcab42bc92a113548740 \ - b702f35cca52b56d1fb6e5bd4a048fbf \ + 98731fbefe42841dce239a8e8064431d \ + e4b3317d33ff0d40a2a0f5195673ec38 \ + fbccda0cd4fb98e305ba86c4dd5567bc \ + 7cc35774447d1ec5b7a6f0ebf8765c39 \ + 683a998da434a7ff8558bdf6eaa7b8c7 \ + 0cddb62b3dcfb814b4e0b9441c5c1a18 \ + c45800f4dfb888a928c772b081065214 \ + 2bd60bd849926090bd69a9fca2706c62 \ + 8efd24bdaba2414159d5c9c7d146f3ca \ + d29e8c70063563f063eb6647ddd187ff \ + 9c52a747ee0325081e566c9f700a8d7e \ + 7ea8e5ad906d517aa522b8fcbc49e8dd \ + 99e024622d98dc28a8a5f37afccaf20a \ + c3df6ec550943c6ccd356272db8eb202 \ + fdb01eb939ccb5c5ff66970427d22c48 \ + 03442e847beac2997633c93f7ecb9cc2 \ aecd889de42c8168e1bc97a6f2720d8f \ - 03c73cb148f51b2591e9affdf0aeca79 \ + b4dcac855af5df71f3383d86c4a96b78 \ fd9aa273ad560dedd00ddcf3dbe808ce \ - be3a0b8317f246ba0b1bff8e44082b3c \ - f26d84520f7692ce73cf89754f9f0e90 \ - 7abcd3196e6ba223249892b5bb7a5173 \ - cc474ae16578e25702808bba7968aea3 \ + 0fb8f799f959c69991d54556c5457068 \ + c20de7948428395a51bbd46dd03dbfc8 \ + 59b36aa3bae0b2fa7d338e71da2e309f \ + 1d457c63e43a46ed899f3c644ffb2d92 \ e1e7dd5a92eecf2d6a2430313d5b4de5 \ - 5d1a7bdbe77f74a2e2eefbb360dfcd55 \ - cfc2fa00b6829d7e27c3c81c669e5fed \ - 27363360c544fc6f398567e759821bca \ + 8d7308960df5143fe29a4a31c0c5f9c9 \ + be2af3efcea9586194e249f646161d83 \ 7e264bc8f23a45ad680668cb5e57d9fd \ - 8a5fc6ba84f3ac8a7e43ecb99322866c \ - a0edb223b83fc48865e3027b5b5fa93e \ - 2d2c5c75bbbf1e5017eb3b3ddd4a2975 \ - a97444822722348ec68b3b3f1d660280 \ - 48301fc58dd77896e3fe4a37559fa41d \ - 87a9d36f5ebe5eae0c3e8d69d58752e1 \ - 540cf2bacbdfedf7408e6499f2bd56ce \ + f490982aceabdbd515348f63e638a782 \ + a580658df3c2da1e8fed41a7a51389d0 \ + 4964b67b085fa4433b67dbde4d986c31 \ + fd3df95de65e4c1fe6c9c4a8399cb7e7 \ + f27cbb8b66feb1cc9ab1b9af8a1a2c51 \ + d6f8f8aba0bdb5edb2dc41705b9d1144 \ + e23545b69ca2087070db2432c9e9f52f \ 7261ce43635fd9c2a009810db04d6901 \ - 630a739e24e0fd2d6c17a97b7cf15453 \ - 4563373184ff931ec276dc1a659d52d2 \ - e4dce2134a2e4ae3bc240f8b09287d8f \ - cff6d0d12e74ebe26535ee9c6668d1cc \ - b8e402de21805717cdaa0c2f122a2a26 \ - 47bbc871bdfc0b6c2213c1b60890fe92 \ - 58ce576e12cf7111693210bca7edbe76 \ - 1ffaad533e741d447655a83a40fe0b66 \ - 690ef3b9334a15b51bca81a889c5d9fb \ - 312adefbeab31084c8e418f5820a686d \ - 7e94bf91e9faf1557da812a3444f23cc \ - 01cb5402c0fd99cebac702b76f2f2669 \ - f91e69d935946bdc258a0ed22dceeaad \ - de7bb5037caf6403d859c56b09fedcd2 \ - 775e84045c60713fa8ed6e13c44f05a6 \ - d3652677415c9ed4cae3b602316ff8bd \ - 7f7bb3d395fa0b2d99db8957e89347f0 \ - 84de896ba581818f8ef5172912291d2b \ - 09422dcb1cd6e3c30598296d2d3d4798 \ - 6fc469116d889934d49a05b9c0bc68c7 \ - 1d805df8d3022cb5bbe233d0a1898261 \ + 31e22078d1d024582e5116669d6714e4 \ + d120d82e6be8b10ed122a6b026db4199 \ + 020c7d0be083642e24a1499122793006 \ + 54b1bfe8bed9df22acc8e98f0761f527 \ + 3181dca31efe33cbed29a45d0ec67848 \ + e6692d52f35aa3b9311d7d7748fa25ea \ + d3c0a18ae8f426b3659405203a88f182 \ + 66d1cb32dce999907409f636f004b884 \ + 0a80ed36a125ac3cdfa09f8707055873 \ + a0f55fda89c0f97784edb18f4c253a49 \ + b269356e8646f3184a0e8d52a58cee69 \ + 7b0715affe44616a992f113ad7ab7d50 \ + 6840e02794f8d1a270f10a743f62d8b2 \ + 8dc2aa474c2cba342120ade9e98de066 \ + 31d088af3982b271b2afdda37e963518 \ + 04031b2ff0f95e8fb3c09d2d1d3b3b77 \ + 26e3fed1cf505f5fd65b98fb149ca1aa \ + 526f5ebac8d794185afbc71959c5c968 \ + c9a135ad3406eeeffb425d585d4567d7 \ + 7b1261ea730a9314bc9bcdf4a379bf98 \ + 675704441633e4a46e05d0dec5671a70 \ 4d101ab24d14c54937c5f45ece8fad5f \ - a881714716003d7c91024ed857e0c926 \ - ad0fe6b52cb27ae441a282062b48cb5f \ - 0977266288190c9d5919d49b0eb1a184 \ - c2d7745f520bda4e59b52cb411fa31aa \ - 6bccc3d52555a67d135ee83a4f7ffade \ - ce762e713513aed0e1f89b92161a4909 \ - aa66bbfd8cd16850fc54f0de89a79ac2 \ - b492e0a70603c3903a44ec5cabd3ba21 \ - 500e5bb7d9b5a8882e2e961012391a58 \ - a4a2c4f47d87eba91bbf72adce603aab \ - b400c5d9660e39eab5f284e3ad590fb8 \ + f69d418c4e60b38ce069f8778208b520 \ + 55ba60123c22238764e9007b3152f6cc \ + 44d95c1ed46baee736c9420ad1de3228 \ + 2d8d8b377d144f5e32b4f65a69eb0b24 \ + f505a218806e44b2369671089d65e839 \ + b4a0a98a54439a5a37952c8879187ee3 \ + 1024ac462fe90a1d7882a6911bd70604 \ + 9e0c7fedb6287e5090bab920da5c1d09 \ 8b4d8c7b6e3a060d365bc1ad650929fa \ 64111c20b69aa1532fb66b70c4660b55 \ - bb98fae2d6cebc95e1f2f22090cf2db5 \ - 7e28008a51955e6178c5dbf3a6e7f053 \ - 3d9ef7102215ff1debc9ed412a2cb016 \ - 6d043f63f5da2b5c42b6e610d4c08a0e \ - 91e18d40cf41666e8a9849a421592849 \ - 2aaa993ba5f5cb24369e21647549188a \ + 3879349fe374e764e24f37ce40ac9824 \ + 9b7d58f6341fb619ff2190481ce13b84 \ + ce76f5430cd6d2ab76d0d86ecb8a4f4d \ + edc6879bb5e213331662862bb4a68145 \ + 1e7f016a7eff797498f28cba0e156d3a \ 0a1c33ff15279010692af23566070deb \ e0a0f1fa737110ffd0b04af8d1062edd \ - 85e4e64ebc6bd76f1b9ff5be147a918d \ - e20d7941c777a14a3620fe2a089c776f \ - cecfe213083001cbbb29cb7247576024 \ - 9f481a2e33bc27a6be63ab49b6811ae6 \ - 7379dc37657e54eb7f94527985b8b8ce \ - cc0c1c50a5cbee9fb944e544e631c975 \ - a986c51d8a91f91704da0c440295640d \ - 251271dd374eac256e91caeeff11c9bc \ - 9b72dabb6ae9c1c47d83411ecda78f9e \ - fbb6473579065c9fe4dc3d48c5d5d8a5 \ - 3667c8bd11343aa0293c604b99b73785 \ - d155c08de6c18bd55639ffed629894b9 \ - 918b2d65f7489e154483e3d6e54118a0 \ - 6b70927d96d7e02a00964cbd0732dec3 \ - 051f9a8b684a784c146a4ab0b79de48e \ - de04800c89d374b8a843f91d26fa05ad \ - 63268e3f02616082705227f0a58fed87 \ - baaa166f66e90e94b76b7418afd5df90 \ - b571ad816b2e81ae07f9f8e6a2157c9f \ - 9775850c1cc8a4f209f2b6c03a6e700b \ - c9f237bdbd53c89a9b7a08e00a5dddaa \ - 2ad4c44824b070c8d09e5648a8f280b9 \ - 1a1422d8f8551d04488d343f4d7adf09 \ - f6f58232c5457ad590ad37cf355eb57e \ - 6d0c2c682ba6f758a7931922fa7f57fa \ - 8f6eb32191b6973944ebb493c79b86ad \ - eb5f8efbb1906c1ef36b290c0f9e71ba \ - d1c8fd39c1fbb3f6deef2326d4dc0301 \ - fcfdf0dd94be2e2c267cf991190b1ede \ - 4100a229d87cedbe6f5e1afe614604b0 \ - e48b0cdf016eb0f3c25a6e394abb3ea7 \ - 70317db8c6c714bfeb917fc553590182 \ - bbe88d247472b1c7f7724be0d50d1590 \ - 611c790e924c1cc68c014e24782f46f6 \ - 5786d96c4346a308bc8fc4c8cd956b04 \ - 4862b7532087212f286b9a852c2a7e01 \ - c7cab038d6351de358a8e98f3c861fe2 \ - f316454c1928e03f6459d7eac04d2168 \ - 6b10467c87356eadc6b7017857c5b55b \ + e4e7efe2ab7921499d5c247a349e9e1f \ + 6baa5e1feb7ae90febb0ce028b0e4117 \ + 25d8a9b311bab576201d2d2bf19492e4 \ + 760118daf11b1985e22552de2b5b868a \ + c7bfa89e6da163f1474bb3787987bb12 \ + 079297fc0fb968f749368577d9131549 \ + d542cb62835e6715b6971ef7af7a592c \ + 0f842e0256ed664e51aca8ca2e306c57 \ + 77db363940fc8039d4389406375031d0 \ + 557d2ae2d0ba91790dfa7b2a894807e8 \ + 180a73ec075244f3a7a519160efade32 \ + 3cea882cebbb1273387568cf938abe35 \ + 781d4ccf5d04c98fa02af207a9639249 \ + 67ddc5f26cbbc715dfa213c9e4881dd7 \ + bb3ae104a9fa1b31568cc98c920a4653 \ + 62e883807a65ebe1ba9d0e555d703339 \ + c4fcdc44105c5e02def5a4ea19f1775f \ + a8de006fe0c7e373c560dd51599287a8 \ + a5dd75e77c7324f5c1d2d372c990d0a7 \ + 9d66208e00715217a8c1f2e40efe4a0c \ + 2e99b7fe9fc50def58bf0b391c149b1c \ + 36cbce768155bdac8934efa262d75fe3 \ f403bbb812ce1a2d9270d9159cf9e8d3 \ - f9c3f9df08be27f5d7cc8c0a06a71d81 \ - d7c493ca4f84a7d50b53646421a37487 \ + 3d394ff298f20e04de3ce053ab63ccc7 \ + 0f65fd26370e1fd67c8e8812cabea574 \ 5aaf04f9a94a6450e3e4963ddd62b92d \ - b390278bbea483da591b1bc026be5fa2 \ - 32f0ced8a8881d2c0572b879bf15b91e \ - 62beadf2fc0c0f274785be31a21952cb \ - 9c27232c12abb96c68e10e21f2012639 \ - 3b656a3aebdf60145eb01a1300cd85ca \ - d8d2ae521b4a500432b159744ec3fa41 \ - e75c0721667b6bc86472ecf7b286d9fc \ - 0eedbc32447f40b3045d6de3910b5415 \ - f48add3d6234e8b9829fa5364509f425 \ + e628ca8adb2b572bffb210f014656b6f \ + 81821d39675a1f584546b9920e5d6b5d \ + f0fec022d543fb5d2575bd32ee6803a4 \ + 9d83f7627e511837fb2d94fbad338d35 \ + aab44b0dae2fc434c7b1f119ffb100b9 \ + 333b4ba3f64c35b6f89b521e8d64548b \ + 0d6976e8a1a1e69abc8ba8f6966cddb8 \ 689203efc084fc0f1d1f74f5d354ae75 \ - 9f49c12903d0319936054bf1c128f112 \ - 446adaad11d5f90ee0621f08552e0ce9 \ - e37a5fe8c728e9f7fa4e0e56018041e0 \ - ebb89f9823a977532990e238113d6819 \ - f8876871cf3109c4ce1fe24fe7541e8e \ - 36343cfacf604740d413bc99f92b0f63 \ - a6840df0028ac04a447c3596794b7a96 \ - d75e50366ec2d8a95012840323d8c2e5 \ - 2d007e6bd4d52c23e864eaa2f9fcbc2f \ - 22f4b5a626c3ae1c7b36ff2e30eee1ad \ + 6fe13b4122d83cd239b61466ede3198c \ + 32222c3df2805eabcfe92432db2aee8f \ + 03d7d776edd1a01dbc81f955fa9a9d41 \ + a29fec77b1e07caf7b682b881b676c06 \ + 1092a4a24e80f8856efc71af51a06114 \ + 6e23e0eee42b1ba9ec61a6db7ec2dc08 \ + a59b9a01b4de22db8d7287f945bce33c \ + b5015d777b19cae7d1c9a40622c74b03 \ + 45a3312c06fe9539a292146025f02426 \ + fbdc95c195b987c8d75dc92c97a10307 \ + 5a2a0beb0c61c93106161a473bb9df12 \ + 7035a08f69721a134bd3f401d977fb57 \ c900e7dbce808ff8ced375077b17a163 \ db96b50050277bf05a3c68534bbb9586 \ - e003af62de1097ee482635cff7bdf6ca \ + b9e37d5fc4ad28b612b78ad37816684d \ 09de9d01e7331ff3da11f58be8bef0df \ b44489eb4799c4fabac3fceb48de54f7 \ - 40909511b3d0e2dba891f438715808d0 \ - 2f9f840bd479751f715a8f530976b6bf \ - 5442b7076e8374e9fa8964a35ed0aaa3 \ - 35dc54bd806e940d9fd1fcdab28a5fc3 \ - 18eb1711b907c34969353a721a0ca533 \ + ce68e06a2cd4f180747cf169fc388a95 \ + 8125488182a6ce236cdc8508ae1ad6a2 \ + b047c36ce2c3277ec2f9d0b88b17a082 \ + a5993712501e0c03db6ec7a31c4d6d50 \ + e01f3a4b5c3690899e5975c90bf12174 \ 38346bab0933c9eb1e36d22fe4220ba7 \ - cc007d1ed803de8e399518daeec6d4cd \ - 65c71ba710824feabcdbc340aa9dbebe \ - aa21a0ccffbd119424b5ab3b14a1d753 \ - 6492ecb377ffc18c649cbca93e3b18c3 \ - 3330bd5ad46e2b2a7276a954cdc60a62 \ + 8aa5631ce68ab505b09a7e01fd704f65 \ + 6e5896b10ddc995243e45e5482e7ee43 \ + bc17188adb6a07610c3a78bfb184ef59 \ + 1628d3f26e3f952d8c43973ade1f2dad \ 9039399ab9632e189ce70d8008011d34 \ - 12a788ed8a569a3011f52e501ba01225 \ - 50b73de2605159fd629475fa86628fd4" + 0541629539c6bf2359a81746df61d841 \ + 7ae9feef92beadbfbb0caa8c2fee28d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="xclip" +REQUIRES="python3" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/system/anacron/anacron.info b/system/anacron/anacron.info index 71048247dd..470d0e504f 100644 --- a/system/anacron/anacron.info +++ b/system/anacron/anacron.info @@ -6,5 +6,5 @@ MD5SUM="865cc1dfe1ed75c470d3e6de13763f03" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Michael Wagner" -EMAIL="lapinours@web.de" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere.com" diff --git a/system/android-file-transfer/README b/system/android-file-transfer/README new file mode 100644 index 0000000000..a0b712341a --- /dev/null +++ b/system/android-file-transfer/README @@ -0,0 +1,10 @@ +Android File Transfer for Linux - reliable MTP client with +minimalistic UI similar to Android File Transfer for Mac. + +Android File Transfer by default builds qt5 ui. This version +of Android File Transfer does not support qt4 ui. + +In building only the command-line client (this does not require +qt5), run the script with the following command: + +QT_GUI=no ./android-file-transfer.SlackBuild diff --git a/system/android-file-transfer/android-file-transfer.SlackBuild b/system/android-file-transfer/android-file-transfer.SlackBuild new file mode 100644 index 0000000000..07699f3c7d --- /dev/null +++ b/system/android-file-transfer/android-file-transfer.SlackBuild @@ -0,0 +1,102 @@ +#!/bin/sh + +# Slackware build script for android-file-transfer +# +# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.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. + +PRGNAM=android-file-transfer +VERSION=${VERSION:-4.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-linux-$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 {} \; + +if [ ${QT_GUI:-yes} = no ]; then + GUI="OFF" +else + GUI="ON" +fi + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_QT_UI=$GUI \ + -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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a FAQ.md README.md LICENSE $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:-tgz} diff --git a/system/android-file-transfer/android-file-transfer.info b/system/android-file-transfer/android-file-transfer.info new file mode 100644 index 0000000000..256a032663 --- /dev/null +++ b/system/android-file-transfer/android-file-transfer.info @@ -0,0 +1,10 @@ +PRGNAM="android-file-transfer" +VERSION="4.2" +HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux" +DOWNLOAD="https://github.com/whoozle/android-file-transfer-linux/archive/v4.2/android-file-transfer-4.2.tar.gz" +MD5SUM="861de28c87f095a32808d0cbf9bb897a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="qt5" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu1@isaacyu1.com" diff --git a/system/android-file-transfer/slack-desc b/system/android-file-transfer/slack-desc new file mode 100644 index 0000000000..7a057805a1 --- /dev/null +++ b/system/android-file-transfer/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------------------------------------------------------| +android-file-transfer: android-file-transfer (Android File Transfer for Linux) +android-file-transfer: +android-file-transfer: Android File Transfer for Linux - reliable MTP client with +android-file-transfer: minimalistic UI similar to Android File Transfer for Mac. +android-file-transfer: +android-file-transfer: +android-file-transfer: +android-file-transfer: +android-file-transfer: +android-file-transfer: +android-file-transfer: diff --git a/system/ansible/README b/system/ansible/README index 0d4f3e9188..ce2e1e89e0 100644 --- a/system/ansible/README +++ b/system/ansible/README @@ -5,3 +5,6 @@ configuration, software deployment, and other IT needs. It comes as an easy-to-use and powerful alternative to infrastructure management tools such as CFEngine, Chef, Puppet, and SaltStack. + +Note: for some modules to run, you may need to install additional +dependencies. diff --git a/system/ansible/ansible.SlackBuild b/system/ansible/ansible.SlackBuild index 2a45b281e5..f5043880e4 100644 --- a/system/ansible/ansible.SlackBuild +++ b/system/ansible/ansible.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2014 Alex Diaconu <alex.diaconu@gmx.com> # Copyright 2016 Ciorceri Petru Sorin <cpsorin@gmail.com> -# Copyright 2017-2018 Marek Wodzinski <majek@w7i.pl> +# Copyright 2017-2020 Marek Wodzinski <majek@w7i.pl> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ansible -VERSION=${VERSION:-2.7.6} +VERSION=${VERSION:-2.9.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,7 +71,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 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG # Copy docs, remove git traces, compress manpages cp -a docs/man $PKG/usr/man diff --git a/system/ansible/ansible.info b/system/ansible/ansible.info index d4f3b43694..bd7b3a06ee 100644 --- a/system/ansible/ansible.info +++ b/system/ansible/ansible.info @@ -1,10 +1,10 @@ PRGNAM="ansible" -VERSION="2.7.6" +VERSION="2.9.20" HOMEPAGE="https://www.ansible.com" -DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.7.6.tar.gz" -MD5SUM="ccdc9f5f6c7237e7d6fc53e58baba820" +DOWNLOAD="https://releases.ansible.com/ansible/ansible-2.9.20.tar.gz" +MD5SUM="47226da137b30883f166d5543882d66f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="paramiko PyYAML Jinja2" +REQUIRES="cryptography python3-PyYAML Jinja2" MAINTAINER="Marek Wodzinski" EMAIL="majek@w7i.pl" diff --git a/system/apache-tomcat/apache-tomcat.SlackBuild b/system/apache-tomcat/apache-tomcat.SlackBuild index 541033b591..28eec47580 100644 --- a/system/apache-tomcat/apache-tomcat.SlackBuild +++ b/system/apache-tomcat/apache-tomcat.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=apache-tomcat -VERSION=${VERSION:-7.0.67} +VERSION=${VERSION:-7.0.103} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,7 +66,7 @@ find -L . \ mkdir -p $PKG/etc/tomcat $PKG/usr/share/{tomcat,java} \ $PKG/var/{run,lib,log,tmp,spool}/tomcat - # required, otherwise, permissions on /var/tmp will be + # required, otherwise, permissions on /var/tmp will be # (re)set to 755 when package is installed. # chmod 1777 $PKG/var/tmp diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info index 3de9bf59f8..2750dfb566 100644 --- a/system/apache-tomcat/apache-tomcat.info +++ b/system/apache-tomcat/apache-tomcat.info @@ -1,8 +1,8 @@ PRGNAM="apache-tomcat" -VERSION="7.0.67" -HOMEPAGE="http://tomcat.apache.org/" -DOWNLOAD="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.67/bin/apache-tomcat-7.0.67.tar.gz" -MD5SUM="55a5ef91b4bd9082ad5faf91d3372ae2" +VERSION="7.0.103" +HOMEPAGE="https://tomcat.apache.org/" +DOWNLOAD="https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.103/bin/apache-tomcat-7.0.103.tar.gz" +MD5SUM="8dd9df51900023107e0c24f4ed105b01" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk commons-daemon" diff --git a/system/apachetop/apachetop.SlackBuild b/system/apachetop/apachetop.SlackBuild index bfee045d9f..c766ca84da 100644 --- a/system/apachetop/apachetop.SlackBuild +++ b/system/apachetop/apachetop.SlackBuild @@ -3,14 +3,14 @@ # Slackware build script for ApacheTop # Written by Menno Duursma <druiloor@zonnet.nl> -# Maintained by Willy Sudiarto Raharjo <willysr@slackware-id.org> +# Maintained by Willy Sudiarto Raharjo <willysr@slackbuilds.org> # This program is free software. It comes without any warranty. # Granted WTFPLv2, as published by Sam Hocevar dec 2004. # See http://sam.zoy.org/wtfpl/COPYING for more details. PRGNAM=apachetop -VERSION=${VERSION:-0.18.4} +VERSION=${VERSION:-0.19.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/apachetop/apachetop.info b/system/apachetop/apachetop.info index ca6c814a8f..e4f5665b2b 100644 --- a/system/apachetop/apachetop.info +++ b/system/apachetop/apachetop.info @@ -1,8 +1,8 @@ PRGNAM="apachetop" -VERSION="0.18.4" +VERSION="0.19.7" HOMEPAGE="https://github.com/tessus/apachetop" -DOWNLOAD="https://github.com/tessus/apachetop/archive/0.18.4/apachetop-0.18.4.tar.gz" -MD5SUM="a600b3100061d30bb7e56c05fa83d557" +DOWNLOAD="https://github.com/tessus/apachetop/archive/0.19.7/apachetop-0.19.7.tar.gz" +MD5SUM="a1b7d9d21794fbcc87bc6efc66320a21" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/apg/README b/system/apg/README new file mode 100644 index 0000000000..5185c1ddd4 --- /dev/null +++ b/system/apg/README @@ -0,0 +1,18 @@ +apg (automated password generator) + +apg generates random passwords according to several algorithms. The +default algorithm is pronounceable password generation algorithm +designed by Morrie Gasser and described in 'A Random Word Generator +For Pronounceable Passwords (National Technical Information Service +(NTIS) AD-A-017676)'. + +This SlackBuild by default patches apg to use /dev/urandom rather than +/dev/random for generating random seeds, to avoid apg blocking while +waiting for the kernel to gather more entropy. If you're worried about +this being possibly insecure, first read: + +http://web.archive.org/web/20201109034537/https://www.2uo.de/myths-about-urandom/ + +Then, if you remain unconvinced, you can run this script with +URANDOM=no in the environment to use /dev/random. Remember, apg is +only using this to generate *seeds* for its own built-in PRNG! diff --git a/system/apg/apg.SlackBuild b/system/apg/apg.SlackBuild new file mode 100644 index 0000000000..a213d6346e --- /dev/null +++ b/system/apg/apg.SlackBuild @@ -0,0 +1,77 @@ +#!/bin/sh + +# Slackware build script for apg + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# TODO: figure out what's wrong with apgd. It works fine when called +# from the command line, but when starting it from inetd it seems +# to get stuck in a loop, never prints any output, logs hundreds +# of requests, and never generates any output. This is low-priority +# because nobody actually *uses* a password-generation TCP service... + +PRGNAM=apg +VERSION=${VERSION:-2.2.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +[ "${URANDOM:-yes}" = "no" ] || sed -i 's,/dev/random,/dev/urandom,' rnd.h + +# If we were going to build the daemon, we'd use "make all". + +make FLAGS="$SLKCFLAGS -Wl,-s" +make install INSTALL_PREFIX=$PKG/usr +gzip -9 $PKG/usr/man/man?/*.? + +rm -rf doc/man +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES COPYING LICENSE README README.md THANKS TODO doc/* \ + $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:-tgz} diff --git a/system/apg/apg.info b/system/apg/apg.info new file mode 100644 index 0000000000..89d7456f13 --- /dev/null +++ b/system/apg/apg.info @@ -0,0 +1,10 @@ +PRGNAM="apg" +VERSION="2.2.3" +HOMEPAGE="https://github.com/jabenninghoff/apg/blob/master/rnd.c" +DOWNLOAD="https://github.com/jabenninghoff/apg/archive/v2.2.3/apg-2.2.3.tar.gz" +MD5SUM="6d1490d7835dbf5a04ade75fbad3d726" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/apg/slack-desc b/system/apg/slack-desc new file mode 100644 index 0000000000..7278d89849 --- /dev/null +++ b/system/apg/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------------------------------------------------------| +apg: apg (automated password generator) +apg: +apg: apg generates random passwords according to several algorithms. The +apg: default algorithm is pronounceable password generation algorithm +apg: designed by Morrie Gasser and described in 'A Random Word Generator +apg: For Pronounceable Passwords (National Technical Information Service +apg: (NTIS) AD-A-017676)'. +apg: +apg: +apg: +apg: diff --git a/system/apparmor/apparmor.SlackBuild b/system/apparmor/apparmor.SlackBuild index ab72993fbd..9f1dcc2c1a 100644 --- a/system/apparmor/apparmor.SlackBuild +++ b/system/apparmor/apparmor.SlackBuild @@ -23,24 +23,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=apparmor -VERSION=${VERSION:-2.12} +VERSION=${VERSION:-2.13.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} # For consistency's sake, use this +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} # Drop the package in /tmp +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -128,11 +126,9 @@ make make install DESTDIR=$PKG popd -# Strip binaries and libraries 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 -# Compress man pages find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done @@ -141,18 +137,15 @@ find $PKG -name perllocal.pod \ -o -name "*.bs" \ | xargs rm -f -# Copy program documentation into the package mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - LICENSE README documentation/ \ + LICENSE README.md documentation/ \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Copy the slack-desc and a custom doinst.sh into ./install mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Make the package cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/apparmor/apparmor.info b/system/apparmor/apparmor.info index 2755785c32..d1f682368f 100644 --- a/system/apparmor/apparmor.info +++ b/system/apparmor/apparmor.info @@ -1,10 +1,10 @@ PRGNAM="apparmor" -VERSION="2.12" +VERSION="2.13.4" HOMEPAGE="https://gitlab.com/apparmor/" -DOWNLOAD="https://gitlab.com/apparmor/apparmor/-/archive/v2.12/apparmor-v2.12.tar.bz2" -MD5SUM="3591dc32db552ab5ed2b5d842100ac17" +DOWNLOAD="https://gitlab.com/apparmor/apparmor/-/archive/v2.13.4/apparmor-v2.13.4.tar.bz2" +MD5SUM="ac50e8bec220d62a350661ee88fd41b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" MAINTAINER="pyllyukko" -EMAIL="pyllyukko AT maimed dot org" +EMAIL="pyllyukko@maimed.org" diff --git a/system/archivemount/README b/system/archivemount/README new file mode 100644 index 0000000000..c3cec52a31 --- /dev/null +++ b/system/archivemount/README @@ -0,0 +1,10 @@ +archivemount (mounts an archive for access as a file system) + +archivemount is a FUSE based file system. Its purpose is to mount +an archive on a mount point where it can be read from or written to +as with any other file system. This makes accessing the contents of +the archive, which may be compressed, transparent to other programs, +without decompressing them. + +Supported archive formats: tar, pax, cpio, iso9660 (CD-ROM) images, +zip, shar. Other archive types such as rar and 7z may also work. diff --git a/system/archivemount/archivemount.SlackBuild b/system/archivemount/archivemount.SlackBuild new file mode 100644 index 0000000000..4b2001ae1d --- /dev/null +++ b/system/archivemount/archivemount.SlackBuild @@ -0,0 +1,86 @@ +#!/bin/sh + +# Slackware build script for archivemount + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# 20200923 bkw: Update for v0.9.1. Thanks to Alexander Verbovetsky +# for pointing out the real homepage and new version of archivemount. +# Also, reflowed the README, all the lines are <= 72 characters now. + +PRGNAM=archivemount +VERSION=${VERSION:-0.9.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# Man page says to use umount, which works but requires root privs. +# The normal way for a user to umount a fuse fs is with fusermount. +# Also fix hyphen/minus formatting errors. +patch -p1 < $CWD/manpage.diff +rm -f $PRGNAM.1 # make sure it will be rebuilt + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG COPYING README $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:-tgz} diff --git a/system/archivemount/archivemount.info b/system/archivemount/archivemount.info new file mode 100644 index 0000000000..0a2296ff0b --- /dev/null +++ b/system/archivemount/archivemount.info @@ -0,0 +1,10 @@ +PRGNAM="archivemount" +VERSION="0.9.1" +HOMEPAGE="https://www.cybernoia.de/software/archivemount.html" +DOWNLOAD="https://www.cybernoia.de/software/archivemount/archivemount-0.9.1.tar.gz" +MD5SUM="954c096230ab1e1f7153555c0221b37d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/archivemount/manpage.diff b/system/archivemount/manpage.diff new file mode 100644 index 0000000000..ed745b1897 --- /dev/null +++ b/system/archivemount/manpage.diff @@ -0,0 +1,335 @@ +diff -Naur archivemount-0.8.7/archivemount.1.in archivemount-0.8.7.patched/archivemount.1.in +--- archivemount-0.8.7/archivemount.1.in 2013-10-24 00:52:59.000000000 -0400 ++++ archivemount-0.8.7.patched/archivemount.1.in 2019-12-17 03:06:50.655875322 -0500 +@@ -5,12 +5,12 @@ + .SH NAME + archivemount \- mounts an archive for access as a file system + .SH SYNOPSIS +-\fBarchivemount\fP [\fB-hVdfs\fP] [\fB-o\fP \fIoptions\fP] \fIarchivepath\fP \fImountpoint\fP ++\fBarchivemount\fP [\fB\-hVdfs\fP] [\fB\-o\fP \fIoptions\fP] \fIarchivepath\fP \fImountpoint\fP + .SH DESCRIPTION + The \fBarchivemount\fP command mounts the file tree contained in the archive + \fIarchivepath\fP on the directory \fImountpoint\fP. The archive's contents + can subsequently be accessed inside \fImountpoint\fP as a file system. The +-\fBumount\fP(8) command performs the corresponding unmount operation. ++\fBumount\fP(8) command (or \fBfusermount \-u\fP) performs the corresponding unmount operation. + + \fBarchivemount\fP is known to work under both linux and Mac OS X (via + MacFUSE). +@@ -34,7 +34,7 @@ + [... Perform desired read/write operations on the archive via mnt/ ...] + + .nf +-$ umount mnt ++$ fusermount -u mnt + + [... Any changes are saved to the archive ...] + +@@ -44,13 +44,13 @@ + Read operations are supported for: + .RS + .IP \(bu +-old-style tar archives, ++old\-style tar archives, + .IP \(bu + most variants of the POSIX ``ustar'' format, + .IP \(bu + the POSIX ``pax interchange'' format, + .IP \(bu +-GNU-format tar archives, ++GNU\-format tar archives, + .IP \(bu + most common cpio archive formats, + .IP \(bu +@@ -65,11 +65,11 @@ + The following formats can be written: + .RS + .IP \(bu +-POSIX-standard ``ustar'' archives, ++POSIX\-standard ``ustar'' archives, + .IP \(bu + POSIX ``pax interchange format'' archives, + .IP \(bu +-POSIX octet-oriented cpio archives, ++POSIX octet\-oriented cpio archives, + .IP \(bu + two different variants of shar archives. + .RE +@@ -83,7 +83,7 @@ + + \fBarchivemount\fP is built upon the FUSE (Filesystem in Userspace) + library, and the complete set of available options depends upon the +-specific FUSE implementation. Execute \fBarchivemount -h\fP to retrieve ++specific FUSE implementation. Execute \fBarchivemount \-h\fP to retrieve + a definitive list. + + .SS "general options" +@@ -216,168 +216,168 @@ + These options are available to Mac users using MacFUSE. + + .TP +-\fB-o\fR allow_other ++\fB\-o\fR allow_other + allow access to others besides the user who mounted the file system + .TP +-\fB-o\fR allow_recursion ++\fB\-o\fR allow_recursion + allow a mount point that itself resides on a MacFUSE volume (by default, + such mounting is disallowed) + .TP +-\fB-o\fR allow_root ++\fB\-o\fR allow_root + allow access to root (can't be used with allow_other) + .TP +-\fB-o\fR auto_xattr ++\fB\-o\fR auto_xattr + handle extended attributes entirely through ._ files + .TP +-\fB-o\fR blocksize=SIZE ++\fB\-o\fR blocksize=SIZE + specify block size in bytes of "storage" + .TP +-\fB-o\fR case_insensitive +-enable case-insensitive mode ++\fB\-o\fR case_insensitive ++enable case\-insensitive mode + .TP +-\fB-o\fR daemon_timeout=T ++\fB\-o\fR daemon_timeout=T + timeout in seconds for kernel calls to daemon + .TP +-\fB-o\fR debug ++\fB\-o\fR debug + turn on debug information printing + .TP +-\fB-o\fR default_permissions ++\fB\-o\fR default_permissions + let the kernel handle permission checks locally + .TP +-\fB-o\fR defer_permissions ++\fB\-o\fR defer_permissions + defer permission checks to file operations themselves + .TP +-\fB-o\fR direct_io +-use alternative (direct) path for kernel-user I/O ++\fB\-o\fR direct_io ++use alternative (direct) path for kernel\-user I/O + .TP +-\fB-o\fR extended_security ++\fB\-o\fR extended_security + turn on Mac OS X extended security (ACLs) + .TP +-\fB-o\fR fsid=FSID +-set the second 32-bit component of the fsid ++\fB\-o\fR fsid=FSID ++set the second 32\-bit component of the fsid + .TP +-\fB-o\fR fsname=NAME ++\fB\-o\fR fsname=NAME + set the file system's name + .TP +-\fB-o\fR fssubtype=NUM ++\fB\-o\fR fssubtype=NUM + set the file system's fssubtype identifier + .TP +-\fB-o\fR fstypename=NAME ++\fB\-o\fR fstypename=NAME + set the file system's type name + .TP +-\fB-o\fR iosize=SIZE ++\fB\-o\fR iosize=SIZE + specify maximum I/O size in bytes + .TP +-\fB-o\fR jail_symlinks ++\fB\-o\fR jail_symlinks + contain symbolic links within the mount + .TP +-\fB-o\fR kill_on_unmount ++\fB\-o\fR kill_on_unmount + kernel will send a signal (SIGKILL by default) to the daemon after unmount + finishes + .TP +-\fB-o\fR local ++\fB\-o\fR local + mark the volume as ``local'' (default is ``nonlocal'') + .TP +-\fB-o\fR negative_vncache +-enable vnode name caching of non-existent objects ++\fB\-o\fR negative_vncache ++enable vnode name caching of non\-existent objects + .TP +-\fB-o\fR volname=NAME ++\fB\-o\fR volname=NAME + set the file system's volume name + + .TP +-\fB-o\fR noalerts ++\fB\-o\fR noalerts + disable all graphical alerts (if any) in MacFUSE Core + .TP +-\fB-o\fR noappledouble ++\fB\-o\fR noappledouble + ignore Apple Double (._) and .DS_Store files entirely + .TP +-\fB-o\fR noapplexattr ++\fB\-o\fR noapplexattr + ignore all ``com.apple.*'' extended attributes + .TP +-\fB-o\fR nobrowse +-mark the volume as non-browsable by the Finder ++\fB\-o\fR nobrowse ++mark the volume as non\-browsable by the Finder + .TP +-\fB-o\fR nolocalcaches ++\fB\-o\fR nolocalcaches + meta option equivalent to noreadahead,noubc,novncache + .TP +-\fB-o\fR noping_diskarb ++\fB\-o\fR noping_diskarb + do not ping Disk Arbitration (pings by default) + .TP +-\fB-o\fR noreadahead +-disable I/O read-ahead behavior for this file system ++\fB\-o\fR noreadahead ++disable I/O read\-ahead behavior for this file system + .TP +-\fB-o\fR nosynconclose +-disable sync-on-close behavior (enabled by default) ++\fB\-o\fR nosynconclose ++disable sync\-on\-close behavior (enabled by default) + .TP +-\fB-o\fR nosyncwrites +-disable synchronous-writes behavior (dangerous) ++\fB\-o\fR nosyncwrites ++disable synchronous\-writes behavior (dangerous) + .TP +-\fB-o\fR noubc ++\fB\-o\fR noubc + disable the unified buffer cache for this file system + .TP +-\fB-o\fR novncache ++\fB\-o\fR novncache + disable the vnode name cache for this file system + + .TP +-\fB-o\fR hard_remove ++\fB\-o\fR hard_remove + immediate removal (don't hide files) + .TP +-\fB-o\fR use_ino ++\fB\-o\fR use_ino + let filesystem set inode numbers + .TP +-\fB-o\fR readdir_ino ++\fB\-o\fR readdir_ino + try to fill in d_ino in readdir + .TP +-\fB-o\fR direct_io ++\fB\-o\fR direct_io + use direct I/O + .TP +-\fB-o\fR kernel_cache ++\fB\-o\fR kernel_cache + cache files in kernel + .TP +-\fB-o\fR [no]auto_cache ++\fB\-o\fR [no]auto_cache + enable caching based on modification times + .TP +-\fB-o\fR umask=M ++\fB\-o\fR umask=M + set file permissions (octal) + .TP +-\fB-o\fR uid=N ++\fB\-o\fR uid=N + set file owner + .TP +-\fB-o\fR gid=N ++\fB\-o\fR gid=N + set file group + .TP +-\fB-o\fR entry_timeout=T ++\fB\-o\fR entry_timeout=T + cache timeout for names (1.0s) + .TP +-\fB-o\fR negative_timeout=T ++\fB\-o\fR negative_timeout=T + cache timeout for deleted names (0.0s) + .TP +-\fB-o\fR attr_timeout=T ++\fB\-o\fR attr_timeout=T + cache timeout for attributes (1.0s) + .TP +-\fB-o\fR ac_attr_timeout=T ++\fB\-o\fR ac_attr_timeout=T + auto cache timeout for attributes (attr_timeout) + .TP +-\fB-o\fR intr ++\fB\-o\fR intr + allow requests to be interrupted + .TP +-\fB-o\fR intr_signal=NUM ++\fB\-o\fR intr_signal=NUM + signal to send on interrupt (30) + .TP +-\fB-o\fR modules=M1[:M2...] ++\fB\-o\fR modules=M1[:M2...] + names of modules to push onto filesystem stack + + .TP +-\fB-o\fR max_write=N ++\fB\-o\fR max_write=N + set maximum size of write requests + .TP +-\fB-o\fR max_readahead=N ++\fB\-o\fR max_readahead=N + set maximum readahead + .TP +-\fB-o\fR async_read ++\fB\-o\fR async_read + perform reads asynchronously (default) + .TP +-\fB-o\fR sync_read ++\fB\-o\fR sync_read + perform reads synchronously + + .SS "Module options" +@@ -393,10 +393,10 @@ + [iconv] + .TP + \fB\-o\fR from_code=CHARSET +-original encoding of file names (default: UTF-8) ++original encoding of file names (default: UTF\-8) + .TP + \fB\-o\fR to_code=CHARSET +-new encoding of the file names (default: ISO-8859-2) ++new encoding of the file names (default: ISO\-8859\-2) + .PD + + +@@ -414,7 +414,7 @@ + + You should have received a copy of the GNU Library General Public + License along with this software; if not, write to the Free Software +-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111\-1307 USA + + + .SH KNOWN BUGS +@@ -422,7 +422,7 @@ + This is beta software and should be treated as such. Bug reports to the + AUTHORS listed below would be appreciated. + +-archivemount is forced to run a single-thread mode for now. Support for ++archivemount is forced to run a single\-thread mode for now. Support for + stable multithreading is planned in a future release. + + +@@ -436,6 +436,7 @@ + .BR pax (1), + .BR tar (1), + .BR umount (8), ++.BR fusermount (1), + and + .BR zip (1) + diff --git a/system/archivemount/slack-desc b/system/archivemount/slack-desc new file mode 100644 index 0000000000..c87b440dae --- /dev/null +++ b/system/archivemount/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------------------------------------------------------| +archivemount: archivemount (mounts an archive for access as a file system) +archivemount: +archivemount: archivemount is a FUSE based file system. Its purpose is to mount +archivemount: an archive on a mount point where it can be read from or written to +archivemount: as with any other file system. This makes accessing the contents of +archivemount: the archive, which may be compressed, transparent to other programs, +archivemount: without decompressing them. +archivemount: +archivemount: Supported archive formats: tar, pax, cpio, iso9660 (CD-ROM) images, +archivemount: zip, shar. Other archive types such as rar and 7z may also work. +archivemount: diff --git a/system/asbt/README.Slackware b/system/asbt/README.Slackware index 259969778c..c1c3728cdb 100644 --- a/system/asbt/README.Slackware +++ b/system/asbt/README.Slackware @@ -1,5 +1,4 @@ -The variables used in the script, which you would probably -adjust according to your wish, are: +Some variables used in the script: 1) REPODIR="$HOME/slackbuilds" # Repository for slackbuilds. diff --git a/system/asbt/asbt.SlackBuild b/system/asbt/asbt.SlackBuild index e906a7bd77..bcc5aa17ba 100644 --- a/system/asbt/asbt.SlackBuild +++ b/system/asbt/asbt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for asbt -# Copyright 2014-2018 Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Copyright 2014-2020 Aaditya Bagga <aaditya_gnulinux@zoho.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=asbt -VERSION=${VERSION:-1.9.2} +VERSION=${VERSION:-2.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/asbt/asbt.info b/system/asbt/asbt.info index 4450b15332..d8bd20df07 100644 --- a/system/asbt/asbt.info +++ b/system/asbt/asbt.info @@ -1,8 +1,8 @@ PRGNAM="asbt" -VERSION="1.9.2" +VERSION="2.1.1" HOMEPAGE="https://github.com/aadityabagga/asbt" -DOWNLOAD="https://github.com/aadityabagga/asbt/archive/1.9.2.tar.gz" -MD5SUM="727e6ca50630daedff3d0a4725529c2b" +DOWNLOAD="https://github.com/aadityabagga/asbt/archive/2.1.1.tar.gz" +MD5SUM="22a9bda61fc6eb4124ecf13a9ece85aa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/asbt/doinst.sh b/system/asbt/doinst.sh index a989c1290e..84e435b430 100644 --- a/system/asbt/doinst.sh +++ b/system/asbt/doinst.sh @@ -1,3 +1,4 @@ + config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" diff --git a/system/atool/atool.SlackBuild b/system/atool/atool.SlackBuild index fe7947a69c..6ccd335da1 100644 --- a/system/atool/atool.SlackBuild +++ b/system/atool/atool.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for atool -# Copyright 2010 David Woodfall <dave@dawoodfall.net> +# Copyright 2010 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/atool/atool.info b/system/atool/atool.info index d016b9a028..6853b6cc31 100644 --- a/system/atool/atool.info +++ b/system/atool/atool.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/atop/142.patch b/system/atop/142.patch new file mode 100644 index 0000000000..b17fe2d6ca --- /dev/null +++ b/system/atop/142.patch @@ -0,0 +1,47 @@ +From aff473ee28903775e1bb35793b9c4c50ee0c7270 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Tue, 22 Dec 2020 12:23:33 +0100 +Subject: [PATCH] ifprop.c: fix build with kernel < 4.6 + +Build fails with kernel headers < 4.6 since version 2.6.0 and +https://github.com/Atoptool/atop/commit/08c622ecaa5bb0bb260984ceaddc4730d1b312a7 + +Indeed, ethtool_link_settings and ETHTOOL_GLINKSETTINGS are only +available since +https://github.com/torvalds/linux/commit/3f1ac7a700d039c61d8d8b99f28d605d489a60cf + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + ifprop.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ifprop.c b/ifprop.c +index 60fa3fa..63fce5a 100644 +--- a/ifprop.c ++++ b/ifprop.c +@@ -104,7 +104,9 @@ initifprop(void) + char *cp, linebuf[2048]; + int i=0, sockfd; + ++#ifdef ETHTOOL_GLINKSETTINGS + struct ethtool_link_settings ethlink; // preferred! ++#endif + struct ethtool_cmd ethcmd; // deprecated + + struct ifreq ifreq; +@@ -153,6 +155,7 @@ initifprop(void) + strncpy((void *)&ifreq.ifr_ifrn.ifrn_name, ifprops[i].name, + sizeof ifreq.ifr_ifrn.ifrn_name-1); + ++#ifdef ETHTOOL_GLINKSETTINGS + ethlink.cmd = ETHTOOL_GLINKSETTINGS; + ifreq.ifr_ifru.ifru_data = (void *)ðlink; + +@@ -164,6 +167,7 @@ initifprop(void) + phy_addr = ethlink.phy_address; + } + else ++#endif + { + ethcmd.cmd = ETHTOOL_GSET; + ifreq.ifr_ifru.ifru_data = (void *)ðcmd; diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild index 246f5fef1b..a8302f3497 100644 --- a/system/atop/atop.SlackBuild +++ b/system/atop/atop.SlackBuild @@ -12,8 +12,8 @@ # http://sam.zoy.org/wtfpl/COPYING for more details. PRGNAM=atop -VERSION=${VERSION:-2.4.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-2.6.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -58,6 +58,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/142.patch + make CFLAGS="$SLKCFLAGS" # Install the binary sgid utmp in order to allow accounting diff --git a/system/atop/atop.info b/system/atop/atop.info index 7fa17d0942..4e380ae2da 100644 --- a/system/atop/atop.info +++ b/system/atop/atop.info @@ -1,8 +1,8 @@ PRGNAM="atop" -VERSION="2.4.0" +VERSION="2.6.0" HOMEPAGE="https://www.atoptool.nl/" -DOWNLOAD="https://www.atoptool.nl/download/atop-2.4.0.tar.gz" -MD5SUM="1077da884ed94f2bc3c81ac3ab970436" +DOWNLOAD="https://www.atoptool.nl/download/atop-2.6.0.tar.gz" +MD5SUM="1cb879c4e98de49dc66ab79791f435d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/autojump/README b/system/autojump/README index 3d2ad6a249..3e949333ec 100644 --- a/system/autojump/README +++ b/system/autojump/README @@ -5,3 +5,35 @@ becomes usable. Autojump will listen and rank your 'cd' commands by frequency. Once your database is reasonably complete, you can "jump" to a commonly "cd"ed directory. It supports the bash, zsh, and tcsh shells. + +Additional Installation Steps +------------------------------ + +Add the following to your .bashrc to enable autojump for your +account: + +[[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh + +You must open a new shell for autojump to become active. You may +also need to log in and out of your desktop environment. + +The default shell in Slackware is Bash. Further steps may be +required for other shell environments. + +Example Usage +-------------- + +$ cd /tmp +$ cd /home +$ cd /var +$ cd /var/log +$ j tmp +$ j log +$ jo /home +$ j -s + +The "j" command drops you back into each directory. The "jo" +command will launch a file manager for the home directory if +you are using a graphical environment. Adding "-s" to the "j" +command will list your autojump database. See the man page +for further details. diff --git a/system/autojump/autojump.SlackBuild b/system/autojump/autojump.SlackBuild index 94d4f6746c..ba2c4d9d93 100644 --- a/system/autojump/autojump.SlackBuild +++ b/system/autojump/autojump.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for autojump # Copyright 2010-2012 Binh Nguyen <binhvng@gmail.com> -# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com> +# Copyright 2015-2018, 2020 Brenton Earl <brent@exitstatusone.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=autojump -VERSION=${VERSION:-22.5.1} +VERSION=${VERSION:-22.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,7 +55,7 @@ sed -i "s/'share', 'man'/'man'/" install.py # Post install message may confuse users, removed # Details listed in included README -sed -i '213,215d' install.py +sed -i '229,232d' install.py # Adjust path for bash file source sed -i "s:/usr/local/:/usr/:g" bin/$PRGNAM.sh diff --git a/system/autojump/autojump.info b/system/autojump/autojump.info index fc62a2a7d5..dcaf89b49a 100644 --- a/system/autojump/autojump.info +++ b/system/autojump/autojump.info @@ -1,8 +1,8 @@ PRGNAM="autojump" -VERSION="22.5.1" +VERSION="22.5.3" HOMEPAGE="https://github.com/wting/autojump" -DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.5.1.tar.gz" -MD5SUM="eaa7344925ae9a03a19cf9b9a3cdb4b4" +DOWNLOAD="https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz" +MD5SUM="29f1a7df736814c747645703bf00ce48" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/autoslackpkg/README b/system/autoslackpkg/README new file mode 100644 index 0000000000..b99aa806f8 --- /dev/null +++ b/system/autoslackpkg/README @@ -0,0 +1,55 @@ +autoslackpkg automates the use of slackpkg. The script expects to be run +as the root user. It also expects specific modifications to blacklist, +mkinitrd.conf, efi.conf & lilo.conf. + +The script maintains multiple kernels and manages EFI & LILO setups (not +GRUB yet). The default boot kernel is changed to the most recent kernel. +In the unlikely event the most recent kernel is not functioning properly +the system can be rebooted with the previous kernel. + +The script has a config file /etc/slackpkg/autoslackpkg.conf that sets +default variables. These variables can be changed based on unique system +requirements. + +The script requires options and arguments. To see usage help +run (autoslackpkg) without options or arguments. Usage help also is +displayed if there is a script option or argument error. + +When run with the -h option and a valid argument (autoslackpkg -h +overview | blacklist | elilo | lilo | mkinitrd) the script provides +help. + +When run with the -m option and a valid argument (autoslackpkg -m dialog +| batch) the script runs in either dialog mode or batch mode. Dialog +mode is a hands-on, interactive mode. Batch mode runs without user +input. + +When run with the -s option (autoslackpkg -s update | install-new | +upgrade-all | clean-system | install-kernel | remove-kernel | +new-config) the script only runs a specific section of the overall +script. + +The script runs in 2 Phases. If not installing a new kernel then +autoslackpkg runs both Phase 1 & Phase 2 in succession. If a new kernel +is installed then only Phase 1 is run & reboot is required. After +reboot, rerun autoslackpkg then Phase 1 is skipped & only Phase 2 is +run. + +Phase 1 includes: + + 1) slackpkg update + 2) slackpkg install-new + 3) slackpkg upgrade-all (see blacklist help) + 4) new kernel download & installation (see blacklist help) + 5) mkinitrd for new kernel (see mkitrd help) + 6) EFI system new kernel management (see elilo help) + 7) LILO system new kernel management (see lilo help) + +Phase 2 includes: + + 1) slackpkg clean-system + 2) EFI system old kernel management (see elilo help) + 3) LILO system old kernel management (see lilo help) + 4) run updatedb + 5) slackpkg new-config + 6) find /etc *.new & *.orig diff --git a/system/autoslackpkg/autoslackpkg.SlackBuild b/system/autoslackpkg/autoslackpkg.SlackBuild new file mode 100644 index 0000000000..e1b22b7102 --- /dev/null +++ b/system/autoslackpkg/autoslackpkg.SlackBuild @@ -0,0 +1,79 @@ +#!/bin/sh + +# Slackware build script for autoslackpkg + +# Copyright 2019, 2020 Stu Miller, Colorado, USA +# 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. + +PRGNAM=autoslackpkg +VERSION=${VERSION:-1.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGELOG \ + README \ + $PKG/usr/doc/$PRGNAM-$VERSION/ +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/etc/slackpkg +cp -a \ + $PRGNAM.conf.new \ + $PKG/etc/slackpkg/ + +mkdir -p $PKG/usr/sbin +cp -a \ + $PRGNAM \ + $PKG/usr/sbin/ + +mkdir -p $PKG/usr/libexec/$PRGNAM +cp -a \ + libexec/$PRGNAM/* \ + $PKG/usr/libexec/$PRGNAM/ + +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:-tgz} diff --git a/system/autoslackpkg/autoslackpkg.info b/system/autoslackpkg/autoslackpkg.info new file mode 100644 index 0000000000..1539f227e6 --- /dev/null +++ b/system/autoslackpkg/autoslackpkg.info @@ -0,0 +1,10 @@ +PRGNAM="autoslackpkg" +VERSION="1.1" +HOMEPAGE="https://www.go4it2day.com/news/autoslackpkg-1.1.html" +DOWNLOAD="https://www.go4it2day.com/downloads/autoslackpkg/1.1/autoslackpkg-1.1.tar.gz" +MD5SUM="02c46c7abf1d532fbba82abb7b73b71c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Stu Miller" +EMAIL="slackbuilds@go4it2day.com" diff --git a/system/autoslackpkg/doinst.sh b/system/autoslackpkg/doinst.sh new file mode 100644 index 0000000000..fbcc100866 --- /dev/null +++ b/system/autoslackpkg/doinst.sh @@ -0,0 +1,16 @@ +# doinst.sh for autoslackpkg + +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... +} + +config etc/slackpkg/autoslackpkg.conf.new diff --git a/system/fs-uae-launcher/slack-desc b/system/autoslackpkg/slack-desc index a5db678416..12e6cf2207 100644 --- a/system/fs-uae-launcher/slack-desc +++ b/system/autoslackpkg/slack-desc @@ -5,15 +5,15 @@ # 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------------------------------------------------------| -fs-uae-launcher: fs-uae-launcher (FS-UAE GUI) -fs-uae-launcher: -fs-uae-launcher: FS-UAE Launcher is a graphical user interface for FS-UAE. -fs-uae-launcher: -fs-uae-launcher: Homepage: http://fs-uae.net/ -fs-uae-launcher: -fs-uae-launcher: -fs-uae-launcher: -fs-uae-launcher: -fs-uae-launcher: -fs-uae-launcher: + |-----handy-ruler------------------------------------------------------| +autoslackpkg: autoslackpkg (automates the use of slackpkg) +autoslackpkg: +autoslackpkg: To see autoslackpkg usage run: autoslackpkg +autoslackpkg: +autoslackpkg: Home: https://www.go4it2day.com/news/autoslackpkg-1.1.html +autoslackpkg: +autoslackpkg: +autoslackpkg: +autoslackpkg: +autoslackpkg: +autoslackpkg: diff --git a/system/avfs/avfs.SlackBuild b/system/avfs/avfs.SlackBuild index 6b8da1ac6f..9e384ac6d5 100644 --- a/system/avfs/avfs.SlackBuild +++ b/system/avfs/avfs.SlackBuild @@ -25,7 +25,7 @@ # Modified by Eugene M., <damagedone at gmx dot com> PRGNAM=avfs -VERSION=${VERSION:-1.0.6} +VERSION=${VERSION:-1.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/avfs/avfs.info b/system/avfs/avfs.info index 25bdf6b2ef..8313618311 100644 --- a/system/avfs/avfs.info +++ b/system/avfs/avfs.info @@ -1,8 +1,8 @@ PRGNAM="avfs" -VERSION="1.0.6" +VERSION="1.1.4" HOMEPAGE="http://avf.sourceforge.net" -DOWNLOAD="http://sourceforge.net/projects/avf/files/avfs/1.0.6/avfs-1.0.6.tar.bz2" -MD5SUM="ad04a13afc4c01a50b7c945602926ce7" +DOWNLOAD="http://sourceforge.net/projects/avf/files/avfs/1.1.4/avfs-1.1.4.tar.bz2" +MD5SUM="c333462d744aeab2e6bee7a1af02350e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="p7zip unrar" diff --git a/system/babeltrace/README b/system/babeltrace/README new file mode 100644 index 0000000000..33faec3c46 --- /dev/null +++ b/system/babeltrace/README @@ -0,0 +1,11 @@ +BabelTrace - Trace Format Babel Tower + +This project provides trace read and write libraries, as well as a +trace converter. A plugin can be created for any trace format to +allow its conversion to/from another trace format. + +The main format expected to be converted to/from is the Common +Trace Format (CTF). + +The CE Workgroup of the Linux Foundation, Ericsson, and EfficiOS have +sponsored this work. diff --git a/system/babeltrace/babeltrace.SlackBuild b/system/babeltrace/babeltrace.SlackBuild new file mode 100644 index 0000000000..edd22d17b6 --- /dev/null +++ b/system/babeltrace/babeltrace.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh + +# Slackware build script for Babeltrace diagnosis mechanism + +# Copyright 2019 Marian Mairnov <mm@yuhu.biz> +# +# 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. + +PRGNAM=babeltrace +VERSION=${VERSION:-1.5.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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.bz2 +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" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --enable-python-bindings \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 ChangeLog CodingStyle LICENSE doc/*.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:-tgz} diff --git a/system/babeltrace/babeltrace.info b/system/babeltrace/babeltrace.info new file mode 100644 index 0000000000..226e28c920 --- /dev/null +++ b/system/babeltrace/babeltrace.info @@ -0,0 +1,10 @@ +PRGNAM="babeltrace" +VERSION="1.5.3" +HOMEPAGE="https://diamon.org/babeltrace/" +DOWNLOAD="http://www.efficios.com/files/babeltrace/babeltrace-1.5.3.tar.bz2" +MD5SUM="0cec2745ac316649791c43f416d71ea1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3" +MAINTAINER="Marian Marinov" +EMAIL="mm@yuhu.biz" diff --git a/system/babeltrace/slack-desc b/system/babeltrace/slack-desc new file mode 100644 index 0000000000..b40062e8fa --- /dev/null +++ b/system/babeltrace/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------------------------------------------------------| +babeltrace: babeltrace (trace format converter) +babeltrace: +babeltrace: The Babeltrace project provides a library, Python bindings of this +babeltrace: library, as well as a handy little command-line tool aptly named +babeltrace: babeltrace which makes it very easy for mere mortals to view and +babeltrace: convert traces. +babeltrace: Babeltrace is also the reference parser implementation of the Common +babeltrace: Trace Format (CTF), a very versatile trace format. The Babeltrace +babeltrace: library and its Python bindings can read and write CTF traces. +babeltrace: +babeltrace: Homepage: https://diamon.org/babeltrace/ diff --git a/system/bacula-client/bacula-client.SlackBuild b/system/bacula-client/bacula-client.SlackBuild index f2e5727f0e..c481a020db 100644 --- a/system/bacula-client/bacula-client.SlackBuild +++ b/system/bacula-client/bacula-client.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Bacula Client -# Copyright 2010, 2012, 2013, 2018 Mario Preksavec, Zagreb, Croatia +# Copyright 2010, 2012, 2013, 2018, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bacula-client -VERSION=${VERSION:-9.0.6} +VERSION=${VERSION:-9.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/bacula-client/bacula-client.info b/system/bacula-client/bacula-client.info index c819e6ad41..506b822dd6 100644 --- a/system/bacula-client/bacula-client.info +++ b/system/bacula-client/bacula-client.info @@ -1,8 +1,8 @@ PRGNAM="bacula-client" -VERSION="9.0.6" +VERSION="9.6.3" HOMEPAGE="http://www.bacula.org" -DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.0.6.tar.gz" -MD5SUM="9168e398808c42bf290515f60892f643" +DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz" +MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/bacula/README.SLACKWARE b/system/bacula/README.SLACKWARE index eaf57eba47..6429187729 100644 --- a/system/bacula/README.SLACKWARE +++ b/system/bacula/README.SLACKWARE @@ -17,8 +17,8 @@ Remember to give executable permission to /etc/rc.d/rc.local_shutdown: chmod 0755 /etc/rc.d/rc.local_shutdown -Upgrading from 5.2.13 to 9.0.6 ------------------------------- +Upgrading from 5.2.13/9.0.6 to 9.6.3 +------------------------------------ Before installing the new package, make sure to: diff --git a/system/bacula/bacula.SlackBuild b/system/bacula/bacula.SlackBuild index a7e1856c7d..30b0059daa 100644 --- a/system/bacula/bacula.SlackBuild +++ b/system/bacula/bacula.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Bacula -# Copyright 2010, 2012, 2013, 2018 Mario Preksavec, Zagreb, Croatia +# Copyright 2010, 2012, 2013, 2018, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bacula -VERSION=${VERSION:-9.0.6} +VERSION=${VERSION:-9.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/bacula/bacula.info b/system/bacula/bacula.info index 4721c04f6d..8ecb0e383d 100644 --- a/system/bacula/bacula.info +++ b/system/bacula/bacula.info @@ -1,8 +1,8 @@ PRGNAM="bacula" -VERSION="9.0.6" +VERSION="9.6.3" HOMEPAGE="http://www.bacula.org" -DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.0.6.tar.gz" -MD5SUM="9168e398808c42bf290515f60892f643" +DOWNLOAD="http://downloads.sourceforge.net/bacula/bacula-9.6.3.tar.gz" +MD5SUM="6d64bc27de773ee0e0ca1d836cbe4008" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/barman/barman.SlackBuild b/system/barman/barman.SlackBuild index 07d5595bb8..6b3fde3f7a 100644 --- a/system/barman/barman.SlackBuild +++ b/system/barman/barman.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for barman -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=barman -VERSION=${VERSION:-2.4} +VERSION=${VERSION:-2.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,7 +72,7 @@ find -L . \ # fix man pages paths sed -i 's/share\/man/man/g' setup.py -python setup.py install --root=$PKG +python3 setup.py install --root=$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 diff --git a/system/barman/barman.info b/system/barman/barman.info index ee78012fe6..03588e0ab4 100644 --- a/system/barman/barman.info +++ b/system/barman/barman.info @@ -1,8 +1,8 @@ PRGNAM="barman" -VERSION="2.4" +VERSION="2.10" HOMEPAGE="http://www.pgbarman.org/" -DOWNLOAD="https://files.pythonhosted.org/packages/6b/37/862e1394617d78a325ae51b430d19b833358f3c76bc4a796b5493e25e327/barman-2.4.tar.gz" -MD5SUM="ad3f4d5f5ea2014108e33796311205bf" +DOWNLOAD="https://files.pythonhosted.org/packages/cc/fb/dca92b36ca6c77da2e8d69382666069504ce6d9ec846bb81a0f81fc9f0ce/barman-2.10.tar.gz" +MD5SUM="6ae19fc6cd493b296f7b8514992440d9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="psycopg2 argh python-dateutil argcomplete" diff --git a/system/bat/README b/system/bat/README new file mode 100644 index 0000000000..40a04228e8 --- /dev/null +++ b/system/bat/README @@ -0,0 +1 @@ +bat is a cat clone with syntax highlighting and Git integration. diff --git a/system/bat/bat.SlackBuild b/system/bat/bat.SlackBuild new file mode 100644 index 0000000000..3ad1d70525 --- /dev/null +++ b/system/bat/bat.SlackBuild @@ -0,0 +1,154 @@ +#!/bin/sh + +# Slackware build script for bat + +# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# 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. + +PRGNAM=bat +VERSION=${VERSION:-0.18.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac + + if [ "$ARCH" = "i586" ]; then + if rustc -Vv | grep host | grep i686 > /dev/null ; then + ARCH=i686 + fi + fi +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" + CARGOTARGET="--target i586-unknown-linux-gnu" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" + CARGOTARGET="--target i686-unknown-linux-gnu" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + CARGOTARGET="--target x86_64-unknown-linux-gnu" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + CARGOTARGET="" +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 + +# build offline +# configuration tells cargo to use the configured directory +# for dependencies intead of downloading from crates.io +mkdir .cargo +cat << EOF >> .cargo/config +[source.crates-io] +registry = 'https://github.com/rust-lang/crates.io-index' +replace-with = 'vendored-sources' + +[source.vendored-sources] +directory = '$(pwd)/vendor' +EOF + +# deps and versions come from Cargo.lock +mkdir vendor +( + cd vendor + + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" + + tar xvf $CWD/$dep-$ver.crate + + touch $dep-$ver/.cargo-ok + + # generate checksum + { + printf "{\n" + printf ' "files": {\n' + + ( + cd $dep-$ver + find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/' + ) | sed '$ s/,$//' + + printf " },\n" + printf ' "package": "' + + sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' + + printf "}\n" + } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + done +) + +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" \ +cargo build --offline --release $CARGOTARGET + +mkdir -p $PKG/usr/bin/ + +find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \; + +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 +cp -a -r \ + LICENSE-APACHE LICENSE-MIT 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/bat/bat.info b/system/bat/bat.info new file mode 100644 index 0000000000..9a8337b2f1 --- /dev/null +++ b/system/bat/bat.info @@ -0,0 +1,304 @@ +PRGNAM="bat" +VERSION="0.18.0" +HOMEPAGE="https://github.com/sharkdp/bat" +DOWNLOAD="https://github.com/sharkdp/bat/archive/v0.18.0/bat-0.18.0.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/adler/adler-0.2.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_colours/ansi_colours-1.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bat/bat-0.18.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bincode/bincode-1.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-set/bit-set-0.5.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.6.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bugreport/bugreport-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clircle/clircle-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/console/console-0.14.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/content_inspector/content_inspector-0.2.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crc32fast/crc32fast-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/difference/difference-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-next/dirs-next-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys-next/dirs-sys-next-0.1.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/doc-comment/doc-comment-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dtoa/dtoa-0.4.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encode_unicode/encode_unicode-0.3.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding/encoding-0.2.33.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-japanese/encoding-index-japanese-1.20141219.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-korean/encoding-index-korean-1.20141219.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-simpchinese/encoding-index-simpchinese-1.20141219.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-singlebyte/encoding-index-singlebyte-1.20141219.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding-index-tradchinese/encoding-index-tradchinese-1.20141219.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_index_tests/encoding_index_tests-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/error-chain/error-chain-0.12.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fancy-regex/fancy-regex-0.3.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/flate2/flate2-1.0.20.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/float-cmp/float-cmp-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/form_urlencoded/form_urlencoded-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.2.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.13.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hashbrown/hashbrown-0.9.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.18.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/indexmap/indexmap-1.6.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/instant/instant-0.1.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazycell/lazycell-1.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.86.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.12.18+1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/line-wrap/line-wrap-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/linked-hash-map/linked-hash-map-0.5.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/miniz_oxide/miniz_oxide-0.4.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.19.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/normalize-line-endings/normalize-line-endings-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.44.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.5.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/onig/onig-6.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/onig_sys/onig_sys-69.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.11.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.8.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/path_abs/path_abs-0.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pest/pest-2.1.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/plist/plist-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.8.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.6.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.2.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-automata/regex-automata-0.1.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.22.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/safemem/safemem-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.10.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.123.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.123.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.62.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_yaml/serde_yaml-0.8.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serial_test/serial_test-0.5.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serial_test_derive/serial_test_derive-0.5.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/shell-words/shell-words-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-1.6.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/snailquote/snailquote-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/std_prelude/std_prelude-0.2.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.60.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/syntect/syntect-4.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/sys-info/sys-info-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/terminal_size/terminal_size-0.1.16.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror/thiserror-1.0.23.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thiserror-impl/thiserror-impl-1.0.23.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.1.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-1.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec_macros/tinyvec_macros-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/treeline/treeline-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-trie/ucd-trie-0.1.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode_categories/unicode_categories-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.2+wasi-snapshot-preview1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wild/wild-2.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/xml-rs/xml-rs-0.8.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/yaml-rust/yaml-rust-0.4.5.crate" +MD5SUM="e49ce07dd1c51c91f67423d62af32abf \ + c9d0c8f38c6686e47c29fe9b409c25c2 \ + 93850f8bf39e61dcf80ce49b5e0943d7 \ + 3b493a3c9dcd266b3b682e2c2f2191e1 \ + 294a49d3c53865fa7ac5d0ce2f5d5735 \ + f44e8d1d2e61974b268852797530ea41 \ + 6bd91b6b8d9a78a24535d0ed8c738a6c \ + 142cb4b9a653e56e56311f0c883b8582 \ + c6443ec8d007c729ba5482008d0c864d \ + 80a2c27647a6acb1890a3a7de8fded72 \ + 75337445ec034d3b0c5c191bc9f10e9a \ + de348f8664b16740eb8d438f9c2fb8a7 \ + 8f8acc3c1caff2043085a0cc28a92757 \ + 45a867175c81501378699f80724393c0 \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + 5521c32e5f09faa1fbbdb584c95316dc \ + 5d0d14275cf3dd93c93733d3f02613c3 \ + c0c854d9b92b342470c85564612651fb \ + b3ebb5d4433417e998d982d46334a6f4 \ + 74634128440dbc3766bda76fdf0aaa05 \ + 1581b390d17f6e73a43ffc8a7b009e57 \ + bc79e0eb364df515a33755ac9a581cfd \ + 1d8b58aa271a21c4196bf1d2a0bb61d1 \ + 4b95605e5c36d3757bad8eb17a64097c \ + 64bebafaf681f39deebbc41b24b3527f \ + e5b87a7cd8e16e7f46ee58f0e75c026a \ + 5e49f4c3f9076fe30ae207fe951f9195 \ + 3681f813c502d911e9eea940dddd26a5 \ + 056c8d712ee146347c412b72f4077b2f \ + dd1e49c76e9d5853e673a3b41ba02917 \ + 99e2caee477220b4f0dcf7fdc6fb1b96 \ + 95a243b2d7c30018a643e218b3c5d693 \ + 1cdd23edc54b385ee5cfb6a0f9f52f17 \ + c19b47edfeea6760da864066bba50208 \ + bb17317266b63ce2a7eb7b8a47f35594 \ + 1618bf8d183d5cee0b6db1392a8f874b \ + 0dbb2c3d83adb1fa4f17ac94e2bef0dc \ + afdb4c49775dbcd9c76763052433d370 \ + 5c31515f4fc8fc5167a5b64f816e915e \ + da699c4c8e4c153cbdb9fb0ef3fb3056 \ + 480f00b3768504ade60944b9b340bc67 \ + 7881509413936dc7382f9314f632787e \ + 2a49454320cf4ea4fde553c66e2e9522 \ + 8dab3b3ec00dc56cffde0b0c410d47b5 \ + e3225eb6ecda0f2c3d1d09c8450f7ef8 \ + b8a0cdd510c32ee8b6cdd47ba3ea3a4c \ + f6ff4e5808bcd44a99b19384561b4f52 \ + e7c07242a95ee1df865efe9534e10a34 \ + 1b94f32581a557963eecb29761e9c0eb \ + 58285dfb5134c5df5503066a20dc9d2c \ + 2c4bc5c16b345ce4d4bbf977577fab35 \ + 37526dd3d44994407f5d2e9ab4fc022d \ + acd3ce35bdaa48ec384fcfec07c0f0dd \ + 1509d8c3ecae86153ea1e5724d2018c9 \ + 4379362bf1be77d47a45c7223a01eead \ + 04a84513cdad48c92d8363d627904227 \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 23cc9e52c52465f5b225e62ab7cc3457 \ + 04f84e88732a1057a37b5d01c23eac1d \ + b5b2006aeb90fbd6a12b32ed9c19bb37 \ + e5768043e447a7423f030c1394440502 \ + 651dd38020e02806ccadcc41df89c7dc \ + 0d60bc25ce9a0383bf64efc300f4cb16 \ + 474d078cf6fb1ea92ec630c7ffa5df90 \ + 40e508baeee8cdccbc471489b0f449ff \ + 7916dcd738a8fa6a2798754c20d6e146 \ + fa3630e5867493e09296155763e4f4a0 \ + c291ac2f4465c030c058a7c1bc595783 \ + 4ade3dff4f5f96ff3aa1c04fd28ac11d \ + f9ddf92ded75c1df47b2dd1379a482fd \ + a8ec1126ef06244ac1e3773981a005f1 \ + c0e036fd990d0c9cae11b5876a5cb572 \ + d227ca24b102ae4ab2a4f3bc3bd44bf3 \ + e7de14df5369a22fe08167972e34df14 \ + 2c223fe5b38361c4aa8b8a4ea832e910 \ + fc5f09918af1f97297e928d728e07236 \ + 467a9abc6c4099e5cb830a0eed66cbfb \ + 88b078aad93b7c645bd6c127e910051b \ + f490982aceabdbd515348f63e638a782 \ + 37cf6acd1c3259eefeba636e4cc9b365 \ + 448bc61aee07661464d98da7660e9a1d \ + 899b172855b10f2e76eea3ecc6314a7d \ + a4ff7abd41c57dfd24bbd4b50edb848f \ + e93afff8bd2e6bc78ba02d6312d7c006 \ + 30d783a004d6ae43913983d49b8466c9 \ + 59425b318d7a80253445671a9fda0aa4 \ + 0736e4f76f4f8f0a29563b0608ca3974 \ + 3233400d1bc56e7c78d4d7564d8e5b74 \ + e878596904877d1d7933d8f89a63dd49 \ + bacea6e63b5b0b7a55a8881b47d80f3a \ + b5b168b1af99cbb8c0f5556ffe56f1e5 \ + 69e9436d5c9889a6fdf199dfc5c3d3fe \ + 03fb8f44e1d4f958154720139bde9cb0 \ + d961a02195226cfce1a1e23ba5980cb4 \ + 26d687e0e0e8b04fafabfcd88f594a53 \ + 3b298ba1d0e5e75b14765b2c48d52b13 \ + bef05db0f0e720c1fd56505850065ae1 \ + 0538d1da369f3e3f0412aa4d735c1b61 \ + a69721c73263cd2040e1a5f120b03a6f \ + 994b165f971ecfc09dc13fca8d394691 \ + 2d8d8b377d144f5e32b4f65a69eb0b24 \ + b4a0a98a54439a5a37952c8879187ee3 \ + d2cc4e584ed64165fc56d2c9081eb3ee \ + 42408be0352a76b14f1e77a6b8858a77 \ + e16bb0d9c46839fbf5d1a69673b00c4c \ + 6ec70075835fed0250bc4407f32d5928 \ + f024ce4a4f4ff7326d9bbe3039017081 \ + 540180a044c1a83c751915586ee3a81c \ + ae34124843bda798c5e387a28ad4b5ea \ + a7bf8d2fe33b8dd1cad14d9f6bd19a7f \ + 1a3070ee58d2d21cb6adaacc71ff27cd \ + e1b37f2526a1f0eed9c0bda62b8095ba \ + 3268d0bb1ba1e9a04ef5d70ceec8cef0 \ + 8e320697cbdcd4b294e671888e746131 \ + 781d4ccf5d04c98fa02af207a9639249 \ + c72a927acc4cc7695ae9c73c19964a6f \ + 4417301f71d3f8408073b0c5dad21697 \ + 0c6cfebb3f8a7b21c76e30d7a59c9fdb \ + 6e328718765f2352dd34f10215488fbb \ + 73d602cc41e3e431bf4fabd129ae1616 \ + 62a72aa48fde11aa7b0daf7788009ca5 \ + a8de006fe0c7e373c560dd51599287a8 \ + b5e95a9fbe4c8fa6b1cee73db0aca22c \ + 85e9f0e4567eafc985f4f4375bf383a6 \ + 36f6470713fffe6b98b6f457c2d2c299 \ + f7d6a4f32f22507c694dd2f2251076aa \ + 7bfcad253aff26bc26c5e3521f3ba891 \ + 8f1da9ba3b7b793efa8a39a159d06035 \ + 6cae4969689ecc3b4b4c31a9fb9539a6 \ + f403bbb812ce1a2d9270d9159cf9e8d3 \ + 9acda194d3610e7d42e09b6de24c717a \ + 4272c279b06b88f8b0ffce7109348e27 \ + a51c43692084979295641a7ffba4b297 \ + 5d5167f36e5fb271a426dfead24427fc \ + 2b19b51b60f46edd8f7826a3e8be2de9 \ + e17e2583e10c6947982de78aeae42a5c \ + 333b4ba3f64c35b6f89b521e8d64548b \ + 8b01b016a9b6deebc1b43f296057efb5 \ + 6708629acf3d2ecb7404e43255d2df85 \ + 1092a4a24e80f8856efc71af51a06114 \ + a061ad1db3e0d839725b037ff8be84e7 \ + 95491f9095e26cbd501d6aadc7322e1c \ + 0498c4a11448bfc35dc7bb2caa64c753 \ + db96b50050277bf05a3c68534bbb9586 \ + b9e37d5fc4ad28b612b78ad37816684d \ + 09de9d01e7331ff3da11f58be8bef0df \ + c78fded8bcf586e5b389e3366d55f9c0 \ + 331d07cdd036d528ede2f69c7ff0beb6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Benjamin Trigona-Harany" +EMAIL="slackbuilds@jaxartes.net" diff --git a/system/bat/slack-desc b/system/bat/slack-desc new file mode 100644 index 0000000000..ce9f6468e9 --- /dev/null +++ b/system/bat/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------------------------------------------------------| +bat: bat (cat clone) +bat: +bat: bat is a cat clone with syntax highlighting and Git integration. +bat: +bat: +bat: +bat: +bat: +bat: +bat: +bat: diff --git a/system/beebem/README b/system/beebem/README new file mode 100644 index 0000000000..4235aeacc2 --- /dev/null +++ b/system/beebem/README @@ -0,0 +1,7 @@ +beebem (BeebEm is a popular Acorn BBC Micro and Master 128 emulator) + +This version of BeebEm for UNIX is an SDL port of the Windows version +of BeebEm. To get the menu system for changing settings, loading and +running disc images and so-on, press F12 when the emulater is running. +It's not as polished as the windows version, especially keyboard +mapping is limited to querty, but its better than nothing. enjoy! :-) diff --git a/system/beebem/beebem.SlackBuild b/system/beebem/beebem.SlackBuild new file mode 100644 index 0000000000..7a2d3c3c1e --- /dev/null +++ b/system/beebem/beebem.SlackBuild @@ -0,0 +1,116 @@ +#!/bin/sh + +# Slackware build script for beebem + +# Copyright 2020 Tim Dickson Scotland +# 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. + +PRGNAM=beebem +VERSION=${VERSION:-0.0.13} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 +patch -p0 <${CWD}/${PRGNAM}-${VERSION}_64bit.patch +patch -p0 <${CWD}/${PRGNAM}-${VERSION}-keys.patch +patch -p0 <${CWD}/${PRGNAM}-${VERSION}_menu_crash.patch +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" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --disable-welcome-message \ + --disable-static \ + --enable-econet \ + --build=$ARCH-slackware-linux + +make +#make install does not honour DESTDIR for anything but the binary, so we +#do a manual install. +#lets create an icon for the .desktop file +convert data/resources/icon.bmp -transparent magenta -resize 64 data/resources/beebem.png +WKDIR=$PKG/usr/share/$PRGNAM +mkdir -p $PKG/usr/bin $WKDIR/config $WKFIR/resources $WKDIR/media $WKDIR/roms $WKDIR/phroms +mkdir -p $WKDIR/state/ $PKG/usr/doc/${PRGNAM}-${VERSION} $WKDIR/src +mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/applications +cp -a data/resources/${PRGNAM}.png $PKG/usr/share/pixmaps/ +cp $CWD/${PRGNAM}.desktop $PKG/usr/share/applications/ +cp -ar src/$PRGNAM $PKG/usr/bin/$PRGNAM +for i in config media phroms resources roms state; do + cp -ar data/$i $WKDIR/ +done + +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 +cp -a COPYING $PKG/usr/doc/${PRGNAM}-${VERSION}/COPYING +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:-tgz} diff --git a/system/beebem/beebem.desktop b/system/beebem/beebem.desktop new file mode 100644 index 0000000000..bcb002059b --- /dev/null +++ b/system/beebem/beebem.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=beebem +GenericName=emulator +Comment=bbc microcomputer emulator. When running press F12 to activate menu +Categories=System;Emulator; +Exec=beebem %F +Icon=beebem + diff --git a/system/beebem/beebem.info b/system/beebem/beebem.info new file mode 100644 index 0000000000..e75a5b9736 --- /dev/null +++ b/system/beebem/beebem.info @@ -0,0 +1,16 @@ +PRGNAM="beebem" +VERSION="0.0.13" +HOMEPAGE="http://beebem-unix.bbcmicro.com/index.html" +DOWNLOAD="http://beebem-unix.bbcmicro.com/download/beebem-0.0.13.tar.gz \ + http://beebem-unix.bbcmicro.com/download/beebem-0.0.13_64bit.patch \ + http://beebem-unix.bbcmicro.com/download/beebem-0.0.13-keys.patch \ + http://beebem-unix.bbcmicro.com/download/beebem-0.0.13_menu_crash.patch" +MD5SUM="44e6edc5c3e5fca9a84e2cddc4bf4858 \ + fb4b26c4b0189dbf0407816314a42ec6 \ + 05d373f8c295039b62f9b48cc4dad9fa \ + 32de835139acabb7b919c18a9ebad830" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Tim Dickson" +EMAIL="dickson.tim@googlemail.com" diff --git a/system/beebem/doinst.sh b/system/beebem/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/system/beebem/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/system/fs-uae/slack-desc b/system/beebem/slack-desc index bab0cb5292..d89bff9124 100644 --- a/system/fs-uae/slack-desc +++ b/system/beebem/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fs-uae: fs-uae (Amiga Emulator) -fs-uae: -fs-uae: FS-UAE focuses on emulating Amiga games using the accurate emulation -fs-uae: code from WinUAE. It also has features to emulate a high-end Amiga -fs-uae: with expansions. -fs-uae: -fs-uae: Homepage: http://fs-uae.net/ -fs-uae: -fs-uae: -fs-uae: -fs-uae: +beebem: beebem (popular Acorn BBC Micro and Master 128 emulator) +beebem: +beebem: This version of BeebEm for UNIX is an SDL port of the Windows version +beebem: of BeebEm +beebem: +beebem: Homepage http://beebem-unix.bbcmicro.com/index.html +beebem: +beebem: +beebem: +beebem: +beebem: diff --git a/system/bin2iso/bin2iso.SlackBuild b/system/bin2iso/bin2iso.SlackBuild index 51c13bbd10..91ef15daf5 100644 --- a/system/bin2iso/bin2iso.SlackBuild +++ b/system/bin2iso/bin2iso.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bin2iso -# Copyright 2016 Hunter Sezen California, USA +# Copyright 2016, 2019 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=bin2iso VERSION=${VERSION:-19b} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -63,12 +63,16 @@ rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION -[ -z "$CC" ] && CC=cc -$CC $SLKCFLAGS -Wall -o $PRGNAM $CWD/$PRGNAM${VERSION}_linux.c -install -Dm0755 $PRGNAM $PKG/usr/bin/$PRGNAM +${CC:-cc} \ + $(printf %s "$SLKCFLAGS") -Wall -o $PRGNAM \ + $CWD/$PRGNAM${VERSION}_linux.c -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/bin" +cp -- $PRGNAM "$PKG/usr/bin/" +chmod 0755 -- "$PKG/usr/bin/$PRGNAM" + +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 cp $CWD/readme.txt $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/bin2iso/bin2iso.info b/system/bin2iso/bin2iso.info index 84e7bca14b..a6adee948f 100644 --- a/system/bin2iso/bin2iso.info +++ b/system/bin2iso/bin2iso.info @@ -1,10 +1,10 @@ PRGNAM="bin2iso" VERSION="19b" HOMEPAGE="http://users.eastlink.ca/~doiron/bin2iso/" -DOWNLOAD="http://users.eastlink.ca/~doiron/bin2iso/linux/bin2iso19b_linux.c" +DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/system/bin2iso/bin2iso19b_linux.c" MD5SUM="01dab72496175a772bcf6e08c854d440" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/bindfs/README b/system/bindfs/README index bb05846c4c..42d162bd3e 100644 --- a/system/bindfs/README +++ b/system/bindfs/README @@ -1,3 +1,3 @@ -bindfs is a FUSE filesystem for mounting a directory to another location, -similarly to mount --bind. The permissions inside the mountpoint can be -altered using various rules. +bindfs is a FUSE filesystem for mounting a directory to another +location, similarly to mount --bind. The permissions inside the +mountpoint can be altered using various rules. diff --git a/system/bindfs/bindfs.SlackBuild b/system/bindfs/bindfs.SlackBuild index f953f7b2bb..390476cdfd 100644 --- a/system/bindfs/bindfs.SlackBuild +++ b/system/bindfs/bindfs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bindfs -# Copyright 2013-2017 Kent Fritz Mountain View, CA, USA +# Copyright 2013-2020 Kent Fritz Mountain View, CA, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bindfs -VERSION=${VERSION:-1.13.7} +VERSION=${VERSION:-1.14.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/bindfs/bindfs.info b/system/bindfs/bindfs.info index 7e18cb74af..e37c36f5ad 100644 --- a/system/bindfs/bindfs.info +++ b/system/bindfs/bindfs.info @@ -1,8 +1,8 @@ PRGNAM="bindfs" -VERSION="1.13.7" +VERSION="1.14.7" HOMEPAGE="https://bindfs.org" -DOWNLOAD="https://bindfs.org/downloads/bindfs-1.13.7.tar.gz" -MD5SUM="c087767dff91b714d5c517797457d479" +DOWNLOAD="https://bindfs.org/downloads/bindfs-1.14.7.tar.gz" +MD5SUM="047ca696707077c05d2d995fbd9aec7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/binfmt-support/README b/system/binfmt-support/README new file mode 100644 index 0000000000..3ee4608e5e --- /dev/null +++ b/system/binfmt-support/README @@ -0,0 +1,33 @@ +binfmt-support + +The binfmt_misc kernel module, contained in versions 2.1.43 and later of the +Linux kernel, allows system administrators to register interpreters for +various binary formats based on a magic number or their file extension, and +cause the appropriate interpreter to be invoked whenever a matching file is +executed. Think of it as a more flexible version of the #! executable +interpreter mechanism. + +binfmt-support provides an update-binfmts script with which package +maintainers can register interpreters to be used with this module without +having to worry about writing their own init.d scripts, and which sysadmins +can use for a slightly higher-level interface to this module. + +You will want to add an fstab entry for binfmt_misc: + + none /proc/sys/fs/binfmt_misc binfmt_misc defaults 0 0 + +You will also want to make sure the binfmt_misc kernel module is loaded at +boot by adding '/sbin/modprobe binfmt_misc' to /etc/rc.d/rc.modules.local. + +To have binfmt-support start and stop with your host, +add to /etc/rc.d/rc.local: + + if [ -x /etc/rc.d/rc.binfmt-support ]; then + /etc/rc.d/rc.binfmt-support start + fi + +and to /etc/rc.d/rc.local_shutdown (creating it if needed): + + if [ -x /etc/rc.d/rc.binfmt-support ]; then + /etc/rc.d/rc.binfmt-support stop + fi diff --git a/system/binfmt-support/binfmt-support.SlackBuild b/system/binfmt-support/binfmt-support.SlackBuild new file mode 100644 index 0000000000..b60ef0d36d --- /dev/null +++ b/system/binfmt-support/binfmt-support.SlackBuild @@ -0,0 +1,115 @@ +#!/bin/sh + +# Slackware build script for binfmt-support + +# Copyright 2019-2020 Andrew Clemons, Wellington New Zealand +# 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. + +PRGNAM=binfmt-support +VERSION=${VERSION:-2.2.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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".orig.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" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + --enable-sysvinit \ + --disable-upstart \ + --disable-systemd + +make +make install DESTDIR=$PKG + +mv $PKG/etc/init.d $PKG/etc/rc.d +mv $PKG/etc/rc.d/binfmt-support $PKG/etc/rc.d/rc.binfmt-support + +sed -i 's/init\.d/rc.d/g' $PKG/etc/rc.d/rc.binfmt-support +sed -i '/^NAME=/s/=/=rc./' $PKG/etc/rc.d/rc.binfmt-support + +chmod 0644 $PKG/etc/rc.d/rc.binfmt-support +mv $PKG/etc/rc.d/rc.binfmt-support $PKG/etc/rc.d/rc.binfmt-support.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 + +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 \ + COPYING ChangeLog-2013 NEWS \ + $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:-tgz} diff --git a/system/binfmt-support/binfmt-support.info b/system/binfmt-support/binfmt-support.info new file mode 100644 index 0000000000..bf6c570f5a --- /dev/null +++ b/system/binfmt-support/binfmt-support.info @@ -0,0 +1,10 @@ +PRGNAM="binfmt-support" +VERSION="2.2.1" +HOMEPAGE="http://binfmt-support.nongnu.org/" +DOWNLOAD="http://deb.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_2.2.1.orig.tar.gz" +MD5SUM="c62b74a8862575f321f8c1ef3e4b8a2e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="man-db" +MAINTAINER="Andrew Clemons" +EMAIL="andrew.clemons@gmail.com" diff --git a/system/binfmt-support/doinst.sh b/system/binfmt-support/doinst.sh new file mode 100644 index 0000000000..36b62594cd --- /dev/null +++ b/system/binfmt-support/doinst.sh @@ -0,0 +1,22 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + rm $NEW + fi +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.binfmt-support.new diff --git a/system/binfmt-support/slack-desc b/system/binfmt-support/slack-desc new file mode 100644 index 0000000000..1d7129136e --- /dev/null +++ b/system/binfmt-support/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------------------------------------------------------| +binfmt-support: binfmt-support (script to register interpreters with binfmt_misc) +binfmt-support: +binfmt-support: binfmt-support provides an update-binfmts script with which +binfmt-support: package maintainers can register interpreters to be used with +binfmt-support: this module without having to worry about writing their own +binfmt-support: init.d scripts, and which sysadmins can use for a slightly +binfmt-support: higher-level interface to this module. +binfmt-support: +binfmt-support: +binfmt-support: https://nongnu.org/binfmt-support/ +binfmt-support: diff --git a/system/bit-babbler/README b/system/bit-babbler/README index 0359eb623e..a6bee17d00 100644 --- a/system/bit-babbler/README +++ b/system/bit-babbler/README @@ -2,4 +2,10 @@ The BitBabbler is a hardware True Random Number Generator (TRNG) manufactured by Voicetronix of Australia. This package installs the software necessary to control and test White and Black BB devices. -Please see README.Slackware for installation tips. +Socket control of BitBabbler devices is granted to group bit-babbler +by default. You can create it after installation like so: + groupadd bit-babbler +OR choose another suitable group (eg, wheel) when building: + BBGROUP="wheel" sh bit-babbler.SlackBuild + +Please see README.Slackware for additional installation tips. diff --git a/system/bit-babbler/README.Slackware b/system/bit-babbler/README.Slackware index d807cf93ed..2e69cb7eaf 100644 --- a/system/bit-babbler/README.Slackware +++ b/system/bit-babbler/README.Slackware @@ -1,26 +1,28 @@ -To begin: groupadd "bit-babbler", or place a modified copy of -90-bit-babbler.rules (found in /lib/udev/rules.d/) into /etc/udev/rules.d -that uses an existing group (e.g., "wheel"). For consistency, change -socket-group in /etc/bit-babbler/seedd.conf to use the same group. +To have BitBabbler device(s) begin feeding entropy to the kernel at +boot, add these lines to /etc/rc.d/rc.local: -To have your BitBabbler device(s) start feeding entropy to the -kernel at boot: + # Start BitBabbler TRNG. + if [ -x /etc/rc.d/rc.seedd ]; then + . /etc/rc.d/rc.seedd start + fi -1. Add the following lines to /etc/rc.d/rc.local: +It's a good idea to stop devices before capturing the entropy pool +on reboot/shutdown, so add these lines to /etc/rc.d/rc.local_shutdown: - # Start BitBabbler TRNG. - if [ -x /etc/rc.d/rc.seedd ]; then - . /etc/rc.d/rc.seedd start - fi + # Stop BitBabbler TRNG. + if [ -x /etc/rc.d/rc.seedd ]; then + . /etc/rc.d/rc.seedd stop + fi -2. Add the following to /etc/rc.d/rc.local_shutdown: +Additional configuration of BitBabbler devices on boot can be set +in /etc/bit-babbler/seedd.conf. - # Stop BitBabbler TRNG. - if [ -x /etc/rc.d/rc.seedd ]; then - . /etc/rc.d/rc.seedd stop - fi +Finally, ensure relevant files are executable: + chmod 755 /etc/rc.d/rc.local \ + /etc/rc.d/rc.local_shutdown \ + /etc/rc.d/rc.seedd -3. Make sure the execute bit is set (chmod) for - /etc/rc.d/rc.local - /etc/rc.d/rc.local_shutdown - /etc/rc.d/rc.seedd +N.B. If changes to the udev rules are needed, + cp /lib/udev/rules.d/90-bit-babbler.rules /etc/udev/rules.d +and modify the copy in /etc/udev/rules.d. eudev will only use the +copy in /etc/udev/rules.d so long as the filenames are the same. diff --git a/system/bit-babbler/bit-babbler.SlackBuild b/system/bit-babbler/bit-babbler.SlackBuild index 6661ad3409..c8344c1afb 100644 --- a/system/bit-babbler/bit-babbler.SlackBuild +++ b/system/bit-babbler/bit-babbler.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# SlackBuild for bit-babbler, 5 March 2018 +# SlackBuild for bit-babbler, 7 March 2019 # awg <awg@cock.li> # All rights reserved. # @@ -22,7 +22,7 @@ PRGNAM=bit-babbler VERSION=${VERSION:-0.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -87,16 +87,24 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$VERSION/examples cp -a debian/copyright debian/changelog debian/bit-babbler.NEWS doc/virtual_machines $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/examples/*.pl $PKG/usr/doc/$PRGNAM-$VERSION/examples cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # install sysctl setting, udev rules, and init script. install -D -m 0644 debian/bit-babbler-sysctl.conf $PKG/etc/sysctl.d/bit-babbler-sysctl.conf install -D -m 0644 debian/bit-babbler.udev $PKG/lib/udev/rules.d/90-bit-babbler.rules install -D -m 0644 $CWD/rc.seedd.new $PKG/etc/rc.d/rc.seedd.new +# set default socket control group in udev rules and seedd.conf for finished package. +if [ "${BBGROUP:=bit-babbler}" ]; then + sed -i -e "s/^\(GROUP=\"\)bit-babbler\(\"\)/\1$BBGROUP\2/" \ + -e "s/\(-m g:\)bit-babbler\(:rw\)/\1$BBGROUP\2/" $PKG/lib/udev/rules.d/90-bit-babbler.rules + mv $PKG/etc/bit-babbler/seedd.conf $PKG/etc/bit-babbler/seedd.conf.new + sed -i -e "s/^\([[:blank:]]*socket-group[[:blank:]]*\)adm/\1$BBGROUP/" $PKG/etc/bit-babbler/seedd.conf.new +fi -# cut out unneeded files. +# remove trash. rm -rv $PKG/lib/systemd/ mkdir -p $PKG/install diff --git a/system/bit-babbler/bit-babbler.info b/system/bit-babbler/bit-babbler.info index d69abf65df..ec82ad4667 100644 --- a/system/bit-babbler/bit-babbler.info +++ b/system/bit-babbler/bit-babbler.info @@ -1,7 +1,7 @@ PRGNAM="bit-babbler" VERSION="0.8" -HOMEPAGE="http://bit-babbler.org/" -DOWNLOAD="http://bit-babbler.org/downloads/bit-babbler_0.8.tar.gz" +HOMEPAGE="http://bitbabbler.org/" +DOWNLOAD="http://bitbabbler.org/downloads/bit-babbler_0.8.tar.gz" MD5SUM="1def2a04c9f0783d8cc466b64b6b118e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/bit-babbler/doinst.sh b/system/bit-babbler/doinst.sh index ec1e814a59..8bee7a6f35 100644 --- a/system/bit-babbler/doinst.sh +++ b/system/bit-babbler/doinst.sh @@ -23,3 +23,4 @@ preserve_perms() { } preserve_perms etc/rc.d/rc.seedd.new +preserve_perms etc/bit-babbler/seedd.conf.new diff --git a/system/bit-babbler/rc.seedd.new b/system/bit-babbler/rc.seedd.new index c7df6b2eff..0843b8c214 100644 --- a/system/bit-babbler/rc.seedd.new +++ b/system/bit-babbler/rc.seedd.new @@ -2,41 +2,37 @@ # # /etc/rc.d/rc.seedd: start and stop BitBabbler TRNG(s). -BBOPTS='--daemon --config=/etc/bit-babbler/seedd.conf' +BBOPTS="--daemon --config=/etc/bit-babbler/seedd.conf" +BBSOCKET=/run/bit-babbler/seedd.socket seedd_start() { - if [ -S /var/run/bit-babbler/seedd.socket ]; then + if [ -S $BBSOCKET ]; then echo 'seedd appears to be already running!' + exit 1 else - echo 'Checking for BitBabbler(s)...' - /usr/bin/seedd --scan + echo 'Checking for BitBabbler...' + /usr/bin/seedd --scan echo "Starting seedd: /usr/bin/seedd $BBOPTS" - /usr/bin/seedd $BBOPTS + /usr/bin/seedd $BBOPTS fi } seedd_stop() { echo 'Stopping seedd...' killall -w seedd - rm -f /var/run/bit-babbler/seedd.socket.lock + # daemon doesn't clean up lock on termination. + rm -f $BBSOCKET.lock } seedd_restart() { seedd_stop - sleep 2 + sleep 2 # ...take a breath... seedd_start } case "$1" in -'start') - seedd_start - ;; -'stop') - seedd_stop - ;; -'restart') - seedd_restart - ;; -*) - echo "usage $0 start|stop|restart" + 'start') seedd_start;; + 'restart') seedd_restart;; + 'stop') seedd_stop;; + *) echo "usage $0 start|restart|stop";; esac diff --git a/system/bit-babbler/slack-desc b/system/bit-babbler/slack-desc index 9653d63592..a68bd4b35b 100644 --- a/system/bit-babbler/slack-desc +++ b/system/bit-babbler/slack-desc @@ -12,7 +12,7 @@ bit-babbler: The BitBabbler is a hardware True Random Number Generator (TRNG) bit-babbler: manufactured by Voicetronix of Australia. This package installs the bit-babbler: software necessary to control and test White and Black BB devices. bit-babbler: -bit-babbler: http://bit-babbler.org/ +bit-babbler: http://bitbabbler.org/ bit-babbler: bit-babbler: bit-babbler: diff --git a/system/bitmapfont2ttf/README b/system/bitmapfont2ttf/README new file mode 100644 index 0000000000..1c9b9a50e0 --- /dev/null +++ b/system/bitmapfont2ttf/README @@ -0,0 +1,17 @@ +bitmapfont2ttf (convert bitmap BDF fonts to vector TTF) + +bitmapfont2ttf is a fontforge Python script which autotraces the glyphs +in a bitmap font and converts it to a vector (outline) TrueType font. +The resulting font retains its "pixelated" look when scaled up to any +size. + +bitmapfont2ttf is a bit picky about the BDF fonts it will accept as +input. This build includes a patch that allows it to work with fonts +produced by psf2bdf (from psftools). The patch is applied by default, +but you can export PRISTINE=yes in the environment if you really don't +want it. + +If you're trying to convert a PCF font, use pcf2bdf to turn it into a +BDF first. + +If you're looking for exact-autotrace, it's included in this build. diff --git a/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild new file mode 100644 index 0000000000..683b4abfce --- /dev/null +++ b/system/bitmapfont2ttf/bitmapfont2ttf.SlackBuild @@ -0,0 +1,82 @@ +#!/bin/sh + +# Slackware build script for bitmapfont2ttf + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# The source tarball contains code from 3 git repositories: +# https://github.com/dse/bitmapfont2ttf +# https://github.com/dse/exact-autotrace +# https://github.com/wernsey/bitmap.git +# ...plus some minor fixes by me to get exact-autotrace to compile. + +PRGNAM=bitmapfont2ttf +VERSION=${VERSION:-20200215_03529d2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# 20200621 bkw: the fonts produced by some tools (notably psf2bdf) +# are missing the PIXEL_SIZE property. Patched code derives it from the +# ascent and descent properties, if necessary. This isn't always correct, +# but for the 670 fonts in /usr/share/fonts/misc (converted to BDF), +# it's correct for 654 (98%) of them. +if [ "${PRISTINE:-no}" != "yes" ]; then + patch -p1 < $CWD/derive_pixel_size.diff + PATCHDESC=" This package includes a patch for fonts without PIXEL_SIZE." +fi + +make -C exact-autotrace CFLAGS="$SLKCFLAGS" +strip exact-autotrace/bin/exact-autotrace-c +mkdir -p $PKG/usr/bin +install -m0755 exact-autotrace/bin/* bin/$PRGNAM $PKG/usr/bin + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md exact-autotrace/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +sed "16s/$/$PATCHDESC/" $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/bitmapfont2ttf/bitmapfont2ttf.info b/system/bitmapfont2ttf/bitmapfont2ttf.info new file mode 100644 index 0000000000..a245e0f4b4 --- /dev/null +++ b/system/bitmapfont2ttf/bitmapfont2ttf.info @@ -0,0 +1,10 @@ +PRGNAM="bitmapfont2ttf" +VERSION="20200215_03529d2" +HOMEPAGE="https://github.com/dse/bitmapfont2ttf" +DOWNLOAD="https://slackware.uk/~urchlay/src/bitmapfont2ttf-20200215_03529d2.tar.xz" +MD5SUM="5f4ab36a5d56c79e28ce38841f063bdc" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/bitmapfont2ttf/derive_pixel_size.diff b/system/bitmapfont2ttf/derive_pixel_size.diff new file mode 100644 index 0000000000..60afe3242c --- /dev/null +++ b/system/bitmapfont2ttf/derive_pixel_size.diff @@ -0,0 +1,13 @@ +diff -Naur bitmapfont2ttf-20200215_03529d2/bin/bitmapfont2ttf bitmapfont2ttf-20200215_03529d2.patched/bin/bitmapfont2ttf +--- bitmapfont2ttf-20200215_03529d2/bin/bitmapfont2ttf 2020-06-08 17:30:53.000000000 -0400 ++++ bitmapfont2ttf-20200215_03529d2.patched/bin/bitmapfont2ttf 2020-06-21 04:06:26.622171278 -0400 +@@ -122,6 +122,9 @@ + continue + (cmd, args) = (args[0].upper(), args[1:]) + if cmd == 'ENDPROPERTIES': ++ if self.pixelSize == None: ++ self.pixelSize = int(self.ascent + self.descent) ++ sys.stderr.write('*** missing PIXEL_SIZE property, derived from FONT_ASCENT + FONT_DESCENT: %d\n' % self.pixelSize); + return + if cmd == 'PIXEL_SIZE' and len(args) >= 1: + self.pixelSize = float(args[0]) diff --git a/system/bitmapfont2ttf/slack-desc b/system/bitmapfont2ttf/slack-desc new file mode 100644 index 0000000000..dd948af0b8 --- /dev/null +++ b/system/bitmapfont2ttf/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------------------------------------------------------| +bitmapfont2ttf: bitmapfont2ttf (convert bitmap BDF fonts to vector TTF) +bitmapfont2ttf: +bitmapfont2ttf: bitmapfont2ttf is a fontforge Python script which autotraces the +bitmapfont2ttf: glyphs in a bitmap font and converts it to a vector (outline) +bitmapfont2ttf: TrueType font. The resulting font retains its "pixelated" look +bitmapfont2ttf: when scaled up to any size. +bitmapfont2ttf: +bitmapfont2ttf: +bitmapfont2ttf: +bitmapfont2ttf: +bitmapfont2ttf: diff --git a/system/bleachbit/bleachbit.SlackBuild b/system/bleachbit/bleachbit.SlackBuild index 0fec329a85..5309956821 100644 --- a/system/bleachbit/bleachbit.SlackBuild +++ b/system/bleachbit/bleachbit.SlackBuild @@ -2,8 +2,8 @@ # # Slackware build script for bleachbit # -# Copyright 2013-2018 Erwin van Zanten, Dordrecht, The Netherlands, Europe -# Copyright 2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2013-2018 Erwin van Zanten, Dordrecht, The Netherlands, Europe +# Copyright 2018-2021 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bleachbit -VERSION=${VERSION:-2.0} +VERSION=${VERSION:-4.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,7 +61,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -70,9 +70,6 @@ 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 {} \; -# Exclude the Windows-only cleaners from the source per author's instructions. -grep -l os=.windows. cleaners/*xml | xargs rm -f - make make install DESTDIR=$PKG prefix=/usr @@ -80,7 +77,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 MANIFEST* COPYING PKG-INFO README* doc/* $PKG/usr/doc/$PRGNAM-$VERSION +cp COPYING README.md doc/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/bleachbit/bleachbit.info b/system/bleachbit/bleachbit.info index 546cde84a6..b2b644d918 100644 --- a/system/bleachbit/bleachbit.info +++ b/system/bleachbit/bleachbit.info @@ -1,10 +1,10 @@ PRGNAM="bleachbit" -VERSION="2.0" +VERSION="4.2.0" HOMEPAGE="https://www.bleachbit.org/" -DOWNLOAD="https://download.bleachbit.org/bleachbit-2.0.tar.bz2" -MD5SUM="0dacb052ffe6dd24b08bb1bdc0b2b980" +DOWNLOAD="https://github.com/bleachbit/bleachbit/archive/v4.2.0/bleachbit-4.2.0.tar.gz" +MD5SUM="39856abb5f3a0bdadf83b07609bed3e3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="pygobject3-python3" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/system/blktrace/blktrace.info b/system/blktrace/blktrace.info index b85ff5617f..bfa19c5b18 100644 --- a/system/blktrace/blktrace.info +++ b/system/blktrace/blktrace.info @@ -1,7 +1,7 @@ PRGNAM="blktrace" VERSION="1.2.0" -HOMEPAGE="http://brick.kernel.dk/snaps/" -DOWNLOAD="http://brick.kernel.dk/snaps/blktrace-1.2.0.tar.gz" +HOMEPAGE="https://brick.kernel.dk/snaps/" +DOWNLOAD="https://brick.kernel.dk/snaps/blktrace-1.2.0.tar.gz" MD5SUM="05abb873b4de96c5e7b2deba80695bf1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/bonnie++/bonnie++.SlackBuild b/system/bonnie++/bonnie++.SlackBuild index fe1243f8bb..b9c011e052 100644 --- a/system/bonnie++/bonnie++.SlackBuild +++ b/system/bonnie++/bonnie++.SlackBuild @@ -1,11 +1,11 @@ #!/bin/sh # Slackware build script for bonnie++ -# Written by Vincent Batts, vbatts@batts.mine.nu +# Written by Vincent Batts <vbatts@hashbangbash.com> # Modified by Michiel van Wessem <michiel@slackbuils.org> PRGNAM=bonnie++ -VERSION=${VERSION:-1.03e} +VERSION=${VERSION:-1.04} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,7 +42,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tgz +tar xvf $CWD/${PRGNAM}_${VERSION}.tgz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/bonnie++/bonnie++.info b/system/bonnie++/bonnie++.info index cc63a14cc4..620997acb5 100644 --- a/system/bonnie++/bonnie++.info +++ b/system/bonnie++/bonnie++.info @@ -1,8 +1,8 @@ PRGNAM="bonnie++" -VERSION="1.03e" +VERSION="1.04" HOMEPAGE="http://www.coker.com.au/bonnie++/" -DOWNLOAD="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz" -MD5SUM="750aa5b5051263a99c6c195888c74968" +DOWNLOAD="http://www.coker.com.au/bonnie++/bonnie++_1.04.tgz" +MD5SUM="1414aab86e2db1b4691bd4be82031012" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/borgbackup/01-msgpack-python-renamed.patch b/system/borgbackup/01-msgpack-python-renamed.patch deleted file mode 100644 index 00cf94c9ef..0000000000 --- a/system/borgbackup/01-msgpack-python-renamed.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- setup.py 2018-12-09 03:18:19.000000000 +0100 -+++ setup.py.new 2018-12-09 09:43:12.950202360 +0100 -@@ -39,7 +39,7 @@ - # we are rather picky about msgpack versions, because a good working msgpack is - # very important for borg, see https://github.com/borgbackup/borg/issues/3753 - # best versions seem to be 0.4.6, 0.4.7, 0.4.8 and 0.5.6: -- 'msgpack-python >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5', -+ 'msgpack >=0.4.6, <=0.5.6, !=0.5.0, !=0.5.1, !=0.5.2, !=0.5.3, !=0.5.4, !=0.5.5', - # if you can't satisfy the above requirement, these are versions that might - # also work ok, IF you make sure to use the COMPILED version of msgpack-python, - # NOT the PURE PYTHON fallback implementation: ==0.5.1, ==0.5.4 ---- src/borgbackup.egg-info/requires.txt 2018-12-09 03:37:50.000000000 +0100 -+++ src/borgbackup.egg-info/requires.txt.new 2018-12-09 09:47:08.958294779 +0100 -@@ -1,4 +1,4 @@ --msgpack-python!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,!=0.5.4,!=0.5.5,<=0.5.6,>=0.4.6 -+msgpack!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,!=0.5.4,!=0.5.5,<=0.5.6,>=0.4.6 - - [fuse] - llfuse<2.0 diff --git a/system/borgbackup/README b/system/borgbackup/README index 26302d1265..6d9f2dc9cf 100644 --- a/system/borgbackup/README +++ b/system/borgbackup/README @@ -9,10 +9,13 @@ targets. Borg is a fork of Attic and is maintained by "The Borg collective". +FIXME: + Due to outdated version of llfuse here at SBo, building borgbackup + with mount support using llfuse will fail. + Optional dependencies: -- llfuse (https://slackbuilds.org/apps/llfuse/) is required, - if you wish to mount an archive as a FUSE filesystem, -- Sphinx (https://slackbuilds.org/apps/Sphinx/) and guzzle_sphinx_theme - (https://slackbuilds.org/apps/guzzle_sphinx_theme/) are required if - you wish to build the docs (html, man). Please note that the build - will fail if Sphinx is installed, but guzzle_sphinx_theme is not. +- llfuse is required if you wish to mount an archive using FUSE, +- Sphinx, alabaster, guzzle_sphinx_theme, imagesize, python3-attrs, + python3-certifi and python-urllib3 are required if you wish to build + the docs (html, man). Please note that the build will fail if Sphinx + is installed, but the other required packages are not. diff --git a/system/borgbackup/borgbackup.SlackBuild b/system/borgbackup/borgbackup.SlackBuild index 96bc56314b..e7b71cf172 100644 --- a/system/borgbackup/borgbackup.SlackBuild +++ b/system/borgbackup/borgbackup.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for borgbackup -# Copyright 2018 Andrzej Telszewski, Szczecin +# Copyright 2020 Andrzej Telszewski, Szczecin # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=borgbackup -VERSION=${VERSION:-1.1.8} +VERSION=${VERSION:-1.1.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,10 +69,6 @@ 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 msgpack-python => msgpack package rename. -# Thanks to Audrius Kažukauskas. -patch -p0 < $CWD/01-msgpack-python-renamed.patch - python3 setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/borgbackup/borgbackup.info b/system/borgbackup/borgbackup.info index ef49545e9d..57a140bdfd 100644 --- a/system/borgbackup/borgbackup.info +++ b/system/borgbackup/borgbackup.info @@ -1,8 +1,8 @@ PRGNAM="borgbackup" -VERSION="1.1.8" +VERSION="1.1.13" HOMEPAGE="https://borgbackup.readthedocs.io/" -DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.8/borgbackup-1.1.8.tar.gz" -MD5SUM="bad2c745d6f683e552cee3b48ee8f1ce" +DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.13/borgbackup-1.1.13.tar.gz" +MD5SUM="a82d2bdf61bfaeebb90ac8ab1347657a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libb2 lz4 msgpack-python python3 setuptools-scm zstd" diff --git a/system/btrbk/README b/system/btrbk/README index 76bff1ea52..6e1e0c0835 100644 --- a/system/btrbk/README +++ b/system/btrbk/README @@ -24,5 +24,5 @@ Key Features: * Display file changes between two backups btrbk is designed to run as a cron job for triggering periodic snapshots -and backups, as well as from the command line (e.g. for instantly creating -additional snapshots). +and backups, as well as from the command line (e.g. for instantly +creating additional snapshots). diff --git a/system/btrbk/btrbk.SlackBuild b/system/btrbk/btrbk.SlackBuild index 58c234ce8a..b6f317e277 100644 --- a/system/btrbk/btrbk.SlackBuild +++ b/system/btrbk/btrbk.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for btrbk -# Copyright 2019 Alan Aversa +# Copyright 2020 Alan Aversa # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=btrbk -VERSION=${VERSION:-0.27.1} +VERSION=${VERSION:-0.31.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/btrbk/btrbk.info b/system/btrbk/btrbk.info index 7d4019cbb1..e7725f2fe6 100644 --- a/system/btrbk/btrbk.info +++ b/system/btrbk/btrbk.info @@ -1,10 +1,10 @@ PRGNAM="btrbk" -VERSION="0.27.1" +VERSION="0.31.0" HOMEPAGE="https://digint.ch/btrbk/" -DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.27.1.tar.xz" -MD5SUM="127bc0bfbef3e720c2400f2c619ddca4" +DOWNLOAD="https://digint.ch/download/btrbk/releases/btrbk-0.31.0.tar.xz" +MD5SUM="e6d430a3145d021672f11a2a5dbe05b3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="rubygem-asciidoctor" MAINTAINER="Alan Aversa" EMAIL="alan.aveNOrsaSP@AMcox.net (remove NO and SPAM)" diff --git a/system/bubblewrap/bubblewrap.SlackBuild b/system/bubblewrap/bubblewrap.SlackBuild index f06a061796..53d6bef9fb 100644 --- a/system/bubblewrap/bubblewrap.SlackBuild +++ b/system/bubblewrap/bubblewrap.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bubblewrap -# Copyright 2017, 2018 Vincent Batts <vbatts@hashbangbash.com> +# Copyright 2017, 2018, 2019 Vincent Batts <vbatts@hashbangbash.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=bubblewrap -VERSION=${VERSION:-0.3.1} +VERSION=${VERSION:-0.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/bubblewrap/bubblewrap.info b/system/bubblewrap/bubblewrap.info index b8a94d9dfd..9366cd4180 100644 --- a/system/bubblewrap/bubblewrap.info +++ b/system/bubblewrap/bubblewrap.info @@ -1,8 +1,8 @@ PRGNAM="bubblewrap" -VERSION="0.3.1" -HOMEPAGE="https://github.com/projectatomic/bubblewrap/" -DOWNLOAD="https://github.com/projectatomic/bubblewrap/releases/download/v0.3.1/bubblewrap-0.3.1.tar.xz" -MD5SUM="c34034985e80bdea39aaaaa4bcb92c64" +VERSION="0.4.0" +HOMEPAGE="https://github.com/containers/bubblewrap/" +DOWNLOAD="https://github.com/containers/bubblewrap/releases/download/v0.4.0/bubblewrap-0.4.0.tar.xz" +MD5SUM="a0f3f2c80a3bad535af5bbd1b502450c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/buildah/README b/system/buildah/README new file mode 100644 index 0000000000..75d3214ce2 --- /dev/null +++ b/system/buildah/README @@ -0,0 +1,35 @@ +buildah is a (daemon-free) container build utility + +The Buildah package provides a command line tool that can be used to + +* create a working container, either from scratch or using an image as a + starting point +* create an image, either from a working container or via the instructions in a + Dockerfile +* images can be built in either the OCI image format or the traditional + upstream docker image format +* mount a working container's root filesystem for manipulation +* unmount a working container's root filesystem +* use the updated contents of a container's root filesystem as a filesystem + layer to create a new image +* delete a working container or an image +* rename a local container + +For examples, see: +* https://github.com/containers/buildah or /usr/doc/buildah-*/README.md +* man pages + +non-root usage: + +plenty of kernel recent kernel's support the user-namespace sub uid/gid +mapping. Only recent versions of shadow-utils will append a new mapping for +users when they are created. You may have to add a mapping for your user like +so: + +```shell +echo "$YOURUSER:100000:65536" > /etc/subuid +echo "$YOURGROUP:100000:65536" > /etc/subgid +``` + +if you have more than one non-root user to add a mapping for, then their start +number (like `100000` above) would begin after 100000+65536. diff --git a/system/buildah/buildah.SlackBuild b/system/buildah/buildah.SlackBuild new file mode 100644 index 0000000000..eb674e63c6 --- /dev/null +++ b/system/buildah/buildah.SlackBuild @@ -0,0 +1,102 @@ +#!/bin/sh + +# Slackware build script for buildah + +# Copyright 2019 Vincent Batts, Raleigh, NC, USA +# 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. + +PRGNAM=buildah +VERSION=${VERSION:-1.5} +GIT_COMMIT="e94b4f9" +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +# The domain part of the go package name, usually the hosting platform +DOMAIN=github.com +# The name of the organization/owner of the package +ORG=containers + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-$VERSION +mkdir -p $PRGNAM-$VERSION/src/$DOMAIN/$ORG +cd $PRGNAM-$VERSION/src/$DOMAIN/$ORG +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +mv $PRGNAM-$VERSION $PRGNAM +cd $PRGNAM +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 {} \; + +# Point go to the location of the source tree +export GOPATH="$TMP/$PRGNAM-$VERSION" + +sed -i 's|GIT_COMMIT :=|GIT_COMMIT ?=|' Makefile + +make binary docs GIT_COMMIT="$GIT_COMMIT" TAGS="'seccomp containers_image_ostree_stub'" +make install install.completions GIT_COMMIT="$GIT_COMMIT" PREFIX="/usr" DESTDIR="$PKG" MANDIR="/usr/man" + +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 \ + LICENSE README.md vendor.conf \ + $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:-tgz} diff --git a/system/buildah/buildah.info b/system/buildah/buildah.info new file mode 100644 index 0000000000..5ae306f82a --- /dev/null +++ b/system/buildah/buildah.info @@ -0,0 +1,10 @@ +PRGNAM="buildah" +VERSION="1.5" +HOMEPAGE="https://github.com/containers/buildah" +DOWNLOAD="https://github.com/containers/buildah/archive/v1.5/buildah-1.5.tar.gz" +MD5SUM="a1b38dcbab076e058e1098a84fde3c17" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="go-md2man runc" +MAINTAINER="Vincent Batts" +EMAIL="vbatts@hashbangbash.com" diff --git a/system/buildah/slack-desc b/system/buildah/slack-desc new file mode 100644 index 0000000000..defd1be19f --- /dev/null +++ b/system/buildah/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------------------------------------------------------| +buildah: buildah (container build utility) +buildah: +buildah: buildah facilitates building OCI container images, all without a +buildah: daemon. It supports a bash-style invocation, as well as Dockerfiles. +buildah: +buildah: https://github.com/containers/buildah +buildah: +buildah: +buildah: +buildah: +buildah: diff --git a/system/cabextract/cabextract.SlackBuild b/system/cabextract/cabextract.SlackBuild index fbe1985678..851684c820 100644 --- a/system/cabextract/cabextract.SlackBuild +++ b/system/cabextract/cabextract.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cabextract -VERSION=${VERSION:-1.9} +VERSION=${VERSION:-1.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/cabextract/cabextract.info b/system/cabextract/cabextract.info index 4da9745e6b..2862b4afbb 100644 --- a/system/cabextract/cabextract.info +++ b/system/cabextract/cabextract.info @@ -1,8 +1,8 @@ PRGNAM="cabextract" -VERSION="1.9" +VERSION="1.9.1" HOMEPAGE="https://www.cabextract.org.uk" -DOWNLOAD="https://www.cabextract.org.uk/cabextract-1.9.tar.gz" -MD5SUM="c38f4d1920dd4f597c707f16273ad480" +DOWNLOAD="https://www.cabextract.org.uk/cabextract-1.9.1.tar.gz" +MD5SUM="cb0ee8eee4f6596fa18478d59e1973c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/capabilities/README b/system/capabilities/README new file mode 100644 index 0000000000..14427bfbcd --- /dev/null +++ b/system/capabilities/README @@ -0,0 +1,9 @@ +This is basically a simple form of shadow/unshadow kind of thingy for Linux CAPABILITIES(7) + +Just have a look at, and maybe add to: /etc/default/capabilities + +And add the following to /etc/rc.d/rc.local + +if [ -x /etc/rc.d/rc.capabilities ]; then + /etc/rc.d/rc.capabilities start +fi diff --git a/system/capabilities/capabilities.SlackBuild b/system/capabilities/capabilities.SlackBuild new file mode 100644 index 0000000000..e58605b3eb --- /dev/null +++ b/system/capabilities/capabilities.SlackBuild @@ -0,0 +1,69 @@ +#!/bin/sh + +# Slackware build script forcapabilities + +# Copyright 2019, Menno E. Duursma, North Holland, The Netherlands +# 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. + +PRGNAM=capabilities +VERSION=${VERSION:-0.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mv $PKG/etc/default/capabilities $PKG/etc/default/capabilities.new +mv $PKG/etc/rc.d/rc.capabilities $PKG/etc/rc.d/rc.capabilities.new + +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:-tgz} diff --git a/system/capabilities/capabilities.info b/system/capabilities/capabilities.info new file mode 100644 index 0000000000..08f3adb752 --- /dev/null +++ b/system/capabilities/capabilities.info @@ -0,0 +1,10 @@ +PRGNAM="capabilities" +VERSION="0.1" +HOMEPAGE="https://github.com/druiloor/capabilities" +DOWNLOAD="https://github.com/druiloor/capabilities/archive/v0.1/capabilities-0.1.tar.gz" +MD5SUM="28a7263ccdeaab544fecebaf0b2dade5" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Menno E. Duursma" +EMAIL="druiloor@zonnet.nl" diff --git a/system/capabilities/doinst.sh b/system/capabilities/doinst.sh new file mode 100644 index 0000000000..1d973e6283 --- /dev/null +++ b/system/capabilities/doinst.sh @@ -0,0 +1,26 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.capabilities.new +config etc/default/capabilities.new diff --git a/system/capabilities/slack-desc b/system/capabilities/slack-desc new file mode 100644 index 0000000000..234dbad309 --- /dev/null +++ b/system/capabilities/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------------------------------------------------------| +capabilities: capabilities (fcaps) +capabilities: +capabilities: This script sets filesystem caps from a config file. +capabilities: +capabilities: +capabilities: +capabilities: +capabilities: +capabilities: +capabilities: +capabilities: diff --git a/system/capstone/capstone.SlackBuild b/system/capstone/capstone.SlackBuild index fe645c81ef..27aeb32b93 100644 --- a/system/capstone/capstone.SlackBuild +++ b/system/capstone/capstone.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=capstone -VERSION=${VERSION:-3.0.5} +VERSION=${VERSION:-4.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -101,12 +101,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr # to generate .pc file do: $ python setup.py build # inside bindings/python mkdir -p $PKG/usr/share/pkgconfig -sed -e "s|%VERSION%|$VERSION|" -e "s|%LIBDIRSUFFIX%|$LIBDIRSUFFIX|" \ - < $CWD/capstone.pc.in \ +sed -e "s|@CMAKE_INSTALL_PREFIX@|/usr|" \ + -e "s|@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@|$VERSION|" \ + -e "s|@LIBSUFFIX@|$LIBDIRSUFFIX|" \ + < capstone.pc.in \ > $PKG/usr/share/pkgconfig/capstone.pc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COMPILE* LICENSE* README TODO RELEASE_NOTES HACK.TXT ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COMPILE* CREDITS.TXT ChangeLog HACK.TXT LICENSE* README.md RELEASE_NOTES SPONSORS.TXT TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/capstone/capstone.info b/system/capstone/capstone.info index e79138c439..7ced80cd88 100644 --- a/system/capstone/capstone.info +++ b/system/capstone/capstone.info @@ -1,8 +1,8 @@ PRGNAM="capstone" -VERSION="3.0.5" +VERSION="4.0.1" HOMEPAGE="http://www.capstone-engine.org" -DOWNLOAD="https://github.com/aquynh/capstone/archive/3.0.5/capstone-3.0.5.tar.gz" -MD5SUM="2cd59a5a83b50fbf7663b1678bae9410" +DOWNLOAD="https://github.com/aquynh/capstone/archive/4.0.1/capstone-4.0.1.tar.gz" +MD5SUM="1b0a9a0d50d9515dcf7684ce0a2270a4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ccd2cue/README b/system/ccd2cue/README new file mode 100644 index 0000000000..fa0b35ab09 --- /dev/null +++ b/system/ccd2cue/README @@ -0,0 +1,5 @@ +ccd2cue (convert proprietary CloneCD images to bin/cue) + +GNU ccd2cue is a CCD sheet to CUE sheet converter. It supports the full +extent of CUE sheet format expressiveness, including mixed-mode discs +and CD-Text meta-data. diff --git a/system/ccd2cue/ccd2cue.SlackBuild b/system/ccd2cue/ccd2cue.SlackBuild new file mode 100644 index 0000000000..743c380b2b --- /dev/null +++ b/system/ccd2cue/ccd2cue.SlackBuild @@ -0,0 +1,82 @@ +#!/bin/sh + +# Slackware build script for ccd2cue + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=ccd2cue +VERSION=${VERSION:-0.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --infodir=/usr/info \ + --build=$ARCH-slackware-linux + +make +make install-strip DESTDIR=$PKG + +find $PKG/usr/man -type f -exec gzip -9 {} \; + +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/*.info* + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +# Skip Makefile*, INSTALL, and long political rants. +cp -a THANKS A[NU]* [B-HN-SUVXYZ]* $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:-tgz} diff --git a/system/ccd2cue/ccd2cue.info b/system/ccd2cue/ccd2cue.info new file mode 100644 index 0000000000..02c096e670 --- /dev/null +++ b/system/ccd2cue/ccd2cue.info @@ -0,0 +1,10 @@ +PRGNAM="ccd2cue" +VERSION="0.5" +HOMEPAGE="https://www.gnu.org/software/ccd2cue/" +DOWNLOAD="http://ftpmirror.gnu.org/ccd2cue/ccd2cue-0.5.tar.gz" +MD5SUM="565eb34e3ab5331ee5aab2fe215118aa" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/ccd2cue/slack-desc b/system/ccd2cue/slack-desc new file mode 100644 index 0000000000..c0973a04e7 --- /dev/null +++ b/system/ccd2cue/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------------------------------------------------------| +ccd2cue: ccd2cue (convert proprietary CloneCD images to bin/cue) +ccd2cue: +ccd2cue: GNU ccd2cue is a CCD sheet to CUE sheet converter. It supports the +ccd2cue: full extent of CUE sheet format expressiveness, including mixed-mode +ccd2cue: discs and CD-Text meta-data. +ccd2cue: +ccd2cue: +ccd2cue: +ccd2cue: +ccd2cue: +ccd2cue: diff --git a/system/cdemu-client/cdemu-client.SlackBuild b/system/cdemu-client/cdemu-client.SlackBuild index f596a62182..9afa65b685 100644 --- a/system/cdemu-client/cdemu-client.SlackBuild +++ b/system/cdemu-client/cdemu-client.SlackBuild @@ -4,7 +4,7 @@ # command-line client for cdemu-daemon # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com> -# Copyright 2018 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cdemu-client -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.2.4} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/cdemu-client/cdemu-client.info b/system/cdemu-client/cdemu-client.info index b9bab3a3e3..1d646ff8f3 100644 --- a/system/cdemu-client/cdemu-client.info +++ b/system/cdemu-client/cdemu-client.info @@ -1,8 +1,8 @@ PRGNAM="cdemu-client" -VERSION="3.2.0" -HOMEPAGE="http://cdemu.sourceforge.net/about/client/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-client-3.2.0.tar.bz2" -MD5SUM="da971b08ae76b1d65464a158213c6c30" +VERSION="3.2.4" +HOMEPAGE="https://cdemu.sourceforge.io/about/client/" +DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-client-3.2.4.tar.bz2" +MD5SUM="5eadc5691fabfc7c54e926d5d1ceb8bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cdemu-daemon pygobject3-python3" diff --git a/system/cdemu-client/slack-desc b/system/cdemu-client/slack-desc index e2be4ac287..e882420ec0 100644 --- a/system/cdemu-client/slack-desc +++ b/system/cdemu-client/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| cdemu-client: cdemu-client (command-line client for CDEmu-daemon) cdemu-client: -cdemu-client: CDEmu client is a simple command-line client for controlling CDEmu- -cdemu-client: daemon. +cdemu-client: CDEmu client is a simple command-line client for controlling +cdemu-client: CDEmu-daemon. +cdemu-client: cdemu-client: It provides a way to perform the key tasks related to controlling the cdemu-client: CDEmu daemon, such as loading and unloading devices, displaying cdemu-client: devices' status and retrieving/setting devices' debug masks. cdemu-client: -cdemu-client: Homepage: http://cdemu.sourceforge.net/about/client/ -cdemu-client: +cdemu-client: Homepage: https://cdemu.sourceforge.io/about/client/ cdemu-client: diff --git a/system/cdemu-daemon/README b/system/cdemu-daemon/README index 25c517b7c4..b1229b97fc 100644 --- a/system/cdemu-daemon/README +++ b/system/cdemu-daemon/README @@ -2,6 +2,8 @@ CDEmu daemon is the userspace daemon part of the cdemu suite. a free, GPL CD/DVD-ROM device emulator for linux. This SlackBuild uses group cdrom as default. -To use another group ex. cdemu run the script like this: +To use another group (e.x. cdemu), add its name as an +argument to the GROUP variable when running the build script. +For example: - GROUP=cdemu ./cdemu-daemon.SlackBuild +GROUP=cdemu ./cdemu-daemon.SlackBuild diff --git a/system/cdemu-daemon/README.SLACKWARE b/system/cdemu-daemon/README.SLACKWARE index 3569f6367c..d68901e1fd 100644 --- a/system/cdemu-daemon/README.SLACKWARE +++ b/system/cdemu-daemon/README.SLACKWARE @@ -2,15 +2,15 @@ README.SLACKWARE To start the cdemu-daemon at boot, add the following to /etc/rc.d/rc.local: - # Start cdemu-daemon. - if [ -x /etc/rc.d/rc.cdemud ]; then - /etc/rc.d/rc.cdemud start - fi +# Start cdemu-daemon. +if [ -x /etc/rc.d/rc.cdemud ]; then + /etc/rc.d/rc.cdemud start +fi Add this to /etc/rc.d/rc.local_shutdown (if this file does not already exist, create it and make it executable): - # Stop cdemu-daemon. - if [ -x /etc/rc.d/rc.cdemud ]; then - /etc/rc.d/rc.cdemud stop - fi +# Stop cdemu-daemon. +if [ -x /etc/rc.d/rc.cdemud ]; then + /etc/rc.d/rc.cdemud stop +fi diff --git a/system/cdemu-daemon/cdemu-daemon.SlackBuild b/system/cdemu-daemon/cdemu-daemon.SlackBuild index 5d1c484584..691c02f314 100644 --- a/system/cdemu-daemon/cdemu-daemon.SlackBuild +++ b/system/cdemu-daemon/cdemu-daemon.SlackBuild @@ -1,10 +1,10 @@ #!/bin/sh # Slackware build script for cdemu-daemon -# -# Copyright 2008 Niklas "Nille" Ã…kerström + +# Copyright 2008 Niklas "Nille" Ã…kerström # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com> -# Copyright 2018 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cdemu-daemon -VERSION=${VERSION:-3.2.1} +VERSION=${VERSION:-3.2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/cdemu-daemon/cdemu-daemon.info b/system/cdemu-daemon/cdemu-daemon.info index 0f8c572451..3a27c0b19b 100644 --- a/system/cdemu-daemon/cdemu-daemon.info +++ b/system/cdemu-daemon/cdemu-daemon.info @@ -1,8 +1,8 @@ PRGNAM="cdemu-daemon" -VERSION="3.2.1" -HOMEPAGE="http://cdemu.sourceforge.net/about/daemon/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-3.2.1.tar.bz2" -MD5SUM="673bec5d723d4710fe8835109ec6be92" +VERSION="3.2.4" +HOMEPAGE="https://cdemu.sourceforge.io/about/daemon/" +DOWNLOAD="https://downloads.sourceforge.net/cdemu/cdemu-daemon-3.2.4.tar.bz2" +MD5SUM="9021f56fd95686f5b14d3b32f68e7b1a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmirage vhba-module" diff --git a/system/cdemu-daemon/slack-desc b/system/cdemu-daemon/slack-desc index 9ac5fdb937..bcfe0793c7 100644 --- a/system/cdemu-daemon/slack-desc +++ b/system/cdemu-daemon/slack-desc @@ -15,5 +15,5 @@ cdemu-daemon: one instance per each device registered by kernel module. cdemu-daemon: It uses libMirage, an image access library that is part of cdemu-daemon: demu suite, for the image access. cdemu-daemon: -cdemu-daemon: Homepage: http://cdemu.sourceforge.net/about/daemon/ +cdemu-daemon: Homepage: https://cdemu.sourceforge.io/about/daemon/ cdemu-daemon: diff --git a/system/cfpeek/README b/system/cfpeek/README new file mode 100644 index 0000000000..849f86b127 --- /dev/null +++ b/system/cfpeek/README @@ -0,0 +1,7 @@ +Cfpeek provides a uniform and consistent command line interface for +various operations on structured configuration files, such as +named.conf, .gitconfig, etc. It can be used to look up and retrieve +settings, reformat the files and to apply external scripts to them. + +Support for Guile extension language is enabled on systems with Guile +2.2 or newer (slackware-current). diff --git a/system/fs-uae/fs-uae.SlackBuild b/system/cfpeek/cfpeek.SlackBuild index e1383204ba..c9b16c02fb 100644 --- a/system/fs-uae/fs-uae.SlackBuild +++ b/system/cfpeek/cfpeek.SlackBuild @@ -1,31 +1,29 @@ #!/bin/sh -# SlackBuild script for "fs-uae". +# Slackware build script for cfpeek -# Copyright 2012-2016 Marcel Saegebarth <marc@mos6581.de> +# Copyright 2021 Sergey Poznyakoff <gray@gnu.org> # All rights reserved. # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. +# 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 COPYRIGHT HOLDERS AND CONTRIBUTORS -# "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 COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 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. -PRGNAM=fs-uae -VERSION=${VERSION:-2.8.1} +PRGNAM=cfpeek +VERSION=${VERSION:-1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,17 +77,28 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ --build=$ARCH-slackware-linux make make install-strip 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 + +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/*.info* + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README NEWS \ + $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:-tgz} diff --git a/system/cfpeek/cfpeek.info b/system/cfpeek/cfpeek.info new file mode 100644 index 0000000000..5769a7f01f --- /dev/null +++ b/system/cfpeek/cfpeek.info @@ -0,0 +1,10 @@ +PRGNAM="cfpeek" +VERSION="1.2" +HOMEPAGE="https://www.gnu.org.ua/software/cfpeek/" +DOWNLOAD="http://download.gnu.org.ua/pub/release/cfpeek/cfpeek-1.2.tar.gz" +MD5SUM="b9f112fd9e3376c1ee46ff7f5c61853f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README%" +MAINTAINER="Sergey Poznyakoff" +EMAIL="gray@gnu.org" diff --git a/system/cfpeek/slack-desc b/system/cfpeek/slack-desc new file mode 100644 index 0000000000..bdf9575ea8 --- /dev/null +++ b/system/cfpeek/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------------------------------------------------------| +cfpeek: cfpeek (Command line processor for structured configuration files) +cfpeek: +cfpeek: Cfpeek provides a uniform and consistent command line interface for +cfpeek: various operations on structured configuration files, such as +cfpeek: named.conf, .gitconfig, etc. It can be used to look up and retrieve +cfpeek: settings, reformat the files and to apply external scripts to them. +cfpeek: +cfpeek: Cfpeek is a handy tool for use in scripting. +cfpeek: +cfpeek: Homepage: https://puszcza.gnu.org.ua/projects/cfpeek +cfpeek: diff --git a/system/chkrootkit/README b/system/chkrootkit/README index 31c9fa8506..0ea9bf08e8 100644 --- a/system/chkrootkit/README +++ b/system/chkrootkit/README @@ -1,16 +1,17 @@ -chkrootkit (Check Rootkit) is a common unix-based program intended to help -system administrators check their system for known rootkits. It is a shell -script using common UNIX/Linux tools like the strings and grep commands to -search core system programs for signatures and for comparing a traversal of the -/proc filesystem with the output of the ps (process status) command to look for -discrepancies. +chkrootkit (Check Rootkit) is a common unix-based program intended to +help system administrators check their system for known rootkits. It is +a shell script using common UNIX/Linux tools like the strings and grep +commands to search core system programs for signatures and for comparing +a traversal of the /proc filesystem with the output of the ps (process +status) command to look for discrepancies. -It can be used from a "rescue disc" (typically a LiveCD) or it can optionally -use an alternative directory from which to run all of its own commands. These -techniques allow chkrootkit to trust the commands upon which it depends a bit -more. +It can be used from a "rescue disc" (typically a LiveCD) or it can +optionally use an alternative directory from which to run all of its own +commands. These techniques allow chkrootkit to trust the commands upon +which it depends a bit more. -There are inherent limitations to the reliability of any program that attempts -to detect compromises (such as rootkits and computer viruses). Newer rootkits -may specifically attempt to detect and compromise copies of the chkrootkit -programs or take other measures to evade detection by them. +There are inherent limitations to the reliability of any program that +attempts to detect compromises (such as rootkits and computer viruses). +Newer rootkits may specifically attempt to detect and compromise copies +of the chkrootkit programs or take other measures to evade detection by +them. diff --git a/system/chkrootkit/chkrootkit.SlackBuild b/system/chkrootkit/chkrootkit.SlackBuild index 6c119ee964..73fba3775a 100644 --- a/system/chkrootkit/chkrootkit.SlackBuild +++ b/system/chkrootkit/chkrootkit.SlackBuild @@ -22,8 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Updated by Emmanuel N. Millan 2020-2021 + PRGNAM=chkrootkit -VERSION=${VERSION:-0.52} +VERSION=${VERSION:-0.54} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,6 +81,7 @@ done # Thanks to Erik Jan Tromp (alphageek) for the suggestion on this # Install a wrapper script +###sbolint off mkdir -p $PKG/usr/sbin cat << EOF > $PKG/usr/sbin/chkrootkit #!/bin/sh @@ -87,6 +90,7 @@ PRGDIR=/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/bin cd \$PRGDIR && exec ./$PRGNAM \$* EOF chmod 0755 $PKG/usr/sbin/$PRGNAM +###sbolint on find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/system/chkrootkit/chkrootkit.info b/system/chkrootkit/chkrootkit.info index 666b3c2490..f70ed2dba7 100644 --- a/system/chkrootkit/chkrootkit.info +++ b/system/chkrootkit/chkrootkit.info @@ -1,10 +1,10 @@ PRGNAM="chkrootkit" -VERSION="0.52" +VERSION="0.54" HOMEPAGE="http://www.chkrootkit.org" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/chkrootkit/chkrootkit-0.52.tar.gz" -MD5SUM="0c864b41cae9ef9381292b51104b0a04" +DOWNLOAD="ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.54.tar.gz" +MD5SUM="af81e9b9038019ea53e5d24d34901153" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Michiel van Wessem" -EMAIL="michiel@slackbuilds.org" +MAINTAINER="Emmanuel N. Millan" +EMAIL="emmanueln@gmail.com" diff --git a/system/chronograf/README b/system/chronograf/README index 37c8860d14..fbaadf0fc4 100644 --- a/system/chronograf/README +++ b/system/chronograf/README @@ -8,8 +8,9 @@ visualizations of your data. Groupname and Username -You must have the "chronograf" group and user to run this script, for +You must have the "chronograf" group and user to run this script, for example: groupadd -g 350 chronograf - useradd -u 350 -s /bin/false -d /var/lib/chronograf -g chronograf chronograf + useradd -u 350 -s /bin/false -d /var/lib/chronograf \ + -g chronograf chronograf diff --git a/system/chronograf/chronograf.SlackBuild b/system/chronograf/chronograf.SlackBuild index 4dbf5e68df..c87bcb4f14 100644 --- a/system/chronograf/chronograf.SlackBuild +++ b/system/chronograf/chronograf.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Chronograf -# Copyright 2017-2019 Ebben Aries <e@dscp.org> +# Copyright 2017-2020 Ebben Aries <e@dscp.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=chronograf -VERSION=${VERSION:-1.7.7} +VERSION=${VERSION:-1.8.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/chronograf/chronograf.info b/system/chronograf/chronograf.info index 6bbc1b1f1b..b8e6183cd4 100644 --- a/system/chronograf/chronograf.info +++ b/system/chronograf/chronograf.info @@ -1,10 +1,10 @@ PRGNAM="chronograf" -VERSION="1.7.7" +VERSION="1.8.10" HOMEPAGE="https://www.influxdata.com" -DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.7.7_linux_i386.tar.gz" -MD5SUM="dcef95e9709d9af71f1ac1d82aeac710" -DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.7.7_linux_amd64.tar.gz" -MD5SUM_x86_64="f543fd8fb061360292c316ce3d371b91" +DOWNLOAD="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.10_linux_i386.tar.gz" +MD5SUM="7a06e74733b7d7931dc64562940956c2" +DOWNLOAD_x86_64="https://dl.influxdata.com/chronograf/releases/chronograf-1.8.10_linux_amd64.tar.gz" +MD5SUM_x86_64="29a4e1c6676ab3014c2f7659b62cc8bc" REQUIRES="" MAINTAINER="Ebben Aries" EMAIL="e@dscp.org" diff --git a/system/ciopfs/README b/system/ciopfs/README index 8288557370..2c70999a57 100644 --- a/system/ciopfs/README +++ b/system/ciopfs/README @@ -1,3 +1,7 @@ -ciopfs is a case-insensitive FUSE filesystem. It is useful for getting -around issues where, say, a game is ported from Linux to Windows but -the mods for that game still expect a case-insenitive filesystem. +ciopfs (case insensitive on purpose filesystem) + +ciopfs is a stackable or overlay linux userspace file system (implemented +with FUSE) which mounts a normal directory on a regular file sytem in +case insensitive fashion. It's useful for getting around issues where, +say, a game is ported from Linux to Windows but the mods for that game +still expect a case-insenitive filesystem. diff --git a/system/ciopfs/ciopfs.SlackBuild b/system/ciopfs/ciopfs.SlackBuild index 27b116836c..6658402742 100644 --- a/system/ciopfs/ciopfs.SlackBuild +++ b/system/ciopfs/ciopfs.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for ciopfs # Copyright 2015 Dugan Chen Canada +# Copyright 2020 B. Watson # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,6 +23,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200413 bkw: +# - take over maintenance +# - i486 => i586 +# - include "links -dump" of web page as ciopfs.txt + PRGNAM=ciopfs VERSION=${VERSION:-0.4} BUILD=${BUILD:-1} @@ -29,7 +35,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +46,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -63,28 +69,23 @@ 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 {} \; - +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -make -install -Dm755 ciopfs $PKG/bin/ciopfs -mkdir -p $PKG/sbin -( cd $PKG/sbin -ln -s ../bin/ciopfs mount.ciopfs -) + make -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 +install -s -Dm755 ciopfs $PKG/bin/ciopfs +mkdir -p $PKG/sbin +ln -s ../bin/ciopfs $PKG/sbin/mount.ciopfs mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# 20200413 bkw: Upstream includes no documentation. Text file made from +# upstream's web site. +cat $CWD/$PRGNAM.txt > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.txt + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/ciopfs/ciopfs.info b/system/ciopfs/ciopfs.info index 1b7880ed43..64b2a2ee75 100644 --- a/system/ciopfs/ciopfs.info +++ b/system/ciopfs/ciopfs.info @@ -6,5 +6,5 @@ MD5SUM="1798fc043034f292efd887c05fc4ea1e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/ciopfs/ciopfs.txt b/system/ciopfs/ciopfs.txt new file mode 100644 index 0000000000..2d5981faa0 --- /dev/null +++ b/system/ciopfs/ciopfs.txt @@ -0,0 +1,138 @@ + ciopfs - case insensitive on purpose filesystem + +ciopfs is a stackable or overlay linux userspace file system (implemented with +FUSE) which mounts a normal directory on a regular file system in case +insensitive fashion. + +The commands below should illustrate it’s function: + +mkdir -p ~/tmp/ciopfs/{.data,case-insensitive} +ciopfs ~/tmp/ciopfs/.data ~/tmp/ciopfs/case-insensitive +cd ~/tmp/ciopfs +mkdir -p case-insensitive/DeMo/SubFolder +echo demo >> case-insensitive/DEMO/subFolder/MyFile + +At this point your file system should look like this: + +case-insensitive +`-- DeMo + `-- SubFolder + `-- MyFile +.data +`-- demo + `-- subfolder + `-- myfile + +To avoid any conflicts you should not manipulate the data directory directly, +any change should be done over the mount point. All filenames in the data +directory which aren’t all lower case are ignored. + +If you want to mount the file system automatically at boot time add a line like +the one below to your /etc/fstab. + +/ciopfs/data /ciopfs/mnt ciopfs allow_other,default_permissions,use_ino,attr_timeout=0 0 0 + +Note that ciopfs is primarily designed for single user mode. It was originally +developed to mount the wine program folder and provide faster case insensitive +file access. If you want to give multiple users write access to the same file +system, then you have to mount it as root. However, in order to avoid security +problems ciopfs will force fuse into single threaded mode and thus hurt +performance. + +News + + * ciopfs-0.4 released (18.06.2011) + * Bugfix in symlink creation + * Better errno handling + * ciopfs-0.3 released (25.09.2010) + * Security improvements: ciopfs forces single threaded mode if the file + system is mounted by root and accessible for others + * ASCII mode should now work (an off by one error which caused a segfault + was fixed) + * Various bug fixes + * ciopfs-0.2 released (30.06.2008) + * Unicode support based on glib + * Better error handling in out of memory situations + * Various code cleanups + * ciopfs-0.1 released (24.05.2008) + +How it works + +ciopfs works by translating every path element to lower case before further +operations take place. On file or directory creation the original file name is +stored in an extended attribute which is later returned upon request. + +This is illustrated below: + +getfattr -dR .data +# file: .data/demo +user.filename="DeMo" + +# file: .data/demo/subfolder +user.filename="SubFolder" + +# file: .data/demo/subfolder/myfile +user.filename="MyFile" + +Runtime Requirements + +If you want the file system to preserve case information you have to make sure +that the underlying file system supports extended attributes (for example for +ext{2,3} you need a kernel with CONFIG_EXT{2,3}_FS_XATTR enabled). You probably +also want to mount the underlying filesystem with the user_xattr option which +allows non root users to create extended attributes. + +Build Requirements + +In order to compile ciopfs you will need the fuse development files, libattr and +if you plan to use Unicode characters within file names you will either need +glib which is the default or alternatively libicu. + +If you want to use neither of those the file system will fall back to libc’s +tolower(3) function which is only defined for [a-zA-Z]. Hence, it will only work +case insensitively for ASCII file names. + +For ease of use the following 3 Makefile targets are supported: + + * unicode-glib (default) + * unicode-icu + * ascii + +Running one of those followed by sudo make install should do everything that is +needed. + +Alternatively, you can also use one of the distribution provided binary +packages. + +POSIX Compliance + +ciopfs passes all test of a slightly patched POSIX file system test suite when +mounted as root user with the following options: + +allow_other,use_ino,attr_timeout=0,entry_timeout=0 + +and $fs set to "ciopfs" in the test suite configuration file. This was last +tested with pjd-fstest-20090130-RC.tgz and ext3 as the underlying file system. + +Stability and Speed + +ciopfs just passes every requested operation to the underlying file system, so +in theory it shouldn’t have a negative impact on stability. However, if you find +a bug then send me an email with the instruction to reproduce it. + +As far as speed is of concern, I didn’t really benchmark or optimize it so far. +There is the usual overhead associated with user / kernel space context +switches. Furthermore, ciopfs in it’s current implementation uses libc’s +malloc/free quite extensively, maybe this could be a bottleneck. + +Development + +You can always fetch the current code base from the git repository located at +Github or Sourcehut. + +If you have comments, suggestions, ideas, a bug report, a patch or something +else related to ciopfs then don’t hesitate to write me an email. + +License + +ciopfs is licensed under the GNU GPL v2. diff --git a/system/ciopfs/slack-desc b/system/ciopfs/slack-desc index 71fd50e058..dc82790fcd 100644 --- a/system/ciopfs/slack-desc +++ b/system/ciopfs/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -ciopfs: ciopfs (case insensitive FUSE filesystem) +ciopfs: ciopfs (case insensitive on purpose filesystem) ciopfs: ciopfs: ciopfs is a stackable or overlay linux userspace file system ciopfs: (implemented with fuse) which mounts a normal directory on a regular diff --git a/system/ck4up/README b/system/ck4up/README new file mode 100644 index 0000000000..67e65fe544 --- /dev/null +++ b/system/ck4up/README @@ -0,0 +1,14 @@ +ck4up is a small command-line utility, writen in ruby, primarily +intended for CRUX ports maintainers to watch http and ftp sites for +updates, but may also be useful for others. + +ck4up scans through a configuration file, fetches the listed URLs +from the web, computes the md5sum of the page, and compares the +value with one stored in a gdbm database. If both differ a message +will be written to the standard output. + +To improve performance, ck4up is multi-threaded. Regular expressions +can be applied to each page in the event that ck4up produces +repetitive diff messages. For example, if daily snapshots and a web +counter are on the same page. To simplify maintenance of the +configuration file, a kind of macro-expansion can be used. diff --git a/system/ck4up/ck4up.SlackBuild b/system/ck4up/ck4up.SlackBuild new file mode 100644 index 0000000000..dbb831f522 --- /dev/null +++ b/system/ck4up/ck4up.SlackBuild @@ -0,0 +1,88 @@ +#!/bin/sh + +# Slackware build script for ck4up + +# Copyright 2019 abooksigun <abooksigun09@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. + +PRGNAM=ck4up +VERSION=${VERSION:-1.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +make DESTDIR=$PKG install + +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 CREDITS ChangeLog ck4up.conf $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:-tgz} diff --git a/system/ck4up/ck4up.info b/system/ck4up/ck4up.info new file mode 100644 index 0000000000..9b8acb0f1c --- /dev/null +++ b/system/ck4up/ck4up.info @@ -0,0 +1,10 @@ +PRGNAM="ck4up" +VERSION="1.4" +HOMEPAGE="http://jue.li/crux/ck4up" +DOWNLOAD="http://jue.li/crux/ck4up/ck4up-1.4.tar.gz" +MD5SUM="181c8342e16a20bd6ebce0a6dd23b894" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="abooksigun" +EMAIL="abooksigun09@gmail.com" diff --git a/system/ck4up/slack-desc b/system/ck4up/slack-desc new file mode 100644 index 0000000000..36cedd873b --- /dev/null +++ b/system/ck4up/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------------------------------------------------------| +ck4up: ck4up (Check for Updates, a utility to monitor web pages for updates) +ck4up: +ck4up: ck4up is a small command-line utility, writen in ruby, +ck4up: primarily intended for CRUX ports maintainers to watch http +ck4up: and ftp sites for updates, but may also be useful for others. +ck4up: +ck4up: Homepage: http://jue.li/crux/ck4up/ +ck4up: +ck4up: +ck4up: +ck4up: diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild index 1a62e60b10..79be84db92 100644 --- a/system/clamav/clamav.SlackBuild +++ b/system/clamav/clamav.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2006,2007 Eric Hameleers <alien@slackware.com> -# Copyright (c) 2011-2019 Matteo Bernardini <ponce@slackbuilds.org> +# Copyright (c) 2011-2021 Matteo Bernardini <ponce@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ # No additional license terms added PRGNAM=clamav -VERSION=${VERSION:-0.101.1} +VERSION=${VERSION:-0.103.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -180,7 +180,8 @@ install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav.new # init script must still ensure that /var/run/clamav exists # and has proper ownership and permissions though mkdir -p $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav -chmod 771 $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav +chmod 0771 $PKG/var/log/clamav $PKG/var/run/clamav +chmod 0775 $PKG/var/lib/clamav # Fixup some ownership and permissions issues chown -R root:root $PKG @@ -189,14 +190,13 @@ if [ "$milter" = "en" ]; then chown clamav $PKG/usr/sbin/clamav-milter chmod 4700 $PKG/usr/sbin/clamav-milter fi -chmod 0770 $PKG/var/lib/clamav touch $PKG/var/lib/clamav/main.cvd $PKG/var/lib/clamav/daily.cvd chmod 0660 $PKG/var/lib/clamav/* # Create log files in such a way that they won't clobber existing ones touch $PKG/var/log/clamav/clamd.log.new \ $PKG/var/log/clamav/freshclam.log.new -chmod 660 $PKG/var/log/clamav/clamd.log.new \ +chmod 0660 $PKG/var/log/clamav/clamd.log.new \ $PKG/var/log/clamav/freshclam.log.new chown -R clamav:clamav $PKG/var/lib/clamav $PKG/var/log/clamav \ diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info index 7b14da5f76..3e4a74944f 100644 --- a/system/clamav/clamav.info +++ b/system/clamav/clamav.info @@ -1,8 +1,8 @@ PRGNAM="clamav" -VERSION="0.101.1" +VERSION="0.103.2" HOMEPAGE="https://www.clamav.net/" -DOWNLOAD="https://www.clamav.net/downloads/production/clamav-0.101.1.tar.gz" -MD5SUM="9c137d6172f6e132e08e61fe25b636f8" +DOWNLOAD="https://www.clamav.net/downloads/production/clamav-0.103.2.tar.gz" +MD5SUM="508e6988e2937985e702cc3a2202b6e7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/clamav/rc.clamav b/system/clamav/rc.clamav index d3db41f4fd..3ed975b3d0 100644 --- a/system/clamav/rc.clamav +++ b/system/clamav/rc.clamav @@ -6,7 +6,8 @@ # Slightly modified by Robby Workman <rworkman@slackbuilds.org> # to replace backticks ( s/`command`/$(command)/ ) -# Set to '1' if you want milter support: +# Set to '1' if you want milter support +# (edit /etc/clamav-milter.conf first!): MILTER=0 # Start clamav: @@ -24,8 +25,8 @@ clamav_start() { /usr/bin/freshclam -d -l /var/log/clamav/freshclam.log echo "." if [ "$MILTER" == "1" ]; then - echo -n "Starting clamav-milter daemon: /usr/sbin/clamav-milter -dblo --max-children=2 local:/var/run/clamav/clmilter.sock " - /usr/sbin/clamav-milter -dblo --max-children=2 local:/var/run/clamav/clmilter.sock + echo -n "Starting clamav-milter daemon: /usr/sbin/clamav-milter -c /etc/clamav-milter.conf " + /usr/sbin/clamav-milter -c /etc/clamav-milter.conf echo "." fi fi diff --git a/system/clamtk/README b/system/clamtk/README index 4b3b119fe4..2cf603fcfa 100644 --- a/system/clamtk/README +++ b/system/clamtk/README @@ -1,4 +1,5 @@ -ClamTk is a frontend for ClamAV using Gtk2-perl. It is intended to be -an easy to use, light-weight, on-demand scanner for Linux systems. +ClamTk is a frontend for ClamAV (Clam antivirus) using Gtk3-perl. It is +intended to be an easy to use, light-weight, on-demand scanner for Linux +systems. If you are using XFCE you may wish to install thunar-sendto-clamtk. diff --git a/system/clamtk/clamtk.SlackBuild b/system/clamtk/clamtk.SlackBuild index dc74dad70b..17e5d69ac1 100644 --- a/system/clamtk/clamtk.SlackBuild +++ b/system/clamtk/clamtk.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for clamtk -# Copyright 2012-2018 Petar Petrov slackalaxy@gmail.com +# Copyright 2012-2020 Petar Petrov slackalaxy@gmail.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ # https://aur.archlinux.org/packages/clamtk/ PRGNAM=clamtk -VERSION=${VERSION:-5.26} +VERSION=${VERSION:-6.05} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,16 +75,15 @@ find -L . \ # Change the menu category to System and make sure the menu entry # shows in other desktops than GNOME. sed -i "s:Categories=GTK;GNOME;Utility;:Categories=System;:" $PRGNAM.desktop -sed -i "s:OnlyShowIn=GNOME;:#OnlyShowIn=GNOME;:" $PRGNAM.desktop install -D -m755 $PRGNAM $PKG/usr/bin/$PRGNAM for i in lib/* ; do -install -D -m644 $i $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/ClamTk/`basename $i` + install -D -m644 $i $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl/ClamTk/`basename $i` done for i in po/*.mo ; do -install -D -m644 $i $PKG/usr/share/locale/`basename $i .mo`/LC_MESSAGES/$PRGNAM.mo + install -D -m644 $i $PKG/usr/share/locale/`basename $i .mo`/LC_MESSAGES/$PRGNAM.mo done install -D -m644 $PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz @@ -97,7 +96,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 CHANGES DISCLAIMER LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES credits.md DISCLAIMER LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/clamtk/clamtk.info b/system/clamtk/clamtk.info index f092cd482c..a0a07e72d8 100644 --- a/system/clamtk/clamtk.info +++ b/system/clamtk/clamtk.info @@ -1,10 +1,10 @@ PRGNAM="clamtk" -VERSION="5.26" +VERSION="6.05" HOMEPAGE="https://dave-theunsub.github.io/clamtk/" -DOWNLOAD="https://bitbucket.org/davem_/clamtk/downloads/clamtk-5.26.tar.xz" -MD5SUM="d77266a12b5cb40887b44e01adabbe27" +DOWNLOAD="https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.05.tar.xz" +MD5SUM="71896ca2ecabddf9938523a1f0e357ab" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libwww-perl perl-http-message perl-JSON perl-LWP-Protocol-https perl-Text-CSV perl-Time-Piece perl-gtk2 clamav zenity" +REQUIRES="libwww-perl perl-http-message perl-JSON perl-LWP-Protocol-https perl-Text-CSV perl-Gtk3 clamav zenity" MAINTAINER="Petar Petrov" EMAIL="slackalaxy@gmail.com" diff --git a/system/clamtk/slack-desc b/system/clamtk/slack-desc index 41c3b077e3..d5204a3883 100644 --- a/system/clamtk/slack-desc +++ b/system/clamtk/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| clamtk: clamtk (A frontend for ClamAV) clamtk: -clamtk: ClamTk is a frontend for ClamAV using Gtk2-perl. +clamtk: ClamTk is a frontend for ClamAV using perl-Gtk3. clamtk: It is intended to be an easy to use, light-weight, clamtk: on-demand scanner for Linux systems. clamtk: diff --git a/system/cluster-glue/README b/system/cluster-glue/README index b9e1a6c915..0f255839f9 100644 --- a/system/cluster-glue/README +++ b/system/cluster-glue/README @@ -2,8 +2,8 @@ cluster-glue (Reusable Cluster Components) Additional cluster tools to play with e.g. some STONITH scripts. -You might also want to install corosync, pacemaker, resource-agents, crmsh, -fence-agents and eventually cluster-glue. +You might also want to install cluster-glue, heartbeat, resource-agents, +fence-agents. You must have a haclient group and hacluster user to run this script. diff --git a/system/cluster-glue/cluster-glue.SlackBuild b/system/cluster-glue/cluster-glue.SlackBuild index 0b36765a43..1ae6d7be73 100644 --- a/system/cluster-glue/cluster-glue.SlackBuild +++ b/system/cluster-glue/cluster-glue.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cluster-glue -VERSION=${VERSION:-20180409_43b22d1} -COMMIT=${COMMIT:-43b22d15db165b27743519da2c431a9f5d8062a6} +VERSION=${VERSION:-20161102_afaeeb} +COMMIT=${COMMIT:-afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/cluster-glue/cluster-glue.info b/system/cluster-glue/cluster-glue.info index 5116c9026c..8c61443bd0 100644 --- a/system/cluster-glue/cluster-glue.info +++ b/system/cluster-glue/cluster-glue.info @@ -1,8 +1,8 @@ PRGNAM="cluster-glue" -VERSION="20180409_43b22d1" +VERSION="20161102_afaeeb" HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue" -DOWNLOAD="https://github.com/ClusterLabs/cluster-glue/archive/43b22d1/cluster-glue-43b22d15db165b27743519da2c431a9f5d8062a6.tar.gz" -MD5SUM="d27f0580e690ed5425ad8e5135073c3e" +DOWNLOAD="https://github.com/ClusterLabs/cluster-glue/archive/afaeeb/cluster-glue-afaeeb2f3e2a576c8a50ee3ce98e83e4da635c76.tar.gz" +MD5SUM="50c799bb708921e9b44b1df161574fba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/cluster-glue/slack-desc b/system/cluster-glue/slack-desc index 62e9d250e8..1a57233cd3 100644 --- a/system/cluster-glue/slack-desc +++ b/system/cluster-glue/slack-desc @@ -10,8 +10,8 @@ cluster-glue: cluster-glue (Reusable Cluster Components) cluster-glue: cluster-glue: Additional cluster tools to play with e.g. some STONITH scripts. cluster-glue: -cluster-glue: You might also want to install corosync, pacemaker, resource-agents, -cluster-glue: crmsh, fence-agents and eventually cluster-glue. +cluster-glue: You might also want to install cluster-glue, heartbeat, +cluster-glue: resource-agents, fence-agents. cluster-glue: cluster-glue: cluster-glue: diff --git a/system/cnijfilter2/README b/system/cnijfilter2/README new file mode 100644 index 0000000000..bd7d23ec82 --- /dev/null +++ b/system/cnijfilter2/README @@ -0,0 +1,20 @@ +cnijfilter2 (Canon IJ Printer Driver) + +cnijfilter2 provides printing functions for Canon Inkjet printers operating +under the CUPS (Common UNIX Printing System) environment. + +Supported series: +- MG2900, MG3000, MG3600, MG5600, MG5700, MG6600, MG6700, MG6800, MG6900, MG7700, + MG7500 +- MB2700, MB2300, MB2100, MB2000, MB5000, MB5300 +- G4010, G4000, G3010, G3000 +- iB4100, iB4000, iP110 +- E450, E480, E470, E300, E200, E3100, E4200, MX490 +- TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530 +- TS9500, TS8230, TS8280, TS8200, TS6280, TS6230, TS6200, TS200, TS300, TS3100, + TS5100, TS6100, TS6130, TS6180, TS8100, TS8180, TS9100, TS9180, TS8130, TS9580 +- XK80, XK70, XK50 + +NB. see also SBo system/pixma SlackBuild for support of related Canon +printers. It supports MG2500, MG2400, MG3500, MG5500, MG6400, MG6500, MG7100 +and P200 series. diff --git a/system/cnijfilter2/cnijfilter2.SlackBuild b/system/cnijfilter2/cnijfilter2.SlackBuild new file mode 100644 index 0000000000..32c58adad8 --- /dev/null +++ b/system/cnijfilter2/cnijfilter2.SlackBuild @@ -0,0 +1,139 @@ +#!/bin/sh + +# Slackware build script for cnijfilter2 + +# Copyright 2019 Kenneth Chan, Hong Kong +# 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. + +PRGNAM=cnijfilter2 +VERSION=${VERSION:-5.90.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=$PRGNAM-source +SRCVERSION=5.90-1 + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" + LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32" + BITS="i386" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" + LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32" + BITS="i386" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin64" + BITS="amd64" +else + echo "Package for $(uname -m) architecture is not available." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$SRCVERSION + +tar xvzf $CWD/$SRCNAM-${SRCVERSION}.tar.gz +cd $SRCNAM-$SRCVERSION +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 {} \; +find -L . \ + \( -type f \! -name autogen.sh \) \ + -exec chmod 644 {} \; + +common_pkg="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" +for dir in $common_pkg; do + cd $dir + ./autogen.sh --prefix=/usr LDFLAGS="$LDFLAGS" + make + make install-strip DESTDIR=$PKG + cd .. +done +cd lgmon3 + ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib2 LDFLAGS="$LDFLAGS" + make + make install-strip DESTDIR=$PKG +cd .. + +if [ "$ARCH" = "x86_64" ]; then + mv $PKG/usr/lib $PKG/usr/lib64 + mkdir $PKG/usr/lib64/bjlib2 + install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib64/bjlib2/ + install -c -m 755 com/libs_bin64/libcnnet2.so.* $PKG/usr/lib64/ + install -c -m 755 com/libs_bin64/libcnbpnet20.so.* $PKG/usr/lib64/ + install -c -m 755 com/libs_bin64/libcnbpnet30.so.* $PKG/usr/lib64/ + install -c -m 755 com/libs_bin64/libcnbpcnclapicom2.so.* $PKG/usr/lib64/ +elif [ "$ARCH" = "i686" ]; then + mkdir $PKG/usr/lib/bjlib2 + install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib/bjlib2/ + install -c -m 755 com/libs_bin32/libcnnet2.so.* $PKG/usr/lib/ + install -c -m 755 com/libs_bin32/libcnbpnet20.so.* $PKG/usr/lib/ + install -c -m 755 com/libs_bin32/libcnbpnet30.so.* $PKG/usr/lib/ + install -c -m 755 com/libs_bin32/libcnbpcnclapicom2.so.* $PKG/usr/lib/ +fi + +mkdir -p $PKG/usr/share/ppd/cnijfilter2 +cp -a ppd/*.ppd $PKG/usr/share/ppd/cnijfilter2 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/lproptions +cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a lproptions/lpr* $PKG/usr/doc/$PRGNAM-$VERSION/lproptions +cat ppd/NEWS > $PKG/usr/doc/$PRGNAM-$VERSION/NEWS +# Copy all README to /usr/doc +for dir in $common_pkg; do + mkdir $PKG/usr/doc/$PRGNAM-$VERSION/$dir + cd $dir + for file in AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README; do + [ -f $file ] && cp -a $file $PKG/usr/doc/$PRGNAM-$VERSION/$dir + done + cd .. +done +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo +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:-tgz} diff --git a/system/cnijfilter2/cnijfilter2.info b/system/cnijfilter2/cnijfilter2.info new file mode 100644 index 0000000000..f71f314189 --- /dev/null +++ b/system/cnijfilter2/cnijfilter2.info @@ -0,0 +1,10 @@ +PRGNAM="cnijfilter2" +VERSION="5.90.1" +HOMEPAGE="https://asia.canon/en/support/0101048401" +DOWNLOAD="http://gdlp01.c-wss.com/gds/4/0100010484/01/cnijfilter2-source-5.90-1.tar.gz" +MD5SUM="11029121b7003a3ebd5d53a1331673a7" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Kenneth Chan" +EMAIL="kenneth.t.chan@gmail.com" diff --git a/system/cnijfilter2/slack-desc b/system/cnijfilter2/slack-desc new file mode 100644 index 0000000000..5d9d84e58f --- /dev/null +++ b/system/cnijfilter2/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 ':'. + + |-----handy-ruler------------------------------------------------------| +cnijfilter2: cnijfilter2 (Canon IJ Printer Driver) +cnijfilter2: +cnijfilter2: cnijfilter2 provides printing functions for Canon Inkjet printers +cnijfilter2: operating under the CUPS (Common UNIX Printing System) environment. +cnijfilter2: +cnijfilter2: It supports MG7500 series, MG6700 series, MG6600 series, MG5600 +cnijfilter2: series, MG2900 series, MB2000 series, MB2300, iB4000 series, +cnijfilter2: MB5000 series, MB5300 series, iP110 series, E450 series, MX490 +cnijfilter2: series, E480 series. +cnijfilter2: +cnijfilter2: Homepage: https://asia.canon/en/support/0101048401 diff --git a/system/collectd/collectd.SlackBuild b/system/collectd/collectd.SlackBuild index 018423225a..7be7e16a63 100644 --- a/system/collectd/collectd.SlackBuild +++ b/system/collectd/collectd.SlackBuild @@ -10,10 +10,10 @@ # Modified by the SlackBuilds.org project -# Copyright (c) 2017-2018, Modified by: Ricardo J. Barberis <ricardo.barberis@gmail.com> +# Copyright (c) 2017-2019, Modified by: Ricardo J. Barberis <ricardo.barberis@gmail.com> PRGNAM=collectd -VERSION=${VERSION:-5.8.1} +VERSION=${VERSION:-5.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/collectd/collectd.info b/system/collectd/collectd.info index 84dbbf1a74..0669478a2b 100644 --- a/system/collectd/collectd.info +++ b/system/collectd/collectd.info @@ -1,8 +1,8 @@ PRGNAM="collectd" -VERSION="5.8.1" +VERSION="5.10.0" HOMEPAGE="https://collectd.org" -DOWNLOAD="https://collectd.org/files/collectd-5.8.1.tar.bz2" -MD5SUM="bfce96c42cede5243028510bcc57c1e6" +DOWNLOAD="https://collectd.org/files/collectd-5.10.0.tar.bz2" +MD5SUM="a8344a199b124711bdbec57f1c0b624f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/colorize/README b/system/colorize/README new file mode 100644 index 0000000000..51221064f1 --- /dev/null +++ b/system/colorize/README @@ -0,0 +1,6 @@ +colorize (colorize text on terminal) + +Colorize aims at being a small, independent and handy command-line +text colorizing tool. It emits ANSI escape sequences in order to color +lines of text; also, sequences emitted by colorize or foreign programs +may be cleared. diff --git a/system/colorize/colorize.SlackBuild b/system/colorize/colorize.SlackBuild new file mode 100644 index 0000000000..0bb6b9d8b4 --- /dev/null +++ b/system/colorize/colorize.SlackBuild @@ -0,0 +1,66 @@ +#!/bin/sh + +# Slackware build script for colorize + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=colorize +VERSION=${VERSION:-0.65} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" +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.bz2 +cd $PRGNAM-$VERSION +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 {} \+ + +make CFLAGS="$SLKCFLAGS" + +# disable tests by default +[ "${CHECK:-no}" = "yes" ] && make check + +mkdir -p $PKG/usr/bin $PKG/usr/man/man1 +install -s -m0755 $PRGNAM $PKG/usr/bin +gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS* COPYING* HACKING* README* TODO* $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:-tgz} diff --git a/system/colorize/colorize.info b/system/colorize/colorize.info new file mode 100644 index 0000000000..2643a9c7fe --- /dev/null +++ b/system/colorize/colorize.info @@ -0,0 +1,10 @@ +PRGNAM="colorize" +VERSION="0.65" +HOMEPAGE="http://cgit.refcnt.org/colorize.git/tree/README" +DOWNLOAD="http://cgit.refcnt.org/colorize.git/snapshot/colorize-0.65.tar.bz2" +MD5SUM="4ebbe5fd92ac1f69ce73ba4d6a0cbc78" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/colorize/slack-desc b/system/colorize/slack-desc new file mode 100644 index 0000000000..276034c426 --- /dev/null +++ b/system/colorize/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------------------------------------------------------| +colorize: colorize (colorize text on terminal) +colorize: +colorize: Colorize aims at being a small, independent and handy command-line +colorize: text colorizing tool. It emits ANSI escape sequences in order to color +colorize: lines of text; also, sequences emitted by colorize or foreign programs +colorize: may be cleared. +colorize: +colorize: +colorize: +colorize: +colorize: diff --git a/system/compsize/README b/system/compsize/README index e930f6fe83..558075e74d 100644 --- a/system/compsize/README +++ b/system/compsize/README @@ -1,6 +1,6 @@ -compsize takes a list of files (given as arguments) on a btrfs filesystem -and measures used compression types and effective compression ratio, -producing a report such as: +compsize takes a list of files (given as arguments) on a btrfs +filesystem and measures used compression types and effective compression +ratio, producing a report such as: [~]$ compsize /usr/share Processed 120101 files. diff --git a/system/compsize/compsize.SlackBuild b/system/compsize/compsize.SlackBuild index 0d1e7b2f55..bc8aaa229a 100644 --- a/system/compsize/compsize.SlackBuild +++ b/system/compsize/compsize.SlackBuild @@ -4,7 +4,7 @@ # Michales (clavisound) Michaloudes korgie@gmail.com <2017> PRGNAM=compsize -VERSION=${VERSION:-1.2} +VERSION=${VERSION:-1.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/compsize/compsize.info b/system/compsize/compsize.info index 1ee84575c8..ef7c7a2af2 100644 --- a/system/compsize/compsize.info +++ b/system/compsize/compsize.info @@ -1,8 +1,8 @@ PRGNAM="compsize" -VERSION="1.2" +VERSION="1.5" HOMEPAGE="https://github.com/kilobyte/compsize" -DOWNLOAD="https://github.com/kilobyte/compsize/archive/v1.2/compsize-1.2.tar.gz" -MD5SUM="de6e7b8c9391dd8075fcedf62736d799" +DOWNLOAD="https://github.com/kilobyte/compsize/archive/v1.5/compsize-1.5.tar.gz" +MD5SUM="41ded6559cd7d1750e5cf967bf2eae08" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/conmon/README b/system/conmon/README new file mode 100644 index 0000000000..8c1e2691b9 --- /dev/null +++ b/system/conmon/README @@ -0,0 +1,24 @@ +An OCI container runtime monitor. + +Conmon is a monitoring program and communication tool between a container +manager (like podman or CRI-O) and an OCI runtime (like runc or crun) for a +single container. + +Upon being launched, it double-forks to daemonize and detach from the parent +that launched it. It then launches the runtime as its child. This allows +managing processes to die in the foreground, but still be able to watch over +and connect to the child process (the container). + +While the container runs, conmon does two things: + + Provides a socket for attaching to the container, holding open the + container's standard streams and forwarding them over the socket. Writes + the contents of the container's streams to a log file (or to the systemd + journal) so they can be read after the container's death. + +Finally, upon the containers death, conmon will record its exit time and code +to be read by the managing programs. + +Written in C and designed to have a low memory footprint, conmon is intended +to be run by a container managing library. Essentially, conmon is the smallest +daemon a container can have. diff --git a/system/conmon/conmon.SlackBuild b/system/conmon/conmon.SlackBuild new file mode 100644 index 0000000000..cca924bf78 --- /dev/null +++ b/system/conmon/conmon.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for conmon + +# Copyright 2019 Gabriel Diaz, Madrid, Spain +# Copyright 2019 Vincent Batts, Raleigh, NC, USA +# 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. + +PRGNAM=conmon +REPONAME=conmon +VERSION=${VERSION:-2.0.1} +GIT_COMMIT="4dc8bcfec41e10ca760c8e2089474c2843dfd066" +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +# The domain part of the go package name, usually the hosting platform +DOMAIN=github.com +# The name of the organization/owner of the package +ORG=containers + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 $REPONAME-$VERSION +mkdir -p $REPONAME-$VERSION/src/$DOMAIN/$ORG +cd $REPONAME-$VERSION/src/$DOMAIN/$ORG +tar xvf $CWD/$REPONAME-$VERSION.tar.gz +mv $REPONAME-$VERSION $REPONAME +cd $REPONAME +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 {} \; + +# Point go to the location of the source tree +export GOPATH="$TMP/$REPONAME-$VERSION" + +make podman DESTDIR="$PKG" PREFIX="/usr/" MANDIR="/usr/man/" + + +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 +cp -a \ + 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/conmon/conmon.info b/system/conmon/conmon.info new file mode 100644 index 0000000000..c17ea64eed --- /dev/null +++ b/system/conmon/conmon.info @@ -0,0 +1,10 @@ +PRGNAM="conmon" +VERSION="2.0.1" +HOMEPAGE="https://github.com/containers/conmon" +DOWNLOAD="https://github.com/containers/conmon/archive/v2.0.1/conmon-2.0.1.tar.gz" +MD5SUM="72eea27a2ac98ec35611dd91ee786c70" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Vincent Batts" +EMAIL="vbatts@hashbangbash.com" diff --git a/system/conmon/slack-desc b/system/conmon/slack-desc new file mode 100644 index 0000000000..0e310d52bf --- /dev/null +++ b/system/conmon/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------------------------------------------------------| +conmon: conmon (utility to run OCI-based containers) +conmon: +conmon: Conmon is a monitoring program and communication tool between a +conmon: container manager (like podman or CRI-O) and an OCI runtime (like +conmon: runc or crun) for a single container. +conmon: +conmon: Site: https://github.com/containers/conmon +conmon: +conmon: +conmon: +conmon: diff --git a/system/consolation/README b/system/consolation/README new file mode 100644 index 0000000000..097e8b2ccf --- /dev/null +++ b/system/consolation/README @@ -0,0 +1,4 @@ +Consolation is a daemon that provides copy-paste and scrolling +support to the Linux console. It is based on the libinput library +and supports all pointer devices and settings provided by this +library. Similar software include gpm and jamd. diff --git a/system/consolation/consolation.SlackBuild b/system/consolation/consolation.SlackBuild new file mode 100644 index 0000000000..4ed2efbde9 --- /dev/null +++ b/system/consolation/consolation.SlackBuild @@ -0,0 +1,102 @@ +#!/bin/sh + +# Slackware build script for consolation + +# Copyright 2020 Robby Workman, Tuscaloosa, Alabama, USA +# 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. + +PRGNAM=consolation +VERSION=${VERSION:-0.0.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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}.orig.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 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 \ + AUTHORS COPYING LICENSE README \ + $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:-tgz} diff --git a/system/consolation/consolation.info b/system/consolation/consolation.info new file mode 100644 index 0000000000..dfa9635b08 --- /dev/null +++ b/system/consolation/consolation.info @@ -0,0 +1,10 @@ +PRGNAM="consolation" +VERSION="0.0.7" +HOMEPAGE="https://salsa.debian.org/consolation-team/consolation/" +DOWNLOAD="http://deb.debian.org/debian/pool/main/c/consolation/consolation_0.0.7.orig.tar.xz" +MD5SUM="5ac2520190ec74ec9170b7a3395b264f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libinput" +MAINTAINER="Robby Workman" +EMAIL="rworkman@slackbuilds.org" diff --git a/system/consolation/slack-desc b/system/consolation/slack-desc new file mode 100644 index 0000000000..4ba13b62a8 --- /dev/null +++ b/system/consolation/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------------------------------------------------------| +consolation: consolation (copy-paste for the Linux console) +consolation: +consolation: Consolation is a daemon to provide copy-paste and scrolling support +consolation: to the Linux console. It is based on the libinput library and +consolation: supports all pointer devices and settings provided by this library. +consolation: +consolation: Similar software include gpm and jamd. +consolation: +consolation: Homepage: https://salsa.debian.org/consolation-team/consolation/ +consolation: +consolation: diff --git a/system/conspy/README b/system/conspy/README new file mode 100644 index 0000000000..6214505103 --- /dev/null +++ b/system/conspy/README @@ -0,0 +1,8 @@ +conspy (take control of a virtual console) + +Conspy allows the user to take control of a Linux virtual console. +The user can see what is displayed on the console and their keystrokes +are sent to it. + +Actually, conspy needs to be run as root, so "the user" above is a bit +misleading... diff --git a/system/conspy/conspy.SlackBuild b/system/conspy/conspy.SlackBuild new file mode 100644 index 0000000000..ed1bb1afbc --- /dev/null +++ b/system/conspy/conspy.SlackBuild @@ -0,0 +1,77 @@ +#!/bin/sh + +# Slackware build script for conspy + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=conspy +VERSION=${VERSION:-1.16} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +autoreconf -if +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.txt *.html $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:-tgz} diff --git a/system/conspy/conspy.info b/system/conspy/conspy.info new file mode 100644 index 0000000000..139f0ecb86 --- /dev/null +++ b/system/conspy/conspy.info @@ -0,0 +1,10 @@ +PRGNAM="conspy" +VERSION="1.16" +HOMEPAGE="http://conspy.sourceforge.net/" +DOWNLOAD="https://downloads.sourceforge.net/project/conspy/conspy-1.16-1/conspy-1.16.tar.gz" +MD5SUM="c5ab86215e27a418f220d853b6ebf6d4" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/conspy/slack-desc b/system/conspy/slack-desc new file mode 100644 index 0000000000..551226aa69 --- /dev/null +++ b/system/conspy/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------------------------------------------------------| +conspy: conspy (take control of a virtual console) +conspy: +conspy: Conspy allows the user to take control of a Linux virtual console. +conspy: The user can see what is displayed on the console and their keystrokes +conspy: are sent to it. +conspy: +conspy: +conspy: +conspy: +conspy: +conspy: diff --git a/system/containerd/containerd.SlackBuild b/system/containerd/containerd.SlackBuild index e86cacad9e..934a17ad35 100644 --- a/system/containerd/containerd.SlackBuild +++ b/system/containerd/containerd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for containerd # Copyright 2016 Asaf Ohayon <asaf@sysbind.co.il> -# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=containerd -VERSION=${VERSION:-1.1.2} -GITHASH=${GITHASH:-468a545b9edcd5932818eb9de8e72413e616e86e} +VERSION=${VERSION:-1.4.3} +GITHASH=${GITHASH:-269548fa27e0089a8b8278fc4fc781d7f65a939b} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,12 +71,7 @@ make \ BUILDTAGS="seccomp" \ GIT_COMMIT=$GITHASH \ GOPATH=$TMP/$PRGNAM-$VERSION/build - -# Install executables. -install -D -m 0755 bin/containerd $PKG/usr/bin/containerd -install -D -m 0755 bin/containerd-shim $PKG/usr/bin/containerd-shim -install -D -m 0755 bin/containerd-stress $PKG/usr/bin/containerd-stress -install -D -m 0755 bin/ctr $PKG/usr/bin/ctr +make install DESTDIR=$PKG/usr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README.md LICENSE NOTICE $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/containerd/containerd.info b/system/containerd/containerd.info index 51cc4e4f7e..4d93b7af95 100644 --- a/system/containerd/containerd.info +++ b/system/containerd/containerd.info @@ -1,10 +1,10 @@ PRGNAM="containerd" -VERSION="1.1.2" +VERSION="1.4.3" HOMEPAGE="https://containerd.io/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.1.2/containerd-1.1.2.tar.gz" -MD5SUM_x86_64="995e2b3de6357211d3bb19902a1cfa8c" +DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.4.3/containerd-1.4.3.tar.gz" +MD5SUM_x86_64="8b0201fa609d511ad01fd52d5b544fe7" REQUIRES="runc" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" diff --git a/system/cool-retro-term/cool-retro-term.SlackBuild b/system/cool-retro-term/cool-retro-term.SlackBuild index 95ffd41224..97e7b8b515 100644 --- a/system/cool-retro-term/cool-retro-term.SlackBuild +++ b/system/cool-retro-term/cool-retro-term.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cool-retro-term -# Copyright 2015-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cool-retro-term -VERSION=${VERSION:-1.0.1} +VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/cool-retro-term/cool-retro-term.info b/system/cool-retro-term/cool-retro-term.info index e763d8263c..235d580e1f 100644 --- a/system/cool-retro-term/cool-retro-term.info +++ b/system/cool-retro-term/cool-retro-term.info @@ -1,8 +1,8 @@ PRGNAM="cool-retro-term" -VERSION="1.0.1" +VERSION="1.1.1" HOMEPAGE="https://github.com/Swordfish90/cool-retro-term" -DOWNLOAD="https://github.com/Swordfish90/cool-retro-term/archive/1.0.1/cool-retro-term-1.0.1.tar.gz" -MD5SUM="44d5834d7e955def891b6ccf69442c76" +DOWNLOAD="https://github.com/Swordfish90/cool-retro-term/archive/1.1.1/cool-retro-term-1.1.1.tar.gz" +MD5SUM="0450dd6b50907168aba63a64bb0fef16" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qmltermwidget" diff --git a/system/coolkey/coolkey.info b/system/coolkey/coolkey.info index 61dc6c0cf4..a8730df6bf 100644 --- a/system/coolkey/coolkey.info +++ b/system/coolkey/coolkey.info @@ -6,5 +6,5 @@ MD5SUM="815a1811a46bf9b8782107c073149cbe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pcsc-lite" -MAINTAINER="Andy Bailey" -EMAIL="GooseYArd@gmail.com" +MAINTAINER="Michael Edie" +EMAIL="michael@sawbox.net" diff --git a/system/corosync/corosync.SlackBuild b/system/corosync/corosync.SlackBuild index 7295b62883..bd5d435b25 100644 --- a/system/corosync/corosync.SlackBuild +++ b/system/corosync/corosync.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for corosync -# Copyright 2018 Pierre-Philipp Braun, Russia +# Copyright 2018 Pierre-Philipp Braun, Russia +# Copyright 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=corosync -VERSION=${VERSION:-2.4.4} +VERSION=${VERSION:-2.4.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/corosync/corosync.info b/system/corosync/corosync.info index 84ec3fa09e..99fea50ff9 100644 --- a/system/corosync/corosync.info +++ b/system/corosync/corosync.info @@ -1,10 +1,10 @@ PRGNAM="corosync" -VERSION="2.4.4" +VERSION="2.4.5" HOMEPAGE="http://corosync.github.io/corosync/" -DOWNLOAD="http://build.clusterlabs.org/corosync/releases/corosync-2.4.4.tar.gz" -MD5SUM="69db29ff4bc035936946be44fc8be5cd" +DOWNLOAD="http://build.clusterlabs.org/corosync/releases/corosync-2.4.5.tar.gz" +MD5SUM="e36a056b893c313c4ec1fe0d7e6cdebd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libqb" -MAINTAINER="Pierre-Philipp Braun" -EMAIL="pbraun@nethence.com" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/system/cpmtools/README b/system/cpmtools/README index b431569eb3..114bf0853b 100644 --- a/system/cpmtools/README +++ b/system/cpmtools/README @@ -1,4 +1,4 @@ cpmtools (access CP/M filesystem images or floppies) cpmtools accesses CP/M file systems. It's similar to the well-known -mtools package (which accesses MSDOS file systems). +mtools package (which accesses MS-DOS file systems). diff --git a/system/cpmtools/cpmtools.SlackBuild b/system/cpmtools/cpmtools.SlackBuild index 81265004e5..0a34b57dd3 100644 --- a/system/cpmtools/cpmtools.SlackBuild +++ b/system/cpmtools/cpmtools.SlackBuild @@ -6,8 +6,13 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20201102 bkw: +# - Updated for v2.21. Can't build older versions, sorry. +# - Switch to freebsd distfile source, as upstream vanishes the old +# source immediately upon a new release. + PRGNAM=cpmtools -VERSION=${VERSION:-2.20} +VERSION=${VERSION:-2.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,11 +52,8 @@ 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -64,19 +66,11 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make -# make install fails to create these. Grr. -mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/man/man5 $PKG/usr/share - -# really old configure script, no DESTDIR support. "autoreconf -fi" fails -# to build a new configure script, too. -make install prefix=$PKG/usr exec_prefix=$PKG/usr MANDIR=$PKG/usr/man - -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 +# 'make install' fails to create this: +mkdir -p $PKG/usr/share/diskdefs -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 +make install DESTDIR=$PKG # binaries already stripped, yay! +gzip $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README NEWS COPYING $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/cpmtools/cpmtools.info b/system/cpmtools/cpmtools.info index 57187fab70..8777c5480b 100644 --- a/system/cpmtools/cpmtools.info +++ b/system/cpmtools/cpmtools.info @@ -1,8 +1,8 @@ PRGNAM="cpmtools" -VERSION="2.20" +VERSION="2.21" HOMEPAGE="http://www.moria.de/~michael/cpmtools/" -DOWNLOAD="http://www.moria.de/~michael/cpmtools/files/cpmtools-2.20.tar.gz" -MD5SUM="675dd715c93469330833c8b67abadcda" +DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/cpmtools-2.21.tar.gz" +MD5SUM="b250cbcc09a0ca6fbdf850653f5f3e1f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild index dd7d71f327..68f01eac11 100644 --- a/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild +++ b/system/cpuid2cpuflags/cpuid2cpuflags.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for cpuid2cpuflags. # -# Copyright 2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2017-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cpuid2cpuflags -VERSION=${VERSION:-5.0} +VERSION=${VERSION:-11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,7 +56,7 @@ fi set -e -SRCVER="5" +SRCVER="11" rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/cpuid2cpuflags/cpuid2cpuflags.info b/system/cpuid2cpuflags/cpuid2cpuflags.info index 0a5dfb9455..0e9efd6ba2 100644 --- a/system/cpuid2cpuflags/cpuid2cpuflags.info +++ b/system/cpuid2cpuflags/cpuid2cpuflags.info @@ -1,8 +1,8 @@ PRGNAM="cpuid2cpuflags" -VERSION="5.0" +VERSION="11.0" HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags" -DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v5/cpuid2cpuflags-5.tar.bz2" -MD5SUM="b2be0e32340fd47cf67a23167e40a0c1" +DOWNLOAD="https://github.com/mgorny/cpuid2cpuflags/releases/download/v11/cpuid2cpuflags-11.tar.bz2" +MD5SUM="c54deede1aee5d41decd5fd5969ff2d5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/crc32_simple/README b/system/crc32_simple/README new file mode 100644 index 0000000000..fa12639621 --- /dev/null +++ b/system/crc32_simple/README @@ -0,0 +1,6 @@ +crc32_simple (calculate crc32 checksum of files) + +Simple public domain implementation of the standard CRC32 checksum. +Outputs the checksum for each file given as a command line argument. +Invalid file names and files that cause errors are silently skipped. +The program reads from stdin if it is called with no arguments. diff --git a/system/crc32_simple/crc32_simple.1 b/system/crc32_simple/crc32_simple.1 new file mode 100644 index 0000000000..d5d119a2f6 --- /dev/null +++ b/system/crc32_simple/crc32_simple.1 @@ -0,0 +1,61 @@ +.\" Man page generated from reStructuredText. +. +.TH CRC32_SIMPLE 1 "2020-05-05" "20120911" "SlackBuilds.org" +.SH NAME +crc32_simple \- calculate standard crc32 checksum +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for crc32_simple(1) man page. Convert with: +. +.\" rst2man.py crc32_simple.rst > crc32_simple.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.\" converting from pod: +. +.\" s/B<\([^>]*\)>/**\1**/g +. +.\" s/I<\([^>]*\)>/*\1*/g +. +.SH SYNOPSIS +.sp +crc32_simple [filenames] +.SH DESCRIPTION +.sp +Simple public domain implementation of the standard CRC32 checksum. +Outputs the checksum for each file given as a command line argument. +Invalid file names and files that cause errors are silently skipped. +The program reads from stdin if it is called with no arguments. +.SH AUTHORS +.sp +crc32_simple was written by Björn Samuelsson. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.\" Generated by docutils manpage writer. +. diff --git a/system/crc32_simple/crc32_simple.SlackBuild b/system/crc32_simple/crc32_simple.SlackBuild new file mode 100644 index 0000000000..759078b08d --- /dev/null +++ b/system/crc32_simple/crc32_simple.SlackBuild @@ -0,0 +1,67 @@ +#!/bin/sh + +# Slackware build script for crc32_simple + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# Why doesn't Slackware already have some tool that can do crc32? +# There are TCL and PHP modules, the kernel includes its own crc32 algo, +# but nothing you can run directly from the command line. + +# VERSION is from the timestamp on the source file. + +PRGNAM=crc32_simple +VERSION=${VERSION:-20120911} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" +else + SLKCFLAGS="-O2" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP + +# Look ma, no source directory! +mkdir -p $PKG/usr/bin +gcc -Wall $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$PRGNAM $CWD/$PRGNAM.c +ln -s $PRGNAM $PKG/usr/bin/crc32 + +# It's probably overkill, but I wrote a man page for this... +mkdir -p $PKG/usr/man/man1 +gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +ln -s $PRGNAM.1.gz $PKG/usr/man/man1/crc32.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README +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:-tgz} diff --git a/system/crc32_simple/crc32_simple.info b/system/crc32_simple/crc32_simple.info new file mode 100644 index 0000000000..ee890f6530 --- /dev/null +++ b/system/crc32_simple/crc32_simple.info @@ -0,0 +1,10 @@ +PRGNAM="crc32_simple" +VERSION="20120911" +HOMEPAGE="http://home.thep.lu.se/~bjorn/crc/" +DOWNLOAD="http://home.thep.lu.se/~bjorn/crc/crc32_simple.c" +MD5SUM="da200e9ec1cb4f9e72ed6bd87cb43017" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/crc32_simple/crc32_simple.rst b/system/crc32_simple/crc32_simple.rst new file mode 100644 index 0000000000..d8842c4e29 --- /dev/null +++ b/system/crc32_simple/crc32_simple.rst @@ -0,0 +1,44 @@ +.. RST source for crc32_simple(1) man page. Convert with: +.. rst2man.py crc32_simple.rst > crc32_simple.1 +.. rst2man.py comes from the SBo development/docutils package. + +.. |version| replace:: 20120911 +.. |date| date:: + +.. converting from pod: +.. s/B<\([^>]*\)>/**\1**/g +.. s/I<\([^>]*\)>/*\1*/g + +============ +crc32_simple +============ + +--------------------------------- +calculate standard crc32 checksum +--------------------------------- + +:Manual section: 1 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +crc32_simple [filenames] + +DESCRIPTION +=========== + +Simple public domain implementation of the standard CRC32 checksum. +Outputs the checksum for each file given as a command line argument. +Invalid file names and files that cause errors are silently skipped. +The program reads from stdin if it is called with no arguments. + +AUTHORS +======= + +crc32_simple was written by Björn Samuelsson. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. diff --git a/system/crc32_simple/slack-desc b/system/crc32_simple/slack-desc new file mode 100644 index 0000000000..c642cbd537 --- /dev/null +++ b/system/crc32_simple/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------------------------------------------------------| +crc32_simple: crc32_simple (calculate crc32 checksum of files) +crc32_simple: +crc32_simple: Simple public domain implementation of the standard CRC32 checksum. +crc32_simple: Outputs the checksum for each file given as a command line argument. +crc32_simple: Invalid file names and files that cause errors are silently skipped. +crc32_simple: The program reads from stdin if it is called with no arguments. +crc32_simple: +crc32_simple: +crc32_simple: +crc32_simple: +crc32_simple: diff --git a/system/createrepo_c/README b/system/createrepo_c/README new file mode 100644 index 0000000000..c69040a2d0 --- /dev/null +++ b/system/createrepo_c/README @@ -0,0 +1,16 @@ +RPM metadata generator. + +Since we have very basic support of rpm in Slackware +base, why not ship this utilities too? + +This is C implementation of createrepo. + +With this utility you can run repository of your own RPM +package set. + +Please note that deltarpm in this package is off as it very +rare cases where it used in practice because of difficulties +in support this case on repo side. + +0.15.5 is the last version that can be built with python2 +support only. All further version require python3. diff --git a/system/createrepo_c/createrepo_c.SlackBuild b/system/createrepo_c/createrepo_c.SlackBuild new file mode 100644 index 0000000000..7595a494cd --- /dev/null +++ b/system/createrepo_c/createrepo_c.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for createrepo_c + +# Copyright 2019 Sergei Fedosoff <eleksir@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. + +PRGNAM=createrepo_c +VERSION=${VERSION:-0.15.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +mkdir build +cd build +cmake .. \ + -DPYTHON_DESIRED:FILEPATH=/usr/bin/python \ + -DWITH_ZCHUNK=OFF \ + -DWITH_LIBMODULEMD=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_THREADED_XZ_ENCODER=on \ + -DENABLE_DRPM=off + +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 + +mv $PKG/usr/share/man/ $PKG/usr/ + +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 AUTHORS README.md COPYING $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:-tgz} diff --git a/system/createrepo_c/createrepo_c.info b/system/createrepo_c/createrepo_c.info new file mode 100644 index 0000000000..450dcf3db9 --- /dev/null +++ b/system/createrepo_c/createrepo_c.info @@ -0,0 +1,10 @@ +PRGNAM="createrepo_c" +VERSION="0.15.5" +HOMEPAGE="https://github.com/rpm-software-management/createrepo_c" +DOWNLOAD="https://github.com/rpm-software-management/createrepo_c/archive/0.15.5/createrepo_c-0.15.5.tar.gz" +MD5SUM="207603d4c3594bf8f316ab3557fa0cce" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Sergei Fedosoff" +EMAIL="eleksir@gmail.com" diff --git a/system/createrepo_c/slack-desc b/system/createrepo_c/slack-desc new file mode 100644 index 0000000000..7621984882 --- /dev/null +++ b/system/createrepo_c/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------------------------------------------------------| +createrepo_c: createrepo_c (rpm repository metadata generator) +createrepo_c: +createrepo_c: C implementation of Createrepo. +createrepo_c: A set of utilities (createrepo_c, mergerepo_c, modifyrepo_c) +createrepo_c: for generating a common metadata repository from a directory of +createrepo_c: rpm packages and maintaining it. +createrepo_c: +createrepo_c: +createrepo_c: Project URL: https://github.com/rpm-software-management/createrepo_c +createrepo_c: +createrepo_c: diff --git a/system/cronie/cronie.SlackBuild b/system/cronie/cronie.SlackBuild index c66eb5586f..5d8b8eb4b8 100644 --- a/system/cronie/cronie.SlackBuild +++ b/system/cronie/cronie.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2012, 2013 Chris Abela, Malta # Copyright 2014 Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org # Copyright 2017-2018 Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Copyright 2019 Ricardo J. Barberis <ricardo.barberis@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cronie -VERSION=${VERSION:-1.5.2} +VERSION=${VERSION:-1.5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -113,7 +114,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 \ - AUTHORS COPYING ChangeLog INSTALL README \ + AUTHORS COPYING ChangeLog INSTALL NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/cronie/cronie.info b/system/cronie/cronie.info index 7567b3b0b4..e8710de367 100644 --- a/system/cronie/cronie.info +++ b/system/cronie/cronie.info @@ -1,10 +1,10 @@ PRGNAM="cronie" -VERSION="1.5.2" +VERSION="1.5.4" HOMEPAGE="https://github.com/cronie-crond/cronie" -DOWNLOAD="https://github.com/cronie-crond/cronie/releases/download/cronie-1.5.2/cronie-1.5.2.tar.gz" -MD5SUM="703314f58a49ea136e9966d3937d9bf4" +DOWNLOAD="https://github.com/cronie-crond/cronie/releases/download/cronie-1.5.4-final/cronie-1.5.4.tar.gz" +MD5SUM="20233b96997e17a142e1fbe0d7ce8223" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" -MAINTAINER="Aaditya Bagga" -EMAIL="aaditya_gnulinux@zoho.com" +MAINTAINER="Ricardo J. Barberis" +EMAIL="ricardo.barberis@gmail.com" diff --git a/system/cronie/slack-desc b/system/cronie/slack-desc index 1cee22c33f..afceb90bf8 100644 --- a/system/cronie/slack-desc +++ b/system/cronie/slack-desc @@ -13,7 +13,7 @@ cronie: programs at scheduled times and related tools. It is based on the cronie: original cron and has security and configuration enhancements like the cronie: ability to use pam and SELinux. cronie: -cronie: Homepage: http://freecode.com/projects/dcron +cronie: Homepage: https://github.com/cronie-crond/cronie cronie: cronie: cronie: diff --git a/system/daa2iso/daa2iso.SlackBuild b/system/daa2iso/daa2iso.SlackBuild index 1d76c9938c..036aa72869 100644 --- a/system/daa2iso/daa2iso.SlackBuild +++ b/system/daa2iso/daa2iso.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for daa2iso -# Copyright 2009 David Woodfall <dave@dawoodfall.net> +# Copyright 2009 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # aka dive in #slackware on freenode.net diff --git a/system/daa2iso/daa2iso.info b/system/daa2iso/daa2iso.info index 8f2e76c4e9..9a68ed33a8 100644 --- a/system/daa2iso/daa2iso.info +++ b/system/daa2iso/daa2iso.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/daemontools-bin/README b/system/daemontools-bin/README new file mode 100644 index 0000000000..246c488957 --- /dev/null +++ b/system/daemontools-bin/README @@ -0,0 +1,23 @@ +daemontools is a collection of tools for managing UNIX services. + +supervise monitors a service. It starts the service and restarts the +service if it dies. Setting up a new service is easy: all supervise +needs is a directory with a run script that runs the service. + +multilog saves error messages to one or more logs. It optionally +timestamps each line and, for each log, includes or excludes lines +matching specified patterns. It automatically rotates logs to limit the +amount of disk space used. If the disk fills up, it pauses and tries +again, without losing any data. + +Also included are svscan (starts one supervise process for each +service), svscanboot (run by init to start svscan in the /service +directory), readproctitle (show error messages in ps o/p) and many +others. See the home page for a list and for documentation. + +This package differs from the daemontools package in that +it installs the binaries to /usr/bin instead of /command. + +daemontools is written by D. J. Bernstein. + +See README.Slackware on how to use it after installation. diff --git a/system/daemontools-bin/README.Slackware b/system/daemontools-bin/README.Slackware new file mode 100644 index 0000000000..918b78e99f --- /dev/null +++ b/system/daemontools-bin/README.Slackware @@ -0,0 +1,32 @@ +Service directory +----------------- + +Create /service directory where services to be run are linked. + +mkdir /service + +Running daemontools +------------------- + +svscanboot starts svscan in the /service directory. +There are several different ways to run it: + +1. Add the following to /etc/rc.d/rc.local + +if [ -x /usr/sbin/svscanboot ]; then + echo "Starting svscanboot" + /usr/sbin/svscanboot & +fi + +OR + +2. Add the following to the end of /etc/inittab + +SV:12345:respawn:/usr/sbin/svscanboot + +After doing either of the above, restart your system and check +that the svscan command is running. + +The difference between the rc.local and inittab versions is that +the inittab version is supervised by init, ie, in case svscan +dies due to some reason, init can restart it. diff --git a/system/daemontools-bin/daemontools-0.76.errno.patch b/system/daemontools-bin/daemontools-0.76.errno.patch new file mode 100644 index 0000000000..d1884f5797 --- /dev/null +++ b/system/daemontools-bin/daemontools-0.76.errno.patch @@ -0,0 +1,12 @@ +diff -ur daemontools-0.76.old/src/error.h daemontools-0.76/src/error.h +--- daemontools-0.76.old/src/error.h 2001-07-12 11:49:49.000000000 -0500 ++++ daemontools-0.76/src/error.h 2003-01-09 21:52:01.000000000 -0600 +@@ -3,7 +3,7 @@ + #ifndef ERROR_H + #define ERROR_H + +-extern int errno; ++#include <errno.h> + + extern int error_intr; + extern int error_nomem; diff --git a/system/daemontools-bin/daemontools-bin.SlackBuild b/system/daemontools-bin/daemontools-bin.SlackBuild new file mode 100644 index 0000000000..96ec1969e5 --- /dev/null +++ b/system/daemontools-bin/daemontools-bin.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/sh + +# Slackware build script for daemontools + +# Copyright 2017 Duncan Roe Melbourne, Australia +# Copyright 2019 Aaditya Bagga, India +# 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. + +PRGNAM=daemontools-bin +SRCNAM=daemontools +VERSION=${VERSION:-0.76} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" +else + SLKCFLAGS="-O2" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz --strip-components=1 +tar xvf $CWD/$SRCNAM-$VERSION-man.tar.gz +mv $SRCNAM-man $SRCNAM-$VERSION/man +mv $SRCNAM-$VERSION $PRGNAM-$VERSION +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 {} \; + +echo "${CC:-gcc} $SLKCFLAGS -Wall" > src/conf-cc +echo "${LD:-gcc -s}" > src/conf-ld + +for i in $CWD/*.patch; do + patch -p1 < $i +done + +package/compile + +install -d $PKG/usr/{bin,sbin} +install -m 755 command/* $PKG/usr/bin/ +mv $PKG/usr/bin/svscanboot $PKG/usr/sbin/ + +install -d $PKG/usr/man/man8 +install -m 644 man/*.8 $PKG/usr/man/man8/ + +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 \ + src/{CHANGES,TODO} \ + package/README \ + $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 n -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/daemontools-bin/daemontools-bin.info b/system/daemontools-bin/daemontools-bin.info new file mode 100644 index 0000000000..7f0cc81fd7 --- /dev/null +++ b/system/daemontools-bin/daemontools-bin.info @@ -0,0 +1,12 @@ +PRGNAM="daemontools-bin" +VERSION="0.76" +HOMEPAGE="http://cr.yp.to/daemontools.html" +DOWNLOAD="http://cr.yp.to/daemontools/daemontools-0.76.tar.gz \ + http://smarden.org/pape/djb/manpages/daemontools-0.76-man.tar.gz" +MD5SUM="1871af2453d6e464034968a0fbcb2bfc \ + 2d3858a48f293c87202f76cd883438ee" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Aaditya Bagga" +EMAIL="aaditya_gnulinux@zoho.com" diff --git a/system/daemontools-bin/slack-desc b/system/daemontools-bin/slack-desc new file mode 100644 index 0000000000..5dd6fb1e00 --- /dev/null +++ b/system/daemontools-bin/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------------------------------------------------------| +daemontools-bin: daemontools-bin (djb's tools for managing UNIX services) +daemontools-bin: +daemontools-bin: daemontools includes several programs. supervise monitors a service. +daemontools-bin: It starts the service and restarts the service if it dies. Setting up +daemontools-bin: a new service is easy: all supervise needs is a directory with a run +daemontools-bin: script that runs the service. +daemontools-bin: +daemontools-bin: Also included are multilog (for service logging), svcscan, +daemontools-bin: svscanboot, readproctitle, and many others. +daemontools-bin: +daemontools-bin: Homepage: https://cr.yp.to/daemontools.html diff --git a/system/dar/dar.SlackBuild b/system/dar/dar.SlackBuild index 4280fe1214..632ea13418 100644 --- a/system/dar/dar.SlackBuild +++ b/system/dar/dar.SlackBuild @@ -3,7 +3,7 @@ # Slackware Package Build Script for Disk ARchive (DAR) # Home Page http://dar.linux.free.fr/ -# Copyright (c) 2007-2018, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2007-2019, Nishant Limbachia, Hoffman Estates, IL, USA # <nishant _AT_ mnspace _DOT_ net> # All rights reserved. # @@ -30,7 +30,7 @@ # No additional license terms added :-) PRGNAM="dar" -VERSION=${VERSION:-2.5.17} +VERSION=${VERSION:-2.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -112,6 +112,8 @@ chown -R root:root $PKG/usr/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/dar/dar.info b/system/dar/dar.info index 31f0769148..2aa5ebddea 100644 --- a/system/dar/dar.info +++ b/system/dar/dar.info @@ -1,8 +1,8 @@ PRGNAM="dar" -VERSION="2.5.17" +VERSION="2.6.3" HOMEPAGE="http://dar.linux.free.fr/" -DOWNLOAD="http://downloads.sourceforge.net/dar/dar-2.5.17.tar.gz" -MD5SUM="249a7373593bde11da30a0465db4400b" +DOWNLOAD="http://downloads.sourceforge.net/dar/dar-2.6.3.tar.gz" +MD5SUM="c02666e2e04fb37d61745e0de220f983" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild index dfb7bdf565..e0d4ada3e3 100644 --- a/system/dash/dash.SlackBuild +++ b/system/dash/dash.SlackBuild @@ -3,10 +3,10 @@ # Slackware build script for dash # Written by Vincent Batts, http://hashbangbash.com/ -# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA +# Copyright 2017-2020 Donald Cooley South Haven, Indiana USA PRGNAM=dash -VERSION=${VERSION:-0.5.10.2} +VERSION=${VERSION:-0.5.11.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/dash/dash.info b/system/dash/dash.info index 93724d2bb5..8404d7fbad 100644 --- a/system/dash/dash.info +++ b/system/dash/dash.info @@ -1,8 +1,8 @@ PRGNAM="dash" -VERSION="0.5.10.2" +VERSION="0.5.11.2" HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" -DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz" -MD5SUM="8f485f126c05d0ab800e85abfe1987aa" +DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz" +MD5SUM="b9b71c72e40fdc4db9b4ffb81fc3bebc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libedit" diff --git a/system/dateutils/dateutils.SlackBuild b/system/dateutils/dateutils.SlackBuild index 999d9d9a8b..9a8919aa22 100644 --- a/system/dateutils/dateutils.SlackBuild +++ b/system/dateutils/dateutils.SlackBuild @@ -22,8 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Update by: blizzack <slackbuilds@blizzack.com> + PRGNAM=dateutils -VERSION=${VERSION:-0.4.2} +VERSION=${VERSION:-0.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/dateutils/dateutils.info b/system/dateutils/dateutils.info index 3819b6a2e3..a7901ac93e 100644 --- a/system/dateutils/dateutils.info +++ b/system/dateutils/dateutils.info @@ -1,10 +1,10 @@ PRGNAM="dateutils" -VERSION="0.4.2" +VERSION="0.4.7" HOMEPAGE="http://www.fresse.org/dateutils/" -DOWNLOAD="https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.2.tar.xz" -MD5SUM="6ef4d3e6697588ef370e2174639535df" +DOWNLOAD="https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-0.4.7.tar.xz" +MD5SUM="41b11e705802768356abc4e1e9920055" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Audrius Kažukauskas" -EMAIL="audrius@neutrino.lt" +MAINTAINER="blizzack" +EMAIL="slackbuilds@blizzack.com" diff --git a/system/davfs2/davfs2.SlackBuild b/system/davfs2/davfs2.SlackBuild index e5df20b2b4..b49822ae5a 100644 --- a/system/davfs2/davfs2.SlackBuild +++ b/system/davfs2/davfs2.SlackBuild @@ -5,7 +5,7 @@ # Copyright (c) 2008, Justin H Haynes <justin@justinhaynes.com> # Copyright (c) 2012 Chris Abela, Malta # Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org -# Copyright 2014, 2016 Chris Abela, Malta +# Copyright 2014, 2016, 2020 Chris Abela, Malta # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -22,7 +22,7 @@ # Modified by Robby Workman <rworkman@slackbuilds.org> PRGNAM=davfs2 -VERSION=${VERSION:-1.5.4} +VERSION=${VERSION:-1.5.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/davfs2/davfs2.info b/system/davfs2/davfs2.info index 9cdfc478f0..7a0a62c2d0 100644 --- a/system/davfs2/davfs2.info +++ b/system/davfs2/davfs2.info @@ -1,8 +1,8 @@ PRGNAM="davfs2" -VERSION="1.5.4" +VERSION="1.5.6" HOMEPAGE="http://savannah.nongnu.org/projects/davfs2" -DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.5.4.tar.gz" -MD5SUM="c9f0b557275b7ec88fec751bf22f30cf" +DOWNLOAD="http://ftp.cc.uoc.gr/mirrors/nongnu.org/davfs2/davfs2-1.5.6.tar.gz" +MD5SUM="eb9948097dc08664cbc19ad06eeacd97" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ddrescue-gui/ddrescue-gui.SlackBuild b/system/ddrescue-gui/ddrescue-gui.SlackBuild index 4e144bc7d1..f94df137a7 100644 --- a/system/ddrescue-gui/ddrescue-gui.SlackBuild +++ b/system/ddrescue-gui/ddrescue-gui.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for ddrescue-gui. # -# Copyright 2015-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ddrescue-gui -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-2.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,7 +56,7 @@ fi set -e -SRCVER=${SRCVER:-2.0.0~otherdistro-0ubuntu1~ppa1} +SRCVER=${SRCVER:-2.0.2~otherdistro-0ubuntu1~ppa1} rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/ddrescue-gui/ddrescue-gui.info b/system/ddrescue-gui/ddrescue-gui.info index d7f4855731..0991194016 100644 --- a/system/ddrescue-gui/ddrescue-gui.info +++ b/system/ddrescue-gui/ddrescue-gui.info @@ -1,10 +1,10 @@ PRGNAM="ddrescue-gui" -VERSION="2.0.0" +VERSION="2.0.2" HOMEPAGE="https://launchpad.net/ddrescue-gui" -DOWNLOAD="https://launchpad.net/ddrescue-gui/2.x/2.0.0/+download/ddrescue-gui_2.0.0~otherdistro-0ubuntu1~ppa1.tar.gz" -MD5SUM="bf73369066ec729b33f67f0599f78a26" +DOWNLOAD="https://launchpad.net/ddrescue-gui/2.x/2.0.2/+download/ddrescue-gui_2.0.2~otherdistro-0ubuntu1~ppa1.tar.gz" +MD5SUM="963eb832ff9861af5f09e20029bf0cd2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxPython4 getdevinfo" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +REQUIRES="wxPython4 python-requests getdevinfo" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/system/ded/ded.SlackBuild b/system/ded/ded.SlackBuild index 63085486f3..ca200877e3 100644 --- a/system/ded/ded.SlackBuild +++ b/system/ded/ded.SlackBuild @@ -10,8 +10,11 @@ # This build script was written from scratch for 14.1, without referring # to the old script. -# 20180915 bkw: -# - updated for 20180324 release +# 20210220 bkw: updated for 20210110. get rid of configure patch, found +# a better way to disable the long filename test. +# 20200111 bkw: updated for 20200428 release +# 20200111 bkw: updated for 20191226 release +# 20180915 bkw: updated for 20180324 release # 20170819 bkw: # - ftp server's been down >1 week, use http archives for DOWNLOAD @@ -19,15 +22,13 @@ # 20170305 bkw: # - stop gnulib's long filename test from writing to /usr/lib and /var/lib -# 20150909 bkw: -# - updated for 20150704 release - +# 20150909 bkw: updated for 20150704 release # 20140826 bkw: # - updated for 20140722 release # - added td_lib docs in /usr/doc PRGNAM=ded -VERSION=${VERSION:-20180324} +VERSION=${VERSION:-20210110} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -82,10 +83,13 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ # "checking for long filenames" wants to create files in /usr/lib and # /var/lib. Violates the principle of least surprise: users don't expect # configure scripts (or SlackBuilds) to touch their system directories. -patch -p1 < $CWD/td_lib_no_write_usr.diff -# NB: the -j1's are necessary, even on 'make install'. +# This *should* work, but doesn't, I guess because configure.in is too old. +#sed -i '/^AC_SYS_LONG_FILE_NAMES/d' configure.in +#autoreconf -i +# It turns out we can force it in the environment. +ac_cv_sys_long_file_names="set" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -96,6 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux +# NB: the -j1's are necessary, even on 'make install'. make -j1 # actually, don't really need to make install, ded's configure will find diff --git a/system/ded/ded.info b/system/ded/ded.info index 61f1f7855a..009d0a2485 100644 --- a/system/ded/ded.info +++ b/system/ded/ded.info @@ -1,10 +1,10 @@ PRGNAM="ded" -VERSION="20180324" +VERSION="20210110" HOMEPAGE="http://invisible-island.net/ded/" -DOWNLOAD="http://invisible-mirror.net/archives/ded/ded-20180324.tgz \ - http://invisible-mirror.net/archives/ded/td_lib-20180324.tgz" -MD5SUM="2bea15142aa1c1a3f118a767ae43a7f4 \ - d38c1fd32f3f15aab40c5dde9d2f8611" +DOWNLOAD="http://invisible-mirror.net/archives/ded/ded-20210110.tgz \ + http://invisible-mirror.net/archives/ded/td_lib-20210110.tgz" +MD5SUM="80a03899f46fe64179d824f65ed1491b \ + 71a71fb677e480e293dc7907df23b70b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ded/td_lib_no_write_usr.diff b/system/ded/td_lib_no_write_usr.diff deleted file mode 100644 index 455b1a85bf..0000000000 --- a/system/ded/td_lib_no_write_usr.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur td_lib-20150704/configure td_lib-20150704.patched/configure ---- td_lib-20150704/configure 2015-07-04 11:20:27.000000000 -0400 -+++ td_lib-20150704.patched/configure 2017-03-05 11:29:40.888486013 -0500 -@@ -5031,7 +5031,7 @@ - else - ac_tmpdirs='/tmp /var/tmp /usr/tmp' - fi --for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do -+for ac_dir in . $ac_tmpdirs ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. - ac_xdir=$ac_dir/cf$$ diff --git a/system/dehydrated/dehydrated.SlackBuild b/system/dehydrated/dehydrated.SlackBuild index 0409e535e2..0ad52ff36f 100644 --- a/system/dehydrated/dehydrated.SlackBuild +++ b/system/dehydrated/dehydrated.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for dehydrated -# Copyright 2016 - 2018 Johannes Schoepfer, Germany +# Copyright 2016 - 2019 Johannes Schoepfer, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dehydrated -VERSION=${VERSION:-0.6.2} +VERSION=${VERSION:-0.6.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH=noarch diff --git a/system/dehydrated/dehydrated.info b/system/dehydrated/dehydrated.info index 53e22d4ac1..88215e61fa 100644 --- a/system/dehydrated/dehydrated.info +++ b/system/dehydrated/dehydrated.info @@ -1,10 +1,10 @@ PRGNAM="dehydrated" -VERSION="0.6.2" -HOMEPAGE="https://github.com/lukas2511/dehydrated" -DOWNLOAD="https://github.com/lukas2511/dehydrated/archive/v0.6.2/dehydrated-0.6.2.tar.gz" -MD5SUM="d4db13d5965054b0a231bf95285c6cf0" +VERSION="0.6.5" +HOMEPAGE="https://dehydrated.io/" +DOWNLOAD="https://github.com/lukas2511/dehydrated/archive/v0.6.5/dehydrated-0.6.5.tar.gz" +MD5SUM="cedf07369517c317c4e1075540b94699" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Johannes Schoepfer" -EMAIL="<slackbuilds[AT]schoepfer[DOT]info>" +EMAIL="slackbuilds@schoepfer.info" diff --git a/system/dehydrated/slack-desc b/system/dehydrated/slack-desc index 9e3752b7e9..2abcc2d4bb 100644 --- a/system/dehydrated/slack-desc +++ b/system/dehydrated/slack-desc @@ -14,6 +14,6 @@ dehydrated: -Signing of a CSR, standalone or completely automated using hooks dehydrated: -Renewal if a cert is about to expire or included domains changed dehydrated: -Certificate revocation dehydrated: -dehydrated: https://github.com/lukas2511/dehydrated/ +dehydrated: Homepage: https://dehydrated.io/ dehydrated: dehydrated: diff --git a/system/dfc/dfc.SlackBuild b/system/dfc/dfc.SlackBuild index 1c0786bfa2..be9a7faeb6 100644 --- a/system/dfc/dfc.SlackBuild +++ b/system/dfc/dfc.SlackBuild @@ -6,7 +6,7 @@ # Updated by Donald Cooley <dfc@warpmail.net> PRGNAM=dfc -VERSION=${VERSION:-3.0.5} +VERSION=${VERSION:-3.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -23,8 +23,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/system/dfc/dfc.info b/system/dfc/dfc.info index f8bf36cd3c..5709c4dc32 100644 --- a/system/dfc/dfc.info +++ b/system/dfc/dfc.info @@ -1,8 +1,8 @@ PRGNAM="dfc" -VERSION="3.0.5" +VERSION="3.1.1" HOMEPAGE="https://projects.gw-computing.net/projects/dfc" -DOWNLOAD="https://projects.gw-computing.net/attachments/download/467/dfc-3.0.5.tar.gz" -MD5SUM="3e6443c54966751f5e9fdaca33d873d1" +DOWNLOAD="https://projects.gw-computing.net/attachments/download/615/dfc-3.1.1.tar.gz" +MD5SUM="26fd905a07078332d98c2806cdd0fc0e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/dfu-util/dfu-util.SlackBuild b/system/dfu-util/dfu-util.SlackBuild index 890878e1f8..056010437e 100644 --- a/system/dfu-util/dfu-util.SlackBuild +++ b/system/dfu-util/dfu-util.SlackBuild @@ -1,10 +1,10 @@ #!/bin/sh # Slackware build script for dfu-util # Written by Damien Durand <splinux25@gmail.com> -# 2018 Maintained by Christoph Willing <chris.willing@linux.com> +# From 2018, maintained by Christoph Willing <chris.willing@linux.com> PRGNAM=dfu-util -VERSION=${VERSION:-0.9} +VERSION=${VERSION:-0.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/dfu-util/dfu-util.info b/system/dfu-util/dfu-util.info index a710e848d6..ecd8609d4e 100644 --- a/system/dfu-util/dfu-util.info +++ b/system/dfu-util/dfu-util.info @@ -1,8 +1,8 @@ PRGNAM="dfu-util" -VERSION="0.9" +VERSION="0.10" HOMEPAGE="http://dfu-util.gnumonks.org" -DOWNLOAD="http://dfu-util.sourceforge.net/releases/dfu-util-0.9.tar.gz" -MD5SUM="233bb1e08ef4b405062445d84e28fde6" +DOWNLOAD="http://dfu-util.sourceforge.net/releases/dfu-util-0.10.tar.gz" +MD5SUM="8cf55663703cdc6b40f377f999eb8d3d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/dget/dget.SlackBuild b/system/dget/dget.SlackBuild index 60ffd0f833..020bd65d4b 100644 --- a/system/dget/dget.SlackBuild +++ b/system/dget/dget.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for dget. # -# Copyright 2015-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2018-2021 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dget -VERSION=${VERSION:-2.18.9} +VERSION=${VERSION:-2.20.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/dget/dget.info b/system/dget/dget.info index 862ce79c8e..f2c54ec3b9 100644 --- a/system/dget/dget.info +++ b/system/dget/dget.info @@ -1,10 +1,10 @@ PRGNAM="dget" -VERSION="2.18.9" +VERSION="2.20.5" HOMEPAGE="https://goo.gl/mr1Uz3" -DOWNLOAD="http://snapshot.debian.org/archive/debian/20181115T161804Z/pool/main/d/devscripts/devscripts_2.18.9_i386.deb" -MD5SUM="27491804a6316433fd3b81f26346296d" -DOWNLOAD_x86_64="http://snapshot.debian.org/archive/debian/20181115T161804Z/pool/main/d/devscripts/devscripts_2.18.9_amd64.deb" -MD5SUM_x86_64="3598b8b54250c41e7650dfe0ff04c266" +DOWNLOAD="http://http.us.debian.org/debian/pool/main/d/devscripts/devscripts_2.20.5_i386.deb" +MD5SUM="064723c6fac020a141c0990c2e70c218" +DOWNLOAD_x86_64="http://http.us.debian.org/debian/pool/main/d/devscripts/devscripts_2.20.5_amd64.deb" +MD5SUM_x86_64="cf5cb14bfc90c75cc91772e2436f6c9e" REQUIRES="dpkg" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/system/dieharder/dieharder.SlackBuild b/system/dieharder/dieharder.SlackBuild index a59c642de3..6b032e90d2 100644 --- a/system/dieharder/dieharder.SlackBuild +++ b/system/dieharder/dieharder.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # SlackBuild for dieharder, 5 January 2017 -# Arthur W. Green <awg@posteo.us> +# awg <awg@cock.li> # All rights reserved. # # Redistribution and use of this script, with or without modification, diff --git a/system/dieharder/dieharder.info b/system/dieharder/dieharder.info index e4a204c9ce..aa7496f4bd 100644 --- a/system/dieharder/dieharder.info +++ b/system/dieharder/dieharder.info @@ -6,5 +6,5 @@ MD5SUM="b57404dfb812d4548caaf71a05be2d17" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Arthur W. Green" -EMAIL="awg@posteo.us" +MAINTAINER="awg" +EMAIL="awg@cock.li" diff --git a/system/direvent/README b/system/direvent/README new file mode 100644 index 0000000000..63d8e873e1 --- /dev/null +++ b/system/direvent/README @@ -0,0 +1,11 @@ +GNU Direvent monitors events in the file system directories. For each +event that occurs in a set of pre-configured directories, the program +calls an external program associated with it, supplying it with the +information about the event and the location within the file system +where it occured. + +Interfaces for tracking changes to file systems are highly +system-specific. Direvent aims to provide a uniform and +system-independent command-level interface. It is known to work with +all modern Linux kernels and BSD systems (FreeBSD, NetBSD, OpenBSD, +Darwin). diff --git a/system/direvent/direvent.SlackBuild b/system/direvent/direvent.SlackBuild new file mode 100644 index 0000000000..a0e7c0c952 --- /dev/null +++ b/system/direvent/direvent.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for direvent + +# Copyright 2020 Jeff Parent <jeff+SBo@sh0.xyz> +# 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. + +PRGNAM=direvent +VERSION=${VERSION:-5.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 + +rm -f $PKG/usr/share/info/dir +mv $PKG/usr/share/info $PKG/usr/ +gzip -9 $PKG/usr/info/*.info* + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS ChangeLog COPYING doc NEWS README THANKS \ + $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:-tgz} diff --git a/system/direvent/direvent.info b/system/direvent/direvent.info new file mode 100644 index 0000000000..6a0dbba331 --- /dev/null +++ b/system/direvent/direvent.info @@ -0,0 +1,10 @@ +PRGNAM="direvent" +VERSION="5.2" +HOMEPAGE="https://www.gnu.org.ua/software/direvent/direvent.html" +DOWNLOAD="http://ftp.gnu.org/gnu/direvent/direvent-5.2.tar.gz" +MD5SUM="3af3340ba9fce2cbd6580c19817fe811" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jeff Parent" +EMAIL="jeff+SBo@sh0.xyz" diff --git a/system/direvent/slack-desc b/system/direvent/slack-desc new file mode 100644 index 0000000000..70e47ff935 --- /dev/null +++ b/system/direvent/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------------------------------------------------------| +direvent: direvent (Directory event monitoring daemon) +direvent: +direvent: GNU Direvent monitors events in the file system directories. For each +direvent: event that occurs in a set of pre-configured directories, the program +direvent: calls an external program associated with it, supplying it with the +direvent: information about the event and the location within the file system +direvent: where it occured. +direvent: +direvent: +direvent: +direvent: diff --git a/system/disk-manager/README b/system/disk-manager/README index b1dfac52b4..1da103385d 100644 --- a/system/disk-manager/README +++ b/system/disk-manager/README @@ -1,11 +1,10 @@ disk-manager (simple filesystem configurator) -Disk Manager is a tool to manage filesystems, partitions, and NTFS write mode. - Disk manager is a simple filesystem configurator that allows you to: * Automatically detect new partitions at startup. * Fully manage configuration of filesystem. * Enable/disable write support for NTFS (needs ntfs-3g installed). -This require: ktsuss, xfsudo, gksu or kdesu for authenticated method. +NOTE: for your authentication you can use another tool instead of gksu, +there are: ktsuss, xfsudo or kdesu. diff --git a/system/disk-manager/disk-manager.SlackBuild b/system/disk-manager/disk-manager.SlackBuild index 705641dadd..73f3962e34 100644 --- a/system/disk-manager/disk-manager.SlackBuild +++ b/system/disk-manager/disk-manager.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for disk-manager. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=disk-manager VERSION=${VERSION:-1.1.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -88,16 +88,17 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG +install -Dm644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop + 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 -DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO" - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/disk-manager/disk-manager.desktop b/system/disk-manager/disk-manager.desktop new file mode 100644 index 0000000000..24b9e3088f --- /dev/null +++ b/system/disk-manager/disk-manager.desktop @@ -0,0 +1,27 @@ +[Desktop Entry] +Version=1.0 +Name=Disk Manager +Name[de]=Geräte Verwaltung +Name[en_GB]=Disk Manager +Name[es]=Administrador de disco +Name[fr]=Gestionnaire de disque +Name[nb]=Disk Manager +Name[pl]=Disk Manager +Name[pt_BR]=Gerenciador de Disco +Name[sv]=Diskhanterare +Name[zh_CN]=ç£ç›˜ç®¡ç†å™¨ +Comment=Manage filesystem configuration +Comment[de]=Verwalte Dateisystem Konfiguration +Comment[en_GB]=Manage filesystem configuration +Comment[es]=Administra la configuración del sistema de archivos +Comment[fr]=Gère la configuration du système de fichier +Comment[nb]=Styr filsystem konfigurasjon +Comment[pl]=ZarzÄ…daj konfiguracjÄ… systemu plików +Comment[pt_BR]=Gerenciar configurações do sistema de arquivos +Comment[sv]=Hantera filsystemskonfiguration +Comment[zh_CN]=管ç†æ–‡ä»¶ç³»ç»Ÿçš„é…ç½® +Icon=disk-manager +Exec=gksu /usr/sbin/disk-manager +Terminal=false +Type=Application +Categories=System; diff --git a/system/disk-manager/disk-manager.info b/system/disk-manager/disk-manager.info index d952818ba2..df526a22d9 100644 --- a/system/disk-manager/disk-manager.info +++ b/system/disk-manager/disk-manager.info @@ -1,10 +1,10 @@ PRGNAM="disk-manager" VERSION="1.1.1" HOMEPAGE="http://flomertens.free.fr/disk-manager/" -DOWNLOAD="http://http.debian.net/debian/pool/main/d/disk-manager/disk-manager_1.1.1.orig.tar.gz" +DOWNLOAD="http://snapshot.debian.org/archive/debian/20190608T092728Z/pool/main/d/disk-manager/disk-manager_1.1.1.orig.tar.gz" MD5SUM="41bdb4693da535fdd2d3ce2f5e1a37d9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="gksu" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/system/disk-manager/slack-desc b/system/disk-manager/slack-desc index c3a2ab7399..f3231968e1 100644 --- a/system/disk-manager/slack-desc +++ b/system/disk-manager/slack-desc @@ -8,8 +8,8 @@ |-----handy-ruler------------------------------------------------------| disk-manager: disk-manager (simple filesystem configurator) disk-manager: -disk-manager: Disk Manager is a tool to manage filesystems, partitions, and -disk-manager: NTFS write mode. +disk-manager: Disk Manager is a tool to manage filesystems, partitions, and NTFS +disk-manager: write mode. disk-manager: disk-manager: Home page: http://flomertens.free.fr/disk-manager/ disk-manager: diff --git a/system/dlm/README b/system/dlm/README new file mode 100644 index 0000000000..e9d8c9db5d --- /dev/null +++ b/system/dlm/README @@ -0,0 +1,4 @@ +DLM is the lock manager that provides a mechanism for other cluster +infrastructure components to synchronize their access to shared resources. + +More information post-install can be found in README.SLACKWARE diff --git a/system/dlm/README.SLACKWARE b/system/dlm/README.SLACKWARE new file mode 100644 index 0000000000..1dcc2ecdfa --- /dev/null +++ b/system/dlm/README.SLACKWARE @@ -0,0 +1,18 @@ +Starting the daemon on boot +--------------------------- + +You may wish to add these lines to /etc/rc.d/rc.local to start the service: + + if [ -x /etc/rc.d/rc.dlm ]; then + /etc/rc.d/rc.dlm start + fi + +You may also add these lines to /etc/rc.d/rc.local_shutdown: + + if [ -x /etc/rc.d/rc.dlm ]; then + /etc/rc.d/rc.dlm stop + fi + +Remember to give executable permission to /etc/rc.d/rc.local_shutdown: + + chmod 0755 /etc/rc.d/rc.local_shutdown diff --git a/system/dlm/dlm.SlackBuild b/system/dlm/dlm.SlackBuild new file mode 100644 index 0000000000..ccebfec1f9 --- /dev/null +++ b/system/dlm/dlm.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/sh + +# Slackware build script for dlm + +# Copyright 2019, 2020 Mario Preksavec, Zagreb, Croatia +# 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. + +PRGNAM=dlm +VERSION=${VERSION:-4.0.9} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-}$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION || cd $PRGNAM-$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 {} \; + +# Thanks to Debian folks +for i in $(cat $CWD/patches/series) ; do patch -p1 <$CWD/patches/$i ; done + +# We don't have stack clash protection support yet +sed -i 's/-fstack-clash-protection//' */Makefile + +make install \ +PREFIX=/usr \ +LIBNUM=lib${LIBDIRSUFFIX} \ +MANDIR=/usr/man \ +UDEVDIR=/lib/udev/rules.d \ +USE_SD_NOTIFY=no \ +DESTDIR=$PKG + +# Copy init script and adjust for default config +install -D -m0755 -oroot -groot init/$PRGNAM.init $PKG/etc/rc.d/rc.$PRGNAM.new +install -D -m0644 -oroot -groot init/$PRGNAM.sysconfig $PKG/etc/default/$PRGNAM.new +sed -e "s|/etc/sysconfig|/etc/default|g" \ + -e "s|^progdir=.*|progdir=\"dlm_controld\"|" \ + -i $PKG/etc/rc.d/rc.$PRGNAM.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 + +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 +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE + +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:-tgz} diff --git a/system/dlm/dlm.info b/system/dlm/dlm.info new file mode 100644 index 0000000000..7343b4d19a --- /dev/null +++ b/system/dlm/dlm.info @@ -0,0 +1,10 @@ +PRGNAM="dlm" +VERSION="4.0.9" +HOMEPAGE="https://pagure.io/dlm" +DOWNLOAD="https://pagure.io/dlm/archive/dlm-4.0.9/dlm-dlm-4.0.9.tar.gz" +MD5SUM="4c57a941a15547859cd38fd55f66388e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="pacemaker" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/system/dlm/doinst.sh b/system/dlm/doinst.sh new file mode 100644 index 0000000000..6aa62bb17a --- /dev/null +++ b/system/dlm/doinst.sh @@ -0,0 +1,26 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.dlm.new +config etc/default/dlm.new diff --git a/system/dlm/patches/Debian-path-for-the-config-file.patch b/system/dlm/patches/Debian-path-for-the-config-file.patch new file mode 100644 index 0000000000..f59ee39ca0 --- /dev/null +++ b/system/dlm/patches/Debian-path-for-the-config-file.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@niif.hu> +Date: Sun, 30 Aug 2015 16:48:15 +0200 +Subject: Debian path for the config file + +--- + init/dlm.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/init/dlm.service b/init/dlm.service +index 1db5925..5cd01c5 100644 +--- a/init/dlm.service ++++ b/init/dlm.service +@@ -7,7 +7,7 @@ After=corosync.service sys-kernel-config.mount + OOMScoreAdjust=-1000 + Type=notify + NotifyAccess=main +-EnvironmentFile=/etc/sysconfig/dlm ++EnvironmentFile=-/etc/default/dlm + ExecStartPre=/sbin/modprobe dlm + ExecStart=/usr/sbin/dlm_controld --foreground $DLM_CONTROLD_OPTS + #ExecStopPost=/sbin/modprobe -r dlm diff --git a/system/dlm/patches/Don-t-link-dlm_stonith-against-libxml2.patch b/system/dlm/patches/Don-t-link-dlm_stonith-against-libxml2.patch new file mode 100644 index 0000000000..11a4a4091b --- /dev/null +++ b/system/dlm/patches/Don-t-link-dlm_stonith-against-libxml2.patch @@ -0,0 +1,20 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org> +Date: Mon, 19 Dec 2016 22:57:22 +0100 +Subject: Don't link dlm_stonith against libxml2 + +--- + fence/Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fence/Makefile b/fence/Makefile +index d4a3c09..1382260 100644 +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -22,7 +22,6 @@ CFLAGS += `xml2-config --cflags` + CFLAGS += -I../include + + LDFLAGS += -Wl,-z,relro -pie +-LDFLAGS += `xml2-config --libs` + LDFLAGS += -ldl + + all: $(BIN_TARGET) diff --git a/system/dlm/patches/Enable-systemctl-help-dlm-to-show-relevant-man-pages.patch b/system/dlm/patches/Enable-systemctl-help-dlm-to-show-relevant-man-pages.patch new file mode 100644 index 0000000000..8e4fba9270 --- /dev/null +++ b/system/dlm/patches/Enable-systemctl-help-dlm-to-show-relevant-man-pages.patch @@ -0,0 +1,20 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@niif.hu> +Date: Wed, 27 Apr 2016 12:00:43 +0200 +Subject: Enable systemctl help dlm to show relevant man pages + +--- + init/dlm.service | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/init/dlm.service b/init/dlm.service +index 5cd01c5..5854738 100644 +--- a/init/dlm.service ++++ b/init/dlm.service +@@ -2,6 +2,7 @@ + Description=dlm control daemon + Requires=corosync.service sys-kernel-config.mount + After=corosync.service sys-kernel-config.mount ++Documentation=man:dlm_controld man:dlm.conf man:dlm_stonith + + [Service] + OOMScoreAdjust=-1000 diff --git a/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch b/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch new file mode 100644 index 0000000000..d4e9f5bd89 --- /dev/null +++ b/system/dlm/patches/Use-CPPFLAGS-from-the-environment.patch @@ -0,0 +1,63 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org> +Date: Mon, 19 Dec 2016 21:36:05 +0100 +Subject: Use CPPFLAGS from the environment + +--- + dlm_controld/Makefile | 4 ++-- + dlm_tool/Makefile | 2 +- + fence/Makefile | 2 +- + libdlm/Makefile | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -62,10 +62,10 @@ + all: $(LIB_TARGET) $(BIN_TARGET) $(LIB_PC) + + $(BIN_TARGET): $(BIN_SOURCE) +- $(CC) $(BIN_SOURCE) $(BIN_CFLAGS) $(BIN_LDFLAGS) -o $@ -L. ++ $(CC) $(CPPFLAGS) $(BIN_SOURCE) $(BIN_CFLAGS) $(BIN_LDFLAGS) -o $@ -L. + + $(LIB_TARGET): $(LIB_SOURCE) +- $(CC) $^ $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR) ++ $(CC) $(CPPFLAGS) $^ $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR) + ln -sf $(LIB_TARGET) $(LIB_SO) + ln -sf $(LIB_TARGET) $(LIB_SMAJOR) + +--- a/dlm_tool/Makefile ++++ b/dlm_tool/Makefile +@@ -27,7 +27,7 @@ + all: $(BIN_TARGET) + + $(BIN_TARGET): $(BIN_SOURCE) +- $(CC) $(BIN_SOURCE) $(CFLAGS) $(LDFLAGS) -o $@ ++ $(CC) $(CPPFLAGS) $(BIN_SOURCE) $(CFLAGS) $(LDFLAGS) -o $@ + + clean: + rm -f *.o *.so *.so.* $(BIN_TARGET) +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -28,7 +28,7 @@ + all: $(BIN_TARGET) + + $(BIN_TARGET): $(BIN_SOURCE) +- $(CC) $(BIN_SOURCE) $(CFLAGS) $(LDFLAGS) -o $@ -L. ++ $(CC) $(CPPFLAGS) $(BIN_SOURCE) $(CFLAGS) $(LDFLAGS) -o $@ -L. + + clean: + rm -f *.o *.so *.so.* $(BIN_TARGET) +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -90,10 +90,10 @@ + all: $(LIB_TARGET) $(LLT_TARGET) $(LIB_PC) $(LLT_PC) + + $(LIB_O): $(SOURCE) +- $(CC) $< $(LIB_CFLAGS) -c -o $@ ++ $(CC) $(CPPFLAGS) $< $(LIB_CFLAGS) -c -o $@ + + $(LLT_O): $(SOURCE) +- $(CC) $< $(LLT_CFLAGS) -c -o $@ ++ $(CC) $(CPPFLAGS) $< $(LLT_CFLAGS) -c -o $@ + + $(LIB_TARGET): $(LIB_O) + $(CC) $^ $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR) diff --git a/system/dlm/patches/series b/system/dlm/patches/series new file mode 100644 index 0000000000..17ef4f6ee0 --- /dev/null +++ b/system/dlm/patches/series @@ -0,0 +1,4 @@ +Debian-path-for-the-config-file.patch +Enable-systemctl-help-dlm-to-show-relevant-man-pages.patch +Use-CPPFLAGS-from-the-environment.patch +Don-t-link-dlm_stonith-against-libxml2.patch diff --git a/system/dlm/slack-desc b/system/dlm/slack-desc new file mode 100644 index 0000000000..465667dc48 --- /dev/null +++ b/system/dlm/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------------------------------------------------------| +dlm: dlm (Distributed Lock Manager) +dlm: +dlm: DLM is the lock manager that provides a mechanism for other cluster +dlm: infrastructure components to synchronize their access to shared +dlm: resources. +dlm: +dlm: Homepage: https://pagure.io/dlm +dlm: +dlm: +dlm: +dlm: diff --git a/system/docker-cli/README b/system/docker-cli/README new file mode 100644 index 0000000000..d22fbf077f --- /dev/null +++ b/system/docker-cli/README @@ -0,0 +1 @@ +Command line tool for Docker engine. diff --git a/system/docker-cli/docker-cli.SlackBuild b/system/docker-cli/docker-cli.SlackBuild new file mode 100644 index 0000000000..b6451ec6fe --- /dev/null +++ b/system/docker-cli/docker-cli.SlackBuild @@ -0,0 +1,88 @@ +#!/bin/sh + +# Slackware build script for docker-cli + +# Copyright 2021 Audrius Kažukauskas <audrius@neutrino.lt> +# 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. + +PRGNAM=docker-cli +VERSION=${VERSION:-20.10.2} +GITHASH=${GITHASH:-2291f61} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=cli + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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 \) -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 {} \; + +mkdir build +mv vendor build/src +ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/cli + +DISABLE_WARN_OUTSIDE_CONTAINER=1 \ +make dynbinary \ + GITCOMMIT=$GITHASH \ + VERSION=$VERSION \ + GOPATH=$TMP/$SRCNAM-$VERSION/build + +install -D -m 0755 build/docker-linux-amd64 $PKG/usr/bin/docker + +# Completion. +( cd contrib/completion + install -D -m 0644 bash/docker $PKG/usr/share/bash-completion/completions/docker + install -D -m 0644 zsh/_docker $PKG/usr/share/zsh/site-functions/_docker + install -D -m 0644 fish/docker.fish $PKG/usr/share/fish/vendor_completions.d/docker.fish +) + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE NOTICE 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/docker-cli/docker-cli.info b/system/docker-cli/docker-cli.info new file mode 100644 index 0000000000..e004f9f2b5 --- /dev/null +++ b/system/docker-cli/docker-cli.info @@ -0,0 +1,10 @@ +PRGNAM="docker-cli" +VERSION="20.10.2" +HOMEPAGE="https://www.docker.com/products/container-runtime" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/docker/cli/archive/v20.10.2/cli-20.10.2.tar.gz" +MD5SUM_x86_64="b3e97ba282605d0c511d394d7a7be3b4" +REQUIRES="docker" +MAINTAINER="Audrius Kažukauskas" +EMAIL="audrius@neutrino.lt" diff --git a/system/docker-cli/slack-desc b/system/docker-cli/slack-desc new file mode 100644 index 0000000000..944f01ec27 --- /dev/null +++ b/system/docker-cli/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------------------------------------------------------| +docker-cli: docker-cli (command line tool for Docker engine) +docker-cli: +docker-cli: Docker is an open-source project to easily create lightweight, +docker-cli: portable, self-sufficient containers from any application. The same +docker-cli: container that a developer builds and tests on a laptop can run at +docker-cli: scale, in production, on VMs, bare metal, OpenStack clusters, public +docker-cli: clouds and more. +docker-cli: +docker-cli: Homepage: https://www.docker.com/products/container-runtime +docker-cli: +docker-cli: diff --git a/system/docker-proxy/docker-proxy.SlackBuild b/system/docker-proxy/docker-proxy.SlackBuild index 630e0b3cf9..ee04af839e 100644 --- a/system/docker-proxy/docker-proxy.SlackBuild +++ b/system/docker-proxy/docker-proxy.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for docker-proxy -# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=docker-proxy -VERSION=${VERSION:-20181015_6da50d1} -GITHASH=${GITHASH:-6da50d1978302f04c3e2089e29112ea24812f05b} +VERSION=${VERSION:-20201215_fa125a3} +GITHASH=${GITHASH:-fa125a3512ee0f6187721c88582bf8c4378bd4d7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/docker-proxy/docker-proxy.info b/system/docker-proxy/docker-proxy.info index 5a60f98bd1..6329993d4c 100644 --- a/system/docker-proxy/docker-proxy.info +++ b/system/docker-proxy/docker-proxy.info @@ -1,10 +1,10 @@ PRGNAM="docker-proxy" -VERSION="20181015_6da50d1" -HOMEPAGE="https://github.com/docker/libnetwork" +VERSION="20201215_fa125a3" +HOMEPAGE="https://github.com/moby/libnetwork" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/libnetwork/archive/6da50d1/libnetwork-6da50d1978302f04c3e2089e29112ea24812f05b.tar.gz" -MD5SUM_x86_64="b2d6d1427bdc142137280c66f732a4f2" +DOWNLOAD_x86_64="https://github.com/moby/libnetwork/archive/fa125a3/libnetwork-fa125a3512ee0f6187721c88582bf8c4378bd4d7.tar.gz" +MD5SUM_x86_64="0fa46e48ffcf64148df15a0739c06df4" REQUIRES="google-go-lang" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" diff --git a/system/docker-proxy/slack-desc b/system/docker-proxy/slack-desc index 17cd924cb6..b51cd858b9 100644 --- a/system/docker-proxy/slack-desc +++ b/system/docker-proxy/slack-desc @@ -11,7 +11,7 @@ docker-proxy: docker-proxy: docker-proxy enables a service consumer to communicate with the docker-proxy: service providing container. docker-proxy: -docker-proxy: Homepage: https://github.com/docker/libnetwork +docker-proxy: Homepage: https://github.com/moby/libnetwork docker-proxy: docker-proxy: docker-proxy: diff --git a/system/docker/docker.SlackBuild b/system/docker/docker.SlackBuild index 5fd5d5142b..c6631b2487 100644 --- a/system/docker/docker.SlackBuild +++ b/system/docker/docker.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for docker # Copyright 2014-2015 Vincent Batts <vbatts@hashbangbash.com> -# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=docker -VERSION=${VERSION:-18.09.0} -GITHASH=${GITHASH:-4d60db4} +VERSION=${VERSION:-20.10.2} +GITHASH=${GITHASH:-8891c58} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCNAM=$PRGNAM-ce +SRCNAM=moby if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,34 +59,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 {} \; -mkdir -p build/src/github.com/docker -( cd build/src/github.com/docker - ln -s $TMP/$SRCNAM-$VERSION/components/engine docker - ln -s $TMP/$SRCNAM-$VERSION/components/cli cli -) +mkdir build +mv vendor build/src +ln -sf $TMP/$SRCNAM-$VERSION build/src/github.com/docker/docker -# Build daemon. -cd components/engine DOCKER_GITCOMMIT=$GITHASH \ DOCKER_BUILDTAGS="seccomp" \ -VERSION=$(cat ../../VERSION) \ +VERSION=$VERSION \ GOPATH=$TMP/$SRCNAM-$VERSION/build \ ./hack/make.sh dynbinary -install -D -m 0755 $(readlink -f bundles/latest/dynbinary-daemon/dockerd) \ +install -D -m 0755 bundles/dynbinary-daemon/dockerd-$VERSION \ $PKG/usr/bin/dockerd -cd - - -# Build CLI. -cd components/cli -DISABLE_WARN_OUTSIDE_CONTAINER=1 \ -make dynbinary \ - GITCOMMIT=$GITHASH \ - VERSION=$(cat ../../VERSION) \ - GOPATH=$TMP/$SRCNAM-$VERSION/build - -install -D -m 0755 build/docker-linux-amd64 $PKG/usr/bin/docker -cd - # Integrate required components. ln -s runc $PKG/usr/bin/docker-runc @@ -95,25 +79,16 @@ ln -s containerd-shim $PKG/usr/bin/docker-containerd-shim ln -s ctr $PKG/usr/bin/docker-containerd-ctr ln -s tini-static $PKG/usr/bin/docker-init -# Completion. -( cd components/cli/contrib/completion - install -D -m 0644 bash/docker $PKG/usr/share/bash-completion/completions/docker - install -D -m 0644 zsh/_docker $PKG/usr/share/zsh/site-functions/_docker - install -D -m 0644 fish/docker.fish $PKG/usr/share/fish/vendor_completions.d/docker.fish -) - install -D -m 0644 $CWD/config/docker.default $PKG/etc/default/docker.new install -D -m 0644 $CWD/config/docker.logrotate $PKG/etc/logrotate.d/docker.new install -D -m 0644 $CWD/config/rc.docker $PKG/etc/rc.d/rc.docker.new # Install udev rules. -install -D -m 0644 components/engine/contrib/udev/80-docker.rules \ +install -D -m 0644 contrib/udev/80-docker.rules \ $PKG/lib/udev/rules.d/80-docker.rules mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - CHANGELOG.md components/engine/LICENSE components/engine/NOTICE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE NOTICE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/docker/docker.info b/system/docker/docker.info index b10994bb10..caf6c4c8b8 100644 --- a/system/docker/docker.info +++ b/system/docker/docker.info @@ -1,10 +1,10 @@ PRGNAM="docker" -VERSION="18.09.0" -HOMEPAGE="https://www.docker.com/products/docker-engine" +VERSION="20.10.2" +HOMEPAGE="https://www.docker.com/products/container-runtime" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/docker/docker-ce/archive/v18.09.0/docker-ce-18.09.0.tar.gz" -MD5SUM_x86_64="cf7f7fd8dde4bea3798cea36e8f806a1" +DOWNLOAD_x86_64="https://github.com/moby/moby/archive/v20.10.2/moby-20.10.2.tar.gz" +MD5SUM_x86_64="4a1025fd2affef73fb32e863ff6873bd" REQUIRES="containerd docker-proxy tini" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" diff --git a/system/docker/slack-desc b/system/docker/slack-desc index 896dd91d1c..f6794fc5af 100644 --- a/system/docker/slack-desc +++ b/system/docker/slack-desc @@ -14,6 +14,6 @@ docker: container that a developer builds and tests on a laptop can run at docker: scale, in production, on VMs, bare metal, OpenStack clusters, public docker: clouds and more. docker: -docker: Homepage: https://www.docker.com/products/docker-engine +docker: Homepage: https://www.docker.com/products/container-runtime docker: docker: diff --git a/system/dosbox-dev/dosbox-dev.SlackBuild b/system/dosbox-dev/dosbox-dev.SlackBuild index d65fda9053..5ef88a37ec 100644 --- a/system/dosbox-dev/dosbox-dev.SlackBuild +++ b/system/dosbox-dev/dosbox-dev.SlackBuild @@ -26,8 +26,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dosbox-dev -REVISION=${REVISION:-4180} -VERSION=${VERSION:-0.74.r$REVISION} +REVISION=${REVISION:-4441} +VERSION=${VERSION:-0.75_pre4441} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} DOSBOXDEV=${DOSBOXDEV:-no} diff --git a/system/dosbox-dev/dosbox-dev.info b/system/dosbox-dev/dosbox-dev.info index b88809c656..7c9ee5d64b 100644 --- a/system/dosbox-dev/dosbox-dev.info +++ b/system/dosbox-dev/dosbox-dev.info @@ -1,8 +1,8 @@ PRGNAM="dosbox-dev" -VERSION="0.74.r4180" +VERSION="0.75_pre4441" HOMEPAGE="http://dosbox.sourceforge.net" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.74.r4180.tar.xz" -MD5SUM="b62ae70cc3694598831f025466ddd723" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/dosbox/dosbox-dev-0.75_pre4441.tar.xz" +MD5SUM="885571b284da48fb563161bb8da4abbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/dosbox-x/README b/system/dosbox-x/README new file mode 100644 index 0000000000..17cb2022f2 --- /dev/null +++ b/system/dosbox-x/README @@ -0,0 +1,4 @@ +DOSBox-X is a fork of DOSBox; while retaining compatibility with the +wide base of DOS games and DOS gaming DOSBox was designed for, it goes +further with a focus on accurate emulation of the hardware and many +more ways to tweak and configure the DOS virtual machine. diff --git a/system/dosbox-x/dosbox-x.SlackBuild b/system/dosbox-x/dosbox-x.SlackBuild new file mode 100644 index 0000000000..5a04069ac3 --- /dev/null +++ b/system/dosbox-x/dosbox-x.SlackBuild @@ -0,0 +1,102 @@ +#!/bin/sh + +# Slackware build script for dosbox-x + +# Copyright 2019-2020 Leonardo Citrolo, 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. + +PRGNAM=dosbox-x +VERSION=${VERSION:-0.83.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 +# handle duplicated $PRGNAM, which may appear (due to upstream mistake, I guess) +# in the sources tarball filename and/or main dirname +rm -rf $PRGNAM-v$VERSION $PRGNAM-$PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-v$VERSION.tar.gz +cd $PRGNAM-v$VERSION || cd $PRGNAM-$PRGNAM-v$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 \ + --build=$ARCH-slackware-linux \ + --enable-sdl2 \ + --enable-d3d9 \ + --enable-d3d-shaders + +make +make install 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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS CHANGELOG CODE_OF_CONDUCT.md CONTRIBUTING.md COPYING \ + "DOS GAMES THAT NEED A HIGHER MCB BASE SEGMENT.TXT" INSTALL NEWS \ + README* THANKS \ + $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:-tgz} diff --git a/system/dosbox-x/dosbox-x.info b/system/dosbox-x/dosbox-x.info new file mode 100644 index 0000000000..0b95690601 --- /dev/null +++ b/system/dosbox-x/dosbox-x.info @@ -0,0 +1,10 @@ +PRGNAM="dosbox-x" +VERSION="0.83.2" +HOMEPAGE="http://dosbox-x.com/" +DOWNLOAD="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v0.83.2/dosbox-x-dosbox-x-v0.83.2.tar.gz" +MD5SUM="3da8a408deaf9518da1423dff8021f53" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="SDL2" +MAINTAINER="Leo C." +EMAIL="leoc@gmx.com" diff --git a/system/dosbox-x/slack-desc b/system/dosbox-x/slack-desc new file mode 100644 index 0000000000..317edbd44d --- /dev/null +++ b/system/dosbox-x/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------------------------------------------------------| +dosbox-x: dosbox-x (Accurate emulation and retro-development) +dosbox-x: +dosbox-x: DOSBox-X is a fork of DOSBox; while retaining compatibility with the +dosbox-x: wide base of DOS games and DOS gaming DOSBox was designed for, it goes +dosbox-x: further with a focus on accurate emulation of the hardware and many +dosbox-x: more ways to tweak and configure the DOS virtual machine. +dosbox-x: +dosbox-x: +dosbox-x: +dosbox-x: Homepage: http://dosbox-x.com/ +dosbox-x: diff --git a/system/dosbox/dosbox.SlackBuild b/system/dosbox/dosbox.SlackBuild index 934c884e77..dd32ec9133 100644 --- a/system/dosbox/dosbox.SlackBuild +++ b/system/dosbox/dosbox.SlackBuild @@ -28,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dosbox -VERSION=${VERSION:-0.74.2} +VERSION=${VERSION:-0.74.3} SRCVER=$(sed 's/\(.*\)\./\1-/' <<< $VERSION) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/dosbox/dosbox.info b/system/dosbox/dosbox.info index 9cd339a362..2b931fdf0f 100644 --- a/system/dosbox/dosbox.info +++ b/system/dosbox/dosbox.info @@ -1,8 +1,8 @@ PRGNAM="dosbox" -VERSION="0.74.2" -HOMEPAGE="http://dosbox.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/dosbox/dosbox-0.74-2.tar.gz" -MD5SUM="7110ee24a45a2b4951ad52eb1a3722be" +VERSION="0.74.3" +HOMEPAGE="https://www.dosbox.com/" +DOWNLOAD="https://downloads.sourceforge.net/dosbox/dosbox-0.74-3.tar.gz" +MD5SUM="759c75fffb59c542f80fb8391012911b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/drbd-utils/drbd-utils.SlackBuild b/system/drbd-utils/drbd-utils.SlackBuild index c1832b1778..e6eeb7f4ae 100644 --- a/system/drbd-utils/drbd-utils.SlackBuild +++ b/system/drbd-utils/drbd-utils.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for drbd-utils -# Copyright 2014, 2015, 2016, 2017, 2018 Mario Preksavec, Zagreb, Croatia +# Copyright 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=drbd-utils -VERSION=${VERSION:-9.3.0} +VERSION=${VERSION:-9.15.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -89,6 +89,7 @@ CXXFLAGS="$SLKCFLAGS" \ --without-rgmanager \ --with-bashcompletion \ --with-distro=slackware \ + --with-prebuiltman \ --build=$ARCH-slackware-linux make diff --git a/system/drbd-utils/drbd-utils.info b/system/drbd-utils/drbd-utils.info index 39922d18af..49f7312a95 100644 --- a/system/drbd-utils/drbd-utils.info +++ b/system/drbd-utils/drbd-utils.info @@ -1,8 +1,8 @@ PRGNAM="drbd-utils" -VERSION="9.3.0" +VERSION="9.15.1" HOMEPAGE="http://www.drbd.org" -DOWNLOAD="http://www.drbd.org/download/drbd/utils/drbd-utils-9.3.0.tar.gz" -MD5SUM="bcf5288f01f43d7418031e1d85544894" +DOWNLOAD="https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.15.1.tar.gz" +MD5SUM="5ff3c956aab8f022f676455162c91b21" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/driconf/driconf.SlackBuild b/system/driconf/driconf.SlackBuild index e3ccdcaf35..42f886f8d0 100644 --- a/system/driconf/driconf.SlackBuild +++ b/system/driconf/driconf.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for driconf -# Copyright 2011 David Woodfall <dave@dawoodfall.net> +# Copyright 2011 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/driconf/driconf.info b/system/driconf/driconf.info index 8d99cd64be..4cd402ce10 100644 --- a/system/driconf/driconf.info +++ b/system/driconf/driconf.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/dse-typewriter-font/README b/system/dse-typewriter-font/README new file mode 100644 index 0000000000..7a8d65d7a2 --- /dev/null +++ b/system/dse-typewriter-font/README @@ -0,0 +1,17 @@ +dse-typewriter-font (typewriter-style TrueType font) + +dse-typewriter-font is a coding font inspired by early 20th-century +typewriters, with good Unicode coverage. + +This font is not the result of any scans or traces of samples, specimens, +or other output from an actual typewriter. It's more like an amalgamation +of old-school typewriter fonts with features semi-arbitrarily picked +from each one, as well as a few not in use on actual typewriters. + +Features and Characteristics: + +* Relatively low ex-height. +* Coding-friendly distinctive characters: li1| Oo0 `'" +* Elite scale typeface (12 characters per inch at 12-point font size). +* Perfectly useful as a traditional typewriter face for other purposes, if you + don’t mind the zero (0) having a dot in the middle. diff --git a/system/dse-typewriter-font/doinst.sh b/system/dse-typewriter-font/doinst.sh new file mode 100644 index 0000000000..c4c0e67fec --- /dev/null +++ b/system/dse-typewriter-font/doinst.sh @@ -0,0 +1,8 @@ +if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then + ( cd usr/share/fonts/TTF + /usr/bin/mkfontscale . + /usr/bin/mkfontdir . + ) +fi + +[ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache -f diff --git a/system/dse-typewriter-font/dse-typewriter-font.SlackBuild b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild new file mode 100644 index 0000000000..857bfbcc46 --- /dev/null +++ b/system/dse-typewriter-font/dse-typewriter-font.SlackBuild @@ -0,0 +1,47 @@ +#!/bin/sh + +# Slackware build script for dse-typewriter-font + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=dse-typewriter-font +VERSION=${VERSION:-20200507_1795eb8} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 . +# upstream permissions are bad +find -L . -type d -exec chmod 755 {} \+ +find -L . -type f -exec chmod 644 {} \+ + +mkdir -p $PKG/usr/share/fonts/TTF +cp -a ttf/*.ttf $PKG/usr/share/fonts/TTF + +# don't include the HTML docs: they're just a copy of the homepage, except +# they don't actually work right when installed locally. +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.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:-tgz} diff --git a/system/dse-typewriter-font/dse-typewriter-font.info b/system/dse-typewriter-font/dse-typewriter-font.info new file mode 100644 index 0000000000..7e30ee6d05 --- /dev/null +++ b/system/dse-typewriter-font/dse-typewriter-font.info @@ -0,0 +1,10 @@ +PRGNAM="dse-typewriter-font" +VERSION="20200507_1795eb8" +HOMEPAGE="https://webonastick.com/fonts/dse-typewriter/" +DOWNLOAD="https://slackware.uk/~urchlay/src/dse-typewriter-font-20200507_1795eb8.tar.xz" +MD5SUM="fc138176cffc5e8acb8937132a16d4c6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/dse-typewriter-font/git2tarxz.sh b/system/dse-typewriter-font/git2tarxz.sh new file mode 100644 index 0000000000..e4d12c1807 --- /dev/null +++ b/system/dse-typewriter-font/git2tarxz.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +# Create source tarball from git repo, with generated version +# number. + +# Note that this script doesn't need to be run as root. It does +# need to be able to write to the current directory it's run from. + +# Takes one optional argument, which is the commit or tag to create +# a tarball of. With no arg, HEAD is used. + +PRGNAM=dse-typewriter-font +GITUSER=dse +CLONE_URL=https://github.com/$GITUSER/$PRGNAM.git + +set -e + +GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX ) +rm -rf $GITDIR +git clone $CLONE_URL $GITDIR + +CWD="$( pwd )" +cd $GITDIR + +if [ "$1" != "" ]; then + git reset --hard "$1" || exit 1 +fi + +GIT_SHA=$( git rev-parse --short HEAD ) + +DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 ) + +VERSION=${DATE}_${GIT_SHA} + +rm -rf .git +find . -name .gitignore -print0 | xargs -0 rm -f + +cd "$CWD" +rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz +mv $GITDIR $PRGNAM-$VERSION +tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION + +echo +echo "Created tarball: $PRGNAM-$VERSION.tar.xz" +echo "VERSION=$VERSION" diff --git a/system/dse-typewriter-font/slack-desc b/system/dse-typewriter-font/slack-desc new file mode 100644 index 0000000000..d1ad44a2c3 --- /dev/null +++ b/system/dse-typewriter-font/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------------------------------------------------------| +dse-typewriter-font: dse-typewriter-font (typewriter-style TrueType font) +dse-typewriter-font: +dse-typewriter-font: dse-typewriter-font is a coding font inspired by early 20th-century +dse-typewriter-font: typewriters, with good Unicode coverage. +dse-typewriter-font: +dse-typewriter-font: This font is not the result of any scans or traces of samples, +dse-typewriter-font: specimens, or other output from an actual typewriter. It's more +dse-typewriter-font: like an amalgamation of old-school typewriter fonts with features +dse-typewriter-font: semi-arbitrarily picked from each one, as well as a few not in use +dse-typewriter-font: on actual typewriters. +dse-typewriter-font: diff --git a/system/dtrx/dtrx.SlackBuild b/system/dtrx/dtrx.SlackBuild index 1d9ff74427..66ac134d48 100644 --- a/system/dtrx/dtrx.SlackBuild +++ b/system/dtrx/dtrx.SlackBuild @@ -2,10 +2,11 @@ # Slackware build script for dtrx -# Petr Kletecka petr@kle.cz <2013> +# Petr Kletecka petr@kle.cz <2020> PRGNAM=dtrx VERSION=${VERSION:-7.1} +ARCHIVE=${ARCHIVE:-671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -22,8 +23,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xf $CWD/${PRGNAM}-${VERSION}.tar.gz -cd $PRGNAM-$VERSION +unzip -o $CWD/$PRGNAM-$ARCHIVE.zip +cd $PRGNAM-$ARCHIVE chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/system/dtrx/dtrx.info b/system/dtrx/dtrx.info index fde1387e1e..411479487b 100644 --- a/system/dtrx/dtrx.info +++ b/system/dtrx/dtrx.info @@ -1,8 +1,8 @@ PRGNAM="dtrx" VERSION="7.1" -HOMEPAGE="https://brettcsmith.org/2007/dtrx/" -DOWNLOAD="https://brettcsmith.org/2007/dtrx/dtrx-7.1.tar.gz" -MD5SUM="4be207724b75aea3e9f93374298b2174" +HOMEPAGE="https://github.com/brettcs/dtrx" +DOWNLOAD="https://github.com/brettcs/dtrx/archive/671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf/dtrx-671ccf7d1b7ea90a6e6e6cc44234ef14874d59bf.zip" +MD5SUM="80a5abf4324824e3bcaf70d03db37bdb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/duplicity/duplicity.SlackBuild b/system/duplicity/duplicity.SlackBuild index 600788d9bc..2630fa48a1 100644 --- a/system/duplicity/duplicity.SlackBuild +++ b/system/duplicity/duplicity.SlackBuild @@ -3,6 +3,7 @@ # Written by Richard Ellis <rellis@dp100.com> # Modified by Luka Novsak <lnovsak@gmail.com> +# Modified by Jeff Parent <jeff@sh0.xyz> # All rights reserved. # @@ -24,13 +25,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=duplicity -VERSION=${VERSION:-0.6.26} +VERSION=${VERSION:-0.7.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/system/duplicity/duplicity.info b/system/duplicity/duplicity.info index 4a5a10ca0f..a37512f9fa 100644 --- a/system/duplicity/duplicity.info +++ b/system/duplicity/duplicity.info @@ -1,10 +1,10 @@ PRGNAM="duplicity" -VERSION="0.6.26" +VERSION="0.7.19" HOMEPAGE="http://duplicity.nongnu.org/" -DOWNLOAD="http://code.launchpad.net/duplicity/0.6-series/0.6.26/+download/duplicity-0.6.26.tar.gz" -MD5SUM="7c85e63f738761456b43feaa5931ba9a" +DOWNLOAD="https://code.launchpad.net/duplicity/0.7-series/0.7.19/+download/duplicity-0.7.19.tar.gz" +MD5SUM="b4decdb60275c87b4fafab55c31dc5ce" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="librsync lockfile" -MAINTAINER="Luka Novsak" -EMAIL="lnovsak@gmail.com" +REQUIRES="librsync lockfile fasteners rename six" +MAINTAINER="Jeff Parent" +EMAIL="jeff+SBo@sh0.xyz" diff --git a/system/duply/duply.SlackBuild b/system/duply/duply.SlackBuild index 1cfe4be321..ade04d8aa5 100644 --- a/system/duply/duply.SlackBuild +++ b/system/duply/duply.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=duply -VERSION=${VERSION:-2.2} +VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/duply/duply.info b/system/duply/duply.info index b78b1b2e19..0f07fc2b44 100644 --- a/system/duply/duply.info +++ b/system/duply/duply.info @@ -1,10 +1,10 @@ PRGNAM="duply" -VERSION="2.2" +VERSION="2.2.2" HOMEPAGE="https://duply.net" -DOWNLOAD="https://phoenixnap.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_2.2.tgz" -MD5SUM="1ea50f06e51f389c1f4075c2dbaecbc5" +DOWNLOAD="https://cfhcable.dl.sourceforge.net/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_2.2.2.tgz" +MD5SUM="22a8a0d1471d373a7989e698408274b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="duplicity" MAINTAINER="Jeff Parent" -EMAIL="jeff@sh0.xyz" +EMAIL="jeff+SBo@sh0.xyz" diff --git a/system/dust/README b/system/dust/README new file mode 100644 index 0000000000..84a1a21a62 --- /dev/null +++ b/system/dust/README @@ -0,0 +1,6 @@ +Dust is meant to give you an instant overview of which directories are using +disk space without requiring sort or head. + +Dust will list the 20 biggest sub directories or files and will smartly recurse +down the tree to find the larger ones. There is no need for a '-d' flag or a +'-h' flag. The largest sub directory will have its size shown in red. diff --git a/system/dust/dust.SlackBuild b/system/dust/dust.SlackBuild new file mode 100644 index 0000000000..0ff62de60d --- /dev/null +++ b/system/dust/dust.SlackBuild @@ -0,0 +1,154 @@ +#!/bin/sh + +# Slackware build script for dust + +# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# 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. + +PRGNAM=dust +VERSION=${VERSION:-0.5.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac + + if [ "$ARCH" = "i586" ]; then + if rustc -Vv | grep host | grep i686 > /dev/null ; then + ARCH=i686 + fi + fi +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" + CARGOTARGET="--target i586-unknown-linux-gnu" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" + CARGOTARGET="--target i686-unknown-linux-gnu" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + CARGOTARGET="--target x86_64-unknown-linux-gnu" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + CARGOTARGET="" +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 + +# build offline +# configuration tells cargo to use the configured directory +# for dependencies intead of downloading from crates.io +mkdir .cargo +cat << EOF >> .cargo/config +[source.crates-io] +registry = 'https://github.com/rust-lang/crates.io-index' +replace-with = 'vendored-sources' + +[source.vendored-sources] +directory = '$(pwd)/vendor' +EOF + +# deps and versions come from Cargo.lock +mkdir vendor +( + cd vendor + + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" + + tar xvf $CWD/$dep-$ver.crate + + touch $dep-$ver/.cargo-ok + + # generate checksum + { + printf "{\n" + printf ' "files": {\n' + + ( + cd $dep-$ver + find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/' + ) | sed '$ s/,$//' + + printf " },\n" + printf ' "package": "' + + sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' + + printf "}\n" + } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + done +) + +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" \ +cargo build --offline --release $CARGOTARGET + +mkdir -p $PKG/usr/bin/ + +find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \; + +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 +cp -a -r \ + 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/dust/dust.info b/system/dust/dust.info new file mode 100644 index 0000000000..3e2a8987e2 --- /dev/null +++ b/system/dust/dust.info @@ -0,0 +1,128 @@ +PRGNAM="dust" +VERSION="0.5.4" +HOMEPAGE="https://github.com/bootandy/dust/" +DOWNLOAD="https://github.com/bootandy/dust/archive/v0.5.4/dust-0.5.4.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/assert_cmd/assert_cmd-1.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/difference/difference-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/doc-comment/doc-comment-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/du-dust/du-dust-0.5.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.82.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ppv-lite86/ppv-lite86-0.2.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates/predicates-1.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-core/predicates-core-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/predicates-tree/predicates-tree-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.6.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.2.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.22.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/stfu8/stfu8-0.2.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tempfile/tempfile-3.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/terminal_size/terminal_size-0.1.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thousands/thousands-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/treeline/treeline-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.1+wasi-snapshot-preview1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate" +MD5SUM="4949eb0c64996079eab79162ab5d2df1 \ + 93850f8bf39e61dcf80ce49b5e0943d7 \ + 294a49d3c53865fa7ac5d0ce2f5d5735 \ + f44e8d1d2e61974b268852797530ea41 \ + f06a942b7e3e0b3a5eb3fb86dfb27605 \ + 142cb4b9a653e56e56311f0c883b8582 \ + c6443ec8d007c729ba5482008d0c864d \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + 0df9d76acda993ef38665e5e254f500c \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 74634128440dbc3766bda76fdf0aaa05 \ + bc79e0eb364df515a33755ac9a581cfd \ + 093c5099d3cef0f418550fe28788d34d \ + ff67cf2eb9668167782b8012d3b48e7b \ + 9e1f73325eeb9647ee68eeaa4bff975c \ + 5e49f4c3f9076fe30ae207fe951f9195 \ + dd1e49c76e9d5853e673a3b41ba02917 \ + 1e34572c42ac9f55fbf404b5d1437c11 \ + 8dab3b3ec00dc56cffde0b0c410d47b5 \ + 41b82342dee92cae37b3b731ad83e5aa \ + 1b94f32581a557963eecb29761e9c0eb \ + 553b325a602b701eb7eaef228e69d0f2 \ + 88b4e3e28ea8527c2b0e7124d6d5766f \ + fba3b040a55c01be7376d3dd5c4d4920 \ + a59d2449c2538c87a5a6aac25e852220 \ + 667d0475d8eb79899b3f511e9acd7c4d \ + f3373fd861a0066fa446a8ab3dabc749 \ + b5cf10e268e8a3bee2de8a734104245e \ + fa3630e5867493e09296155763e4f4a0 \ + c36d452e37c73b1e99f40bae18cddfdb \ + a4ff7abd41c57dfd24bbd4b50edb848f \ + b966c0b76d66f779eb93e0f0a490912a \ + 7cb6e5d606fb3a5987be4e135baea727 \ + a045d820c7167768e155123b5a985360 \ + 98aea9dd15bb412a38837b668e020e1f \ + bacea6e63b5b0b7a55a8881b47d80f3a \ + 7514db098d4a8e624178b2732ce3c4ab \ + 69e9436d5c9889a6fdf199dfc5c3d3fe \ + 381ebb79fffdf657a666ee577323039e \ + 26d687e0e0e8b04fafabfcd88f594a53 \ + bef05db0f0e720c1fd56505850065ae1 \ + 0538d1da369f3e3f0412aa4d735c1b61 \ + 2d8d8b377d144f5e32b4f65a69eb0b24 \ + c58c5d6565be5a35674117b9826795b4 \ + 781d4ccf5d04c98fa02af207a9639249 \ + 6e328718765f2352dd34f10215488fbb \ + a949194aa8c4d54f31bdda76da660982 \ + a8de006fe0c7e373c560dd51599287a8 \ + eca4f78f2f4293611dccd41ad47a3be9 \ + bf8e3f0acd783c8554afb599d7d36817 \ + 8f1da9ba3b7b793efa8a39a159d06035 \ + 4272c279b06b88f8b0ffce7109348e27 \ + 333b4ba3f64c35b6f89b521e8d64548b \ + 6708629acf3d2ecb7404e43255d2df85 \ + 1092a4a24e80f8856efc71af51a06114 \ + f95e376ec9ce794a747aba5b8ec3d940 \ + 0498c4a11448bfc35dc7bb2caa64c753 \ + db96b50050277bf05a3c68534bbb9586 \ + b9e37d5fc4ad28b612b78ad37816684d \ + 09de9d01e7331ff3da11f58be8bef0df" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Benjamin Trigona-Harany" +EMAIL="slackbuilds@jaxartes.net" diff --git a/system/dust/slack-desc b/system/dust/slack-desc new file mode 100644 index 0000000000..8d56e0f318 --- /dev/null +++ b/system/dust/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------------------------------------------------------| +dust: dust (more intuitive du) +dust: +dust: dust is a more intuitive version of the du command, showing an +dust: overview of which directories are using disk space. +dust: +dust: +dust: +dust: +dust: +dust: +dust: diff --git a/system/eaglemode/eaglemode.SlackBuild b/system/eaglemode/eaglemode.SlackBuild index 2993533646..e59a9be49e 100644 --- a/system/eaglemode/eaglemode.SlackBuild +++ b/system/eaglemode/eaglemode.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for eaglemode -# Copyright 2015-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece +# All rights reserved. # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -17,7 +18,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. PRGNAM=eaglemode -VERSION=${VERSION:-0.93.1} +VERSION=${VERSION:-0.94.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/eaglemode/eaglemode.info b/system/eaglemode/eaglemode.info index 03b310233a..2dbbbe250a 100644 --- a/system/eaglemode/eaglemode.info +++ b/system/eaglemode/eaglemode.info @@ -1,8 +1,8 @@ PRGNAM="eaglemode" -VERSION="0.93.1" +VERSION="0.94.1" HOMEPAGE="http://eaglemode.sourceforge.net/" -DOWNLOAD="https://downloads.sourceforge.net/project/eaglemode/eaglemode-0.93.1/eaglemode-0.93.1.tar.bz2" -MD5SUM="2acd8005e1578fef176d616478ab4862" +DOWNLOAD="https://downloads.sourceforge.net/project/eaglemode/eaglemode-0.94.1/eaglemode-0.94.1.tar.bz2" +MD5SUM="949a65b983480e65b5f73451316ac685" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/early-ssh/early-ssh.SlackBuild b/system/early-ssh/early-ssh.SlackBuild index 70cc852bef..0405940a32 100644 --- a/system/early-ssh/early-ssh.SlackBuild +++ b/system/early-ssh/early-ssh.SlackBuild @@ -23,11 +23,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=early-ssh -GITREV=${GITREV:-4acf000ddbe564dcafec626ec0dc7eadd821a857} -VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')} +VERSION=${VERSION:-git4acf000} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +GITREV=4acf000ddbe564dcafec626ec0dc7eadd821a857 + ARCH=noarch CWD=$(pwd) diff --git a/system/ecm-tools/ecm-tools.info b/system/ecm-tools/ecm-tools.info index 70203de643..eee6860a0b 100644 --- a/system/ecm-tools/ecm-tools.info +++ b/system/ecm-tools/ecm-tools.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/elasticsearch/README b/system/elasticsearch/README index 95e34c9927..4d20f2c192 100644 --- a/system/elasticsearch/README +++ b/system/elasticsearch/README @@ -1,7 +1,6 @@ ElasticSearch A Distributed RESTful Search Engine -http://www.elasticsearch.org ElasticSearch is a distributed RESTful search engine built for the cloud. diff --git a/system/entr/entr.SlackBuild b/system/entr/entr.SlackBuild index 671ea40e31..275bbf4d1f 100644 --- a/system/entr/entr.SlackBuild +++ b/system/entr/entr.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for entr -# Copyright 2014-2016 Kent Fritz, Mountain View, CA +# Copyright 2014-2020 Kent Fritz, Mountain View, CA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=entr -VERSION=${VERSION:-3.6} +VERSION=${VERSION:-4.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,11 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -DIRNAME=`tar tf $CWD/$PRGNAM-$VERSION.tar.gz | head -1 | cut -d/ -f1` -[ "${DIRNAME}" = "" -o "$DIRNAME" = "/" ] && exit 1 -rm -rf $DIRNAME +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $DIRNAME +cd $PRGNAM-$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/entr/entr.info b/system/entr/entr.info index f1b145b004..e789b0c1fd 100644 --- a/system/entr/entr.info +++ b/system/entr/entr.info @@ -1,8 +1,8 @@ PRGNAM="entr" -VERSION="3.6" +VERSION="4.6" HOMEPAGE="http://entrproject.org" -DOWNLOAD="http://entrproject.org/code/entr-3.6.tar.gz" -MD5SUM="072eed7153296a8fae6ebdedefed9fd4" +DOWNLOAD="http://entrproject.org/code/entr-4.6.tar.gz" +MD5SUM="e91417c7096bb94cbe8a8d2976223cb8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/epson-inkjet-printer-escpr/LICENSE.html b/system/epson-inkjet-printer-escpr/LICENSE.html index 990b7a0418..83ca9f49a4 100644 --- a/system/epson-inkjet-printer-escpr/LICENSE.html +++ b/system/epson-inkjet-printer-escpr/LICENSE.html @@ -1,34 +1,33 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <!-- title --> -<title>License agreement for Epson Inkjet Printer Driver for Linux</title> -<meta name="description" content="" /> -<meta name="keywords" content="" /> -<meta http-equiv="Content-Script-Type" content="text/javascript" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<meta http-equiv="X-UA-Compatible" content="IE=edge" /> -<link rel="stylesheet" href="/common/css/css_link.css" type="text/css" /> -<link rel="stylesheet" href="/common/css/print.css" type="text/css" media="print" /> - -<script type="text/javascript" src="/common/js/common.js"></script> -<script type="text/javascript" src="/common/js/jquery.js"></script> -<script type="text/javascript" src="/common/js/jquery.ui.core.js"></script> -<script type="text/javascript" src="/common/js/jquery.easing.js"></script> -<script type="text/javascript" src="/common/js/jquery.accordion.js"></script> -<script type="text/javascript" src="/faq/common/js/xpath.js"></script> -<script type="text/javascript" src="/faq/common/js/SpryData.js"></script> -<script type="text/javascript" src="/common/js/epson.common.js"></script> +<title>License agreement - Linux</title> +<meta name="description" content=""> +<meta name="keywords" content=""> +<meta http-equiv="Content-Script-Type" content="text/javascript"> +<meta http-equiv="Content-Style-Type" content="text/css"> +<meta http-equiv="X-UA-Compatible" content="IE=edge"> +<link rel="stylesheet" href="LICENSE2_files/css_link.css" type="text/css"> +<link rel="stylesheet" href="LICENSE2_files/print.css" type="text/css" media="print"> + +<script type="text/javascript" src="LICENSE2_files/common.js"></script> +<script type="text/javascript" src="LICENSE2_files/jquery_002.js"></script> +<script type="text/javascript" src="LICENSE2_files/jquery_003.js"></script> +<script type="text/javascript" src="LICENSE2_files/jquery.js"></script> +<script type="text/javascript" src="LICENSE2_files/jquery_004.js"></script> +<script type="text/javascript" src="LICENSE2_files/xpath.js"></script> +<script type="text/javascript" src="LICENSE2_files/SpryData.js"></script> +<script type="text/javascript" src="LICENSE2_files/epson.js"></script><link rel="stylesheet" href="LICENSE2_files/javascript.css" type="text/css" media="all"> <script type="text/javascript"><!-- newDatabase = new Spry.Data.XMLDataSet("xml/windows.xml", "/newsline/news"); // --></script> -<link rel="shortcut icon" href="/favicon.ico"type="image/vnd.microsoft.icon" /> -<link rel="icon" href="/favicon.ico" type="image/vnd.microsoft.icon" /> -<meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> +<link rel="shortcut icon" href="http://download.ebz.epson.net/favicon.ico" type="image/vnd.microsoft.icon"> +<link rel="icon" href="http://download.ebz.epson.net/favicon.ico" type="image/vnd.microsoft.icon"> +<meta http-equiv="X-UA-Compatible" content="IE=emulateIE7"> <!--[if lte IE 6]> <script type="text/javascript" src="/common/js/jquery.dropdown.js"></script> <script type="text/javascript" src="/common/js/DD_belatedPNG.js"></script> @@ -45,31 +44,32 @@ newDatabase = new Spry.Data.XMLDataSet("xml/windows.xml", "/newsline/news"); <form action="" method="get"> <font face="Helvetica"> <ul> - <li><title="Home">English</a></li> - <li><a href="/la_j/" title="Japanese">Japanese</a></li> + <li><title="home">English</title="home"></li> + <li><a href="http://download.ebz.epson.net/la_j/" title="Japanese">Japanese</a></li> </ul> </font></form> <!-- /userLinks --></div> <div class="roundCorner"> <div class="roundInner"> - <h1 class="logo"><a href="http://global.epson.com/index.html"><img src="/common/img/logo.gif" alt="Epson" width="116" height="38" /></a></h1> + <h1 class="logo"><a href="http://global.epson.com/index.html"><img src="LICENSE2_files/logo.gif" alt="Epson" width="116" height="38"></a></h1> <div class="content"> <div id="primaryNav"> <ul class="nav"> - <li><strong><a href="/dsc/search/01/search/">Support</a></strong></li> + <li><strong><a href="http://download.ebz.epson.net/dsc/search/01/search/">Support</a></strong></li> </ul> <!-- /primaryNav --></div> <div id="secondaryNav"> <ul> - <li><a href="/dsc/search/01/search/">Download</a></li> - <li><a href="/faq/">FAQ</a></li> - <li><a href="/man/">Manual</a></li> - <li><a href="/la/">License Agreement</a></li> - <li><a href="/link/">Link</a></li> + <li><a href="http://download.ebz.epson.net/dsc/search/01/search/">Download</a></li> + <li><a href="http://download.ebz.epson.net/faq/">FAQ</a></li> + <li><a href="http://download.ebz.epson.net/man/">Manual</a></li> + <li><a href="http://download.ebz.epson.net/la/">License Agreement</a></li> + <li><a href="http://download.ebz.epson.net/ps/">Privacy Statement</a></li> + <!-- li><a href="/link/">Link</a></li --> </ul> <!-- /secondaryNav --></div> <!-- /content --></div> @@ -97,9 +97,9 @@ newDatabase = new Spry.Data.XMLDataSet("xml/windows.xml", "/newsline/news"); <ul class="heroNavigation ui-accordion"> <li> <ul id="leftMenuConts"> - <li><a href="/faq/linux/index.html">Linux</a></li><br /> - <li><font color="bbbbbb"> Windows (Now Constructing)</font></li><br /> - <li><font color="bbbbbb"> Mac OS (Now Constructing)</font></li><br /> + <li><strong><a href="">Linux</a></strong></li><!-- br / --> + <!-- li><font color="bbbbbb"> Windows (Now Constructing)</font></li><br / --> + <!-- li><font color="bbbbbb"> Mac OS (Now Constructing)</font></li><br / --> </ul> </li> @@ -112,304 +112,116 @@ newDatabase = new Spry.Data.XMLDataSet("xml/windows.xml", "/newsline/news"); <!-- /left --></div> - <div id="main"> + <div id="main" style="font-size: 100%;"> <div class="roundCorner"> <div id="newsRoom" class="roundInner"> <div id="headline"> - <p class="treeMenu"><a onclick="print();return false;" href="javascript:void(0);"><a onclick="print();return false;" href="javascript:void(0);"><img height="13" width="72" alt="Print" src="/common/img/button_print.gif"/></a><img height="13" width="1" alt="" src="/common/img/textsize2.gif"/><img height="13" width="54" alt="Text Size" src="/common/img/textsize.gif"/><a href="javascript:setCSS('0');void(0);"><img height="13" width="15" alt="Small" id="sizeM" name="sizeM" src="/common/img/textsize_small_on.gif"/></a><a href="javascript:setCSS('1');void(0);"><img height="13" width="18" alt="Large" id="sizeL" name="sizeL" src="/common/img/textsize_big_off.gif"/></a></p> + <p class="treeMenu"><a onclick="print();return false;" href="javascript:void(0);"></a><a onclick="print();return false;" href="javascript:void(0);"><img alt="Print" src="LICENSE2_files/button_print.gif" width="72" height="13"></a><img alt="" src="LICENSE2_files/textsize2.gif" width="1" height="13"><img alt="Text Size" src="LICENSE2_files/textsize.gif" width="54" height="13"><a href="javascript:setCSS('0');void(0);"><img alt="Small" id="sizeM" name="sizeM" src="LICENSE2_files/textsize_small_on.gif" width="15" height="13"></a><a href="javascript:setCSS('1');void(0);"><img alt="Large" id="sizeL" name="sizeL" src="LICENSE2_files/textsize_big_off.gif" width="18" height="13"></a></p> </div> <div class="artcleBody"> <!-- title --> -<h2 class="txtMainHeader">License agreement for Epson Inkjet Printer Driver for Linux</h2> +<h2 class="txtMainHeader">License agreement - Linux</h2> <!-- ID & date --> <p class="txtR"> -Last modified : 2011.12.21</p> +Last modified : 2019.07.29</p> <!-- body start --> - -<p> -<p> -This package includes source codes which are distributed under GNU Lesser General Public License v2.1 (COPYING.LIB). This package also includes objects codes which are distributed under the conditions of SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT(COPYING.EPSON). Please refer to each license for the details. -</p> <p> -<ul class="listBasicBlack txtNormal"> -<li><a href="http://www.gnu.org/licenses/lgpl.html" target=_blank>GNU Lesser General Public License v2.1 -</a></li> -<li><a href="#softlicense">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a></li> +<b>[Inkjet Printer]</b><br> +<b>1.ESC/P</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html">License agreement for Epson Inkjet Printer Driver for Linux</a></li> </ul> -</p> +<p></p> + <p> -<br /><br /> -<a name="softlicense">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a> -</p> +<b>2.ESC/P-R</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li> +</ul> +<p></p> + <p> -IMPORTANT! READ THIS SOFTWARE LICENSE AGREEMENT CAREFULLY. The computer software product, fontware, typefaces and/or data, including any accompanying explanatory written materials (the "Software") should only be installed or used by the Licensee ("you") on the condition you agree with SEIKO EPSON CORPORATION ("EPSON") to the terms and conditions set forth in this Agreement. By installing or using the Software, you are representing to agree all the terms and conditions set forth in this Agreement. You should read this Agreement carefully before installing or using the Software. If you do not agree with the terms and conditions of this Agreement, you are not permitted to install or use the Software. -</p> -<ol class="listBasicBlack txtNormal"> -<li>License. EPSON and its suppliers grant you a personal, nonexclusive, royalty-free, non-sublicensable limited license to install and use the Software on any single computer or computers that you intend to use directly or via network. You may allow other users of the computers connected to the network to use the Software, provided that you (a) ensure that all such users agree and are bound by the terms and conditions of this Agreement, (b) ensure that all such users use the Software only in conjunction with the computers and in relation to the network of which they form part, and (c) indemnify and keep whole EPSON and its suppliers against all damages, losses, costs, expenses and liabilities which EPSON or its suppliers may incur as a consequence of such users failing to observe and perform the terms and conditions of this Agreement. You may also make copies of the Software as necessary for backup and archival purposes, provided that the copyright notice is reproduced in its entirety on the backup copy. The term "Software" shall include the software components, media, all copies made by you and any upgrades, modified versions, updates, additions and copies of the Software licensed to you by EPSON or its suppliers. EPSON and its suppliers reserve all rights not granted herein.</li> -<br /> -<li>Other Rights and Limitations. You agree not to modify, adapt or translate the Software. You also agree not to attempt to reverse engineer, decompile, disassemble or otherwise attempt to discover the source code of the Software. You may not share, rent, lease, encumber, sublicense or lend the Software. You may, however, transfer all your rights to use the Software to another person or legal entity provided that you transfer this Agreement, the Software, including all copies, updates and prior versions, to such person or entity, and that you retain no copies, including copies stored on a computer. Some states or jurisdictions, however, do not allow the restriction or limitation on transfer of the Software, so the above limitations may not apply to you.</li> -<br /> -<li>Ownership. Title, ownership rights, and intellectual property rights in and to the Software and any copies thereof shall remain with EPSON or its suppliers. There is no transfer to you of any title to or ownership of the Software and this License shall not be construed as a sale of any rights in the Software. The Software is protected by Japanese Copyright Law and international copyright treaties, as well as other intellectual property laws and treaties. Except as otherwise provided in this Agreement, you may not copy the Software. You also agree not to remove or alter any copyright and other proprietary notices on any copies of the Software.</li> -<br /> -<li>LGPL. The Software uses the open source software programs which apply the GNU Lesser General Public License Version 2 or later version (“ LGPLâ€). Notwithstanding any provision of this Agreement, you may make modification of the Software for your own use and reverse engineering for debugging such modifications according to the terms and conditions of the LGPL.</li> -<br /> -<li>Protection and Security. You agree to use your best efforts and take all reasonable steps to safeguard the Software to ensure that no unauthorized person has access to them and that no unauthorized copy, publication, disclosure or distribution of any of the Software is made. You acknowledge that the Software contains valuable, confidential information and trade secrets, that unauthorized use and copying are harmful to EPSON and its suppliers, and that you have a confidentiality obligation as to such valuable information and trade secrets.</li> -<br /> -<li>Limited Warranty. In case of that you obtained the Software by media from EPSON or a dealer, EPSON warrants that the media on which the Software is recorded will be free from defects in workmanship and materials under normal use for a period of 90 days from the date of delivery to you. If the media is returned to EPSON or the dealer from which the media was obtained within 90 days of the date of delivery to you, and if EPSON determines the media to be defective and provided the media was not subject to misuse, abuse, misapplication or use in defective equipment, EPSON will replace the media, upon your return to EPSON of the Software, including all copies of any portions thereof. ALL IMPLIED WARRANTIES ON THE MEDIA, INCLUDING IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE LIMITED TO THE DURATION OF THE EXPRESS WARRANTY SET FORTH ABOVE. -<br /><br /> -You acknowledge and agree that the use of the Software is at your sole risk. THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY WARRANTY OF ANY KIND. EPSON AND ITS SUPPLIERS DO NOT AND CANNOT WARRANT THE PERFORMANCE OR RESULTS YOU MAY OBTAIN BY USING THE SOFTWARE. THE FOREGOING STATES THE SOLE AND EXCLUSIVE REMEDIES FOR EPSON'S AND ITS SUPPLIERS' BREACH OF WARRANTY. EXCEPT FOR THE FOREGOING LIMITED WARRANTY, EPSON AND ITS SUPPLIERS MAKE NO WARRANTIES, EXPRESS OR IMPLIED, AS TO NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE. Some states or jurisdictions do not allow the exclusion of implied warranties or limitations on how long an implied warranty may last, so the above limitations may not apply to you. This warranty gives you specific legal rights. You may have other rights which vary from state to state or jurisdiction to jurisdiction. -<br /><br /> -IN NO EVENT WILL EPSON OR ITS SUPPLIERS BE LIABLE TO YOU, WHETHER ARISING UNDER CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY, BREACH OR WARRANTY, MISREPRESENTATION OR OTHERWISE, FOR ANY DIRECT, CONSEQUENTIAL, INCIDENTAL OR SPECIAL DAMAGES, INCLUDING ANY LOST PROFITS OR LOST SAVINGS, EVEN IF EPSON, ITS SUPPLIERS OR ANY REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY THIRD PARTY. Some states or jurisdictions, however, do not allow the exclusion or limitation of incidental, consequential or special damages, so the above limitations may not apply to you. -</li> -<br /> -<li>Termination. Without prejudice to any other rights EPSON has, this Agreement shall automatically terminate upon failure by you to comply with its terms. You may also terminate this Agreement at any time by uninstalling and destroying the Software and all copies thereof. -</li> -<br /> -<li>Export Restriction. You agree not to transfer, export or re-export the Software and any data or information which you obtained from EPSON or use the Software without a proper license under Japanese law, restrictions and regulations, or the laws of the jurisdiction in which the Software is obtained. -</li> -<br /> -<li>Governing Law and General Provisions. This Agreement shall be governed and construed under by the laws of Japan without regard to its conflicts of law rules. This Agreement is the entire agreement between the parties with respect to the Software, and supersedes any purchase order, communication, advertisement, or representation concerning the Software. This Agreement shall be binding upon, and inure to the benefit of, the parties hereto and their respective successors, assigns and legal representatives. If any provision herein is found void or unenforceable, it will not affect the validity of the balance of the Agreement, which shall remain valid and enforceable according to its terms. This Agreement may only be modified in writing signed by an authorized officer of EPSON. -</li> -<br /> -<li>U.S. Government End Users. If you are acquiring the Software on behalf of any unit or agency of the United States Government, the following provisions apply. The Government agrees: (i) if the Software is supplied to the Department of Defense (DoD), the Software is classified as " Commercial Computer Software" and the Government is acquiring only " restricted rights" in the Software and its documentation as that term is defined in Clause 252.227-7013(c)(1) of the DFARS; and (ii) if the Software is supplied to any unit or agency of the United States Government other than DoD, the Government's rights in the Software and its documentation will be as defined in Clause 52.227-19(c)(2) of the FAR or, in the case of NASA, in Clause 18-52.227-86(d) of the NASA supplement to the FAR. -</li> -<br /> -<li>Internet Connection. The Software may have the ability to connect over the Internet to transmit data and/or information to and from your computer regarding the EPSON hardware and/or software that you use ("EPSON Products") including, but not limited to, EPSON Products model information, the country/ region where you live, the condition of EPSON Products, etc. EPSON may alter the items of such data and/or information without your prior approval. EPSON does not collect any personally identifiable information without your permission. EPSON may, however, use non personally identifiable information for statistical purposes to improve the level of service we provide to our users If you agree to install the Software, any transmissions to or from the Internet will be in accordance with EPSON's then-current Privacy Policy provided in EPSON Internet site. -</li> -<br /> -<li>Updating Software Version. The Software may have the ability to connect over the Internet to a server of EPSON or any third party entrusted by EPSON in order to update the software version (i)automatically or (ii)with your consent in advance. Such updated software shall be deemed to be the Software and be governed by this Agreement. -</li> -</ol> -</p> -<br /><br /> +<b>3.PIPS(Photo Image Print System)</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li> +<li><a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">GNU Lesser General Public License</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li> +</ul> +<p></p> +<br> <hr> -<br /><br /> -<p align="center"> -GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 -</p> -<p> - Copyright (C) 1991, 1999 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - </p> -<p> -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.]<br /><br /></p> -<p align="center">Preamble</p> -<p> - The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. -</p> -<p> - This license, the Lesser General Public License, applies to somespecially designated software packages--typically libraries--of theFree Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. -</p> -<p> - When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure thatyou have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can dothese things. -</p> -<p> - To protect your rights, we need to make restrictions that forbiddistributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.<br /> - For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. -</p> -<p> - We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. -</p> -<p> - To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. -</p> -<p> - Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. -</p> -<p> - Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. -</p> -<p> - When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. -</p> -<p> - We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. -</p> -<p> - For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. -</p> -<p> - In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. -</p> -<p> - Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. -</p> -<p> - The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.<br /><br /> -</p> - -<p align="center">GNU LESSER GENERAL PUBLIC LICENSE<br /> - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</p> - -<ol class="listBasicBlack txtNormal" start="0"> -<li> -<p> -This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". -</p> -<p> - A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. -</p> -<p> - The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) -</p> -<p> - "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. -</p> <p> - Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. -</p></li> -<li> -<p> - You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. -</p> -<p> - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. -</p></li> - -<li><p> - You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:<br /><br /> - - a) The modified work must itself be a software library.<br /><br /> - - b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.<br /><br /> - - c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.<br /><br /> - - d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.<br /><br /> +<b>[Laser Printer]</b><br> +<b>1.Postscript Printer Description (PPD) file for EPSON Printer</b> +</p><ul class="listBasicBlack txtNormal"> +<li>Please read the license at the top of the EPSON PPD file carefully.</li> +</ul> +<p></p> - (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)</p> - -<p> -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wroteit.</p> -<p> -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.</p> <p> -In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.</p></li> +<b>2.GS-LPD (Ghostscript Laser Printer Driver for Linux)</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li> +</ul> +<p></p> -<li><p> - You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.</p> -<p> - Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.</p> -<p> - This option is useful when you wish to copy part of the code of the Library into a program that is not a library.</p></li> -<li><p> - You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.</p> -<p> - If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.</p></li> -<li><p> - A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.</p> -<p> - However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.</p> <p> - When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.</p> -<p> - If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)</p> -<p> - Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.</p></li> -<li><p> - As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.</p> -<p> - You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:<br /><br /> - - a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)<br /><br /> - - b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.<br /><br /> - - c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.<br /><br /> - - d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.<br /><br /> - - e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.</p> +<b>3.Laser Printer Filter for Linux</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li> +<li><a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">MIT License</a></li> +</ul> +<p></p> <p> - For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.</p> +<b>4.Photo Image Print System Plus for Linux</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li> +<li><a href="http://www.gnu.org/licenses/fdl.html" target="_blank">GNU Free Documentation License</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li> +</ul> +<p></p> +<br> +<hr> <p> - It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.</p></li> - -<li><p> - You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:<br /><br /> - - a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.<br /><br /> - - b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.</p></li> -<li><p> - You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.</p></li> -<li><p> - You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.</p></li> -<li><p> - Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.</p></li> -<li><p> - If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.</p> -<p> -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.</p> -<p> -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.</p> -<p> -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.</p> -<li><p> - If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.</p></li> -<li><p> - The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</p> -<p> -Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.</p></li> -<li><p> - If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.<br /><br /></p></li> - -<p align="center">NO WARRANTY</p> -<li><p> - BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p></li> -<li><p> - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.<br /><br /></p></li> -</ol> - -<p align="center">END OF TERMS AND CONDITIONS</p> +<b>[PC-Fax]</b><br> +<b>1.PC-Fax Driver for Linux</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html">License agreement for Epson Inkjet Printer Driver for Linux</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/APPLE_LICENSE" target="_blank">APPLE PUBLIC SOURCE LICENSE v2.0</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/ICU.license.html" target="_blank">ICU License</a></li> +</ul> +<p></p> +<br> +<hr> -<p align="center">How to Apply These Terms to Your New Libraries</p> -<p> - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License).</p> -<p> - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found.</p> -<p> - <one line to give the library's name and a brief idea of what it does.><br /> - Copyright (C) <year> <name of author></p> -<p> - 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.</p> -<p> - 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.</p> <p> - 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA</p> -<p> -Also add information on how to contact you by electronic and paper mail.</p> -<p> -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names:</p> -<p> - Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker.</p> -<p> - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice</p> -<p> -That's all there is to it! -</p> +<b>[Scanner]</b><br> +<b>1.Image Scan! for Linux</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li> +<li><a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">GNU Lesser General Public License</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html#softlicense">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a></li> +</ul> +<p></p> -</p> +<p> +<b>2.Image Scan v3</b> +</p><ul class="listBasicBlack txtNormal"> +<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li> +<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html#softlicense">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a></li> +</ul> +<p></p> +<br> <!-- body end --> @@ -444,7 +256,7 @@ That's all there is to it! <!--<li><a href="/privacy/privacy_policy.html">Privacy Policy</a></li>--> <!--<li><a href="/privacy/teams_conditions.html">Terms & Conditions</a></li>--> </ul> - <p id="copyright">© Seiko Epson Corp. 2012</p> + <p id="copyright">© Seiko Epson Corp. 2019</p> <!-- SEG Global Web Analytics Program - Google Analytics - DO NOT REMOVE--> <!--<script type="text/javascript" @@ -459,8 +271,9 @@ var ww_pageTracker = _gat._getTracker("UA-6298218-1"); <!-- SEG Global Web Analytics Program - Google Analytics - END--> + <script type="text/javascript" src="LICENSE2_files/menuconst.js"></script> <!-- /footer --></div> <!-- /container --></div> -</body> -</html> + +</body></html>
\ No newline at end of file diff --git a/system/epson-inkjet-printer-escpr/README.models b/system/epson-inkjet-printer-escpr/README.models index 6ca28f65a7..b5b5fdb956 100644 --- a/system/epson-inkjet-printer-escpr/README.models +++ b/system/epson-inkjet-printer-escpr/README.models @@ -1,127 +1,138 @@ Supported models: -Artisan 1430, Artisan 630, Artisan 700, Artisan 710, Artisan 720, Artisan -730, Artisan 800, Artisan 810, Artisan 830, Artisan 837, E-150, E-200, -E-300, E-330, E-330S, E-340, E-350, E-360 Series, E-370 Series, E-500, -E-520, E-530, E-530P, E-530S, E-600, E-700, E-720, E-800, E-810, E-820, -E-830 Series, E-840 Series, E-850 Series, EP-10VA Series, EP-306 Series, -EP-30VA Series, EP-4004, EP-702A, EP-703A, EP-704A, EP-705A Series, -EP-706A Series, EP-707A Series, EP-708A Series, EP-709A Series, EP-710A -Series, EP-774A, EP-775A Series, EP-776A Series, EP-777A Series, EP-801A, -EP-802A, EP-803A, EP-804A, EP-805A Series, EP-806A Series, EP-807A -Series, EP-808A Series, EP-810A Series, EP-901A, EP-901F, EP-902A, -EP-903A, EP-903F, EP-904A, EP-904F, EP-905A Series, EP-905F Series, -EP-906F Series, EP-907F Series, EP-976A3 Series, EP-977A3 Series, -EP-978A3 Series, EP-979A3 Series, EP-M570T Series, ET-16500 Series, -ET-2500 Series, ET-2550 Series, ET-2600 Series, ET-2610 Series, ET-2650 -Series, ET-2700 Series, ET-2710 Series, ET-2750 Series, ET-4500 Series, -ET-4550 Series, ET-7700 Series, ET-7750 Series, EW-M5071FT Series, -EW-M571T Series, EW-M660FT Series, EW-M770T Series, EW-M970A3T Series, -K200, K300, L1455 Series, L3050 Series, L3060 Series, L3070 Series, L3110 -Series, L3150 Series, L364 Series, L375 Series, L385 Series, L386 Series, -L395 Series, L396 Series, L405 Series, L4150 Series, L4160 Series, L475 -Series, L485 Series, L486 Series, L495 Series, L565 Series, L566 Series, -L575 Series, L605 Series, L655 Series, L805 Series, L810 Series, L850 -Series, M200 Series, M205 Series, ME 200, ME OFFICE 520, ME OFFICE 530, -ME OFFICE 560W, ME OFFICE 570, ME OFFICE 620F, ME OFFICE 900WD, ME OFFICE -940FW, ME OFFICE 960FWD, ME Office 510, ME Office 600F, ME Office 650FN, -ME Office 700FW, ME-301 Series, ME-303 Series, ME-400 Series, NX230 -TX230, NX430 TX435, PF-70 Series, PF-71 Series, PF-81 Series, PM-400 -Series, PM-A750, PM-A820, PM-A840, PM-A840S, PM-A890, PM-A920, PM-A940, -PM-A950, PM-A970, PM-D600, PM-D800, PM-D870, PM-G4500, PM-G850, PM-T960, -PM-T990, PX-046A Series, PX-047A Series, PX-048A Series, PX-049A Series, -PX-1600F, PX-1700F, PX-205 Series, PX-404A, PX-405A Series, PX-434A, -PX-435A Series, PX-436A Series, PX-437A Series, PX-501A, PX-502A, -PX-503A, PX-504A, PX-505F Series, PX-535F Series, PX-5600, PX-5V, -PX-601F, PX-602F, PX-603F, PX-605F Series, PX-673F, PX-675F Series, -PX-7V, PX-A620, PX-A640, PX-A650, PX-A720, PX-A740, PX-B700, PX-B750F, -PX-FA700, PX-G5300, PX-M160T Series, PX-M350F, PX-M5040F, PX-M5041F, -PX-M650A, PX-M650F, PX-M7050 Series, PX-M7050FP, PX-M7050FX, PX-M740F, -PX-M741F, PX-M840F, PX-M840FX, PX-M860F, PX-S05 Series, PX-S160T Series, -PX-S350, PX-S5040, PX-S7050 Series, PX-S7050PS, PX-S740, PX-S840, PX-S860, -PictureMate 500, PictureMate Deluxe, PictureMate PM 200, PictureMate -PM 210, PictureMate PM 215, PictureMate PM 225, PictureMate PM 235, -PictureMate PM 240, PictureMate PM 245, PictureMate PM 250, PictureMate -PM 260, PictureMate PM 270, PictureMate PM 280, PictureMate PM 290, -PictureMate PM 300, PictureMate PM 310, Epson Stylus CX2800, Epson -Stylus CX2900, Epson Stylus CX3700, Epson Stylus CX3800, Epson Stylus -CX3900, Epson Stylus CX4200, Epson Stylus CX4800, Epson Stylus CX4900, -Epson Stylus CX5000, Epson Stylus CX5900, Epson Stylus CX6000, Epson -Stylus CX7300, Epson Stylus CX7400, Epson Stylus CX7700, Epson Stylus -CX7800, Epson Stylus CX8300, Epson Stylus CX8400, Epson Stylus CX9300F, -Epson Stylus CX9400Fax, Epson Stylus DX3800, Epson Stylus DX4000, Epson -Stylus DX4200, Epson Stylus DX4800, Epson Stylus DX5000, Epson Stylus -DX7400, Epson Stylus DX8400, Epson Stylus DX9400F, Epson Stylus NX200, -Epson Stylus NX210, Epson Stylus NX215, Epson Stylus NX230, Epson Stylus -NX300, Epson Stylus NX330, Epson Stylus NX400, Epson Stylus NX410, Epson -Stylus NX420, Epson Stylus NX430, Epson Stylus NX510, Epson Stylus NX530, -Epson Stylus NX620, Epson Stylus NX635, Epson Stylus Office BX300F, -Epson Stylus Office BX305, Epson Stylus Office BX305 Plus, Epson Stylus -Office BX310FN, Epson Stylus Office BX320FW, Epson Stylus Office BX525WD, -Epson Stylus Office BX535WD, Epson Stylus Office BX600FW, Epson Stylus -Office BX610FW, Epson Stylus Office BX620FWD, Epson Stylus Office BX630FW, -Epson Stylus Office BX635FWD, Epson Stylus Office BX925, Epson Stylus -Office BX935FWD, Epson Stylus Office TX300F, Epson Stylus Office TX320F, -Epson Stylus Office TX510FN, Epson Stylus Office TX515FN, Epson Stylus -Office TX525FW, Epson Stylus Office TX600FW, Epson Stylus Office TX610FW, -Epson Stylus Office TX620FWD, Epson Stylus Photo 1400, Epson Stylus Photo -1410, Epson Stylus Photo 1430, Epson Stylus Photo 1500, Epson Stylus Photo -PX650, Epson Stylus Photo PX660, Epson Stylus Photo PX700W, Epson Stylus -Photo PX710W, Epson Stylus Photo PX720WD, Epson Stylus Photo PX730, -Epson Stylus Photo PX800FW, Epson Stylus Photo PX810FW, Epson Stylus -Photo PX820FWD, Epson Stylus Photo PX830, Epson Stylus Photo R1900, -Epson Stylus Photo R2000, Epson Stylus Photo R240, Epson Stylus Photo -R250, Epson Stylus Photo R260, Epson Stylus Photo R265, Epson Stylus -Photo R270, Epson Stylus Photo R2880, Epson Stylus Photo R3000, Epson -Stylus Photo R340, Epson Stylus Photo R350, Epson Stylus Photo R360, -Epson Stylus Photo R380, Epson Stylus Photo R390, Epson Stylus Photo -RX520, Epson Stylus Photo RX530, Epson Stylus Photo RX560, Epson Stylus -Photo RX580, Epson Stylus Photo RX585, Epson Stylus Photo RX590, Epson -Stylus Photo RX595, Epson Stylus Photo RX610, Epson Stylus Photo RX640, -Epson Stylus Photo RX650, Epson Stylus Photo RX680, Epson Stylus Photo -RX685, Epson Stylus Photo RX690, Epson Stylus Photo TX650, Epson Stylus -Photo TX700W, Epson Stylus Photo TX710W, Epson Stylus Photo TX720WD, -Epson Stylus Photo TX730, Epson Stylus Photo TX800FW, Epson Stylus Photo -TX810FW, Epson Stylus SX200, Epson Stylus SX210, Epson Stylus SX215, -Epson Stylus SX218, Epson Stylus SX230, Epson Stylus SX235, Epson Stylus -SX400, Epson Stylus SX410, Epson Stylus SX420W, Epson Stylus SX430, -Epson Stylus SX440, Epson Stylus SX510W, Epson Stylus SX525WD, Epson -Stylus SX535WD, Epson Stylus SX600FW, Epson Stylus SX610FW, Epson Stylus -SX620FW, Epson Stylus TX200, Epson Stylus TX210, Epson Stylus TX213, -Epson Stylus TX219, Epson Stylus TX220, Epson Stylus TX230, Epson Stylus -TX235, Epson Stylus TX400, Epson Stylus TX410, Epson Stylus TX420W, -Epson Stylus TX430, Epson Stylus TX550W, Epson Stylus TX560WD, TX220 -NX220, TX320 WorkForce320, TX420 NX420, WF-100 Series, WF-2510 Series, -WF-2520 Series, WF-2530 Series, WF-2540 Series, WF-2630 Series, WF-2650 -Series, WF-2660 Series, WF-2750 Series, WF-2760 Series, WF-3010 Series, -WF-3520 Series, WF-3530 Series, WF-3540 Series, WF-3620 Series, WF-3640 -Series, WF-4630 Series, WF-4640 Series, WF-5110 Series, WF-5190 Series, -WF-5620 Series, WF-5690 Series, WF-6090 Series, WF-6530 Series, WF-6590 -Series, WF-7110 Series, WF-7510 Series, WF-7511 Series, WF-7515 Series, -WF-7520 Series, WF-7521 Series, WF-7525 Series, WF-7610 Series, WF-7620 -Series, WF-8010 Series, WF-8090 Series, WF-8510 Series, WF-8590 Series, -WF-M1560 Series, WF-M5190 Series, WF-M5690 Series, WF-R4640 Series, -WF-R5190 Series, WF-R5690 Series, WF-R8590 Series, WP-4010 Series, -WP-4011 Series, WP-4015 Series, WP-4020 Series, WP-4022 Series, WP-4023 -Series, WP-4025 Series, WP-4090 Series, WP-4091 Series, WP-4092 Series, -WP-4095 Series, WP-4511 Series, WP-4515 Series, WP-4520 Series, WP-4521 -Series, WP-4525 Series, WP-4530 Series, WP-4531 Series, WP-4532 Series, -WP-4533 Series, WP-4535 Series, WP-4540 Series, WP-4545 Series, WP-4590 -Series, WP-4592 Series, WP-4595 Series, WP-M4011 Series, WP-M4015 Series, -WP-M4095 Series, WP-M4521 Series, WP-M4525 Series, WP-M4595 Series, -WorkForce 310, WorkForce 320, WorkForce 435, WorkForce 500, WorkForce 520, -WorkForce 545, WorkForce 600, WorkForce 610, WorkForce 620, WorkForce 630, -WorkForce 645, WorkForce 840, WorkForce 845, XP-200 Series, XP-201 204 208 -Series, XP-202 203 206 Series, XP-205 207 Series, XP-211 214 216 Series, -XP-212 213 Series, XP-215 217 Series, XP-220 Series, XP-225 Series, -XP-235 Series, XP-240 Series, XP-243 245 247 Series, XP-255 257 Series, -XP-300 Series, XP-302 303 305 306 Series, XP-310 Series, XP-312 313 315 -Series, XP-320 Series, XP-322 323 325 Series, XP-330 Series, XP-332 335 -Series, XP-340 Series, XP-342 343 345 Series, XP-352 355 Series, XP-400 -Series, XP-402 403 405 406 Series, XP-410 Series, XP-412 413 415 Series, -XP-420 Series, XP-422 423 425 Series, XP-430 Series, XP-432 435 Series, -XP-440 Series, XP-442 445 Series, XP-452 455 Series, XP-510 Series, -XP-520 Series, XP-530 Series, XP-540 Series, XP-55 Series, XP-600 Series, -XP-610 Series, XP-620 Series, XP-630 Series, XP-640 Series, XP-700 Series, -XP-710 Series, XP-720 Series, XP-750 Series, XP-760 Series, XP-800 Series, -XP-810 Series, XP-820 Series, XP-830 Series, XP-850 Series, XP-860 Series, -XP-900 Series, XP-950 Series, XP-960 Series +Artisan 1430, Artisan 630, Artisan 700, Artisan 710, Artisan 720, +Artisan 730, Artisan 800, Artisan 810, Artisan 830, Artisan 837, E-150, +E-200, E-300, E-330, E-330S, E-340, E-350, E-360 Series, E-370 Series, +E-500, E-520, E-530, E-530P, E-530S, E-600, E-700, E-720, E-800, E-810, +E-820, E-830 Series, E-840 Series, E-850 Series, EC-C110 Series, EP-10VA +Series, EP-306 Series, EP-30VA Series, EP-4004, EP-702A, EP-703A, +EP-704A, EP-705A Series, EP-706A Series, EP-707A Series, EP-708A Series, +EP-709A Series, EP-710A Series, EP-711A Series, EP-712A Series, EP-713A +Series, EP-774A, EP-775A Series, EP-776A Series, EP-777A Series, +EP-801A, EP-802A, EP-803A, EP-804A, EP-805A Series, EP-806A Series, +EP-807A Series, EP-808A Series, EP-810A Series, EP-811A Series, EP-812A +Series, EP-813A Series, EP-901A, EP-901F, EP-902A, EP-903A, EP-903F, +EP-904A, EP-904F, EP-905A Series, EP-905F Series, EP-906F Series, +EP-907F Series, EP-976A3 Series, EP-977A3 Series, EP-978A3 Series, +EP-979A3 Series, EP-M552T Series, EP-M570T Series, ET-1110 Series, +ET-16500 Series, ET-2500 Series, ET-2550 Series, ET-2600 Series, ET-2610 +Series, ET-2650 Series, ET-2700 Series, ET-2710 Series, ET-2720 Series, +ET-2750 Series, ET-2760 Series, ET-4500 Series, ET-4550 Series, ET-4700 +Series, ET-7700 Series, ET-7750 Series, ET-M1100 Series, ET-M1120 +Series, ET-M2120 Series, EW-052A Series, EW-452A Series, EW-M5071FT +Series, EW-M571T Series, EW-M660FT Series, EW-M770T Series, EW-M970A3T +Series, K200, K300, L1110 Series, L1455 Series, L3050 Series, L3060 +Series, L3070 Series, L3100 Series, L3110 Series, L3150 Series, L3160 +Series, L364 Series, L375 Series, L385 Series, L386 Series, L395 Series, +L396 Series, L405 Series, L4150 Series, L4160 Series, L475 Series, L485 +Series, L486 Series, L495 Series, L5190 Series, L565 Series, L566 +Series, L575 Series, L605 Series, L655 Series, L7160 Series, L7180 +Series, L805 Series, L810 Series, L850 Series, M1100 Series, M1120 +Series, M200 Series, M205 Series, M2110 Series, M2120 Series, ME 200, ME +OFFICE 520, ME OFFICE 530, ME OFFICE 560W, ME OFFICE 570, ME OFFICE +620F, ME OFFICE 900WD, ME OFFICE 940FW, ME OFFICE 960FWD, ME Office 510, +ME Office 600F, ME Office 650FN, ME Office 700FW, ME-301 Series, ME-303 +Series, ME-400 Series, NX230 TX230, NX430 TX435, PF-70 Series, PF-71 +Series, PF-81 Series, PM-400 Series, PM-A750, PM-A820, PM-A840, +PM-A840S, PM-A890, PM-A920, PM-A940, PM-A950, PM-A970, PM-D600, PM-D800, +PM-D870, PM-G4500, PM-G850, PM-T960, PM-T990, PX-046A Series, PX-047A +Series, PX-048A Series, PX-049A Series, PX-1600F, PX-1700F, PX-205 +Series, PX-404A, PX-405A Series, PX-434A, PX-435A Series, PX-436A +Series, PX-437A Series, PX-501A, PX-502A, PX-503A, PX-504A, PX-505F +Series, PX-535F Series, PX-5600, PX-5V, PX-601F, PX-602F, PX-603F, +PX-605F Series, PX-673F, PX-675F Series, PX-7V, PX-A620, PX-A640, +PX-A650, PX-A720, PX-A740, PX-B700, PX-B750F, PX-FA700, PX-G5300, +PX-M160T Series, PX-M350F, PX-M5040F, PX-M5041F, PX-M650A, PX-M650F, +PX-M7050 Series, PX-M7050FP, PX-M7050FX, PX-M740F, PX-M741F, PX-M840F, +PX-M840FX, PX-M860F, PX-S05 Series, PX-S06 Series, PX-S160T Series, +PX-S170T Series, PX-S170UT Series, PX-S350, PX-S5040, PX-S7050 Series, +PX-S7050PS, PX-S740, PX-S840, PX-S860, PictureMate 500, PictureMate +Deluxe, PictureMate PM 200, PictureMate PM 210, PictureMate PM 215, +PictureMate PM 225, PictureMate PM 235, PictureMate PM 240, PictureMate +PM 245, PictureMate PM 250, PictureMate PM 260, PictureMate PM 270, +PictureMate PM 280, PictureMate PM 290, PictureMate PM 300, PictureMate +PM 310, ST-2000 Series, Epson Stylus CX2800, Epson Stylus CX2900, Epson +Stylus CX3700, Epson Stylus CX3800, Epson Stylus CX3900, Epson Stylus +CX4200, Epson Stylus CX4800, Epson Stylus CX4900, Epson Stylus CX5000, +Epson Stylus CX5900, Epson Stylus CX6000, Epson Stylus CX7300, Epson +Stylus CX7400, Epson Stylus CX7700, Epson Stylus CX7800, Epson Stylus +CX8300, Epson Stylus CX8400, Epson Stylus CX9300F, Epson Stylus +CX9400Fax, Epson Stylus DX3800, Epson Stylus DX4000, Epson Stylus +DX4200, Epson Stylus DX4800, Epson Stylus DX5000, Epson Stylus DX7400, +Epson Stylus DX8400, Epson Stylus DX9400F, Epson Stylus NX200, Epson +Stylus NX210, Epson Stylus NX215, Epson Stylus NX230, Epson Stylus +NX300, Epson Stylus NX330, Epson Stylus NX400, Epson Stylus NX410, Epson +Stylus NX420, Epson Stylus NX430, Epson Stylus NX510, Epson Stylus +NX530, Epson Stylus NX620, Epson Stylus NX635, Epson Stylus Office +BX300F, Epson Stylus Office BX305, Epson Stylus Office BX305 Plus, Epson +Stylus Office BX310FN, Epson Stylus Office BX320FW, Epson Stylus Office +BX525WD, Epson Stylus Office BX535WD, Epson Stylus Office BX600FW, Epson +Stylus Office BX610FW, Epson Stylus Office BX620FWD, Epson Stylus Office +BX630FW, Epson Stylus Office BX635FWD, Epson Stylus Office BX925, Epson +Stylus Office BX935FWD, Epson Stylus Office TX300F, Epson Stylus Office +TX320F, Epson Stylus Office TX510FN, Epson Stylus Office TX515FN, Epson +Stylus Office TX525FW, Epson Stylus Office TX600FW, Epson Stylus Office +TX610FW, Epson Stylus Office TX620FWD, Epson Stylus Photo 1400, Epson +Stylus Photo 1410, Epson Stylus Photo 1430, Epson Stylus Photo 1500, +Epson Stylus Photo PX650, Epson Stylus Photo PX660, Epson Stylus Photo +PX700W, Epson Stylus Photo PX710W, Epson Stylus Photo PX720WD, Epson +Stylus Photo PX730, Epson Stylus Photo PX800FW, Epson Stylus Photo +PX810FW, Epson Stylus Photo PX820FWD, Epson Stylus Photo PX830, Epson +Stylus Photo R1900, Epson Stylus Photo R2000, Epson Stylus Photo R240, +Epson Stylus Photo R250, Epson Stylus Photo R260, Epson Stylus Photo +R265, Epson Stylus Photo R270, Epson Stylus Photo R2880, Epson Stylus +Photo R3000, Epson Stylus Photo R340, Epson Stylus Photo R350, Epson +Stylus Photo R360, Epson Stylus Photo R380, Epson Stylus Photo R390, +Epson Stylus Photo RX520, Epson Stylus Photo RX530, Epson Stylus Photo +RX560, Epson Stylus Photo RX580, Epson Stylus Photo RX585, Epson Stylus +Photo RX590, Epson Stylus Photo RX595, Epson Stylus Photo RX610, Epson +Stylus Photo RX640, Epson Stylus Photo RX650, Epson Stylus Photo RX680, +Epson Stylus Photo RX685, Epson Stylus Photo RX690, Epson Stylus Photo +TX650, Epson Stylus Photo TX700W, Epson Stylus Photo TX710W, Epson +Stylus Photo TX720WD, Epson Stylus Photo TX730, Epson Stylus Photo +TX800FW, Epson Stylus Photo TX810FW, Epson Stylus SX200, Epson Stylus +SX210, Epson Stylus SX215, Epson Stylus SX218, Epson Stylus SX230, Epson +Stylus SX235, Epson Stylus SX400, Epson Stylus SX410, Epson Stylus +SX420W, Epson Stylus SX430, Epson Stylus SX440, Epson Stylus SX510W, +Epson Stylus SX525WD, Epson Stylus SX535WD, Epson Stylus SX600FW, Epson +Stylus SX610FW, Epson Stylus SX620FW, Epson Stylus TX200, Epson Stylus +TX210, Epson Stylus TX213, Epson Stylus TX219, Epson Stylus TX220, Epson +Stylus TX230, Epson Stylus TX235, Epson Stylus TX400, Epson Stylus +TX410, Epson Stylus TX420W, Epson Stylus TX430, Epson Stylus TX550W, +Epson Stylus TX560WD, TX220 NX220, TX320 WorkForce320, TX420 NX420, +WF-100 Series, WF-110 Series, WF-2510 Series, WF-2520 Series, WF-2530 +Series, WF-2540 Series, WF-2630 Series, WF-2650 Series, WF-2660 Series, +WF-2750 Series, WF-2760 Series, WF-2810 Series, WF-2830 Series, WF-2850 +Series, WF-3010 Series, WF-3520 Series, WF-3530 Series, WF-3540 Series, +WF-3620 Series, WF-3640 Series, WF-4630 Series, WF-4640 Series, WF-5110 +Series, WF-5190 Series, WF-5620 Series, WF-5690 Series, WF-6090 Series, +WF-6530 Series, WF-6590 Series, WF-7110 Series, WF-7510 Series, WF-7511 +Series, WF-7515 Series, WF-7520 Series, WF-7521 Series, WF-7525 Series, +WF-7610 Series, WF-7620 Series, WF-8010 Series, WF-8090 Series, WF-8510 +Series, WF-8590 Series, WF-M1560 Series, WF-M5190 Series, WF-M5690 +Series, WF-R4640 Series, WF-R5190 Series, WF-R5690 Series, WF-R8590 +Series, WP-4010 Series, WP-4011 Series, WP-4015 Series, WP-4020 Series, +WP-4022 Series, WP-4023 Series, WP-4025 Series, WP-4090 Series, WP-4091 +Series, WP-4092 Series, WP-4095 Series, WP-4511 Series, WP-4515 Series, +WP-4520 Series, WP-4521 Series, WP-4525 Series, WP-4530 Series, WP-4531 +Series, WP-4532 Series, WP-4533 Series, WP-4535 Series, WP-4540 Series, +WP-4545 Series, WP-4590 Series, WP-4592 Series, WP-4595 Series, WP-M4011 +Series, WP-M4015 Series, WP-M4095 Series, WP-M4521 Series, WP-M4525 +Series, WP-M4595 Series, WorkForce 310, WorkForce 320, WorkForce 435, +WorkForce 500, WorkForce 520, WorkForce 545, WorkForce 600, WorkForce +610, WorkForce 620, WorkForce 630, WorkForce 645, WorkForce 840, +WorkForce 845, XP-200 Series, XP-201 204 208 Series, XP-202 203 206 +Series, XP-205 207 Series, XP-2100 Series, XP-211 214 216 Series, XP-212 +213 Series, XP-215 217 Series, XP-220 Series, XP-225 Series, XP-235 +Series, XP-240 Series, XP-243 245 247 Series, XP-255 257 Series, XP-300 +Series, XP-302 303 305 306 Series, XP-310 Series, XP-3100 Series, XP-312 +313 315 Series, XP-320 Series, XP-322 323 325 Series, XP-330 Series, +XP-332 335 Series, XP-340 Series, XP-342 343 345 Series, XP-352 355 +Series, XP-400 Series, XP-402 403 405 406 Series, XP-410 Series, XP-4100 +Series, XP-412 413 415 Series, XP-420 Series, XP-422 423 425 Series, +XP-430 Series, XP-432 435 Series, XP-440 Series, XP-442 445 Series, +XP-452 455 Series, XP-510 Series, XP-520 Series, XP-530 Series, XP-540 +Series, XP-55 Series, XP-600 Series, XP-610 Series, XP-620 Series, +XP-630 Series, XP-640 Series, XP-700 Series, XP-710 Series, XP-7100 +Series, XP-720 Series, XP-750 Series, XP-760 Series, XP-800 Series, +XP-810 Series, XP-820 Series, XP-830 Series, XP-850 Series, XP-860 +Series, XP-900 Series, XP-950 Series, XP-960 Series diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild index 13fe5e3ead..88dbdefd43 100644 --- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild +++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild @@ -22,8 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Update by: blizzack <slackbuilds@blizzack.com> + PRGNAM=epson-inkjet-printer-escpr -VERSION=${VERSION:-1.6.33} +VERSION=${VERSION:-1.7.8} TARNAM=$PRGNAM-$VERSION-1lsb3.2.tar.gz BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info index c5a9d86faf..f88bde0aac 100644 --- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info +++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.info @@ -1,10 +1,10 @@ PRGNAM="epson-inkjet-printer-escpr" -VERSION="1.6.33" +VERSION="1.7.8" HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/" -DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz" -MD5SUM="abc5fe0916035b9dffc8d3933e58d29a" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz" +MD5SUM="1631fef39f62e368d95b3823121bf8a8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Ruben Schuller" -EMAIL="sb@rbn.im" +MAINTAINER="blizzack" +EMAIL="slackbuilds@blizzack.com" diff --git a/system/epson-inkjet-printer-escpr2/README b/system/epson-inkjet-printer-escpr2/README index f6a474ec35..ac28a3caac 100644 --- a/system/epson-inkjet-printer-escpr2/README +++ b/system/epson-inkjet-printer-escpr2/README @@ -1,5 +1,8 @@ This is a generic driver for many Epson inkjet printers. -This supports printers using escp protocol variant r2 (escr2). -If your printer is not listed, try the escr package instead. +This supports printers using escp protocol variant r2 (escpr2). +If your printer is not listed, try the escpr package instead. See README.models for supported printer models. + +don't forget to restart cups after installing/updating this driver +You will have to print a page in order to get an acurate ink status. diff --git a/system/epson-inkjet-printer-escpr2/README.models b/system/epson-inkjet-printer-escpr2/README.models index d4d6c8ea67..13f4944464 100644 --- a/system/epson-inkjet-printer-escpr2/README.models +++ b/system/epson-inkjet-printer-escpr2/README.models @@ -1,18 +1,36 @@ -EP-50V Series, EP-879A Series, EP-880A Series, EP-881A Series, -ET-3700 Series, ET-3750 Series, ET-4750 Series, ET-8700 Series, -ET-M1140 Series, ET-M1180 Series, ET-M2140 Series, ET-M3140 Series, -ET-M3170 Series, ET-M3180 Series EW-M630T Series, EW-M670FT Series, -L6160 Series, L6170 Series, L6190 Series, M1180 Series, M2140 Series, -M3180 Series, PM-520 Series, PX-M380F, PX-M381FL, PX-M5080F Series, -PX-M5081F Series, PX-M680F Series, PX-M7070FX, PX-M7110F, PX-M7110FP, -PX-M780F Series, PX-M781F Series, PX-M880FX, PX-M884F, PX-M886FL, PX-S380, -PX-S381L, PX-S5010 Series, PX-S5080 Series, PX-S7070X, PX-S7110, PX-S7110P, -PX-S880X, PX-S884, WF-2860 Series, WF-3720 Series, WF-3730 Series, -WF-4720 Series, WF-4730 Series, WF-4740 Series, WF-7210 Series, -WF-7710 Series, WF-7720 Series, WF-C5210 Series, WF-C5290 Series, -WF-C5290BA, WF-C529R Series, WF-C529RB, WF-C5710 Series, -WF-C5790 Series, WF-C5790BA, WF-C579R Series, WF-C579RB, -WF-C8190 Series, WF-C8190B, WF-C8610 Series, WF-C8690 Series, -WF-C8690B, WF-C869R Series, WF-M5298 Series, WF-M5299 Series, -WF-M5799 Series, XP-15000 Series, XP-5100 Series, XP-6000 Series, -XP-6100 Series, XP-8500 Series +EC-4020 Series, EC-4030 Series, EC-4040 Series, EC-C7000 Series +EP-50V Series, EP-879A Series, EP-880A Series, EP-881A Series +EP-882A Series, EP-883A Series, EP-982A3 Series, ET-15000 Series +ET-16150 Series, ET-16600 Series, ET-16650 Series, ET-3700 Series +ET-3710 Series, ET-3750 Series, ET-3760 Series, ET-4750 Series +ET-4760 Series, ET-5150 Series, ET-5170 Series, ET-5800 Series +ET-5850 Series, ET-5880 Series, ET-8500 Series, ET-8550 Series +ET-8700 Series, ET-M1140 Series, ET-M1170 Series, ET-M1180 Series +ET-M16600 Series, ET-M2140 Series, ET-M2170 Series, ET-M3140 Series +ET-M3170 Series, ET-M3180 Series, EW-M530F Series, EW-M5610FT Series +EW-M630T Series, EW-M670FT Series, EW-M752T Series, EW-M873T Series +EW-M973A3T Series, L11160 Series, L14150 Series, L15150 Series +L15160 Series, L15180 Series, L6160 Series, L6170 Series, L6190 Series +L6550 Series, L6570 Series, L6580 Series, L8160 Series, L8180 Series +M1140 Series, M1170 Series, M1180 Series, M15140 Series, M2140 Series +M2170 Series, M3140 Series, M3170 Series, M3180 Series, PM-520 Series +PX-M270FT Series, PX-M270T Series, PX-M380F, PX-M381FL +PX-M5080F Series, PX-M5081F Series, PX-M6010F Series, PX-M6011F Series +PX-M6711FT Series, PX-M6712FT Series, PX-M680F Series, PX-M7070FX +PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP, PX-M730F Series +PX-M780F Series, PX-M781F Series, PX-M791FT Series, PX-M880FX, PX-M884F +PX-M885F, PX-M886FL, PX-S270T Series, PX-S380, PX-S381L +PX-S5010 Series, PX-S5080 Series, PX-S6710T Series, PX-S7070X +PX-S7090X, PX-S7110, PX-S7110P, PX-S880X, PX-S884, PX-S885 +ST-3000 Series, ST-4000 Series, ST-C8000 Series, ST-M1000 Series +ST-M3000 Series, WF-2860 Series, WF-3720 Series, WF-3730 Series +WF-3820 Series, WF-4720 Series, WF-4730 Series, WF-4740 Series +WF-4820 Series, WF-4830 Series, WF-7210 Series, WF-7710 Series +WF-7720 Series, WF-7820 Series, WF-7830 Series, WF-7840 Series +WF-C5210 Series, WF-C5290 Series, WF-C5290BA, WF-C529R Series +WF-C529RB, WF-C5710 Series, WF-C5790 Series, WF-C5790BA +WF-C579R Series, WF-C579RB, WF-C8190 Series, WF-C8190B, WF-C8610 Series +WF-C8690 Series, WF-C8690B, WF-C869R Series, WF-C878R Series, WF-C878RB +WF-C879R Series, WF-C879RB, WF-M5298 Series, WF-M5299 Series +WF-M5799 Series, XP-15000 Series, XP-5100 Series, XP-6000 Series +XP-6100 Series, XP-8500 Series, XP-8600 Series, XP-970 Series diff --git a/system/epson-inkjet-printer-escpr2/doinst.sh b/system/epson-inkjet-printer-escpr2/doinst.sh new file mode 100644 index 0000000000..9cf806b007 --- /dev/null +++ b/system/epson-inkjet-printer-escpr2/doinst.sh @@ -0,0 +1,6 @@ +echo +echo "********************* NOTICE **********************" +echo "Cups needs restarting for new drivers to be usable:" +echo "/etc/rc.d/rc.cups restart" +echo "***************************************************" +echo 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 59d29cd42b..2fcc1e0c7e 100644 --- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild +++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild @@ -2,10 +2,11 @@ # Slackware build script for escpr2 -# Copyright 2018 Tim Dickson +# Copyright 2018-2020 Tim Dickson +# All rights reserved. +# # thanks to Ruben Schuller for escpr slack build, which this is # heavily based on. -# All rights reserved. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -24,8 +25,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#note to self. paste list of supported models into first line of empty README.models +#file. run sh ./fixrm to spread the model list evenly over as many lines as needed +#also request upload of source to slackbuildsdirectlinks. + PRGNAM=epson-inkjet-printer-escpr2 -VERSION=${VERSION:-1.0.28} +VERSION=${VERSION:-1.1.29} EXTRABIT=1lsb3.2 TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz BUILD=${BUILD:-1} @@ -107,6 +112,7 @@ 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:-tgz} 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 75c775b863..37af85947e 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.0.28" +VERSION="1.1.29" HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/" -DOWNLOAD="https://download3.ebz.epson.net/dsc/f/03/00/08/93/16/e484dad0996111ecd76d58de992765967bfe6319/epson-inkjet-printer-escpr2-1.0.28-1lsb3.2.src.rpm" -MD5SUM="256f522f914c7b5191ddf1557edc6095" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.1.29-1lsb3.2.src.rpm" +MD5SUM="b36f12fadc8db81050982ad3901c1b4a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/epson-inkjet-printer-escpr2/fixrm b/system/epson-inkjet-printer-escpr2/fixrm new file mode 100644 index 0000000000..e1c5c21315 --- /dev/null +++ b/system/epson-inkjet-printer-escpr2/fixrm @@ -0,0 +1,30 @@ +#!/bin/sh +#fixrm is a little script to limit the items on each line so the line +#is less than 72 characters. it is used by the maintainer when creating +#the README.models file for this package, and for the epson-inkjet-printer-escpr2 +#slackbuild. It takes the list posted on a single long first line, and spreads +#them over as many lines as needed. +# +#paste the list from the epson website into an empty README.models and run this +#script in the same directory + +FNAME="README.models" +MAXLEN=${MAXLEN:-72} +#make sure MAXLEN is a integer bigger than 39 +MAXLEN=`echo $MAXLEN|awk '($1<40) {print "40"} (int($1)>39) {print int($1) }'` +if [ -e $FNAME ]&&[ `cat $FNAME|head -n1|awk '{print length($0)}'` -gt $MAXLEN ]; then + #only do something if the file exists, and thefirst line is longer than it + #should be. + TMPFILE=rmtmp + mv README.models $TMPFILE + cat $TMPFILE|awk -v mlen="$MAXLEN" -F', ' 'BEGIN{curline="";mlen=mlen-2} +{ for (i=1;i<=NF; i++) + { { n=0; l=length(curline)+length($i) } + if (i==1) {curline=$i; n=1} + if (l<mlen && i>1) { curline=curline ", " $i; n=1} + if (n==0) {print curline; curline=$i } + } + if (length(curline)>0) {print curline; curline=""} +}'>README.models + rm $TMPFILE +fi diff --git a/system/epson-printer-utility/LICENCE.html b/system/epson-printer-utility/LICENCE.html new file mode 100644 index 0000000000..9db25aedc9 --- /dev/null +++ b/system/epson-printer-utility/LICENCE.html @@ -0,0 +1,98 @@ +<html><head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<font size="2">
+<font size="3"><b>SEIKO EPSON CORPORATION</b></font><br>
+<font size="3"><b>SOFTWARE LICENSE AGREEMENT FOR LINUX</b></font><br>
+<br>
+IMPORTANT! READ THIS SOFTWARE LICENSE AGREEMENT CAREFULLY. The computer
+ software product, fontware, typefaces and/or data, including any
+accompanying explanatory written materials (the "Software") should only
+be installed or used by the Licensee ("you") on the condition you agree
+with SEIKO EPSON CORPORATION ("EPSON") to the terms and conditions set
+forth in this Agreement. By installing or using the Software, you are
+representing to agree all the terms and conditions set forth in this
+Agreement. You should read this Agreement carefully before installing
+or using the Software. If you do not agree with the terms and
+conditions of this Agreement, you are not permitted to install or use
+the Software.<br>
+<br>
+
+<hr>
+
+<font size="4"><b>[Inkjet Printer]</b></font><br>
+<font size="4"><b>1.ESC/P</b></font>
+<ul>
+<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html" target="_blank">License agreement for Epson Inkjet Printer Driver for Linux</a></li>
+</ul>
+
+<font size="4"><b>2.ESC/P-R</b></font>
+<ul>
+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>
+</ul>
+
+<font size="4"><b>3.PIPS(Photo Image Print System)</b></font>
+<ul>
+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>
+<li><a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">GNU Lesser General Public License</a></li>
+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>
+</ul>
+
+<hr>
+
+<font size="4"><b>[Laser Printer]</b></font><br>
+<font size="4"><b>1.Postscript Printer Description (PPD) file for EPSON Printer
+</b></font>
+<ul>
+<li>Please read the license at the top of the EPSON PPD file carefully.</li>
+</ul>
+
+<font size="4"><b>2.GS-LPD (Ghostscript Laser Printer Driver for Linux)
+</b></font>
+<ul>
+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>
+</ul>
+
+<font size="4"><b>3.Laser Printer Filter for Linux</b></font>
+<ul>
+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>
+<li><a href="http://www.opensource.org/licenses/mit-license.php" target="_blank">MIT License</a></li>
+</ul>
+
+<font size="4"><b>4.Photo Image Print System Plus for Linux</b></font>
+<ul>
+<li><a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a></li>
+<li><a href="http://www.gnu.org/licenses/fdl.html" target="_blank">GNU Free Documentation License</a></li>
+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>
+</ul>
+
+<hr>
+
+<font size="4"><b>[Scanner]</b></font><br>
+<font size="4"><b>1.Image Scan! for Linux</b></font>
+<ul>
+<li><a href="http://www.gnu.org/licenses/gpl-2.0.html" target="_blank">GNU General Public License</a></li>
+<li><a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">GNU Lesser General Public License</a></li>
+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>
+<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html#softlicense" target="_blank">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a></li>
+</ul>
+
+<font size="4"><b>2.Image Scan v3</b></font>
+<ul>
+<li><a href="http://www.gnu.org/licenses/gpl-3.0.html" target="_blank">GNU General Public License</a></li>
+<li><a href="http://download.ebz.epson.net/la/linux/AVASYSPL.en.txt" target="_blank">AVASYS Public License</a></li>
+<li><a href="http://download.ebz.epson.net/la/linux/inkjet_for_linux.html#softlicense" target="_blank">SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT</a></li>
+</ul>
+
+
+<br>
+<br>
+EPSON EULA EN 11/05/2012
+<br>
+<br>
+</font>
+
+
+
+</body></html>
\ No newline at end of file diff --git a/system/epson-printer-utility/README b/system/epson-printer-utility/README new file mode 100644 index 0000000000..d5771efb20 --- /dev/null +++ b/system/epson-printer-utility/README @@ -0,0 +1,6 @@ +This is a printer utility for most Epson inkjet printers. +It offers printer monitoring of error, ink levels, and utilities +to check nozzles and clean print heads. + +See README.models for supported printer models. + diff --git a/system/epson-printer-utility/README.models b/system/epson-printer-utility/README.models new file mode 100644 index 0000000000..0cc3c61591 --- /dev/null +++ b/system/epson-printer-utility/README.models @@ -0,0 +1,208 @@ +, Artisan 1430, Artisan 50, Artisan 630, Artisan 700, Artisan 710 +Artisan 720, Artisan 730, Artisan 800, Artisan 810, Artisan 830 +Artisan 837, E-150, E-200, E-300, E-330, E-330S, E-340, E-350 +E-360 Series, E-370 Series, E-500, E-520, E-530, E-530P, E-530S, E-600 +E-700, E-720, E-800, E-810, E-820, E-830 Series, E-840 Series +E-850 Series, EC-4020 Series, EC-4030 Series, EC-4040 Series +EC-C110 Series, EC-C7000 Series, EP-10VA Series, EP-302, EP-306 Series +EP-30VA Series, EP-4004, EP-50V Series, EP-702A, EP-703A, EP-704A +EP-705A Series, EP-706A Series, EP-707A Series, EP-708A Series +EP-710A Series, EP-711A Series, EP-712A Series, EP-774A, EP-775A Series +EP-776A Series, EP-777A Series, EP-801A, EP-802A, EP-803A, EP-804A +EP-805A Series, EP-806A Series, EP-807A Series, EP-808A Series +EP-810A Series, EP-811A Series, EP-812A Series, EP-879A Series +EP-880A Series, EP-881A Series, EP-882A Series, EP-901A, EP-901F +EP-902A, EP-903A, EP-903F, EP-904A, EP-904F, EP-905A Series +EP-905F Series, EP-906F Series, EP-907F Series, EP-976A3 Series +EP-977A3 Series, EP-978A3 Series, EP-982A3 Series, EP-M552T Series +EP-M570T Series, ET-1110 Series, ET-14000 Series, ET-15000 Series +ET-16150 Series, ET-16600 Series, ET-16650 Series, ET-2500 Series +ET-2550 Series, ET-2600 Series, ET-2610 Series, ET-2650 Series +ET-2700 Series, ET-2710 Series, ET-2720 Series, ET-2750 Series +ET-2760 Series, ET-3700 Series, ET-3710 Series, ET-3750 Series +ET-3760 Series, ET-4500 Series, ET-4550 Series, ET-4700 Series +ET-4750 Series, ET-4760 Series, ET-5800 Series, ET-5850 Series +ET-5880 Series, ET-7700 Series, ET-7750 Series, ET-8700 Series +ET-M1100 Series, ET-M1120 Series, ET-M1140 Series, ET-M1170 Series +ET-M1180 Series, ET-M2120 Series, ET-M2140 Series, ET-M2170 Series +ET-M3140 Series, ET-M3170 Series, ET-M3180 Series, EW-052A Series +EW-452A Series, EW-M5071FT Series, EW-M5610FT Series, EW-M571T Series +EW-M630T Series, EW-M660FT Series, EW-M670FT Series, EW-M752T Series +EW-M770T Series, EW-M970A3T Series, K100, K200, K300, L110 Series +L1110 Series, L11160 Series, L120 Series, L130 Series, L1300 Series +L132 Series, L14150 Series, L1455 Series, L15150 Series, L15160 Series +L1800 Series, L210 Series, L220 Series, L222 Series, L300 Series +L3050 Series, L3060 Series, L3070 Series, L310 Series, L3100 Series +L3110 Series, L312 Series, L3150 Series, L3160 Series, L350 Series +L355 Series, L360 Series, L362 Series, L364 Series, L365 Series +L366 Series, L375 Series, L380 Series, L382 Series, L386 Series +L395 Series, L396 Series, L405 Series, L4150 Series, L4160 Series +L455 Series, L456 Series, L475 Series, L486 Series, L495 Series +L5190 Series, L550 Series, L555 Series, L565 Series, L566 Series +L575 Series, L605 Series, L6160 Series, L6170 Series, L6190 Series +L655 Series, L6550 Series, L6570 Series, L6580 Series, L7160 Series +L7180 Series, L800, L805 Series, L810 Series, L850 Series, LX-10000F +LX-10000FK, LX-10050KF, LX-10050MF, LX-6050MF, LX-7000F, LX-7550MF +M100 Series, M105 Series, M1100 Series, M1120 Series, M1140 Series +M1170 Series, M1180 Series, M15140 Series, M200 Series, M205 Series +M2110 Series, M2120 Series, M2140 Series, M2170 Series, M3140 Series +M3170 Series, M3180 Series, ME 10, ME 200, ME 32, ME 320, ME 33, ME 330 +ME 340, ME OFFICE 520, ME OFFICE 530, ME OFFICE 560W, ME OFFICE 570 +ME OFFICE 620F, ME OFFICE 82WD, ME OFFICE 85ND, ME OFFICE 900WD +ME OFFICE 940FW, ME OFFICE 960FWD, ME Office 510, ME Office 600F +ME Office 650FN, ME Office 700FW, ME-10 Series, ME-100 Series +ME-301 Series, ME-303 Series, ME-400 Series, NX130 TX130, NX230 TX230 +NX430 TX435, PF-70 Series, PF-71 Series, PF-81 Series, PM-400 Series +PM-520 Series, PM-A750, PM-A820, PM-A840, PM-A840S, PM-A890, PM-A920 +PM-A940, PM-A950, PM-A970, PM-D600, PM-D800, PM-D870, PM-G4500, PM-G850 +PM-T960, PM-T990, PX-045A Series, PX-046A Series, PX-047A Series +PX-048A Series, PX-105 Series, PX-1200, PX-1600F, PX-1700F, PX-203 +PX-204, PX-205 Series, PX-402A, PX-403A, PX-404A, PX-405A Series +PX-434A, PX-435A Series, PX-436A Series, PX-437A Series, PX-501A +PX-502A, PX-503A, PX-504A, PX-505F Series, PX-535F Series, PX-5600 +PX-5V, PX-601F, PX-602F, PX-603F, PX-605F Series, PX-673F +PX-675F Series, PX-7V, PX-A620, PX-A640, PX-A650, PX-A720, PX-A740 +PX-B700, PX-B750F, PX-FA700, PX-G5300, PX-K100, PX-K150 Series +PX-M160T Series, PX-M270FT Series, PX-M270T Series, PX-M270UT Series +PX-M350F, PX-M380F, PX-M381FL, PX-M5040F, PX-M5041F, PX-M5080F Series +PX-M5081F Series, PX-M650A, PX-M650F, PX-M6711FT Series +PX-M6712FT Series, PX-M680F Series, PX-M7050 Series, PX-M7050FP +PX-M7050FX, PX-M7070FX, PX-M7080FX, PX-M7090FX, PX-M7110F, PX-M7110FP +PX-M740F, PX-M741F, PX-M780F Series, PX-M781F Series, PX-M791FT Series +PX-M840F, PX-M840FX, PX-M860F, PX-M880FX, PX-M884F, PX-M885F, PX-M886FL +PX-S05 Series, PX-S06 Series, PX-S160T Series, PX-S170T Series +PX-S170UT Series, PX-S270T Series, PX-S350, PX-S380, PX-S381L +PX-S5010 Series, PX-S5040, PX-S5080 Series, PX-S7050 Series, PX-S7050PS +PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S740, PX-S840, PX-S860 +PX-S880X, PX-S884, PX-S885, PictureMate 500, PictureMate Deluxe +PictureMate PM 200, PictureMate PM 210, PictureMate PM 215 +PictureMate PM 225, PictureMate PM 235, PictureMate PM 240 +PictureMate PM 245, PictureMate PM 250, PictureMate PM 260 +PictureMate PM 270, PictureMate PM 280, PictureMate PM 290 +PictureMate PM 300, PictureMate PM 310, ST-2000 Series, ST-3000 Series +ST-4000 Series, ST-C8000 Series, ST-M1000 Series, ST-M3000 Series +Epson Stylus CX2800, Epson Stylus CX2900, Epson Stylus CX3700 +Epson Stylus CX3800, Epson Stylus CX3900, Epson Stylus CX4200 +Epson Stylus CX4800, Epson Stylus CX4900, Epson Stylus CX5000 +Epson Stylus CX5900, Epson Stylus CX6000, Epson Stylus CX7300 +Epson Stylus CX7400, Epson Stylus CX7700, Epson Stylus CX7800 +Epson Stylus CX8300, Epson Stylus CX8400, Epson Stylus CX9300F +Epson Stylus CX9400Fax, Epson Stylus DX3800, Epson Stylus DX4000 +Epson Stylus DX4200, Epson Stylus DX4800, Epson Stylus DX5000 +Epson Stylus DX7400, Epson Stylus DX8400, Epson Stylus DX9400F +Epson Stylus N10 N11, Epson Stylus NX110, Epson Stylus NX125 NX127 +Epson Stylus NX130, Epson Stylus NX200, Epson Stylus NX210 +Epson Stylus NX215, Epson Stylus NX230, Epson Stylus NX300 +Epson Stylus NX330, Epson Stylus NX400, Epson Stylus NX410 +Epson Stylus NX420, Epson Stylus NX430, Epson Stylus NX510 +Epson Stylus NX530, Epson Stylus NX620, Epson Stylus NX635 +Epson Stylus Office B42WD, Epson Stylus Office BX300F +Epson Stylus Office BX305, Epson Stylus Office BX305 Plus +Epson Stylus Office BX310FN, Epson Stylus Office BX320FW +Epson Stylus Office BX525WD, Epson Stylus Office BX535WD +Epson Stylus Office BX600FW, Epson Stylus Office BX610FW +Epson Stylus Office BX620FWD, Epson Stylus Office BX630FW +Epson Stylus Office BX635FWD, Epson Stylus Office BX925 +Epson Stylus Office BX935FWD, Epson Stylus Office TX300F +Epson Stylus Office TX320F, Epson Stylus Office TX510FN +Epson Stylus Office TX515FN, Epson Stylus Office TX525FW +Epson Stylus Office TX600FW, Epson Stylus Office TX610FW +Epson Stylus Office TX620FWD, Epson Stylus Photo 1400 +Epson Stylus Photo 1410, Epson Stylus Photo 1430 +Epson Stylus Photo 1500, Epson Stylus Photo P50 +Epson Stylus Photo PX650, Epson Stylus Photo PX660 +Epson Stylus Photo PX700W, Epson Stylus Photo PX710W +Epson Stylus Photo PX720WD, Epson Stylus Photo PX730 +Epson Stylus Photo PX800FW, Epson Stylus Photo PX810FW +Epson Stylus Photo PX820FWD, Epson Stylus Photo PX830 +Epson Stylus Photo R1900, Epson Stylus Photo R2000 +Epson Stylus Photo R240, Epson Stylus Photo R250 +Epson Stylus Photo R260, Epson Stylus Photo R265 +Epson Stylus Photo R270, Epson Stylus Photo R2880 +Epson Stylus Photo R3000, Epson Stylus Photo R340 +Epson Stylus Photo R350, Epson Stylus Photo R360 +Epson Stylus Photo R380, Epson Stylus Photo R390 +Epson Stylus Photo RX520, Epson Stylus Photo RX530 +Epson Stylus Photo RX560, Epson Stylus Photo RX580 +Epson Stylus Photo RX585, Epson Stylus Photo RX590 +Epson Stylus Photo RX595, Epson Stylus Photo RX610 +Epson Stylus Photo RX640, Epson Stylus Photo RX650 +Epson Stylus Photo RX680, Epson Stylus Photo RX685 +Epson Stylus Photo RX690, Epson Stylus Photo T50 +Epson Stylus Photo T60, Epson Stylus Photo TX650 +Epson Stylus Photo TX700W, Epson Stylus Photo TX710W +Epson Stylus Photo TX720WD, Epson Stylus Photo TX730 +Epson Stylus Photo TX800FW, Epson Stylus Photo TX810FW +Epson Stylus S21, Epson Stylus S22, Epson Stylus SX110 +Epson Stylus SX125, Epson Stylus SX130, Epson Stylus SX200 +Epson Stylus SX210, Epson Stylus SX215, Epson Stylus SX218 +Epson Stylus SX230, Epson Stylus SX235, Epson Stylus SX400 +Epson Stylus SX410, Epson Stylus SX420W, Epson Stylus SX430 +Epson Stylus SX440, Epson Stylus SX510W, Epson Stylus SX525WD +Epson Stylus SX535WD, Epson Stylus SX600FW, Epson Stylus SX610FW +Epson Stylus SX620FW, Epson Stylus T21, Epson Stylus T22 +Epson Stylus T24, Epson Stylus T25, Epson Stylus T27 +Epson Stylus TX110, Epson Stylus TX111, Epson Stylus TX112 +Epson Stylus TX115, Epson Stylus TX117, Epson Stylus TX120 +Epson Stylus TX121, Epson Stylus TX125, Epson Stylus TX130 +Epson Stylus TX200, Epson Stylus TX210, Epson Stylus TX213 +Epson Stylus TX219, Epson Stylus TX220, Epson Stylus TX230 +Epson Stylus TX235, Epson Stylus TX400, Epson Stylus TX410 +Epson Stylus TX420W, Epson Stylus TX430, Epson Stylus TX550W +Epson Stylus TX560WD, T12 T22 N11, T13 T22E, TX120 NX120, TX133 TX135 +TX220 NX220, TX320 WorkForce320, TX420 NX420, WF-100 Series +WF-110 Series, WF-2010 Series, WF-2510 Series, WF-2520 Series +WF-2530 Series, WF-2540 Series, WF-2630 Series, WF-2650 Series +WF-2660 Series, WF-2750 Series, WF-2760 Series, WF-2810 Series +WF-2830 Series, WF-2850 Series, WF-2860 Series, WF-3010 Series +WF-3520 Series, WF-3530 Series, WF-3540 Series, WF-3620 Series +WF-3640 Series, WF-3720 Series, WF-3730 Series, WF-3820 Series +WF-4630 Series, WF-4640 Series, WF-4720 Series, WF-4730 Series +WF-4740 Series, WF-4820 Series, WF-4830 Series, WF-5110 Series +WF-5190 Series, WF-5620 Series, WF-5690 Series, WF-6090 Series +WF-6530 Series, WF-6590 Series, WF-7010 Series, WF-7011 Series +WF-7012 Series, WF-7015 Series, WF-7018 Series, WF-7110 Series +WF-7210 Series, WF-7510 Series, WF-7511 Series, WF-7515 Series +WF-7520 Series, WF-7521 Series, WF-7525 Series, WF-7610 Series +WF-7620 Series, WF-7710 Series, WF-7720 Series, WF-7820 Series +WF-7830 Series, WF-7840 Series, WF-8010 Series, WF-8090 Series +WF-8510 Series, WF-8590 Series, WF-C17590 Series, WF-C20590 Series +WF-C20600 Series, WF-C20750 Series, WF-C21000 Series, WF-C5210 Series +WF-C5290 Series, WF-C5290BA, WF-C529R Series, WF-C529RB +WF-C5710 Series, WF-C5790 Series, WF-C5790BA, WF-C579R Series +WF-C579RB, WF-C8190 Series, WF-C8190B, WF-C8610 Series, WF-C8690 Series +WF-C8690B, WF-C869R Series, WF-C878R Series, WF-C878RB, WF-C879R Series +WF-C879RB, WF-M1030 Series, WF-M1560 Series, WF-M20590 Series +WF-M5190 Series, WF-M5298 Series, WF-M5299 Series, WF-M5690 Series +WF-M5799 Series, WF-R4640 Series, WF-R5190 Series, WF-R5690 Series +WF-R8590 Series, WP-4010 Series, WP-4011 Series, WP-4015 Series +WP-4020 Series, WP-4022 Series, WP-4023 Series, WP-4025 Series +WP-4090 Series, WP-4091 Series, WP-4092 Series, WP-4095 Series +WP-4511 Series, WP-4515 Series, WP-4520 Series, WP-4521 Series +WP-4525 Series, WP-4530 Series, WP-4531 Series, WP-4532 Series +WP-4533 Series, WP-4535 Series, WP-4540 Series, WP-4545 Series +WP-4590 Series, WP-4592 Series, WP-4595 Series, WP-M4011 Series +WP-M4015 Series, WP-M4095 Series, WP-M4521 Series, WP-M4525 Series +WP-M4595 Series, WorkForce 310, WorkForce 320, WorkForce 435 +WorkForce 500, WorkForce 520, WorkForce 545, WorkForce 60 +WorkForce 600, WorkForce 610, WorkForce 620, WorkForce 630 +WorkForce 645, WorkForce 840, WorkForce 845, WorkForce T42WD +XP-100 Series, XP-102 103 Series, XP-15000 Series, XP-200 Series +XP-201 204 208 Series, XP-202 203 206 Series, XP-205 207 Series +XP-2100 Series, XP-211 214 216 Series, XP-212 213 Series +XP-215 217 Series, XP-220 Series, XP-225 Series, XP-235 Series +XP-240 Series, XP-243 245 247 Series, XP-255 257 Series, XP-300 Series +XP-302 303 305 306 Series, XP-310 Series, XP-3100 Series +XP-312 313 315 Series, XP-320 Series, XP-322 323 325 Series +XP-330 Series, XP-332 335 Series, XP-340 Series, XP-342 343 345 Series +XP-352 355 Series, XP-400 Series, XP-402 403 405 406 Series +XP-410 Series, XP-4100 Series, XP-412 413 415 Series, XP-420 Series +XP-422 423 425 Series, XP-430 Series, XP-432 435 Series, XP-440 Series +XP-442 445 Series, XP-452 455 Series, XP-510 Series, XP-5100 Series +XP-520 Series, XP-530 Series, XP-540 Series, XP-55 Series +XP-600 Series, XP-6000 Series, XP-610 Series, XP-6100 Series +XP-620 Series, XP-630 Series, XP-640 Series, XP-700 Series +XP-710 Series, XP-7100 Series, XP-720 Series, XP-750 Series +XP-760 Series, XP-800 Series, XP-810 Series, XP-820 Series +XP-830 Series, XP-850 Series, XP-8500 Series, XP-860 Series +XP-8600 Series, XP-950 Series, XP-960 Series, XP-970 Series diff --git a/system/epson-printer-utility/doinst.sh b/system/epson-printer-utility/doinst.sh new file mode 100644 index 0000000000..e41ff8a5fe --- /dev/null +++ b/system/epson-printer-utility/doinst.sh @@ -0,0 +1,37 @@ +#!/bin/sh +#fix rc file on install, and register .desktop file +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... +} + +config etc/rc.d/rc.ecbd.new + +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 + +if [ -x /usr/bin/kbuildsycoca4 ]; then + /usr/bin/kbuildsycoca4 >/dev/null 2>&1 +fi + +echo +echo "********************* NOTICE *********************************" +echo "ecbd needs to be running for the printer monitor to be usable:" +echo "/etc/rc.d/rc.ecbd restart" +echo "**************************************************************" +echo diff --git a/system/epson-printer-utility/epson-printer-utility.SlackBuild b/system/epson-printer-utility/epson-printer-utility.SlackBuild new file mode 100644 index 0000000000..c9e1b2bfce --- /dev/null +++ b/system/epson-printer-utility/epson-printer-utility.SlackBuild @@ -0,0 +1,248 @@ +#!/bin/sh + +# Slackware build script for epson-printer-utility + +# Copyright 2020 Tim Dickson +# 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. + +#thanks to B.Watson for support on this build. :-) + +PRGNAM=epson-printer-utility +VERSION=${VERSION:-1.1.1} +EXTRABIT=1lsb3.2 +TARNAM=$PRGNAM-$VERSION.tar.gz +BUILD=${BUILD:-3} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +#lets get the source tarball from the rpm and clean up the bits we don't need +rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm +tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz +cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION.tar.gz ./ +cp $PRGNAM-$VERSION-$EXTRABIT/epson-backend-$VERSION.tar.gz ./ +rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz +rm -r $PRGNAM-$VERSION-$EXTRABIT + +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/$TARNAM +#we remove the tarnam as the original is an rpm +#this keeps things tidy. +rm $CWD/$TARNAM +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 {} \; + +echo "patch configure.ac" +sed -i 's_/opt/lsb/bin/lsbc++_/usr/bin/c++_g' configure.ac +sed -i '/^AM_INIT_AUTOMAKE/a AM_PROG_AR()' configure.ac +#fix typo in path of udev stuff +sed -i 's_/ect_/etc_g' configure.ac +#fix source code. We shouldn't have to do this, but hey ho!.... +mv EPSCommonLib/epsmp/linux/XAsyncSocket.cpp EPSCommonLib/epsmp/linux/XAsyncSocket.c +#patch png files to remove incorrect sRGB profile in all of them. +mogrify -strip PrinterUtility/Images/*.png +#patch the Resources.qrc file to include missing png's +sed -i 'sZInklow.png</file>ZInklow.png</file>\n <file>Images/Inklow_.png</file>\n <file>Images/printer_status_OLD.png</file>\n <file>Images/printer_status_error_laser.png</file>\n <file>Images/printer_status_warning_laser.png</file>\n <file>Images/warning.png</file>Zg' PrinterUtility/Resources.qrc +#we need to regenerate qrc_Resources.cpp (which would have been generated by qmake) +#as the one shipped has all the png's with iCCP invalid sRGB profiles. +#echo "create new qrc_resources.cpp file using our patched Resources.qrc file" +cd PrinterUtility +rm -f qrc_Resources.cpp +rcc -o qrc_Resources.cpp Resources.qrc +cd .. +#echo "now we have a resources file with fixed pngs embeded in it" +#lets run qmake :-) - or lets not. it looks like a bunch of stuff is missing.! +#the list of stuff reported missing by qmake was sent to linux-printer@epson.jp 28/09/2020 +#with a request for them to include the missing source code. hopefully they will supply +#the missing code, so we can update this script and remove some of the patches. + +#keep next few lines incase we can actually use it in the future. +#cd PrinterUtility +#qmake PrinterUtility.pro +#cd .. + +echo "running aclocal" +aclocal +echo "running autoreconf" +autoreconf --install --force + +#we still have to fix the Makefile.am files that autoreconf didn't sort out +#fix hardcoded /opt/lsb stuff +sed -i 's_/opt/lsb_/usr_g' EPSCommonLib/Makefile.am +#patch qtlibs reference in wrong place +sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" EPSCommonLib/Makefile.am +sed -i 's_/opt/lsb_/usr_g' PrinterUtility/Makefile.am +sed -i "s_/usr/include/QtCore_/usr/lib${LIBDIRSUFFIX}/qt/include/QtCore_g" PrinterUtility/Makefile.am +sed -i "s_/usr/include/QtGui_/usr/lib${LIBDIRSUFFIX}/qt/include/QtGui_g" PrinterUtility/Makefile.am +sed -i "s_include/QtNetwork_lib${LIBDIRSUFFIX}/qt/include/QtNetwork_g" PrinterUtility/Makefile.am +echo "running configure" + +CC=/usr/bin/c++ \ +CXX=/usr/bin/c++ \ +CFLAGS="$SLKCFLAGS -fpermissive" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --datarootdir=/usr/share \ + --disable-static \ + --build=$ARCH-slackware-linux + +echo "more patching of source files" +#add missing header for sleep +sed -i "1 i #include <unistd.h>" PrinterUtility/EPUMainController.cpp +sed -i "1 i #include <unistd.h>" PrinterUtility/EPUPrinterListDialog.cpp +#we need to patch the moc files so they work with qt 4.8.7 that ships with slackware 14.2 +#when the source is complete and we can run qmake, that should fix this. +for i in `ls PrinterUtility/moc_*.cpp`; do + sed -i 's/59/63/g' $i +done +#patch hardcoded path in Main.cpp so it can find language files +sed -i "s_/opt/epson_/usr/share/epson_g" PrinterUtility/Main.cpp +echo "running make" +make + +echo "running make install" +make install DESTDIR=$PKG +#as make install doesn't do much we do it manually +mkdir -p $PKG/usr/bin +cp -a PrinterUtility/epson-printer-utility $PKG/usr/bin/ +#udev rule to allow set permissions so any user can monitor the printer. +mkdir -p $PKG/etc/udev/rules.d +cp -a support-tool/79-udev-epson.rules $PKG/etc/udev/rules.d/ +mkdir -p $PKG/usr/share/epson-printer-utility/resource/Languages +mv $PKG/usr/resource/Languages/*.qm $PKG/usr/share/epson-printer-utility/resource/Languages/ +rm -r $PKG/usr/resource +mkdir -p $PKG/usr/share/pixmaps +cp PrinterUtility/Images/AppIcon.png $PKG/usr/share/pixmaps/epson-printer-utility.png +#+-----------------------------------------------------------+ +#| we now have to process the communication daemon | +#+-----------------------------------------------------------+ +cd $TMP +rm -rf epson-backend-$VERSION +tar -xzf $CWD/epson-backend-$VERSION.tar.gz +#we remove the tarnam as the original is an rpm +#this keeps things tidy. +rm $CWD/epson-backend-$VERSION.tar.gz +cd epson-backend-$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 {} \; + +echo "running aclocal" +aclocal +echo "running autoreconf" +autoreconf --install --force + +echo "running configure" + +CC=/usr/bin/gcc \ +CXX=/usr/bin/c++ \ +CFLAGS="$SLKCFLAGS -Wno-unused-but-set-variable -Wno-unused-function -Wno-implicit-function-declaration -Wno-pointer-sign -Wno-unused-variable" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +echo "patching source for backend daemon. epmnt.c" +sed -i "1 i #include <stdlib.h>\n#include <string.h>" daemon/epmnt.c +echo "running make" +make +echo "running make install" +make install DESTDIR=$PKG + +#now lets tidy everything up. after all, we are not debian :-) +#there are three important program files, /usr/bin/epson-printer-utility +#/usr/lib/epson-backend/ecbd the communication daemon, and +#/usr/lib64/cups/backend/ecblp the cups backend +#we will trash the contents of /usr/lib64/epson-backend for now, it looks like it is just debian daemon stuff. +#we need to create our own rc.ecbd file to start/stop/restart the backend +#this should be added into rc.local to make it active at startup +rm -r $PKG/usr/lib64/epson-backend +mkdir -p $PKG/etc/rc.d +cp $CWD/rc.ecbd $PKG/etc/rc.d/rc.ecbd.new +#the utility won't work without the daemon, so reduce steps admin has to do to get +#things working on a clean install. +chmod +x $PKG/etc/rc.d/rc.ecbd.new + +mkdir -p $PKG/usr/share/applications +cp $CWD/epson-printer-utility.desktop $PKG/usr/share/applications + +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 +cp -a AUTHORS COPYING NEWS README INSTALL $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:-tgz} diff --git a/system/epson-printer-utility/epson-printer-utility.desktop b/system/epson-printer-utility/epson-printer-utility.desktop new file mode 100644 index 0000000000..08e9588c8f --- /dev/null +++ b/system/epson-printer-utility/epson-printer-utility.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Epson Printer Utility +Comment=monitor ink levels, print nozzle check pattern +Exec=epson-printer-utility +Terminal=false +Type=Application +Icon=epson-printer-utility +Categories=System;Printing; diff --git a/system/epson-printer-utility/epson-printer-utility.info b/system/epson-printer-utility/epson-printer-utility.info new file mode 100644 index 0000000000..04281e9828 --- /dev/null +++ b/system/epson-printer-utility/epson-printer-utility.info @@ -0,0 +1,10 @@ +PRGNAM="epson-printer-utility" +VERSION="1.1.1" +HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/" +DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-printer-utility-1.1.1-1lsb3.2.src.rpm" +MD5SUM="4285b0585dd559d53f2c233fb96b4a00" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Tim Dickson" +EMAIL="dickson.tim@googlemail.com" diff --git a/system/epson-printer-utility/fixrm b/system/epson-printer-utility/fixrm new file mode 100644 index 0000000000..e1c5c21315 --- /dev/null +++ b/system/epson-printer-utility/fixrm @@ -0,0 +1,30 @@ +#!/bin/sh +#fixrm is a little script to limit the items on each line so the line +#is less than 72 characters. it is used by the maintainer when creating +#the README.models file for this package, and for the epson-inkjet-printer-escpr2 +#slackbuild. It takes the list posted on a single long first line, and spreads +#them over as many lines as needed. +# +#paste the list from the epson website into an empty README.models and run this +#script in the same directory + +FNAME="README.models" +MAXLEN=${MAXLEN:-72} +#make sure MAXLEN is a integer bigger than 39 +MAXLEN=`echo $MAXLEN|awk '($1<40) {print "40"} (int($1)>39) {print int($1) }'` +if [ -e $FNAME ]&&[ `cat $FNAME|head -n1|awk '{print length($0)}'` -gt $MAXLEN ]; then + #only do something if the file exists, and thefirst line is longer than it + #should be. + TMPFILE=rmtmp + mv README.models $TMPFILE + cat $TMPFILE|awk -v mlen="$MAXLEN" -F', ' 'BEGIN{curline="";mlen=mlen-2} +{ for (i=1;i<=NF; i++) + { { n=0; l=length(curline)+length($i) } + if (i==1) {curline=$i; n=1} + if (l<mlen && i>1) { curline=curline ", " $i; n=1} + if (n==0) {print curline; curline=$i } + } + if (length(curline)>0) {print curline; curline=""} +}'>README.models + rm $TMPFILE +fi diff --git a/system/epson-printer-utility/rc.ecbd b/system/epson-printer-utility/rc.ecbd new file mode 100644 index 0000000000..c534fab9aa --- /dev/null +++ b/system/epson-printer-utility/rc.ecbd @@ -0,0 +1,33 @@ +#!/bin/sh +#script to start/stop etc epson communication backend daemon ecbd + +if [ ! -x /usr/lib/epson-backend/ecbd ]; then + echo "/usr/lib/epson-backend/ecbd not executable" + exit 1 +fi +PIDFILE=/var/run/ecbd.pid +OPT=${1:-start} +case "$OPT" in +'start') + if [ `ps -A|grep ecbd|grep -v "rc.ecbd"|wc -l` -gt 0 ]||[ -e $PIDFILE ]; then + echo "ecbd is already running" + else + /usr/lib/epson-backend/ecbd -p $PIDFILE & + fi + ;; +'stop') + if [ -e /var/run/ecbd.pid ]; then + kill `cat $PIDFILE` + fi + rm -f $PIDFILE + ;; +'restart') + if [ -e $PIDFILE ]; then + kill `cat $PIDFILE` + fi + rm -f $PIDFILE + /usr/lib/epson-backend/ecbd -p $PIDFILE & + ;; +*) + echo "usage $0 start|stop|restart" +esac diff --git a/system/epson-printer-utility/slack-desc b/system/epson-printer-utility/slack-desc new file mode 100644 index 0000000000..2f670ddfa2 --- /dev/null +++ b/system/epson-printer-utility/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------------------------------------------------------| +epson-printer-utility: epson-printer-utility (epson printer monitor and tools) +epson-printer-utility: +epson-printer-utility: This is a printer utility for most Epson inkjet printers. +epson-printer-utility: It offers printer monitoring of error, ink levels, and utilities +epson-printer-utility: to check nozzles and clean print heads. +epson-printer-utility: +epson-printer-utility: +epson-printer-utility: +epson-printer-utility: +epson-printer-utility: +epson-printer-utility: diff --git a/system/esekeyd/README b/system/esekeyd/README new file mode 100644 index 0000000000..3c5817bd65 --- /dev/null +++ b/system/esekeyd/README @@ -0,0 +1,26 @@ +esekeyd (multimedia keyboard daemon for Linux) + +ESE Key Daemon is a multimedia keyboard daemon for Linux. With +the 2.6 kernel series it can also handle remote controls, as they +are presented as keyboards. It's a userspace program that polls +/dev/input/event? interfaces for incoming keypresses, and executes +commands as defined in its config file. + +esekeyd is also useful for keyboards without multimedia keys. Its +functionality is similar to xbindkeys, but (a) it doesn't require X +(works in the console), and (b) it doesn't "eat" the keystrokes it +receives, so you'll want to disable those keycodes in your keymap +if you don't want applications to react to them (see loadkeys(1) and +keymaps(5)). + +To start using esekeyd, first edit /etc/esekeyd.conf to define your +keys and the programs that will be run (use "learnkeys" to get +the names of the keys). Then start the esekeyd daemon by running +"/usr/sbin/esekeyd /etc/esekeyd.conf" (as root, or as a user in the +input group). To start esekeyd at boot, just add that command to +/etc/rc.d/rc.local. + +If esekeyd never sees your keystrokes, you may have to explicitly set +the input device for it to use on the command line (see the esekeyd(1) +man page). Also, for testing purposes, see the "Simple test" section +at the end of /etc/esekeyd.conf. diff --git a/system/esekeyd/config.snippet b/system/esekeyd/config.snippet new file mode 100644 index 0000000000..4b01f3bce5 --- /dev/null +++ b/system/esekeyd/config.snippet @@ -0,0 +1,22 @@ + +### +# Simple test: Uncomment the next two lines: + +#KEY_87:touch /tmp/esekeyd_works +#KEY_88:rm -f /tmp/esekeyd_works + +# Then start up esekeyd with this config file: +# esekeyd /etc/esekeyd.conf +# Then run: +# watch -n 1 ls /tmp/esekeyd_works +# Press F11 and F12 to see the file get created and deleted. +# If you can't use F11 and F12 for some reason, run "keytest" and +# press e.g. A and Z, change the KEY_ numbers to the ones you see +# for those keys. + +# If nothing happens, you may have to find out which +# /dev/input/event* device is your keyboard and add that to the +# esekeyd command line. Try something like: +# ls -l /dev/input/by-id/*-kbd +# ...or install and run evtest. +### diff --git a/system/esekeyd/doinst.sh b/system/esekeyd/doinst.sh new file mode 100644 index 0000000000..b1bc6d67f6 --- /dev/null +++ b/system/esekeyd/doinst.sh @@ -0,0 +1,11 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + rm $NEW + fi +} + +config etc/esekeyd.conf.new diff --git a/system/esekeyd/esekeyd.SlackBuild b/system/esekeyd/esekeyd.SlackBuild new file mode 100644 index 0000000000..aca4698c74 --- /dev/null +++ b/system/esekeyd/esekeyd.SlackBuild @@ -0,0 +1,100 @@ +#!/bin/sh + +# Slackware build script for esekeyd + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=esekeyd +VERSION=${VERSION:-1.2.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$PRGNAM-$VERSION + +# The license is supposed to be GPL3, but it's shipped as a symlink +# to /usr/share/automake-1.10/COPYING, which doesn't even exist on +# Slackware 14.2. Use a copy that does exist. +rm -f COPYING +cp $( /bin/ls /usr/share/automake-*/COPYING | head -1 ) . + +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 {} \+ + +# Typo in man pages. +sed -i 's,pools,polls,g' doc/*.1 + +# The keyboard autodetection code is outdated and broken. Patch has +# been sent upstream and will hopefully be incorporated in the next +# release. +patch -p1 < $CWD/keyboard_detection.diff + +[ -e configure ] || sh bootstrap + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install-strip DESTDIR=$PKG +gzip $PKG/usr/man/man?/*.? + +# Example config. As shipped, but with all the commands commented out. +# Also add a simpler example that everyone should be able to use. +mkdir -p $PKG/etc +sed 's,^.,#&,' examples/example.conf > $PKG/etc/$PRGNAM.conf.new +cat $CWD/config.snippet >> $PKG/etc/$PRGNAM.conf.new + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS README TODO $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:-tgz} diff --git a/system/esekeyd/esekeyd.info b/system/esekeyd/esekeyd.info new file mode 100644 index 0000000000..385c0e8a92 --- /dev/null +++ b/system/esekeyd/esekeyd.info @@ -0,0 +1,10 @@ +PRGNAM="esekeyd" +VERSION="1.2.7" +HOMEPAGE="https://github.com/burghardt/esekeyd" +DOWNLOAD="https://github.com/burghardt/esekeyd/archive/esekeyd-1.2.7/esekeyd-esekeyd-1.2.7.tar.gz" +MD5SUM="e8ba0f4f0bc2080f1a9da17b52f86805" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/esekeyd/keyboard_detection.diff b/system/esekeyd/keyboard_detection.diff new file mode 100644 index 0000000000..97e93bcdce --- /dev/null +++ b/system/esekeyd/keyboard_detection.diff @@ -0,0 +1,101 @@ +diff -Naur esekeyd-esekeyd-1.2.7/src/input.c esekeyd-esekeyd-1.2.7.patched/src/input.c +--- esekeyd-esekeyd-1.2.7/src/input.c 2010-07-04 16:23:51.000000000 -0400 ++++ esekeyd-esekeyd-1.2.7.patched/src/input.c 2020-11-01 20:22:49.777498592 -0500 +@@ -10,6 +10,14 @@ + + #include "esekey.h" + ++#include <dirent.h> ++#define CLASS_DIR "/sys/class/input" ++#define DEV_DIR "/dev/input" ++ ++#ifndef PATH_MAX ++# define PATH_MAX 1024 ++#endif ++ + signed char check_handlers (void) + { + FILE *fp = NULL; +@@ -45,32 +53,63 @@ + return 0; + } + +-signed char find_input_dev (void) ++/* return true if /dev/input/event<devno> is a keyboard. ++ This could also have been done by way of ioctls instead of reading ++ from /sys files. Hopefully the /sys API doesn't change... ++ It's documented thoroughly here: ++ https://unix.stackexchange.com/questions/74903/explain-ev-in-proc-bus-input-devices-data ++ */ ++int is_keyboard(int devno) + { +- FILE *fp = NULL; +- signed char have_evdev = -2; ++ char filename[PATH_MAX + 1]; ++ char *buf = NULL; ++ size_t len = 0, caps = 0; ++ size_t wantcaps = (1 << EV_SYN | 1 << EV_KEY | 1 << EV_MSC | 1 << EV_LED | 1 << EV_REP); ++ FILE *fp; ++ ++ sprintf(filename, "%s/event%d/device/capabilities/ev", CLASS_DIR, devno); ++ if(!(fp = fopen(filename, "r"))) return 0; ++ ++ getline(&buf, &len, fp); ++ fclose(fp); ++ if(!buf) return 0; + +- fp = fopen (INPUT_DEVICES, "r"); ++ caps = strtol(buf, NULL, 16); ++ free(buf); + +- if (!fp) ++ return (caps & wantcaps) == wantcaps; ++} ++ ++/* returns the highest-numbered keyboard found. The common case is ++ that the internal keyboard on a laptop is numbered lower than an external ++ keyboard, and we assume that if there's an external, it's the one the ++ user actually uses. If no keyboards are found, returns -1. */ ++signed char find_input_dev (void) ++{ ++ DIR *dir; ++ struct dirent *entry; ++ int last_kbd = -1; ++ char buf[PATH_MAX + 1]; ++ ++ dir = opendir(CLASS_DIR); ++ if(!dir) { ++ perror(CLASS_DIR); + return -1; ++ } + +- while (!feof (fp)) +- { +- char *buff = NULL; +- size_t len = 0; +- short int number = -2; +- getline (&buff, &len, fp); +- sscanf (buff, "H: Handlers=kbd event%hu", &number); +- free (buff); +- if (number > -1) +- { +- have_evdev = number; +- break; ++ while( (entry = readdir(dir)) ) { ++ sprintf(buf, "%s/%s", CLASS_DIR, entry->d_name); ++ if(strncmp(entry->d_name, "event", 5) == 0) { ++ int devno = atoi(entry->d_name + 5); ++ if(is_keyboard(devno)) { ++ fprintf(stderr, "event%d is a keyboard\n", devno); ++ if(devno > last_kbd) last_kbd = devno; ++ } + } + } ++ closedir(dir); + +- fclose (fp); ++ fprintf(stderr, "Autodetected keyboard: %s/event%d\n", DEV_DIR, last_kbd); + +- return have_evdev; ++ return last_kbd; + } diff --git a/system/esekeyd/slack-desc b/system/esekeyd/slack-desc new file mode 100644 index 0000000000..60a565adc5 --- /dev/null +++ b/system/esekeyd/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------------------------------------------------------| +esekeyd: esekeyd (multimedia keyboard daemon for Linux) +esekeyd: +esekeyd: ESE Key Daemon is a multimedia keyboard daemon for Linux. With +esekeyd: the 2.6 kernel series it can also handle remote controls, as they +esekeyd: are presented as keyboards. It's a userspace program that polls +esekeyd: /dev/input/event? interfaces for incoming keypresses, and executes +esekeyd: commands as defined in its config file. +esekeyd: +esekeyd: esekeyd is also useful for keyboards without multimedia keys. Its +esekeyd: functionality is similar to xbindkeys, but it doesn't require X +esekeyd: (works in the console). diff --git a/system/etsh/etsh.SlackBuild b/system/etsh/etsh.SlackBuild index 6e87ea5bdf..d1cb0cad9e 100644 --- a/system/etsh/etsh.SlackBuild +++ b/system/etsh/etsh.SlackBuild @@ -18,10 +18,11 @@ # The name means "Extended Thompson Shell", it's nothing to do with # phoning home... +# 20191201 bkw: updated for v5.4.0. # 20180902 bkw: updated for v5.3.1. PRGNAM=etsh -VERSION=${VERSION:-5.3.1} # main etsh version +VERSION=${VERSION:-5.4.0} # main etsh version V6S_VER=${V6S_VER:-20180109} # v6scripts version LT_VER=${LT_VER:-20180115} # looptest version BUILD=${BUILD:-1} @@ -63,11 +64,8 @@ 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 {} \+ +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ ./configure # not a GNU autoconf script, does not take standard args make PREFIX=/usr BINDIR=/bin DESTDIR=$PKG WARNINGS="$SLKCFLAGS" install @@ -90,7 +88,7 @@ cd - # binaries already stripped gzip -9 $PKG/usr/man/man?/*.? -cp -a AUTHORS CHANGES* DEDICATIONS History \ +cp -a AUTHORS CHANGES* DEDICATIONS \ LICENSE NOTES PROJECT README* examples \ $DOCDIR cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild diff --git a/system/etsh/etsh.info b/system/etsh/etsh.info index 64a2c03cf0..dad0393dcb 100644 --- a/system/etsh/etsh.info +++ b/system/etsh/etsh.info @@ -1,10 +1,10 @@ PRGNAM="etsh" -VERSION="5.3.1" -HOMEPAGE="https://etsh.io/" -DOWNLOAD="https://etsh.io/src/etsh_5.3.1/etsh-5.3.1.tar.gz \ - https://etsh.io/v6scripts/v6scripts-20180109.tar.gz \ - http://urchlay.naptime.net/~urchlay/src/looptest-20180115.tar.xz" -MD5SUM="ade54e7130d2a8931427f6a2397337d6 \ +VERSION="5.4.0" +HOMEPAGE="https://etsh.nl/" +DOWNLOAD="https://etsh.nl/src/etsh_5.4.0/etsh-5.4.0.tar.gz \ + https://etsh.nl/v6scripts/v6scripts-20180109.tar.gz \ + https://slackware.uk/~urchlay/src/looptest-20180115.tar.xz" +MD5SUM="e004699ce8842fdfc4536e54dbb1ea04 \ 5fee60c842f1ab7274c5a53447de2b63 \ 1c7ef73a9515d340354bbb19e5ebed91" DOWNLOAD_x86_64="" diff --git a/system/evilvte/evilvte.SlackBuild b/system/evilvte/evilvte.SlackBuild index 40d9bb2671..18dbc4a4f6 100644 --- a/system/evilvte/evilvte.SlackBuild +++ b/system/evilvte/evilvte.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for evilvte. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/evilvte/evilvte.info b/system/evilvte/evilvte.info index e4cd913dd5..9ec5d1d50e 100644 --- a/system/evilvte/evilvte.info +++ b/system/evilvte/evilvte.info @@ -6,5 +6,5 @@ MD5SUM="e09c34ac7d5afaf6ca785b7984df70ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/system/exa/exa.SlackBuild b/system/exa/exa.SlackBuild index 6deb91fb9f..2ebd5f52e1 100644 --- a/system/exa/exa.SlackBuild +++ b/system/exa/exa.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for exa -# Copyright 2017 Andrew Clemons, Wellington New Zealand +# Copyright 2017-2021 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=exa -VERSION=${VERSION:-0.8.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.10.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -73,9 +73,6 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -# https://github.com/ogham/exa/issues/301 -patch -p1 < $CWD/upgrade_datetime_crate.diff - # build offline # configuration tells cargo to use the configured directory # for dependencies intead of downloading from crates.io @@ -94,56 +91,13 @@ mkdir vendor ( cd vendor - for dependency in aho-corasick=0.5.3 \ - ansi_term=0.8.0 \ - bitflags=0.9.1 \ - byteorder=0.4.2 \ - cmake=0.1.25 \ - datetime=0.4.7 \ - env_logger=0.3.5 \ - gcc=0.3.53 \ - getopts=0.2.14 \ - git2=0.6.8 \ - glob=0.2.11 \ - idna=0.1.4 \ - iso8601=0.1.1 \ - kernel32-sys=0.2.2 \ - lazy_static=0.2.8 \ - libc=0.2.30 \ - libgit2-sys=0.6.14 \ - libz-sys=1.0.16 \ - locale=0.2.2 \ - log=0.3.8 \ - matches=0.1.6 \ - memchr=0.1.11 \ - natord=1.0.9 \ - nom=1.2.4 \ - num-traits=0.1.40 \ - num_cpus=1.6.2 \ - number_prefix=0.2.7 \ - pad=0.1.4 \ - percent-encoding=1.0.0 \ - pkg-config=0.3.9 \ - redox_syscall=0.1.31 \ - regex=0.1.80 \ - regex-syntax=0.3.9 \ - scoped_threadpool=0.1.7 \ - term_grid=0.1.6 \ - term_size=0.3.0 \ - thread-id=2.0.0 \ - thread_local=0.2.7 \ - unicode-bidi=0.3.4 \ - unicode-normalization=0.1.5 \ - unicode-width=0.1.4 \ - url=1.5.1 \ - users=0.5.3 \ - utf8-ranges=0.1.3 \ - vcpkg=0.2.2 \ - winapi=0.2.8 \ - winapi-build=0.1.1 \ - zoneinfo_compiled=0.4.7; do - dep="$(echo "$dependency" | cut -d= -f1)" - ver="$(echo "$dependency" | cut -d= -f2)" + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" tar xvf $CWD/$dep-$ver.crate @@ -165,31 +119,24 @@ mkdir vendor sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' printf "}\n" - } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + } > $dep-$ver/.cargo-checksum.json done ) +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 {} \; -mkdir -p $PKG/usr/share/bash-completion/completions/ -mkdir -p $PKG/usr/share/zsh/vendor-completions/ -mkdir -p $PKG/usr/bin - -sed -i 's,share/man,man,' Makefile - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -cargo build --release --no-default-features --features default $CARGOTARGET +cargo build --release $CARGOTARGET -find target -name exa -exec install -m 755 {} $PKG/usr/bin/exa \; -make install-man install-bash-completions install-zsh-completions DESTDIR=$PKG PREFIX=/usr BASHDIR=/usr/share/bash-completion/completions +mkdir -p $PKG/usr/bin -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 +find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \; 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 diff --git a/system/exa/exa.info b/system/exa/exa.info index 3ed66ac7a9..7eaff285a4 100644 --- a/system/exa/exa.info +++ b/system/exa/exa.info @@ -1,104 +1,92 @@ PRGNAM="exa" -VERSION="0.8.0" +VERSION="0.10.0" HOMEPAGE="https://github.com/ogham/exa" -DOWNLOAD="https://github.com/ogham/exa/archive/v0.8.0/exa-0.8.0.tar.gz \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.5.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.8.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-0.9.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-0.4.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cmake/cmake-0.1.25.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/datetime/datetime-0.4.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.3.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gcc/gcc-0.3.53.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.14.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.6.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/iso8601/iso8601-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-0.2.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.30.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.6.14.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.16.crate \ +DOWNLOAD="https://github.com/ogham/exa/archive/v0.10.0/exa-0.10.0.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.61.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/datetime/datetime-0.5.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/git2/git2-0.13.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/idna/idna-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jobserver/jobserver-0.1.21.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.79.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libgit2-sys/libgit2-sys-0.12.14+1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.1.2.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/locale/locale-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.3.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-0.1.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/matches/matches-0.1.8.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/natord/natord-1.0.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-1.2.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.1.40.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.6.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/number_prefix/number_prefix-0.2.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/pad/pad-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-1.0.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.31.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-0.1.80.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.3.9.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped_threadpool/scoped_threadpool-0.1.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/term_grid/term_grid-0.1.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/thread-id/thread-id-2.0.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.2.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/number_prefix/number_prefix-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-src/openssl-src-111.12.0+1.1.1h.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.58.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pad/pad-0.1.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/percent-encoding/percent-encoding-2.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/scoped_threadpool/scoped_threadpool-0.1.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/term_grid/term_grid-0.1.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tinyvec/tinyvec-0.3.4.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-bidi/unicode-bidi-0.3.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-1.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.5.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/zoneinfo_compiled/zoneinfo_compiled-0.4.7.crate" -MD5SUM="9024cabd9346fc3b3694e3a36f01e60d \ - df727d9f2986c9874bec190bbc9f0021 \ - f715ae93f15bac515273f287af9d130b \ - 8db34042da9ec719905b996a5b7182e1 \ - 9601b4fb33dec3dfc2427447b7bfe800 \ - 8f41a0f8569a596728890a1db27f5118 \ - 244e19eb0ab4ad90aa523890f7104465 \ - 27d9427d2f98d6024fd8d91ba50becef \ - cd77c8af3ff188c7f4a697c8e228b17c \ - 6d59f4fa29cab7bcc7ea7e0c8f96e27d \ - b7c75834ae41cd8ae0fa8f77c9d467c7 \ - f8ece52bd2dc2019f8ccc8401d259ecf \ - 7c311938b4bdbd1e0a7f0afe0864e24f \ - 4867b6387128434a377e6ab91ea65af8 \ - 9d033cc2daa6924420a4a89e6705773f \ - 4f1b30ca715275fdbc0696a8fb60c850 \ - 2276e12441afd49488c69c45f5af1392 \ - eccb87bae9484a576843a9af1b149739 \ - ccd80468b385ca0eed5c70ac9ff0eb27 \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/url/url-2.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vcpkg/vcpkg-0.2.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/zoneinfo_compiled/zoneinfo_compiled-0.5.1.crate" +MD5SUM="e8064cba42ae5692a85365074761ef88 \ + f44e8d1d2e61974b268852797530ea41 \ + c6443ec8d007c729ba5482008d0c864d \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + e502e6c6b0dca9c1ae2d99e92b26f645 \ + 87343079a03b28726b323c5c40c9167c \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 483eecc236461c493fd1aab629cee9e2 \ + 5cd52aaa12a180c9e090f40a30cd2a99 \ + e7c07242a95ee1df865efe9534e10a34 \ + 553b325a602b701eb7eaef228e69d0f2 \ + 54ac4c56d9ec2800b8428020f24be67c \ + 04a84513cdad48c92d8363d627904227 \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 7aef65438636d8662cd61e77c42c28f0 \ + 486fd4e3f2db566414f9d0b66e377fb6 \ + e5768043e447a7423f030c1394440502 \ 4b6711425b661ef923c9ff3ef9ba8c67 \ - 3aeec0abc69e407a94677199cd6a0b4b \ - 91f355db69eb1b80980ef8a7436fbc2b \ - 6a8e1bfad0f908afae0d0ca9941bd411 \ + f50d2e280b4a3491fffda43b90982544 \ + 7916dcd738a8fa6a2798754c20d6e146 \ 5a9b94ba54ea1f52f2a496ba982e3282 \ - 3796b5abe0f8c5f3a9e9441c5757a52c \ - 0d824de5c73b72433dedb16ad52e3a9e \ - 393ca202bd5c4304c3ea90fb5cc7617f \ - ee9160e4e5f6bc37082515274324f88e \ - c1f101feae32400220f6a667c3258365 \ - f6403cafe6a20349d62ceb224a644092 \ - 5dc94c21d86b663e4a1a65b47134f6c5 \ - e08cdbd749dde894cf8ed5fe8cf54ab8 \ - c76d9e4def697bf23faf4d2b79aac458 \ - 797f26b635bbc56fdf5ef1cc3883f259 \ - 472037f104fd6d766b68f0c8f68f309f \ - 9d2431826b200515c6f9ee1aca04db5a \ - ef6c6bda7a4b8de56b53329783b7976c \ - cbd02f4b3f041a51789a0a22163e482c \ - 228d6ac2570bd4b88b0cc2a7729b493e \ + c36d452e37c73b1e99f40bae18cddfdb \ + 4bbea6a7f7b7715c2e4eb553cf62913c \ + 57230f576c93046e708d3afcff7ac682 \ + 48067cc7d8ace5851af5f3ea557fee17 \ + 9ef4dc6ae75b107b9b8eb13d5824bba8 \ + f490982aceabdbd515348f63e638a782 \ + 448bc61aee07661464d98da7660e9a1d \ + 3cc3a4bd5861ca93d7c0d19129334703 \ + b492e0a70603c3903a44ec5cabd3ba21 \ + 225ea4b479317c9db74e6e74db8ef198 \ + 73d602cc41e3e431bf4fabd129ae1616 \ + 253a33d4577293cbeb852f14069b4a84 \ f403bbb812ce1a2d9270d9159cf9e8d3 \ - c658f9f53055b9326b7fb214acc9858a \ - 4576769468adf019f6500d3a84b7f68c \ - bb21a839ce735f8d429b9e8ad8b2bc6e \ - 47fafd4449f5a25dd44083d025e5c1ad \ - 075bda329483078c4a57eb6988c6a31a \ - ce928aff50b1256ea43cb94ecc4cb017 \ - b44489eb4799c4fabac3fceb48de54f7 \ - c900e7dbce808ff8ced375077b17a163 \ - 872af6020ad0bc24d439a8d0a26d7782" + c3be058b692f0e9b25a3219b7b5d940c \ + 4272c279b06b88f8b0ffce7109348e27 \ + 81821d39675a1f584546b9920e5d6b5d \ + d4c929fc9daf131daef04ee7eaa91fd4 \ + bff823ec07c5fbcc3e425c9c9e4b38a6 \ + db96b50050277bf05a3c68534bbb9586 \ + 09de9d01e7331ff3da11f58be8bef0df \ + 0498c4a11448bfc35dc7bb2caa64c753 \ + cebfcf2c00532e4559ecad9c9ebaca0a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/exa/upgrade_datetime_crate.diff b/system/exa/upgrade_datetime_crate.diff deleted file mode 100644 index 1845d95bb7..0000000000 --- a/system/exa/upgrade_datetime_crate.diff +++ /dev/null @@ -1,268 +0,0 @@ -diff -Naur exa-0.8.0.bak/Cargo.lock exa-0.8.0/Cargo.lock ---- exa-0.8.0.bak/Cargo.lock 2017-10-14 22:24:06.182951913 +1300 -+++ exa-0.8.0/Cargo.lock 2017-10-14 22:24:15.347288626 +1300 -@@ -3,7 +3,7 @@ - version = "0.8.0" - dependencies = [ - "ansi_term 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "datetime 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "datetime 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -20,7 +20,7 @@ - "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "users 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "zoneinfo_compiled 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "zoneinfo_compiled 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -38,11 +38,6 @@ - - [[package]] - name = "bitflags" --version = "0.7.0" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "bitflags" - version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - -@@ -60,28 +55,15 @@ - ] - - [[package]] --name = "conv" --version = "0.3.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "custom_derive" --version = "0.1.7" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] - name = "datetime" --version = "0.4.5" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "iso8601 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)", - "locale 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", - "pad 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -196,23 +178,6 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] --name = "magenta" --version = "0.1.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "magenta-sys" --version = "0.1.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] - name = "matches" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -236,67 +201,6 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] --name = "num" --version = "0.1.40" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "num-bigint 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-complex 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-rational 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "num-bigint" --version = "0.1.40" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "num-complex" --version = "0.1.40" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "num-integer" --version = "0.1.35" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "num-iter" --version = "0.1.34" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "num-rational" --version = "0.1.39" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "num-bigint 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] - name = "num-traits" - version = "0.1.40" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -336,15 +240,6 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] --name = "rand" --version = "0.3.16" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] - name = "redox_syscall" - version = "0.1.31" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -367,11 +262,6 @@ - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] --name = "rustc-serialize" --version = "0.3.24" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] - name = "scoped_threadpool" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -469,23 +359,20 @@ - - [[package]] - name = "zoneinfo_compiled" --version = "0.4.5" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "datetime 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "datetime 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [metadata] - "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" - "checksum ansi_term 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c877397e09fec7a240af5fa74ad0124054b8066149d6544cd1ace93f8de3be68" --"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" - "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" - "checksum byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96c8b41881888cc08af32d47ac4edd52bc7fa27fef774be47a92443756451304" - "checksum cmake 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "0c8a6541a55bcd72d3de4faee2d101a5a66df29790282c7f797082a7228a9b3d" --"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" --"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" --"checksum datetime 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "865ed3829ccf00833e92d46f061dbbafccb4a551655a183024f97bddc0f90ccc" -+"checksum datetime 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5c44b6c112860e38412e0c4732172d723458d40db906ee4b9ce87544f022a7b9" - "checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" - "checksum gcc 0.3.53 (registry+https://github.com/rust-lang/crates.io-index)" = "e8310f7e9c890398b0e80e301c4f474e9918d2b27fca8f48486ca775fa9ffc5a" - "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" -@@ -500,29 +387,19 @@ - "checksum libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8" - "checksum locale 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fdbe492a9c0238da900a1165c42fc5067161ce292678a6fe80921f30fe307fd" - "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b" --"checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527" --"checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699" - "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" - "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" - "checksum natord 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" --"checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525" --"checksum num-bigint 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "8fd0f8dbb4c0960998958a796281d88c16fbe68d87b1baa6f31e2979e81fd0bd" --"checksum num-complex 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "503e668405c5492d67cf662a81e05be40efe2e6bcf10f7794a07bd9865e704e6" --"checksum num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "d1452e8b06e448a07f0e6ebb0bb1d92b8890eea63288c0b627331d53514d0fba" --"checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01" --"checksum num-rational 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "288629c76fac4b33556f4b7ab57ba21ae202da65ba8b77466e6d598e31990790" - "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0" - "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584" - "checksum number_prefix 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "59a14be9c211cb9c602bad35ac99f41e9a84b44d71b8cbd3040e3bd02a214902" - "checksum pad 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d1bf3336e626b898e7263790d432a711d4277e22faea20dd9f70e0cab268fa58" - "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356" - "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" --"checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf" - "checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509" - "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" - "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" --"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" - "checksum term_grid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b56a46b68f4aa347ba5512b1abc12dcb641ff0e9aa3cb49b007595a320e369c5" - "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209" -@@ -537,4 +414,4 @@ - "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b" - "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" --"checksum zoneinfo_compiled 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "97d89e408f902f2359bfebbdb3fd4974dad6faf4ecf5daa625c0241d40eeeafa" -+"checksum zoneinfo_compiled 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6cce4d9bb3225a0cfe4496147373cde97909be617abcf1a10952429b48830560" -diff -Naur exa-0.8.0.bak/Cargo.toml exa-0.8.0/Cargo.toml ---- exa-0.8.0.bak/Cargo.toml 2017-10-14 22:24:06.182951913 +1300 -+++ exa-0.8.0/Cargo.toml 2017-10-14 22:24:15.643299501 +1300 -@@ -24,7 +24,7 @@ - - [dependencies] - ansi_term = "0.8.0" --datetime = "0.4.5" -+datetime = "0.4.7" - env_logger = "0.3" - getopts = "0.2.14" - glob = "0.2" -@@ -40,7 +40,7 @@ - term_size = "0.3.0" - unicode-width = "0.1.4" - users = "0.5.2" --zoneinfo_compiled = "0.4.5" -+zoneinfo_compiled = "0.4.7" - - [features] - default = [ "git" ] diff --git a/system/execline/README b/system/execline/README new file mode 100644 index 0000000000..c3019a5055 --- /dev/null +++ b/system/execline/README @@ -0,0 +1,34 @@ +execline is a (non-interactive) scripting language, like sh; but its +syntax is quite different from a traditional shell syntax. The +execlineb program is meant to be used as an interpreter for a text +file; the other commands are essentially useful inside an execlineb +script. + +execline is as powerful as a shell: it features conditional loops, +getopt-style option handling, filename globbing, and more. Meanwhile, +its syntax is far more logic and predictable than the shell's syntax, +and has no security issues. + +NOTE: +Upstream recommends building skarnet.org softwares with static libraries +as most of skarnet.org softwares are small enough that using shared +libraries are generally not worth using. Therefore, by default, shared +libraries are not built and binaries are linked against the static +versions of the skarnet.org libraries. + +If you want to also build the shared libraries, pass BUILD_SHARED=yes +environment variable to the SlackBuild script like below: + + BUILD_SHARED=yes ./execline.SlackBuild + +Similarly, to avoid building the static libraries, you can pass +BUILD_STATIC=no to the script. For example, to only build the shared +libraries and not the static ones, you can do something like: + + BUILD_SHARED=yes BUILD_STATIC=no ./execline.SlackBuild + +If you just want to build and use skarnet.org softwares, building only +the static libraries should be sufficient. + +If you want the binaries to be linked against the shared versions of the +skarnet.org libraries, pass LINK_SHARED=yes to the script. diff --git a/system/execline/execline.SlackBuild b/system/execline/execline.SlackBuild new file mode 100644 index 0000000000..1394c1bfd1 --- /dev/null +++ b/system/execline/execline.SlackBuild @@ -0,0 +1,111 @@ +#!/bin/sh + +# Slackware build script for execline + +# Copyright 2019 Sean MacLennan Ottawa, Canada +# Copyright 2020 Muhammad Mahendra Subrata Depok, Indonesia +# 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. + +PRGNAM=execline +VERSION=${VERSION:-2.8.0.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +# By default, only static libraries are built. If you need to build the shared libraries, just pass +# BUILD_SHARED=yes to this script +BUILD_STATIC=${BUILD_STATIC:-yes} +BUILD_SHARED=${BUILD_SHARED:-no} +[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static" +[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF" + +# By default, all binaries are linked against the static versions of the skarnet.org libraries +# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries +# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be +# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script +LINK_SHARED=${LINK_SHARED:-no} +[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF" + +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" \ +./configure \ + --dynlibdir=/lib${LIBDIRSUFFIX} \ + --bindir=/bin \ + --libexecdir=/usr/libexec \ + --libdir=/usr/lib${LIBDIRSUFFIX}/execline \ + --includedir=/usr/include \ + --with-sysdeps=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/skalibs \ + $LIBS_CONF + +make +make strip +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING INSTALL NEWS README doc examples $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:-tgz} diff --git a/system/execline/execline.info b/system/execline/execline.info new file mode 100644 index 0000000000..4325cd74e9 --- /dev/null +++ b/system/execline/execline.info @@ -0,0 +1,10 @@ +PRGNAM="execline" +VERSION="2.8.0.1" +HOMEPAGE="https://skarnet.org/software/execline/" +DOWNLOAD="https://skarnet.org/software/execline/execline-2.8.0.1.tar.gz" +MD5SUM="1db2962b05f2566826ad9da4e3b5c475" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="skalibs" +MAINTAINER="Muhammad Mahendra Subrata" +EMAIL="mumahendras3@gmail.com" diff --git a/system/execline/slack-desc b/system/execline/slack-desc new file mode 100644 index 0000000000..9d0df0b9fb --- /dev/null +++ b/system/execline/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------------------------------------------------------| +execline: execline (non-interactive scripting language) +execline: +execline: execline is a (non-interactive) scripting language, like sh; but its +execline: syntax is quite different from a traditional shell syntax. It is as +execline: powerful as a shell: it features conditional loops, getopt-style +execline: option handling, filename globbing, and more. Meanwhile, its syntax is +execline: far more logic and predictable than the shell's syntax, and has no +execline: security issues. +execline: +execline: Homepage: https://skarnet.org/software/execline/ +execline: diff --git a/system/exomizer/exomizer.SlackBuild b/system/exomizer/exomizer.SlackBuild index 9f4f47f02b..fba03086b4 100644 --- a/system/exomizer/exomizer.SlackBuild +++ b/system/exomizer/exomizer.SlackBuild @@ -6,6 +6,11 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20210225 bkw: update for v3.1.0, try using upstream's download +# URL again. Handle bitbucket adding ?rev=<hash> to the filename, by +# using .zip* as the source filename. Not ideal, but workable. + +# 20191201 bkw: update for v3.0.2 # 20180829 bkw: update for v3.0.1 # 20180619 bkw: @@ -16,7 +21,7 @@ # - can still build with VERSION=2.0.9 or VERSION=2.0.10, if needed PRGNAM=exomizer -VERSION=${VERSION:-3.0.1} +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,14 +60,11 @@ cd $TMP rm -rf $PRGNAM-$VERSION mkdir -p $PRGNAM-$VERSION cd $PRGNAM-$VERSION -unzip $CWD/${PRGNAM}${VERSION//./}.zip -x dos/\* win32/\* || \ - unzip $CWD/$PRGNAM-$VERSION.zip -x dos/\* win32/\* +unzip $CWD/${PRGNAM}${VERSION//./}.zip* -x dos/\* win32/\* || \ + unzip $CWD/$PRGNAM-$VERSION.zip* -x dos/\* win32/\* 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ make -C src CFLAGS="$SLKCFLAGS" mkdir -p $PKG/usr/bin diff --git a/system/exomizer/exomizer.info b/system/exomizer/exomizer.info index 38a1dcc868..8ce26be2ec 100644 --- a/system/exomizer/exomizer.info +++ b/system/exomizer/exomizer.info @@ -1,8 +1,8 @@ PRGNAM="exomizer" -VERSION="3.0.1" +VERSION="3.1.0" HOMEPAGE="https://bitbucket.org/magli143/exomizer/wiki/Home" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/exomizer-3.0.1.zip" -MD5SUM="cb5b3fe6a4c492099b220a9da064f7e5" +DOWNLOAD="https://bitbucket.org/magli143/exomizer/wiki/downloads/exomizer-3.1.0.zip" +MD5SUM="ea39dde72aa703324e27a4ee8b6ad1b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/extract-xiso/extract-xiso.SlackBuild b/system/extract-xiso/extract-xiso.SlackBuild index b93c17045a..9b0442cc50 100644 --- a/system/extract-xiso/extract-xiso.SlackBuild +++ b/system/extract-xiso/extract-xiso.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for extract-xiso. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/extract-xiso/extract-xiso.info b/system/extract-xiso/extract-xiso.info index bd7443c87d..9be9114975 100644 --- a/system/extract-xiso/extract-xiso.info +++ b/system/extract-xiso/extract-xiso.info @@ -6,5 +6,5 @@ MD5SUM="464aeb312aca6f4a1ffee42384b3c738" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/system/f2fs_tools/f2fs_tools.SlackBuild b/system/f2fs_tools/f2fs_tools.SlackBuild index 198eb74854..cfc322e817 100644 --- a/system/f2fs_tools/f2fs_tools.SlackBuild +++ b/system/f2fs_tools/f2fs_tools.SlackBuild @@ -5,7 +5,7 @@ PRGNAM=f2fs_tools SRCNAM=f2fs-tools -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/f2fs_tools/f2fs_tools.info b/system/f2fs_tools/f2fs_tools.info index cda93b1788..d3c8afa5b2 100644 --- a/system/f2fs_tools/f2fs_tools.info +++ b/system/f2fs_tools/f2fs_tools.info @@ -1,8 +1,8 @@ PRGNAM="f2fs_tools" -VERSION="1.6.1" +VERSION="1.14.0" HOMEPAGE="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git" -DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.6.1.tar.gz" -MD5SUM="3fc6caa14569e059fc41807e42641a11" +DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.14.0.tar.gz" +MD5SUM="b8be45bb2903d9c89d33f3dda630f7b9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/fantasque-sans-mono/README b/system/fantasque-sans-mono/README new file mode 100644 index 0000000000..7cdf3f8e9f --- /dev/null +++ b/system/fantasque-sans-mono/README @@ -0,0 +1,2 @@ +fantasque-sans-mono is a cool monospaced font with a handwriting style. +This script packages both the TTF and OTF font files. diff --git a/system/fantasque-sans-mono/doinst.sh b/system/fantasque-sans-mono/doinst.sh new file mode 100644 index 0000000000..ff1dece33d --- /dev/null +++ b/system/fantasque-sans-mono/doinst.sh @@ -0,0 +1,10 @@ +# Update the X font indexes: +if [ -x /usr/bin/mkfontdir ]; then + ( cd /usr/share/fonts/OTF + mkfontscale . + mkfontdir . + ) +fi +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi diff --git a/system/fantasque-sans-mono/fantasque-sans-mono.SlackBuild b/system/fantasque-sans-mono/fantasque-sans-mono.SlackBuild new file mode 100644 index 0000000000..594f73842e --- /dev/null +++ b/system/fantasque-sans-mono/fantasque-sans-mono.SlackBuild @@ -0,0 +1,72 @@ +#!/bin/sh + +# Slackware build script for fantasque-sans-mono + +# Copyright 2019 klorophatu +# 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. + +PRGNAM=fantasque-sans-mono +VERSION=${VERSION:-1.8.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -eu + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT + +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION + +cd $PRGNAM-$VERSION +unzip $CWD/FantasqueSansMono-Normal.zip + +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 {} \; + +mkdir -p $PKG/usr/share/fonts/OTF +cp -a OTF/*.otf $PKG/usr/share/fonts/OTF + +mkdir -p $PKG/usr/share/fonts/TTF +cp -a TTF/*.ttf $PKG/usr/share/fonts/TTF + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.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:-tgz} diff --git a/system/fantasque-sans-mono/fantasque-sans-mono.info b/system/fantasque-sans-mono/fantasque-sans-mono.info new file mode 100644 index 0000000000..5bf1504dc1 --- /dev/null +++ b/system/fantasque-sans-mono/fantasque-sans-mono.info @@ -0,0 +1,10 @@ +PRGNAM="fantasque-sans-mono" +VERSION="1.8.0" +HOMEPAGE="https://github.com/belluzj/fantasque-sans/" +DOWNLOAD="https://github.com/belluzj/fantasque-sans/releases/download/v1.8.0/FantasqueSansMono-Normal.zip" +MD5SUM="99bd6bf2755c7f6b5f5c62daf6807aea" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="klorophatu" +EMAIL="klorophatu@krutt.org" diff --git a/system/fantasque-sans-mono/slack-desc b/system/fantasque-sans-mono/slack-desc new file mode 100644 index 0000000000..509eccd125 --- /dev/null +++ b/system/fantasque-sans-mono/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------------------------------------------------------| +fantasque-sans-mono: fantasque-sans-mono (Monospaced programming font) +fantasque-sans-mono: +fantasque-sans-mono: A programming font, designed with functionality in mind. +fantasque-sans-mono: +fantasque-sans-mono: The font has some wibbly-wobbly handwriting-like fuzziness that +fantasque-sans-mono: makes it unassumingly cool. It is used for programming, as it is +fantasque-sans-mono: a monospaced font. +fantasque-sans-mono: +fantasque-sans-mono: Homepage: https://github.com/belluzj/fantasque-sans/ +fantasque-sans-mono: +fantasque-sans-mono: diff --git a/system/fasd/slack-desc b/system/fasd/slack-desc index c74a9dd152..284105f567 100644 --- a/system/fasd/slack-desc +++ b/system/fasd/slack-desc @@ -16,4 +16,4 @@ fasd: quickly reference them in the command line. fasd: fasd: The name fasd comes from the default suggested aliases f(files), fasd: a(files/directories), s(show/search/select), d(directories). -fasd:
\ No newline at end of file +fasd: diff --git a/system/fatrace/fatrace.SlackBuild b/system/fatrace/fatrace.SlackBuild index e8e68ad4e5..72e5b34cea 100644 --- a/system/fatrace/fatrace.SlackBuild +++ b/system/fatrace/fatrace.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fatrace -# Copyright 2018 Leonardo Citrolo, Italy +# Copyright 2018-2020 Leonardo Citrolo, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fatrace -VERSION=${VERSION:-0.13} +VERSION=${VERSION:-0.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/fatrace/fatrace.info b/system/fatrace/fatrace.info index 8ea1432f21..bc7e463ec8 100644 --- a/system/fatrace/fatrace.info +++ b/system/fatrace/fatrace.info @@ -1,8 +1,8 @@ PRGNAM="fatrace" -VERSION="0.13" +VERSION="0.15" HOMEPAGE="https://launchpad.net/fatrace" -DOWNLOAD="https://launchpad.net/fatrace/trunk/0.13/+download/fatrace-0.13.tar.bz2" -MD5SUM="c390b5d2ce6e48a88ff1905593b9eb61" +DOWNLOAD="https://launchpad.net/fatrace/trunk/0.15/+download/fatrace-0.15.tar.xz" +MD5SUM="d33ec7c650ab25a835540e802bfab09f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/system/fatsort/fatsort.SlackBuild b/system/fatsort/fatsort.SlackBuild index ac2e5e8cea..430da431ec 100644 --- a/system/fatsort/fatsort.SlackBuild +++ b/system/fatsort/fatsort.SlackBuild @@ -1,9 +1,8 @@ #!/bin/sh # Slackware build script for fatsort -# $Id: fatsort.SlackBuild,v 1.1 2018/08/03 07:22:48 pomf Exp pomf $ -# Copyright 2018 pomfland +# Copyright 2020 pomfland # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,16 +23,16 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fatsort -VERSION=${VERSION:-1.4.2.439} +VERSION=${VERSION:-1.6.2.605} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then - case "$( uname -m )" in +case "$( uname -m )" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac + *) ARCH=$( uname -m ) ;; +esac fi CWD=$(pwd) @@ -42,17 +41,17 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" +SLKCFLAGS="-O2 -march=i586 -mtune=i686" +LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" +SLKCFLAGS="-O2 -march=i686 -mtune=i686" +LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" +SLKCFLAGS="-O2 -fPIC" +LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" +SLKCFLAGS="-O2" +LIBDIRSUFFIX="" fi set -e @@ -65,16 +64,16 @@ 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 {} \; +\( -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" make +make make install DESTDIR=$PKG MANDIR=/usr/man/man1 SBINDIR=/usr/sbin 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 +| 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 diff --git a/system/fatsort/fatsort.info b/system/fatsort/fatsort.info index 6201b038c7..4500153440 100644 --- a/system/fatsort/fatsort.info +++ b/system/fatsort/fatsort.info @@ -1,8 +1,8 @@ PRGNAM="fatsort" -VERSION="1.4.2.439" +VERSION="1.6.2.605" HOMEPAGE="https://fatsort.sourceforge.io/" -DOWNLOAD="https://sourceforge.net/projects/fatsort/files/fatsort-1.4.2.439.tar.xz" -MD5SUM="0ca483918bd12339653c4563e11ef20a" +DOWNLOAD="https://sourceforge.net/projects/fatsort/files/fatsort-1.6.2.605.tar.xz" +MD5SUM="e3ef708dcdfff60e81db957f6ac30f5a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/fcron/fcron.SlackBuild b/system/fcron/fcron.SlackBuild index 0ca20e670a..835f21f70f 100644 --- a/system/fcron/fcron.SlackBuild +++ b/system/fcron/fcron.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=fcron VERSION=${VERSION:-3.3.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} # Select fcron's default user/group @@ -47,7 +47,7 @@ fi if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -58,8 +58,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686 -Wall" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wall" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wall" @@ -94,6 +94,7 @@ find -L . \ --with-boot-install=no \ --with-cflags="$SLKCFLAGS" \ --with-docdir=/usr/doc \ + --without-pam \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --mandir=/usr/man \ diff --git a/system/fd/fd.SlackBuild b/system/fd/fd.SlackBuild index 8772fe767d..e842053adb 100644 --- a/system/fd/fd.SlackBuild +++ b/system/fd/fd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fd -# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fd -VERSION=${VERSION:-7.1.0} +VERSION=${VERSION:-8.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,55 +91,13 @@ mkdir vendor ( cd vendor - for dependency in aho-corasick=0.6.6 \ - ansi_term=0.11.0 \ - atty=0.2.11 \ - bitflags=1.0.3 \ - cc=1.0.18 \ - cfg-if=0.1.5 \ - clap=2.32.0 \ - crossbeam=0.3.2 \ - ctrlc=3.1.1 \ - diff=0.1.11 \ - fnv=1.0.6 \ - fuchsia-zircon-sys=0.3.3 \ - fuchsia-zircon=0.3.3 \ - globset=0.4.1 \ - ignore=0.4.3 \ - kernel32-sys=0.2.2 \ - lazy_static=1.1.0 \ - libc=0.2.43 \ - log=0.4.4 \ - memchr=2.0.1 \ - nix=0.11.0 \ - num_cpus=1.8.0 \ - rand=0.4.3 \ - redox_syscall=0.1.40 \ - redox_termios=0.1.1 \ - regex-syntax=0.6.2 \ - regex=1.0.2 \ - remove_dir_all=0.5.1 \ - same-file=1.0.2 \ - strsim=0.7.0 \ - tempdir=0.3.7 \ - term_size=0.3.1 \ - termion=1.5.1 \ - textwrap=0.10.0 \ - thread_local=0.3.6 \ - ucd-util=0.1.1 \ - unicode-width=0.1.5 \ - utf8-ranges=1.0.0 \ - vec_map=0.8.1 \ - version_check=0.1.4 \ - void=1.0.2 \ - walkdir=2.2.0 \ - winapi-build=0.1.1 \ - winapi-i686-pc-windows-gnu=0.4.0 \ - winapi-x86_64-pc-windows-gnu=0.4.0 \ - winapi=0.2.8 \ - winapi=0.3.5; do - dep="$(echo "$dependency" | cut -d= -f1)" - ver="$(echo "$dependency" | cut -d= -f2)" + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" tar xvf $CWD/$dep-$ver.crate @@ -161,7 +119,7 @@ mkdir vendor sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' printf "}\n" - } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + } > $dep-$ver/.cargo-checksum.json done ) diff --git a/system/fd/fd.info b/system/fd/fd.info index 42393c2476..bb79177da2 100644 --- a/system/fd/fd.info +++ b/system/fd/fd.info @@ -1,102 +1,128 @@ PRGNAM="fd" -VERSION="7.1.0" +VERSION="8.2.1" HOMEPAGE="https://github.com/sharkdp/fd" -DOWNLOAD="https://github.com/sharkdp/fd/archive/v7.1.0/fd-7.1.0.tar.gz \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.6.crate \ +DOWNLOAD="https://github.com/sharkdp/fd/archive/v8.2.1/fd-8.2.1.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.18.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.32.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam/crossbeam-0.3.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ctrlc/ctrlc-3.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/diff/diff-0.1.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.43.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.0.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.11.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.8.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.40.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_termios/redox_termios-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.12.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/anyhow/anyhow-1.0.35.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ctrlc/ctrlc-3.1.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/diff/diff-0.1.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-next/dirs-next-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys-next/dirs-sys-next-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/filetime/filetime-0.2.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-cprng/fuchsia-cprng-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/globset/globset-0.4.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-2.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ignore/ignore-0.4.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jemallocator/jemallocator-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.80.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lscolors/lscolors-0.7.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.18.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rdrand/rdrand-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.21.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/tempdir/tempdir-0.3.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/termion/termion-1.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.10.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/term_size/term_size-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/users/users-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.5.crate" -MD5SUM="e03231adb88177342740d4582fc3beb2 \ - eccb0686604358f59b8a5aa9d4142df1 \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate" +MD5SUM="be6243e578e2313578bb0cf1e713b5e9 \ + 93850f8bf39e61dcf80ce49b5e0943d7 \ 294a49d3c53865fa7ac5d0ce2f5d5735 \ - 5d7155b7fbc0e234c017f418f0dc9d64 \ - 634007318860771724b024485d4fdde6 \ - 3cb8e4048052dfc41403d697c8b77630 \ - 097e0d2392a5e65f9471f7af7001940a \ - cff9adf6952db7c0442bd9639440bb90 \ - 16b8c0d406003257fb050c231920b6d5 \ - 287531452c9202d5fd88391ed47a96e1 \ - c2ab12ba9352dea157fe995e0e89eaa9 \ - b0fd8ad50f5e64c71f0daf8af79ca952 \ - 54cfab480b7a5f7302eadf44129d3f4b \ - dd7c80c2d04d2e9ceba82826cf69764d \ - b29cbc861981df3632294e402b53c813 \ - 9bfdb331dda537e4755c6987cacbadd3 \ - 9d033cc2daa6924420a4a89e6705773f \ - 5ad17e4d6ff2d31f4f487d67bd2ac6e3 \ - 5524b53de0aad9352ca0d4d899f87046 \ - bd4331eab1e79fd39cf9d3e89a33bd32 \ - 5acbda15de2f57f6a3e78381277c9cdd \ - 50a9b3ddba8c0723171ea61d78cb25c8 \ - b702f35cca52b56d1fb6e5bd4a048fbf \ - b8e402de21805717cdaa0c2f122a2a26 \ - 7e94bf91e9faf1557da812a3444f23cc \ - 01cb5402c0fd99cebac702b76f2f2669 \ - 34abd5937facf3194234568f2c7143be \ - 9aeb18b39fd35b8739659f4af6d7ac61 \ - 09422dcb1cd6e3c30598296d2d3d4798 \ - 17e0cb7f8a95f3db92e03668a361d9bd \ - fbb6473579065c9fe4dc3d48c5d5d8a5 \ + f44e8d1d2e61974b268852797530ea41 \ + 6f628b386c5dfe62ffa9b017d8ed7c38 \ + 142cb4b9a653e56e56311f0c883b8582 \ + c6443ec8d007c729ba5482008d0c864d \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + 0df9d76acda993ef38665e5e254f500c \ + b3ebb5d4433417e998d982d46334a6f4 \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 74634128440dbc3766bda76fdf0aaa05 \ + bc79e0eb364df515a33755ac9a581cfd \ + 9e1f73325eeb9647ee68eeaa4bff975c \ + ed8fbdb220a7435e83c34d46151182f0 \ + 06fc5cd841a576b0bc969fb13ba22b4c \ + 3681f813c502d911e9eea940dddd26a5 \ + c1922365b80dcdf50342e7640eea27ce \ + d2c45f1ab11c072f28d2087f0af9870f \ + 8dab3b3ec00dc56cffde0b0c410d47b5 \ + 11bdaeb718e5577104b0697c89cf9311 \ + 27260b46db6b9ac40318143d70a80ba3 \ + 704babd757a22f163230a36fa5474890 \ + 1b94f32581a557963eecb29761e9c0eb \ + 553b325a602b701eb7eaef228e69d0f2 \ + 3f94dd669aafea2fcd7c8c63236029c4 \ + 88b4e3e28ea8527c2b0e7124d6d5766f \ + 85dae509b4cda41fa820b3ad3b302479 \ + 9f10bcc7b3ab24a0cdbaa0addc65b88d \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 3845eb009d59a1e90a749e50fadfd2d3 \ + f50d2e280b4a3491fffda43b90982544 \ + f3373fd861a0066fa446a8ab3dabc749 \ + fa3630e5867493e09296155763e4f4a0 \ + d0daed97b20f4a6b23c8d4e2ac7b77a8 \ + c36d452e37c73b1e99f40bae18cddfdb \ + 9e99a37f8c37bb953732ef46ac2b12a1 \ + 8cab41822d03dfa674870315308fa392 \ + 35ddcd36701a1a6711cc3aec85909f41 \ + c8d655d206cbe48b84a22544d6fc6d15 \ + 3cc3a4bd5861ca93d7c0d19129334703 \ + 870008bba2e68db4988c31e511fbd9c4 \ + 13373372c7ce2e894925d846625a7987 \ + 40d1ab8fd9b6e5e376b0839a9132abe1 \ + 0538d1da369f3e3f0412aa4d735c1b61 \ + 2d8d8b377d144f5e32b4f65a69eb0b24 \ + 781d4ccf5d04c98fa02af207a9639249 \ 918b2d65f7489e154483e3d6e54118a0 \ - adf9d2250c2a622c6274514e38d1f559 \ - de04800c89d374b8a843f91d26fa05ad \ - 63268e3f02616082705227f0a58fed87 \ - baaa166f66e90e94b76b7418afd5df90 \ - 5a31b770d7063a98028d2b3de67e7a7a \ - d7c493ca4f84a7d50b53646421a37487 \ - 7293a4349a42c9b7ef8866cca981ed83 \ - 0eedbc32447f40b3045d6de3910b5415 \ - 42251e6747c29cf0b8cd6ee7c6b1f7e0 \ - 689203efc084fc0f1d1f74f5d354ae75 \ - b04f218672a07efa7a47c160e452c58e \ - c900e7dbce808ff8ced375077b17a163 \ + 73d602cc41e3e431bf4fabd129ae1616 \ + a8de006fe0c7e373c560dd51599287a8 \ + a5dd75e77c7324f5c1d2d372c990d0a7 \ + 4272c279b06b88f8b0ffce7109348e27 \ + d4c929fc9daf131daef04ee7eaa91fd4 \ + 333b4ba3f64c35b6f89b521e8d64548b \ + 8b01b016a9b6deebc1b43f296057efb5 \ + 1092a4a24e80f8856efc71af51a06114 \ + 6e23e0eee42b1ba9ec61a6db7ec2dc08 \ db96b50050277bf05a3c68534bbb9586 \ + b9e37d5fc4ad28b612b78ad37816684d \ 09de9d01e7331ff3da11f58be8bef0df \ - b44489eb4799c4fabac3fceb48de54f7 \ - 2125e7b9377edde8dc250554b47c7442" + 0498c4a11448bfc35dc7bb2caa64c753" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/fdclone/01_previous_changes.patch b/system/fdclone/01_previous_changes.patch new file mode 100644 index 0000000000..af32350eaf --- /dev/null +++ b/system/fdclone/01_previous_changes.patch @@ -0,0 +1,85 @@ +Description: configure fdclone for works properly under Debian + This allows for customize fdclone configuration for works + properly under Debian. Originally 01_previous_changes.dpatch +Author: Sandro Tosi <matrixhasu@gmail.com> + +Index: fdclone/Configur +=================================================================== +--- fdclone.orig/Configur ++++ fdclone/Configur +@@ -679,12 +679,7 @@ fi + if isexist "sysconf(0)"; then + echo "#define USESYSCONF" + fi +-if isexist "_llseek(0,0,0,0,0)" linux/unistd "static _syscall5(int, _llseek, +- unsigned int, fd, +- unsigned long, ofs_h, +- unsigned long, ofs_l, +- long long *, result, +- unsigned int, whence); ++if isexist "_llseek(0,0,0,0,0)" "sys/syscall" "#define _llseek(fd, ofs_h, ofs_l, result, whence) syscall(SYS__llseek, fd, ofs_h, ofs_l, result, whence) + "; then + echo "#define USELLSEEK" + fi +Index: fdclone/config.hin +=================================================================== +--- fdclone.orig/config.hin ++++ fdclone/config.hin +@@ -3,4 +3,4 @@ + * + * definitions for each OS + */ +- ++#define USEDATADIR +Index: fdclone/dosdisk.c +=================================================================== +--- fdclone.orig/dosdisk.c ++++ fdclone/dosdisk.c +@@ -23,6 +23,7 @@ + #include "mntinfo.h" + #include <sys/mount.h> + #include <linux/unistd.h> ++#include <sys/syscall.h> + # ifndef BLKFLSBUF + # include <linux/fs.h> + # endif +@@ -378,12 +379,7 @@ static CONST char *inhibitname[] = INHIB + #ifdef USELLSEEK + # ifdef _syscall5 + # undef _llseek +-static _syscall5(int, _llseek, +- u_int, fd, +- u_long, ofs_h, +- u_long, ofs_l, +- l_off_t *, result, +- u_int, whence); ++#define _llseek(fd, ofs_h, ofs_l, result, whence) syscall(SYS__llseek, fd, ofs_h, ofs_l, result, whence) + # endif + + static l_off_t NEAR Xllseek(fd, offset, whence) +Index: fdclone/fd.h +=================================================================== +--- fdclone.orig/fd.h ++++ fdclone/fd.h +@@ -95,8 +95,8 @@ extern char *_mtrace_file; + * If you don't like the following tools as each uses, * + * you should rewrite another suitable command name. * + ****************************************************************/ +-#define PAGER "more%K" /* to view file */ +-#define EDITOR "vi" /* to edit file */ ++#define PAGER "/usr/bin/pager" /* to view file */ ++#define EDITOR "/usr/bin/editor" /* to edit file */ + + + /**************************************************************** +Index: fdclone/version.h +=================================================================== +--- fdclone.orig/version.h ++++ fdclone/version.h +@@ -4,5 +4,5 @@ + * version number + */ + +-char *distributor = NULL; ++char *distributor = "sano@debian.org (Taketoshi Sano)"; + static char version[] = "@(#)fd.c 3.01j 07/27/19"; diff --git a/system/fdclone/30_makefilein_setting.patch b/system/fdclone/30_makefilein_setting.patch new file mode 100644 index 0000000000..fd5e9c74f3 --- /dev/null +++ b/system/fdclone/30_makefilein_setting.patch @@ -0,0 +1,53 @@ +Description: install files in the correctly Debian's path + This setting values to install files in the correctly Debian's path. + +Index: fdclone/Makefile.in +=================================================================== +--- fdclone.orig/Makefile.in ++++ fdclone/Makefile.in +@@ -12,7 +12,7 @@ MANSEC = 1 + BINTOP = $(PREFIX)/bin + BINDIR = $(BUILD)$(BINTOP) + DATATOP = $(PREFIX)/share +-DATADIR = $(BUILD)$(DATATOP)/fd ++DATADIR = $(BUILD)$(DATATOP)/fdclone + MANTOP = $(PREFIX)/man + MANDIR = $(BUILD)$(MANTOP)/man$(MANSEC) + CATDIR = $(BUILD)$(MANTOP)/cat$(MANSEC) +@@ -484,24 +484,24 @@ install-runcom: + + install-table: $(TABLE) mkdir_p$(EXE) + -if [ -f $(UNITBL) ]; then \ +- [ -d __DATADIR__ ] || ./mkdir_p$(EXE) __DATADIR__; \ +- $(INSTALL) $(UNITBL) __DATADIR__; \ +- $(CHMOD) a+r-x __DATADIR__/$(UNITBL); \ ++ [ -d $(DATADIR) ] || ./mkdir_p$(EXE) $(DATADIR); \ ++ $(INSTALL) $(UNITBL) $(DATADIR); \ ++ $(CHMOD) a+r-x $(DATADIR)/$(UNITBL); \ + fi + -if [ -f $(DICTTBL) ]; then \ +- [ -d __DATADIR__ ] || ./mkdir_p$(EXE) __DATADIR__; \ +- $(INSTALL) $(DICTTBL) __DATADIR__; \ +- $(CHMOD) a+r-x __DATADIR__/$(DICTTBL); \ ++ [ -d $(DATADIR) ] || ./mkdir_p$(EXE) $(DATADIR); \ ++ $(INSTALL) $(DICTTBL) $(DATADIR); \ ++ $(CHMOD) a+r-x $(DATADIR)/$(DICTTBL); \ + fi + -if [ -f $(CATTBL) ]; then \ +- [ -d __DATADIR2__ ] || ./mkdir_p$(EXE) __DATADIR2__; \ +- $(INSTALL) $(CATTBL) __DATADIR2__; \ +- $(CHMOD) a+r-x __DATADIR2__/$(CATTBL); \ ++ [ -d $(DATADIR)/$(VERSION) ] || ./mkdir_p$(EXE) $(DATADIR)/$(VERSION); \ ++ $(INSTALL) $(CATTBL) $(DATADIR)/$(VERSION); \ ++ $(CHMOD) a+r-x $(DATADIR)/$(VERSION)/$(CATTBL); \ + fi + -if [ -f $(ECATTBL) ]; then \ +- [ -d __DATADIR2__ ] || ./mkdir_p$(EXE) __DATADIR2__; \ +- $(INSTALL) $(ECATTBL) __DATADIR2__; \ +- $(CHMOD) a+r-x __DATADIR2__/$(ECATTBL); \ ++ [ -d $(DATADIR)/$(VERSION) ] || ./mkdir_p$(EXE) $(DATADIR)/$(VERSION); \ ++ $(INSTALL) $(ECATTBL) $(DATADIR)/$(VERSION) ; \ ++ $(CHMOD) a+r-x $(DATADIR)/$(VERSION)/$(ECATTBL); \ + fi + + install-man: $(MANSRC) mkdir_p$(EXE) diff --git a/system/fdclone/README b/system/fdclone/README new file mode 100644 index 0000000000..dfb23f42fb --- /dev/null +++ b/system/fdclone/README @@ -0,0 +1,12 @@ +fdclone (two-pane textmode file manager) + +FDclone is a file & directory maintenance tool for UNIX-based OSes. It +is a clone of "FD" for MS-DOS, made by Mr. A.Idei in 1989. + +fdclone has excellent Japanese language UI, documentation, and +character encoding support, since it originates in Japan. + +The executable is installed as /usr/bin/fdclone, which means this +build doesn't conflict with system/fd. However, if you don't have fd +installed, a symlink /usr/bin/fd is created so you can just type "fd" +to run this. diff --git a/system/fdclone/doinst.sh b/system/fdclone/doinst.sh new file mode 100644 index 0000000000..35eeb79424 --- /dev/null +++ b/system/fdclone/doinst.sh @@ -0,0 +1,22 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi +} + +config etc/fdclone/fd2rc.siteconfig.new + +# If there's no fd link, take over: +if [ ! -r usr/bin/fd ]; then + ( cd usr/bin ; rm -rf fd ) + ( cd usr/bin ; ln -sf fdclone fd ) + ( cd usr/man/man1 ; rm -rf fd.1.gz ) + ( cd usr/man/man1 ; ln -sf fdclone.1.gz fd.1.gz ) + ( cd usr/man/ja/man1 ; rm -rf fd.1.gz ) + ( cd usr/man/ja/man1 ; ln -sf fdclone.1.gz fd.1.gz ) +fi diff --git a/system/fdclone/fd2rc b/system/fdclone/fd2rc new file mode 100644 index 0000000000..4f24272d1e --- /dev/null +++ b/system/fdclone/fd2rc @@ -0,0 +1,613 @@ +# /etc/fdclone/fd2rc: Initialize file for FD +# +# This Slackware package provides /etc/fdclone/fd2rc.siteconfig for +# site specific settings. Please use it for your customization, +# and leave this file alone for smooth upgrade. +# +# 20201118 bkw: +# This file was taken from the Debian package, and modified slightly. +# To see the changes, search within the file for the string "bkw:". +# +# There are some settings in this configuration file +# which differ from the upstream default: +# +# DISPLAYMODE=3 (sym-link status & file type symbol) +# ADJTTY=1 (adjust TTY when exiting) +# TMPDIR=$HOME (for security reasons) +# TMPUMASK=077 (same above) +# LANGUAGE=$LANG (bkw: and MESSAGELANG=$LANG) +# INPUTKCODE=$LANG +# FNAMEKCODE=$LANG +# +# Launcher settings +# for files with suffix as .zip, .Z, .gz. .bz2 +# for deb package (.deb) and rpm package (.rpm) +# Archiver settings +# for files with suffix as .zip +# for deb package (.deb) and rpm package (.rpm) +# +# Some keycode settings for linux console, xterm, and kterm. +# +# fdclone can use the environment variables PAGER and EDITOR, +# but the settings from the configuration file such as +# /etc/fdclone/fd2rc or $HOME/.fd2rc will be prefered and +# the settings in the environment variables are ignored in +# this case. +# (/etc/fdclone/fd2rc includes /etc/fdclone/fd2rc.siteconfig) +# +# So the default runcom file (i.e. this file, /etc/fdclone/fd2rc) +# in this package don't set these variables as default. +# If you like to set the PAGER&EDITOR settings as the site default, +# plese put the following 2 lines in /etc/fdclone/fd2rc.siteconfig. +# +# PAGER=/usr/bin/pager%K (or the pager which you like) +# EDITOR=/usr/bin/editor (or the editor which you like) +# +# `%K' means that fd waits for the key input when the pager finishes. +# This is useful for simple pagers such like `more', since they just +# quits soon when they show all the contents of the specified file. +# But if you use others such like `less' or `lv', then you wish to +# disable this by eliminating `%K' at the end, since the pager itself +# prompts user to quit. +# Please refer the manual page of `fd' for more detail. + +# to set default sort type +# 0: not sort (Default) +# 1: alphabetical 9: alphabetical (reversal) +# 2: extension 10: extension (reversal) +# 3: size 11: size (reversal) +# 4: date 12: date (reversal) +# 5: length 13: length (reversal) +# 100-113: preserve previous sort type +# (the least 2 digits are effective just after initialize) +#SORTTYPE=0 + +# to set default display mode +# 0: normal (Default) +# 1: sym-link status +# 2: file type symbol +# 3: sym-link status & file type symbol +# 4: invisible dot file +# 5: sym-link status & invisible dot file +# 6: file type symbol & invisible dot file +# 7: sym-link status & file type symbol & invisible dot file +DISPLAYMODE=3 + +# whether if sort or not in tree mode +# 0: not sort (Default) +# >= 1: sort according to SORTTYPE +#SORTTREE=0 + +# behavior about writing over directory on file system +# 0: confirm to write or not, after directory arranged (Default) +# 1: write directory only if commanded +# 2: never write over directory even if commanded +#WRITEFS=0 + +# whether if ignore uppercase or lowercase in filename comparison +# 0: not ignore (Default) +# >= 1: ignore +#IGNORECASE=0 + +# whether if inherit timestamp or not when copying +# 0: not inherit (Default) +# >= 1: inherit +#INHERITCOPY=0 + +# whether if adjust tty or not when exiting +# 0: not adjust (Default) +# >= 1: adjust +ADJTTY=1 + +# whether if prioritize VT100 escape sequence or not for getting terminal size +# 0: not prioritize (Default) +# >= 1: prioritize +#USEGETCURSOR=0 + +# to set default columns of file in 1 line +# 1: 1 column +# 2: 2 columns (Default) +# 3: 3 columns +# 5: 5 columns +#DEFCOLUMNS=2 + +# minimum columns of filename field +# Default: 12 +#MINFILENAME=12 + +# history file of sh mode +# Default: ~/.fd_history +#HISTFILE=~/.fd_history + +# history size of sh mode +# Default: 50 +#HISTSIZE=50 + +# history size of path input +# Default: 50 +#DIRHIST=50 + +# size of saved history +# Default: 50 +#SAVEHIST=50 + +# limit of counting files in directory, on tree mode +# Default: 50 +#DIRCOUNTLIMIT=50 + +# whether if make MS-DOS drive effective +# 0: not use (Default) +# >= 1: effective +#DOSDRIVE=0 + +# whether if display the second hand of clock +# 0: not display (Default) +# >= 1: display +#SECOND=0 + +# whether if use the screen layout based on the traditional "FD" +# 0: original layout (Default) +# >= 1: traditional layout +#TRADLAYOUT=0 + +# whether if show the info. of filesize +# 0: not show (Default) +# >= 1: show +#SIZEINFO=0 + +# whether if support ANSI color escape sequence +# 0: monochrome (Default) +# 1: color +# 2: color & force background to blacken +# 3: color & force foreground to blacken +# 20201118 bkw: enable this by default, it's 2020 and you should be using +# a terminal that supports color by now. +ANSICOLOR=2 + +# specify color palette in the ANSI color mode +# Default: none +# 0: black +# 1: red +# 2: green +# 3: yellow +# 4: blue +# 5: magenta +# 6: cyan +# 7: white +# 8: default color for foreground +# 9: default color for background +# default palette: 8962435188 +# |||||||||| +# normal file -----+||||||||| +# background -------+|||||||| +# directory ---------+||||||| +# unwritable ---------+|||||| +# unreadable ----------+||||| +# symbolic link --------+|||| +# socket ----------------+||| +# fifo (named pipe) ------+|| +# block device ------------+| +# character device ---------+ +# 20201118 bkw: set the default here +ANSIPALETTE="8962435188" + +# select edit mode with your favorite editor type +# emacs: ^P, ^N, ^F, ^B, ... (Default) +# wordstar ^E, ^X, ^D, ^S, ... +# vi: k, j, l, h, ... +#EDITMODE=emacs + +# whether if loop cursor moving within the same page +# 0: not loop (Default) +# >= 1: loop +#LOOPCURSOR=0 + +# temporary directory where archive file is unpacked +# Default: /tmp +TMPDIR=$HOME + +# file creation mask for the temporary directory +# Default: 022 +TMPUMASK=077 + +# mount point of CD-ROM with iso-9660 rock ridge format +# Default: none +#RRPATH="" + +# directories on which browsing precedes getting file status +# Default: none +#PRECEDEPATH="" + +# shell prompt strings +# Default: "$ " +#PS1="$ " + +# continuous shell prompt strings +# Default: "> " +#PS2="> " + +# whether if not use control sequences in the internal shell +# 0: use (Default) +# >= 1: not use +#DUMBSHELL=0 + +# whether if hold the UNICODE translation table on memory +# 0: not hold (Default) +# >= 1: hold +#UNICODEBUFFER=0 + +# language code type to display +# Default: No convert +# euc, EUC: EUC-JP +# sjis, SJIS: Shift JIS +# jis, JIS: 7bits JIS +# jis8, JIS8: 8bits JIS +# junet, JUNET: ISO-2022-JP +# ojis, OJIS: old 7bits JIS +# ojis8, OJIS8: old 8bits JIS +# ojunet, OJUNET: old ISO-2022-JP +# utf8, UTF8: UTF-8 +# utf8-mac, UTF8-MAC: UTF-8 for Mac OS X +# eng, ENG, C: English +LANGUAGE=$LANG + +# 20201118 bkw: makes no sense not to set this also! +MESSAGELANG=$LANG + +# language code type to input +# Default: No convert +# euc, EUC: EUC-JP +# sjis, SJIS: Shift JIS +# utf8, UTF8: UTF-8 +# utf8-mac, UTF8-MAC: UTF-8 for Mac OS X +INPUTKCODE=$LANG + +# language code type in filename +# Default: No convert +# euc, EUC: EUC-JP +# sjis, SJIS: Shift JIS +# jis, JIS: 7bits JIS +# jis8, JIS8: 8bits JIS +# junet, JUNET: ISO-2022-JP +# ojis, OJIS: old 7bits JIS +# ojis8, OJIS8: old 8bits JIS +# ojunet, OJUNET: old ISO-2022-JP +# hex, HEX: HEX +# cap, CAP: CAP +# utf8, UTF8: UTF-8 +# utf8-mac, UTF8-MAC: UTF-8 for Mac OS X +FNAMEKCODE=$LANG + +# directories on which language code type in filename is SJIS +# Default: none +#SJISPATH="" + +# directories on which language code type in filename is EUC-JP +# Default: none +#EUCPATH="" + +# directories on which language code type in filename is 7bits JIS +# Default: none +#JISPATH="" + +# directories on which language code type in filename is 8bits JIS +# Default: none +#JIS8PATH="" + +# directories on which language code type in filename is ISO-2022-JP +# Default: none +#JUNETPATH="" + +# directories on which language code type in filename is old 7bits JIS +# Default: none +#OJISPATH="" + +# directories on which language code type in filename is old 8bits JIS +# Default: none +#OJIS8PATH="" + +# directories on which language code type in filename is old ISO-2022-JP +# Default: none +#OJUNETPATH="" + +# directories on which language code type in filename is HEX +# Default: none +#HEXPATH="" + +# directories on which language code type in filename is CAP +# Default: none +#CAPPATH="" + +# directories on which language code type in filename is UTF-8 +# Default: none +#UTF8PATH="" + +# directories on which language code type in filename is UTF-8 for Mac OS X +# Default: none +#UTF8MACPATH="" + +# directories on which language code type in filename is not converted +# Default: none +#NOCONVPATH="" + +#PAGER=more%K +#EDITOR=vi +#SHELL=/bin/sh + +# for Mischievous Japanese OS (see `man fd') +#export LANG=C + +# launcher definition +#(Default) +#launch ".lzh" "lha l" \ +# -f "%a %u/%g %s %x %m %d %{yt} %*f" \ +# -f "%9a %u/%g %s %x %m %d %{yt} %*f" \ +# -i " PERMSSN * UID*GID *" \ +# -i "----------*" \ +# -i " Total * file* ???.*%*" \ +#launch ".tar" "tar tvf" \ +# -f "%a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %s %y-%m-%d %t %*f" \ +# -f "%a %l %u %g %s %m %d %{yt} %*f" \ +# -f "%10a %u/%g %s %m %d %t %y %*f" \ +# -f "%9a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %m %d %t %y %*f" +#launch ".tar.Z" "zcat %C|tar tvf -" \ +# -f "%a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %s %y-%m-%d %t %*f" \ +# -f "%a %l %u %g %s %m %d %{yt} %*f" \ +# -f "%10a %u/%g %s %m %d %t %y %*f" \ +# -f "%9a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %m %d %t %y %*f" +#launch ".tar.gz" "gzip -cd %C|tar tvf -" \ +# -f "%a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %s %y-%m-%d %t %*f" \ +# -f "%a %l %u %g %s %m %d %{yt} %*f" \ +# -f "%10a %u/%g %s %m %d %t %y %*f" \ +# -f "%9a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %m %d %t %y %*f" +#launch ".tar.bz2" "bzip2 -cd %C|tar tvf -" \ +# -f "%a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %s %y-%m-%d %t %*f" \ +# -f "%a %l %u %g %s %m %d %{yt} %*f" \ +# -f "%10a %u/%g %s %m %d %t %y %*f" \ +# -f "%9a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %m %d %t %y %*f" +#launch ".taZ" "zcat %C|tar tvf -" \ +# -f "%a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %s %y-%m-%d %t %*f" \ +# -f "%a %l %u %g %s %m %d %{yt} %*f" \ +# -f "%10a %u/%g %s %m %d %t %y %*f" \ +# -f "%9a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %m %d %t %y %*f" +#launch ".taz" "gzip -cd %C|tar tvf -" \ +# -f "%a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %s %y-%m-%d %t %*f" \ +# -f "%a %l %u %g %s %m %d %{yt} %*f" \ +# -f "%10a %u/%g %s %m %d %t %y %*f" \ +# -f "%9a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %m %d %t %y %*f" +#launch ".tgz" "gzip -cd %C|tar tvf -" \ +# -f "%a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %s %y-%m-%d %t %*f" \ +# -f "%a %l %u %g %s %m %d %{yt} %*f" \ +# -f "%10a %u/%g %s %m %d %t %y %*f" \ +# -f "%9a %u/%g %s %m %d %t %y %*f" \ +# -f "%a %u/%g %m %d %t %y %*f" +#(Examples) +launch ".zip" "unzip -lqq" " %s %m-%d-%y %t %*f" +#launch ".zoo" "zoo lq" " %s %x %x %d %m %y %t %*f" +#launch ".rar" "unrar v" \ +# -f " %*f\n%s %x %x %d-%m-%y %t %a" \ +# -i "UNRAR *" \ +# -i "RAR *" \ +# -i "Shareware version *" \ +# -i "Verifying authenticity *" \ +# -i "Solid archive *" \ +# -i "Archive *" \ +# -i "Pathname/Comment" \ +# -i "Size * Packed *" \ +# -i "----------*" \ +# -i "* * * ??%" \ +# -i "Old style *" \ +# -i "Archive *.rar" \ +# -i "created at ??:??:?? *" \ +# -i "by * *" \ +# -i "" +launch ".Z" "zcat %C|$PAGER" +launch ".gz" "gzip -cd %C|$PAGER" +launch ".bz2" "bzip2 -cd %C|$PAGER" + +# examples for MS-DOS +#launch ".lzh" "lha v %S" % +# -f "%*f\n%s %x %x %y-%m-%d %t %a" % +# -f "%1x %12f %s %x %x %y-%m-%d %t %a" % +# -i "Listing of archive : *" % +# -i " Name Original *" % +# -i "--------------*" % +# -i "* files * ???.?%%%% ??-??-?? ??:??:??" % +# -i "" +#launch ".tar.Z" "gzip -cd %S|tar tvf -" % +# -f "%a %u/%g %s %m %d %t %y %*f" % +# -f "%a %u/%g %s %y-%m-%d %t %*f" % +# -f "%a %u/%g %s %m %d %y %t %*f" % +#launch ".tar.gz" "gzip -cd %S|tar tvf -" % +# -f "%a %u/%g %s %m %d %t %y %*f" % +# -f "%a %u/%g %s %y-%m-%d %t %*f" % +# -f "%a %u/%g %s %m %d %y %t %*f" % +#launch ".tar.bz2" "bzip2 -cd %S|tar tvf -" % +# -f "%a %u/%g %s %m %d %t %y %*f" % +# -f "%a %u/%g %s %y-%m-%d %t %*f" % +# -f "%a %u/%g %s %m %d %y %t %*f" % +#launch ".taz" "gzip -cd %S|tar tvf -" % +# -f "%a %u/%g %s %m %d %t %y %*f" % +# -f "%a %u/%g %s %y-%m-%d %t %*f" % +# -f "%a %u/%g %s %m %d %y %t %*f" % +#launch ".tgz" "gzip -cd %S|tar tvf -" % +# -f "%a %u/%g %s %m %d %t %y %*f" % +# -f "%a %u/%g %s %y-%m-%d %t %*f" % +# -f "%a %u/%g %s %m %d %y %t %*f" % +#launch ".zip" "unzip -lqq %S" " %s %y-%m-%d %t %*f" +#launch ".zip" "pkunzip -vb %S" " %s %x %x %x %y-%m-%d %t %*f" 14 2 + +# +# Debian package settings +launch ".deb" "ar p %C data.tar.gz|gzip -dc|tar tvf - "\ + "%a %u/%g %s %y-%m-%d %t %f" +launch ".rpm" "rpm2cpio %C|cpio -tv" "%a %x %u %g %s %m %d %y %f" + + +# archiver definition +#(Default) +# 20201118 bkw: uncommented these +arch ".lzh" "lha aq %C %TA" "lha xq %C %TA" +arch ".tar" "tar cf %C %T" "tar xf %C %TA" +arch ".tar.Z" "tar cf - %T|compress -c > %C" "zcat %C|tar xf - %TA" +arch ".tar.gz" "tar cf - %T|gzip -c > %C" "gzip -cd %C|tar xf - %TA" +arch ".tar.bz2" \ + "tar cf - %T|bzip2 -c > %C" "bzip2 -cd %C|tar xf - %TA" +arch ".taZ" "tar cf - %T|compress -c > %C" "zcat %C|tar xf - %TA" +arch ".taz" "tar cf - %T|gzip -c > %C" "gzip -cd %C|tar xf - %TA" +arch ".tgz" "tar cf - %T|gzip -c > %C" "gzip -cd %C|tar xf - %TA" +#(Examples) +arch ".zip" "zip -q %C %TA" "unzip -q %C %TA" +arch ".zoo" "zoo aq %C %TA" "zoo xq %C %TA" +arch ".rar" "rar a -inul %C %TA" "unrar x -inul %C %TA" + +# examples for MS-DOS +#arch ".lzh" "lha a %S %TA" "lha x %S %TA" +#arch ".tar.Z" "tar cf - %T|compress -c > %C" "gzip -cd %S|tar xf - %TA" +#arch ".tar.gz" "tar cf - %T|gzip -c > %C" "gzip -cd %S|tar xf - %TA" +#arch ".tar.bz2" % +# "tar cf - %T|bzip2 -c > %C" "bzip2 -cd %S|tar xf - %TA" +#arch ".taz" "tar cf - %T|compress -c > %C" "gzip -cd %S|tar xf - %TA" +#arch ".tgz" "tar cf - %T|gzip -c > %C" "gzip -cd %S|tar xf - %TA" +#arch ".zip" "pkzip %S %TA" "pkunzip %S %TA" + +# +# Debian package settings +arch ".deb" "clear; echo ERROR; false"\ + "ar p %C data.tar.gz|gzip -dc|tar -xf - %TA" +arch ".rpm" "clear; echo ERROR; false" "rpm2cpio %C|cpio -id %TA" + +# key bind definition +#(Examples) +#bind 'I' "dir -d %C" +#bind 'g' "gzip %C%K" WARNING_BELL +#bind 'G' "gzip -d %C%K" WARNING_BELL +#bind 'R' "grep %R %C" +#bind '{' ROLL_UP +#bind '}' ROLL_DOWN +#bind '~' "cd ~%N%K" +#bind 'F1' "man fd%N%K" :Manual + +# function definition +#(Example1) +#rename() { +# MARK_ALL 0 +# MARK_FIND $1 +## RENAME_FILE $2 +# evalmacro mv %M $2 +#} +# +#(Example2: used in archiver definition) +#maketaz() { +# evalmacro tar cf %X.tar %T +# evalmacro $1 %X.tar +# evalmacro mv %X.tar.$2 %X.$3 +#} +# +#(Example3: ftp browsing) +#getftp() { +# FHOST=$1 +# FPATH= +# browse -@ - <<'EOF0' +# 'ftp -n $FHOST <<-EOF +# user ftp `whoami`@`hostname` +# dir $FPATH +# quit +# EOF' +# -f "%a %l %u %g %s %m %d %{yt} %*f" +# -i "total *" +# -e "Not connected." +# -e "Login incorrect." +# -e "Login failed." +# -p 'FPATH=$1; while [ "$#" -gt 1 ]; do shift; FPATH=$1/$FPATH; done' +# -d loop +# +# 'dir=`readline "Dir: "` && [ -d "$dir" ] \ +# && yesno "copy \"$FPATH\" to \"$dir\" ?" \ +# && ftp -n $FHOST <<-EOF \ +# && echo "copy \"$FPATH\" to \"$dir\"." %K \ +# || echo canceled. +# user ftp `whoami`@`hostname` +# get $FPATH $dir/${FPATH##*/} +# quit +# EOF' +#EOF0 +#} + +# MS-DOS drive definition +#(Example) +#setdrv B "/dev/rfd00a" 2, 18, 80 + +# alias definition +#(Example) +#alias dir="ls -laF" + +# keymap definition +#(Example) +#keymap DEL "\033[3~" + +# common keycode settings for xterm and kterm + xtermkey() + { + keymap HOME "\033OH" + keymap END "\033OF" + #keymap INS "\033[2~" + #keymap DEL "\033[3~" + keymap BS "\177" + #keymap PPAGE "\033[5~" + #keymap NPAGE "\033[6~" + #keymap RET "\033OM" + keymap F5 "\033[15~" + keymap F6 "\033[17~" + keymap F7 "\033[18~" + keymap F8 "\033[19~" + keymap F9 "\033[20~" + keymap F10 "\033[21~" + keymap F11 "\033[23~" + keymap F12 "\033[24~" + keymap PLUS "\033Ok" + keymap MINUS "\033Om" + keymap ASTER "\033Oj" + keymap SLASH "\033Oo" + } + +# keycode settings for various terminals + case $TERM in + linux) + LANGUAGE=eng + ;; + xterm) + LANGUAGE=eng + keymap F1 "\033OP" + keymap F2 "\033OQ" + keymap F3 "\033OR" + keymap F4 "\033OS" + xtermkey + ;; + kterm) + keymap F1 "\033[11~" + keymap F2 "\033[12~" + keymap F3 "\033[13~" + keymap F4 "\033[14~" + xtermkey + ;; + esac + +unset xtermkey + +# for site specific settings +source /etc/fdclone/fd2rc.siteconfig + diff --git a/system/fdclone/fdclone.SlackBuild b/system/fdclone/fdclone.SlackBuild new file mode 100644 index 0000000000..5eb5e8302a --- /dev/null +++ b/system/fdclone/fdclone.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh + +# Slackware build script for fdclone + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# This build script owes a debt to the Debian fdclone build +# script. Unlike the Debian build though, I install the binary & man +# pages as "fdclone", not "fd", because SBo already has an "fd". I +# also don't see the point of the stub fdsh man page. + +PRGNAM=fdclone +SRCNAM=FD +VERSION=${VERSION:-3.01j} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION +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 {} \+ + +# Patches from Debian. Not going to apply the one that stops the +# Makefile from stripping the binary, since that's what we want. +patch -p1 < $CWD/01_previous_changes.patch +patch -p1 < $CWD/30_makefilein_setting.patch + +# Set the default pager & editor to things that actually exist on +# Slackware. The user's EDITOR and PAGER will override these, or they +# can be set system-wide by the admin, in the config file. +FDPAGER=${FDPAGER:-less} ; FDPAGER=$( which $FDPAGER ) +FDEDITOR=${FDEDITOR:-vim} ; FDEDITOR=$( which $FDEDITOR ) + +sed -i -e "s,/usr/bin/pager,$FDPAGER," \ + -e "s,/usr/bin/editor,$FDEDITOR," \ + fd.h + +make config +make CFLAGS="$SLKCFLAGS" \ + PREFIX=/usr \ + CONFDIR=/etc/$PRGNAM + +# make install fails to create this: +mkdir -p $PKG/usr/man/man1 + +make install \ + PREFIX=$PKG/usr \ + DATADIR=$PKG/usr/share/$PRGNAM \ + MANDIR=$PKG/usr/man/man1 \ + EMANDIR=$PKG/usr/man/man1 \ + JMANDIR=$PKG/usr/man/ja/man1 \ + JCATDIR=$PKG/usr/man/ja/man1 \ + DEFRC=$PKG/etc/$PRGNAM/fd2rc + +# Rename to avoid conflict with system/fd +rename /fd /$PRGNAM \ + $PKG/usr/bin/fd \ + $PKG/usr/man/man1/fd.1 \ + $PKG/usr/man/ja/man1/fd.1 + +# De-hardlinkify +rm -f $PKG/usr/bin/fdsh +ln -s $PRGNAM $PKG/usr/bin/fdsh +rm -f $PKG/usr/man/man1/fdsh.1 $PKG/usr/man/ja/man1/fdsh.1 +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 $PKG/usr/man/ja/man1/$PRGNAM.1 +ln -s $PRGNAM.1.gz $PKG/usr/man/man1/fdsh.1.gz +ln -s $PRGNAM.1.gz $PKG/usr/man/ja/man1/fdsh.1.gz + +# Don't install fd2rc as a .new config, since it sources +# fd2rc.siteconfig, which can override anything in fd2rc, +# and the comments at the top explain this clearly. +mkdir -p $PKG/etc/$PRGNAM +cat $CWD/fd2rc > $PKG/etc/$PRGNAM/fd2rc +echo "# fd2rc.siteconfig - see fd2rc for options you can use here" > \ + $PKG/etc/$PRGNAM/fd2rc.siteconfig.new + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a FAQ* HISTORY* LICENSES* README* TECHKNOW* $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:-tgz} diff --git a/system/fdclone/fdclone.info b/system/fdclone/fdclone.info new file mode 100644 index 0000000000..7172c22de0 --- /dev/null +++ b/system/fdclone/fdclone.info @@ -0,0 +1,10 @@ +PRGNAM="fdclone" +VERSION="3.01j" +HOMEPAGE="http://hp.vector.co.jp/authors/VA012337/soft/fd/" +DOWNLOAD="http://hp.vector.co.jp/authors/VA012337/soft/fd/FD-3.01j.tar.gz" +MD5SUM="81f4b5a2aa50afac8c1677d34a646a7e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/fdclone/slack-desc b/system/fdclone/slack-desc new file mode 100644 index 0000000000..0a69b2b38e --- /dev/null +++ b/system/fdclone/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------------------------------------------------------| +fdclone: fdclone (two-pane textmode file manager) +fdclone: +fdclone: FDclone is a file & directory maintenance tool for UNIX-based OSes. It +fdclone: is a clone of "FD" for MS-DOS, made by Mr. A.Idei in 1989. +fdclone: +fdclone: fdclone has excellent Japanese language UI, documentation, and +fdclone: character encoding support, since it originates in Japan. +fdclone: +fdclone: +fdclone: +fdclone: diff --git a/system/fdupes/fdupes-1.51-destdir.patch b/system/fdupes/fdupes-1.51-destdir.patch deleted file mode 100644 index e2fd8b2fe1..0000000000 --- a/system/fdupes/fdupes-1.51-destdir.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur fdupes-1.51.orig/Makefile fdupes-1.51/Makefile ---- fdupes-1.51.orig/Makefile 2013-04-20 12:51:58.000000000 -0500 -+++ fdupes-1.51/Makefile 2013-07-16 09:22:30.169197997 -0500 -@@ -46,6 +46,8 @@ - # - PROGRAM_NAME=fdupes - -+DESTDIR = -+ - # - # BIN_DIR indicates directory where program is to be installed. - # Suggested value is "$(PREFIX)/bin" -@@ -103,12 +105,12 @@ - $(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES) - - installdirs: -- test -d $(BIN_DIR) || $(MKDIR) $(BIN_DIR) -- test -d $(MAN_DIR) || $(MKDIR) $(MAN_DIR) -+ test -d $(DESTDIR)$(BIN_DIR) || $(MKDIR) $(DESTDIR)$(BIN_DIR) -+ test -d $(DESTDIR)$(MAN_DIR) || $(MKDIR) $(DESTDIR)$(MAN_DIR) - - install: fdupes installdirs -- $(INSTALL_PROGRAM) fdupes $(BIN_DIR)/$(PROGRAM_NAME) -- $(INSTALL_DATA) fdupes.1 $(MAN_DIR)/$(PROGRAM_NAME).$(MAN_EXT) -+ $(INSTALL_PROGRAM) fdupes $(DESTDIR)$(BIN_DIR)/$(PROGRAM_NAME) -+ $(INSTALL_DATA) fdupes.1 $(DESTDIR)$(MAN_DIR)/$(PROGRAM_NAME).$(MAN_EXT) - - clean: - $(RM) $(OBJECT_FILES) diff --git a/system/fdupes/fdupes-makefile.patch b/system/fdupes/fdupes-makefile.patch new file mode 100644 index 0000000000..9d3ff37342 --- /dev/null +++ b/system/fdupes/fdupes-makefile.patch @@ -0,0 +1,24 @@ +Index: Makefile +=================================================================== +--- Makefile.orig 2016-08-21 06:54:46.000000000 +0200 ++++ Makefile 2016-11-04 13:46:21.037423459 +0100 +@@ -11,7 +11,7 @@ + # determination of the actual installation directories. + # Suggested values are "/usr/local", "/usr", "/pkgs/fdupes-$(VERSION)" + # +-PREFIX = /usr/local ++PREFIX = /usr + + # + # When compiling for 32-bit systems, FILEOFFSET_64BIT must be enabled +--- Makefile.orig 2019-01-31 06:02:58.000000000 +0200 ++++ Makefile 2019-01-31 06:04:24.000000000 +0200 +@@ -49,7 +49,7 @@ + # MAN_DIR indicates directory where the fdupes man page is to be + # installed. Suggested value is "$(PREFIX)/man/man1" + # +-MAN_BASE_DIR = $(PREFIX)/share/man ++MAN_BASE_DIR = $(PREFIX)/man + MAN_DIR = $(MAN_BASE_DIR)/man1 + MAN_EXT = 1 + diff --git a/system/fdupes/fdupes.SlackBuild b/system/fdupes/fdupes.SlackBuild index c157299c84..773d032db6 100644 --- a/system/fdupes/fdupes.SlackBuild +++ b/system/fdupes/fdupes.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2008-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # Copyright 2013-2014 LukenShiro, Italy - +# Copyright 2019 yukoff, Chernihiv, Ukraine # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -13,7 +13,7 @@ # 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 +# 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, @@ -27,15 +27,16 @@ # 17/12/2008 - Original script. # 28/05/2009 - Updated for Slackware64 and general tidy up. # 19/06/2011 - Updated to version 1.50-PR2 +# 30/01/2019 - Updated to version 1.6.1, i486 -> i586 PRGNAM=fdupes -VERSION=${VERSION:-1.51} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.6.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -46,8 +47,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -68,8 +69,10 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar -xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$PRGNAM-$VERSION +tar -xvf $CWD/$PRGNAM-$VERSION.tar.?z* \ + || tar -xvf $CWD/v$VERSION.tar.?z* \ + || tar -xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -77,8 +80,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 {} \; -# apply a patch by hobbes1069<at>gmail<dot>com for DESTDIR (issue #29) -patch -p1 < $CWD/fdupes-1.51-destdir.patch +# patch Makefile for PREFIX and MAN_BASE_DIR +patch -p0 < $CWD/fdupes-makefile.patch make install DESTDIR=$PKG PREFIX=/usr COMPILER_OPTIONS="$SLKCFLAGS" diff --git a/system/fdupes/fdupes.info b/system/fdupes/fdupes.info index eefa9daeb7..e6952e9d1e 100644 --- a/system/fdupes/fdupes.info +++ b/system/fdupes/fdupes.info @@ -1,8 +1,8 @@ PRGNAM="fdupes" -VERSION="1.51" +VERSION="1.6.1" HOMEPAGE="https://github.com/adrianlopezroche/fdupes" -DOWNLOAD="https://github.com/adrianlopezroche/fdupes/archive/fdupes-1.51.tar.gz" -MD5SUM="cc90047dea9f1e0a849c3c1a6e8b2d68" +DOWNLOAD="https://github.com/adrianlopezroche/fdupes/archive/v1.6.1/fdupes-1.6.1.tar.gz" +MD5SUM="4fc41681fb506e518a40d610fec50aea" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/fdupes/slack-desc b/system/fdupes/slack-desc index 15e26f051a..13d5c22a0e 100644 --- a/system/fdupes/slack-desc +++ b/system/fdupes/slack-desc @@ -11,7 +11,7 @@ fdupes: fdupes: FDUPES is a program for identifying or deleting duplicate files fdupes: residing within specified directories. fdupes: -fdupes: Homepage: http://code.google.com/p/fdupes/ +fdupes: Homepage: https://github.com/adrianlopezroche/fdupes fdupes: fdupes: fdupes: diff --git a/system/fence-agents/README b/system/fence-agents/README index e60449bac2..6ae20b9e8d 100644 --- a/system/fence-agents/README +++ b/system/fence-agents/README @@ -5,5 +5,5 @@ computers from destroying data on shared storage. Their aim is to isolate a corrupted computer, using one of three methods: Power / Network / Configuration. -You might also want to install corosync, pacemaker, resource-agents, crmsh, -fence-agents and eventually cluster-glue. +You might also want to install cluster-glue, heartbeat, resource-agents, +fence-agents. diff --git a/system/fence-agents/fence-agents.SlackBuild b/system/fence-agents/fence-agents.SlackBuild index 61d4f715a0..13cc51c804 100644 --- a/system/fence-agents/fence-agents.SlackBuild +++ b/system/fence-agents/fence-agents.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fence-agents -VERSION=${VERSION:-4.2.1} +VERSION=${VERSION:-4.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/fence-agents/fence-agents.info b/system/fence-agents/fence-agents.info index 59ac045edf..6c46e6d631 100644 --- a/system/fence-agents/fence-agents.info +++ b/system/fence-agents/fence-agents.info @@ -1,10 +1,10 @@ PRGNAM="fence-agents" -VERSION="4.2.1" +VERSION="4.5.2" HOMEPAGE="https://github.com/ClusterLabs/fence-agents" -DOWNLOAD="https://github.com/ClusterLabs/fence-agents/archive/v4.2.1/fence-agents-4.2.1.tar.gz" -MD5SUM="2c7ad8aaf1a47154a6e6d53b40c15721" +DOWNLOAD="https://github.com/ClusterLabs/fence-agents/archive/v4.5.2/fence-agents-4.5.2.tar.gz" +MD5SUM="eb8c96a87c529b0c30a7524ea86433e7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="corosync pacemaker pexpect python-requests" +REQUIRES="pexpect ptyprocess python-requests" MAINTAINER="Pierre-Philipp Braun" EMAIL="pbraun@nethence.com" diff --git a/system/fence-agents/slack-desc b/system/fence-agents/slack-desc index fe6dca19bc..826d0e1000 100644 --- a/system/fence-agents/slack-desc +++ b/system/fence-agents/slack-desc @@ -13,7 +13,7 @@ fence-agents: prevent computers from destroying data on shared storage. Their fence-agents: aim is to isolate a corrupted computer, using one of three methods: fence-agents: Power / Network / Configuration. fence-agents: -fence-agents: You might also want to install corosync, pacemaker, resource-agents, -fence-agents: crmsh, fence-agents and eventually cluster-glue. +fence-agents: You might also want to install cluster-glue, heartbeat, +fence-agents: resource-agents, fence-agents. fence-agents: fence-agents: diff --git a/system/filerunner/README b/system/filerunner/README new file mode 100644 index 0000000000..13cd824d28 --- /dev/null +++ b/system/filerunner/README @@ -0,0 +1,12 @@ +filerunner (two-pane graphical file manager) + +FileRunner is a very configurable two-pane file manager for Unix and +Windows systems. It is simple and efficient and has a built-in FTP/SFTP +client. + +FileRunner's config files can be found in ~/.config/.fr. + +Note: the FileRunner executable is normally called /usr/bin/fr. I've +renamed it to /usr/bin/filerunner, since there's already a system/fr +package that installs a /usr/bin/fr. If system/fr is not installed, +you'll get a /usr/bin/fr symlink to filerunner. diff --git a/system/filerunner/doinst.sh b/system/filerunner/doinst.sh new file mode 100644 index 0000000000..f05aaf46fc --- /dev/null +++ b/system/filerunner/doinst.sh @@ -0,0 +1,14 @@ +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 + +# If there's no fr link, take over: +if [ ! -r usr/bin/fr ]; then + ( cd usr/bin ; ln -sf filerunner fr ) +fi diff --git a/system/filerunner/filerunner.SlackBuild b/system/filerunner/filerunner.SlackBuild new file mode 100644 index 0000000000..365286bdc0 --- /dev/null +++ b/system/filerunner/filerunner.SlackBuild @@ -0,0 +1,114 @@ +#!/bin/sh + +# Slackware build script for filerunner + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# Upstream's official RPM release claims to be noarch, but it's a dirty +# lie: it includes libinotify1.4.1.so binaries[*] for various arches. So +# does the source, but we're not trusting binaries that were probably +# built on Red Hat. The source for the prebuilt binaries is included, +# so this script compiles it instead. + +# [*] It breaks FHS and Slackware standards by installing arch-dependent +# files (shared libs) in /usr/share, too. But I'm going to leave it +# that way. + +PRGNAM=filerunner +VERSION=${VERSION:-20.05.02.17} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=fr + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +# called twice, make it a func +fixperms() { + 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 {} \+ +} + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $PRGNAM +fixperms + +# DO NOT use precompiled binaries! +rm -rf packages/inotify/* + +# Use tcl's idea of our architecture, since that's what fr will use +# to locate the inotify tcl extension. +TCLARCH="$( echo 'puts $::tcl_platform(machine)' | tclsh )" +mkdir -p packages/inotify/$TCLARCH + +# Compile the library that prevents this from being a noarch package: +cd Makefiles +LIBNAM=tcl-inotify +LIBVER="$( echo $LIBNAM-*.tar.gz | sed 's,.*-\([0-9.]*\)\.tar.gz,\1,' )" +tar xvf $LIBNAM-$LIBVER.tar.gz +fixperms + +cd $LIBNAM-$LIBVER +./configure && make + +# Install it where fr INSTALL script expects to find it. +install -s libinotify$LIBVER.so \ + $TMP/$PRGNAM/packages/inotify/$TCLARCH + +# Now we can install the main package. +cd - +DESTDIR=$PKG \ +DOCS=/usr/doc/$PRGNAM-$VERSION \ + ./INSTALL -nogui + +# Make this symlink so fr won't try to do it at runtime (and fail, if +# not running as root). +( cd $PKG/usr/share/$PRGNAM/packages/inotify + ln -s $TCLARCH/libinotify$LIBVER.so . ) + +# We have a slight conflict with system/fr, so: +mv $PKG/usr/bin/$SRCNAM $PKG/usr/bin/$PRGNAM +sed -i "/^Exec/s|$SRCNAM|$PRGNAM|" $PKG/usr/share/applications/$PRGNAM.desktop + +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:-tgz} diff --git a/system/filerunner/filerunner.info b/system/filerunner/filerunner.info new file mode 100644 index 0000000000..1304749807 --- /dev/null +++ b/system/filerunner/filerunner.info @@ -0,0 +1,10 @@ +PRGNAM="filerunner" +VERSION="20.05.02.17" +HOMEPAGE="https://sourceforge.net/projects/filerunner/" +DOWNLOAD="https://downloads.sourceforge.net/project/filerunner/release-20.05.02.17/fr-20.05.02.17.tar.gz" +MD5SUM="a8787d750f729c8487e44e16075aa671" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/filerunner/slack-desc b/system/filerunner/slack-desc new file mode 100644 index 0000000000..c40867c9a6 --- /dev/null +++ b/system/filerunner/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------------------------------------------------------| +filerunner: filerunner (two-pane graphical file manager) +filerunner: +filerunner: FileRunner is a very configurable two-pane file manager for Unix +filerunner: and Windows systems. It is simple and efficient and has a built-in +filerunner: FTP/SFTP client. +filerunner: +filerunner: +filerunner: +filerunner: +filerunner: +filerunner: diff --git a/system/fio/fio.SlackBuild b/system/fio/fio.SlackBuild index 30f7dc1929..3e923213c6 100644 --- a/system/fio/fio.SlackBuild +++ b/system/fio/fio.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for fio # Copyright 2012 Binh Nguyen <binhvng@gmail.com> -# Copyright 2015-2018 Brenton Earl <brent@exitstatusone.com> +# Copyright 2015-2020 Brenton Earl <brent@exitstatusone.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fio -VERSION=${VERSION:-3.11} +VERSION=${VERSION:-3.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/fio/fio.info b/system/fio/fio.info index a19c7c48d9..9fec576b28 100644 --- a/system/fio/fio.info +++ b/system/fio/fio.info @@ -1,8 +1,8 @@ PRGNAM="fio" -VERSION="3.11" +VERSION="3.23" HOMEPAGE="http://git.kernel.dk/cgit/fio/" -DOWNLOAD="http://brick.kernel.dk/snaps/fio-3.11.tar.gz" -MD5SUM="c0f3941df6f3f1c548fa131e0f9fefad" +DOWNLOAD="http://brick.kernel.dk/snaps/fio-3.23.tar.gz" +MD5SUM="497f8bad953723a8c4c46f2a58a13b24" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/firejail/firejail.SlackBuild b/system/firejail/firejail.SlackBuild index a4a0cab7b9..d4779d311d 100644 --- a/system/firejail/firejail.SlackBuild +++ b/system/firejail/firejail.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for firejail # Copyright 2015 mwgg -# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=firejail -VERSION=${VERSION:-0.9.56} +VERSION=${VERSION:-0.9.64.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -88,6 +88,8 @@ make install 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 +sed -i "s|whitelist /usr/share/doc|#whitelist /usr/share/doc|" $PKG/etc/firejail/firefox.profile + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/firejail/firejail.info b/system/firejail/firejail.info index b443f7b216..a13f37b3ae 100644 --- a/system/firejail/firejail.info +++ b/system/firejail/firejail.info @@ -1,8 +1,8 @@ PRGNAM="firejail" -VERSION="0.9.56" +VERSION="0.9.64.4" HOMEPAGE="https://firejail.wordpress.com/" -DOWNLOAD="https://sourceforge.net/projects/firejail/files/firejail/firejail-0.9.56.tar.xz" -MD5SUM="d10f8d7af2193334dc7e819ecaf1b791" +DOWNLOAD="https://sourceforge.net/projects/firejail/files/firejail/firejail-0.9.64.4.tar.xz" +MD5SUM="e3be55266472dc8ac373c9fcfba4f9f9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/firetools/firetools.SlackBuild b/system/firetools/firetools.SlackBuild index b3fd648bde..f5c930d902 100644 --- a/system/firetools/firetools.SlackBuild +++ b/system/firetools/firetools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for firetools -# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=firetools -VERSION=${VERSION:-0.9.52} +VERSION=${VERSION:-0.9.64} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --with-qmake=/usr/lib${LIBDIRSUFFIX}/qt5/bin/qmake \ --build=$ARCH-slackware-linux sed -i "s|share/man|man|g" Makefile diff --git a/system/firetools/firetools.info b/system/firetools/firetools.info index c1dcee70a8..04d18c6f79 100644 --- a/system/firetools/firetools.info +++ b/system/firetools/firetools.info @@ -1,10 +1,10 @@ PRGNAM="firetools" -VERSION="0.9.52" +VERSION="0.9.64" HOMEPAGE="https://l3net.wordpress.com/projects/firejail/#firetools" -DOWNLOAD="https://sourceforge.net/projects/firejail/files/firetools/firetools-0.9.52.tar.xz" -MD5SUM="5c6dd64066d76b72cdae191330b42462" +DOWNLOAD="https://sourceforge.net/projects/firejail/files/firetools/firetools-0.9.64.tar.xz" +MD5SUM="a95af117c8bd1c78a67de450a8ecb97a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="firejail" +REQUIRES="firejail qt5" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/fish/README b/system/fish/README index 9b00838a7e..00f5c35adf 100644 --- a/system/fish/README +++ b/system/fish/README @@ -1,15 +1,16 @@ fish (Friendly Interactive Shell) -fish is a user friendly command line shell for UNIX-like systems. -fish includes case insensitive completions, a multiline editing -system, a new and simplified key binding system, and a large number -of command specific completions. +fish is a user friendly command line shell for UNIX-like systems. fish +includes case insensitive completions, a multiline editing system, a new +and simplified key binding system, and a large number of command +specific completions. -This package will potentially conflict with the /usr/games/fish -binary from the y/bsdgames package. In a stock installation with -default PATH ordering, /usr/bin should be checked before /usr/games, -so it shouldn't be an issue, but we thought it was worth noting -just in case. +This package will potentially conflict with the /usr/games/fish binary +from the y/bsdgames package. In a stock installation with default PATH +ordering, /usr/bin should be checked before /usr/games, so it shouldn't +be an issue, but we thought it was worth noting just in case. + +Optional packages (also found at slackbuilds.org): sphinx libedit NOTES: @@ -29,3 +30,7 @@ SlackBuild or typically (as normal user or root): $ fish $ source /etc/profile.d/man-db.sh $ fish_update_completions + +If you are upgrading from version 3.0.0 or before, please also review +the release notes for 3.1.1, 3.1.0 and 3.1b1 at +https://fishshell.com/release_notes.html. diff --git a/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild index 462266ba26..909ee515e2 100644 --- a/system/fish/fish.SlackBuild +++ b/system/fish/fish.SlackBuild @@ -1,9 +1,10 @@ #!/bin/sh -# -# Slackware build script for the fish shell. -# + +# Slackware build script for fish + +# Copyright 2020 Donald Cooley, South Haven, Indiana USA # Copyright 2015-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. -# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> +# Copyright 2009 Pierre Cazenave # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -12,19 +13,19 @@ # 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. +# 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. PRGNAM=fish -VERSION=${VERSION:-3.0.0} +VERSION=${VERSION:-3.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,33 +71,38 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Let's not clobber the config +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/share/$PRGNAM +mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/share/$PRGNAM + +# Let's not clobber the old config mv $PKG/etc/fish/config.fish $PKG/etc/fish/config.fish.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/man/man1 mv $PKG/usr/share/$PRGNAM/man/man1/* $PKG/usr/man/man1 -rm -rf $PKG/usr/share/fish/man/ +rm -rf $PKG/usr/share/man/ 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 # Remove manual pages that overwrites coreutils' man pages rm -f $PKG/usr/man/man1/{echo,false,pwd,test,true}.1.gz + cp CHANGELOG.md CONTRIBUTING.md COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/fish/fish.info b/system/fish/fish.info index ce00ef7526..b70ec030e0 100644 --- a/system/fish/fish.info +++ b/system/fish/fish.info @@ -1,10 +1,10 @@ PRGNAM="fish" -VERSION="3.0.0" -HOMEPAGE="http://fishshell.com/" -DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.0.0/fish-3.0.0.tar.gz" -MD5SUM="25e057795de05d0e21b600b7b7d7e812" +VERSION="3.1.2" +HOMEPAGE="https://fishshell.com/" +DOWNLOAD="https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.2.tar.gz" +MD5SUM="2e9f12a250dccb9ab0529ae6f77710a0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="man-db" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="Donald Cooley" +EMAIL="chytraeu@sdf.org" diff --git a/system/fish/slack-desc b/system/fish/slack-desc index 967da1a55f..5b7d97efd9 100644 --- a/system/fish/slack-desc +++ b/system/fish/slack-desc @@ -14,6 +14,6 @@ fish: fish includes case insensitive completions, a multiline editing fish: system, a new and simplified key binding system, and a large number fish: of command specific completions. fish: -fish: Homepage: http://fishshell.com/ +fish: Homepage: https://fishshell.com/ fish: fish: diff --git a/system/flashcards/fixes.diff b/system/flashcards/fixes.diff new file mode 100644 index 0000000000..8096bd21b4 --- /dev/null +++ b/system/flashcards/fixes.diff @@ -0,0 +1,24 @@ +diff -Naur flashcards-2.4/flashcards/configure.py flashcards-2.4.patched/flashcards/configure.py +--- flashcards-2.4/flashcards/configure.py 2012-02-06 03:32:51.000000000 -0500 ++++ flashcards-2.4.patched/flashcards/configure.py 2020-01-17 23:03:15.495097878 -0500 +@@ -29,6 +29,8 @@ + documents = os.path.join(home_path, 'Documents') + ROOT = os.path.join(documents, 'flashcards') + ++if not os.path.isdir(documents): ++ os.mkdir(documents) + if not os.path.isdir(ROOT): + os.mkdir(ROOT) + +diff -Naur flashcards-2.4/setup.py flashcards-2.4.patched/setup.py +--- flashcards-2.4/setup.py 2012-02-06 03:45:22.000000000 -0500 ++++ flashcards-2.4.patched/setup.py 2020-01-17 23:03:32.311096350 -0500 +@@ -14,7 +14,7 @@ + author_email = "luisnaranjo733@hotmail.com", + description = ("A simple command line flashcards utility, similar to physical flashcards."), + license = "GNU GPL", +- install_requires= ['argparse','configobj',], ++ install_requires= ['configobj',], + entry_points = { + 'console_scripts': ['flashcards = flashcards.flashcards:main'] + }, diff --git a/system/flashcards/flashcards.SlackBuild b/system/flashcards/flashcards.SlackBuild index 73fd70a471..16b56a16bb 100644 --- a/system/flashcards/flashcards.SlackBuild +++ b/system/flashcards/flashcards.SlackBuild @@ -69,6 +69,12 @@ 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 {} \; +# 20200117 bkw: this has apparently been broken for a LONG time. It +# complains that there's no "distribution" called argparse... but +# argparse ships with Slackware. Also, application fails to start if +# $HOME/Documents doesn't already exist. Patch fixes both issues. +patch -p1 < $CWD/fixes.diff + python setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/forkstat/forkstat.SlackBuild b/system/forkstat/forkstat.SlackBuild index e317e805ea..d071210330 100644 --- a/system/forkstat/forkstat.SlackBuild +++ b/system/forkstat/forkstat.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for forkstat. # -# Copyright 2015-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=forkstat -VERSION=${VERSION:-0.02.09} +VERSION=${VERSION:-0.02.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/forkstat/forkstat.info b/system/forkstat/forkstat.info index 29cfec96b9..86b0cb5768 100644 --- a/system/forkstat/forkstat.info +++ b/system/forkstat/forkstat.info @@ -1,10 +1,10 @@ PRGNAM="forkstat" -VERSION="0.02.09" -HOMEPAGE="http://kernel.ubuntu.com/~cking/forkstat/" -DOWNLOAD="http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-0.02.09.tar.xz" -MD5SUM="a607c768c8a6c6e8e8b30e102b4601f6" +VERSION="0.02.12" +HOMEPAGE="https://kernel.ubuntu.com/~cking/forkstat/" +DOWNLOAD="https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-0.02.12.tar.xz" +MD5SUM="cc4809b66dc2276a76370e2c9c325307" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/system/forkstat/slack-desc b/system/forkstat/slack-desc index d57f0f0e1f..6bffb3ba2b 100644 --- a/system/forkstat/slack-desc +++ b/system/forkstat/slack-desc @@ -10,7 +10,7 @@ forkstat: forkstat (process fork/exec/exit monitoring tool) forkstat: forkstat: Forkstat monitors process fork(), exec() and exit() activity. forkstat: -forkstat: Home page: http://kernel.ubuntu.com/~cking/forkstat/ +forkstat: Home page: https://kernel.ubuntu.com/~cking/forkstat/ forkstat: forkstat: forkstat: diff --git a/system/freeipmi/README b/system/freeipmi/README new file mode 100644 index 0000000000..5805f45eac --- /dev/null +++ b/system/freeipmi/README @@ -0,0 +1,10 @@ +FreeIPMI provides in-band and out-of-band IPMI software based on the +IPMI v1.5/2.0 specification. + +The IPMI specification defines a set of interfaces for platform +management. It is utilized by a wide variety of vendors for system +management on motherboards. The features of IPMI that most users will +be interested in are sensor monitoring, remote power control, +serial-over-LAN (SOL), and system debugging. The FreeIPMI tools and +libraries in this package should provide users with the ability to +access and utilize these features. diff --git a/system/freeipmi/doinst.sh b/system/freeipmi/doinst.sh new file mode 100644 index 0000000000..fe318696f2 --- /dev/null +++ b/system/freeipmi/doinst.sh @@ -0,0 +1,22 @@ + +config() { + NEW="$1" + OLD="${1%.new}" + if [ ! -r $OLD ]; + then + # If there's no config file by that name, mv it over: + mv $NEW $OLD + elif [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ]; + then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +# doinst.sh reads the list of files from ./install/conffiles at install time. +# ./install/conffiles was generated at build time/ +for cf in $(cat install/conffiles) +do + config $cf.new +done diff --git a/system/freeipmi/freeipmi.SlackBuild b/system/freeipmi/freeipmi.SlackBuild new file mode 100644 index 0000000000..eb422db3c1 --- /dev/null +++ b/system/freeipmi/freeipmi.SlackBuild @@ -0,0 +1,123 @@ +#!/bin/sh + +# Copyright 2019, Wayne Cuddy, wcuddyATgmailDOTcom +# 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. + +# +# 2019-03-30: Initial Release +# + +PRGNAM=freeipmi +VERSION=${VERSION:-1.6.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 +cd $TMP/$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 + +rm -rf $PKG/usr/share + +cd $PKG + +mkdir -p etc/rc.d +# Convert the init script to Slackware style rc scripts. +for i in etc/init.d/* +do + mv $i etc/rc.d/rc.${i##*/} + chmod 644 etc/rc.d/rc.${i##*/} +done + +rmdir etc/init.d + +# Don't clobber existing config files. +for i in $(find etc -type f) +do + mv $i $i.new + echo $i +done 1>>$PKG/install/conffiles + +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/freeipmi/freeipmi.info b/system/freeipmi/freeipmi.info new file mode 100644 index 0000000000..983ae37b23 --- /dev/null +++ b/system/freeipmi/freeipmi.info @@ -0,0 +1,10 @@ +PRGNAM="freeipmi" +VERSION="1.6.3" +HOMEPAGE="https://www.gnu.org/software/freeipmi" +DOWNLOAD="https://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.3.tar.gz" +MD5SUM="b2d97e20db9b81b460ce1b9dad5bf54e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Wayne Cuddy" +EMAIL="wcuddy@gmail.com" diff --git a/system/freeipmi/slack-desc b/system/freeipmi/slack-desc new file mode 100644 index 0000000000..3974cbf3d0 --- /dev/null +++ b/system/freeipmi/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------------------------------------------------------| +freeipmi: freeipmi (system management) +freeipmi: +freeipmi: Tools which provide in in-band and out-of-band system management via +freeipmi: the IPMI v1.5/2.0 specification. +freeipmi: +freeipmi: +freeipmi: +freeipmi: +freeipmi: +freeipmi: +freeipmi: diff --git a/system/fs-uae-arcade/README b/system/fs-uae-arcade/README deleted file mode 100644 index 3d7668c656..0000000000 --- a/system/fs-uae-arcade/README +++ /dev/null @@ -1 +0,0 @@ -FS-UAE Arcade is a fullscreen Amiga game browser for FS-UAE. diff --git a/system/fs-uae-arcade/fs-uae-arcade.SlackBuild b/system/fs-uae-arcade/fs-uae-arcade.SlackBuild deleted file mode 100644 index d8cb3185af..0000000000 --- a/system/fs-uae-arcade/fs-uae-arcade.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# SlackBuild script for "fs-uae-arcade". - -# Copyright 2013-2015 Marcel Saegebarth <marc@mos6581.de> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "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 COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=fs-uae-arcade -VERSION=${VERSION:-2.6.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -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 {} \; - -python3 setup.py build -make -make install prefix=/usr DESTDIR=$PKG - -mkdir -p $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:-tgz} diff --git a/system/fs-uae-arcade/fs-uae-arcade.info b/system/fs-uae-arcade/fs-uae-arcade.info deleted file mode 100644 index 67454b4d5c..0000000000 --- a/system/fs-uae-arcade/fs-uae-arcade.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fs-uae-arcade" -VERSION="2.6.2" -HOMEPAGE="https://fs-uae.net/" -DOWNLOAD="https://fs-uae.net/fs-uae/stable/2.6.2/fs-uae-arcade-2.6.2.tar.gz" -MD5SUM="2b99bbcb32245a36c4b73cb1d56e1d2f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-PyQt5 python3-lhafile fs-uae" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/system/fs-uae-launcher/README b/system/fs-uae-launcher/README deleted file mode 100644 index be59c8ae17..0000000000 --- a/system/fs-uae-launcher/README +++ /dev/null @@ -1 +0,0 @@ -FS-UAE Launcher is a graphical user interface for FS-UAE. diff --git a/system/fs-uae-launcher/fs-uae-launcher.SlackBuild b/system/fs-uae-launcher/fs-uae-launcher.SlackBuild deleted file mode 100644 index 7cf795a364..0000000000 --- a/system/fs-uae-launcher/fs-uae-launcher.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# SlackBuild script for "fs-uae-launcher". - -# Copyright 2013-2015 Marcel Saegebarth <marc@mos6581.de> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "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 COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=fs-uae-launcher -VERSION=${VERSION:-2.6.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -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 {} \; - -python3 setup.py build -make -make install prefix=/usr DESTDIR=$PKG - -mkdir -p $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:-tgz} diff --git a/system/fs-uae-launcher/fs-uae-launcher.info b/system/fs-uae-launcher/fs-uae-launcher.info deleted file mode 100644 index 189bc6f7f8..0000000000 --- a/system/fs-uae-launcher/fs-uae-launcher.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fs-uae-launcher" -VERSION="2.6.2" -HOMEPAGE="https://fs-uae.net/" -DOWNLOAD="https://fs-uae.net/fs-uae/stable/2.6.2/fs-uae-launcher-2.6.2.tar.gz" -MD5SUM="bde923259083a97c5ea677f4f61cb660" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3-PyQt5 python3-lhafile fs-uae" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/system/fs-uae/README b/system/fs-uae/README deleted file mode 100644 index c84fe274c5..0000000000 --- a/system/fs-uae/README +++ /dev/null @@ -1,4 +0,0 @@ -FS-UAE focuses on emulating Amiga games using the accurate emulation code -from WinUAE. It also has features to emulate a high-end Amiga with expansions. - -Note: Since version 2.3.x the FS-UAE Launcher is a separate package. diff --git a/system/fs-uae/fs-uae.info b/system/fs-uae/fs-uae.info deleted file mode 100644 index 7549ba7f85..0000000000 --- a/system/fs-uae/fs-uae.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fs-uae" -VERSION="2.8.1" -HOMEPAGE="https://fs-uae.net/" -DOWNLOAD="https://fs-uae.net/fs-uae/stable/2.8.1/fs-uae-2.8.1.tar.gz" -MD5SUM="6dd3a6edc9c08780db8b7d6002440929" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="SDL2 OpenAL libmpeg2" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/system/fswatch/slack-desc b/system/fswatch/slack-desc index 979af68994..29eecd53bf 100644 --- a/system/fswatch/slack-desc +++ b/system/fswatch/slack-desc @@ -4,7 +4,7 @@ # 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------------------------------------------------------| fswatch: fswatch (A cross-platform file change monitor with multiple backends) fswatch: @@ -12,7 +12,7 @@ fswatch: This SlackBuild implements the Linux inotify variant only. fswatch: fswatch: Homepage: https://github.com/emcrisostomo/fswatch fswatch: -fswatch: Please check the man page ( man 7 fswatch ) or browse the info page +fswatch: Please check the man page ( man 7 fswatch ) or browse the info page fswatch: ( info fswatch ) before using this tool. fswatch: fswatch: diff --git a/system/ft2demos/README b/system/ft2demos/README new file mode 100644 index 0000000000..048f6be971 --- /dev/null +++ b/system/ft2demos/README @@ -0,0 +1,26 @@ +ft2demos (freetype demos and tools) + +Set of demo programs and tools for freetype. Can be useful for testing +and debugging problems with fonts (or with freetype itself). Includes +these tools: + +ftbench - benchmark some common FreeType paths +ftchkwd - test fixed font width +ftdiff - compare font hinting modes +ftdump - simple font dumper +ftgamma - screen gamma calibration helper +ftgrid - simple glyph grid viewer +ftlint - simple font tester +ftmemchk - simple memory tester (tests FreeType's memory allocator) +ftmulti - multiple masters font viewer +ftpatchk - tests whether patented hinting is necessary +ftstring - string viewer (displays text in specified font) +fttimer - simple performance timer +ftvalid - font layout table validator +ftview - simple glyph viewer +ttdebug - a TrueType bytecode debugger + +Most of the commands have man pages. Also most of the commands show +usage info if you run them with --help (or with no arguments). + +This package is known as "freetype2-demos" on Arch and Debian systems. diff --git a/system/ft2demos/ft2demos.SlackBuild b/system/ft2demos/ft2demos.SlackBuild new file mode 100644 index 0000000000..6f4c2805c9 --- /dev/null +++ b/system/ft2demos/ft2demos.SlackBuild @@ -0,0 +1,158 @@ +#!/bin/sh + +# Slackware build script for ft2demos + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# This thing requires first building (but not installing) freetype2, +# hence all the downloads. + +# This script is heavily based on Pat Volkerding's freetype.SlackBuild: +# https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/ +# ...and Arch Linux's freetype2-demos PKGBUILD: +# https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/freetype2 + +# Note to self: keep VERSION in sync with Pat's patches/freetype. + +PRGNAM=ft2demos +VERSION=${VERSION:-2.6.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +LIBNAM=freetype + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-build +mkdir -p $PRGNAM-build +cd $PRGNAM-build +tar xvf $CWD/$LIBNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +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 {} \+ + +# Build process wants this symlink. +ln -s $LIBNAM-$VERSION ${LIBNAM}2 + +### First, build FreeType, since ft2demos needs the whole source tree. +cd $LIBNAM-$VERSION + +# Apply Pat's patches +zcat $CWD/freetype.illadvisederror.diff.gz | patch -p1 +zcat $CWD/freetype.CVE-2017-8287.diff.gz | patch -p1 + +# Enable the validators needed by the ftvalid command. Part 1 of a +# DIRTY_HACK to make ftvalid work. +sed -i '/^# *AUX_MODULES.*valid/s|^# *||' modules.cfg + +# Use Pat's build command (but no make install!) +CFLAGS="$SLKCFLAGS" \ + make setup \ + CFG="--prefix=/usr --libdir=/usr/lib${LIBDIRSUFFIX} --build=$ARCH-slackware-linux" +make + +### Now, build ft2demos. These will end up dynamically linked to the +# system libfreetype.so after package installation, *except* for +# ftvalid, which won't work with Slackware's libfreetype.so, so it +# gets statically linked with the libfreetype.a we just built. See +# DIRTY_HACK, parts 1 and 2. +cd $TMP/$PRGNAM-build/$PRGNAM-$VERSION + +# Build the extra executables +sed -i '/^ *# *EXES/s|# *||' Makefile + +# Don't try to build ftvalid yet. If we do, the resulting binary is +# useless, complains that none of its validation methods are compiled in, +# and suggests rebuilding FreeType. +sed -i '/EXES *+= *ftvalid/d' Makefile + +# Don't include RPATH in binaries (borrowed from Arch) +sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk + +# Don't have to specify CFLAGS here, it'll pick them up from the freetype +# build we just did. +make + +# DIRTY_HACK, part 2. Get the link command libtool generated for ftvalid, +# and replace freetype.so with freetype.a (the static lib). This is me +# working around libtool's "helpful" automation. Die, libtool! +echo "=== Prepare for dirty hack, put on your goggles now" +make EXES=ftvalid | tee make.out + +echo "=== ftvalid.build.cmd:" +grep '^libtool: link:' make.out | \ + cut -d: -f3- | \ + sed 's|/usr/lib[^/]*/libfreetype.so||' | \ + sed 's|\([^ *]\.libs/libfreetype.\)so|\1a|' | \ + tee ftvalid.build.cmd + +# Now run the abomination we've created. If it fails, don't let set -e +# kill the whole script (we'll just make a package without ftvalid). +sh ./ftvalid.build.cmd || echo "!!! Attempt to build ftvalid failed" + +# The semi-static ftvalid is big, but still under 1MB. Also, if you +# run ldd on it, you'll see libfreetype.so is required... this is because +# of a circular dependency with harfbuzz. It doesn't seem to cause a +# problem for ftvalid. +echo "=== Stand down from dirty hack alert, you may now remove your goggles" + +# There is no 'make install', this bit was borrowed from Arch. +mkdir -p $PKG/usr/bin +for i in bin/{f,t}t*; do + libtool --mode=install install $i $PKG/usr/bin +done +strip $PKG/usr/bin/* + +# For whatever reason, the Arch and Debian packages don't install the +# man pages. +mkdir -p $PKG/usr/man/man1 +for i in src/*.1; do + gzip -9c < $i > $PKG/usr/man/man1/$( basename $i).gz +done + +# The README is build instructions, don't bother. Instead, include our +# own README which at least lists the tools and their short descriptions. +# The ChangeLog goes back to 2000, don't need the whole damn thing. +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +head -n1000 ChangeLog > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt +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:-tgz} diff --git a/system/ft2demos/ft2demos.info b/system/ft2demos/ft2demos.info new file mode 100644 index 0000000000..50c3bc2ea5 --- /dev/null +++ b/system/ft2demos/ft2demos.info @@ -0,0 +1,16 @@ +PRGNAM="ft2demos" +VERSION="2.6.3" +HOMEPAGE="http://www.freetype.org" +DOWNLOAD="https://download-mirror.savannah.gnu.org/releases/freetype/ft2demos-2.6.3.tar.bz2 \ + https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype-2.6.3.tar.xz \ + https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.CVE-2017-8287.diff.gz \ + https://slackware.uk/slackware/slackware-14.2/patches/source/freetype/freetype.illadvisederror.diff.gz" +MD5SUM="f7c6102f29834a80456264fe4edd81d1 \ + c806890db47d8ad8887253a926377e33 \ + eea2e24cf46314d716d0668f5fdbbf08 \ + 419295091bb684f531c3ba9614fea3a0" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/ft2demos/slack-desc b/system/ft2demos/slack-desc new file mode 100644 index 0000000000..22f4cbc5e3 --- /dev/null +++ b/system/ft2demos/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------------------------------------------------------| +ft2demos: ft2demos (freetype demos and tools) +ft2demos: +ft2demos: Set of demo programs and tools for freetype. Can be useful for testing +ft2demos: and debugging problems with fonts (or with freetype itself). Includes +ft2demos: these tools: +ft2demos: +ft2demos: ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk +ft2demos: ftmulti ftpatchk ftstring fttimer ftvalid ftview ttdebug +ft2demos: +ft2demos: +ft2demos: diff --git a/system/fuse-overlayfs/README b/system/fuse-overlayfs/README new file mode 100644 index 0000000000..a9c9a2dc38 --- /dev/null +++ b/system/fuse-overlayfs/README @@ -0,0 +1,19 @@ +fuse-overlayfs + +An implementation of overlay+shiftfs in FUSE for rootless containers. + +# Limitations: +Read-only mode is not supported, so it is always required to specify an +upperdir and a workingdir. + +# Usage: + +```shell +$ fuse-overlayfs -o lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged +``` + +Specify a different UID/GID mapping: + +```shell +$ fuse-overlayfs -o uidmapping=0:10:100:100:10000:2000,gidmapping=0:10:100:100:10000:2000,lowerdir=lowerdir/a:lowerdir/b,upperdir=up,workdir=workdir merged +``` diff --git a/system/fuse-overlayfs/fuse-overlayfs.SlackBuild b/system/fuse-overlayfs/fuse-overlayfs.SlackBuild new file mode 100644 index 0000000000..b87ed95f94 --- /dev/null +++ b/system/fuse-overlayfs/fuse-overlayfs.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for fuse-overlayfs + +# Copyright 2019 Vincent Batts, Raleigh, NC, USA +# 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. + +PRGNAM=fuse-overlayfs +VERSION=${VERSION:-0.6.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +sh 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 \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 COPYING \ + $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:-tgz} diff --git a/system/fuse-overlayfs/fuse-overlayfs.info b/system/fuse-overlayfs/fuse-overlayfs.info new file mode 100644 index 0000000000..025aa493f2 --- /dev/null +++ b/system/fuse-overlayfs/fuse-overlayfs.info @@ -0,0 +1,10 @@ +PRGNAM="fuse-overlayfs" +VERSION="0.6.5" +HOMEPAGE="https://github.com/containers/fuse-overlayfs" +DOWNLOAD="https://github.com/containers/fuse-overlayfs/archive/v0.6.5/fuse-overlayfs-0.6.5.tar.gz" +MD5SUM="11b6906ae03fd83d32d20d7151e00470" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="fuse3" +MAINTAINER="Vincent Batts" +EMAIL="vbatts@hashbangbash.com" diff --git a/system/fuse-overlayfs/slack-desc b/system/fuse-overlayfs/slack-desc new file mode 100644 index 0000000000..9e932d7b80 --- /dev/null +++ b/system/fuse-overlayfs/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------------------------------------------------------| +fuse-overlayfs: fuse-overlayfs (non-root overlayfs+shiftfs) +fuse-overlayfs: +fuse-overlayfs: An implementation of overlay+shiftfs in FUSE for rootless containers +fuse-overlayfs: +fuse-overlayfs: Site: https://github.com/containers/fuse-overlayfs +fuse-overlayfs: +fuse-overlayfs: +fuse-overlayfs: +fuse-overlayfs: +fuse-overlayfs: +fuse-overlayfs: diff --git a/system/fuse3/README b/system/fuse3/README new file mode 100644 index 0000000000..fedc4c62b9 --- /dev/null +++ b/system/fuse3/README @@ -0,0 +1,15 @@ +fuse3 - Filesystem in Userspace, version 3 + +FUSE (Filesystem in Userspace) is an interface for userspace programs to +export a filesystem to the Linux kernel. The FUSE project consists of two +components: the fuse kernel module (maintained in the regular kernel +repositories) and the libfuse userspace library (maintained in this +repository). libfuse provides the reference implementation for communicating +with the FUSE kernel module. + +This ought not collide with the "fuse" package in stock slackware install. + +The package can optionally install extensive developer documentation. If this +is needed, run the SlackBuild like this: + +FUSE3_DEVDOCS=yes ./fuse3.SlackBuild diff --git a/system/fuse3/fuse3.SlackBuild b/system/fuse3/fuse3.SlackBuild new file mode 100644 index 0000000000..da4fbda772 --- /dev/null +++ b/system/fuse3/fuse3.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for fuse3 + +# Copyright 2019 Vincent Batts, Raleigh, NC, USA +# 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. + +PRGNAM=fuse3 +VERSION=${VERSION:-3.10.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +BASENAME=fuse +SUFFIX=3 + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +FUSE3_DEVDOCS=${FUSE3_DEVDOCS:-no} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $BASENAME-$VERSION +tar xvf $CWD/$BASENAME-$VERSION.tar.xz +cd $BASENAME-$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 {} \; + +meson build \ + -Dexamples=false \ + -Dudevrulesdir="/etc/udev/rules.d" \ + --prefix="/usr" \ + --mandir="/usr/man" +ninja -C build +DESTDIR=$PKG ninja -C build install +rm -rf $PKG/dev $PKG/etc/udev + +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 +if [ "$FUSE3_DEVDOCS" = "yes" ]; then + cp -a doc/ example/ $PKG/usr/doc/$PRGNAM-$VERSION +fi + +cp -a \ + README.md LICENSE LGPL2.txt GPL2.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:-tgz} diff --git a/system/fuse3/fuse3.info b/system/fuse3/fuse3.info new file mode 100644 index 0000000000..25599ccf6a --- /dev/null +++ b/system/fuse3/fuse3.info @@ -0,0 +1,10 @@ +PRGNAM="fuse3" +VERSION="3.10.1" +HOMEPAGE="https://github.com/libfuse/libfuse" +DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.10.1/fuse-3.10.1.tar.xz" +MD5SUM="e973012119e98b048307558271b5b296" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="meson" +MAINTAINER="Vincent Batts" +EMAIL="vbatts@hashbangbash.com" diff --git a/system/fuse3/slack-desc b/system/fuse3/slack-desc new file mode 100644 index 0000000000..6cd1dacca4 --- /dev/null +++ b/system/fuse3/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------------------------------------------------------| +fuse3: fuse3 (Filesystem in Userspace) +fuse3: +fuse3: FUSE is a simple interface for userspace programs to export a virtual +fuse3: filesystem to the Linux kernel. FUSE also aims to provide a secure +fuse3: method for non privileged users to create and mount their own +fuse3: filesystem implementations. +fuse3: +fuse3: Homepage: https://github.com/libfuse/libfuse +fuse3: +fuse3: +fuse3: diff --git a/system/fwupd/README b/system/fwupd/README index d7427c9344..07e8586ed7 100644 --- a/system/fwupd/README +++ b/system/fwupd/README @@ -7,4 +7,4 @@ Options (all default to false): ENABLE_UEFI: true|false - requires pygobject3-python3 python3-pillow py3cairo - https://github.com/hughsie/fwupd/blob/1.2.3/meson_options.txt + https://github.com/fwupd/fwupd/blob/1.2.13/meson_options.txt diff --git a/system/fwupd/doinst.sh b/system/fwupd/doinst.sh index d98d893e0a..835a554895 100644 --- a/system/fwupd/doinst.sh +++ b/system/fwupd/doinst.sh @@ -8,18 +8,23 @@ config() { fi } -config etc/fwupd/daemon.conf.new -if [ -e etc/fwupd/uefi.conf ] ; then - config etc/fwupd/uefi.conf.new -fi -config etc/fwupd/remotes.d/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.conf.new - -config etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new -config etc/pki/fwupd-metadata/LVFS-CA.pem.new config etc/pki/fwupd/GPG-KEY-Hughski-Limited.new +config etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware.new config etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new config etc/pki/fwupd/LVFS-CA.pem.new +config etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new +config etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new +config etc/pki/fwupd-metadata/LVFS-CA.pem.new +config etc/fwupd/remotes.d/lvfs.conf.new +config etc/fwupd/remotes.d/lvfs-testing.conf.new +config etc/fwupd/remotes.d/vendor.conf.new +config etc/fwupd/remotes.d/vendor-directory.conf.new +config etc/fwupd/remotes.d/fwupd-tests.conf.new +config etc/fwupd/daemon.conf.new +config etc/fwupd/redfish.conf.new + +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/fwupd/fwupd.SlackBuild b/system/fwupd/fwupd.SlackBuild index 92d69114f3..b7d8384306 100644 --- a/system/fwupd/fwupd.SlackBuild +++ b/system/fwupd/fwupd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fwupd -# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand +# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fwupd -VERSION=${VERSION:-1.2.3} +VERSION=${VERSION:-1.2.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -97,26 +97,25 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 $PKG/etc/fwupd/daemon.conf $PKG/etc/fwupd/daemon.conf.new -mv $PKG/etc/fwupd/redfish.conf $PKG/etc/fwupd/redfish.conf.new -mv $PKG/etc/fwupd/remotes.d/fwupd.conf $PKG/etc/fwupd/remotes.d/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/pki/fwupd/GPG-KEY-Hughski-Limited $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited.new +mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware.new +mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new +mv $PKG/etc/pki/fwupd/LVFS-CA.pem $PKG/etc/pki/fwupd/LVFS-CA.pem.new +mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new +mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new +mv $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem.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.conf $PKG/etc/fwupd/remotes.d/vendor.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/fwupd-tests.conf $PKG/etc/fwupd/remotes.d/fwupd-tests.conf.new +mv $PKG/etc/fwupd/daemon.conf $PKG/etc/fwupd/daemon.conf.new +mv $PKG/etc/fwupd/redfish.conf $PKG/etc/fwupd/redfish.conf.new if [ -e $PKG/etc/fwupd/uefi.conf ] ; then mv $PKG/etc/fwupd/uefi.conf $PKG/etc/fwupd/uefi.conf.new fi -mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata.new -mv $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service.new -mv $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem $PKG/etc/pki/fwupd-metadata/LVFS-CA.pem.new -mv $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited $PKG/etc/pki/fwupd/GPG-KEY-Hughski-Limited.new -mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware $PKG/etc/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware.new -mv $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service $PKG/etc/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service.new -mv $PKG/etc/pki/fwupd/LVFS-CA.pem $PKG/etc/pki/fwupd/LVFS-CA.pem.new - rm -rf $PKG/usr/share/installed-tests mkdir -p $PKG/usr/share/dbus-1/system-services @@ -132,5 +131,10 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +if [ -e $PKG/etc/fwupd/uefi.conf.new ] ; then + echo "" >> $PKG/install/doinst.sh + echo "config etc/fwupd/uefi.conf.new" >> $PKG/install/doinst.sh +fi + cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/fwupd/fwupd.info b/system/fwupd/fwupd.info index 4348d3f54f..97d10dab24 100644 --- a/system/fwupd/fwupd.info +++ b/system/fwupd/fwupd.info @@ -1,8 +1,8 @@ PRGNAM="fwupd" -VERSION="1.2.3" +VERSION="1.2.13" HOMEPAGE="https://www.fwupd.org" -DOWNLOAD="https://github.com/hughsie/fwupd/archive/1.2.3/fwupd-1.2.3.tar.gz" -MD5SUM="1efff93e3399ebd8c75022f4f1487586" +DOWNLOAD="https://github.com/fwupd/fwupd/archive/1.2.13/fwupd-1.2.13.tar.gz" +MD5SUM="e205c79b43f343c56b340593f4d00c9f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libxmlb libgusb efivar json-glib gcab" diff --git a/system/fzf/fzf.SlackBuild b/system/fzf/fzf.SlackBuild index f00a0d015e..ae700c1ceb 100644 --- a/system/fzf/fzf.SlackBuild +++ b/system/fzf/fzf.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fzf -# Copyright 2016-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2016-2021 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=fzf -VERSION=${VERSION:-0.17.5} +VERSION=${VERSION:-0.27.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -49,21 +49,19 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -sed -i '/glide install/d' Makefile +# build offline with our vendored dependencies +sed -i '/^BUILD_FLAGS/s/$/ -mod=vendor/' Makefile mkdir -p vendor/github.com -for DEPENDENCY in codegangsta/cli/c6af8847eb2b7b297d07c3ede98903e95e680ef9 \ - gdamore/encoding/b23993cbb6353f0e6aa98d0ee318a34728f628b9 \ - gdamore/tcell/0a0db94084dfe181108c18508ebd312f12d331fb \ - lucasb-eyer/go-colorful/c900de9dbbc73129068f5af6a823068fc5f2308c \ - Masterminds/semver/15d8430ab86497c5c0da827b748823945e1cf1e1 \ - Masterminds/vcs/6f1c6d150500e452704e9863f68c2559f58616bf \ - mattn/go-isatty/66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8 \ - mattn/go-runewidth/14207d285c6c197daabb5c9793d63e7af9ab2d50 \ - mattn/go-shellwords/02e3cf038dcea8290e44424da473dd12be796a8a \ - mitchellh/go-homedir/b8bc1bf767474819792c23f32d8286a45736f1c6 \ - go-yaml/yaml/287cf08546ab5e7e37d55a84f7ed3fd1db036de5 ; do +for DEPENDENCY in gdamore/encoding/1.0.0 \ + gdamore/tcell/1.3.0 \ + lucasb-eyer/go-colorful/1.2.0 \ + mattn/go-isatty/0.0.12 \ + mattn/go-runewidth/0.0.12 \ + mattn/go-shellwords/1.0.11 \ + rivo/uniseg/0.2.0 \ + saracen/walker/0.1.2 ; do DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)" DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)" DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)" @@ -75,9 +73,11 @@ for DEPENDENCY in codegangsta/cli/c6af8847eb2b7b297d07c3ede98903e95e680ef9 \ done mkdir -p vendor/golang.org/x -for DEPENDENCY in crypto/558b6879de74bc843225cde5686419267ff707ca \ - sys/b90f89a1e7a9c1f6b918820b3daa7f08488c8594 \ - text/4ee4af566555f5fbe026368b75596286a312663a ; do +for DEPENDENCY in sync/036812b2e83c0ddf193dd5a34e034151da389d09 \ + sys/d101bd2416d505c0448a6ce8a282482678040a89 \ + term/de623e64d2a6562fa463152da80477d4aa07fca0 \ + text/0.3.6 \ + tools/90fa682c2a6e6a37b3a1364ce2fe1d5e41af9d6d ; do DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)" DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)" @@ -92,7 +92,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 {} \; -make +FZF_VERSION="$VERSION" FZF_REVISION="$VERSION" make mkdir -p $PKG/usr/bin install -m 0755 target/fzf-linux_* $PKG/usr/bin/fzf @@ -118,7 +118,10 @@ cp -a \ BUILD.md CHANGELOG.md LICENSE README-VIM.md README.md shell/key-bindings.zsh shell/key-bindings.bash \ $PKG/usr/doc/$PRGNAM-$VERSION -chmod 0755 $PKG/usr/doc/$PRGNAM-$VERSION/key-bindings.* +mkdir -p $PKG/usr/share/fzf +cp -a \ + shell/key-bindings.zsh shell/key-bindings.bash \ + $PKG/usr/share/fzf cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -127,16 +130,23 @@ if [ "$WITH_VIM" = "yes" ] ; then mkdir -p $PKG/usr/share/vim/vimfiles/plugin install -m 0644 plugin/fzf.vim $PKG/usr/share/vim/vimfiles/plugin + mkdir -p $PKG/usr/share/vim/vimfiles/doc/ + install -m 0644 doc/fzf.txt $PKG/usr/share/vim/vimfiles/doc/ + # neovim support mkdir -p $PKG/usr/share/nvim/runtime/plugin + mkdir -p $PKG/usr/share/nvim/runtime/doc ( cd $PKG/usr/share/nvim/runtime + ln -s ../../../vim/vimfiles/plugin/fzf.vim plugin/fzf.vim + ln -s ../../../vim/vimfiles/doc/fzf.txt doc/fzf.txt ) else mkdir -p $PKG/usr/share/fzf/vim/ install -m 0644 plugin/fzf.vim $PKG/usr/share/fzf/vim/ + install -m 0644 doc/fzf.txt $PKG/usr/share/fzf/vim/ fi mkdir -p $PKG/install diff --git a/system/fzf/fzf.info b/system/fzf/fzf.info index d39c00c4de..5f1c696425 100644 --- a/system/fzf/fzf.info +++ b/system/fzf/fzf.info @@ -1,36 +1,34 @@ PRGNAM="fzf" -VERSION="0.17.5" +VERSION="0.27.0" HOMEPAGE="https://github.com/junegunn/fzf" -DOWNLOAD="https://github.com/junegunn/fzf/archive/0.17.5/fzf-0.17.5.tar.gz \ - https://github.com/codegangsta/cli/archive/c6af8847eb2b7b297d07c3ede98903e95e680ef9/cli-c6af8847eb2b7b297d07c3ede98903e95e680ef9.tar.gz \ - https://github.com/gdamore/encoding/archive/b23993cbb6353f0e6aa98d0ee318a34728f628b9/encoding-b23993cbb6353f0e6aa98d0ee318a34728f628b9.tar.gz \ - https://github.com/gdamore/tcell/archive/0a0db94084dfe181108c18508ebd312f12d331fb/tcell-0a0db94084dfe181108c18508ebd312f12d331fb.tar.gz \ - https://github.com/lucasb-eyer/go-colorful/archive/c900de9dbbc73129068f5af6a823068fc5f2308c/go-colorful-c900de9dbbc73129068f5af6a823068fc5f2308c.tar.gz \ - https://github.com/Masterminds/semver/archive/15d8430ab86497c5c0da827b748823945e1cf1e1/semver-15d8430ab86497c5c0da827b748823945e1cf1e1.tar.gz \ - https://github.com/Masterminds/vcs/archive/6f1c6d150500e452704e9863f68c2559f58616bf/vcs-6f1c6d150500e452704e9863f68c2559f58616bf.tar.gz \ - https://github.com/mattn/go-isatty/archive/66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8/go-isatty-66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8.tar.gz \ - https://github.com/mattn/go-runewidth/archive/14207d285c6c197daabb5c9793d63e7af9ab2d50/go-runewidth-14207d285c6c197daabb5c9793d63e7af9ab2d50.tar.gz \ - https://github.com/mattn/go-shellwords/archive/02e3cf038dcea8290e44424da473dd12be796a8a/go-shellwords-02e3cf038dcea8290e44424da473dd12be796a8a.tar.gz \ - https://github.com/mitchellh/go-homedir/archive/b8bc1bf767474819792c23f32d8286a45736f1c6/go-homedir-b8bc1bf767474819792c23f32d8286a45736f1c6.tar.gz \ - https://github.com/golang/crypto/archive/558b6879de74bc843225cde5686419267ff707ca/crypto-558b6879de74bc843225cde5686419267ff707ca.tar.gz \ - https://github.com/golang/sys/archive/b90f89a1e7a9c1f6b918820b3daa7f08488c8594/sys-b90f89a1e7a9c1f6b918820b3daa7f08488c8594.tar.gz \ - https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a/text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz \ - https://github.com/go-yaml/yaml/archive/287cf08546ab5e7e37d55a84f7ed3fd1db036de5/yaml-287cf08546ab5e7e37d55a84f7ed3fd1db036de5.tar.gz" -MD5SUM="b44b96f45efb26fca1d740917d18db6a \ - 0dc8a9984b1d284ca11b7ab0a612f1ab \ - 4c6fb2d95929b35e44788924edc56649 \ - 8c61d3a0fb9b399e8eac971537bb987e \ - ae47671585a14b145b3edd83b2240019 \ - 21db36a34d002fcb2405ea510d890312 \ - e8a71d3706e4026278a079e264084cec \ - e15b95057201799f455982ce76ff7041 \ - cc482b237c1812152afd973b52f40852 \ - 80447b1055e248f7273e7ef45521534d \ - efe999d23734f1c575d8d523e4d6a841 \ - 2425a12f648d6c117460836386e17a3a \ - 34a1e1f3baa7e0b733272fe81e1bf3e9 \ - cc2a01a744b1d2eb588f213db4bf4485 \ - 87913c935b1e6067cc29635f7329c8b6" +DOWNLOAD="https://github.com/junegunn/fzf/archive/0.27.0/fzf-0.27.0.tar.gz \ + https://github.com/gdamore/encoding/archive/v1.0.0/encoding-1.0.0.tar.gz \ + https://github.com/gdamore/tcell/archive/v1.3.0/tcell-1.3.0.tar.gz \ + https://github.com/lucasb-eyer/go-colorful/archive/v1.2.0/go-colorful-1.2.0.tar.gz \ + https://github.com/mattn/go-isatty/archive/v0.0.12/go-isatty-0.0.12.tar.gz \ + https://github.com/mattn/go-runewidth/archive/v0.0.12/go-runewidth-0.0.12.tar.gz \ + https://github.com/mattn/go-shellwords/archive/v1.0.11/go-shellwords-1.0.11.tar.gz \ + https://github.com/rivo/uniseg/archive/v0.2.0/uniseg-0.2.0.tar.gz \ + https://github.com/saracen/walker/archive/v0.1.2/walker-0.1.2.tar.gz \ + https://github.com/golang/sync/archive/036812b2e83c0ddf193dd5a34e034151da389d09/sync-036812b2e83c0ddf193dd5a34e034151da389d09.tar.gz \ + https://github.com/golang/sys/archive/d101bd2416d505c0448a6ce8a282482678040a89/sys-d101bd2416d505c0448a6ce8a282482678040a89.tar.gz \ + https://github.com/golang/term/archive/de623e64d2a6562fa463152da80477d4aa07fca0/term-de623e64d2a6562fa463152da80477d4aa07fca0.tar.gz \ + https://github.com/golang/text/archive/v0.3.6/text-0.3.6.tar.gz \ + https://github.com/golang/tools/archive/90fa682c2a6e6a37b3a1364ce2fe1d5e41af9d6d/tools-90fa682c2a6e6a37b3a1364ce2fe1d5e41af9d6d.tar.gz" +MD5SUM="498b121f93733e45b4c432c3549b68f8 \ + fbadc383bc1ace79fa769fe2de36b87b \ + ad4f913e9293c655c5b7cdeba02429e8 \ + 191fe5cfcb58e480ff4045c82a06091a \ + 56a6121ba7ae8a13dad2925edd9f11b5 \ + ff86c8f58d907d46399df06b7d5565bb \ + ca0ba2f62a0ce9d20fe9939d18135e45 \ + 71d5e8800299a85ecfd72a1833eefa4c \ + 2b8de2c0180b772eac09f19ed7cb264a \ + 45a3bb00e962f5ba158827f54bbdce4a \ + 09d78ad8306fb264ebecd65e309e33ef \ + 4fae21a5000857ef943f4f9f93d8727a \ + f406aa34e4555c0bac8c2f00f2ab729b \ + aa1fd192d5fd5f11f7d552eea120d495" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/system/gcdemu/gcdemu.SlackBuild b/system/gcdemu/gcdemu.SlackBuild index 49f792c139..e06410655d 100644 --- a/system/gcdemu/gcdemu.SlackBuild +++ b/system/gcdemu/gcdemu.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for gcdemu # # Copyright 2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com> -# Copyright 2018 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gcdemu -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.2.4} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) diff --git a/system/gcdemu/gcdemu.info b/system/gcdemu/gcdemu.info index 32ab877f86..1a80f15758 100644 --- a/system/gcdemu/gcdemu.info +++ b/system/gcdemu/gcdemu.info @@ -1,8 +1,8 @@ PRGNAM="gcdemu" -VERSION="3.2.0" -HOMEPAGE="http://cdemu.sourceforge.net/about/gcdemu/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/gcdemu-3.2.0.tar.bz2" -MD5SUM="1c50d18fcc205d60ea7d861cd2b35735" +VERSION="3.2.4" +HOMEPAGE="https://cdemu.sourceforge.io/about/gcdemu/" +DOWNLOAD="https://downloads.sourceforge.net/cdemu/gcdemu-3.2.4.tar.bz2" +MD5SUM="942e8b223985a67fb8096c44fdc40df4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cdemu-daemon pygobject3-python3" diff --git a/system/gcdemu/slack-desc b/system/gcdemu/slack-desc index d15fcc1f34..519eaf0e64 100644 --- a/system/gcdemu/slack-desc +++ b/system/gcdemu/slack-desc @@ -13,7 +13,7 @@ gcdemu: related to controlling the CDEmu daemon, such as loading and unloading gcdemu: devices, displaying devices' status and retrieving/setting gcdemu: devices' debug masks. gcdemu: -gcdemu: Homepage: http://cdemu.sourceforge.net/about/gcdemu/ +gcdemu: Homepage: https://cdemu.sourceforge.io/about/gcdemu/ gcdemu: gcdemu: gcdemu: diff --git a/system/gigolo/gigolo.SlackBuild b/system/gigolo/gigolo.SlackBuild index 6d17bbbb5a..6d96016d60 100644 --- a/system/gigolo/gigolo.SlackBuild +++ b/system/gigolo/gigolo.SlackBuild @@ -68,11 +68,9 @@ if [ x"${GNOMEMOUNT:-"yes"}" = "xyes" ]; then chmod 0755 $PKG/usr/bin/gnome-mount fi -# Strip binaries and libraries find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Compress man pages find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/system/gksu/gksu.info b/system/gksu/gksu.info index 3c55be7cd8..4c89b2568f 100644 --- a/system/gksu/gksu.info +++ b/system/gksu/gksu.info @@ -6,5 +6,5 @@ MD5SUM="cacbcac3fc272dce01c6ea38354489e2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgksu" -MAINTAINER="Stylianos Tsampas" -EMAIL="ztsampas@otenet.gr" +MAINTAINER="Didier Spaier" +EMAIL="didier at slint dot fr" diff --git a/system/glances/README b/system/glances/README index 120cd17f85..ba7d2548f9 100644 --- a/system/glances/README +++ b/system/glances/README @@ -12,16 +12,16 @@ systems, processes, etc. OPTIONAL DEPENDENCIES * Available on SBo: -batinfo (for battery monitoring support) bottle (for web server mode) couchdb (for CouchDB export module) docker (for Docker monitoring support) elasticsearch (for Elastic Search export module) hddtemp (for HDD temperature monitoring support) -matplotlib (for graphical/chart support) +influxdb (for InfluxDB export module) netifaces (for IP plugin) py-cpuinfo (for Quicklook CPU info module) pymdstat (for RAID support) +python-prometheus_client (for Prometheus export module) python-requests (for Ports plugin) python-scandir (for Folders plugin) statsd (for StatsD export module) @@ -31,10 +31,12 @@ pyzmq (for ZeroMQ export module) * Not available on SBo: bernhard (for Riemann export module) cassandra-driver (for Cassandra export module) -influxdb (for InfluxDB export module) -nvidia-ml-py (for GPU plugin) +kafka-python (for Kafka export module) +nvidia-ml-pyi3 (for GPU plugin) pika (for RabbitMQ/ActiveMQ export module) potsdb (for OpenTSDB export module) +pygal (for graph export module) +pySMART.smartx (for HDD SMART support) pystache (for action scripting) wifi (for wifi plugin) zeroconf (for autodiscover mode) diff --git a/system/glances/glances.SlackBuild b/system/glances/glances.SlackBuild index a520b6e3a3..0972a94bfa 100644 --- a/system/glances/glances.SlackBuild +++ b/system/glances/glances.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for glances -# Copyright 2013-2017 Philip Lacroix <slackph at posteo dot de> +# Copyright 2013-2020 Philip Lacroix <slackph at posteo dot de> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=glances -VERSION=${VERSION:-2.9.1} +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/glances/glances.info b/system/glances/glances.info index cf3fe34b48..e61af1e5aa 100644 --- a/system/glances/glances.info +++ b/system/glances/glances.info @@ -1,8 +1,8 @@ PRGNAM="glances" -VERSION="2.9.1" +VERSION="3.1.0" HOMEPAGE="https://github.com/nicolargo/glances" -DOWNLOAD="https://github.com/nicolargo/glances/archive/v2.9.1/glances-2.9.1.tar.gz" -MD5SUM="2e10c6e25f61002bc6d647d3bfcb4d62" +DOWNLOAD="https://github.com/nicolargo/glances/archive/v3.1.0/glances-3.1.0.tar.gz" +MD5SUM="6b4d001854f711ee805eb60bd6831e18" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="psutil" diff --git a/system/gnu-unifont/README b/system/gnu-unifont/README index 1a66fa550c..1e7e3058f1 100644 --- a/system/gnu-unifont/README +++ b/system/gnu-unifont/README @@ -3,4 +3,20 @@ Unicode Basic Multilinguial Plane(BMP). The BMP is the first Unicode "plane" of 65,536(16bit) code points, and includes character encoding for most of the world's modern scripts. -This package installs precompiled fonts only. +By default, the package will include precompiled versions of the font in +TTF (TrueType), PCF (X Window bitmap) and PSF (console) formats. This can be +changed using FONTFORMATS environment variable, which should be set to +comma-separated list of font formats to include in the package. + +Available formats are: + +ttf = TrueType +pcf = X Window bitmap +psf = Console fonts +otb = OpenType Bitmap fonts, compatible with recent versions of Pango which + don't support PCF fonts. Fonts in this format are generated by + converting precompiled PCF fonts using fonttosfnt tool. + +For example, setting FONTFORMATS=pcf,psf will include only PCF and PSF fonts. +If FONTFORMATS variable is not set the default value "ttf,pcf,psf" is +assumed. diff --git a/system/gnu-unifont/gnu-unifont.SlackBuild b/system/gnu-unifont/gnu-unifont.SlackBuild index 527309110a..85ea602913 100644 --- a/system/gnu-unifont/gnu-unifont.SlackBuild +++ b/system/gnu-unifont/gnu-unifont.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2010 crocket (crockabiscuit@gmail.com) # Copyright 2013-2015 LukenShiro, Italy +# Copyright 2019-2020 Tomasz Bywalec # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gnu-unifont -VERSION=${VERSION:-8.0.01} +VERSION=${VERSION:-13.0.06} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -37,6 +38,12 @@ OUTPUT=${OUTPUT:-/tmp} SRCNAM=unifont DOCFILES="ChangeLog COPYING INSTALL NEWS README" +FONTFORMATS=${FONTFORMATS:-ttf,pcf,psf} + +contains() +{ + echo "$1" | grep -qi "\(^\|,\)$2\($\|,\)" +} set -e @@ -53,14 +60,54 @@ 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 {} \; +FONTSCOPIED=0 + cd font/precompiled -mkdir -p $PKG/usr/share/fonts/{misc,TTF} -cp -a *.pcf.gz $PKG/usr/share/fonts/misc/ -cp -a *.ttf $PKG/usr/share/fonts/TTF -mkdir -p $PKG/usr/share/kbd/consolefonts -cp -a *.psf.gz $PKG/usr/share/kbd/consolefonts/ + +if contains "$FONTFORMATS" "pcf"; then + mkdir -p $PKG/usr/share/fonts/misc + cp -a *.pcf.gz $PKG/usr/share/fonts/misc + + FONTSCOPIED=1 +fi + +if contains "$FONTFORMATS" "ttf"; then + mkdir -p $PKG/usr/share/fonts/TTF + cp -a *.ttf $PKG/usr/share/fonts/TTF + + FONTSCOPIED=1 +fi + +if contains "$FONTFORMATS" "psf"; then + mkdir -p $PKG/usr/share/kbd/consolefonts + cp -a *.psf.gz $PKG/usr/share/kbd/consolefonts + + FONTSCOPIED=1 +fi + +if contains "$FONTFORMATS" "otb"; then + mkdir -p $PKG/usr/share/fonts/misc + for pcf_file in *.pcf.gz; do + echo "Converting '$pcf_file' to OTB format." + otb_file=$(echo "$pcf_file" | sed 's/\.pcf\.gz$/.otb/g') + fonttosfnt -o "$PKG/usr/share/fonts/misc/$otb_file" "$pcf_file" + done + + FONTSCOPIED=1 +fi + cd - +if [ "$FONTSCOPIED" -eq 0 ]; then + echo + echo "No fonts selected to be included in the package." + echo "Please check value of the FONTFORMATS environment variable." + exit 1 +fi + +# Keep the fonts names unversioned +find -L $PKG/usr/share -type f -name "*-$VERSION*" -exec rename -- "-$VERSION" '' {} \; + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/gnu-unifont/gnu-unifont.info b/system/gnu-unifont/gnu-unifont.info index 95dcb493dd..fbcf5b0e78 100644 --- a/system/gnu-unifont/gnu-unifont.info +++ b/system/gnu-unifont/gnu-unifont.info @@ -1,10 +1,10 @@ PRGNAM="gnu-unifont" -VERSION="8.0.01" -HOMEPAGE="http://unifoundry.com/unifont.html" -DOWNLOAD="ftp://ftp.gnu.org/gnu/unifont/unifont-8.0.01/unifont-8.0.01.tar.gz" -MD5SUM="b813e863f35e0f5f6235e73041c7b1a6" +VERSION="13.0.06" +HOMEPAGE="http://unifoundry.com/unifont/index.html" +DOWNLOAD="https://ftpmirror.gnu.org/unifont/unifont-13.0.06/unifont-13.0.06.tar.gz" +MD5SUM="60971929464ceb99bbcca55b9ad7c796" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LukenShiro" -EMAIL="lukenshiro@ngi.it" +MAINTAINER="Tomasz Bywalec" +EMAIL="t.bywalec@gmail.com" diff --git a/system/gnu-unifont/slack-desc b/system/gnu-unifont/slack-desc index 3c3c36c945..259c4b902e 100644 --- a/system/gnu-unifont/slack-desc +++ b/system/gnu-unifont/slack-desc @@ -13,7 +13,7 @@ gnu-unifont: Unicode Basic Multilinguial Plane (BMP). The BMP is the first gnu-unifont: Unicode "plane" of 65,536(16bit) code points, and includes character gnu-unifont: encoding for most of the world's modern scripts. gnu-unifont: -gnu-unifont: Homepage: http://unifoundry.com/unifont.html +gnu-unifont: Homepage: http://unifoundry.com/unifont/index.html gnu-unifont: gnu-unifont: gnu-unifont: diff --git a/system/goaccess/README b/system/goaccess/README index 563151d147..a21acc4c4a 100644 --- a/system/goaccess/README +++ b/system/goaccess/README @@ -1,28 +1,29 @@ -Goaccess is an open source real-time Apache log analyzer and +Goaccess is an open source real-time Apache log analyser and interactive viewer that runs in a terminal in *nix systems. It provides fast and valuable HTTP statistics for system -administrators that require a visual server report on the fly. +administrators that require a visual server report on the +fly. Optional: -GeoIP: - -Goaccess now supports two types of GeoIP - legacy and mmdb. +Goaccess supports two types of GeoIP - legacy and mmdb. If you want to add GeoIP support, pass either option to the slackbuild: GEOIP=legacy ./goaccess.SlackBuild -GEOIP=mmdb ./goaccess.SlackBuild +(Requires GeoIP) -At the moment, mmdb is not on slackbuilds.org. +GEOIP=mmdb ./goaccess.SlackBuild +(Requires libmaxminddb) TokyoCabinet: -Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk B+ Tree -database. +Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk +B+ Tree database. The options are: TCB=memhash ./goaccess.SlackBuild TCB=btree ./goaccess.SlackBuild +(Both require tokyocabinet) diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild index e03d8cb90e..2e83305eba 100644 --- a/system/goaccess/goaccess.SlackBuild +++ b/system/goaccess/goaccess.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for goaccess -# Copyright David Woodfall <dave@dawoodfall.net> +# Copyright Dave Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=goaccess -VERSION=${VERSION:-1.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,13 +54,8 @@ else LIBDIRSUFFIX="" fi -if [ -n "$GEOIP" ]; then - geoip="--enable-geoip=$GEOIP" -fi - -if [ -n "$TCB" ]; then - tcb="--enable-tcb=$TCB" -fi +geoip="--enable-geoip=${GEOIP:-no}" +tcb="--enable-tcb=${TCB:-no}" set -e @@ -103,10 +98,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 $PKG/etc/goaccess.conf $PKG/etc/goaccess.conf.new +install -D -m644 config/goaccess.conf $PKG/etc/goaccess.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/goaccess/goaccess.info b/system/goaccess/goaccess.info index 4be37913ed..c655ce38ef 100644 --- a/system/goaccess/goaccess.info +++ b/system/goaccess/goaccess.info @@ -1,10 +1,10 @@ PRGNAM="goaccess" -VERSION="1.2" +VERSION="1.3" HOMEPAGE="http://goaccess.prosoftcorp.com" -DOWNLOAD="http://tar.goaccess.io/goaccess-1.2.tar.gz" -MD5SUM="00f41cf1fb72cfc459984c0fb087333d" +DOWNLOAD="http://tar.goaccess.io/goaccess-1.3.tar.gz" +MD5SUM="5209c5d4e9e04b5b3e7f13134c5e146c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/system/gpart/gpart.info b/system/gpart/gpart.info index fa43665e98..7eccd9838e 100644 --- a/system/gpart/gpart.info +++ b/system/gpart/gpart.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/grub4dos/grub4dos.info b/system/grub4dos/grub4dos.info index f9e0f4bc8e..fdc043c9c0 100644 --- a/system/grub4dos/grub4dos.info +++ b/system/grub4dos/grub4dos.info @@ -6,5 +6,5 @@ MD5SUM="525f86bd58cfb4608f50c22f4e58042b" DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="p7zip" -MAINTAINER="Steven Pledger" -EMAIL="spledger91@yahoo.com" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/gtk-vnc/gtk-vnc.SlackBuild b/system/gtk-vnc/gtk-vnc.SlackBuild index 0884bfe522..4f9f183cc9 100644 --- a/system/gtk-vnc/gtk-vnc.SlackBuild +++ b/system/gtk-vnc/gtk-vnc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for gtk-vnc # Copyright 2014 Will Brokenbourgh U.S.A. -# Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gtk-vnc -VERSION=${VERSION:-0.9.0} +VERSION=${VERSION:-1.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,61 +74,17 @@ find -L $PRGNAM-$VERSION \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Strip jobs number from the MAKEFLAGS -MAKEFLAGS=$(echo "$MAKEFLAGS" | sed "s/-j[0-999]//g") - -cp -a $PRGNAM-$VERSION $PRGNAM-$VERSION-3 - cd $PRGNAM-$VERSION CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-examples \ - --with-libview \ - --with-python \ - --with-gtk=2.0 \ - --enable-vala \ - --enable-introspection \ - --build=$ARCH-slackware-linux - -# Building with -j1 to avoid surprises -make -j1 -make install DESTDIR=$PKG - -# To avoid building the gtk3 version, pass GTK3=no to the script -if [ "${GTK3:-yes}" = "yes" ]; then - -cd ../$PRGNAM-$VERSION-3 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-examples \ - --with-libview \ - --with-python \ - --with-gtk=3.0 \ - --enable-vala \ - --enable-introspection \ - --build=$ARCH-slackware-linux - -# Building with -j1 to avoid surprises -make -j1 -make install DESTDIR=$PKG +meson \ + --prefix /usr \ + --libdir lib${LIBDIRSUFFIX} \ + --mandir /usr/man \ + build -fi +DESTDIR=$PKG ninja -C build all install 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 @@ -137,7 +93,7 @@ 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 AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING.LIB ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/gtk-vnc/gtk-vnc.info b/system/gtk-vnc/gtk-vnc.info index 9bae1901ad..07318cad36 100644 --- a/system/gtk-vnc/gtk-vnc.info +++ b/system/gtk-vnc/gtk-vnc.info @@ -1,10 +1,10 @@ PRGNAM="gtk-vnc" -VERSION="0.9.0" +VERSION="1.0.0" HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/0.9/gtk-vnc-0.9.0.tar.xz" -MD5SUM="1eed0aa5d71f849eae9fa00ecf28e247" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz" +MD5SUM="ff2e531525f6200be613643b9ee87fbf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="vala python3" +REQUIRES="vala meson" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/guake/doinst.sh b/system/guake/doinst.sh index c9b09eac64..5c97dbdc86 100644 --- a/system/guake/doinst.sh +++ b/system/guake/doinst.sh @@ -1,13 +1,3 @@ -schema_install() { - SCHEMA="$1" - GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ - chroot . gconftool-2 --makefile-install-rule \ - /etc/gconf/schemas/$SCHEMA \ - 1>/dev/null -} - - schema_install guake.schemas - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi @@ -20,6 +10,6 @@ fi if [ -e usr/share/glib-2.0/schemas ]; then if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 fi fi diff --git a/system/guake/guake-3.7.0-fix-paths.patch b/system/guake/guake-3.7.0-fix-paths.patch new file mode 100644 index 0000000000..0cd91ef062 --- /dev/null +++ b/system/guake/guake-3.7.0-fix-paths.patch @@ -0,0 +1,22 @@ +--- guake/paths.py.orig 2020-02-10 16:10:10.000000000 -0500 ++++ guake/paths.py 2020-06-08 20:32:03.423403158 -0400 +@@ -55,8 +55,8 @@ + + + def get_default_locale_dir(): +- d = os.path.join(get_data_files_dir(), "po") +- log.debug("Using guake image directory: %s", d) ++ d = '/usr/share/locale' ++ log.debug("Using guake locale directory: %s", d) + return d + + +@@ -73,7 +73,7 @@ + + + def get_default_schema_dir(): +- d = get_default_data_dir() ++ d = '/usr/share/glib-2.0/schemas' + log.debug("Using guake scheme directory: %s", d) + return d + diff --git a/system/guake/guake.SlackBuild b/system/guake/guake.SlackBuild index 0bf0b55b94..3e9db65f3c 100644 --- a/system/guake/guake.SlackBuild +++ b/system/guake/guake.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for guake # Copyright 2017-2018 Donald Cooley South Haven, IN USA +# Copyright (C) 2020 Logan Rathbone <poprocks@gmail.com> Province of Ontario, Canada # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=guake -VERSION=${VERSION:-0.8.14} +VERSION=${VERSION:-3.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,20 +41,6 @@ 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 @@ -69,35 +56,19 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-schemas-install \ - --build=$ARCH-slackware-linux - -make -make install 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 +# fix some of the broken paths +patch -p0 < $CWD/guake-3.7.0-fix-paths.patch -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 +make generate-desktop generate-mo compile-glib-schemas-dev +make DESTDIR="$PKG" PREFIX='/usr' install-schemas install-locale +python3 setup.py install --root "$PKG" --prefix="/usr" --optimize=1 -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f +# don't ship duplicate .mo and .po files +rm -rf $PKG/usr/share/guake/po mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING INSTALL NEWS README.rst ChangeLog \ + COPYING NEWS.rst README.rst \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/guake/guake.info b/system/guake/guake.info index 4318250bec..4bc7673e19 100644 --- a/system/guake/guake.info +++ b/system/guake/guake.info @@ -1,10 +1,10 @@ PRGNAM="guake" -VERSION="0.8.14" +VERSION="3.7.0" HOMEPAGE="http://guake.org" -DOWNLOAD="https://github.com/Guake/guake/archive/0.8.14/guake-0.8.14.tar.gz" -MD5SUM="a0155a28c4417d3c6200afbdebe2c306" +DOWNLOAD="https://files.pythonhosted.org/packages/f1/20/32c2c8fe2ec4d5c38dbdd2b2ee60a382a529d0409c7a9960b2453e50d0d7/guake-3.7.0.tar.gz" +MD5SUM="7934c9c214e25cbc706cd9a8e806becd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pyxdg python-keybinder gnome-python2-gconf gnome-common" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" +REQUIRES="libwnck3 vte3 python3 py3cairo dbus-python3 pygobject3-python3 pbr" +MAINTAINER="Logan Rathbone" +EMAIL="poprocks@gmail.com" diff --git a/system/guix/guix.info b/system/guix/guix.info index 9a22020c95..e1ea369eb0 100644 --- a/system/guix/guix.info +++ b/system/guix/guix.info @@ -14,5 +14,5 @@ MD5SUM="f5be9eabf634b1f4762297664698d7aa \ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere.com" diff --git a/system/hddtemp/README b/system/hddtemp/README index 7f3abd48b8..76b38fc83b 100644 --- a/system/hddtemp/README +++ b/system/hddtemp/README @@ -1,21 +1,5 @@ -hddtemp (reads hard disk S.M.A.R.T. info and reports temperature) - hddtemp is a small and daemonizable utility designed to read the S.M.A.R.T. information from the given hard disk and report the -temperature of the disk. Different hard disk manufacturers use -different raw values in their S.M.A.R.T. data and the hddtemp.db file -helps to map raw values to actual temperatures. - -http://www.guzu.net/linux/hddtemp.php -https://savannah.nongnu.org/projects/hddtemp/ - -The hddtemp.db file does not include more recent hard disks as the -project does not appear to be maintained anymore. To resolve this, -simply add your disk to the file manually. Run hddtemp on your drive -to get the expected string and use the other entries in the file as -templates to create a new one. +temperature of the disk. -Note that only a few hard disks actually differ from the 194C value so -you can bet your disk will probably use that value too, but I -recommend using older drives from the same manufacturer that are in the -file as a guideline. +Note: hddtemp does not support eMMC or NVMe devices. diff --git a/system/hddtemp/README.Slackware b/system/hddtemp/README.Slackware new file mode 100644 index 0000000000..7a68e8d36f --- /dev/null +++ b/system/hddtemp/README.Slackware @@ -0,0 +1,27 @@ +To use hddtemp you need to do the following: + +First you must make sure hddtemp knows how to handle your disks. Run +the command "hddtemp /dev/sdX" as root for each of your block devices. +If it correctly reports HDD model and its temperature, you're all set. +If instead you get a warning that the drive is not in the database, you +have to add a record describing your device to /etc/hddtemp/hddtemp.db. +Use the disk ID string returned by hddtemp in the first column. Most +drives will use "194" and "C" in second and third columns, but check +output of "smartctl" command to see if this is really the case for your +disk. The last column is a free-form description of the device. + +Next, edit /etc/rc.d/rc.hddtemp and set HDDTEMP_DRIVES variable to a list +of drives you want to monitor. Use the usual /dev/sdX block device files, +or the symlinks available in /dev/disk/. Multiple entries must be separated +with spaces. The remaining configuration variables are set to reasonable +defaults, change them if it suits your needs. + +Finally, to start hddtemp automatically at boot, make /etc/rc.d/rc.hddtemp +executable and add the following to your /etc/rc.d/rc.local: + +if [ -x /etc/rc.d/rc.hddtemp ]; then + . /etc/rc.d/rc.hddtemp start +fi + +Once the hddtemp daemon is running you can use hddtemp-aware tools such as +gkrellm or Conky to display the temperature readings. diff --git a/system/hddtemp/doinst.sh b/system/hddtemp/doinst.sh index 7f616013b7..822ea598b2 100644 --- a/system/hddtemp/doinst.sh +++ b/system/hddtemp/doinst.sh @@ -12,4 +12,5 @@ config() { } config etc/hddtemp/hddtemp.db.new +config etc/rc.d/rc.hddtemp.new diff --git a/system/hddtemp/hddtemp.SlackBuild b/system/hddtemp/hddtemp.SlackBuild index a4a78fdfbf..bb6a139ca3 100644 --- a/system/hddtemp/hddtemp.SlackBuild +++ b/system/hddtemp/hddtemp.SlackBuild @@ -2,16 +2,35 @@ # Slackware build script for hddtemp -# Written by Zordrak - -# Modified by SlackBuilds.org +# Copyright 2010 Zordrak +# Copyright 2010-2020 SlackBuilds.org +# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl> +# 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. PRGNAM=hddtemp -SRCVERSION=${SRCVERSION:-0.3-beta15} -VERSION=$(echo $SRCVERSION | tr -d "-") -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.3beta15} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +SRCVERSION="0.3-beta15" + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -60,24 +79,27 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ --with-db-path=/etc/hddtemp/hddtemp.db \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG +install -D -m 644 $CWD/hddtemp.db $PKG/etc/hddtemp/hddtemp.db.new +install -D -m 644 $CWD/rc.hddtemp.new $PKG/etc/rc.d/rc.hddtemp.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 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/etc/hddtemp -cp $CWD/hddtemp.db $PKG/etc/hddtemp/hddtemp.db.new - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS ChangeLog GPL-2 INSTALL README TODO COPYING LICENSE contribs \ +cp -a ABOUT-NLS ChangeLog GPL-2 INSTALL README TODO COPYING LICENSE contribs/ \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/hddtemp/hddtemp.info b/system/hddtemp/hddtemp.info index 12ee74bdc8..3bdfd6cf6e 100644 --- a/system/hddtemp/hddtemp.info +++ b/system/hddtemp/hddtemp.info @@ -1,10 +1,10 @@ PRGNAM="hddtemp" VERSION="0.3beta15" HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/" -DOWNLOAD="http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2" +DOWNLOAD="https://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2" MD5SUM="8b829339e1ae9df701684ec239021bb8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Zordrak" -EMAIL="slackbuilds@tpa.me.uk" +MAINTAINER="Dominik Drobek" +EMAIL="dominik.drobek (at) o2.pl" diff --git a/system/hddtemp/rc.hddtemp.new b/system/hddtemp/rc.hddtemp.new new file mode 100644 index 0000000000..6532a95cde --- /dev/null +++ b/system/hddtemp/rc.hddtemp.new @@ -0,0 +1,102 @@ +#!/bin/sh + +# Script to start/stop/restart the hddtemp daemon. +# Copyright 2017, 2020 Dominik Drobek <dominik.drobek (at) o2.pl> +# 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. + + +# Configuration options for hddtemp: + +# HDDTEMP_DRIVES must contain a list of drives to monitor. +# The daemon will not start without it. +HDDTEMP_DRIVES="" + +# Listen host and port: +HDDTEMP_LISTENHOST="--listen=localhost" +HDDTEMP_PORT="--port=7634" + +# Additional options (man 8 hddtemp): +#HDDTEMP_OPTIONS="" + +hddtemp_getpid() { + HDDTEMP_PID="$(pidof hddtemp 2> /dev/null)" +} + +hddtemp_start() { + hddtemp_getpid + if [ -n "${HDDTEMP_PID}" ]; then + echo "hddtemp daemon is already running!" + exit + fi + + if [ -x /usr/sbin/hddtemp ]; then + echo -n "Starting hddtemp daemon: " + /usr/sbin/hddtemp --daemon \ + ${HDDTEMP_LISTENHOST} \ + ${HDDTEMP_PORT} \ + ${HDDTEMP_OPTIONS} \ + ${HDDTEMP_DRIVES} &> /dev/null + fi + + hddtemp_getpid + if [ -n "${HDDTEMP_PID}" ]; then + echo "success" + else + echo "failed!" + fi +} + +hddtemp_stop() { + hddtemp_getpid + if [ -z "${HDDTEMP_PID}" ]; then + echo "hddtemp daemon is not running!" + exit + else + echo -n "Stopping hddtemp daemon: " + kill "${HDDTEMP_PID}" &> /dev/null + sleep 1 + fi + + hddtemp_getpid + if [ -z "${HDDTEMP_PID}" ]; then + echo "success" + else + echo "failed!" + fi +} + +hddtemp_restart() { + hddtemp_stop + hddtemp_start +} + +case "$1" in + "start") + hddtemp_start + ;; + "stop") + hddtemp_stop + ;; + "restart") + hddtemp_restart + ;; + *) + echo "usage: $0 start|stop|restart" +esac diff --git a/system/hddtemp/slack-desc b/system/hddtemp/slack-desc index 64d06f1ae3..b2eba97204 100644 --- a/system/hddtemp/slack-desc +++ b/system/hddtemp/slack-desc @@ -10,10 +10,10 @@ hddtemp: hddtemp (reads hard disk S.M.A.R.T. info and reports temperature) hddtemp: hddtemp: hddtemp is a small and daemonizable utility designed to read the hddtemp: S.M.A.R.T. information from the given hard disk and report the -hddtemp: temperature of the disk. Different hard disk manufacturers use -hddtemp: different raw values in their S.M.A.R.T. data and the hddtemp.db file -hddtemp: helps to map raw values to actual temperatures. +hddtemp: temperature of the disk. +hddtemp: +hddtemp: Homepage: https://savannah.nongnu.org/projects/hddtemp/ +hddtemp: +hddtemp: hddtemp: -hddtemp: http://www.guzu.net/linux/hddtemp.php -hddtemp: https://savannah.nongnu.org/projects/hddtemp/ hddtemp: diff --git a/system/heartbeat/README b/system/heartbeat/README new file mode 100644 index 0000000000..742f8f2af6 --- /dev/null +++ b/system/heartbeat/README @@ -0,0 +1,13 @@ +Linux-HA heartbeat + +Heartbeat is a daemon that provides cluster infrastructure (communication and +membership) services to its clients. This allows clients to know about the +presence (or disappearance!) of peer processes on other machines and to easily +exchange messages with them. + +Heartbeat still comes with an integrated primitive resource +manager, which basically is just a shell script. This is also +referred to as "v1 style" or "haresources style" configuration. + +You might also want to install cluster-glue, heartbeat, resource-agents, +fence-agents. diff --git a/system/heartbeat/doinst.sh b/system/heartbeat/doinst.sh new file mode 100644 index 0000000000..bdba1fdb05 --- /dev/null +++ b/system/heartbeat/doinst.sh @@ -0,0 +1,27 @@ +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 cop +y + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +preserve_perms() { + NEW="$1" + OLD="$(dirname ${NEW})/$(basename ${NEW} .new)" + if [ -e ${OLD} ]; then + cp -a ${OLD} ${NEW}.incoming + cat ${NEW} > ${NEW}.incoming + mv ${NEW}.incoming ${NEW} + fi + config ${NEW} +} + +config etc/ha.d/authkeys.new +config etc/ha.d/ha.cf.new +config etc/ha.d/haresources.new +preserve_perms etc/init.d/heartbeat.new diff --git a/system/heartbeat/heartbeat.SlackBuild b/system/heartbeat/heartbeat.SlackBuild new file mode 100644 index 0000000000..1d481aeec7 --- /dev/null +++ b/system/heartbeat/heartbeat.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh + +# Slackware build script for heartbeat + +# Copyright 2018 Pierre-Philipp Braun, Russia +# 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. + +PRGNAM=heartbeat +VERSION=${VERSION:-20200423} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +./bootstrap + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-dependency-tracking \ + --build=$ARCH-slackware-linux \ + --disable-rpath + +make +make install DESTDIR=$PKG +mv $PKG/etc/rc.d/init.d/heartbeat $PKG/etc/rc.d/init.d/heartbeat.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 + +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 + +#/etc/init.d/heartbeat script is already deployed by make install + +#/etc/ha.d/ folder is already created by make install, adding sample configs +cat doc/authkeys > $PKG/etc/ha.d/authkeys.new +cat doc/ha.cf > $PKG/etc/ha.d/ha.cf.new +cat doc/haresources > $PKG/etc/ha.d/haresources.new +chmod 600 $PKG/etc/ha.d/authkeys.new + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README \ + $PKG/usr/doc/$PRGNAM-$VERSION/README.heartbeat +doc=`find doc/ -type f | grep -vE '.([[:digit:]]|in|am|am.orig)$'` +cp -a \ + $doc \ + $PKG/usr/doc/$PRGNAM-$VERSION +unset doc +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:-tgz} diff --git a/system/heartbeat/heartbeat.info b/system/heartbeat/heartbeat.info new file mode 100644 index 0000000000..a4160d6635 --- /dev/null +++ b/system/heartbeat/heartbeat.info @@ -0,0 +1,10 @@ +PRGNAM="heartbeat" +VERSION="20200423" +HOMEPAGE="https://github.com/pbraun9/heartbeat" +DOWNLOAD="https://github.com/pbraun9/heartbeat/archive/20200423/heartbeat-20200423.tar.gz" +MD5SUM="740fab2aea67f98e4c411af35dccec0b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="cluster-glue resource-agents" +MAINTAINER="Pierre-Philipp Braun" +EMAIL="pbraun@nethence.com" diff --git a/system/heartbeat/slack-desc b/system/heartbeat/slack-desc new file mode 100644 index 0000000000..9649a4fb6d --- /dev/null +++ b/system/heartbeat/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------------------------------------------------------| +heartbeat: heartbeat (Linux-HA heartbeat) +heartbeat: +heartbeat: Old school cluster infrastructure for GNU/Linux +heartbeat: Allows you to avoid Corosync and even Pacemaker +heartbeat: +heartbeat: No CRMSH nor PCS required +heartbeat: +heartbeat: You might also want to install cluster-glue, heartbeat, +heartbeat: resource-agents, fence-agents. +heartbeat: +heartbeat: diff --git a/system/hexec/README b/system/hexec/README new file mode 100644 index 0000000000..c073d38384 --- /dev/null +++ b/system/hexec/README @@ -0,0 +1,12 @@ +hexec (hook into exec calls) + +hexec can be used to hook into exec system calls. It evaluates a user +defined expression against all hooked exec calls. This expression can +contain simple path checks (e.g. -path "*/name") and even complex bash +scripts. + +As an example: hexec -name ls -exec echo {} \; bash + +This will run a shell, but any time you try to run "ls", you'll run +"echo" instead. The syntax is similar to "find"; see the man page for +details. diff --git a/system/hexec/hexec.SlackBuild b/system/hexec/hexec.SlackBuild new file mode 100644 index 0000000000..eebdeeefcd --- /dev/null +++ b/system/hexec/hexec.SlackBuild @@ -0,0 +1,82 @@ +#!/bin/sh + +# Slackware build script for hexec + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=hexec +VERSION=${VERSION:-0.2.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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.orig.tar.gz +cd $PRGNAM-$VERSION +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 {} \+ + +# Why is this hardcoded in the configure script? It takes --libdir, but +# doesn't use it for this... +sed -i "s,/lib/$PRGNAM,/lib$LIBDIRSUFFIX/$PRGNAM," configure + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install-strip DESTDIR=$PKG +gzip $PKG/usr/man/man?/*.? + +# NEWS and README are 0-byte placeholders. GNU thinks it can force +# people to write documentation by requiring these files to exist... +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog $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:-tgz} diff --git a/system/hexec/hexec.info b/system/hexec/hexec.info new file mode 100644 index 0000000000..38aa37ca5f --- /dev/null +++ b/system/hexec/hexec.info @@ -0,0 +1,10 @@ +PRGNAM="hexec" +VERSION="0.2.1" +HOMEPAGE="https://packages.debian.org/sid/hexec" +DOWNLOAD="http://deb.debian.org/debian/pool/main/h/hexec/hexec_0.2.1.orig.tar.gz" +MD5SUM="ceec7e57107efecf10d943137b0f5180" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/hexec/slack-desc b/system/hexec/slack-desc new file mode 100644 index 0000000000..ec51937b43 --- /dev/null +++ b/system/hexec/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------------------------------------------------------| +hexec: hexec (hook into exec calls) +hexec: +hexec: hexec can be used to hook into exec system calls. It evaluates a user +hexec: defined expression against all hooked exec calls. This expression can +hexec: contain simple path checks (e.g. -path "*/name") and even complex bash +hexec: scripts. +hexec: +hexec: +hexec: +hexec: +hexec: diff --git a/system/hstr/hstr.SlackBuild b/system/hstr/hstr.SlackBuild index 9d085530d5..828c0f0156 100644 --- a/system/hstr/hstr.SlackBuild +++ b/system/hstr/hstr.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for hstr -# Copyright 2014-2018 Zhu Qun-Ying +# Copyright 2014-2019 Zhu Qun-Ying # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=hstr -VERSION=${VERSION:-2.0} +VERSION=${VERSION:-2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/hstr/hstr.info b/system/hstr/hstr.info index 0bc1d0bb7e..bf5af7b04b 100644 --- a/system/hstr/hstr.info +++ b/system/hstr/hstr.info @@ -1,8 +1,8 @@ PRGNAM="hstr" -VERSION="2.0" +VERSION="2.2" HOMEPAGE="https://github.com/dvorka/hstr" -DOWNLOAD="https://github.com/dvorka/hstr/archive/2.0/hstr-2.0.tar.gz" -MD5SUM="e9f9db3b78624809bc0ce2e98d0b02c0" +DOWNLOAD="https://github.com/dvorka/hstr/archive/2.2/hstr-2.2.tar.gz" +MD5SUM="941138a88005e3e17a9f81c82fa2906d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/hwinfo/hwinfo.SlackBuild b/system/hwinfo/hwinfo.SlackBuild index 024f29b518..7a37308f60 100644 --- a/system/hwinfo/hwinfo.SlackBuild +++ b/system/hwinfo/hwinfo.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=hwinfo -VERSION=${VERSION:-21.46} +VERSION=${VERSION:-21.67} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/hwinfo/hwinfo.info b/system/hwinfo/hwinfo.info index c036245d50..99120953c1 100644 --- a/system/hwinfo/hwinfo.info +++ b/system/hwinfo/hwinfo.info @@ -1,8 +1,8 @@ PRGNAM="hwinfo" -VERSION="21.46" +VERSION="21.67" HOMEPAGE="https://github.com/openSUSE/hwinfo" -DOWNLOAD="https://github.com/openSUSE/hwinfo/archive/21.46/hwinfo-21.46.tar.gz" -MD5SUM="954df2a0f2e3b70ac8163b531a24c3d2" +DOWNLOAD="https://github.com/openSUSE/hwinfo/archive/21.67/hwinfo-21.67.tar.gz" +MD5SUM="afe2085d9b2da9af02d445bd5f5ae965" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libx86emu" diff --git a/system/hwloc/hwloc.SlackBuild b/system/hwloc/hwloc.SlackBuild index 78c7ab75d2..b211bc01cf 100644 --- a/system/hwloc/hwloc.SlackBuild +++ b/system/hwloc/hwloc.SlackBuild @@ -5,7 +5,7 @@ # Written by Wainamoinen <wainamoinen@gmail.com> PRGNAM=hwloc -VERSION=${VERSION:-1.11.0} +VERSION=${VERSION:-2.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,7 +61,8 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ - --disable-debug + --disable-debug \ + --enable-netloc make make install DESTDIR=$PKG diff --git a/system/hwloc/hwloc.info b/system/hwloc/hwloc.info index 721c066639..59ce0ab8e4 100644 --- a/system/hwloc/hwloc.info +++ b/system/hwloc/hwloc.info @@ -1,8 +1,8 @@ PRGNAM="hwloc" -VERSION="1.11.0" -HOMEPAGE="http://www.open-mpi.org/projects/hwloc/" -DOWNLOAD="http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.0.tar.bz2" -MD5SUM="27988d3e904cce5d5d0a8793a727d17b" +VERSION="2.2.0" +HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" +DOWNLOAD="https://download.open-mpi.org/release/hwloc/v2.2/hwloc-2.2.0.tar.bz2" +MD5SUM="5247ba4c1c63623c9285425552df5d92" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/i2c-tools/README b/system/i2c-tools/README index 5ad715d2b8..4779c9ffcd 100644 --- a/system/i2c-tools/README +++ b/system/i2c-tools/README @@ -1,5 +1,3 @@ -i2c-tools (utilities for I2C) - The I2C tools that used to be part of the lm-sensors package have been split to a separate package. The i2c-tools package contains a heterogeneous set of I2C tools for diff --git a/system/i2c-tools/i2c-tools.SlackBuild b/system/i2c-tools/i2c-tools.SlackBuild index 37ab0c622b..05ae7ad50f 100644 --- a/system/i2c-tools/i2c-tools.SlackBuild +++ b/system/i2c-tools/i2c-tools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for i2c-tools -# Copyright 2012-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2012-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=i2c-tools -VERSION=${VERSION:-4.0} +VERSION=${VERSION:-4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/i2c-tools/i2c-tools.info b/system/i2c-tools/i2c-tools.info index 5d650ac218..aea16fa90c 100644 --- a/system/i2c-tools/i2c-tools.info +++ b/system/i2c-tools/i2c-tools.info @@ -1,8 +1,8 @@ PRGNAM="i2c-tools" -VERSION="4.0" +VERSION="4.1" HOMEPAGE="https://i2c.wiki.kernel.org/index.php/I2C_Tools" -DOWNLOAD="https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.0.tar.xz" -MD5SUM="f873c657d00bc00e9c47ed938c2cd770" +DOWNLOAD="https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.1.tar.xz" +MD5SUM="e2981debb4a822a279be7e45a0ede988" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ifuse/ifuse.SlackBuild b/system/ifuse/ifuse.SlackBuild index a5c9c415cc..03aecf9f2d 100644 --- a/system/ifuse/ifuse.SlackBuild +++ b/system/ifuse/ifuse.SlackBuild @@ -27,13 +27,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ifuse -VERSION=${VERSION:-1.1.3} +VERSION=${VERSION:-1.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -68,10 +68,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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" \ @@ -87,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 {} \; @@ -95,7 +95,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* README AUTHORS \ + COPYING* README* AUTHORS \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/ifuse/ifuse.info b/system/ifuse/ifuse.info index 70d5c564d6..9270966ce9 100644 --- a/system/ifuse/ifuse.info +++ b/system/ifuse/ifuse.info @@ -1,8 +1,8 @@ PRGNAM="ifuse" -VERSION="1.1.3" +VERSION="1.1.4" HOMEPAGE="http://www.libimobiledevice.org" -DOWNLOAD="http://www.libimobiledevice.org/downloads/ifuse-1.1.3.tar.bz2" -MD5SUM="83478c7b531b26db286c293bb25bd917" +DOWNLOAD="https://github.com/libimobiledevice/ifuse/releases/download/1.1.4/ifuse-1.1.4.tar.bz2" +MD5SUM="cd31fbd0ea945b2ff1e39eac8d198fdd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/image-analyzer/image-analyzer.SlackBuild b/system/image-analyzer/image-analyzer.SlackBuild index 71a4be7c95..80ca5eed06 100644 --- a/system/image-analyzer/image-analyzer.SlackBuild +++ b/system/image-analyzer/image-analyzer.SlackBuild @@ -4,7 +4,7 @@ # Application to display tree structure of disc images # Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com> -# Copyright 2018 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=image-analyzer -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/image-analyzer/image-analyzer.info b/system/image-analyzer/image-analyzer.info index 942e0e60a8..4c8c475f3d 100644 --- a/system/image-analyzer/image-analyzer.info +++ b/system/image-analyzer/image-analyzer.info @@ -1,10 +1,10 @@ PRGNAM="image-analyzer" -VERSION="3.2.0" -HOMEPAGE="http://cdemu.sourceforge.net/about/analyzer/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/image-analyzer-3.2.0.tar.bz2" -MD5SUM="2cb747a9f2fed0e0dabceaecc0ad36aa" +VERSION="3.2.4" +HOMEPAGE="https://cdemu.sourceforge.net/about/analyzer/" +DOWNLOAD="https://downloads.sourceforge.net/cdemu/image-analyzer-3.2.4.tar.bz2" +MD5SUM="ae7cb81e5909805bf96ce9dfa3ad1328" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libmirage pygobject3-python3 python3-matplotlib" +REQUIRES="libmirage pygobject3-python3 cairocffi python3-matplotlib" MAINTAINER="Isaac Yu" EMAIL="isaacyu1@isaacyu1.com" diff --git a/system/imwheel/imwheel.SlackBuild b/system/imwheel/imwheel.SlackBuild index 5c5dce1a82..5a0bb83416 100644 --- a/system/imwheel/imwheel.SlackBuild +++ b/system/imwheel/imwheel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for imwheel -# Copyright 2009 David Woodfall <dave@dawoodfall.net> +# Copyright 2009 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/imwheel/imwheel.info b/system/imwheel/imwheel.info index a9486f42d9..bad400108c 100644 --- a/system/imwheel/imwheel.info +++ b/system/imwheel/imwheel.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/incron/incron.info b/system/incron/incron.info index 2ac8640348..b5496da4d7 100644 --- a/system/incron/incron.info +++ b/system/incron/incron.info @@ -1,6 +1,6 @@ PRGNAM="incron" VERSION="0.6.0" -HOMEPAGE="http://inotify.aiken.cz" +HOMEPAGE="https://github.com/danfruehauf/incron" DOWNLOAD="https://github.com/danfruehauf/incron/archive/0.6.0/incron-0.6.0.tar.gz" MD5SUM="76e072903edd1ae5a923c528669faccd" DOWNLOAD_x86_64="" diff --git a/system/info2man/README b/system/info2man/README index 7573dd917c..2cc5940532 100644 --- a/system/info2man/README +++ b/system/info2man/README @@ -2,4 +2,4 @@ info2man (convert GNU info files into man pages) info2pod converts GNU info data to POD format for easy transcription to various formats like HTML. info2man is a wrapper for info2pod to convert -info files into nroff -man format. +info files into nroff/man format. diff --git a/system/info2man/flush.pl b/system/info2man/flush.pl deleted file mode 100644 index 8aa6d5580c..0000000000 --- a/system/info2man/flush.pl +++ /dev/null @@ -1,32 +0,0 @@ -# -# This library is no longer being maintained, and is included for backward -# compatibility with Perl 4 programs which may require it. -# -# In particular, this should not be used as an example of modern Perl -# programming techniques. -# -# Suggested alternative: IO::Handle -# -;# Usage: &flush(FILEHANDLE) -;# flushes the named filehandle - -;# Usage: &printflush(FILEHANDLE, "prompt: ") -;# prints arguments and flushes filehandle - -sub flush { - local($old) = select(shift); - $| = 1; - print ""; - $| = 0; - select($old); -} - -sub printflush { - local($old) = select(shift); - $| = 1; - print @_; - $| = 0; - select($old); -} - -1; diff --git a/system/info2man/info2man.SlackBuild b/system/info2man/info2man.SlackBuild index 385cfd6ff8..54c56d52ca 100644 --- a/system/info2man/info2man.SlackBuild +++ b/system/info2man/info2man.SlackBuild @@ -6,8 +6,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. -# The version number below is the modification time of the newest file -# in the source tarball. +# 20201102 bkw: update for v1.1_9 (debian's 1.1-9) # 20140907 bkw: original site blocks downloads based on user-agent. Host # the src on my own server. Only the .info file changed, not the script, so @@ -15,7 +14,7 @@ # Original download link: http://www.cskk.ezoshosting.com/cs/css/info2man.tar.gz PRGNAM=info2man -VERSION=${VERSION:-20040717} +VERSION=${VERSION:-1.1_9} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -27,36 +26,46 @@ OUTPUT=${OUTPUT:-/tmp} set -e +# Trying to teach myself to use bash string stuff instead of echoing +# to 'cut' or whatever. But this is really hard to remember and read: +SRCVER=${VERSION%%_*} +DEBVER=${VERSION##*_} + PERLMODDIR=/usr/share/info2pod rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM.tar.gz +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/${PRGNAM}_${SRCVER}.orig.tar.gz +cd $PRGNAM-$SRCVER +tar xvf $CWD/${PRGNAM}_${SRCVER}-${DEBVER}.debian.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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# Apply debian patches +for i in $( cat debian/patches/series); do + patch -p1 < debian/patches/$i +done -# make the script use its own private perl module dir, so we don't +# Make the script use its own private perl module dir, so we don't # pollute /usr/lib/perl5. sed -i -e '2iuse lib "'$PERLMODDIR'";' info2pod -# this uses an ancient Perl 4 module called flush.pl. The damn thing is less -# than 1KB in size, so I included it in the SlackBuild tarball. It came from -# here: http://www.opensource.apple.com/source/perl/perl-21/perl/lib/flush.pl - mkdir -p $PKG/usr/bin $PKG/$PERLMODDIR install -m0755 -oroot -groot $PRGNAM $PKG/usr/bin install -m0755 -oroot -groot info2pod $PKG/usr/bin -install -m0644 -oroot -groot $CWD/flush.pl $PKG/$PERLMODDIR cp -r cs $PKG/$PERLMODDIR/cs +# Include debian's man pages +mkdir -p $PKG/usr/man/man1 +gzip -9c < debian/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +gzip -9c < debian/info2pod.1 > $PKG/usr/man/man1/info2pod.1.gz + +# 1.1_9 has 0README.txt, but it's mostly install instructions, +# plus a bunch of cruft culled from the original author's other +# projects. Don't bother. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/info2man/info2man.info b/system/info2man/info2man.info index 4a3734703d..d2349216cc 100644 --- a/system/info2man/info2man.info +++ b/system/info2man/info2man.info @@ -1,8 +1,10 @@ PRGNAM="info2man" -VERSION="20040717" +VERSION="1.1_9" HOMEPAGE="https://packages.debian.org/sid/info2man" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/info2man.tar.gz" -MD5SUM="303b9bf313e88558ff577806398f6c4c" +DOWNLOAD="http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1.orig.tar.gz \ + http://deb.debian.org/debian/pool/main/i/info2man/info2man_1.1-9.debian.tar.xz" +MD5SUM="37e9cd74683e1832a4f27ad5c7961a7b \ + 0610fec52815b003df8732d3ab21f0f5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/info2man/slack-desc b/system/info2man/slack-desc index c70b27f087..4ba295af51 100644 --- a/system/info2man/slack-desc +++ b/system/info2man/slack-desc @@ -10,7 +10,7 @@ info2man: info2man (convert GNU info files into man pages) info2man: info2man: info2pod converts GNU info data to POD format for easy transcription info2man: to various formats like HTML. info2man is a wrapper for info2pod to -info2man: convert info files into nroff -man format. +info2man: convert info files into nroff/man format. info2man: info2man: info2man: diff --git a/system/intel-microcode/README b/system/intel-microcode/README index 549d53c700..5fde6323b9 100644 --- a/system/intel-microcode/README +++ b/system/intel-microcode/README @@ -43,3 +43,20 @@ NOTES: To include these special microcodes files, run the script like that: $ INCLUDE_UCODE_WITH_CAVEATS=yes ./intel-microcode.SlackBuild + +5. I updated the package and my microcode has been reverted to + the older revision. What is wrong? What should I do? + + As noted by Ed on Slackbuilds-users mailing list: + https://lists.slackbuilds.org/pipermail/slackbuilds-users/2020-April/024262.html + + Intel has removed microcode updates for some older CPUs. + The updates are no longer present in the tarball officially + released by Intel. + + If you find yourself in this situation, you can either stick + to the older version of the package that works for you or you can + let me know and I might include that particular microcode in + the package. In the latter case, you'll need to provide me with + the details on the exact microcode file in question, specifically + by providing the exact file name, for example `06-0b-04`. diff --git a/system/intel-microcode/intel-microcode.SlackBuild b/system/intel-microcode/intel-microcode.SlackBuild index f9ad4f9935..a2e6cacf9d 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 2018 Andrzej Telszewski, Szczecin +# Copyright 2021 Andrzej Telszewski, Szczecin # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=intel-microcode -SRCNAM=microcode -VERSION=${VERSION:-20180807} +SRCNAM=Intel-Linux-Processor-Microcode-Data-Files-microcode +VERSION=${VERSION:-20210216} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH=noarch @@ -41,8 +41,8 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -mkdir $PRGNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tgz -C $PRGNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +mv $SRCNAM-$VERSION $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -62,6 +62,7 @@ fi # The "list" file is not always present in the upstream tarball. # For consistency, let's ensure it's never present in the package. + rm -rf $PKG/lib/firmware/intel-ucode/list mkdir -p $PKG/boot @@ -70,8 +71,7 @@ iucode_tool -v --write-earlyfw=$PKG/boot/intel-ucode.cpio \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat license > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE -cat releasenote > $PKG/usr/doc/$PRGNAM-$VERSION/RELEASE_NOTE +cp -a license {README,releasenote,security}.md $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/intel-microcode/intel-microcode.info b/system/intel-microcode/intel-microcode.info index c5649ba187..9d177df889 100644 --- a/system/intel-microcode/intel-microcode.info +++ b/system/intel-microcode/intel-microcode.info @@ -1,10 +1,10 @@ PRGNAM="intel-microcode" -VERSION="20180807" -HOMEPAGE="https://downloadcenter.intel.com/" -DOWNLOAD="https://downloadmirror.intel.com/28039/eng/microcode-20180807.tgz" -MD5SUM="49f534f1079d3c5bc178a150c1c105aa" +VERSION="20210216" +HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files" +DOWNLOAD="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20210216/Intel-Linux-Processor-Microcode-Data-Files-microcode-20210216.tar.gz" +MD5SUM="855253d4543a4cf0a40c7fb733c4dcae" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="iucode_tool" MAINTAINER="Andrzej Telszewski" -EMAIL="atelszewski@gmail.com" +EMAIL="andrzej@telszewski.com" diff --git a/system/intel-microcode/slack-desc b/system/intel-microcode/slack-desc index 114ff829fe..b15c7b8817 100644 --- a/system/intel-microcode/slack-desc +++ b/system/intel-microcode/slack-desc @@ -15,5 +15,5 @@ intel-microcode: can be done at runtime using the operating system. This package intel-microcode: contains those processors that support OS loading of microcode intel-microcode: updates. intel-microcode: -intel-microcode: Homepage: https://downloadcenter.intel.com/ +intel-microcode: intel-microcode: diff --git a/system/intelmas/README b/system/intelmas/README new file mode 100644 index 0000000000..2b3a4f8d60 --- /dev/null +++ b/system/intelmas/README @@ -0,0 +1,13 @@ +intelmas (Intel Memory And Storage Tool) + +The intelmas is a proprietary command-line tool to manage Intel SSDs and +Optane memory devices. It provides firmware update capability as well as +reading and setting many configuration settings. + +The intelmas unifies functionality of several Intel programs including +the isdct (Intel SSD Data Center Tool), which was previously available +on SBo. The intelmas is a drop-in replacement for the isdct. + +To work with SATA drives intelmas requires the sg kernel module. To have +this module loaded on boot, please uncomment the corresponding line in +/etc/rc.d/rc.modules.local diff --git a/system/isdct/isdct.SlackBuild b/system/intelmas/intelmas.SlackBuild index 00cd337528..1f385966c1 100644 --- a/system/isdct/isdct.SlackBuild +++ b/system/intelmas/intelmas.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for isdct +# Slackware build script for intelmas -# Copyright 2016-2018, Alexander Verbovetsky, Moscow, Russia +# Copyright 2020-2021, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=isdct -VERSION=${VERSION:-3.0.17} +PRGNAM=intelmas +VERSION=${VERSION:-1.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -38,7 +38,7 @@ fi case "$ARCH" in i?86) RPMARCH=i386 ;; x86_64) RPMARCH=x86_64 ;; - *) printf "\n$ARCH is unsupported for the Intel SSD Data Center Tool.\n\n" + *) printf "\n$ARCH is unsupported for the Intel Memory And Storage Tool.\n\n" exit 1 ;; esac @@ -56,8 +56,8 @@ rm -rf $PRGNAM-$VERSION mkdir -p $PRGNAM-$VERSION cd $PRGNAM-$VERSION -unzip $CWD/Intel_SSD_Data_Center_Tool_${VERSION}*Linux.zip -rpm2cpio isdct-${VERSION}*.$RPMARCH.rpm | cpio -imdv +unzip "$CWD/Intel*MAS_CLI_Tool_*Linux*.zip" +rpm2cpio intelmas-${VERSION}*.$RPMARCH.rpm | cpio -imdv chown -R root:root . find -L . \ @@ -74,7 +74,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 *.pdf *.PDF $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.pdf *.PDF $PKG/usr/doc/$PRGNAM-$VERSION 2>/dev/null || : cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/intelmas/intelmas.info b/system/intelmas/intelmas.info new file mode 100644 index 0000000000..3fe80dd80c --- /dev/null +++ b/system/intelmas/intelmas.info @@ -0,0 +1,10 @@ +PRGNAM="intelmas" +VERSION="1.7" +HOMEPAGE="https://downloadcenter.intel.com/download/30379" +DOWNLOAD="https://downloadmirror.intel.com/30379/eng/Intel%C2%AE_MAS_CLI_Tool_Linux_1.7.zip" +MD5SUM="c07beb6b400ae2bf583c5b9fdbbb1bd3" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/system/intelmas/slack-desc b/system/intelmas/slack-desc new file mode 100644 index 0000000000..8591c17410 --- /dev/null +++ b/system/intelmas/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------------------------------------------------------| +intelmas: intelmas (Intel Memory And Storage Tool) +intelmas: +intelmas: The intelmas is a proprietary command-line tool to manage Intel SSDs +intelmas: and Optane memory devices. It provides firmware update capability as +intelmas: well as reading and setting many configuration settings. +intelmas: +intelmas: +intelmas: Homepage: https://downloadcenter.intel.com/download/30379 +intelmas: +intelmas: +intelmas: diff --git a/system/inxi/inxi.SlackBuild b/system/inxi/inxi.SlackBuild index e1cc85ac26..5bfc28111a 100644 --- a/system/inxi/inxi.SlackBuild +++ b/system/inxi/inxi.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for inxi # Copyright 2011-2012 Binh Nguyen <binhvng@gmail.com> -# Copyright 2014-2018 Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Copyright 2014-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=inxi -VERSION=${VERSION:-3.0.27} +VERSION=${VERSION:-3.0.37} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/inxi/inxi.info b/system/inxi/inxi.info index 189520f330..e4a15bf195 100644 --- a/system/inxi/inxi.info +++ b/system/inxi/inxi.info @@ -1,8 +1,8 @@ PRGNAM="inxi" -VERSION="3.0.27" +VERSION="3.0.37" HOMEPAGE="https://github.com/smxi/inxi" -DOWNLOAD="https://github.com/smxi/inxi/archive/3.0.27-1.tar.gz" -MD5SUM="f09be1f546239323c1eca8e2c369d621" +DOWNLOAD="https://github.com/smxi/inxi/archive/3.0.37-1.tar.gz" +MD5SUM="672437de389fecd2ce807f9a36793576" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ioninja/ioninja.SlackBuild b/system/ioninja/ioninja.SlackBuild index 786daa4f19..c9db3eb44b 100644 --- a/system/ioninja/ioninja.SlackBuild +++ b/system/ioninja/ioninja.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ioninja -VERSION=${VERSION:-3.8.5} +VERSION=${VERSION:-3.10.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,7 +42,7 @@ OUTPUT=${OUTPUT:-/tmp} rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -ar p $CWD/$BASENAME.deb data.tar.xz | tar xvJ +ar p $CWD/$BASENAME.deb data.tar.gz | tar xvz chown -R root:root . find -L . \ diff --git a/system/ioninja/ioninja.info b/system/ioninja/ioninja.info index 7c1bcba2c0..33489f3555 100644 --- a/system/ioninja/ioninja.info +++ b/system/ioninja/ioninja.info @@ -1,10 +1,10 @@ PRGNAM="ioninja" -VERSION="3.8.5" +VERSION="3.10.2" HOMEPAGE="http://ioninja.com" -DOWNLOAD="http://tibbo.com/downloads/archive/ioninja/ioninja-3.8.5/ioninja-3.8.5-linux-x86.deb" -MD5SUM="65aaef93637f25281fbe4cd4d96ce05a" -DOWNLOAD_x86_64="http://tibbo.com/downloads/archive/ioninja/ioninja-3.8.5/ioninja-3.8.5-linux-amd64.deb" -MD5SUM_x86_64="7e912841b286fa903fc889d4fd477196" +DOWNLOAD="http://tibbo.com/downloads/archive/ioninja/ioninja-3.10.2/ioninja-3.10.2-linux-x86.deb" +MD5SUM="d20ea21e510910900ef69cb41c96c35b" +DOWNLOAD_x86_64="http://tibbo.com/downloads/archive/ioninja/ioninja-3.10.2/ioninja-3.10.2-linux-amd64.deb" +MD5SUM_x86_64="54fb487eea38c7d95c4c3542aba4cdd8" REQUIRES="" MAINTAINER="Fernando Lopez Jr." EMAIL="fernando.lopezjr@gmail.com" diff --git a/system/ipmitool/ipmitool-openssl-1.1.patch b/system/ipmitool/ipmitool-openssl-1.1.patch new file mode 100644 index 0000000000..39b311f6e9 --- /dev/null +++ b/system/ipmitool/ipmitool-openssl-1.1.patch @@ -0,0 +1,88 @@ +--- src/plugins/lanplus/lanplus_crypt_impl.c.orig 2020-01-05 20:05:14.536039135 +0100 ++++ src/plugins/lanplus/lanplus_crypt_impl.c 2020-01-05 20:09:48.808613128 +0100 +@@ -164,10 +164,10 @@ + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); + + + *bytes_written = 0; +@@ -191,7 +191,7 @@ + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + *bytes_written = 0; +@@ -201,7 +201,7 @@ + { + uint32_t tmplen; + +- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { + *bytes_written = 0; + return; /* Error */ +@@ -210,7 +210,8 @@ + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); + } + } + } +@@ -239,10 +240,10 @@ + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); + + + if (verbose >= 5) +@@ -266,7 +267,7 @@ + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); +@@ -277,7 +278,7 @@ + { + uint32_t tmplen; + +- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { + char buffer[1000]; + ERR_error_string(ERR_get_error(), buffer); +@@ -290,7 +291,8 @@ + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); + } + } + diff --git a/system/ipmitool/ipmitool.SlackBuild b/system/ipmitool/ipmitool.SlackBuild index b632d54ce8..40fadb21fd 100644 --- a/system/ipmitool/ipmitool.SlackBuild +++ b/system/ipmitool/ipmitool.SlackBuild @@ -9,9 +9,10 @@ # Based on http://slackbuilds.org/template.SlackBuild # Modified by Mario Preksavec <mario@slackware.hr> +# Updated by Emmanuel N. Millan PRGNAM=ipmitool -VERSION=${VERSION:-1.8.13} +VERSION=${VERSION:-1.8.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -48,7 +49,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -57,30 +58,29 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix compilation with openssl-1.1 +[ "`openssl version | grep 1.1`" ] && patch -p0 < $CWD/ipmitool-openssl-1.1.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +make DOCDIR=/usr/doc/$PRGNAM-$VERSION +make DOCDIR=/usr/doc/$PRGNAM-$VERSION install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +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 -mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION -rmdir $PKG/usr/share/doc cp -a contrib $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/ipmitool/ipmitool.info b/system/ipmitool/ipmitool.info index db17f3f7d4..4d4c029cad 100644 --- a/system/ipmitool/ipmitool.info +++ b/system/ipmitool/ipmitool.info @@ -1,10 +1,10 @@ PRGNAM="ipmitool" -VERSION="1.8.13" +VERSION="1.8.18" HOMEPAGE="http://ipmitool.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/ipmitool/ipmitool/1.8.13/ipmitool-1.8.13.tar.gz" -MD5SUM="c1107597848bd0a8be05c179e6f66b62" +DOWNLOAD="http://downloads.sourceforge.net/project/ipmitool/ipmitool/1.8.18/ipmitool-1.8.18.tar.bz2" +MD5SUM="bab7ea104c7b85529c3ef65c54427aa3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Zordrak" -EMAIL="sbo@tpa.me.uk" +MAINTAINER="Emmanuel N. Millan" +EMAIL="emmanueln@gmail.com" diff --git a/system/irqbalance/irqbalance.SlackBuild b/system/irqbalance/irqbalance.SlackBuild index 08e62f5538..5f12fdc5b9 100644 --- a/system/irqbalance/irqbalance.SlackBuild +++ b/system/irqbalance/irqbalance.SlackBuild @@ -4,6 +4,8 @@ # Copyright 2006 by Yalla-One <yallaone@gmail.com> # Copyright 2013-2015 by LukenShiro, Italy +# Copyright 2019-2020 Logan Rathbone <poprocks@gmail.com> +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=irqbalance -VERSION=${VERSION:-1.0.9} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,7 +43,7 @@ TMP=${TMP:-/tmp/SBo} PKG=${TMP}/package-${PRGNAM} OUTPUT=${OUTPUT:-/tmp} -DOCFILES="AUTHORS COPYING README" +DOCFILES="AUTHORS COPYING README.md" SRCVER=v$VERSION if [ "$ARCH" = "i486" ]; then @@ -100,4 +102,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd ${PKG} /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/system/irqbalance/irqbalance.info b/system/irqbalance/irqbalance.info index e9cb95b6e7..57a0f96647 100644 --- a/system/irqbalance/irqbalance.info +++ b/system/irqbalance/irqbalance.info @@ -1,10 +1,10 @@ PRGNAM="irqbalance" -VERSION="1.0.9" +VERSION="1.7.0" HOMEPAGE="https://github.com/Irqbalance/irqbalance" -DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.0.9.tar.gz" -MD5SUM="30174d3941c5452a1e4ecee394a76ff8" +DOWNLOAD="https://github.com/Irqbalance/irqbalance/archive/v1.7.0/irqbalance-1.7.0.tar.gz" +MD5SUM="621117212f6e7ed33d70a25e917e3e0d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LukenShiro" -EMAIL="lukenshiro@ngi.it" +MAINTAINER="Logan Rathbone" +EMAIL="poprocks@gmail.com" diff --git a/system/irqbalance/slack-desc b/system/irqbalance/slack-desc index 5ef790d8ad..00ee8942e1 100644 --- a/system/irqbalance/slack-desc +++ b/system/irqbalance/slack-desc @@ -15,5 +15,5 @@ irqbalance: optimal performance. To a large degree, the work irqbalance does irqbalance: is invisible to you; if irqbalance performs its job correctly, nobody irqbalance: will ever notice it's there or want to turn it off. irqbalance: -irqbalance: homepage: http://code.google.com/p/irqbalance +irqbalance: irqbalance: diff --git a/system/isdct/README b/system/isdct/README deleted file mode 100644 index 188e09646e..0000000000 --- a/system/isdct/README +++ /dev/null @@ -1,11 +0,0 @@ -The isdct is a proprietary command-line tool to manage Intel SSD Data -Center Family NVMe and SATA drives. It can be used to update SSD -firmware, calculate drive life expectancy, analyze the SMART -information, securely erase, and much more. - -isdct supports Intel SSD DC, 750 Series, and some other SSDs -(but does not support 910 Series). - -The sg kernel module is required by isdct. To have this module loaded -on boot, please uncomment the corresponding line in -/etc/rc.d/rc.modules.local diff --git a/system/isdct/isdct.info b/system/isdct/isdct.info deleted file mode 100644 index ba44029e69..0000000000 --- a/system/isdct/isdct.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="isdct" -VERSION="3.0.17" -HOMEPAGE="https://downloadcenter.intel.com/download/28460/Intel-SSD-Data-Center-Tool" -DOWNLOAD="https://downloadmirror.intel.com/28460/eng/Intel_SSD_Data_Center_Tool_3.0.17_Linux.zip" -MD5SUM="93df2e420e41e235aead41d0f64ea19a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" diff --git a/system/isextract/README b/system/isextract/README new file mode 100644 index 0000000000..81d4c5fbe3 --- /dev/null +++ b/system/isextract/README @@ -0,0 +1,10 @@ +isextract (extract v3 InstallShield files) + +isextract is a command line tool to extract the *.z InstallShield v3 +packages many old windows games were distributed as. + +The files isextract supports are identified by the file command as +"InstallShield Z archive Data", and begin with a hex signature of 13 5d +65 8c 3a 01 02. + +See also: unshield, for other types of InstallShield files. diff --git a/system/isextract/fix_output_formatting.diff b/system/isextract/fix_output_formatting.diff new file mode 100644 index 0000000000..d48b491bb8 --- /dev/null +++ b/system/isextract/fix_output_formatting.diff @@ -0,0 +1,12 @@ +diff -Naur isextract-20141107_5adb0af/src/isextract.cpp isextract-20141107_5adb0af.patched/src/isextract.cpp +--- isextract-20141107_5adb0af/src/isextract.cpp 2020-04-29 12:52:20.000000000 -0400 ++++ isextract-20141107_5adb0af.patched/src/isextract.cpp 2020-04-29 13:28:40.715911070 -0400 +@@ -212,7 +212,7 @@ + csize = it->second.compressed_size; + + +- std::cout << fname << " " << csize << " " << ctime(&time) << "\n"; ++ std::cout << fname << " " << csize << " " << ctime(&time); + + it++; + } diff --git a/system/isextract/git2tarxz.sh b/system/isextract/git2tarxz.sh new file mode 100644 index 0000000000..02b50e68cd --- /dev/null +++ b/system/isextract/git2tarxz.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +# Create source tarball from git repo, with generated version +# number. + +# Note that this script doesn't need to be run as root. It does +# need to be able to write to the current directory it's run from. + +# Takes one optional argument, which is the commit or tag to create +# a tarball of. With no arg, HEAD is used. + +PRGNAM=isextract +CLONE_URL=https://github.com/OmniBlade/isextract.git + +set -e + +GITDIR=$( mktemp -dt $PRGNAM.git.XXXXXX ) +rm -rf $GITDIR +git clone $CLONE_URL $GITDIR + +CWD="$( pwd )" +cd $GITDIR + +if [ "$1" != "" ]; then + git reset --hard "$1" || exit 1 +fi + +GIT_SHA=$( git rev-parse --short HEAD ) + +DATE=$( git log --date=format:%Y%m%d --format=%cd | head -1 ) + +VERSION=${DATE}_${GIT_SHA} + +rm -rf .git +find . -name .gitignore -print0 | xargs -0 rm -f + +cd "$CWD" +rm -rf $PRGNAM-$VERSION $PRGNAM-$VERSION.tar.xz +mv $GITDIR $PRGNAM-$VERSION +tar cvfJ $PRGNAM-$VERSION.tar.xz $PRGNAM-$VERSION + +echo +echo "Created tarball: $PRGNAM-$VERSION.tar.xz" +echo "VERSION=$VERSION" diff --git a/system/isextract/isextract.1 b/system/isextract/isextract.1 new file mode 100644 index 0000000000..318ac7fabd --- /dev/null +++ b/system/isextract/isextract.1 @@ -0,0 +1,97 @@ +.\" Man page generated from reStructuredText. +. +.TH ISEXTRACT 1 "2020-04-29" "20141107_5adb0af" "SlackBuilds.org" +.SH NAME +isextract \- Extract InstallShield v3 archives +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for isextract(1) man page. Convert with: +. +.\" rst2man.py isextract.rst > isextract.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.\" converting from pod: +. +.\" s/B<\([^>]*\)>/**\1**/g +. +.\" s/I<\([^>]*\)>/*\1*/g +. +.SH SYNOPSIS +.sp +isextract [\fIl|x\fP] file.z +.SH DESCRIPTION +.sp +isextract is a command line tool to extract the .z InstallShield v3 +packages many old windows games were distributed as. +.sp +The files isextract supports normally have a \fB\&.z\fP extension, and can be +idenfified by the file command: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ file data.z +data.z: InstallShield Z archive Data +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +\&...or by the hex signature at the start of the file: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +$ head \-c6 data.z | xxd +00000000: 135d 658c 3a01 .]e.:. +.ft P +.fi +.UNINDENT +.UNINDENT +.SH OPTIONS +.sp +\fBl\fP List contents of archive. +.sp +\fBx\fP Extract archive to current directory. +.SH COPYRIGHT +.sp +See the file /usr/doc/PRGNAM\-20141107_5adb0af/LICENSE for license information. +.SH AUTHORS +.sp +isextract was written by OmniBlade. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +unshield(1), cabextract(1) +.\" Generated by docutils manpage writer. +. diff --git a/system/isextract/isextract.SlackBuild b/system/isextract/isextract.SlackBuild new file mode 100644 index 0000000000..a4bc4c2c58 --- /dev/null +++ b/system/isextract/isextract.SlackBuild @@ -0,0 +1,72 @@ +#!/bin/sh + +# Slackware build script for isextract + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=isextract +VERSION=${VERSION:-20141107_5adb0af} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# get rid of "double-spaced" output in l command +patch -p1 < $CWD/fix_output_formatting.diff + +make OPTFLAGS="$SLKCFLAGS" +mkdir -p $PKG/usr/bin +install -s -m0755 build/$PRGNAM $PKG/usr/bin + +# man page written by SlackBuild author +mkdir -p $PKG/usr/man/man1 +gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README* LICENSE* $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:-tgz} diff --git a/system/isextract/isextract.info b/system/isextract/isextract.info new file mode 100644 index 0000000000..933dd14ac5 --- /dev/null +++ b/system/isextract/isextract.info @@ -0,0 +1,10 @@ +PRGNAM="isextract" +VERSION="20141107_5adb0af" +HOMEPAGE="https://github.com/OmniBlade/isextract" +DOWNLOAD="https://slackware.uk/~urchlay/src/isextract-20141107_5adb0af.tar.xz" +MD5SUM="2950724969069bfc9b304530e4bc1604" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/isextract/isextract.rst b/system/isextract/isextract.rst new file mode 100644 index 0000000000..aaa4622681 --- /dev/null +++ b/system/isextract/isextract.rst @@ -0,0 +1,74 @@ +.. RST source for isextract(1) man page. Convert with: +.. rst2man.py isextract.rst > isextract.1 +.. rst2man.py comes from the SBo development/docutils package. + +.. |version| replace:: 20141107_5adb0af +.. |date| date:: + +.. converting from pod: +.. s/B<\([^>]*\)>/**\1**/g +.. s/I<\([^>]*\)>/*\1*/g + +========= +isextract +========= + +--------------------------------- +Extract InstallShield v3 archives +--------------------------------- + +:Manual section: 1 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +isextract [*l|x*] file.z + +DESCRIPTION +=========== + +isextract is a command line tool to extract the .z InstallShield v3 +packages many old windows games were distributed as. + +The files isextract supports normally have a **.z** extension, and can be +idenfified by the file command: + +:: + + $ file data.z + data.z: InstallShield Z archive Data + +...or by the hex signature at the start of the file: + +:: + + $ head -c6 data.z | xxd + 00000000: 135d 658c 3a01 .]e.:. + +OPTIONS +======= + +**l** List contents of archive. + +**x** Extract archive to current directory. + +COPYRIGHT +========= + +See the file /usr/doc/PRGNAM-|version|/LICENSE for license information. + +AUTHORS +======= + +isextract was written by OmniBlade. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. + +SEE ALSO +======== + +unshield(1), cabextract(1) diff --git a/system/isextract/slack-desc b/system/isextract/slack-desc new file mode 100644 index 0000000000..a5b892c58e --- /dev/null +++ b/system/isextract/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------------------------------------------------------| +isextract: isextract (extract v3 InstallShield files) +isextract: +isextract: isextract is a command line tool to extract the *.z InstallShield +isextract: v3 packages many old windows games were distributed as. +isextract: +isextract: The files isextract supports are identified by the file command as +isextract: "InstallShield Z archive Data", and begin with a hex signature of +isextract: 13 5d 65 8c 3a 01 02. +isextract: +isextract: +isextract: diff --git a/system/isight-firmware-tools/isight-firmware-tools.info b/system/isight-firmware-tools/isight-firmware-tools.info index 9c0e9d61e2..ec884ec343 100644 --- a/system/isight-firmware-tools/isight-firmware-tools.info +++ b/system/isight-firmware-tools/isight-firmware-tools.info @@ -6,5 +6,5 @@ MD5SUM="d2823c083dc0ef8a589ba3f84b8e9167" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Stu Reedy" -EMAIL="stureedy@spamcop.net" +MAINTAINER="Bojan Popovic" +EMAIL="bocke@slackware-srbija.org" diff --git a/system/jdupes/jdupes.SlackBuild b/system/jdupes/jdupes.SlackBuild index 938cd487bb..9ef57a215c 100644 --- a/system/jdupes/jdupes.SlackBuild +++ b/system/jdupes/jdupes.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jdupes -VERSION=${VERSION:-1.11.1} +VERSION=${VERSION:-1.19.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -52,7 +52,7 @@ else LIBDIRSUFFIX="" fi -DOCFILES="CHANGES INSTALL LICENSE README" +DOCFILES="CHANGES INSTALL LICENSE README*" set -e @@ -62,6 +62,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +rm testdir/recursed_a/symlink_infinite_loop chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -70,6 +71,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; sed -i -e 's|share/man|man|' Makefile +sed -i -e 's|usr/local|usr|' Makefile make PREFIX=/usr CFLAGS_EXTRA="$SLKCFLAGS" make install DESTDIR=$PKG diff --git a/system/jdupes/jdupes.info b/system/jdupes/jdupes.info index 84a0c179db..2193d76102 100644 --- a/system/jdupes/jdupes.info +++ b/system/jdupes/jdupes.info @@ -1,8 +1,8 @@ PRGNAM="jdupes" -VERSION="1.11.1" +VERSION="1.19.2" HOMEPAGE="https://github.com/jbruchon/jdupes" -DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.11.1/jdupes-1.11.1.tar.gz" -MD5SUM="ad40c43af1eebdff11bd4b4a8f2bf65e" +DOWNLOAD="https://github.com/jbruchon/jdupes/archive/v1.19.2/jdupes-1.19.2.tar.gz" +MD5SUM="db9c05aa7a1c61390cbdb41ad1ab8fb4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/jenkins/README b/system/jenkins/README index a28a3572db..e900430c79 100644 --- a/system/jenkins/README +++ b/system/jenkins/README @@ -1,9 +1,11 @@ -Jenkins monitors executions of repeated jobs, such as building a software -project or jobs run by cron. Among those things, current Jenkins focuses on the -following two jobs: +Jenkins monitors executions of repeated jobs, such as building a +software project or jobs run by cron. Among those things, current +Jenkins focuses on the following two jobs: + 1. Building/testing software projects continuously 2. Monitoring executions of externally-run jobs, +This slackbuild tracks the Jenkins LTS branch. Groupname and Username diff --git a/system/jenkins/files/jenkins.conf b/system/jenkins/files/jenkins.conf index fbdbcb875b..8b9688362b 100644 --- a/system/jenkins/files/jenkins.conf +++ b/system/jenkins/files/jenkins.conf @@ -52,6 +52,12 @@ JENKINS_USER="jenkins" ## the SSL KeyManagerFactory type (eg SunX509, IbmX509). Default is SunX509 #JENKINS_HTTPS_KEY_MANAGER="SunX509" +## this along with JENKINS_HTTPS_CERTIFICATE can be used to run HTTPS with +## OpenSSL secret key file and the corresponding certificate file +#JENKINS_HTTPS_PRIVATE_KEY="" + +#JENKINS_HTTPS_CERTIFICATE="" + ## Default home of jenkins stuffs #JENKINS_HOME=/var/lib/jenkins diff --git a/system/jenkins/files/jenkinsd.sh b/system/jenkins/files/jenkinsd.sh index 87d6aa432a..0e616bc9aa 100644 --- a/system/jenkins/files/jenkinsd.sh +++ b/system/jenkins/files/jenkinsd.sh @@ -79,6 +79,14 @@ if [ "$JENKINS_HTTPS_KEY_MANAGER" != "" ] ; then JENKINS_HTTPS_KEY_MANAGER_ARG="--httpsKeyManagerType=$JENKINS_HTTPS_KEY_MANAGER" fi +if [ "$JENKINS_HTTPS_PRIVATE_KEY" != "" ] ; then + JENKINS_HTTPS_PRIVATE_KEY="--httpsPrivateKey=$JENKINS_HTTPS_PRIVATE_KEY" +fi + +if [ "$JENKINS_HTTPS_CERTIFICATE" != "" ] ; then + JENKINS_HTTPS_CERTIFICATE="--httpsCertificate=$JENKINS_HTTPS_CERTIFICATE" +fi + if [ "$JENKINS_LOG_FILE" != "" ] ; then JENKINS_LOG_FILE_ARG="--logfile=$JENKINS_LOG_FILE" fi @@ -106,12 +114,14 @@ su - $JENKINS_USER -c " \ $JENKINS_HTTPS_KEYSTORE_ARG \ $JENKINS_HTTPS_KEYSTORE_PASSWORD_ARG \ $JENKINS_HTTPS_KEY_MANAGER_ARG \ + $JENKINS_HTTPS_PRIVATE_KEY \ + $JENKINS_HTTPS_CERTIFICATE \ $JENKINS_LOG_FILE_ARG \ $JENKINS_WEBAPPSDIR_ARG \ $JENKINS_WEBROOT_ARG \ $OPT_ARGS \ </dev/null >> $JENKINS_CONSOLELOG_FILE 2>&1 & - + echo \$! > $JENKINS_PID_FILE disown \$! diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild index 444e5c615a..b87aec3c39 100644 --- a/system/jenkins/jenkins.SlackBuild +++ b/system/jenkins/jenkins.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for jenkins -# Copyright 2017 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy +# Copyright 2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy +# Copyright 2017-2021 Andrew Clemons, Wellington, New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jenkins -VERSION=${VERSION:-2.73.3} +VERSION=${VERSION:-2.277.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info index a995389a77..e7e644d4a7 100644 --- a/system/jenkins/jenkins.info +++ b/system/jenkins/jenkins.info @@ -1,10 +1,10 @@ PRGNAM="jenkins" -VERSION="2.73.3" -HOMEPAGE="http://jenkins-ci.org" -DOWNLOAD="http://mirrors.jenkins-ci.org/war-stable/2.73.3/jenkins.war" -MD5SUM="a0244e5e6137be493fe7404b26d35714" +VERSION="2.277.2" +HOMEPAGE="https://www.jenkins.io/" +DOWNLOAD="http://mirrors.jenkins.io/war-stable/2.277.2/jenkins.war" +MD5SUM="28e9cfedc215824551df7c83aee8768d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" -MAINTAINER="Giorgio Peron" -EMAIL="giorgio.peron@gmail.com" +MAINTAINER="Andrew Clemons" +EMAIL="andrew.clemons@gmail.com" diff --git a/system/jenkins/slack-desc b/system/jenkins/slack-desc index 6c95f78f7e..3ce6279e7f 100644 --- a/system/jenkins/slack-desc +++ b/system/jenkins/slack-desc @@ -14,6 +14,6 @@ jenkins: Jenkins focuses on the following two jobs: jenkins: (o) Building/testing software projects continuously jenkins: (o) Monitoring executions of externally-run jobs jenkins: -jenkins: Homepage: http://jenkins-ci.org/ +jenkins: Homepage: https://jenkins.io/ jenkins: jenkins: diff --git a/system/john/README b/system/john/README index 574ffb08b1..543e12c8e7 100644 --- a/system/john/README +++ b/system/john/README @@ -1,7 +1,8 @@ -John the Ripper is a fast password cracker. Its primary purpose is to detect -weak passwords. Besides several crypt(3) password hash types most commonly -found on various Unix flavors, supported out of the box are Kerberos AFS and -Windows NT/2000/XP/2003 LM hashes, plus several more with contributed patches. +John the Ripper is a fast password cracker. Its primary purpose is to +detect weak passwords. Besides several crypt(3) password hash types +most commonly found on various Unix flavors, supported out of the box +are Kerberos AFS and Windows NT/2000/XP/2003 LM hashes, plus several +more with contributed patches. -For more information, consult the project's homepage and/or the documentation -installed in /usr/doc/john-1.8.0 +For more information, consult the project's homepage and/or the +documentation installed in /usr/doc/john-1.8.0 diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild index 1a61781796..cfe21faaee 100644 --- a/system/john/john.SlackBuild +++ b/system/john/john.SlackBuild @@ -14,8 +14,8 @@ # slow hashes. PRGNAM=john -VERSION=${VERSION:-1.8.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.9.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -44,6 +44,8 @@ if [ "$ARCH" = "i486" ]; then LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then if grep -q ^flags.*avx /proc/cpuinfo; then + TARGET=linux-x86-64-avx2 + elif grep -q ^flags.*avx /proc/cpuinfo; then TARGET=linux-x86-64-avx else TARGET=linux-x86-64 @@ -61,9 +63,6 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -# Soft-link in tarball causes x bit to be set below; nuke it -rm -f $PRGNAM-$VERSION/README - cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/john/john.info b/system/john/john.info index 9fb3c8e148..20697b1107 100644 --- a/system/john/john.info +++ b/system/john/john.info @@ -1,8 +1,8 @@ PRGNAM="john" -VERSION="1.8.0" -HOMEPAGE="http://www.openwall.com/john/" -DOWNLOAD="http://www.openwall.com/john/j/john-1.8.0.tar.xz" -MD5SUM="a4086df68f51778782777e60407f1869" +VERSION="1.9.0" +HOMEPAGE="https://www.openwall.com/john/" +DOWNLOAD="https://www.openwall.com/john/k/john-1.9.0.tar.xz" +MD5SUM="494b5e6d672ff100fb9fb54c4fb6ed3e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/joyce/joyce.SlackBuild b/system/joyce/joyce.SlackBuild index ed0c93db00..cc860d8ada 100644 --- a/system/joyce/joyce.SlackBuild +++ b/system/joyce/joyce.SlackBuild @@ -7,7 +7,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. PRGNAM=joyce -VERSION=${VERSION:-2.2.12} +VERSION=${VERSION:-2.2.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,11 +47,8 @@ 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/joyce/joyce.info b/system/joyce/joyce.info index b5e5e4cb78..52f85c71f0 100644 --- a/system/joyce/joyce.info +++ b/system/joyce/joyce.info @@ -1,8 +1,8 @@ PRGNAM="joyce" -VERSION="2.2.12" +VERSION="2.2.14" HOMEPAGE="http://www.seasip.info/Unix/Joyce/" -DOWNLOAD="http://www.seasip.info/Unix/Joyce/joyce-2.2.12.tar.gz" -MD5SUM="a519722dc2532cdd0f589d36bd5ee741" +DOWNLOAD="http://www.seasip.info/Unix/Joyce/joyce-2.2.14.tar.gz" +MD5SUM="acf22e515606091108c1c6acab129617" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/jsawk/jsawk.SlackBuild b/system/jsawk/jsawk.SlackBuild index f08ddfd142..3a139be516 100644 --- a/system/jsawk/jsawk.SlackBuild +++ b/system/jsawk/jsawk.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for jsawk -# Copyright 2013,2016,2018 Andrew Clemons, Wellington, New Zealand +# Copyright 2013,2016,2018-2020 Andrew Clemons, Wellington, New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PRGNAM=jsawk VERSION=${VERSION:-1.4} -BUILD=${BUILD:-2} +BUILD=${BUILD:-5} TAG=${TAG:-_SBo} ARCH=noarch @@ -47,8 +47,8 @@ cp $CWD/jsawk $PKG/usr/bin chmod 0755 $PKG/usr/bin/jsawk chown root:root $PKG/usr/bin/jsawk -if command -v js52 > /dev/null 2>&1 ; then - sed -i '/JSBIN=/s/-js/-js52/' $PKG/usr/bin/jsawk +if command -v js78 > /dev/null 2>&1 ; then + sed -i '/JSBIN=/s/-js/-js78/' $PKG/usr/bin/jsawk fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION @@ -59,4 +59,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/system/kapacitor/kapacitor.SlackBuild b/system/kapacitor/kapacitor.SlackBuild index 29a088f73a..100a848ad7 100644 --- a/system/kapacitor/kapacitor.SlackBuild +++ b/system/kapacitor/kapacitor.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Kapacitor -# Copyright 2017, 2018 Ebben Aries <e@dscp.org> +# Copyright 2017-2021 Ebben Aries <slackbuilds@dscp.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kapacitor -VERSION=${VERSION:-1.5.2} +VERSION=${VERSION:-1.5.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/kapacitor/kapacitor.info b/system/kapacitor/kapacitor.info index 5215110978..cb6885d7db 100644 --- a/system/kapacitor/kapacitor.info +++ b/system/kapacitor/kapacitor.info @@ -1,10 +1,10 @@ PRGNAM="kapacitor" -VERSION="1.5.2" +VERSION="1.5.9" HOMEPAGE="https://www.influxdata.com" -DOWNLOAD="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.2_linux_i386.tar.gz" -MD5SUM="2212d60012b7ef592dbf43a15d93b1a4" -DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.2_linux_amd64.tar.gz" -MD5SUM_x86_64="1b7caa428334abe3737ce5eefe58a2c2" +DOWNLOAD="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.9_linux_i386.tar.gz" +MD5SUM="7f396a3b6ec6133407cdeb01c74eea4e" +DOWNLOAD_x86_64="https://dl.influxdata.com/kapacitor/releases/kapacitor-1.5.9_linux_amd64.tar.gz" +MD5SUM_x86_64="c3e8ad4207b2e4f0af63989e55b8c808" REQUIRES="" MAINTAINER="Ebben Aries" -EMAIL="e@dscp.org" +EMAIL="slackbuilds@dscp.org" diff --git a/system/kbfs/README b/system/kbfs/README index 6de9a0c684..9d12908351 100644 --- a/system/kbfs/README +++ b/system/kbfs/README @@ -6,7 +6,7 @@ Choose one between kbfs or keybase. Do not install both. You will need to create a new user keybasehelper before building this package. -groupadd -g keybasehelper keybasehelper +groupadd -g 352 keybasehelper useradd -u 352 -g keybasehelper -c "keybase helper user" -s /bin/false keybasehelper NOTE: Read README.SBo for more instructions!! diff --git a/system/kbfs/kbfs.SlackBuild b/system/kbfs/kbfs.SlackBuild index 18d1ffa640..945fa19147 100644 --- a/system/kbfs/kbfs.SlackBuild +++ b/system/kbfs/kbfs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for kbfs -# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2017-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ PRGNAM=kbfs SRCNAM=keybase -VERSION=${VERSION:-2.13.1_20190115203650} -COMMITVER=eec94506e4 +VERSION=${VERSION:-5.6.1_20210125164223} +COMMITVER=f3b21527b9 SRCVER=$(echo $VERSION | tr _ - ) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/kbfs/kbfs.info b/system/kbfs/kbfs.info index 9b46bc5972..dfce4bbd30 100644 --- a/system/kbfs/kbfs.info +++ b/system/kbfs/kbfs.info @@ -1,10 +1,10 @@ PRGNAM="kbfs" -VERSION="2.13.0_20181219142726" +VERSION="5.6.1_20210125164223" HOMEPAGE="https://github.com/keybase/kbfs" -DOWNLOAD="https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_2.13.0-20181219142726.01e9fa19eb_i386.deb" -MD5SUM="fa5b2a814e723e504c32fb7145f235a2" -DOWNLOAD_x86_64="https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_2.13.0-20181219142726.01e9fa19eb_amd64.deb" -MD5SUM_x86_64="32cdf6295ed9d0871c4468bb103f9a36" +DOWNLOAD="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.6.1-20210125164223.f3b21527b9_i386.deb" +MD5SUM="1b22b307c41a3f914d51c2084b3de400" +DOWNLOAD_x86_64="https://prerelease.keybase.io/linux_binaries/deb/keybase_5.6.1-20210125164223.f3b21527b9_amd64.deb" +MD5SUM_x86_64="45e4f16d21974008e7a23341d1b27b5f" REQUIRES="google-go-lang sshfs-fuse" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/kegs/README.Slackware b/system/kegs/README.Slackware index 03e0ebf940..7a66ba8fb8 100644 --- a/system/kegs/README.Slackware +++ b/system/kegs/README.Slackware @@ -1,34 +1,23 @@ ROM Images ========== -KEGS requires a ROM image dumped from an Apple IIgs. This will typically -be called either "rom01" (131072 bytes) or "rom03" (262144 bytes), -and will often be distributed in zip files called apple2g1.zip and -apple2gs.zip (for use with MESS). This package can optionally include -the ROM file. To do this, place the ROM image in the slackbuild -directory before running the script. The image will be installed -as /usr/share/kegs/rom03 (or rom01). If you do not include the ROM -in the package, you will need to manually copy the rom03 image to -/usr/share/kegs/rom03 before the emulator will work properly. +KEGS requires a ROM image dumped from an Apple IIgs. This will +typically be called either "rom01" (131072 bytes) or "rom03" (262144 +bytes), and will often be distributed in zip files called apple2g1.zip +and apple2gs.zip (for use with MESS). This package includes the +"rom03" file. If you want to also use the older ROM01 file, copy it to +/usr/share/kegs after the package is installed, and select it from the +config menu (F4) or edit the path in ~/.config.kegs. Audio ===== -kegs uses OSS for audio. To get sound working, you have 3 options: +As of version 1.05, kegs uses PulseAudio by default. This is the default +in the SlackBuild, so most users won't have to do anything special. -1. Run kegs as "aoss xkegs", or launch it from your desktop's application - menu (which does the same thing). - -2. Enable ALSA OSS emulation: - # chmod +x /etc/rc.d/rc.alsa-oss - # /etc/rc.d/rc.alsa-oss - - However, this may interfere with other applications' use of the - sound card. - -3. If you already use OSSv4 (audio/oss from slackbuilds.org), kegs - should be able to use it. It's not recommended to switch to OSSv4 - just to get audio working in kegs, though. +It's also possible to build kegs for OSS audio, or ALSA using the +aoss "shim" layer. To do this, set 'AUDIO=oss' or 'AUDIO=alsa' in the +script's environment. GS/OS Disk Images ================= diff --git a/system/kegs/allow_sound_open_fail.diff b/system/kegs/allow_sound_open_fail.diff deleted file mode 100644 index bf9086f72d..0000000000 --- a/system/kegs/allow_sound_open_fail.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur kegs.0.91/src/sound.c kegs.0.91.patched/src/sound.c ---- kegs.0.91/src/sound.c 2004-12-06 19:42:47.000000000 -0500 -+++ kegs.0.91.patched/src/sound.c 2015-06-21 17:48:21.000000000 -0400 -@@ -363,9 +363,9 @@ - - ret = read(read_fd, &tmp, 4); - if(ret != 4) { -- printf("parent dying, could not get sample rate from child\n"); -+ printf("parent could not get audio sample rate from child, disabling sound.\n"); - printf("ret: %d, fd: %d errno:%d\n", ret, read_fd, errno); -- exit(1); -+ g_audio_enable = 0; - } - close(read_fd); - diff --git a/system/kegs/allow_window_close.diff b/system/kegs/allow_window_close.diff index 538022e044..b1343b2e89 100644 --- a/system/kegs/allow_window_close.diff +++ b/system/kegs/allow_window_close.diff @@ -1,35 +1,36 @@ -diff -Naur kegs.0.91/src/xdriver.c kegs.0.91.patched//src/xdriver.c ---- kegs.0.91/src/xdriver.c 2004-12-06 19:42:47.000000000 -0500 -+++ kegs.0.91.patched//src/xdriver.c 2011-01-27 04:28:42.000000000 -0500 -@@ -57,6 +57,7 @@ - Display *g_display = 0; - Visual *g_vis = 0; - Window g_a2_win; -+Atom g_wmdelete_atom; - GC g_a2_winGC; - XFontStruct *g_text_FontSt; - Colormap g_a2_colormap = 0; -@@ -582,6 +583,9 @@ +diff -Naur kegs.1.05/src/xdriver.c kegs.1.05.patched/src/xdriver.c +--- kegs.1.05/src/xdriver.c 2021-01-24 18:37:34.000000000 -0500 ++++ kegs.1.05.patched/src/xdriver.c 2021-02-25 17:53:28.054595900 -0500 +@@ -629,13 +629,10 @@ 0, &my_winSizeHints, 0, &my_winClassHint); - XMapRaised(g_display, g_a2_win); + XMapRaised(g_display, x_win); + +- if(win_info_ptr != &g_mainwin_info) { +- // Debugger window + win_info_ptr->delete_atom = XInternAtom(g_display, + "WM_DELETE_WINDOW", False); + XSetWMProtocols(g_display, x_win, &(win_info_ptr->delete_atom), + 1); +- } -+ g_wmdelete_atom = XInternAtom(g_display, "WM_DELETE_WINDOW", True); -+ XSetWMProtocols(g_display, g_a2_win, &g_wmdelete_atom, 1); -+ XSync(g_display, False); - g_a2_winGC = XCreateGC(g_display, g_a2_win, 0, (XGCValues *) 0); -@@ -1086,6 +1090,13 @@ - (word32)ev.xcolormap.colormap, - ev.xcolormap.new, ev.xcolormap.state); - break; -+ case ClientMessage: -+ if(ev.xclient.data.l[0] == g_wmdelete_atom) { -+ x_auto_repeat_on(1); -+ XCloseDisplay(g_display); -+ exit(0); -+ } -+ break; - default: - printf("X event 0x%08x is unknown!\n", - ev.type); +@@ -1092,9 +1089,15 @@ + case ClientMessage: + win_info_ptr = x_find_xwin(ev.xclient.window); + if(ev.xclient.data.l[0] == win_info_ptr->delete_atom) { +- // This is a WM_DELETE_WINDOW event +- // Just unmap the window +- win_info_ptr->kimage_ptr->active = 0; ++ if(win_info_ptr == &g_debugwin_info) { ++ // This is a WM_DELETE_WINDOW event ++ // Just unmap the window ++ win_info_ptr->kimage_ptr->active = 0; ++ } else { ++ x_auto_repeat_on(1); ++ XCloseDisplay(g_display); ++ exit(0); ++ } + } else { + printf("unknown ClientMessage\n"); + } diff --git a/system/kegs/config.kegs.default b/system/kegs/config.kegs.default index 782bfb8f3a..4408cee760 100644 --- a/system/kegs/config.kegs.default +++ b/system/kegs/config.kegs.default @@ -8,4 +8,4 @@ s6d2 = s7d1 = #NUCLEUS03 -g_cfg_rom_path = @ROM@ +g_cfg_rom_path = /usr/share/kegs/rom03 diff --git a/system/kegs/doinst.sh b/system/kegs/doinst.sh index 5fb28930db..f6a957d203 100644 --- a/system/kegs/doinst.sh +++ b/system/kegs/doinst.sh @@ -1,3 +1,9 @@ +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 + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/system/kegs/kegs.png b/system/kegs/icons/128.png Binary files differindex 578329931f..578329931f 100644 --- a/system/kegs/kegs.png +++ b/system/kegs/icons/128.png diff --git a/system/kegs/icons/16.png b/system/kegs/icons/16.png Binary files differnew file mode 100644 index 0000000000..7dbbef05e5 --- /dev/null +++ b/system/kegs/icons/16.png diff --git a/system/kegs/icons/32.png b/system/kegs/icons/32.png Binary files differnew file mode 100644 index 0000000000..15b49662ca --- /dev/null +++ b/system/kegs/icons/32.png diff --git a/system/kegs/icons/48.png b/system/kegs/icons/48.png Binary files differnew file mode 100644 index 0000000000..7caf94efd2 --- /dev/null +++ b/system/kegs/icons/48.png diff --git a/system/kegs/kegs.SlackBuild b/system/kegs/kegs.SlackBuild index 79883b8daa..851b036d01 100644 --- a/system/kegs/kegs.SlackBuild +++ b/system/kegs/kegs.SlackBuild @@ -6,6 +6,15 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20210225 bkw: update for v1.05. lots of changes: +# - include the ROM image in the package (add it to DOWNLOAD) +# - allow_sound_open_fail.diff no longer required +# - rework allow_window_close.diff for v1.05 +# - .desktop file no longer needs Terminal=true +# - upstream now supports pulseaudio, so build with it by default. add +# AUDIO variable to build the old OSS sound support or ALSA via aoss +# instead. + # 20170305 bkw: # - fix building under installwatch, caused by a symlink in the # tarball being listed before its target Why does this choke @@ -19,8 +28,8 @@ # - "Exec=aoss xkegs" in .desktop file PRGNAM=kegs -VERSION=${VERSION:-0.91} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.05} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -48,45 +57,48 @@ fi set -e +AUDIO=${AUDIO:-pulse} +VARS=$CWD/makevars/vars.$AUDIO + +if [ ! -e $VARS ]; then + echo -n "*** AUDIO=\"$AUDIO\" not supported. Use one of: " 1>&2 + list="$( ls -1 $CWD/makevars/vars.* | cut -d. -f2 )" + echo $list 1>&2 + exit 1 +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM.$VERSION -tar xvf $CWD/$PRGNAM.$VERSION.tar.gz --exclude vars +tar xvf $CWD/$PRGNAM.$VERSION.tar.gz \ + --exclude '*/KEGSMAC.app' \ + --exclude xkegs 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# device name for joysticks has changed for the 21st century. +sed -i 's,/dev/js,/dev/input/js,' src/joystick_driver.c # xkegs refuses to close (close button greyed-out by window manager). # Small patch by SlackBuild author fixes this large annoyance (which is # extra-annoying because there's also no Quit option in the kegs menu). # I've sent this upstream, maybe it'll get integrated in future versions. +# 20210225 bkw: Years later. Patch had to change for 1.05. The README +# for kegs *actually says* you can close the main KEGS window to quit, +# *and you can't fucking close it* without this patch. Apologies if I +# sound a bit strident, but... patch -p1 < $CWD/allow_window_close.diff -# Matthew Miller pointed out this patch to me. Since kegs uses OSS for -# audio, and modern Slackware has ALSA OSS emulation disabled by default, -# sound won't work unless xkegs is run via aoss, or OSS modules are -# loaded. This patch allows the emulator to start with sound disabled if -# it can't open the OSS audio device (instead of it being a fatal error). -# I've also updated the README to explain how to get audio to work. -patch -p1 < $CWD/allow_sound_open_fail.diff - cd src rm -f vars -ln -s vars_x86linux vars -make CCOPTS="$SLKCFLAGS" x$PRGNAM to_pro partls +cat $VARS > vars +make SLKCFLAGS="$SLKCFLAGS" x$PRGNAM to_pro partls cd - # No install target, just stick it all where it goes. -# The icon was converted from the Mac OSX icon with icns2png. -# The .desktop has 'Terminal=true' because xkegs *really* wants -# to be started from a terminal (the debugger uses stdio, and -# is too easy to accidentally enter by center-clicking the window). - mkdir -p \ $PKG/usr/bin \ $PKG/usr/libexec \ @@ -97,12 +109,26 @@ mkdir -p \ install -s -m0755 x$PRGNAM $PKG/usr/libexec/ install -s -m0755 src/to_pro src/partls $PKG/usr/bin/ install -m0755 $CWD/x$PRGNAM.sh $PKG/usr/bin/x$PRGNAM -install -m0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/ install -m0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/ +install -m0644 $CWD/config.$PRGNAM.default $PKG/usr/share/$PRGNAM + +# The icons were converted from the Mac OSX icon with icns2png. +for i in 16 32 48 128; do + idir=$PKG/usr/share/icons/hicolor/${i}x${i}/apps + mkdir -p $idir + cat $CWD/icons/$i.png > $idir/$PRGNAM.png +done + +# old-style icon (e.g. windowmaker, fvwm2) +ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png + +# Include the ROM image in the package. It's been available on the +# asimov site for at least 20 years now, Apple has never complained. +unzip -p $CWD/gsrom03.zip > $PKG/usr/share/$PRGNAM/rom03 # Man pages are specific to the SlackBuild, though I've sent # them upstream for consideration. -for file in $CWD/*.1; do +for file in $CWD/man/*.1; do sed "s/@VERSION@/$VERSION/g" $file \ | gzip -9c \ > $PKG/usr/man/man1/$( basename $file ).gz @@ -113,34 +139,12 @@ done ln -s x$PRGNAM.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz ln -s x$PRGNAM $PKG/usr/bin/$PRGNAM -# Handle the ROM image, if we find it. Filenames are listed in -# reverse order of preference. -for file in ROM01 rom01 ROM03 rom03; do - if [ -e "$CWD/$file" ]; then - ROMFILE="$CWD/$file" - fi -done - -if [ -e "$ROMFILE" ]; then - ROMNAME="$( basename "$ROMFILE" )" - install -m0644 "$ROMFILE" $PKG/usr/share/$PRGNAM -else - # We don't have a ROM, so we don't include one in the package, but we - # do still set the path to /usr/share/kegs/rom03 in the config file, - # so all the user has to do is copy the ROM there later. - ROMNAME=rom03 -fi - -sed "s,@ROM@,/usr/share/$PRGNAM/$ROMNAME," \ - < $CWD/config.$PRGNAM.default \ - > $PKG/usr/share/$PRGNAM/config.$PRGNAM.default - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION install -m0644 *.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 +sed "s,@AUDIO@,$AUDIO," $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG diff --git a/system/kegs/kegs.desktop b/system/kegs/kegs.desktop index 229dc9fe7d..3339d2bafa 100644 --- a/system/kegs/kegs.desktop +++ b/system/kegs/kegs.desktop @@ -3,8 +3,8 @@ Version=1.0 Name=KEGS GenericName=Apple IIgs Emulator Type=Application -Exec=aoss xkegs +Exec=xkegs Icon=kegs -Terminal=true +Terminal=false StartupNotify=false Categories=Game;Emulator; diff --git a/system/kegs/kegs.info b/system/kegs/kegs.info index db8446cf08..937cf787c0 100644 --- a/system/kegs/kegs.info +++ b/system/kegs/kegs.info @@ -1,8 +1,10 @@ PRGNAM="kegs" -VERSION="0.91" +VERSION="1.05" HOMEPAGE="http://kegs.sourceforge.net/" -DOWNLOAD="http://kegs.sourceforge.net/kegs.0.91.tar.gz" -MD5SUM="ec3967d3276bb3d1dd601c7b8f750df5" +DOWNLOAD="http://kegs.sourceforge.net/kegs.1.05.tar.gz \ + https://mirrors.apple2.org.za/ftp.apple.asimov.net/emulators/rom_images/gsrom03.zip" +MD5SUM="b7f0452bf173eecdfadf9a82c4f75bea \ + 029ebd31845614636f6a34a19730cd57" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/kegs/makevars/vars.alsa b/system/kegs/makevars/vars.alsa new file mode 100644 index 0000000000..c8eb5b26aa --- /dev/null +++ b/system/kegs/makevars/vars.alsa @@ -0,0 +1,7 @@ +TARGET = xkegs +OBJECTS1 = xdriver.o +CCOPTS = $(SLKCFLAGS) +NAME = xkegs +LD = $(CC) +EXTRA_LIBS = -lXext -laoss +EXTRA_SPECIALS = diff --git a/system/kegs/makevars/vars.oss b/system/kegs/makevars/vars.oss new file mode 100644 index 0000000000..e71940cd21 --- /dev/null +++ b/system/kegs/makevars/vars.oss @@ -0,0 +1,7 @@ +TARGET = xkegs +OBJECTS1 = xdriver.o +CCOPTS = $(SLKCFLAGS) +NAME = xkegs +LD = $(CC) +EXTRA_LIBS = -lXext +EXTRA_SPECIALS = diff --git a/system/kegs/makevars/vars.pulse b/system/kegs/makevars/vars.pulse new file mode 100644 index 0000000000..8521ec9b6f --- /dev/null +++ b/system/kegs/makevars/vars.pulse @@ -0,0 +1,7 @@ +TARGET = xkegs +OBJECTS1 = pulseaudio_driver.o xdriver.o +CCOPTS = $(SLKCFLAGS) -DPULSE_AUDIO +NAME = xkegs +LD = $(CC) +EXTRA_LIBS = -lXext -lpulse +EXTRA_SPECIALS = diff --git a/system/kegs/partls.1 b/system/kegs/man/partls.1 index 1af148532b..1af148532b 100644 --- a/system/kegs/partls.1 +++ b/system/kegs/man/partls.1 diff --git a/system/kegs/to_pro.1 b/system/kegs/man/to_pro.1 index a58fada52d..a58fada52d 100644 --- a/system/kegs/to_pro.1 +++ b/system/kegs/man/to_pro.1 diff --git a/system/kegs/xkegs.1 b/system/kegs/man/xkegs.1 index 907a6095cd..eb14f217e6 100644 --- a/system/kegs/xkegs.1 +++ b/system/kegs/man/xkegs.1 @@ -86,8 +86,7 @@ Unlimited, 1MHz, 2.8MHz, 8.0MHz Enter KEGS debugger (can also be done by center\-clicking the mouse on the xkegs window). .br -The debugger is tty\-based, and runs on the terminal -that xkegs was started from. +The debugger is X\-based, and runs in a separate window. .TP \fBF7\fR Toggle fast_disk_emul on/off diff --git a/system/kegs/slack-desc b/system/kegs/slack-desc index 5db61e7330..3ecf8b066b 100644 --- a/system/kegs/slack-desc +++ b/system/kegs/slack-desc @@ -13,7 +13,7 @@ kegs: Apple IIgs was the most powerful computer in the Apple II line. It kegs: first was sold in 1986. An Apple IIgs has the capability to run almost kegs: all Apple II, Apple IIe, and Apple IIc programs. kegs: -kegs: +kegs: Package built with audio system '@AUDIO@'. kegs: kegs: kegs: diff --git a/system/kegs/xkegs.sh b/system/kegs/xkegs.sh index 55f0719b73..a947f07f76 100644 --- a/system/kegs/xkegs.sh +++ b/system/kegs/xkegs.sh @@ -8,8 +8,13 @@ # read it from /usr/share/kegs/config.kegs, but it'll freeze if # it doesn't have write permission! +# Update for v1.05: kegs will now start without ~/.config.kegs, +# but if you do that, it'll save its config in the current dir as +# "config.kegs" (no leading dot). So this wrapper's still necessary. +# Added the missing "$@" so options actually get passed to kegs. + if [ ! -e ~/.config.kegs ]; then cat /usr/share/kegs/config.kegs.default > ~/.config.kegs fi -exec /usr/libexec/xkegs +exec /usr/libexec/xkegs "$@" diff --git a/system/kexec-tools/kexec-tools.SlackBuild b/system/kexec-tools/kexec-tools.SlackBuild index 09324e77a1..26d151c93c 100644 --- a/system/kexec-tools/kexec-tools.SlackBuild +++ b/system/kexec-tools/kexec-tools.SlackBuild @@ -4,7 +4,7 @@ # Written by powtrix (@gmail.com) PRGNAM=kexec-tools -VERSION=${VERSION:-2.0.17} +VERSION=${VERSION:-2.0.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/kexec-tools/kexec-tools.info b/system/kexec-tools/kexec-tools.info index bfe645d047..f985835884 100644 --- a/system/kexec-tools/kexec-tools.info +++ b/system/kexec-tools/kexec-tools.info @@ -1,8 +1,8 @@ PRGNAM="kexec-tools" -VERSION="2.0.17" +VERSION="2.0.20" HOMEPAGE="http://horms.net/projects/kexec/" -DOWNLOAD="https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.17.tar.xz" -MD5SUM="f72c11e3bd80de23cae144ce8683d96b" +DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.20.tar.xz" +MD5SUM="3b3ee68064648b1b9e86ad93b1c50644" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/keybase/keybase.SlackBuild b/system/keybase/keybase.SlackBuild index 97b802efea..e2f38806ed 100644 --- a/system/keybase/keybase.SlackBuild +++ b/system/keybase/keybase.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for keybase -# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2016-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=keybase SRCNAM=client -VERSION=${VERSION:-2.13.1} +VERSION=${VERSION:-5.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/keybase/keybase.info b/system/keybase/keybase.info index 5e1ce30ded..367a1a72bb 100644 --- a/system/keybase/keybase.info +++ b/system/keybase/keybase.info @@ -1,8 +1,8 @@ PRGNAM="keybase" -VERSION="2.13.1" +VERSION="5.6.1" HOMEPAGE="https://github.com/keybase/client" -DOWNLOAD="https://github.com/keybase/client/archive/v2.13.1/client-2.13.1.tar.gz" -MD5SUM="e0b54c9948f0aa7c095dc1bebf31e77a" +DOWNLOAD="https://github.com/keybase/client/archive/v5.6.1/client-5.6.1.tar.gz" +MD5SUM="3acd34467dccfad5a7d93741aeea3724" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/system/kfc/README b/system/kfc/README new file mode 100644 index 0000000000..d22ebeff3c --- /dev/null +++ b/system/kfc/README @@ -0,0 +1,4 @@ +kfc (terminal-emulator color palette setter) + +kfc uses extended escape codes to set the 16-color ANSI palette in +supported terminals. Over 300 palettes are included. diff --git a/system/kfc/kfc.1 b/system/kfc/kfc.1 new file mode 100644 index 0000000000..081636a30c --- /dev/null +++ b/system/kfc/kfc.1 @@ -0,0 +1,92 @@ +.\" Man page generated from reStructuredText. +. +.TH KFC 1 "2020-11-23" "0.1.2" "SlackBuilds.org" +.SH NAME +kfc \- terminal-emulator color palette setter +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for kfc(1) man page. Convert with: +. +.\" rst2man.py kfc.rst > kfc.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.\" converting from pod: +. +.\" s/B<\([^>]*\)>/**\1**/g +. +.\" s/I<\([^>]*\)>/*\1*/g +. +.SH SYNOPSIS +.sp +kfc [\fI\-L\fP] [\fI\-r\fP | \fI\-s palette\fP] [\fI\-l\fP | \fI\-p\fP | \fI\-v\fP] +.SH DESCRIPTION +.sp +This project was inspired by Dylan Arap\(aqs POSIX shell script, +okpal, which utilizes 16 ANSI colors to control the color scheme +of existing terminal\-emulator windows. This allows one to achieve +consistent colors across all terminal utilities and applications. This +application has similar functionality to okpal but is designed with +execution speed in mind. There are currently 300 light and dark color +palettes offered at this time that can be applied and quickly swapped +out for others. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \-L +Set light themes (modifier for \-s/\-r) +.TP +.B \-r +Select a random palette (dark theme by default) +.TP +.BI \-s \ palette +Select a palette (dark theme by default) +.TP +.B \-l +List all palettes (dark themes by default) +.TP +.B \-p +Print current palette +.TP +.B \-v +Show version information +.UNINDENT +.SH COPYRIGHT +.sp +See the file /usr/doc/kfc\-0.1.2/LICENSE for license information. +.SH AUTHORS +.sp +kfc was written by Michael Czigler. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +The kfc homepage: \fI\%https://github.com/mcpcpc/kfc\fP +.\" Generated by docutils manpage writer. +. diff --git a/system/kfc/kfc.SlackBuild b/system/kfc/kfc.SlackBuild new file mode 100644 index 0000000000..29eb4f508f --- /dev/null +++ b/system/kfc/kfc.SlackBuild @@ -0,0 +1,71 @@ +#!/bin/sh + +# Slackware build script for kfc + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=kfc +VERSION=${VERSION:-0.1.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# Squelch this pointless warning. +sed -i '/"XDG_CONFIG_HOME is not defined/d' $PRGNAM.c + +make CFLAGS="$SLKCFLAGS -Wl,-s" +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README docs/* $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# man page by SlackBuild author, culled from README and usage output +mkdir -p $PKG/usr/man/man1 +gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz + +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:-tgz} diff --git a/system/kfc/kfc.info b/system/kfc/kfc.info new file mode 100644 index 0000000000..1f0fd9dec2 --- /dev/null +++ b/system/kfc/kfc.info @@ -0,0 +1,10 @@ +PRGNAM="kfc" +VERSION="0.1.2" +HOMEPAGE="https://github.com/mcpcpc/kfc" +DOWNLOAD="https://github.com/mcpcpc/kfc/archive/0.1.2/kfc-0.1.2.tar.gz" +MD5SUM="edd5b6eb81d85f4e1f7623f623f7c083" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/kfc/kfc.rst b/system/kfc/kfc.rst new file mode 100644 index 0000000000..2fa08b524c --- /dev/null +++ b/system/kfc/kfc.rst @@ -0,0 +1,68 @@ +.. RST source for kfc(1) man page. Convert with: +.. rst2man.py kfc.rst > kfc.1 +.. rst2man.py comes from the SBo development/docutils package. + +.. |version| replace:: 0.1.2 +.. |date| date:: + +.. converting from pod: +.. s/B<\([^>]*\)>/**\1**/g +.. s/I<\([^>]*\)>/*\1*/g + +=== +kfc +=== + +-------------------------------------- +terminal-emulator color palette setter +-------------------------------------- + +:Manual section: 1 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +kfc [*-L*] [*-r* | *-s palette*] [*-l* | *-p* | *-v*] + +DESCRIPTION +=========== + +This project was inspired by Dylan Arap's POSIX shell script, +okpal, which utilizes 16 ANSI colors to control the color scheme +of existing terminal-emulator windows. This allows one to achieve +consistent colors across all terminal utilities and applications. This +application has similar functionality to okpal but is designed with +execution speed in mind. There are currently 300 light and dark color +palettes offered at this time that can be applied and quickly swapped +out for others. + +OPTIONS +======= + +-L Set light themes (modifier for -s/-r) +-r Select a random palette (dark theme by default) +-s palette Select a palette (dark theme by default) +-l List all palettes (dark themes by default) +-p Print current palette +-v Show version information + +COPYRIGHT +========= + +See the file /usr/doc/kfc-|version|/LICENSE for license information. + +AUTHORS +======= + +kfc was written by Michael Czigler. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. + +SEE ALSO +======== + +The kfc homepage: https://github.com/mcpcpc/kfc diff --git a/system/kfc/slack-desc b/system/kfc/slack-desc new file mode 100644 index 0000000000..fda7fdcf00 --- /dev/null +++ b/system/kfc/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------------------------------------------------------| +kfc: kfc (terminal-emulator color palette setter) +kfc: +kfc: kfc uses extended escape codes to set the 16-color ANSI palette in +kfc: supported terminals. Over 300 palettes are included. +kfc: +kfc: +kfc: +kfc: +kfc: +kfc: +kfc: diff --git a/system/kitchen-sync/kitchen-sync.SlackBuild b/system/kitchen-sync/kitchen-sync.SlackBuild index 5afb04bda5..7d85b220aa 100644 --- a/system/kitchen-sync/kitchen-sync.SlackBuild +++ b/system/kitchen-sync/kitchen-sync.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for kitchen-sync -# Copyright 2016-2019 Andrew Clemons, Wellington New Zealand +# Copyright 2016-2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=kitchen-sync SRCNAM=$(echo "$PRGNAM" | tr '-' '_') -VERSION=${VERSION:-1.10} +VERSION=${VERSION:-2.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,7 +59,9 @@ cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION + zcat $CWD/0001-Restore-compatibility-with-1.0-servers.patch.gz | patch -p1 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/kitchen-sync/kitchen-sync.info b/system/kitchen-sync/kitchen-sync.info index edfd89f3d0..0ef6843485 100644 --- a/system/kitchen-sync/kitchen-sync.info +++ b/system/kitchen-sync/kitchen-sync.info @@ -1,8 +1,8 @@ PRGNAM="kitchen-sync" -VERSION="1.10" +VERSION="2.10" HOMEPAGE="https://github.com/willbryant/kitchen_sync" -DOWNLOAD="https://github.com/willbryant/kitchen_sync/archive/v1.10/kitchen_sync-1.10.tar.gz" -MD5SUM="79260f252d6612e18f4de2f95349d5a2" +DOWNLOAD="https://github.com/willbryant/kitchen_sync/archive/v2.10/kitchen_sync-2.10.tar.gz" +MD5SUM="e5c7a8a83966e41e16b2ee37c10365ac" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/kitty/README b/system/kitty/README new file mode 100644 index 0000000000..a4cb22c88e --- /dev/null +++ b/system/kitty/README @@ -0,0 +1,14 @@ +kitty (fast, featureful, GPU-based terminal emulator) + +kitty is a terminal emulator for X11 and Wayland[1], which offloads +the rendering to the GPU[2] and supports modern terminal features. It +also supports tiling multiple terminal windows without using an extra +program like screen or tmux. + +[1] For Wayland support, install wayland-protocols before building + kitty. It will be auto-detected. It may be necessary to add the + following line to ~/.config/kitty/kitty.conf: + + linux_display_server wayland + +[2] Requires hardware-accelerated OpenGL support. diff --git a/system/kitty/doinst.sh b/system/kitty/doinst.sh new file mode 100644 index 0000000000..3e5691a052 --- /dev/null +++ b/system/kitty/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/kitty/kitty.SlackBuild b/system/kitty/kitty.SlackBuild new file mode 100644 index 0000000000..7a6708062d --- /dev/null +++ b/system/kitty/kitty.SlackBuild @@ -0,0 +1,99 @@ +#!/bin/sh + +# Slackware build script for kitty + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=kitty +VERSION=${VERSION:-0.19.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# The Makefile ain't a real Makefile, everything's done in setup.py. Which +# has issues: +# - upstream claims harfbuzz >= 1.5 is required, but 14.2's 1.2 seems to work +# just fine. +# - CFLAGS not supported, -O3 hardcoded. The OVERRIDE stuff works, but the +# hardcoded -O3 comes *after* them on the gcc command line. Grr. +# - -Werror is used when compiling launcher.c, no way to disable. This assumes +# upstream is perfect at writing code that compiles without warnings on every +# version of gcc we might ever happen to use, and I don't believe it. +# So, sed surgery. + +sed -i \ + -e "/at_least_version('harfbuzz/s,5,2," \ + -e 's,-O3,-O2,g' \ + -e 's,-Werror , ,g' \ + setup.py + +# The -Wl,-s makes the linker strip the binaries. +OVERRIDE_CPPFLAGS="$SLKCFLAGS -Wl,-s" \ +OVERRIDE_CFLAGS="$SLKCFLAGS -Wl,-s" \ + python3 setup.py --libdir-name lib$LIBDIRSUFFIX --verbose linux-package + +mkdir -p $PKG/usr/bin $PKG/usr/share $PKG/usr/lib$LIBDIRSUFFIX +cp -a linux-package/bin/* $PKG/usr/bin +cp -a linux-package/share/* $PKG/usr/share +cp -a linux-package/lib*/* $PKG/usr/lib$LIBDIRSUFFIX + +mv $PKG/usr/share/man $PKG/usr/man +gzip $PKG/usr/man/man?/*.? + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/$PRGNAM/html $PKG/usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share/doc/ +cp -a CHANGELOG* CONTRIBUTING* README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# make slack-desc reflect the display types the package is built for +L=$PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/$PRGNAM +[ -e $L/glfw-x11.so ] && DISPLAYS+=" X11" +[ -e $L/glfw-wayland.so ] && DISPLAYS+=" Wayland" + +mkdir -p $PKG/install +sed "s,@DISPLAYS@,$DISPLAYS," $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:-tgz} diff --git a/system/kitty/kitty.info b/system/kitty/kitty.info new file mode 100644 index 0000000000..2047627277 --- /dev/null +++ b/system/kitty/kitty.info @@ -0,0 +1,10 @@ +PRGNAM="kitty" +VERSION="0.19.3" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" +DOWNLOAD="https://github.com/kovidgoyal/kitty/releases/download/v0.19.3/kitty-0.19.3.tar.xz" +MD5SUM="262b677889d9b979b9ce609ec7b75186" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3 libxkbcommon" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/kitty/slack-desc b/system/kitty/slack-desc new file mode 100644 index 0000000000..c48660175a --- /dev/null +++ b/system/kitty/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------------------------------------------------------| +kitty: kitty (fast, featureful, GPU-based terminal emulator) +kitty: +kitty: kitty is a terminal emulator for X11 and Wayland, which offloads the +kitty: rendering to the GPU and supports modern terminal features. It also +kitty: supports tiling multiple terminal windows without using an extra +kitty: program like screen or tmux. +kitty: +kitty: This package supports:@DISPLAYS@ +kitty: +kitty: +kitty: diff --git a/system/komparator4/komparator4.info b/system/komparator4/komparator4.info index 2490df849e..56de2cece7 100644 --- a/system/komparator4/komparator4.info +++ b/system/komparator4/komparator4.info @@ -6,5 +6,5 @@ MD5SUM="d78648dfd45dfec0ec8eb161da98ea73" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="orphaned - no maintainer" -EMAIL="nobody@nowhere" +MAINTAINER="Jeremy Hansen" +EMAIL="jebrhansen+SBo@gmail.com" diff --git a/system/ksh-openbsd/README b/system/ksh-openbsd/README index 8c23245a83..ced571d1a8 100644 --- a/system/ksh-openbsd/README +++ b/system/ksh-openbsd/README @@ -6,3 +6,6 @@ besides the Linux port bits). See the Changelog.ksh-openbsd and the homepage for more information about the changes: https://github.com/levaidaniel/ksh-openbsd + +There's a build option (PDKSH_BINNAME) to change the binary and manual names +during build. diff --git a/system/ksh-openbsd/ksh-openbsd.SlackBuild b/system/ksh-openbsd/ksh-openbsd.SlackBuild index 529530c8c8..f1865aa260 100644 --- a/system/ksh-openbsd/ksh-openbsd.SlackBuild +++ b/system/ksh-openbsd/ksh-openbsd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2010-2018 LEVAI Daniel +# Copyright (c) 2010-2019 LEVAI Daniel # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ # Build script for the Linux port of OpenBSD's ksh PRGNAM=ksh-openbsd -VERSION=${VERSION:-20180115} +VERSION=${VERSION:-20190804} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,9 +79,16 @@ CFLAGS="$SLKCFLAGS $(getconf LFS_CFLAGS)" make make check make install DESTDIR=$PKG -strip --strip-unneeded $PKG/bin/pdksh -gzip -9 $PKG/usr/man/man1/pdksh.1 -gzip -9 $PKG/usr/man/man1/pdksh-sh.1 +if [ -n "${PDKSH_BINNAME}" ];then + mv $PKG/bin/pdksh $PKG/bin/"${PDKSH_BINNAME}" + mv $PKG/usr/man/man1/pdksh.1 $PKG/usr/man/man1/"${PDKSH_BINNAME}".1 + mv $PKG/usr/man/man1/pdksh-sh.1 $PKG/usr/man/man1/"${PDKSH_BINNAME}"-sh.1 +fi +BINNAME=${PDKSH_BINNAME:-pdksh} + +strip --strip-unneeded $PKG/bin/"${BINNAME}" +gzip -9 $PKG/usr/man/man1/"${BINNAME}".1 +gzip -9 $PKG/usr/man/man1/"${BINNAME}"-sh.1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/system/ksh-openbsd/ksh-openbsd.info b/system/ksh-openbsd/ksh-openbsd.info index be79c4e289..0430f276b5 100644 --- a/system/ksh-openbsd/ksh-openbsd.info +++ b/system/ksh-openbsd/ksh-openbsd.info @@ -1,8 +1,8 @@ PRGNAM="ksh-openbsd" -VERSION="20180115" +VERSION="20190804" HOMEPAGE="https://github.com/levaidaniel/ksh-openbsd" -DOWNLOAD="https://github.com/levaidaniel/ksh-openbsd/archive/20180115.tar.gz" -MD5SUM="738aaeaed76fa05feaa8900040fd16b1" +DOWNLOAD="https://github.com/levaidaniel/ksh-openbsd/archive/20190804.tar.gz" +MD5SUM="e9f4502ecfa0bc61618ecfd819d1b9f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libbsd" diff --git a/system/kyotocabinet/kyotocabinet.SlackBuild b/system/kyotocabinet/kyotocabinet.SlackBuild index 6cb8823a5a..08b092fc60 100644 --- a/system/kyotocabinet/kyotocabinet.SlackBuild +++ b/system/kyotocabinet/kyotocabinet.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for kyotocabinet -# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kyotocabinet -VERSION=${VERSION:-1.2.76} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.2.77} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/system/kyotocabinet/kyotocabinet.info b/system/kyotocabinet/kyotocabinet.info index 6ab4c9f31a..a09aeb44c3 100644 --- a/system/kyotocabinet/kyotocabinet.info +++ b/system/kyotocabinet/kyotocabinet.info @@ -1,8 +1,8 @@ PRGNAM="kyotocabinet" -VERSION="1.2.76" +VERSION="1.2.77" HOMEPAGE="https://fallabs.com/kyotocabinet/" -DOWNLOAD="https://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.76.tar.gz" -MD5SUM="b925d369d7ed4a37cf0013409046738c" +DOWNLOAD="https://fallabs.com/kyotocabinet/pkg/kyotocabinet-1.2.77.tar.gz" +MD5SUM="0f1fa6d10cb5501ebc0ad6ded7a90f68" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/laptop-mode-tools/laptop-mode-tools.SlackBuild b/system/laptop-mode-tools/laptop-mode-tools.SlackBuild index 777d8d5ea5..61cc194757 100644 --- a/system/laptop-mode-tools/laptop-mode-tools.SlackBuild +++ b/system/laptop-mode-tools/laptop-mode-tools.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=laptop-mode-tools -VERSION=${VERSION:-1.72.2} +VERSION=${VERSION:-1.74} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/laptop-mode-tools/laptop-mode-tools.info b/system/laptop-mode-tools/laptop-mode-tools.info index 409c3e9140..dc4da417af 100644 --- a/system/laptop-mode-tools/laptop-mode-tools.info +++ b/system/laptop-mode-tools/laptop-mode-tools.info @@ -1,8 +1,8 @@ PRGNAM="laptop-mode-tools" -VERSION="1.72.2" +VERSION="1.74" HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools" -DOWNLOAD="https://github.com/rickysarraf/laptop-mode-tools/archive/1.72.2/laptop-mode-tools-1.72.2.tar.gz" -MD5SUM="8a7b3658b0137ce893fe6a224fffd7ba" +DOWNLOAD="https://github.com/rickysarraf/laptop-mode-tools/archive/1.74/laptop-mode-tools-1.74.tar.gz" +MD5SUM="990f7aa20adffd2d3482ad57385399a4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-PyQt5" diff --git a/system/lbench/lbench.info b/system/lbench/lbench.info index 99b4b5abdf..39c6d2d16d 100644 --- a/system/lbench/lbench.info +++ b/system/lbench/lbench.info @@ -1,7 +1,7 @@ PRGNAM="lbench" VERSION="3.7" HOMEPAGE="http://kornelix.net/lbench/lbench.html" -DOWNLOAD="http://kornelix.net/downloads/tarballs/lbench-3.7.tar.gz" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lbench-3.7.tar.gz" MD5SUM="ba1cf6181d3748489ebe68b3c98d3565" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/lddsafe/README b/system/lddsafe/README new file mode 100644 index 0000000000..d1f180e6be --- /dev/null +++ b/system/lddsafe/README @@ -0,0 +1,6 @@ +lddsafe (safe replacement for ldd) + +lddsafe prints shared library dependencies for executables and shared +libraries. However, it uses objdump instead of loading the program, +hence avoiding the security problems of ldd. lddsafe also includes +nonrecursive mode (-n option), which lists direct dependencies only. diff --git a/system/lddsafe/lddsafe.1 b/system/lddsafe/lddsafe.1 new file mode 100644 index 0000000000..9b4ae84fbd --- /dev/null +++ b/system/lddsafe/lddsafe.1 @@ -0,0 +1,66 @@ +.\" Man page generated from reStructuredText. +. +.TH LDDSAFE 1 "2021-02-28" "20110819_02842ba" "SlackBuilds.org" +.SH NAME +lddsafe \- safely print shared library dependencies (similar to ldd) +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.\" RST source for lddsafe(1) man page. Convert with: +. +.\" rst2man.py lddsafe.rst > lddsafe.1 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.SH SYNOPSIS +.sp +lddsafe [\fI\-n\fP] \fBFILE\fP ... +.SH DESCRIPTION +.sp +lddsafe is a shell script written for Linux distributions (tested +under Slackware Linux) that prints shared library dependencies for +executable files and shared libraries, similar to ldd. However, +it uses objdump instead of loading the program, hence avoiding the +security problems of ldd. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \-n +Nonrecursive mode. List direct dependencies only. +.UNINDENT +.SH AUTHORS +.sp +lddsafe was written by Ricardo Garcia Gonzalez and Ivan Mironov, and +released as public domain code. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +The lddsafe homepage: \fI\%https://github.com/rg3/lddsafe/\fP +.\" Generated by docutils manpage writer. +. diff --git a/system/lddsafe/lddsafe.SlackBuild b/system/lddsafe/lddsafe.SlackBuild new file mode 100644 index 0000000000..abd02d1575 --- /dev/null +++ b/system/lddsafe/lddsafe.SlackBuild @@ -0,0 +1,38 @@ +#!/bin/sh + +# Slackware build script for lddsafe + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# 20210228 bkw: I've been using this for years, never got around +# to making a SBo build for it until now. Since it's only one +# self-contained shell script and one README, no point dealing with a +# tarball at all, just link to the 'raw' files on github. + +PRGNAM=lddsafe +VERSION=${VERSION:-20110819_02842ba} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $OUTPUT \ + $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 $PKG/install +install -m0755 -oroot -groot $CWD/$PRGNAM $PKG/usr/bin/$PRGNAM +gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +install -m0644 -oroot -groot $CWD/README.textile $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/lddsafe/lddsafe.info b/system/lddsafe/lddsafe.info new file mode 100644 index 0000000000..e782e2e71a --- /dev/null +++ b/system/lddsafe/lddsafe.info @@ -0,0 +1,12 @@ +PRGNAM="lddsafe" +VERSION="20110819_02842ba" +HOMEPAGE="https://github.com/rg3/lddsafe/" +DOWNLOAD="https://raw.githubusercontent.com/rg3/lddsafe/02842bab5b8d1341fb34c632603dbe1c20e7ab51/lddsafe \ + https://raw.githubusercontent.com/rg3/lddsafe/02842bab5b8d1341fb34c632603dbe1c20e7ab51/README.textile" +MD5SUM="7c9f3a4035a4b438e2ec44c4d27b158f \ + 6e4fa6979ae375cc60f9c444846bcb8d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/lddsafe/lddsafe.rst b/system/lddsafe/lddsafe.rst new file mode 100644 index 0000000000..37c15b22b8 --- /dev/null +++ b/system/lddsafe/lddsafe.rst @@ -0,0 +1,52 @@ +.. RST source for lddsafe(1) man page. Convert with: +.. rst2man.py lddsafe.rst > lddsafe.1 +.. rst2man.py comes from the SBo development/docutils package. + +.. |version| replace:: 20110819_02842ba +.. |date| date:: + +======= +lddsafe +======= + +--------------------------------------------------------- +safely print shared library dependencies (similar to ldd) +--------------------------------------------------------- + +:Manual section: 1 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +lddsafe [*-n*] **FILE** ... + +DESCRIPTION +=========== + +lddsafe is a shell script written for Linux distributions (tested +under Slackware Linux) that prints shared library dependencies for +executable files and shared libraries, similar to ldd. However, +it uses objdump instead of loading the program, hence avoiding the +security problems of ldd. + +OPTIONS +======= + +-n Nonrecursive mode. List direct dependencies only. + +AUTHORS +======= + +lddsafe was written by Ricardo Garcia Gonzalez and Ivan Mironov, and +released as public domain code. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. + +SEE ALSO +======== + +The lddsafe homepage: https://github.com/rg3/lddsafe/ diff --git a/system/lddsafe/slack-desc b/system/lddsafe/slack-desc new file mode 100644 index 0000000000..ddc5f764c2 --- /dev/null +++ b/system/lddsafe/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------------------------------------------------------| +lddsafe: lddsafe (safe replacement for ldd) +lddsafe: +lddsafe: lddsafe prints shared library dependencies for executables and shared +lddsafe: libraries. However, it uses objdump instead of loading the program, +lddsafe: hence avoiding the security problems of ldd. lddsafe also includes +lddsafe: nonrecursive mode (-n option), which lists direct dependencies only. +lddsafe: +lddsafe: +lddsafe: +lddsafe: +lddsafe: diff --git a/system/letsencrypt/README b/system/letsencrypt/README index 96337ef219..98bc09e09f 100644 --- a/system/letsencrypt/README +++ b/system/letsencrypt/README @@ -8,3 +8,5 @@ See README.Slackware for more detailed instructions. Note: the certificate client tool is now certbot, but a symlink is provided to be backward compatible with previous letsencrypt version. Please rename the script to the new name: certbot + +Since 1.1.0, most of deps must be (re)built against Python3. diff --git a/system/letsencrypt/letsencrypt.SlackBuild b/system/letsencrypt/letsencrypt.SlackBuild index c6bd84ce28..09ce608197 100644 --- a/system/letsencrypt/letsencrypt.SlackBuild +++ b/system/letsencrypt/letsencrypt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for letsencrypt -# Copyright 2015-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=letsencrypt SRCNAM=certbot -VERSION=${VERSION:-0.30.0} +VERSION=${VERSION:-1.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,9 +70,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 {} \; -sed -i "/'argparse',/d" setup.py +sed -i "/'argparse',/d" certbot/setup.py sed -i "/'argparse',/d" acme/setup.py -sed -i 's/apache2ctl/apachectl/' certbot-apache/certbot_apache/constants.py for i in $(grep -ri /apache2 * | cut -d: -f1 | sort -u) do @@ -81,33 +80,31 @@ done # install acme-protocol first cd acme -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG # install letsencrypt client -cd .. -python setup.py install --root=$PKG - -# this plugins are not working for Slackware yet, but we will keep it here +cd ../certbot +python3 setup.py install --root=$PKG # install apache plugin -cd certbot-apache -python setup.py install --root=$PKG +cd ../certbot-apache +python3 setup.py install --root=$PKG cd .. # install nginx plugin #cd ../certbot-nginx -#python setup.py install --root=$PKG +#python3 setup.py install --root=$PKG # We include default options for Apache mkdir -p $PKG/etc/letsencrypt/ -cp $PKG/usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/certbot_apache/options-ssl-apache.conf \ +cp $PKG/usr/lib${LIBDIRSUFFIX}/python$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \ $PKG/etc/letsencrypt/options-ssl-apache.conf 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 -cp -a *.rst *.md *.txt *.in $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.rst *.md *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cd $PKG/usr/bin diff --git a/system/letsencrypt/letsencrypt.info b/system/letsencrypt/letsencrypt.info index 9da771617e..f4d2655a90 100644 --- a/system/letsencrypt/letsencrypt.info +++ b/system/letsencrypt/letsencrypt.info @@ -1,10 +1,10 @@ PRGNAM="letsencrypt" -VERSION="0.30.0" +VERSION="1.14.0" HOMEPAGE="https://letsencrypt.org/" -DOWNLOAD="https://github.com/certbot/certbot/archive/v0.30.0/certbot-0.30.0.tar.gz" -MD5SUM="b49cd69d845696f1b59d05a751b942ab" +DOWNLOAD="https://github.com/certbot/certbot/archive/v1.14.0/certbot-1.14.0.tar.gz" +MD5SUM="88f267993e5f887dde34a0b042d84585" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="configobj mock pytz python2-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python-augeas pyparsing josepy funcsigs requests-toolbelt" +REQUIRES="configobj mock pytz python3-pythondialog zope.component pyrfc3339 psutil python-parsedatetime python-configargparse werkzeug ndg_httpsclient python3-augeas josepy funcsigs requests-toolbelt python-distro python-certifi python3-packaging" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/libsignal-protocol-c/README b/system/libsignal-protocol-c/README new file mode 100644 index 0000000000..d80dcb6efe --- /dev/null +++ b/system/libsignal-protocol-c/README @@ -0,0 +1,2 @@ +This is a ratcheting forward secrecy protocol that works +in synchronous and asynchronous messaging environments. diff --git a/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild b/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild new file mode 100644 index 0000000000..4de196efce --- /dev/null +++ b/system/libsignal-protocol-c/libsignal-protocol-c.SlackBuild @@ -0,0 +1,99 @@ +#!/bin/sh + +# Slackware build script for libsignal-protocol-c + +# Copyright 2019- CRTS +# 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. + + +PRGNAM=libsignal-protocol-c +VERSION=${VERSION:-2.3.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + ISSUE_TEMPLATE.md 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/libsignal-protocol-c/libsignal-protocol-c.info b/system/libsignal-protocol-c/libsignal-protocol-c.info new file mode 100644 index 0000000000..4ef8c569a2 --- /dev/null +++ b/system/libsignal-protocol-c/libsignal-protocol-c.info @@ -0,0 +1,10 @@ +PRGNAM="libsignal-protocol-c" +VERSION="2.3.3" +HOMEPAGE="https://signal.org" +DOWNLOAD="https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.3/libsignal-protocol-c-2.3.3.tar.gz" +MD5SUM="68dae9b8da58f36dcbf9e10b0138d6f9" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="CRTS" +EMAIL="crts [at] gmx [dot] net" diff --git a/system/libsignal-protocol-c/slack-desc b/system/libsignal-protocol-c/slack-desc new file mode 100644 index 0000000000..0ba140fd2d --- /dev/null +++ b/system/libsignal-protocol-c/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------------------------------------------------------| +libsignal-protocol-c: libsignal-protocol-c (Forward Secrecy Protocol) +libsignal-protocol-c: +libsignal-protocol-c: This is a ratcheting forward secrecy protocol that works in +libsignal-protocol-c: synchronous and asynchronous messaging environments. +libsignal-protocol-c: +libsignal-protocol-c: +libsignal-protocol-c: +libsignal-protocol-c: +libsignal-protocol-c: +libsignal-protocol-c: +libsignal-protocol-c: diff --git a/system/libtrash/README b/system/libtrash/README new file mode 100644 index 0000000000..6de79c168a --- /dev/null +++ b/system/libtrash/README @@ -0,0 +1,6 @@ +libtrash is a shared library which, when preloaded, implements a +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.6 mc diff --git a/system/libtrash/libtrash.SlackBuild b/system/libtrash/libtrash.SlackBuild new file mode 100644 index 0000000000..f3d824421a --- /dev/null +++ b/system/libtrash/libtrash.SlackBuild @@ -0,0 +1,92 @@ +#!/bin/sh + +# Slackware build script for libtrash +# +# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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. + +PRGNAM=libtrash +VERSION=${VERSION:-3.6} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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.tgz +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 {} \; + +# Inspired by the following Arch Linux AUR script: +# https://aur.archlinux.org/packages/libtrash/ +sed -i -e s/ldconfig// ./src/Makefile +sed -i -e s/python/python2/ ./src/Makefile + +make +install -d $PKG/usr/lib $PKG/etc +make install INSTLIBDIR=$PKG/usr/lib SYSCONFFILE=$PKG/etc/libtrash.conf + +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 +cp -a COPYING README.md TODO config.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:-tgz} diff --git a/system/libtrash/libtrash.info b/system/libtrash/libtrash.info new file mode 100644 index 0000000000..706271dcea --- /dev/null +++ b/system/libtrash/libtrash.info @@ -0,0 +1,10 @@ +PRGNAM="libtrash" +VERSION="3.6" +HOMEPAGE="http://pages.stern.nyu.edu/~marriaga/software/libtrash/" +DOWNLOAD="http://pages.stern.nyu.edu/~marriaga/software/libtrash/libtrash-3.6.tgz" +MD5SUM="15cbe6d792e20057b13f46394c7c122a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu1@isaacyu1.com" diff --git a/system/libtrash/slack-desc b/system/libtrash/slack-desc new file mode 100644 index 0000000000..e72af9f6bc --- /dev/null +++ b/system/libtrash/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------------------------------------------------------| +libtrash: libtrash (trash can for GNU/Linux) +libtrash: +libtrash: libtrash is a shared library which, when preloaded, implements a +libtrash: trash can under GNU/Linux. +libtrash: +libtrash: +libtrash: +libtrash: +libtrash: +libtrash: +libtrash: diff --git a/system/linux-vt-setcolors/README b/system/linux-vt-setcolors/README new file mode 100644 index 0000000000..6f1072302b --- /dev/null +++ b/system/linux-vt-setcolors/README @@ -0,0 +1,8 @@ +linux-vt-setcolors (change color palette in Linux console) + +This little utility can be used to change the default color palette +of the Linux virtual console. The program accepts a configuration file +containing the colors to use, in hexadecimal form. + +The executable is named "setcolors". Sample config files are included +in the package. See: /usr/doc/linux-vt-setcolors-$VERSION/example-colors diff --git a/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild b/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild new file mode 100644 index 0000000000..48957505e6 --- /dev/null +++ b/system/linux-vt-setcolors/linux-vt-setcolors.SlackBuild @@ -0,0 +1,76 @@ +#!/bin/sh + +# Slackware build script for linux-vt-setcolors + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# I don't know why upstream refers to the console as a "VT101". The +# kernel source claims it's a VT102 implementation... but both a VT101 +# and a VT102 are monochrome terminals, so neither name is all that +# accurate... + +PRGNAM=linux-vt-setcolors +VERSION=${VERSION:-1.0.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# Makefile has too much hard-coded stuff. +mkdir -p $PKG/usr/bin $PKG/usr/man/man1 +EXE=setcolors +gcc -Wall $SLKCFLAGS -Wl,-s -o $PKG/usr/bin/$EXE $EXE.c +gzip -9c < $EXE.1 > $PKG/usr/man/man1/$EXE.1.gz + +# Project name and executable name are different, include this symlink +# in case someone (probably me) forgets. +ln -s $EXE.1.gz $PKG/usr/man/man1/$PRGNAM.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE* README* example-colors $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:-tgz} diff --git a/system/linux-vt-setcolors/linux-vt-setcolors.info b/system/linux-vt-setcolors/linux-vt-setcolors.info new file mode 100644 index 0000000000..92ee0d8c30 --- /dev/null +++ b/system/linux-vt-setcolors/linux-vt-setcolors.info @@ -0,0 +1,10 @@ +PRGNAM="linux-vt-setcolors" +VERSION="1.0.0" +HOMEPAGE="https://github.com/EvanPurkhiser/linux-vt-setcolors" +DOWNLOAD="https://github.com/EvanPurkhiser/linux-vt-setcolors/archive/v1.0.0/linux-vt-setcolors-1.0.0.tar.gz" +MD5SUM="789b4dc02d1c4f509b3b01450c7ef980" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/linux-vt-setcolors/slack-desc b/system/linux-vt-setcolors/slack-desc new file mode 100644 index 0000000000..d1eddc0433 --- /dev/null +++ b/system/linux-vt-setcolors/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------------------------------------------------------| +linux-vt-setcolors: linux-vt-setcolors (change color palette in Linux console) +linux-vt-setcolors: +linux-vt-setcolors: This little utility can be used to change the default color palette +linux-vt-setcolors: of the Linux virtual console. The program accepts a configuration file +linux-vt-setcolors: containing the colors to use, in hexadecimal form. +linux-vt-setcolors: +linux-vt-setcolors: The executable is named "setcolors". Sample config files are included +linux-vt-setcolors: in the package. See: +linux-vt-setcolors: /usr/doc/linux-vt-setcolors-$VERSION/example-colors +linux-vt-setcolors: +linux-vt-setcolors: diff --git a/system/linuxconsoletools/README b/system/linuxconsoletools/README index aaac1d084e..7d3b6e9b5a 100644 --- a/system/linuxconsoletools/README +++ b/system/linuxconsoletools/README @@ -9,6 +9,10 @@ to test and configure joysticks, connect legacy devices to the kernel's input subsystem (providing support for serial mice, touchscreens etc.), and test the input event layer. +Optional dependency: SDL2. This is only required for ffmvforce (force +orientation test for force-feedback devices). If SDL2 is not installed, +ffmvforce won't be included in the package. + Notes: - This replaces the "joystick" build that was previously available. diff --git a/system/linuxconsoletools/linuxconsoletools.SlackBuild b/system/linuxconsoletools/linuxconsoletools.SlackBuild index 129224725c..e5662ae25a 100644 --- a/system/linuxconsoletools/linuxconsoletools.SlackBuild +++ b/system/linuxconsoletools/linuxconsoletools.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for linuxconsoletools # Copyright 2011-2012 Roberto Neri, Palermo, Italy +# Copyright 2021 B. Watson <yalhcru@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,6 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20210223 bkw: update for v1.7.1 +# 20191129 bkw: update for v1.7.0, document new optional SDL2 dep. # 20181030 bkw: add GPM_COMPAT=yes option, minor cleanups, BUILD=2 # 20161015 bkw: update for v1.6.0 # 20160726 bkw: update for v1.5.1 @@ -30,8 +33,8 @@ # replaced patch with a bit of sed. PRGNAM=linuxconsoletools -VERSION=${VERSION:-1.6.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.7.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -73,6 +76,12 @@ 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 {} \+ +# 20191129 bkw: allow building without SDL2 installed. +if ! pkg-config --exists sdl2; then + sed -i '/^PROGRAMS/s,ffmvforce ,,' utils/Makefile + sed -i 's,ffmvforce\.1 ,,' docs/Makefile +fi + # install manpages in /usr/man instead of /usr/share/man sed -i 's,share/man,man,g' docs/Makefile diff --git a/system/linuxconsoletools/linuxconsoletools.info b/system/linuxconsoletools/linuxconsoletools.info index dd647eb667..31bd0ef77b 100644 --- a/system/linuxconsoletools/linuxconsoletools.info +++ b/system/linuxconsoletools/linuxconsoletools.info @@ -1,8 +1,8 @@ PRGNAM="linuxconsoletools" -VERSION="1.6.0" +VERSION="1.7.1" HOMEPAGE="https://sourceforge.net/projects/linuxconsole/" -DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.6.0.tar.bz2" -MD5SUM="fd52fa4a81455eb95a6c81efb087ce98" +DOWNLOAD="https://downloads.sourceforge.net/linuxconsole/linuxconsoletools-1.7.1.tar.bz2" +MD5SUM="bc9d7178434a2ff53b75dfdf7c34e2c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild index 20b1e09d51..0180629362 100644 --- a/system/lirc/lirc.SlackBuild +++ b/system/lirc/lirc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for lirc # Copyright 2009 Murat D. Kadirov <banderols@gmail.com> -# Copyright 2015 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> +# Copyright 2015-2021 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ PRGNAM=lirc VERSION=${VERSION:-0.9.3a} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} diff --git a/system/lirc/lirc.info b/system/lirc/lirc.info index 4b5767ee9b..a338a56123 100644 --- a/system/lirc/lirc.info +++ b/system/lirc/lirc.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3a/lirc-0.9.3a. MD5SUM="f9ed5dd0684a52c7cd98672e71e81b05" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-PyYAML" +REQUIRES="python3-PyYAML pygobject3-python3" MAINTAINER="Jeremy Hansen" EMAIL="jebrhansen+SBo -at- gmail.com" diff --git a/system/listpkg/listpkg.SlackBuild b/system/listpkg/listpkg.SlackBuild index 6f3675a96e..0fb268c08f 100644 --- a/system/listpkg/listpkg.SlackBuild +++ b/system/listpkg/listpkg.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for listpkg -# Copyright 2018 Jefferson Rocha <lrcjefferson@gmail.com> +# Copyright 2018 Jefferson Rocha <root@slackjeff.com.br> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/listpkg/listpkg.info b/system/listpkg/listpkg.info index 7db2ea4c6b..d35be08fd9 100644 --- a/system/listpkg/listpkg.info +++ b/system/listpkg/listpkg.info @@ -1,10 +1,10 @@ PRGNAM="listpkg" VERSION="0.1a" -HOMEPAGE="https://notabug.org/jeffersonrocha/ListPkg" -DOWNLOAD="https://notabug.org/jeffersonrocha/ListPkg/raw/master/listpkg-0.1a.tar.xz" +HOMEPAGE="https://github.com/slackjeff/listpkg" +DOWNLOAD="https://github.com/slackjeff/listpkg/raw/master/listpkg-0.1a.tar.xz" MD5SUM="4c4707af5e55d1d150602ea77ab34cb3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jefferson Rocha" -EMAIL="lrcjefferson@gmail.com" +EMAIL="root@slackjeff.com.br" diff --git a/system/lnav/lnav.SlackBuild b/system/lnav/lnav.SlackBuild index c8f866b21e..515b0b549c 100644 --- a/system/lnav/lnav.SlackBuild +++ b/system/lnav/lnav.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lnav -VERSION=${VERSION:-0.8.1} +VERSION=${VERSION:-0.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lnav/lnav.info b/system/lnav/lnav.info index 77b60342ba..799593cbbf 100644 --- a/system/lnav/lnav.info +++ b/system/lnav/lnav.info @@ -1,8 +1,8 @@ PRGNAM="lnav" -VERSION="0.8.1" +VERSION="0.9.0" HOMEPAGE="http://lnav.org" -DOWNLOAD="https://github.com/tstack/lnav/releases/download/v0.8.1/lnav-0.8.1.tar.gz" -MD5SUM="b60499eee0662887040a98c21aa444b3" +DOWNLOAD="https://github.com/tstack/lnav/releases/download/v0.9.0/lnav-0.9.0.tar.gz" +MD5SUM="77e87ccda75ba2c4f223ffac55392716" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/local-persist/README b/system/local-persist/README new file mode 100644 index 0000000000..7ebe8ec4a5 --- /dev/null +++ b/system/local-persist/README @@ -0,0 +1,4 @@ +Local-persist is a docker plugin that provides persistent local volumes. +This gives you the same benefits of standalone volumes that "docker +volume create" normally affords, while also allowing you to create +volumes that persist in arbitrary disk locations. diff --git a/system/local-persist/doinst.sh b/system/local-persist/doinst.sh new file mode 100644 index 0000000000..9ec9b9d797 --- /dev/null +++ b/system/local-persist/doinst.sh @@ -0,0 +1,14 @@ +#! /bin/sh +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... +} + +config etc/rc.d/rc.local-persist.new diff --git a/system/local-persist/local-persist.SlackBuild b/system/local-persist/local-persist.SlackBuild new file mode 100644 index 0000000000..2aaa2fd26c --- /dev/null +++ b/system/local-persist/local-persist.SlackBuild @@ -0,0 +1,85 @@ +#!/bin/sh + +# Slackware build script for local-persist + +# Copyright 2019 Sergey Poznyakoff <gray@gnu.org> +# 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. + +PRGNAM=local-persist +VERSION=${VERSION:-1.3.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +# Make sure go binary is in PATH +if [ -x /etc/profile.d/go.sh ]; then + . /etc/profile.d/go.sh +fi + +go mod init local-persist +make binary + +mkdir -p $PKG/usr/bin $PKG/etc/rc.d $PKG/install +cp bin/local-persist $PKG/usr/bin +cp $CWD/rc.local-persist $PKG/etc/rc.d/rc.local-persist.new +chmod 775 $PKG/etc/rc.d/rc.local-persist.new +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +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 +cp -a \ + 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/local-persist/local-persist.info b/system/local-persist/local-persist.info new file mode 100644 index 0000000000..ccbb3a815f --- /dev/null +++ b/system/local-persist/local-persist.info @@ -0,0 +1,10 @@ +PRGNAM="local-persist" +VERSION="1.3.0" +HOMEPAGE="https://github.com/MatchbookLab/local-persist" +DOWNLOAD="https://github.com/MatchbookLab/local-persist/archive/v1.3.0/local-persist-1.3.0.tar.gz" +MD5SUM="a7857ed93992c3364ff2c3f55de7237e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="google-go-lang" +MAINTAINER="Sergey Poznyakoff" +EMAIL="gray@gnu.org" diff --git a/system/local-persist/rc.local-persist b/system/local-persist/rc.local-persist new file mode 100644 index 0000000000..30fa1d07cf --- /dev/null +++ b/system/local-persist/rc.local-persist @@ -0,0 +1,39 @@ +#! /bin/sh + +CMD=local-persist + +local_persist_start() { + if [ -n "$(/sbin/pidof $CMD)" ]; then + echo >&2 "$0: $CMD is already running" + else + /usr/bin/$CMD | /usr/bin/logger -t $CMD -p daemon.info & + fi +} + +local_persist_stop() { + /usr/bin/pkill $CMD +} + +local_persist_status() { + pid=$(/sbin/pidof $CMD) + if [ -n "$pid" ]; then + echo "$CMD is running (pid $pid)" + else + echo "$CMD is not running" + fi +} + +case $1 in + start) + local_persist_start + ;; + stop) + local_persist_stop + ;; + restart) + local_persist_stop + local_persist_start + ;; + status) + local_persist_status +esac diff --git a/system/slack-scripts/slack-desc b/system/local-persist/slack-desc index 090e02679a..6d96dc682d 100644 --- a/system/slack-scripts/slack-desc +++ b/system/local-persist/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -slack-scripts: slack-scripts (Some Slackware Utilities) -slack-scripts: -slack-scripts: ph A Slackware Package History -slack-scripts: slkcfg A Sysvinit Script Utility -slack-scripts: -slack-scripts: Use <script> -h for usage. -slack-scripts: -slack-scripts: http://tty1.uk -slack-scripts: -slack-scripts: -slack-scripts: +local-persist: local-persist (Create persistent local volumes for docker) +local-persist: +local-persist: This docker plugin gives you the same benefits of standalone volumes +local-persist: that "docker volume create" normally affords, while also allowing you +local-persist: to create volumes that persist in arbitrary disk locations. +local-persist: +local-persist: Homepage: https://github.com/MatchbookLab/local-persist +local-persist: +local-persist: +local-persist: +local-persist: diff --git a/system/localepurge/localepurge.8.diff b/system/localepurge/localepurge.8.diff deleted file mode 100644 index 793b6184b6..0000000000 --- a/system/localepurge/localepurge.8.diff +++ /dev/null @@ -1,142 +0,0 @@ ---- ../localepurge-orig/debian/localepurge.8 2013-09-20 12:52:48.000000000 +0200 -+++ localepurge.8 2013-09-21 12:48:33.864666265 +0200 -@@ -1,4 +1,4 @@ --.TH LOCALEPURGE 8 -+.TH LOCALEPURGE 8 "2013-09-21" "GNU/Linux" "" - .SH NAME - localepurge \- reclaim disk space removing unneeded localizations - .SH SYNOPSIS -@@ -7,15 +7,8 @@ - .SH "DESCRIPTION" - .BR localepurge - is a small script to recover disk space wasted for unneeded locale --files and localized man pages. It will be automagically invoked by --.BR dpkg --upon completion of any --.BR apt --installation run. You have to define the locale --directory names you want to keep from removal after each --.BR apt --installation run --in the -+files and localized man pages. You have to define the locale -+directory names you want to keep from removal in the - .BR /etc/locale.nopurge - configuration file. Unless - .BR localepurge -@@ -35,10 +28,17 @@ - .BR \-\ /usr/share/omf - .br - The localization files you actually need and which you want to be preserved on your system can be --easily configured by running the following command: -+easily configured by editing the following file: - .br --.BR dpkg-reconfigure\ localepurge -+.BR /etc/locale.nopurge - .br -+New locales discovered on your system will be listed in -+.I /var/cache/localepurge/localelist\-new -+and should be added to -+.I /var/cache/localepurge/localelist -+by the -+.BR /usr/bin/localepurge-config -+script. - .SH OPTIONS - The configurable options consist of toggling verbose output, reporting a - summary of freed space, and deletion of localized manual pages in -@@ -68,10 +68,10 @@ - .BR not - .BR integrated - .BR with --.BR Debian's -+.BR "Arch Linux's" - .BR package - .BR management --.BR system -+.BR system - and therefore is not meant for the faint of heart. Responsibility for its - usage and possible breakage of your system therefore lies in the sysadmin's - (your) hands. -@@ -85,60 +85,12 @@ - All locale directories containing a subdirectory named LC_MESSAGES - which are either commented out or not even listed at all in - .BR /etc/locale.nopurge --will be irreversibly deleted. The only way to --reinstall any lost locales is a complete reinstallation of all the --Debian packages containing them. See --.BR /usr/share/doc/localepurge/reinstall_debs.sh --for a recipe. --Alternatively you can reconfigure --it with --.BR dpkg-reconfigure(8) --to prevent locale files from being purged during subsequent runs of apt. --.br --.SH SOLVING PROBLEMS caused by localepurge --This program does interfere with the Debian package management and does --provoke strange, but usually harmless, behaviour of programs related --with --.BR apt/dpkg --like --.BR dpkg-repack(1), --.BR debsums(1), --.BR reportbug(1), --etc. --If you need to have any package in its full integrity so that e.g. the --formerly mentioned programs work as designed by its author and as --expected by you, simply deinstall --.BR localepurge --temporarily without purging its configuration and reinstall the packages --you need in their fully integral state. When you are done with what you --needed the integral packages for simply reinstall --.BR localepurge --again. -- -+will be irreversibly deleted. The only way to reinstall any lost -+locales is a complete reinstallation of all the Arch Linux packages -+containing them. For more information, see "Reinstalling all installed packages" -+at http://wiki.archlinux.org/index.php/Pacman_Tips. - .SH FILES - .BR /etc/locale.nopurge --.SH SEE ALSO --Administrators of systems with short disk space should have a look --at both the --.BR deborphan --and --.BR debfoster --packages. Especially --.BR debfoster --can work wonders for your scarce disk space! -- --.br --.BR deborphan(1) --.br --.BR debfoster(8) --.br --.BR dpkg-reconfigure(8) --.br --.BR debconf(8) --.br --.BR /usr/share/doc/localepurge/README.debian --.br --.BR /usr/share/doc/localepurge/reinstall_debs.sh - .SH AUTHOR - .BR localepurge - and its accompanying manual page was written for the -@@ -150,3 +102,17 @@ - Debian's great package management system will make - .BR localepurge - fully obsolete. -+.SH NOTE -+This manual page and the Debian localepurge script have been modified -+for Arch Linux system by Francesco Groccia <frgroccia gmail.com>. -+Some Debian\-specific information has been removed. -+.br -+In particular, the following files have been revised from the -+localepurge source code (Debian "sid" distribution): -+.HP -+ -+.I ../debian/localepurge.8 -+ -+.I ../debian/localepurge.config -+ -+.I ../usr/sbin/localepurge diff --git a/system/localepurge/localepurge.SlackBuild b/system/localepurge/localepurge.SlackBuild index 4afa7e26f5..a2619e8c5f 100644 --- a/system/localepurge/localepurge.SlackBuild +++ b/system/localepurge/localepurge.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for localepurge. # -# Copyright 2016-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2016-2021 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=localepurge -VERSION=${VERSION:-0.7.3.5} +VERSION=${VERSION:-0.7.3.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,10 +72,6 @@ find -L . \ 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 -patch -uN usr/sbin/localepurge < $CWD/localepurge.diff -patch -uN debian/localepurge.8 < $CWD/localepurge.8.diff -patch -uN debian/localepurge.config < $CWD/localepurge.config.diff - install -D -m755 usr/sbin/localepurge $PKG/usr/bin/localepurge install -D -m644 debian/localepurge.8 $PKG/usr/man/man8/localepurge.8 install -D -m755 debian/localepurge.config $PKG/usr/bin/localepurge-config @@ -92,10 +88,10 @@ install -D -m644 $CWD/localelist $PKG/var/cache/localepurge/localelist 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 -DOCS="debian/NEWS.Debian debian/README.Debian debian/changelog debian/copyright" +DOCS="debian/README.Debian debian/changelog debian/copyright" mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/localepurge/localepurge.config.diff b/system/localepurge/localepurge.config.diff deleted file mode 100644 index 83f0218536..0000000000 --- a/system/localepurge/localepurge.config.diff +++ /dev/null @@ -1,147 +0,0 @@ ---- localepurge.conf.orig 2014-02-04 18:17:32.554174127 +0100 -+++ localepurge.conf 2014-02-04 18:21:08.911092875 +0100 -@@ -2,26 +2,11 @@ - - set -e - --. /usr/share/debconf/confmodule -- - # first get all possible locales and create a full list of locale values: - --CONFIG_FILE="/etc/locale.nopurge" - TEMPFILE="$(mktemp --suffix ".locales")" - LOCALELIST=/var/cache/localepurge/localelist - --conf_has_key() { -- local key="$1" -- -- if [ -f "$CONFIG_FILE" ] && fgrep --quiet --line-regexp \ -- "$key" "$CONFIG_FILE"; then -- echo "true" -- else -- echo "false" -- fi --} -- -- - # for the purpose of presenting a ready made preselection at the very first - # configuration, include already configured locales from locales package: - -@@ -46,9 +31,7 @@ - - # include locales supported by the locales package: - --if [ -f /usr/share/i18n/SUPPORTED ]; then -- grep ^[a-z] /usr/share/i18n/SUPPORTED | cut -d' ' -f1 | sort -u >> "$TEMPFILE" --fi -+find /usr/share/locale -maxdepth 1 -type d -name "*" -printf "%f\n" | grep "^[a-z]" | cut -d" " -f1 | sort -u >> "$TEMPFILE" - - # include locales from our previous localelist if it already exists: - -@@ -59,8 +42,7 @@ - # include locales from newly added locales: - NEWLOCALELIST="$LOCALELIST"-new - --if [ -f "$NEWLOCALELIST" ] && \ -- [ $(ps w -p "$PPID" | grep -c dpkg-reconfigure) = "1" ]; then -+if [ -f "$NEWLOCALELIST" ]; then - cat "$NEWLOCALELIST" >> "$TEMPFILE" - rm -f "$NEWLOCALELIST" - fi -@@ -79,96 +61,9 @@ - else - mv "$LOCALELIST" "$LOCALELIST"-old - sort -u "$TEMPFILE" > "$LOCALELIST" --fi -- --# finally sort and create full list of all collected locale names -- --LOCALES=$(sort -u "$TEMPFILE" | tr '\n' ' ' \ -- | sed 's/\ /,\ /g' | sed 's/,\ $//g') -- --if [ -f "$CONFIG_FILE" ] ; then -- # Update the debconf database -- PRESELECT="$(grep --extended-regexp '^[[:lower:]][[:lower:]]' \ -- "$CONFIG_FILE" | tr '\n' ' ' | sed 's/\ /,\ /g' | \ -- sed 's/,\ $//g')" -- db_set localepurge/nopurge "$PRESELECT" -- -- db_set localepurge/use-dpkg-feature "$(conf_has_key USE_DPKG)" -- db_set localepurge/mandelete "$(conf_has_key MANDELETE)" -- db_set localepurge/dontbothernew "$(conf_has_key DONTBOTHERNEWLOCALE)" -- db_set localepurge/showfreedspace "$(conf_has_key SHOWFREEDSPACE)" -- db_set localepurge/quickndirtycalc "$(conf_has_key QUICKNDIRTYCALC)" -- db_set localepurge/verbose "$(conf_has_key VERBOSE)" -- --else -- -- # sort and create preselection values from "$LOCALEGEN" -- -- PRESELECT=$(sort -u "$LOCALEGEN" | tr '\n' ' ' \ -- | sed 's/\ /,\ /g' | sed 's/,\ $//g') - fi - - # deleting temporary files not needed anymore: - - rm -f "$TEMPFILE" "$LOCALEGEN" - --############################################################# --# now that all locale data is in place let debconf take over: -- --db_subst localepurge/nopurge locales "$LOCALES" -- --# uncomment for debugging: --#echo "$LOCALES" > /tmp/locales.list -- --db_get localepurge/nopurge --if [ "$RET" = "" ] && [ "$RET" != "PURGE_ALL" ] \ -- || [ "$RET" = "NEEDSCONFIGFIRST" ]; then -- db_set localepurge/nopurge "$PRESELECT" -- db_fset localepurge/nopurge seen false -- # uncomment for debugging: -- #echo "$PRESELECT" > /tmp/preselect.list --fi -- --db_input high localepurge/nopurge || true --db_go -- --db_get localepurge/nopurge --if [ "$RET" = "" ] || [ "$RET" = "PURGE_ALL" ]; then -- db_input high localepurge/none_selected || true -- db_go -- -- db_get localepurge/none_selected -- if [ "$RET" = "false" ]; then -- db_input high localepurge/remove_no || true -- db_go -- fi --fi -- --db_input high localepurge/use-dpkg-feature || true --db_go --if [ "$RET" = "" -o "$RET" = "true" ] ; then -- USE_DPKG=yes --else -- USE_DPKG=no --fi -- --db_input medium localepurge/mandelete || true --db_go -- --if [ "$USE_DPKG" = "xno" ] ; then -- # Features incompatible with the dpkg approach. -- db_input medium localepurge/dontbothernew || true -- db_go -- -- db_input low localepurge/showfreedspace || true -- db_go -- -- db_get localepurge/showfreedspace -- if [ "$RET" = "true" ]; then -- db_input low localepurge/quickndirtycalc || true -- db_go -- fi -- -- db_input low localepurge/verbose || true -- db_go --fi diff --git a/system/localepurge/localepurge.diff b/system/localepurge/localepurge.diff deleted file mode 100644 index c0174d5bf7..0000000000 --- a/system/localepurge/localepurge.diff +++ /dev/null @@ -1,206 +0,0 @@ ---- ../localepurge-orig/usr/sbin/localepurge 2013-06-15 18:46:01.000000000 +0200 -+++ localepurge 2013-09-21 12:04:38.155721151 +0200 -@@ -1,6 +1,6 @@ - #! /bin/bash - --# Deleting all locale files and localized man pages installed -+# Deleting all locale files and localized man pages installed - # on system which are *not* listed in /etc/locale.nopurge - - set -e -@@ -12,48 +12,35 @@ - fi - - if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then -- echo "" -- echo "Verbose output is triggered with option '-v' or '-verbose'." -- echo "Debugging output is triggered with option '-d' or '-debug'." -- echo "To reconfigure it, run 'dpkg-reconfigure localepurge'." -- echo "Documentation is either available via 'man localepurge'" -- echo "or by reading the docs in /usr/share/doc/localepurge." -- echo "" -- if [ -f $NOPURGECONF ] && fgrep --quiet --line-regexp USE_DPKG $NOPURGECONF ; then -- echo "NB: localepurge has been configured to use dpkg. Therefore," -- echo "this script will not do anything." -- fi -- exit 0 -+ echo "" -+ echo "Verbose output is triggered with option '-v' or '-verbose'." -+ echo "Debugging output is triggered with option '-d' or '-debug'." -+ echo "To reconfigure it, edit /etc/locale.nopurge file." -+ echo "Documentation is available via 'man 8 localepurge'." -+ echo "" -+ exit 0 - fi - -- - # Do nothing and report why if no valid configuration file exists: - --if [ ! -f $NOPURGECONF ] -- then -- echo " No $NOPURGECONF file present, exiting ..." -+if [ ! -f $NOPURGECONF ]; then -+ echo " No $NOPURGECONF file present, exiting ..." -+ exit 0 -+else -+ if fgrep --quiet --line-regexp NEEDSCONFIGFIRST $NOPURGECONF ; then -+ echo -+ echo " You have to configure \"localepurge\" by editing" -+ echo -+ echo " /etc/locale.nopurge file" -+ echo -+ echo " to make $0 actually start to function." -+ echo -+ echo " Nothing to be done, exiting ..." -+ echo - exit 0 -- else -- if fgrep --quiet --line-regexp USE_DPKG $NOPURGECONF -- then -- # Do nothing, dpkg does all the work for us. -- exit 0 -- elif fgrep --quiet --line-regexp NEEDSCONFIGFIRST $NOPURGECONF -- then -- echo -- echo " You have to configure \"localepurge\" with the command" -- echo -- echo " dpkg-reconfigure localepurge" -- echo -- echo " to make $0 actually start to function." -- echo -- echo " Nothing to be done, exiting ..." -- echo -- exit 0 -- fi -+ fi - fi - -- - ################################################################ - ## Initialise variables - -@@ -85,7 +72,6 @@ - VERBOSE=1 - fi - -- - ################################################################ - ## Manage the list of locales - -@@ -97,57 +83,57 @@ - - ((VERBOSE)) && echo "localepurge: checking for existence of $LOCALECACHEDIR..." - if [ ! -d $LOCALECACHEDIR ]; then -- mkdir -m 644 -p $LOCALECACHEDIR -+ mkdir -m 644 -p $LOCALECACHEDIR - fi - - ((VERBOSE)) && echo "localepurge: checking for existence of $LOCALELIST..." - if [ ! -f $LOCALELIST ]; then -- touch $LOCALELIST && chmod 664 $LOCALELIST -+ touch $LOCALELIST && chmod 664 $LOCALELIST - fi - - ((VERBOSE)) && echo "localepurge: checking system for new locale ..." - - for NEWLOCALE in $(cd /usr/share/locale; ls .) --do -- if [ -d /usr/share/locale/$NEWLOCALE/LC_MESSAGES ]; then -- if [ ! "$(grep -cx $NEWLOCALE $LOCALELIST)" = "1" ]; then -- echo "$NEWLOCALE" >> "$NEWLOCALELIST" -+do -+ if [ -d /usr/share/locale/$NEWLOCALE/LC_MESSAGES ]; then -+ if [ ! "$(grep -cx $NEWLOCALE $LOCALELIST)" = "1" ]; then -+ echo "$NEWLOCALE" >> "$NEWLOCALELIST" -+ fi - fi -- fi - done - - for NEWLOCALE in $(ls --ignore="man[1-9]*" /usr/share/man) --do -- if [ -d /usr/share/man/$NEWLOCALE/man1 ] || [ -d /usr/share/man/$NEWLOCALE/man8 ]; then -- if [ ! "$(grep -cx $NEWLOCALE $LOCALELIST)" = "1" ]; then -- echo "$NEWLOCALE" >> "$NEWLOCALELIST" -+do -+ if [ -d /usr/share/man/$NEWLOCALE/man1 ] || [ -d /usr/share/man/$NEWLOCALE/man8 ]; then -+ if [ ! "$(grep -cx $NEWLOCALE $LOCALELIST)" = "1" ]; then -+ echo "$NEWLOCALE" >> "$NEWLOCALELIST" -+ fi - fi -- fi - done - - if [ -f $NEWLOCALELIST ]; then -- if ((DONTBOTHERNEWLOCALE)); then -- mv "$NEWLOCALELIST" "$NEWLOCALELIST".temp -- sort -u "$NEWLOCALELIST".temp "$LOCALELIST"> "$NEWLOCALELIST" -- mv "$NEWLOCALELIST" "$LOCALELIST" -- rm "$NEWLOCALELIST".temp -- else -- mv "$NEWLOCALELIST" "$NEWLOCALELIST".temp -- sort -u "$NEWLOCALELIST".temp > "$NEWLOCALELIST" -- rm "$NEWLOCALELIST".temp -- fi -+ if ((DONTBOTHERNEWLOCALE)); then -+ mv "$NEWLOCALELIST" "$NEWLOCALELIST".temp -+ sort -u "$NEWLOCALELIST".temp "$LOCALELIST"> "$NEWLOCALELIST" -+ mv "$NEWLOCALELIST" "$LOCALELIST" -+ rm "$NEWLOCALELIST".temp -+ else -+ mv "$NEWLOCALELIST" "$NEWLOCALELIST".temp -+ sort -u "$NEWLOCALELIST".temp > "$NEWLOCALELIST" -+ rm "$NEWLOCALELIST".temp -+ fi - fi - - if [ -f "$NEWLOCALELIST" ] && [ $DONTBOTHERNEWLOCALE != yes ]; then - echo "Some new locales have appeared on your system:" - echo -- tr '\n' ' ' < "$NEWLOCALELIST" -+ tr '\n' ' ' < "$NEWLOCALELIST" - echo - echo - echo "They will not be touched until you reconfigure localepurge" - echo "with the following command:" - echo -- echo " dpkg-reconfigure localepurge" -+ echo " /usr/bin/localepurge-config" - echo - fi - -@@ -157,7 +143,7 @@ - ## all locales and create a pattern matching superfluous locales. - nopurge=$( - set -o noglob; # Disable path expansion and use 'echo' -- # below to change newlines into spaces -+ # below to change newlines into spaces - echo $(grep --invert-match --extended-regexp '^[ \t]*(#|$)' $NOPURGECONF) - ) - nopurgepat='@(C|'"${nopurge// /|}"')' -@@ -172,7 +158,7 @@ - ) - - ################################################################ --## Define utility functions -+## Define utility functions - - # Function for disk space calculation - # Usage: get_used_space <dirname> -@@ -202,7 +188,7 @@ - local flag - ((VERBOSE)) && flag=-v - for file; do -- if [ -f "$file" ] || [ -h "$file" ]; then -+ if [ -f "$file" ] || [ -h "$file" ]; then - echo "$file" - fi - done | xargs rm $flag -@@ -241,7 +227,6 @@ - fi - } - -- - ################################################################ - ## Now, get the job done - diff --git a/system/localepurge/localepurge.info b/system/localepurge/localepurge.info index 5b0e573908..6014256630 100644 --- a/system/localepurge/localepurge.info +++ b/system/localepurge/localepurge.info @@ -1,8 +1,8 @@ PRGNAM="localepurge" -VERSION="0.7.3.5" +VERSION="0.7.3.10" HOMEPAGE="https://packages.debian.org/search?keywords=localepurge" -DOWNLOAD="http://snapshot.debian.org/archive/debian/20181120T130918Z/pool/main/l/localepurge/localepurge_0.7.3.5.tar.xz" -MD5SUM="82e2cff7ced97e9792aada8be30e6367" +DOWNLOAD="http://deb.debian.org/debian/pool/main/l/localepurge/localepurge_0.7.3.10.tar.xz" +MD5SUM="cafa19c565e5156c7947c0094fe76a3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/logtool/logtool.SlackBuild b/system/logtool/logtool.SlackBuild index e6ac3a8508..a1baaddb01 100644 --- a/system/logtool/logtool.SlackBuild +++ b/system/logtool/logtool.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for logtool. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/logtool/logtool.info b/system/logtool/logtool.info index 02edd86e61..f8615dd11c 100644 --- a/system/logtool/logtool.info +++ b/system/logtool/logtool.info @@ -6,5 +6,5 @@ MD5SUM="7da0564dc0fea4f0470d61168871f9c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/system/logwatch/README b/system/logwatch/README new file mode 100644 index 0000000000..c3b26f004d --- /dev/null +++ b/system/logwatch/README @@ -0,0 +1,5 @@ +Logwatch is a customizable log analysis system. + +Logwatch parses through your system's logs and creates a report +analyzing areas that you specify. Logwatch is easy to use and will work +right out of the package on most systems. diff --git a/system/logwatch/doinst.sh b/system/logwatch/doinst.sh new file mode 100644 index 0000000000..a377eaacde --- /dev/null +++ b/system/logwatch/doinst.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +config() { + NEW="$1" + OLD="${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... +} + +config etc/logwatch/conf/logwatch.conf.new +config etc/logwatch/conf/ignore.conf.new +config etc/logwatch/conf/override.conf.new + diff --git a/system/logwatch/logwatch.SlackBuild b/system/logwatch/logwatch.SlackBuild new file mode 100644 index 0000000000..01b45f4253 --- /dev/null +++ b/system/logwatch/logwatch.SlackBuild @@ -0,0 +1,112 @@ +#!/bin/sh + +# Slackware build script for logwatch + +# Copyright (c) 2019 Gregory J.L. Tourte <artourter@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. + +PRGNAM=logwatch +VERSION=${VERSION:-7.5.5} +BUILD=${BUILD:-1} +ARCH=noarch +TAG=${TAG:-_SBo} + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 . + +install -m 0755 -d $PKG/var/cache/logwatch +install -m 0755 -d $PKG/etc/logwatch/scripts +install -m 0755 -d $PKG/etc/logwatch/scripts/services +install -m 0755 -d $PKG/etc/logwatch/conf +install -m 0755 -d $PKG/etc/logwatch/conf/logfiles +install -m 0755 -d $PKG/etc/logwatch/conf/services +install -m 0755 -d $PKG/usr/share/logwatch/default.conf/logfiles +install -m 0755 -d $PKG/usr/share/logwatch/default.conf/services +install -m 0755 -d $PKG/usr/share/logwatch/default.conf/html +install -m 0755 -d $PKG/usr/share/logwatch/dist.conf/logfiles +install -m 0755 -d $PKG/usr/share/logwatch/dist.conf/services +install -m 0755 -d $PKG/usr/share/logwatch/scripts/services +install -m 0755 -d $PKG/usr/share/logwatch/scripts/shared +install -m 0755 -d $PKG/usr/share/logwatch/lib + +install -m 0755 scripts/logwatch.pl $PKG/usr/share/logwatch/scripts/logwatch.pl + +for i in $( find scripts/logfiles/* -type d -not -empty ) +do + echo "creating folder $PKG/usr/share/logwatch/$i" + install -m 0755 -d $PKG/usr/share/logwatch/$i + install -m 0755 $i/* $PKG/usr/share/logwatch/$i +done + +install -m 0755 scripts/services/* $PKG/usr/share/logwatch/scripts/services +install -m 0755 scripts/shared/* $PKG/usr/share/logwatch/scripts/shared +install -m 0755 lib/* $PKG/usr/share/logwatch/lib + +install -m 0644 conf/*.conf $PKG/usr/share/logwatch/default.conf +install -m 0644 conf/logfiles/* $PKG/usr/share/logwatch/default.conf/logfiles +install -m 0644 conf/services/* $PKG/usr/share/logwatch/default.conf/services +install -m 0644 conf/html/* $PKG/usr/share/logwatch/default.conf/html + +install -m 0755 -d $PKG/usr/man/man1 +install -m 0644 amavis-logwatch.1 $PKG/usr/man/man1 +install -m 0644 postfix-logwatch.1 $PKG/usr/man/man1 +install -m 0755 -d $PKG/usr/man/man5 +install -m 0644 ignore.conf.5 $PKG/usr/man/man5 +install -m 0644 logwatch.conf.5 $PKG/usr/man/man5 +install -m 0644 override.conf.5 $PKG/usr/man/man5 +install -m 0755 -d $PKG/usr/man/man8 +install -m 0644 logwatch.8 $PKG/usr/man/man8 + +install -m 0755 -d $PKG/etc/cron.daily +ln -s /usr/share/logwatch/scripts/logwatch.pl $PKG/etc/cron.daily/0logwatch +install -m 0755 -d $PKG/usr/sbin +ln -s /usr/share/logwatch/scripts/logwatch.pl $PKG/usr/sbin/logwatch + +# Using Alienbob's default configuration files +echo "###### REGULAR EXPRESSIONS IN THIS FILE WILL BE TRIMMED FROM REPORT OUTPUT #####" > $PKG/etc/logwatch/conf/ignore.conf.new +echo "# Local configuration options go here (defaults are in /usr/share/logwatch/default.conf/logwatch.conf)" > $PKG/etc/logwatch/conf/logwatch.conf.new +echo "# Configuration overrides for specific logfiles/services may be placed here." > $PKG/etc/logwatch/conf/override.conf.new + +find $PKG/usr/man -type f -exec gzip -9 {} \; + +DOCS="HOWTO-Customize-LogWatch LICENSE README" + +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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/logwatch/logwatch.info b/system/logwatch/logwatch.info new file mode 100644 index 0000000000..8adcf7d5ad --- /dev/null +++ b/system/logwatch/logwatch.info @@ -0,0 +1,10 @@ +PRGNAM="logwatch" +VERSION="7.5.5" +HOMEPAGE="http://logwatch.sourceforge.net" +DOWNLOAD="https://downloads.sourceforge.net/project/logwatch/logwatch-7.5.5/logwatch-7.5.5.tar.gz" +MD5SUM="b658e4db27d905151396ecadcbcb24b1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/system/logwatch/slack-desc b/system/logwatch/slack-desc new file mode 100644 index 0000000000..bba4e1a829 --- /dev/null +++ b/system/logwatch/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 ':'. + + |-----handy-ruler------------------------------------------------------| +logwatch: logwatch (a customizable log analysis system) +logwatch: +logwatch: Logwatch parses through your system's logs for a given period of +logwatch: time and creates a report analyzing areas that you specify, in as +logwatch: much detail as you require. Logwatch is easy to use and will work +logwatch: right out of the package on most systems. +logwatch: +logwatch: Project home: http://www.logwatch.org/ +logwatch: +logwatch: +logwatch: diff --git a/system/loksh/doinst.sh b/system/loksh/doinst.sh new file mode 100644 index 0000000000..84285f3b07 --- /dev/null +++ b/system/loksh/doinst.sh @@ -0,0 +1,8 @@ +if [ ! -r etc/shells ]; then + touch etc/shells + chmod 644 etc/shells +fi + +if ! grep -q /bin/loksh etc/shells ; then + printf %s\\n /bin/loksh >> etc/shells +fi diff --git a/system/loksh/loksh.SlackBuild b/system/loksh/loksh.SlackBuild index 267dfa915c..9a57d890d4 100644 --- a/system/loksh/loksh.SlackBuild +++ b/system/loksh/loksh.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for loksh -# Copyright 2018 Hunter Sezen California, USA +# Copyright 2018-2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=loksh -VERSION=${VERSION:-6.4} +VERSION=${VERSION:-6.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,23 +69,39 @@ 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 {} \; -make \ - CFLAGS="$SLKCFLAGS" +if [ "${DEBUG:=0}" != 0 ]; then + NDEBUG=false + RELEASE=debug + SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')" +else + NDEBUG=true + RELEASE=plain +fi -make install \ - PREFIX=/usr \ - BIN_NAME=$PRGNAM \ - BIN_DIR=/bin \ - MAN_DIR=/usr/man \ - DOC_DIR=/usr/doc/$PRGNAM-$VERSION \ - DESTDIR=$PKG +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +meson \ + --prefix=/ \ + --bindir=bin \ + --libdir=usr/lib${LIBDIRSUFFIX} \ + --mandir=usr/man \ + --datadir=usr \ + -Dstrip=$NDEBUG \ + -Db_ndebug=$NDEBUG \ + -Dbuildtype=$RELEASE \ + build + +"${NINJA:=ninja}" -C build +DESTDIR=$PKG "$NINJA" -C build install + +mv -- $PKG/bin/ksh $PKG/bin/$PRGNAM +mv -- $PKG/usr/man/man1/ksh.1 $PKG/usr/man/man1/$PRGNAM.1 +mv -- $PKG/usr/man/man1/sh.1 $PKG/usr/man/man1/$PRGNAM-sh.1 +mv -- $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/usr/bin ln -s /bin/$PRGNAM $PKG/usr/bin/$PRGNAM -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 @@ -94,6 +110,7 @@ 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:-tgz} diff --git a/system/loksh/loksh.info b/system/loksh/loksh.info index 547a429294..eb380c2afa 100644 --- a/system/loksh/loksh.info +++ b/system/loksh/loksh.info @@ -1,10 +1,10 @@ PRGNAM="loksh" -VERSION="6.4" +VERSION="6.8.1" HOMEPAGE="https://github.com/dimkr/loksh" -DOWNLOAD="https://github.com/dimkr/loksh/archive/6.4/loksh-6.4.tar.gz" -MD5SUM="18d991fc62dfa1f76f4e5de1521df58e" +DOWNLOAD="https://github.com/dimkr/loksh/releases/download/6.8.1/loksh-6.8.1.tar.xz" +MD5SUM="aad60aef7562ad4cf029411032892c2d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="meson" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/lolcat/README b/system/lolcat/README new file mode 100644 index 0000000000..d493acd77e --- /dev/null +++ b/system/lolcat/README @@ -0,0 +1,5 @@ +lolcat (High-performance implementation of lolcat) + +This lolcat clone is an attempt to reduce the world's carbon dioxide +emissions by optimizing inefficient code. It's >10x as fast and <0.1% +as large as the original one. diff --git a/system/lolcat/lolcat.SlackBuild b/system/lolcat/lolcat.SlackBuild new file mode 100644 index 0000000000..5b591c2421 --- /dev/null +++ b/system/lolcat/lolcat.SlackBuild @@ -0,0 +1,87 @@ +#!/bin/sh +# +# Slackware build script for lolcat. +# +# Copyright 2019-2021 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# 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. + +PRGNAM=lolcat +VERSION=${VERSION:-1.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +make +install -Dm755 lolcat $PKG/usr/bin/lolcat + +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 +cp 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/lolcat/lolcat.info b/system/lolcat/lolcat.info new file mode 100644 index 0000000000..7b8e2bfd3c --- /dev/null +++ b/system/lolcat/lolcat.info @@ -0,0 +1,10 @@ +PRGNAM="lolcat" +VERSION="1.2" +HOMEPAGE="https://github.com/jaseg/lolcat" +DOWNLOAD="https://github.com/jaseg/lolcat/archive/v1.2/lolcat-1.2.tar.gz" +MD5SUM="d1a7f8a4ddee5affe84de2d6ffa055e5" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Edinaldo P. Silva" +EMAIL="edps.mundognu@gmail.com" diff --git a/system/lolcat/slack-desc b/system/lolcat/slack-desc new file mode 100644 index 0000000000..04fe4296cc --- /dev/null +++ b/system/lolcat/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------------------------------------------------------| +lolcat: lolcat (High-performance implementation of lolcat) +lolcat: +lolcat: This lolcat clone is an attempt to reduce the world's carbon dioxide +lolcat: emissions by optimizing inefficient code. It's >10x as fast and <0.1% +lolcat: as large as the original one. +lolcat: +lolcat: Home page: https://github.com/jaseg/lolcat +lolcat: +lolcat: +lolcat: +lolcat: diff --git a/system/lomoco/lomoco.SlackBuild b/system/lomoco/lomoco.SlackBuild index 96fce19e29..021c458b9e 100644 --- a/system/lomoco/lomoco.SlackBuild +++ b/system/lomoco/lomoco.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for lomoco -# Copyright 2011 David Woodfall <dave@dawoodfall.net> +# Copyright 2011 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/lomoco/lomoco.info b/system/lomoco/lomoco.info index ee81e839df..1cd4b6ba22 100644 --- a/system/lomoco/lomoco.info +++ b/system/lomoco/lomoco.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/lshw/README b/system/lshw/README index f917315f0f..04d64576eb 100644 --- a/system/lshw/README +++ b/system/lshw/README @@ -1,15 +1,27 @@ -lshw (Hardware Lister) is a small tool to provide detailed information on -the hardware configuration of the machine. It can report exact memory -configuration, firmware version, mainboard configuration, CPU version and -speed, cache configuration, bus speed, etc. on DMI-capable x86 or EFI -(IA-64) systems and on some PowerPC machines (PowerMac G4 is known to work). +lshw (Hardware Lister) is a small tool to provide detailed information +on the hardware configuration of the machine. It can report exact memory +configuration, firmware version, mainboard configuration, CPU version +and speed, cache configuration, bus speed, etc. on DMI-capable x86 or +EFI (IA-64) systems and on some PowerPC machines (PowerMac G4 is known +to work). Information can be output in plain text, XML, or HTML. It currently supports DMI (x86 and EFI only), OpenFirmware device tree -(PowerPC only), PCI/AGP, ISA PnP (x86), CPUID (x86), IDE/ATA/ATAPI, PCMCIA -(only tested on x86), USB, and SCSI. +(PowerPC only), PCI/AGP, ISA PnP (x86), CPUID (x86), IDE/ATA/ATAPI, +PCMCIA (only tested on x86), USB, and SCSI. -On x86, lshw needs to be run as root to be able to access DMI information -from the BIOS. Running lshw as a non-root user usually gives much less -detailed information. +On x86, lshw needs to be run as root to be able to access DMI +information from the BIOS. Running lshw as a non-root user usually gives +much less detailed information. + +There several build options available for the SlackBuild: + + GUI=no Disable GTK GUI support (default: yes) + ZLIB=yes Enable zlib support (default: no) + SQLITE=yes Enable sqlite support (default: no) + +where one or more build options are passed to the SlackBuild. For +example, to disable GUI and enable zlib support use: + + GUI=no ZLIB=yes ./lshw.SlackBuild diff --git a/system/lshw/lshw.SlackBuild b/system/lshw/lshw.SlackBuild index 0b24779004..fdd5409b83 100644 --- a/system/lshw/lshw.SlackBuild +++ b/system/lshw/lshw.SlackBuild @@ -1,13 +1,45 @@ #!/bin/sh # Slackware build script for lshw -# Written by Iskar Enev <iskar.enev[@]gmail.com> + +# Iskar Enev <iskar.enev[@]gmail.com> +# Copyright 2017,2021 Jason Graham <jgraham@compukix.net> USA +# 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. PRGNAM=lshw -VERSION=${VERSION:-B.02.18} +VERSION=${VERSION:-B.02.19.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +GUI=${GUI:-yes} +if [ "$ZLIB" = "no" ]; then + ENABLE_ZLIB=0 +else + ENABLE_ZLIB=1 +fi +if [ "$SQLITE" = "no" ]; then + ENABLE_SQLITE=0 +else + ENABLE_SQLITE=1 +fi + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -53,10 +85,19 @@ find -L . \ # Fix the MANDIR variable sed -i "s%MANDIR=\$(PREFIX)/share/man%MANDIR=\$(PREFIX)/man%" src/Makefile -RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make -RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make gui -make install DESTDIR=$PKG -make install-gui DESTDIR=$PKG +VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \ + make ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE +if [ "$GUI" = "yes" ]; then + VERSION=VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \ + make gui ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE +fi + +VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \ + make install DESTDIR=$PKG ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE +if [ "$GUI" = "yes" ]; then + VERSION=$VERSION RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" \ + make install-gui DESTDIR=$PKG ZLIB=$ENABLE_ZLIB SQLITE=$ENABLE_SQLITE +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 @@ -64,8 +105,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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/share/applications -cat $CWD/gtk-lshw.desktop > $PKG/usr/share/applications/gtk-lshw.desktop +if [ "$GUI" = "yes" ]; then + mkdir -p $PKG/usr/share/applications + cat $CWD/gtk-lshw.desktop > $PKG/usr/share/applications/gtk-lshw.desktop +fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a docs/* COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/lshw/lshw.info b/system/lshw/lshw.info index 4c8d8ae4c5..d6da2e38a2 100644 --- a/system/lshw/lshw.info +++ b/system/lshw/lshw.info @@ -1,10 +1,10 @@ PRGNAM="lshw" -VERSION="B.02.18" +VERSION="B.02.19.2" HOMEPAGE="https://ezix.org/project/wiki/HardwareLiSter" -DOWNLOAD="https://www.ezix.org/software/files/lshw-B.02.18.tar.gz" -MD5SUM="8671c6d94d6324a744b7f21f1bfecfd2" +DOWNLOAD="https://www.ezix.org/software/files/lshw-B.02.19.2.tar.gz" +MD5SUM="8c70d46e906688309095c73ecb9396e3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jason Graham" -EMAIL="jgraha8@gmail.com" +EMAIL="jgraham@compukix.net" diff --git a/system/luckybackup/luckybackup.info b/system/luckybackup/luckybackup.info index d215009d22..760905e8e6 100644 --- a/system/luckybackup/luckybackup.info +++ b/system/luckybackup/luckybackup.info @@ -1,6 +1,6 @@ PRGNAM="luckybackup" VERSION="0.5.0" -HOMEPAGE="https://luckybackup.sourceforge.net/" +HOMEPAGE="http://luckybackup.sourceforge.net" DOWNLOAD="https://downloads.sourceforge.net/luckybackup/luckybackup-0.5.0.tar.gz" MD5SUM="4233d5ddfb3891c1d06fae8b85377d9e" DOWNLOAD_x86_64="" diff --git a/system/lv/README b/system/lv/README new file mode 100644 index 0000000000..41dc4fdfaf --- /dev/null +++ b/system/lv/README @@ -0,0 +1,17 @@ +lv (pager, grep, and iconv replacement) + +lv is a powerful file viewer like less. lv can decode and encode +multilingual streams in many encodings, including ISO-8859, ISO-2022, +EUC, SJIS, Big5, HZ, and Unicode. It recognizes multi-byte patterns +in regular expressions, and can be run as "lgrep" to act as a grep +replacement. In addition, lv can recognize ANSI escape sequences for +text decoration (making it suitable for use as MANPAGER). + +lv can also be used as a replacement for iconv(1), by redirecting +its standard output and using the -I and -O options to set the input +and output encodings. Although it doesn't support all the features of +iconv, lv will autodetect the input encoding (which iconv won't). + +lv also has one (possibly) unique feature: It can autodetect and +convert or display multiple character encodings *within the same +document*. diff --git a/system/lv/lv.SlackBuild b/system/lv/lv.SlackBuild new file mode 100644 index 0000000000..eb8c06c100 --- /dev/null +++ b/system/lv/lv.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/sh + +# Slackware build script for lv + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# 20201111 bkw: added at v4.51_7. The original upstream for this is +# long gone (dead website), but the maintainer of the Debian package +# continues to develop this. So I'm treating Debian as upstream, and +# the _7 in VERSION is the Debian patchlevel. + +# 20201115 bkw: add 2 new patches from Debian git, BUILD=2. + +PRGNAM=lv +VERSION=${VERSION:-4.51_7} +BUILD=${BUILD:-2} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +# Nothing uses LIBDIRSUFFIX, don't bother with it. +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" +else + SLKCFLAGS="-O2" +fi + +set -e + +SRCVER=${VERSION%_*} # 1.23_4 => 1.23 +DEBVER=${VERSION#*_} # 1.23_4 => 4 + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$SRCVER.orig +tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.?z +cd $PRGNAM-$SRCVER.orig +tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz +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 {} \+ + +# Apply all of debian's patches. +for i in $( cat debian/patches/series ); do + patch -p1 < "debian/patches/$i" +done + +# Local patches. 4 of these were written by the SlackBuild author, sent +# upstream (to the Debian maintainer). The height and filename patches +# are from Debian's git. +for i in $( cat $CWD/patches/series ); do + patch -p1 < "$CWD/patches/$i" +done + +# I wish there were --disable-termcap and/or --enable-ncurses options. +# The configure script is hardcoded: if termcap is found, it uses that +# and never looks for ncurses. Since termcap is pretty well deprecated +# here in the 21st century, we'd much rather use ncurses... +sed -i 's,termcap,ncurses,g' src/configure + +# libdir is /usr/share because all that gets installed there is the lv +# help file (which is just a pre-rendered version of the man page). +cd build +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +../src/configure \ + --enable-fastio \ + --prefix=/usr \ + --libdir=/usr/share \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +# binary already stripped +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 +ln -s $PRGNAM.1.gz $PKG/usr/man/man1/lgrep.1.gz + +cd .. +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README* GPL* hello.* debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# Japanese-language sections in the HTML docs are in some kind of +# non-Unicode encoding. lv autodetects it just fine, but nothing else +# seems to, so use lv itself to convert them to UTF-8. This is helpful +# if you're reading the files locally with a browser: there's no HTTP +# headers to specify the encoding, and UTF-8 is more likely to be +# autodetected or just guessed at. +for i in *.html; do + $PKG/usr/bin/lv -Ou8 $i > $PKG/usr/doc/$PRGNAM-$VERSION/$i +done + +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:-tgz} diff --git a/system/lv/lv.info b/system/lv/lv.info new file mode 100644 index 0000000000..3d29aca4a8 --- /dev/null +++ b/system/lv/lv.info @@ -0,0 +1,12 @@ +PRGNAM="lv" +VERSION="4.51_7" +HOMEPAGE="https://packages.debian.org/sid/lv" +DOWNLOAD="http://deb.debian.org/debian/pool/main/l/lv/lv_4.51.orig.tar.gz \ + http://deb.debian.org/debian/pool/main/l/lv/lv_4.51-7.debian.tar.xz" +MD5SUM="893084b35a11eaaee4f71827d0092fa5 \ + d6d2d0e27a43480b794615a02235b953" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/lv/patches/change-maximum-height-to-144.patch b/system/lv/patches/change-maximum-height-to-144.patch new file mode 100644 index 0000000000..84b4afe0c2 --- /dev/null +++ b/system/lv/patches/change-maximum-height-to-144.patch @@ -0,0 +1,17 @@ +Author: TOMITA Masahiro <tommy@tmtm.org> +Description: Change maximum height to 144. +Last-Update: 2020-10-10 + +Index: lv/src/file.h +=================================================================== +--- lv.orig/src/file.h ++++ lv/src/file.h +@@ -16,7 +16,7 @@ + #include <str.h> + #include <stream.h> + +-#define LV_PAGE_SIZE 32U /* lines per page */ ++#define LV_PAGE_SIZE 48U /* lines per page */ + + #ifdef MSDOS + #define BLOCK_SIZE 2 /* segments on memory */ diff --git a/system/lv/patches/fix_implicit_decls.diff b/system/lv/patches/fix_implicit_decls.diff new file mode 100644 index 0000000000..1f9de61b91 --- /dev/null +++ b/system/lv/patches/fix_implicit_decls.diff @@ -0,0 +1,41 @@ +Description: Remove implicit declaration warnings by adding +appropriate #includes, and fix a typo in a prototype. +Author: B. Watson <yahlcru@gmail.com> + +-- + +diff -Naur lv-4.51.orig/src/file.h lv-4.51.orig.patched/src/file.h +--- lv-4.51.orig/src/file.h 2020-11-12 02:03:33.560002050 -0500 ++++ lv-4.51.orig.patched/src/file.h 2020-11-12 02:04:06.555999050 -0500 +@@ -172,7 +172,7 @@ + public inline int IobufGetc( iobuf_t *iobuf ); + public inline int IobufUngetc( int ch, iobuf_t *iobuf ); + public offset_t IobufFtell( iobuf_t *iobuf ); +-public int IobufFseeko( iobuf_t *iobuf, offset_t off, int mode ); ++public int IobufFseek( iobuf_t *iobuf, offset_t off, int mode ); + public int IobufFeof( iobuf_t *iobuf ); + #endif + #define IobufPutc( a, b ) putc( a, (b)->iop ) +diff -Naur lv-4.51.orig/src/guess.c lv-4.51.orig.patched/src/guess.c +--- lv-4.51.orig/src/guess.c 2003-11-12 22:08:19.000000000 -0500 ++++ lv-4.51.orig.patched/src/guess.c 2020-11-12 02:04:22.621997590 -0500 +@@ -21,6 +21,7 @@ + */ + + #include <stdio.h> ++#include <string.h> + + #include <import.h> + #include <decode.h> +diff -Naur lv-4.51.orig/src/guesslocale.c lv-4.51.orig.patched/src/guesslocale.c +--- lv-4.51.orig/src/guesslocale.c 2004-01-05 03:41:22.000000000 -0500 ++++ lv-4.51.orig.patched/src/guesslocale.c 2020-11-12 02:04:49.294995165 -0500 +@@ -20,6 +20,8 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include <ctype.h> ++ + #ifdef HAVE_SETLOCALE + + #include <stdlib.h> diff --git a/system/lv/patches/makefile.diff b/system/lv/patches/makefile.diff new file mode 100644 index 0000000000..4c55d7c5d2 --- /dev/null +++ b/system/lv/patches/makefile.diff @@ -0,0 +1,53 @@ +Description: "make install": Support DESTDIR, use symlink for +lgrep, use more standard default permissions (and make them +variables). Create bin/man/lib dirs if they don't already exist. +Author: B. Watson <yahlcru@gmail.com> + +-- + +diff -Naur lv-4.51.orig/src/Makefile.in lv-4.51.orig.patched/src/Makefile.in +--- lv-4.51.orig/src/Makefile.in 2004-01-06 02:22:17.000000000 -0500 ++++ lv-4.51.orig.patched/src/Makefile.in 2020-11-12 01:59:50.646022314 -0500 +@@ -18,6 +18,10 @@ + lvlibdir= $(libdir)/lv + distdir = lv$(VERSION) + ++DESTDIR= ++BINPERMS= 0755 ++DOCPERMS= 0644 ++ + PURIFY= @PURIFY@ + CC= @CC@ + CFLAGS= @CFLAGS@ -DLV_HELP_PATH=\"$(lvlibdir)\" -I$(srcdir) @DEFS@ +@@ -64,18 +68,22 @@ + # + + install:: +- $(INSTALL) -s -m 555 lv $(bindir) +- if test -f $(bindir)/lgrep; then \ +- /bin/rm -f $(bindir)/lgrep; \ ++ if test ! -d $(DESTDIR)$(bindir); then \ ++ mkdir -p $(DESTDIR)$(bindir); \ ++ fi ++ $(INSTALL) -s -m $(BINPERMS) lv $(DESTDIR)$(bindir) ++ if test -f $(DESTDIR)$(bindir)/lgrep; then \ ++ /bin/rm -f $(DESTDIR)$(bindir)/lgrep; \ + fi +- (cd $(bindir); ln lv lgrep) +- if test ! -d $(lvlibdir); then \ +- mkdir -p $(lvlibdir); \ ++ (cd $(DESTDIR)$(bindir); ln -s lv lgrep) ++ if test ! -d $(DESTDIR)$(lvlibdir); then \ ++ mkdir -p $(DESTDIR)$(lvlibdir); \ + fi +- $(INSTALL) -m 444 $(srcdir)/../lv.hlp $(lvlibdir) +- if test -d $(mandir) -a -d $(mandir)/man1; then \ +- $(INSTALL) -m 444 $(srcdir)/../lv.1 $(mandir)/man1; \ ++ $(INSTALL) -m $(DOCPERMS) $(srcdir)/../lv.hlp $(DESTDIR)$(lvlibdir) ++ if test ! -d $(DESTDIR)$(mandir)/man1; then \ ++ mkdir -p $(DESTDIR)$(mandir)/man1; \ + fi ++ $(INSTALL) -m $(DOCPERMS) $(srcdir)/../lv.1 $(DESTDIR)$(mandir)/man1; \ + + uninstall:: + for i in $(bindir)/lv $(bindir)/lgrep $(lvlibdir)/lv.hlp $(mandir)/man1/lv.1; do \ diff --git a/system/lv/patches/man_typos.diff b/system/lv/patches/man_typos.diff new file mode 100644 index 0000000000..be6e2ad63d --- /dev/null +++ b/system/lv/patches/man_typos.diff @@ -0,0 +1,65 @@ +Description: Fix a few typos in the man & help docs. +Author: B. Watson <yahlcru@gmail.com> + +-- + +diff -Naur lv-4.51.orig/lv.1 lv-4.51.orig.patched/lv.1 +--- lv-4.51.orig/lv.1 2020-11-12 01:44:33.656105671 -0500 ++++ lv-4.51.orig.patched/lv.1 2020-11-12 01:45:58.092097996 -0500 +@@ -47,7 +47,7 @@ + but also as a coding-system translation filter + like \fInkf\fP (1) and \fItcs\fP (1). + .IP "\fIMultilingual regular expressions / Multilingual grep\fP" +-lv can recognize multi-bytes patterns as regular expressions, ++lv can recognize multi-byte patterns as regular expressions, + and lv also provides multilingual \fIgrep\fP (1) functionality + by giving it another name, \fIlgrep\fP. + Pattern matching is conducted in the charset level, +@@ -203,7 +203,7 @@ + Allow physical lines of each logical line printed on the screen + to be concatenated for cut and paste after screen refresh + .IP "-s" +-Force old pages to be swept out from the screen Smoothly ++Force old pages to be swept out from the screen smoothly + .IP "-u" + Unify several character sets, eg. JIS X0208 and C6226. + In addition, lv equates ISO 646 variants, +@@ -237,7 +237,7 @@ + Show this help + .SH "CONFIGURATION" + Options can be described in configuration file ``.lv'' (``_lv'' on MSDOS) +-located at you HOME directory. If and only if you use MSDOS, you can locate ++located in your HOME directory. If and only if you use MSDOS, you can locate + ``_lv'' at current working directory. + They can be also described in the environment variable LV. + Every configuration will be overloaded in this order if there is. Command line +diff -Naur lv-4.51.orig/lv.hlp lv-4.51.orig.patched/lv.hlp +--- lv-4.51.orig/lv.hlp 2020-11-12 01:44:33.635105673 -0500 ++++ lv-4.51.orig.patched/lv.hlp 2020-11-12 01:45:58.098097995 -0500 +@@ -37,7 +37,7 @@ + _t_c_s (1). + + _M_u_l_t_i_l_i_n_g_u_a_l _r_e_g_u_l_a_r _e_x_p_r_e_s_s_i_o_n_s _/ _M_u_l_t_i_l_i_n_g_u_a_l _g_r_e_p +- lv can recognize multi-bytes patterns as regular expressions, ++ lv can recognize multi-byte patterns as regular expressions, + and lv also provides multilingual _g_r_e_p (1) functionality by giv- + ing it another name, _l_g_r_e_p. Pattern matching is conducted in + the charset level, so an EUC fragment, for example, can be found +@@ -183,7 +183,7 @@ + -l Allow physical lines of each logical line printed on the screen + to be concatenated for cut and paste after screen refresh + +- -s Force old pages to be swept out from the screen Smoothly ++ -s Force old pages to be swept out from the screen smoothly + + -u Unify several character sets, eg. JIS X0208 and C6226. In addi- + tion, lv equates ISO 646 variants, eg. JIS X0201-Roman, and +@@ -219,7 +219,7 @@ + + CCOONNFFIIGGUURRAATTIIOONN + Options can be described in configuration file ``.lv'' (``_lv'' on +- MSDOS) located at you HOME directory. If and only if you use MSDOS, ++ MSDOS) located in your HOME directory. If and only if you use MSDOS, + you can locate ``_lv'' at current working directory. They can be also + described in the environment variable LV. Every configuration will be + overloaded in this order if there is. Command line options are always diff --git a/system/lv/patches/no_inline.diff b/system/lv/patches/no_inline.diff new file mode 100644 index 0000000000..ebc1eb58f6 --- /dev/null +++ b/system/lv/patches/no_inline.diff @@ -0,0 +1,19 @@ +Description: Remove inline-related compiler warnings (by not using inline) +Author: B. Watson <yahlcru@gmail.com> + +-- + +diff -Naur lv-4.51.orig/src/file.h lv-4.51.orig.patched/src/file.h +--- lv-4.51.orig/src/file.h 2020-11-12 01:41:53.353120244 -0500 ++++ lv-4.51.orig.patched/src/file.h 2020-11-12 01:44:33.701105667 -0500 +@@ -169,8 +169,8 @@ + # endif + # define IobufFeof( a ) feof( (a)->iop ) + #else +-public inline int IobufGetc( iobuf_t *iobuf ); +-public inline int IobufUngetc( int ch, iobuf_t *iobuf ); ++public int IobufGetc( iobuf_t *iobuf ); ++public int IobufUngetc( int ch, iobuf_t *iobuf ); + public offset_t IobufFtell( iobuf_t *iobuf ); + public int IobufFseek( iobuf_t *iobuf, offset_t off, int mode ); + public int IobufFeof( iobuf_t *iobuf ); diff --git a/system/lv/patches/series b/system/lv/patches/series new file mode 100644 index 0000000000..ce324941d9 --- /dev/null +++ b/system/lv/patches/series @@ -0,0 +1,6 @@ +change-maximum-height-to-144.patch +fix_implicit_decls.diff +no_inline.diff +man_typos.diff +makefile.diff +shows-the-filename-only.diff diff --git a/system/lv/patches/shows-the-filename-only.diff b/system/lv/patches/shows-the-filename-only.diff new file mode 100644 index 0000000000..32912b4209 --- /dev/null +++ b/system/lv/patches/shows-the-filename-only.diff @@ -0,0 +1,25 @@ +Description: shows the file name only if it is shorter than the width of the screen. +Author: Oohara Yuuma <oohara@libra.interq.or.jp> +Last-Update: 2008-01-27 + +Index: lv/src/command.c +=================================================================== +--- lv.orig/src/command.c ++++ lv/src/command.c +@@ -1173,8 +1173,15 @@ public void Command( file_t *file, byte + else + label = "(END)"; + } +- if( TRUE == f->top ) ++ if( TRUE == f->top ){ + label = FileName( f ); ++ /* if the file name is not shorter than the width of the screen, ++ * it causes scrolling and moves the first line of the file ++ * out of the screen ++ */ ++ if ( strlen(label) >= f->width ) ++ label = NULL; ++ } + } + + if( NULL != label ){ diff --git a/system/lv/slack-desc b/system/lv/slack-desc new file mode 100644 index 0000000000..cf08b44fb5 --- /dev/null +++ b/system/lv/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------------------------------------------------------| +lv: lv (pager, grep, and iconv replacement) +lv: +lv: lv is a powerful file viewer like less. lv can decode and encode +lv: multilingual streams in many encodings, including ISO-8859, ISO-2022, +lv: EUC, SJIS, Big5, HZ, and Unicode. It recognizes multi-byte patterns +lv: in regular expressions, and can be run as "lgrep" to act as a grep +lv: replacement. In addition, lv can recognize ANSI escape sequences for +lv: text decoration (making it suitable for use as MANPAGER). +lv: +lv: +lv: diff --git a/system/lvm2-cluster/README b/system/lvm2-cluster/README new file mode 100644 index 0000000000..54cc280716 --- /dev/null +++ b/system/lvm2-cluster/README @@ -0,0 +1,3 @@ +Logical Volume Management (LVM) in a clustered environment. + +More information post-install can be found in README.SLACKWARE diff --git a/system/lvm2-cluster/README.SLACKWARE b/system/lvm2-cluster/README.SLACKWARE new file mode 100644 index 0000000000..1f451076e0 --- /dev/null +++ b/system/lvm2-cluster/README.SLACKWARE @@ -0,0 +1,25 @@ +Starting the daemon on boot +--------------------------- + +You may wish to add these lines to /etc/rc.d/rc.local to start the service: + + if [ -x /etc/rc.d/rc.clvm ]; then + /etc/rc.d/rc.clvm start + fi + +You may also add these lines to /etc/rc.d/rc.local_shutdown: + + if [ -x /etc/rc.d/rc.clvm ]; then + /etc/rc.d/rc.clvm stop + fi + +Remember to give executable permission to /etc/rc.d/rc.local_shutdown: + + chmod 0755 /etc/rc.d/rc.local_shutdown + +Running the LVM cluster system +------------------------------ + +Once the corosync and dlm daemons are up and running, configure LVM with: + + lvmconf --enable-cluster diff --git a/system/lvm2-cluster/doinst.sh b/system/lvm2-cluster/doinst.sh new file mode 100644 index 0000000000..a06e9efe99 --- /dev/null +++ b/system/lvm2-cluster/doinst.sh @@ -0,0 +1,25 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.clvmd.new diff --git a/system/lvm2-cluster/lvm2-cluster.SlackBuild b/system/lvm2-cluster/lvm2-cluster.SlackBuild new file mode 100644 index 0000000000..c923f480fa --- /dev/null +++ b/system/lvm2-cluster/lvm2-cluster.SlackBuild @@ -0,0 +1,133 @@ +#!/bin/sh + +# Slackware build script for lvm2-cluster + +# Copyright 2019 Mario Preksavec, Zagreb, Croatia +# 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. + +PRGNAM=lvm2-cluster +VERSION=${VERSION:-2.02.154} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=LVM2 + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 $SRCNAM.$VERSION +tar xvf $CWD/$SRCNAM.$VERSION.tar.xz +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 \) -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 {} \; + +# Copied from lvm2.SlackBuild +CFLAGS="$SLKCFLAGS" \ +./configure \ + --disable-readline \ + --enable-cmdlib \ + --enable-dmeventd \ + --enable-applib \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-realtime \ + --with-lvm1=internal \ + --enable-pkgconfig \ + --enable-udev_sync \ + --enable-udev_rules \ + --with-udev-prefix="" \ + --with-device-uid=0 \ + --with-device-gid=6 \ + --with-device-mode=0660 \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-run-dir=/run/lvm \ + --with-default-dm-run-dir=/run/lvm \ + --with-clvmd-pidfile=/run/lvm/clvmd.pid \ + --with-cmirrord-pidfile=/run/lvm/cmirrord.pid \ + --with-dmeventd-pidfile=/run/lvm/dmeventd.pid \ + --with-clvmd \ + --with-cluster=shared \ + --build=$ARCH-slackware-linux + +make daemons man + +# Some assembly required +install -D -m0755 -oroot -groot daemons/clvmd/clvmd $PKG/usr/sbin/clvmd +install -D -m0644 -oroot -groot man/clvmd.8 $PKG/usr/man/man8/clvmd.8 + +install -D -m0755 -oroot -groot scripts/clvmd_init_red_hat $PKG/etc/rc.d/rc.clvmd.new +sed -e "s|/etc/sysconfig|/etc/default|g" -i $PKG/etc/rc.d/rc.clvmd.new + +install -D -m0755 -oroot -groot lib/locking/liblvm2clusterlock.so.${VERSION%.*} \ + $PKG/usr/lib${LIBDIRSUFFIX}/lvm2/liblvm2clusterlock.so.${VERSION%.*} +ln -s liblvm2clusterlock.so.${VERSION%.*} \ + $PKG/usr/lib${LIBDIRSUFFIX}/lvm2/liblvm2clusterlock.so + +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 $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE + +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:-tgz} diff --git a/system/lvm2-cluster/lvm2-cluster.info b/system/lvm2-cluster/lvm2-cluster.info new file mode 100644 index 0000000000..8ada4b3065 --- /dev/null +++ b/system/lvm2-cluster/lvm2-cluster.info @@ -0,0 +1,10 @@ +PRGNAM="lvm2-cluster" +VERSION="2.02.154" +HOMEPAGE="https://www.sourceware.org/lvm2/" +DOWNLOAD="http://mirrors.slackware.com/slackware/slackware64-14.2/source/a/lvm2/LVM2.2.02.154.tar.xz" +MD5SUM="c2732c004d9da7d7d0602745490337ca" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="dlm" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/system/lvm2-cluster/slack-desc b/system/lvm2-cluster/slack-desc new file mode 100644 index 0000000000..74776e3860 --- /dev/null +++ b/system/lvm2-cluster/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------------------------------------------------------| +lvm2-cluster: lvm2-cluster (LVM in a clustered environment) +lvm2-cluster: +lvm2-cluster: Logical Volume Management (LVM) in a clustered environment. +lvm2-cluster: +lvm2-cluster: Homepage: https://www.sourceware.org/lvm2/ +lvm2-cluster: +lvm2-cluster: +lvm2-cluster: +lvm2-cluster: +lvm2-cluster: +lvm2-cluster: diff --git a/system/lvm2-lockd/README b/system/lvm2-lockd/README new file mode 100644 index 0000000000..6b49d6c7a8 --- /dev/null +++ b/system/lvm2-lockd/README @@ -0,0 +1,21 @@ +Logical Volume Management (LVM) commands use lvmlockd to coordinate access +to shared storage. + +NOTE: lvm2 package that comes with Slackware includes lvmlockd +support. However, since neither sanlock or dlm were present at build time, +empty functions were compiled in. In order for lvm commands (such as lvmcreate, +etc) to discover and leverage lvmlockd support, stock lvm binary has to +be replaced: + + CLOBBER_STOCK_BINARY=yes ./lvm2-lockd.SlackBuild + +The original binary can be restored by reinstalling the stock lvm2 package. + +By default, lock type is set to sanlock, dlm can be selected with: + + LOCK_TYPE=dlm ./lvm2-lockd.SlackBuild + +This will change package dependancy from sanlock to dlm (also found here +on SlackBuilds.org). + +More information post-install can be found in README.SLACKWARE diff --git a/system/lvm2-lockd/README.SLACKWARE b/system/lvm2-lockd/README.SLACKWARE new file mode 100644 index 0000000000..5cd06a425c --- /dev/null +++ b/system/lvm2-lockd/README.SLACKWARE @@ -0,0 +1,31 @@ +Starting the daemon on boot +--------------------------- + +You may wish to add these lines to /etc/rc.d/rc.local to start the service: + + if [ -x /etc/rc.d/rc.lvmetad ]; then + /etc/rc.d/rc.lvmetad start + fi + + if [ -x /etc/rc.d/rc.lvmlockd ]; then + /etc/rc.d/rc.lvmlockd start + fi + +You may also add these lines to /etc/rc.d/rc.local_shutdown: + + if [ -x /etc/rc.d/rc.lvmlockd ]; then + /etc/rc.d/rc.lvmlockd stop + fi + + if [ -x /etc/rc.d/rc.lvmetad ]; then + /etc/rc.d/rc.lvmetad stop + fi + +Remember to give executable permission to /etc/rc.d/rc.local_shutdown: + + chmod 0755 /etc/rc.d/rc.local_shutdown + +Running the LVM locking system +------------------------------ + +Make sure to read USAGE section in lvmlockd man pages ;-) diff --git a/system/lvm2-lockd/doinst.sh b/system/lvm2-lockd/doinst.sh new file mode 100644 index 0000000000..2133933dde --- /dev/null +++ b/system/lvm2-lockd/doinst.sh @@ -0,0 +1,26 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.lvmetad.new +preserve_perms etc/rc.d/rc.lvmlockd.new diff --git a/system/lvm2-lockd/lvm2-lockd.SlackBuild b/system/lvm2-lockd/lvm2-lockd.SlackBuild new file mode 100644 index 0000000000..143390df28 --- /dev/null +++ b/system/lvm2-lockd/lvm2-lockd.SlackBuild @@ -0,0 +1,141 @@ +#!/bin/sh + +# Slackware build script for lvm2-lockd + +# Copyright 2019 Mario Preksavec, Zagreb, Croatia +# 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. + +PRGNAM=lvm2-lockd +VERSION=${VERSION:-2.02.154} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=LVM2 + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 $SRCNAM.$VERSION +tar xvf $CWD/$SRCNAM.$VERSION.tar.xz +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 \) -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 {} \; + +# Copied from lvm2.SlackBuild +CFLAGS="$SLKCFLAGS" \ +./configure \ + --disable-readline \ + --enable-cmdlib \ + --enable-dmeventd \ + --enable-applib \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-realtime \ + --with-lvm1=internal \ + --enable-pkgconfig \ + --enable-udev_sync \ + --enable-udev_rules \ + --with-udev-prefix="" \ + --with-device-uid=0 \ + --with-device-gid=6 \ + --with-device-mode=0660 \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-run-dir=/run/lvm \ + --with-default-dm-run-dir=/run/lvm \ + --with-clvmd-pidfile=/run/lvm/clvmd.pid \ + --with-cmirrord-pidfile=/run/lvm/cmirrord.pid \ + --with-dmeventd-pidfile=/run/lvm/dmeventd.pid \ + --enable-use-lvmlockd \ + --enable-lockd-${LOCK_TYPE:-sanlock} \ + --build=$ARCH-slackware-linux + +make daemons man tools + +# Some assembly required +install -D -m0755 -oroot -groot daemons/lvmlockd/lvmlockd $PKG/usr/sbin/lvmlockd +install -D -m0755 -oroot -groot daemons/lvmlockd/lvmlockctl $PKG/usr/sbin/lvmlockctl +install -D -m0755 -oroot -groot daemons/lvmetad/lvmetad $PKG/usr/sbin/lvmetad +install -D -m0644 -oroot -groot man/lvmlockd.8 $PKG/usr/man/man8/lvmlockd.8 +install -D -m0644 -oroot -groot man/lvmlockctl.8 $PKG/usr/man/man8/lvmlockctl.8 +install -D -m0644 -oroot -groot man/lvmetad.8 $PKG/usr/man/man8/lvmetad.8 + +install -D -m0755 -oroot -groot scripts/lvm2_lvmetad_init_red_hat $PKG/etc/rc.d/rc.lvmetad.new + +# Yes, we are that lazy :^) +install -D -m0755 -oroot -groot scripts/lvm2_lvmetad_init_red_hat $PKG/etc/rc.d/rc.lvmlockd.new +sed -e "s|metadata|locking|g" \ + -e "s|lvmetad|lvmlockd|g" \ + -i $PKG/etc/rc.d/rc.lvmlockd.new + +if [ "${CLOBBER_STOCK_BINARY:-no}" = "yes" ]; then + install -D -m0755 -oroot -groot tools/lvm $PKG/sbin/lvm +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 + +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 $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE + +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:-tgz} diff --git a/system/lvm2-lockd/lvm2-lockd.info b/system/lvm2-lockd/lvm2-lockd.info new file mode 100644 index 0000000000..08029f5009 --- /dev/null +++ b/system/lvm2-lockd/lvm2-lockd.info @@ -0,0 +1,10 @@ +PRGNAM="lvm2-lockd" +VERSION="2.02.154" +HOMEPAGE="https://www.sourceware.org/lvm2/" +DOWNLOAD="http://mirrors.slackware.com/slackware/slackware64-14.2/source/a/lvm2/LVM2.2.02.154.tar.xz" +MD5SUM="c2732c004d9da7d7d0602745490337ca" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README% sanlock" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/system/lvm2-lockd/slack-desc b/system/lvm2-lockd/slack-desc new file mode 100644 index 0000000000..adf3aa8439 --- /dev/null +++ b/system/lvm2-lockd/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------------------------------------------------------| +lvm2-lockd: lvm2-lockd (LVM in a shared storage environment) +lvm2-lockd: +lvm2-lockd: Logical Volume Management (LVM) commands use lvmlockd to coordinate +lvm2-lockd: access to shared storage. +lvm2-lockd: +lvm2-lockd: Homepage: https://www.sourceware.org/lvm2/ +lvm2-lockd: +lvm2-lockd: +lvm2-lockd: +lvm2-lockd: +lvm2-lockd: diff --git a/system/lxrandr/lxrandr.SlackBuild b/system/lxrandr/lxrandr.SlackBuild index bc67a0f2fb..330ac5a89d 100644 --- a/system/lxrandr/lxrandr.SlackBuild +++ b/system/lxrandr/lxrandr.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # $Id: lxrandr.SlackBuild,v 1.2 2009/09/11 10:27:05 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright 2010-2016 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy +# Copyright 2010-2019 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -29,7 +29,6 @@ # For: lxrandr # Descr: LXDE monitor config tool # URL: http://lxde.sourceforge.net/ -# Needs: # Changelog: # 0.1-1: 23/jun/2008 by Eric Hameleers <alien@slackware.com> # * Initial build. @@ -46,7 +45,8 @@ # * update. # 0.3.1-1 10/jul/2016 by Matteo Bernardini <ponce@slackbuilds.org> # * update. -# +# 0.3.2-1 11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org> +# * update. # # Run 'sh lxrandr.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -55,13 +55,13 @@ # ----------------------------------------------------------------------------- PRGNAM=lxrandr -VERSION=${VERSION:-0.3.1} +VERSION=${VERSION:-0.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -72,8 +72,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -98,10 +98,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; sh autogen.sh || true diff --git a/system/lxrandr/lxrandr.info b/system/lxrandr/lxrandr.info index 0b4c8fc741..4f3f496f8a 100644 --- a/system/lxrandr/lxrandr.info +++ b/system/lxrandr/lxrandr.info @@ -1,8 +1,8 @@ PRGNAM="lxrandr" -VERSION="0.3.1" +VERSION="0.3.2" HOMEPAGE="https://wiki.lxde.org/en/LXRandr" -DOWNLOAD="https://downloads.sf.net/lxde/lxrandr-0.3.1.tar.xz" -MD5SUM="b327938f18a4baac85c4707f927d606e" +DOWNLOAD="https://downloads.sf.net/lxde/lxrandr-0.3.2.tar.xz" +MD5SUM="5101ab29d87fb2b56a5ec5bc8bc3f258" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild index 0ef1451c54..6d6b21d1be 100644 --- a/system/lxsession/lxsession.SlackBuild +++ b/system/lxsession/lxsession.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # $Id: lxsession.SlackBuild,v 1.1 2009/09/11 10:33:13 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright (c) 2010-2014 Matteo Bernardini, Pisa, IT +# Copyright (c) 2010-2019 Matteo Bernardini, Pisa, IT # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -29,7 +29,6 @@ # For: lxsession # Descr: LXDE session manager # URL: http://lxde.sourceforge.net/ -# Needs: # Changelog: # 0.3.5-1: 04/Jun/2008 by Eric Hameleers <alien@slackware.com> # * Initial build. @@ -56,6 +55,10 @@ # * update. # 0.5.3-1: 10/dec/2016 by Matteo Bernardini <ponce@slackbuilds.org> # * update. +# 0.5.4-1: 11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org> +# * update. +# 0.5.5-1: 25/aug/2020 by Matteo Bernardini <ponce@slackbuilds.org> +# * update. # # Run 'sh lxsession.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -64,7 +67,7 @@ # ----------------------------------------------------------------------------- PRGNAM=lxsession -VERSION=${VERSION:-0.5.3} +VERSION=${VERSION:-0.5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info index 1b88878782..89022b9b15 100644 --- a/system/lxsession/lxsession.info +++ b/system/lxsession/lxsession.info @@ -1,8 +1,8 @@ PRGNAM="lxsession" -VERSION="0.5.3" +VERSION="0.5.5" HOMEPAGE="https://wiki.lxde.org/en/LXSession" -DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.3.tar.xz" -MD5SUM="823c50e6d0e4ce15a23a42e8f8bf4221" +DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz" +MD5SUM="e8380acef215ee7c99c067a2241c2c7b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libunique vala" diff --git a/system/lxtask/lxtask.SlackBuild b/system/lxtask/lxtask.SlackBuild index f03c48581b..3856967c99 100644 --- a/system/lxtask/lxtask.SlackBuild +++ b/system/lxtask/lxtask.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # $Id: lxtask.SlackBuild,v 1.2 2009/09/11 10:39:38 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright 2010-2016 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy +# Copyright 2010-2019 Matteo Bernardini <ponce@slackbuilds.org, Pisa, Italy # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -29,7 +29,6 @@ # For: lxtask # Descr: simple task manager for LXDE # URL: http://lxde.sourceforge.net/ -# Needs: lxde-common, lxpanel # Changelog: # 0.1-1: 04/Jun/2008 by Eric Hameleers <alien@slackware.com> # * Initial build. @@ -50,6 +49,10 @@ # * updated. # 0.1.8-1: 25/jan/2017 by Matteo Bernardini <ponce@slackbuilds.org> # * updated. +# 0.1.9-1: 11/mar/2019 by Matteo Bernardini <ponce@slackbuilds.org> +# * updated. +# 0.1.10-1: 10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org> +# * updated. # # Run 'sh lxtask.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -58,7 +61,7 @@ # ----------------------------------------------------------------------------- PRGNAM=lxtask -VERSION=${VERSION:-0.1.8} +VERSION=${VERSION:-0.1.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lxtask/lxtask.info b/system/lxtask/lxtask.info index 12c0277ff6..8e9a1f2b23 100644 --- a/system/lxtask/lxtask.info +++ b/system/lxtask/lxtask.info @@ -1,8 +1,8 @@ PRGNAM="lxtask" -VERSION="0.1.8" +VERSION="0.1.10" HOMEPAGE="https://wiki.lxde.org/en/LXTask" -DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.8.tar.xz" -MD5SUM="dd4f423dda192cb50618c6b1e76ec6b7" +DOWNLOAD="https://downloads.sf.net/lxde/lxtask-0.1.10.tar.xz" +MD5SUM="27b5258847afc237a5b89666e7a8b45b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxde-common lxpanel" diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild index 5cd1509a1b..ef12fe3f5a 100644 --- a/system/lxterminal/lxterminal.SlackBuild +++ b/system/lxterminal/lxterminal.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # $Id: lxterminal.SlackBuild,v 1.6 2009/09/11 10:43:05 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright (c) 2010-2018 Matteo Bernardini, Pisa, IT +# Copyright (c) 2010-2021 Matteo Bernardini, Pisa, IT # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -67,6 +67,8 @@ # * Update. # 0.3.2: 13/oct/2018 by Matteo Bernardini <ponce@slackbuilds.org> # * Update. +# 0.4.0: 10/apr/2021 by Matteo Bernardini <ponce@slackbuilds.org> +# * Update. # # Run 'sh lxterminal.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -75,7 +77,7 @@ # ----------------------------------------------------------------------------- PRGNAM=lxterminal -VERSION=${VERSION:-0.3.2} +VERSION=${VERSION:-0.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info index 8f5130af46..d8fecdbf39 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -1,8 +1,8 @@ PRGNAM="lxterminal" -VERSION="0.3.2" +VERSION="0.4.0" HOMEPAGE="https://wiki.lxde.org/en/LXTerminal" -DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.2.tar.xz" -MD5SUM="62e57c3aafb831505cc1638b2b737cc9" +DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.4.0.tar.xz" +MD5SUM="7938dbd50e3826c11f4735a742b278d3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lynis/lynis.SlackBuild b/system/lynis/lynis.SlackBuild index 1da44988b2..ca54fe860a 100644 --- a/system/lynis/lynis.SlackBuild +++ b/system/lynis/lynis.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lynis -# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2016-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lynis -VERSION=${VERSION:-2.7.0} +VERSION=${VERSION:-3.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lynis/lynis.info b/system/lynis/lynis.info index bec7abdaa5..a6d8d16660 100644 --- a/system/lynis/lynis.info +++ b/system/lynis/lynis.info @@ -1,8 +1,8 @@ PRGNAM="lynis" -VERSION="2.7.0" +VERSION="3.0.3" HOMEPAGE="https://cisofy.com/" -DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-2.7.0.tar.gz" -MD5SUM="ac0ae8086e31f263f2da0c5c553686ba" +DOWNLOAD="https://downloads.cisofy.com/lynis/lynis-3.0.3.tar.gz" +MD5SUM="44b26983029929912d5bab53a083f776" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lz4/lz4.SlackBuild b/system/lz4/lz4.SlackBuild index d965cfcd0d..17feed23bd 100644 --- a/system/lz4/lz4.SlackBuild +++ b/system/lz4/lz4.SlackBuild @@ -6,9 +6,11 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20201208 bkw: update for 1.9.3 +# 20191127 bkw: update for 1.9.2 # 20180911 bkw: update for 1.8.3 # 20180611 bkw: update for 1.8.2. don't try to use the updated script -# to builds older versions, the man pages will end up +# to build older versions, the man pages will end up # in the wrong place due to upstream changing how they # interpret MANDIR # 20180114 bkw: update for 1.8.1.2. had to add -j1 to the make command. @@ -17,7 +19,7 @@ # 20170122 bkw: update for 1.7.5 PRGNAM=lz4 -VERSION=${VERSION:-1.8.3} +VERSION=${VERSION:-1.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,14 +56,11 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz --exclude visual 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # -j1 was necessary in 1.8.1.2. Not sure it's still needed in 1.8.2, but # lz4 is small & builds pretty fast even with -j1, so I'll leave it for now. diff --git a/system/lz4/lz4.info b/system/lz4/lz4.info index 2ce94b8560..b6bb9ea084 100644 --- a/system/lz4/lz4.info +++ b/system/lz4/lz4.info @@ -1,8 +1,8 @@ PRGNAM="lz4" -VERSION="1.8.3" +VERSION="1.9.3" HOMEPAGE="https://lz4.github.io/lz4/" -DOWNLOAD="https://github.com/lz4/lz4/archive/v1.8.3/lz4-1.8.3.tar.gz" -MD5SUM="d5ce78f7b1b76002bbfffa6f78a5fc4e" +DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.3/lz4-1.9.3.tar.gz" +MD5SUM="3a1ab1684e14fc1afc66228ce61b2db3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lzop/README b/system/lzop/README index a3f0588e5a..01955a1cb2 100644 --- a/system/lzop/README +++ b/system/lzop/README @@ -1,5 +1,8 @@ -lzop is a LZO archiver. It uses the LZO data compression library -for compression services, and its main advantages over gzip are -much higher compression and decompression speed (at the cost of -some compression ratio). -lzop is the fastest (de)compresser around. +lzop (LZO compressor/decompressor) + +lzop is an LZO compressor. It uses the LZO data compression library for +compression services, and its main advantages over gzip are much higher +compression and decompression speed (at the cost of some compression +ratio). + +lzop is the fastest (de)compressor around. diff --git a/system/lzop/lzop.SlackBuild b/system/lzop/lzop.SlackBuild index 9b79e00db1..9e93aae47b 100644 --- a/system/lzop/lzop.SlackBuild +++ b/system/lzop/lzop.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for lzop # Copyright (c) 2011-2017 LEVAI Daniel +# Copyright (c) 2020 B. Watson # All rights reserved. # # * Redistribution and use in source and binary forms, with or without @@ -25,6 +26,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200129 bkw: take over maintenance, simplify build, remove some cruft. + PRGNAM=lzop VERSION=${VERSION:-1.04} BUILD=${BUILD:-1} @@ -66,11 +69,8 @@ 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -80,17 +80,17 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -DESTDIR=$PKG make install - -strip --strip-unneeded $PKG/usr/bin/lzop +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man?/*.? -find $PKG/usr/man -type f -exec gzip -9 {} \; +# 20200129 bkw: We really don't need the docs in every possible format. We +# already got a man page in /usr/man, and .tex is the source format. Leave +# the HTML, plain text, and PostScript. +for ext in pod tex man; do + rm -f $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.$ext +done -mkdir -p -m 755 $PKG/usr/doc/$PRGNAM-$VERSION -cp AUTHORS COPYING INSTALL NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc -type f -exec chmod 0644 {} \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/lzop/lzop.info b/system/lzop/lzop.info index 14f47d7864..4f49ad43e6 100644 --- a/system/lzop/lzop.info +++ b/system/lzop/lzop.info @@ -6,5 +6,5 @@ MD5SUM="271eb10fde77a0a96b9cbf745e719ddf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LEVAI Daniel" -EMAIL="leva@ecentrum.hu" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/lzop/slack-desc b/system/lzop/slack-desc index 37a5a0674d..489c8cac01 100644 --- a/system/lzop/slack-desc +++ b/system/lzop/slack-desc @@ -6,12 +6,12 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -lzop: lzop (LZO archiver) +lzop: lzop (LZO compressor/decompressor) lzop: lzop: lzop uses the LZO data compression library for compression services, lzop: and its main advantages over gzip are much higher compression and lzop: decompression speed (at the cost of some compression ratio). -lzop: lzop is the fastest (de)compresser around. +lzop: lzop is the fastest (de)compressor around. lzop: lzop: Homepage: http://www.lzop.org/ lzop: diff --git a/system/magiic/README b/system/magiic/README new file mode 100644 index 0000000000..7b8a14087c --- /dev/null +++ b/system/magiic/README @@ -0,0 +1,15 @@ +magiic is a simple front for slackpkg, written in dialog. + +With him you can: + * List of mirrors + * Check for system update + * Update the mirror + * List all unofficial packages for removal + * Check package information + * Search for a package + * Install a new package + * Reinstall package + * Remove a package + * Upgrade packages + +NOTE: Not all slackpkg features are available, just the main features. diff --git a/system/slack-scripts/slack-scripts.SlackBuild b/system/magiic/magiic.SlackBuild index 9927cf0711..a01339e96e 100644 --- a/system/slack-scripts/slack-scripts.SlackBuild +++ b/system/magiic/magiic.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Slackware build script for slack-scripts -# Copyright 2018 David Woodfall <dave@dawoodfall.net> +# Slackware build script for magiic +# Copyright 2020 Jefferson 'Slackjeff' Rocha <root@slackjeff.com.br> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=slack-scripts -VERSION=${VERSION:-0.0.3} +PRGNAM=magiic +VERSION=${VERSION:-0.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH=noarch @@ -38,7 +38,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -47,12 +47,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 {} \; -mkdir -p $PKG/usr/{bin,sbin} -cp ph/ph $PKG/usr/bin -cp slkcfg/slkcfg $PKG/usr/sbin +mkdir -p $PKG/usr/bin +cp "$PRGNAM" $PKG/usr/bin/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/magiic/magiic.info b/system/magiic/magiic.info new file mode 100644 index 0000000000..79462714de --- /dev/null +++ b/system/magiic/magiic.info @@ -0,0 +1,10 @@ +PRGNAM="magiic" +VERSION="0.3.1" +HOMEPAGE="https://github.com/slackjeff/magiic/" +DOWNLOAD="https://sourceforge.net/projects/magiic/files/magiic-0.3.1.tar.xz" +MD5SUM="c06b2a6f098f15b935bb8f13d740e426" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jefferson Rocha" +EMAIL="root@slackjeff.com.br" diff --git a/system/magiic/slack-desc b/system/magiic/slack-desc new file mode 100644 index 0000000000..83566e961a --- /dev/null +++ b/system/magiic/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------------------------------------------------------| +magiic: magiic (Simple frontend for Slackpkg) +magiic: +magiic: magiic is a simple frontend for slackpkg, written in dialog. +magiic: +magiic: +magiic: +magiic: +magiic: +magiic: +magiic: Homepage: https://github.com/slackjeff/magiic +magiic: diff --git a/system/mailfromd/mailfromd.SlackBuild b/system/mailfromd/mailfromd.SlackBuild index a9c24f9152..18771dd3d2 100644 --- a/system/mailfromd/mailfromd.SlackBuild +++ b/system/mailfromd/mailfromd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mailfromd -# Copyright 2018 Sergey Poznyakoff <gray@gnu.org> +# Copyright 2021 Sergey Poznyakoff <gray@gnu.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mailfromd -VERSION=${VERSION:-8.5} +VERSION=${VERSION:-8.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/mailfromd/mailfromd.info b/system/mailfromd/mailfromd.info index a056ef3e6f..52ce5a5963 100644 --- a/system/mailfromd/mailfromd.info +++ b/system/mailfromd/mailfromd.info @@ -1,8 +1,8 @@ PRGNAM="mailfromd" -VERSION="8.5" +VERSION="8.9" HOMEPAGE="http://puszcza.gnu.org.ua/software/mailfromd" -DOWNLOAD="http://download.gnu.org.ua/pub/release/mailfromd/mailfromd-8.5.tar.gz" -MD5SUM="3b2f97b5defe71e46ff8cbdff3990de5" +DOWNLOAD="http://download.gnu.org.ua/pub/release/mailfromd/mailfromd-8.9.tar.gz" +MD5SUM="77bb38237483616893b926356bc47103" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mailutils adns" diff --git a/system/mailutils/mailutils.SlackBuild b/system/mailutils/mailutils.SlackBuild index ed960ad4a8..a5bae7cc7c 100644 --- a/system/mailutils/mailutils.SlackBuild +++ b/system/mailutils/mailutils.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for GNU mailutils -# Copyright 2018 Sergey Poznyakoff, <gray@gnu.org> +# Copyright 2021 Sergey Poznyakoff, <gray@gnu.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mailutils -VERSION=${VERSION:-3.4} +VERSION=${VERSION:-3.11.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/mailutils/mailutils.info b/system/mailutils/mailutils.info index 7203f933cd..1f455d8c9f 100644 --- a/system/mailutils/mailutils.info +++ b/system/mailutils/mailutils.info @@ -1,8 +1,8 @@ PRGNAM="mailutils" -VERSION="3.4" +VERSION="3.11.1" HOMEPAGE="http://mailutils.org" -DOWNLOAD="https://ftp.gnu.org/gnu/mailutils/mailutils-3.4.tar.gz" -MD5SUM="3d31bb94fe00236a5c32f34d4ed4b49d" +DOWNLOAD="https://ftp.gnu.org/gnu/mailutils/mailutils-3.11.1.tar.gz" +MD5SUM="1f47762607801ad3b9b5642c0d0fbac7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgsasl %README%" diff --git a/system/makeself/makeself.SlackBuild b/system/makeself/makeself.SlackBuild index 4c06c83042..0c812684bd 100644 --- a/system/makeself/makeself.SlackBuild +++ b/system/makeself/makeself.SlackBuild @@ -2,9 +2,11 @@ # Slackware build script for makeself -# Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv +# Copyright 2020, Erik Falor <ewfalor@gmail.com>, Utah, USA # All rights reserved. # +# Originally maintained by Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv +# # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # @@ -23,8 +25,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=makeself -VERSION=${VERSION:-2.2.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.4.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH=noarch @@ -62,7 +64,7 @@ cp makeself.sh $PKG/usr/bin cat makeself.1 |gzip -9 > $PKG/usr/man/man1/makeself.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README.md makeself.lsm update-readme $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README.md makeself.lsm $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/makeself/makeself.info b/system/makeself/makeself.info index c99409f8ff..a1573f2778 100644 --- a/system/makeself/makeself.info +++ b/system/makeself/makeself.info @@ -1,10 +1,10 @@ PRGNAM="makeself" -VERSION="2.2.0" +VERSION="2.4.2" HOMEPAGE="https://github.com/megastep/makeself" -DOWNLOAD="https://github.com/megastep/makeself/archive/release-2.2.0.tar.gz" -MD5SUM="8075530b2ad0a2fbd4bffa80a96eb2ea" +DOWNLOAD="https://github.com/megastep/makeself/archive/release-2.4.2.tar.gz" +MD5SUM="7f81a68ee6a8db39ca099e93e7bbc5ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Andrew Tkalia" -EMAIL="anddt@yandex.ru" +MAINTAINER="Erik Falor" +EMAIL="ewfalor@gmail.com" diff --git a/system/man-db/README b/system/man-db/README index 1e48863b3a..8ac7c0c470 100644 --- a/system/man-db/README +++ b/system/man-db/README @@ -1,11 +1,12 @@ man-db (database-driven manual pager suite) -This package provides the man command and related utilities for examining -on-line help files (manual pages). It can act as a replacement for -Slackware's man package. It has several enhancements over man, including -an indexed database for searches with -k or apropos, the ability to -easily view man pages in a browser, better i18n support, and a much more -efficient implementation of the -K (full text search) option. +This package provides the man command and related utilities +for examining on-line help files (manual pages). It can act as a +replacement for Slackware's man package. It has several enhancements +over man, including an indexed database for searches with -k or +apropos, the ability to easily view man pages in a browser, better +i18n support, and a much more efficient implementation of the -K (full +text search) option. This build includes a complete install of libpipeline. diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild index 4d5e2e10c6..7c9b5a31f6 100644 --- a/system/man-db/man-db.SlackBuild +++ b/system/man-db/man-db.SlackBuild @@ -6,11 +6,14 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. -# 20180801 bkw: -# - update for v2.8.4. +# 20210306 bkw: update for v2.9.4 (resync with -current again) +# 20201024 bkw: update for v2.9.3 (matches -current) +# 20200316 bkw: update for v2.9.1 (resync with -current) +# 20191201 bkw: update for v2.9.0 (to match -current again). +# Also got rid of the systemd-specific stuff properly (via configure opts). -# 20180611 bkw: -# - update for v2.8.3, to match what Pat has in -current. +# 20180801 bkw: update for v2.8.4. +# 20180611 bkw: update for v2.8.3, to match what Pat has in -current. # 20180208 bkw: update for man-db 2.8.0, libpipeline 1.5.0. # This may be the last SBo update, since Pat has imported man-db @@ -52,7 +55,7 @@ # - update README and README.Slackware slightly. PRGNAM=man-db -VERSION=${VERSION:-2.8.4} +VERSION=${VERSION:-2.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -109,18 +112,15 @@ mkdir -p $TMP $PKG $OUTPUT # Instead of making it a separate build and external dep, we'll just # bundle it here. LIBNAM=libpipeline -LIBVER=1.5.0 +LIBVER=1.5.3 cd $TMP rm -rf $LIBNAM-$LIBVER tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz cd $LIBNAM-$LIBVER 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -146,11 +146,8 @@ 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # The 'checking for long filenames' test in the configure script writes to # /usr/lib, which is bad behaviour for a configure script. Not to mention @@ -170,6 +167,8 @@ libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipel CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ + --with-systemdtmpfilesdir=no \ + --with-systemdsystemunitdir=no \ --disable-setuid \ --disable-cache-owner \ --prefix=/usr \ @@ -185,10 +184,6 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG -# This stuff is for systemd, we don't need it (and it might confuse -# people coming from systemd distros): -rm -rf $PKG/usr/lib/tmpfiles.d/ - # There will always be man pages here, regardless of USR=yes or no. 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 diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info index 70a6f6a7c1..62e0c9f10e 100644 --- a/system/man-db/man-db.info +++ b/system/man-db/man-db.info @@ -1,10 +1,10 @@ PRGNAM="man-db" -VERSION="2.8.4" +VERSION="2.9.4" HOMEPAGE="http://www.nongnu.org/man-db/" -DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.8.4.tar.xz \ - http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.0.tar.gz" -MD5SUM="ab41db551f500e4a595b11203b86c67a \ - b7437a5020190cfa84f09c412db38902" +DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.9.4.tar.xz \ + http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.3.tar.gz" +MD5SUM="6e233a555f7b9ae91ce7cd0faa322bce \ + dad443d0911cf9f0f1bd90a334bc9004" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/man-pages-ja/man-pages-ja.SlackBuild b/system/man-pages-ja/man-pages-ja.SlackBuild index bab442a1be..13333c85bb 100644 --- a/system/man-pages-ja/man-pages-ja.SlackBuild +++ b/system/man-pages-ja/man-pages-ja.SlackBuild @@ -7,7 +7,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. PRGNAM=man-pages-ja -VERSION=${VERSION:-20171215} +VERSION=${VERSION:-20201015} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -27,11 +27,8 @@ 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # I'm almost certain this is correct, based on how other distros do it. # The other possibility was "ja.UTF-8". A /usr/man/jp dir does exist on diff --git a/system/man-pages-ja/man-pages-ja.info b/system/man-pages-ja/man-pages-ja.info index 9ee6b330bc..8cd22f19ca 100644 --- a/system/man-pages-ja/man-pages-ja.info +++ b/system/man-pages-ja/man-pages-ja.info @@ -1,8 +1,8 @@ PRGNAM="man-pages-ja" -VERSION="20171215" +VERSION="20201015" HOMEPAGE="http://linuxjm.sourceforge.jp/" -DOWNLOAD="http://linuxjm.sourceforge.jp/man-pages-ja-20171215.tar.gz" -MD5SUM="679767d28b95a1004a43b0568629f37e" +DOWNLOAD="http://linuxjm.sourceforge.jp/man-pages-ja-20201015.tar.gz" +MD5SUM="2ca73214a0027747ec3cc59e8059bc58" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="man-db" diff --git a/system/man-pages-ru/README b/system/man-pages-ru/README index f91c1b8bf9..737959c9c1 100644 --- a/system/man-pages-ru/README +++ b/system/man-pages-ru/README @@ -1 +1,10 @@ -Russian translation for system man pages version 3.41 +man-pages-ru (Russian system documentation) + +Russian translation for system man pages. This requires a terminal +that can handle UTF-8 (such as konsole, xfce4-terminal, or +rxvt-unicode), and a UTF-8 locale such as LANG=ru_RU.UTF-8. You'll +also need a font that displays Cyrillic glyphs (should be included +with Slackware already). + +Sadly, this isn't a complete set of man pages. For instance, there are +no man pages included for coreutils. diff --git a/system/man-pages-ru/man-pages-ru.SlackBuild b/system/man-pages-ru/man-pages-ru.SlackBuild index 568b06ec02..ad1a76d094 100644 --- a/system/man-pages-ru/man-pages-ru.SlackBuild +++ b/system/man-pages-ru/man-pages-ru.SlackBuild @@ -22,12 +22,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20201105 bkw: This hasn't been updated in 7+ years, and I'm not sure +# it ever worked properly with 14.2's man command. Update to latest +# version and document how to get this stuff to work with man-db and a +# utf-8 capable terminal. + PRGNAM=man-pages-ru -VERSION=${VERSION:-3.41_20130102} # Set the version to something sane. +VERSION=${VERSION:-5.03_20191017} # Set the version to something sane. BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCVERSION=${SRCVERSION:-$(echo $PRGNAM_*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)} +SRCVERSION="$(echo $PRGNAM_*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)" ARCH=noarch @@ -45,27 +50,21 @@ rm -rf $PRGNAM\_$SRCVERSION tar xvf $CWD/$PRGNAM\_$SRCVERSION.tar.bz2 cd $PRGNAM\_$SRCVERSION 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# This one is included in Slackware. +rm man5/passwd.5 -mkdir -p $PKG/usr/man/ru +mkdir -p $PKG/usr/man/ru.UTF-8 for section in 1 2 3 4 5 6 7 8 ; do - mv man$section $PKG/usr/man/ru + mv man$section $PKG/usr/man/ru.UTF-8 done -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 - -# This one is included in Slackware. -rm $PKG/usr/man/ru/man5/passwd.5.gz +find $PKG/usr/man -type f -exec gzip -9 {} \+ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README License \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README License $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/man-pages-ru/man-pages-ru.info b/system/man-pages-ru/man-pages-ru.info index 3ea60886d4..8d5e4afdd9 100644 --- a/system/man-pages-ru/man-pages-ru.info +++ b/system/man-pages-ru/man-pages-ru.info @@ -1,10 +1,10 @@ PRGNAM="man-pages-ru" -VERSION="3.41_20130102" +VERSION="5.03_20191017" HOMEPAGE="http://man-pages-ru.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/man-pages-ru/files/man-pages-ru_3.41-2145-1724-20130102.tar.bz2" -MD5SUM="2fc85340225409fe8d5dfbf90b2a0575" +DOWNLOAD="http://sourceforge.net/projects/man-pages-ru/files/man-pages-ru_5.03-2390-2390-20191017.tar.bz2" +MD5SUM="0b4bc884e9f94ca107de6a8eaa60f03e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Anton Sil'uev" -EMAIL="burning2007@ya.ru" +REQUIRES="man-db" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/man-pages-ru/slack-desc b/system/man-pages-ru/slack-desc index 0255970528..7b7011da1f 100644 --- a/system/man-pages-ru/slack-desc +++ b/system/man-pages-ru/slack-desc @@ -8,11 +8,11 @@ |-----handy-ruler------------------------------------------------------| man-pages-ru: man-pages-ru (Russian system documentation) man-pages-ru: -man-pages-ru: Russian translation files for man pages -man-pages-ru: -man-pages-ru: Visit http://man-pages-ru.sourceforge.net/ for details. -man-pages-ru: -man-pages-ru: +man-pages-ru: Russian translation for system man pages. This requires a terminal +man-pages-ru: that can handle UTF-8 (such as konsole, xfce4-terminal, or +man-pages-ru: rxvt-unicode), and a UTF-8 locale such as LANG=ru_RU.UTF-8. You'll +man-pages-ru: also need a font that displays Cyrillic glyphs (should be included +man-pages-ru: with Slackware already). man-pages-ru: man-pages-ru: man-pages-ru: diff --git a/system/mariadb-plugin-saslauthd/README b/system/mariadb-plugin-saslauthd/README deleted file mode 100644 index d50c4c9a4b..0000000000 --- a/system/mariadb-plugin-saslauthd/README +++ /dev/null @@ -1,23 +0,0 @@ -This MariaDB plugin authenticates database users against the system -password file /etc/shadow or other authentication mechanisms supported -by saslauthd. - -Enable the saslauthd daemon with: - - chmod +x /etc/rc.d/rc.saslauthd - /etc/rc.d/rc.saslauthd start - -Restart MariaDB after package installation to enable the plugin. - -To create a database user which uses saslauthd, use - - CREATE USER username@hostname IDENTIFIED WITH saslauthd; - -Optionally, a different system user as well as a realm can be specified. -Example: - - CREATE USER 'jekyll' IDENTIFIED WITH saslauthd AS 'hyde@EXAMPLE.COM'; - -saslauthd needs clear text passwords. Secure non-local connections -between your database clients and the server with TLS. See the MariaDB -documentation for more information. diff --git a/system/mariadb-plugin-saslauthd/auth_saslauthd.cnf.new b/system/mariadb-plugin-saslauthd/auth_saslauthd.cnf.new deleted file mode 100644 index 390291b30e..0000000000 --- a/system/mariadb-plugin-saslauthd/auth_saslauthd.cnf.new +++ /dev/null @@ -1,2 +0,0 @@ -[mariadb] -plugin-load-add=auth_saslauthd.so diff --git a/system/mariadb-plugin-saslauthd/mariadb-plugin-saslauthd.info b/system/mariadb-plugin-saslauthd/mariadb-plugin-saslauthd.info deleted file mode 100644 index 86a09a8cfd..0000000000 --- a/system/mariadb-plugin-saslauthd/mariadb-plugin-saslauthd.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mariadb-plugin-saslauthd" -VERSION="1.5" -HOMEPAGE="https://github.com/voegelas/mariadb-plugin-saslauthd" -DOWNLOAD="https://github.com/voegelas/mariadb-plugin-saslauthd/archive/v1.5/mariadb-plugin-saslauthd-1.5.tar.gz" -MD5SUM="d713abd87efaea7f8c1f988b00b592ff" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andreas Voegele" -EMAIL="andreas@andreasvoegele.com" diff --git a/system/mariadb-plugin-saslauthd/slack-desc b/system/mariadb-plugin-saslauthd/slack-desc deleted file mode 100644 index cfbd1b7271..0000000000 --- a/system/mariadb-plugin-saslauthd/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------------------------------------------------------| -mariadb-plugin-saslauthd: mariadb-plugin-saslauthd (Authenticate database users with saslauthd) -mariadb-plugin-saslauthd: -mariadb-plugin-saslauthd: This MariaDB plugin authenticates database users against the system -mariadb-plugin-saslauthd: password file /etc/shadow or other authentication mechanisms -mariadb-plugin-saslauthd: supported by saslauthd. -mariadb-plugin-saslauthd: -mariadb-plugin-saslauthd: -mariadb-plugin-saslauthd: -mariadb-plugin-saslauthd: -mariadb-plugin-saslauthd: -mariadb-plugin-saslauthd: diff --git a/system/maxcso/flags.patch b/system/maxcso/flags.patch deleted file mode 100644 index 3360c2de29..0000000000 --- a/system/maxcso/flags.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 7b269754c70f6512fef7beb8a11f19a2fc1067fa Mon Sep 17 00:00:00 2001 -From: "Unknown W. Brackets" <checkins@unknownbrackets.org> -Date: Sat, 24 Nov 2018 11:38:01 -0800 -Subject: [PATCH] Allow CFLAGS/CXXFLAGS to be overridden. - ---- - 7zip/Makefile | 11 +++++++---- - Makefile | 13 ++++++++----- - 2 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/7zip/Makefile b/7zip/Makefile -index 986b1488..3909487c 100644 ---- a/7zip/Makefile -+++ b/7zip/Makefile -@@ -2,8 +2,11 @@ CC ?= gcc - CXX ?= g++ - AR ?= ar - --CFLAGS += -W -Wall -Wextra -O2 --CXXFLAGS += -W -Wall -Wextra -std=c++11 -O2 -ICPP -+SRC_CFLAGS = -W -Wall -Wextra -+SRC_CXXFLAGS = -W -Wall -Wextra -std=c++11 -ICPP -+ -+CFLAGS ?= -O2 -+CXXFLAGS ?= $(CFLAGS) - - 7ZIP_CXX_SRC = CPP/7zip/Archive/Common/ParseProperties.cpp \ - CPP/7zip/Archive/DeflateProps.cpp \ -@@ -33,10 +36,10 @@ CXXFLAGS += -W -Wall -Wextra -std=c++11 -O2 -ICPP - 7ZIP_C_OBJ = $(7ZIP_C_SRC:.c=.o) - - %.o: %.cpp -- $(CXX) -c $(CXXFLAGS) -o $@ $< -+ $(CXX) -c $(SRC_CXXFLAGS) $(CXXFLAGS) -o $@ $< - - %.o: %.c -- $(CC) -c $(CFLAGS) -o $@ $< -+ $(CC) -c $(SRC_CFLAGS) $(CFLAGS) -o $@ $< - - 7zip.a: $(7ZIP_CXX_OBJ) $(7ZIP_C_OBJ) - $(AR) rcs $@ $^ -diff --git a/Makefile b/Makefile -index 70870e23..5368d4d6 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,11 @@ MANDIR ?= $(PREFIX)/share/man - CC ?= gcc - CXX ?= g++ - --CFLAGS += -W -Wall -Wextra -O2 -Wno-implicit-function-declaration -DNDEBUG=1 --CXXFLAGS += -W -Wall -Wextra -std=c++11 -O2 -Izopfli/src -I7zip -DNDEBUG=1 \ -+CFLAGS ?= -O2 -+CXXFLAGS ?= $(CFLAGS) -+ -+SRC_CFLAGS += -W -Wall -Wextra -Wno-implicit-function-declaration -DNDEBUG=1 -+SRC_CXXFLAGS += -W -Wall -Wextra -std=c++11 -Izopfli/src -I7zip -DNDEBUG=1 \ - -Wno-unused-parameter -pthread - - SRC_CXX_SRC = $(wildcard src/*.cpp) -@@ -22,13 +25,13 @@ ZOPFLI_C_SRC = zopfli/src/zopfli/blocksplitter.c zopfli/src/zopfli/cache.c \ - ZOPFLI_C_OBJ = $(ZOPFLI_C_SRC:.c=.o) - - %.o: %.cpp -- $(CXX) -c $(CXXFLAGS) -o $@ $< -+ $(CXX) -c $(SRC_CXXFLAGS) $(CXXFLAGS) -o $@ $< - - %.o: %.c -- $(CC) -c $(CFLAGS) -o $@ $< -+ $(CC) -c $(SRC_CFLAGS) $(CFLAGS) -o $@ $< - - maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a -- $(CXX) -o $@ $(CXXFLAGS) $^ -luv -llz4 -lz -+ $(CXX) -o $@ $(SRC_CXXFLAGS) $(CXXFLAGS) $^ -luv -llz4 -lz - - 7zip/7zip.a: - $(MAKE) -C 7zip 7zip.a diff --git a/system/maxcso/install.patch b/system/maxcso/install.patch deleted file mode 100644 index f91f09eba9..0000000000 --- a/system/maxcso/install.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 06c234d2734a2f129aa5cbc1cf8332594813343d Mon Sep 17 00:00:00 2001 -From: orbea <orbea@fredslev.dk> -Date: Thu, 22 Nov 2018 12:04:28 -0800 -Subject: [PATCH] Makefile: Add install and uninstall targets. - ---- - Makefile | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/Makefile b/Makefile -index e66826da..54a6489c 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,3 +1,6 @@ -+PREFIX ?= /usr/local -+BINDIR ?= $(PREFIX)/bin -+ - CC ?= gcc - CXX ?= g++ - -@@ -29,6 +32,14 @@ maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a - 7zip/7zip.a: - $(MAKE) -C 7zip 7zip.a - -+install: -+ mkdir -p $(DESTDIR)$(BINDIR) -+ cp maxcso $(DESTDIR)$(BINDIR) -+ chmod 0755 $(DESTDIR)$(BINDIR)/maxcso -+ -+uninstall: -+ rm -f $(DESTDIR)$(BINDIR)/maxcso -+ - clean: - rm -f $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) maxcso - $(MAKE) -C 7zip clean diff --git a/system/maxcso/man.patch b/system/maxcso/man.patch deleted file mode 100644 index 441511d91b..0000000000 --- a/system/maxcso/man.patch +++ /dev/null @@ -1,204 +0,0 @@ -From bd7f860ebec755a67d09cd9c52a98bd7e1761fe3 Mon Sep 17 00:00:00 2001 -From: orbea <orbea@fredslev.dk> -Date: Thu, 22 Nov 2018 18:27:14 -0800 -Subject: [PATCH] man: Add the maxcso.1 manual. - ---- - Makefile | 5 ++ - maxcso.1 | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 165 insertions(+) - create mode 100644 maxcso.1 - -diff --git a/Makefile b/Makefile -index 54a6489c..70870e23 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,6 @@ - PREFIX ?= /usr/local - BINDIR ?= $(PREFIX)/bin -+MANDIR ?= $(PREFIX)/share/man - - CC ?= gcc - CXX ?= g++ -@@ -34,11 +35,15 @@ maxcso: $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) 7zip/7zip.a - - install: - mkdir -p $(DESTDIR)$(BINDIR) -+ mkdir -p $(DESTDIR)$(MANDIR)/man1 - cp maxcso $(DESTDIR)$(BINDIR) -+ cp maxcso.1 $(DESTDIR)$(MANDIR)/man1 - chmod 0755 $(DESTDIR)$(BINDIR)/maxcso -+ chmod 0644 $(DESTDIR)$(MANDIR)/man1/maxcso.1 - - uninstall: - rm -f $(DESTDIR)$(BINDIR)/maxcso -+ rm -f $(DESTDIR)$(MANDIR)/man1/maxcso.1 - - clean: - rm -f $(SRC_CXX_OBJ) $(CLI_CXX_OBJ) $(ZOPFLI_C_OBJ) maxcso -diff --git a/maxcso.1 b/maxcso.1 -new file mode 100644 -index 00000000..67d7e16c ---- /dev/null -+++ b/maxcso.1 -@@ -0,0 +1,160 @@ -+.\" maxcso.1 -+.\" -+.Dd November 22, 2018 -+.Dt MAXCSO 1 -+.Os -+.Sh NAME -+.Nm MAXCSO -+.Nd Fast cso compressor -+.Sh SYNOPSIS -+.Nm maxcso -+.Op Fl -args -+.Op Ar input.iso -+.Op Fl o Ar output.cso -+.Sh DESCRIPTION -+A fast ISO to CSO compression program for use with PSP and PS2 emulators, which -+uses multiple algorithms for best compression ratio. -+.Ss FEATURES -+.Bl -bullet -offset <TAB> -compact -+.It -+Can use as many CPU cores as you want. -+.It -+Can use -+.Xr zlib 3 , -+7-zip's deflate, and Zopfli. -+.It -+Processes multiple files in one command. -+.It -+Can take a CSO or DAX file as a source. -+.It -+Able to output at larger block sizes. -+.It -+Support for experimental CSO v2 and ZSO formats using -+.Xr lz4 1 -+(faster decompression). -+.It -+Tuning of deflate or -+.Xr lz4 1 -+compression threshold. -+.It -+Decompression of all supported inputs (including DAX and CSO v2). -+.El -+.Ss Compression -+.Nm maxcso -+always uses compression level 9. -+Decompression speed is about the same regardless of level, and disk access is -+faster with smaller files. -+.Pp -+Using 7-zip's deflate and Zopfli improves compression ratios, but don't expect a -+lot. -+Usual results are between 0.5% to 1.0% smaller. -+.Pp -+Larger block sizes than the default will help compression, in the range of 2-3%. -+However, the files may not be compatible with some software. -+For example, -+.Nm ppsspp -+versions released after 2014-10-26 will support larger block -+sizes. -+.Pp -+Avoid DAX where CSOs using larger block sizes are supported, since DAX is less -+efficient. -+.Pp -+.Xr lz4 1 -+support is mostly for experimentation. -+.Ss Speed -+Compared to other tools like ciso and CisoPlus, -+.Nm maxcso -+can run much faster and achieve the same compression. -+Use -+.Fl -fast -+to get the fastest compression, which matches level 9 in other tools. -+.Pp -+Additionally, if you have better than a dual core processor, -+.Nm maxcso -+will use all -+of your cores, and perform even better. -+.Pp -+In usage, CSOs typically perform well in all known emulators. -+Some versions of PSP firmware with -+support for CSOs have bugs in their CSO support, but this doesn't affect -+emulators. -+.Sh OPTIONS -+Multiple files may be specified. -+Inputs can be iso or cso files. -+.Bl -tag -width indent -+.It Fl -threads=N -+Specify N threads for I/O and compression. -+.It Fl -quiet -+Suppress status output. -+.It Fl -crc -+Log CRC32 checksums, ignore output files and methods. -+.It Fl -fast -+Use only basic -+.Xr zlib 3 -+or lz4 for fastest result. -+.It Fl -decompress -+Write out to raw ISO, decompressing as needed. -+.It Fl -block=N -+Specify a block size (default depends on iso size). -+Many readers only support the 2048 size. -+.It Fl -format=VER Ar cso1 , cso2 , zso , dax -+Specify cso version. -+These are experimental, default is -+.Ar cso1 . -+.It Fl -usr-zlib -+Enable trials with -+.Xr zlib 3 -+for deflate compression. -+.It Fl -use-zopli -+Enable trials with Zopfli for deflate compression. -+Because Zopfli is significantly slower than the other methods and uses a lot -+more memory, it is disabled by default. -+Use for maximum compression. -+.It Fl -use-7zdeflate -+Enable trials with 7-zip's deflate compression. -+.It Fl -use-lz4 -+Enable trials with lz4hc for -+.Xr lz4 1 -+compression. -+.It Fl -use-lz4brute -+Enable bruteforce trials with lz4hc for -+.Xr lz4 1 -+compression. -+.It Fl -only-METHOD -+Only allow a certain compression method ( -+.Xr zlib 3 , -+etc. above). -+.It Fl -no-METHOD -+Disable a certain compression method ( -+.Xr zlib 3 , -+etc. above). -+.It Fl -lz4-cost=N -+Allow -+.Xr lz4 1 -+to increase block size by N% at most (cso2 only). -+.It Fl -orig-cost=N -+Allow uncompressed to increase block size by N% at most. -+.El -+.Pp -+The cost arguments allow you to allow each block to be N% bigger by using -+.Xr lz4 1 -+or no compression. -+This makes the file read faster (less cpu power), but take more space. -+.Sh EXAMPLES -+.Bl -tag -width indent -+.It Nm maxcso Ar myfile.iso -+Compress -+.Ar myfile.iso -+and create myfile.cso. -+.It Nm maxcso Ar myfile.iso Fl o Ar output.cso -+Compress -+.Ar myfile.iso -+and create -+.Ar output.cso . -+.El -+.Sh SEE ALSO -+.Xr lz4 1 , -+.Xr PCSX2 1 , -+.Xr zlib 3 -+.Sh BUGS -+.Lk https://github.com/unknownbrackets/maxcso/issues "Issue tracker" diff --git a/system/maxcso/maxcso.SlackBuild b/system/maxcso/maxcso.SlackBuild index f1fc8a467b..8a20490bc6 100644 --- a/system/maxcso/maxcso.SlackBuild +++ b/system/maxcso/maxcso.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for maxcso -# Copyright 2018 Hunter Sezen California, USA +# Copyright 2018-2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=maxcso -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,20 +69,6 @@ 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 {} \; -# Makefile: Add install and uninstall targets. -# https://github.com/unknownbrackets/maxcso/commit/06c234d2734a2f129aa5cbc1cf8332594813343d -# https://github.com/unknownbrackets/maxcso/pull/23 -patch -p1 < $CWD/install.patch - -# man: Add the maxcso.1 manual. -# https://github.com/unknownbrackets/maxcso/commit/bd7f860ebec755a67d09cd9c52a98bd7e1761fe3 -# https://github.com/unknownbrackets/maxcso/pull/25 -patch -p1 < $CWD/man.patch - -# Allow CFLAGS/CXXFLAGS to be overridden. -# https://github.com/unknownbrackets/maxcso/commit/7b269754c70f6512fef7beb8a11f19a2fc1067fa -patch -p1 < $CWD/flags.patch - make \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" diff --git a/system/maxcso/maxcso.info b/system/maxcso/maxcso.info index 58bc1c804f..6093cfae01 100644 --- a/system/maxcso/maxcso.info +++ b/system/maxcso/maxcso.info @@ -1,10 +1,10 @@ PRGNAM="maxcso" -VERSION="1.10.0" +VERSION="1.12.0" HOMEPAGE="https://github.com/unknownbrackets/maxcso" -DOWNLOAD="https://github.com/unknownbrackets/maxcso/archive/v1.10.0/maxcso-1.10.0.tar.gz" -MD5SUM="29fa15cdb1567e5f48b78ad64a56e4a1" +DOWNLOAD="https://github.com/unknownbrackets/maxcso/archive/v1.12.0/maxcso-1.12.0.tar.gz" +MD5SUM="4ad33bcbc7659046564d3700241364ef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libuv lz4" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/md5deep/md5deep.SlackBuild b/system/md5deep/md5deep.SlackBuild index 9f4760f7a0..b049d8efab 100644 --- a/system/md5deep/md5deep.SlackBuild +++ b/system/md5deep/md5deep.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for md5deep # Copyright 2009-2015 Erik W. Hanson, Minneapolis, MN, USA -# Copyright 2015-2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PRGNAM=md5deep SRCNAM=hashdeep VERSION=${VERSION:-4.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -62,9 +62,13 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-release-$VERSION -tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz || tar xvf $CWD/release-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-release-$VERSION.tar.gz cd $SRCNAM-release-$VERSION chown -R root:root . + +# Remove loop +rm -rf tests/testfiles/symlinktest/ + find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ diff --git a/system/md5deep/md5deep.info b/system/md5deep/md5deep.info index 655b55c6ac..eaed42214d 100644 --- a/system/md5deep/md5deep.info +++ b/system/md5deep/md5deep.info @@ -1,7 +1,7 @@ PRGNAM="md5deep" VERSION="4.4" HOMEPAGE="https://github.com/jessek/hashdeep/" -DOWNLOAD="https://github.com/jessek/hashdeep/archive/release-4.4.tar.gz" +DOWNLOAD="https://github.com/jessek/hashdeep/archive/release-4.4/hashdeep-release-4.4.tar.gz" MD5SUM="9ccfd5ba3e3d9cffddeb118cacad0c27" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/mdf2iso/README b/system/mdf2iso/README index fbf02c4879..2d11da7387 100644 --- a/system/mdf2iso/README +++ b/system/mdf2iso/README @@ -1,2 +1,2 @@ mdf2iso is a very simple utility to convert an Alcohol 120% mdf image -to an iso, toc / dat or cue / bin image.
\ No newline at end of file +to an iso, toc / dat or cue / bin image. diff --git a/system/mdf2iso/mdf2iso.info b/system/mdf2iso/mdf2iso.info index b0b47f24bb..401e4ea140 100644 --- a/system/mdf2iso/mdf2iso.info +++ b/system/mdf2iso/mdf2iso.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/megacli/README b/system/megacli/README new file mode 100644 index 0000000000..2ed8a57153 --- /dev/null +++ b/system/megacli/README @@ -0,0 +1,6 @@ +megacli (LSI hardware RAID management utility) + +MegaCLI is an LSI command line interface utility to the MegaRAID +controller family. It is used as a diagnostic utility to obtain +information, event logs and interact with the RAID controller and +attached peripherals. diff --git a/system/megacli/megacli.SlackBuild b/system/megacli/megacli.SlackBuild new file mode 100644 index 0000000000..2c0850425c --- /dev/null +++ b/system/megacli/megacli.SlackBuild @@ -0,0 +1,84 @@ +#!/bin/sh + +# Slackware build script for MegaCLI + +# Copyright 2020 Ebben Aries <e@dscp.org> +# 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. + +PRGNAM=megacli +ZIPNAM=MegaCLI +RPMNAM=MegaCli +VERSION=${VERSION:-8.07.14} +ZIPVER="$(echo $VERSION | sed -e 's/\./\-/g')" +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +unzip -d $PRGNAM-$VERSION $CWD/${ZIPVER}_$ZIPNAM.zip +cd $PRGNAM-$VERSION/Linux + +rpm2cpio < ${RPMNAM}-${VERSION}-${BUILD}.noarch.rpm | cpio -imdv +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 {} \; + +cp -ap opt $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 + +mkdir -p $PKG/usr/bin +ln -s /opt/MegaRAID/$RPMNAM/$RPMNAM$LIBDIRSUFFIX $PKG/usr/bin/$PRGNAM + +mkdir -p $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:-tgz} diff --git a/system/megacli/megacli.info b/system/megacli/megacli.info new file mode 100644 index 0000000000..e9d3f740db --- /dev/null +++ b/system/megacli/megacli.info @@ -0,0 +1,10 @@ +PRGNAM="megacli" +VERSION="8.07.14" +HOMEPAGE="http://www.broadcom.com" +DOWNLOAD="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/8-07-14_MegaCLI.zip" +MD5SUM="bf53eeb0e8ccc09c34f52d7035940c62" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Ebben Aries" +EMAIL="e@dscp.org" diff --git a/system/megacli/slack-desc b/system/megacli/slack-desc new file mode 100644 index 0000000000..a0bf177d66 --- /dev/null +++ b/system/megacli/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------------------------------------------------------| +megacli: megacli (LSI hardware RAID management utility) +megacli: +megacli: MegaCLI is an LSI command line interface utility to the MegaRAID +megacli: controller family. It is used as a diagnostic utility to obtain +megacli: information, event logs and interact with the RAID controller and +megacli: attached peripherals. +megacli: +megacli: Home-Page: http://www.broadcom.com +megacli: +megacli: +megacli: diff --git a/system/memtest86+/README b/system/memtest86+/README index 4b0a4c3e8f..e1c23ed9d5 100644 --- a/system/memtest86+/README +++ b/system/memtest86+/README @@ -2,11 +2,6 @@ Memtest86+ is thorough, stand alone memory test for Intel/AMD x86 architecture systems. BIOS based memory tests are only a quick check and often miss failures that are detected by Memtest86+. -Compilation may fail on 64-bit Slackware due to missing -/usr/include/gnu/stubs-32.h from glibc. If you experience this problem, -copy that file from stubs-64.h in the same directory (or create a symlink), -and you may delete your copy/symlink after you have created the package. - This package installs a bootable image to /boot/memtest86+.bin which is similar to the kernel images in the same directory. diff --git a/system/memtest86+/memtest86+.SlackBuild b/system/memtest86+/memtest86+.SlackBuild index 21c1961bbe..cc9d2156ff 100644 --- a/system/memtest86+/memtest86+.SlackBuild +++ b/system/memtest86+/memtest86+.SlackBuild @@ -2,28 +2,28 @@ # Slackware build script for memtest86+ -# Copyright 2013 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2013-2019 Kyle Guinn <elyk03@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. +# 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. +# 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. PRGNAM=memtest86+ -VERSION=${VERSION:-4.20} +VERSION=${VERSION:-5.01} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -32,10 +32,10 @@ ARCH=i486 CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} -DOCS="FAQ README*" +DOCS="FAQ README* changelog" set -e @@ -46,23 +46,52 @@ 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 {} \; +chmod -R u+w,go-w,a+rX-st . -# Fix false positives in test #7 -# https://bugzilla.novell.com/show_bug.cgi?id=773569 -patch -p1 < $CWD/patches/asm-inline-fix.diff +# Upstream is dead. Lots of patches courtesy of Debian and Gentoo. +# If these get out-of-hand, consider switching to coreboot's fork: +# https://review.coreboot.org/cgit/memtest86plus.git/ -make CC="gcc -fgnu89-inline" -install -D -m 0644 memtest.bin $PKG/boot/memtest86+.bin +# https://sources.debian.org/patches/memtest86+/5.01-3/ +# Last 3 are covered or made unnecessary by Gentoo's patches. +# Multiboot is disabled due to it being experimental and +# possibly not working correctly: https://bugs.debian.org/568176 +# Note that we aren't installing the multiboot image (memtest_shared). +# Note that patches multiboot and memtest86+-5.01-hardcoded_cc.patch conflict. +patch -p1 < $CWD/patches/doc-serialconsole +#patch -p1 < $CWD/patches/multiboot +#patch -p1 < $CWD/patches/memtest86+-5.01-O0.patch +#patch -p1 < $CWD/patches/memtest86+-5.01-array-size.patch +#patch -p1 < $CWD/patches/gcc-5 + +# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/memtest86+/files +patch -p1 < $CWD/patches/memtest86+-5.01-gcc-473.patch +patch -p1 < $CWD/patches/memtest86+-5.01-hardcoded_cc.patch +patch -p1 < $CWD/patches/memtest86+-5.01-no-scp.patch +patch -p1 < $CWD/patches/memtest86+-5.01-io-extern-inline.patch +patch -p1 < $CWD/patches/memtest86+-5.01-reboot-def.patch +patch -p1 < $CWD/patches/memtest86+-5.01-no-clean.patch +patch -p1 < $CWD/patches/memtest86+-5.01-no-C-headers.patch +patch -p1 < $CWD/patches/memtest86+-5.01-test-random-cflags.patch + +# More CFLAGS/CPPFLAGS cleanup, inspired by the previous patch. +patch -p1 < $CWD/patches/makefile.diff + +# https://bugs.debian.org/795421 +patch -p1 < $CWD/patches/memtest86+-test-7-smp.patch + +# https://bugs.debian.org/629506 +patch -p1 < $CWD/patches/bug_629506_message_15.mbox + +make +install -D -m 0755 memtest $PKG/boot/$PRGNAM-$VERSION +install -D -m 0644 memtest.bin $PKG/boot/$PRGNAM-$VERSION.bin +ln -s $PRGNAM-$VERSION $PKG/boot/$PRGNAM +ln -s $PRGNAM-$VERSION.bin $PKG/boot/$PRGNAM.bin 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 -cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/memtest86+/memtest86+.info b/system/memtest86+/memtest86+.info index 0a86642385..0b3b6e3dde 100644 --- a/system/memtest86+/memtest86+.info +++ b/system/memtest86+/memtest86+.info @@ -1,8 +1,8 @@ PRGNAM="memtest86+" -VERSION="4.20" -HOMEPAGE="http://www.memtest.org/" -DOWNLOAD="http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz" -MD5SUM="ef62c2f5be616676c8c62066dedc46b3" +VERSION="5.01" +HOMEPAGE="https://www.memtest.org/" +DOWNLOAD="https://www.memtest.org/download/5.01/memtest86+-5.01.tar.gz" +MD5SUM="43c5832baa919e1206e251e735cdee2d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/memtest86+/patches/asm-inline-fix.diff b/system/memtest86+/patches/asm-inline-fix.diff deleted file mode 100644 index 049c17af86..0000000000 --- a/system/memtest86+/patches/asm-inline-fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- memtest86+-4.20/test.c.orig 2011-01-23 19:11:04.000000000 +0100 -+++ memtest86+-4.20/test.c 2012-10-05 14:57:19.000000000 +0200 -@@ -313,7 +313,7 @@ void movinvr() - "jb L200\n\t" - : "=D" (p) - : "D" (p), "b" (pe) -- : "eax", "edx" -+ : "eax", "ecx", "edx" - ); - - do_tick(); diff --git a/system/memtest86+/patches/bug_629506_message_15.mbox b/system/memtest86+/patches/bug_629506_message_15.mbox new file mode 100644 index 0000000000..0b9362728f --- /dev/null +++ b/system/memtest86+/patches/bug_629506_message_15.mbox @@ -0,0 +1,142 @@ +From viro@ftp.linux.org.uk Fri Feb 27 20:21:34 2015 +Received: (at 629506) by bugs.debian.org; 27 Feb 2015 20:21:34 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02 + (2014-02-07) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-2.3 required=4.0 tests=BAYES_00,FOURLA,MONEY, + MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED,STOCKLIKE,T_RP_MATCHES_RCVD autolearn=no + autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 43; hammy, 150; neutral, 234; spammy, + 0. spammytokens: hammytokens:0.000-+--UD:patch, 0.000-+--H*u:1.5.21, + 0.000-+--H*UA:1.5.21, 0.000-+--H*u:2010-09-15, 0.000-+--H*UA:2010-09-15 +Return-path: <viro@ftp.linux.org.uk> +Received: from zeniv.linux.org.uk ([195.92.253.2]) + by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) + (Exim 4.80) + (envelope-from <viro@ftp.linux.org.uk>) + id 1YRRPi-0007QW-72 + for 629506@bugs.debian.org; Fri, 27 Feb 2015 20:21:34 +0000 +Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) + id 1YRQyr-0000Hl-OS + for 629506@bugs.debian.org; Fri, 27 Feb 2015 19:53:49 +0000 +Date: Fri, 27 Feb 2015 19:53:49 +0000 +From: Al Viro <viro@ZenIV.linux.org.uk> +To: 629506@bugs.debian.org +Subject: memtest86+.bin crashes if loader ends up putting it not at 9000:0000 +Message-ID: <20150227195349.GN29656@ZenIV.linux.org.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +User-Agent: Mutt/1.5.21 (2010-09-15) +Sender: Al Viro <viro@ftp.linux.org.uk> +X-Greylist: delayed 1658 seconds by postgrey-1.34 at buxtehude; Fri, 27 Feb 2015 20:21:33 UTC + + FWIW, the effects described in this bug report are 100% reproducible +on any version, as long as the loader (lilo, grub, whatever) ends up putting +the bootsect+setup in any location below 9000:0000. + + zImage-type images consist of 3 parts - bootsect, setup and +payload. Payload is loaded at 1000:0, bootsect and setup - n:0 and +n+2:0 resp., near the top of lowmem. Payload is protected mode code, +setup - real mode one. Bootsect isn't executed at all; when the +same image is booted directly it would've been the only part loaded +by BIOS and it would copy itself and read the rest of the image to +expected locations and pass control to setup. Values in it can be +used by setup, though, so it must be present even when the image had been +brought in by a loader. + + The thing is, we can't be guaranteed n == 0x9000. E.g. ACPI and +SMM have every right to use _anything_ in range 512K..1M for their +state, declaring it reserved. That's what BIOS int 0x12 is for - it +reports how high (in kilobytes) can you go in lowmem without running into +reserved areas. And while having it report 512K is rare, something like +20K reserved just below the VRAM (i.e. report 620K) is nothing unusual. + + I hadn't looked into details of GRUB behaviour, but LILO puts its +secondary loader as high in lowmem as it can, then puts the bootsect and +setup parts of image below that. It tries to load at 9000:0 if possible, +but if there's no space, it'll go lower. With the sizes it uses 20K reserved +below 640K is enough to push bootsect + setup combination (just) below 9000:0. +And memtest86+ setup has that 0x9000 hardwired - this +gdt_48: + .word 0x800 # gdt limit=2048, 256 GDT entries + .word 512+gdt - start,0x9 # gdt base = 0X9xxxx +in setup.S really depends on 'start' (entry to setup) loaded at +0x90200 physical. Have it loaded at any other address and you'll trigger +an exception as soon as you try to assign any segment register after you switch +to protected mode. Which will escalate to triple-fault and reboot the +damn thing immediately. + + GRUB might be better or worse in triggering that "load not at +9000:0" situation, but it can't possibly avoid it in all cases. If nothing +else, 9000:0 might be within one of the reserved areas. It simply isn't +guaranteed to be available, period. + + Another issue is that setup of memtest86+ expects to see in %dx +the value left there by the bootsect of memtest86+. Fortunately, it's +not critical - in + movw $INITSEG, %ax + movw %ax, %ds + movw %ax, %es + movw %ax, %fs + movw %ax, %ss # reset the stack to INITSEG:0x4000-12. + movw %dx, %sp + push %cs + pop %ds +we really need only the last two instructions. The stack footprint +of what follows is fairly low *and* these values are not used past the +reload of segment registers immediately after protected mode switch. + +It's not the only problem in there - the bits after +# start from grub-a20.patch +are clearly cargo-culted from grub, badly. There it was a part of a function +that expects an argument on stack (it can turn A20 both on and off) and that +got blindly copied, nevermind that the value on stack is random or that +we follow it with (unconditional) use of 8042-based method anyway. I'd rather +see upstream opinion on that particular piece of code first, though. + +Anyway, the patch below fixes dependency on being loaded at 9000:0 and it +seems to work here without regressions. Have fun... + +--- memtest86+-5.01/setup.S 2013-08-09 22:01:58.000000000 -0400 ++++ fixed/setup.S 2015-02-27 14:18:47.000000000 -0500 +@@ -26,14 +26,13 @@ + # APs also execute this code + #ljmp $INITSEG, $(reload - start + 0x200) + reload: +- movw $INITSEG, %ax +- movw %ax, %ds +- movw %ax, %es +- movw %ax, %fs +- movw %ax, %ss # reset the stack to INITSEG:0x4000-12. +- movw %dx, %sp ++ xorl %eax, %eax + push %cs +- pop %ds ++ pop %ax ++ movw %ax, %ds ++ shll $4, %eax ++ addl %eax, (gdt_48 - start + 2) ++ + lidt idt_48 - start # load idt with 0,0 + lgdt gdt_48 - start # load gdt with whatever appropriate + +@@ -88,6 +87,7 @@ + movw %ax, %ds + movw %ax, %es + movw %ax, %ss ++ xorl %esp, %esp # 32bit code will set it then + movw %ax, %fs + movw %ax, %gs + +@@ -144,7 +144,7 @@ + + gdt_48: + .word 0x800 # gdt limit=2048, 256 GDT entries +- .word 512+gdt - start,0x9 # gdt base = 0X9xxxx ++ .word gdt - start,0 # gdt base, needs to be adjusted + + msg1: + .asciz "Setup.S\r\n" + + diff --git a/system/memtest86+/patches/doc-serialconsole b/system/memtest86+/patches/doc-serialconsole new file mode 100644 index 0000000000..c124e7a383 --- /dev/null +++ b/system/memtest86+/patches/doc-serialconsole @@ -0,0 +1,27 @@ +commit 03867c811369be70cd81a42d150e0a250c9d1248 +Author: Yann Dirson <dirson@debian.org> +Date: Tue Sep 29 23:40:15 2009 +0200 + + git-debimport memtest86+_4.00-1.diff.gz + +Index: memtest86+/README +=================================================================== +--- memtest86+.orig/README ++++ memtest86+/README +@@ -89,12 +89,10 @@ To create a boot-disk with this pre-buil + ================= + Memtest86 can be used on PC's equipped with a serial port for the console. + By default serial port console support is not enabled since it slows +-down testing. To enable change the SERIAL_CONSOLE_DEFAULT define in +-config.h from a zero to a one. The serial console baud rate may also +-be set in config.h with the SERIAL_BAUD_RATE define. The other serial +-port settings are no parity, 8 data bits, 1 stop bit. All of the features +-used by memtest86 are accessible via the serial console. However, the +-screen sometimes is garbled when the online commands are used. ++down testing. ++ ++To activate it, add a console parameter on the memtest86+ ++command-line, like: "/boot/memtest86+.bin console=ttyS0,115200n8". + + + 5) Online Commands diff --git a/system/memtest86+/patches/makefile.diff b/system/memtest86+/patches/makefile.diff new file mode 100644 index 0000000000..83bc8b5ff1 --- /dev/null +++ b/system/memtest86+/patches/makefile.diff @@ -0,0 +1,33 @@ +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,6 @@ + + CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector +-CPPFLAGS= -m32 + ASFLAGS= -32 + + # This reverts a change introduced with recent binutils (post +@@ -34,7 +33,7 @@ + $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) + + memtest_shared.bin: memtest_shared +- objcopy -O binary $< memtest_shared.bin ++ objcopy -O binary $< $@ + + memtest: memtest_shared.bin memtest.lds + $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@ +@@ -50,10 +49,10 @@ + + memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds + $(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \ +- memtest_shared.bin -o memtest.bin ++ memtest_shared.bin -o $@ + + reloc.o: reloc.c +- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c ++reloc.o: CFLAGS += -fno-strict-aliasing + + test.o: test.c + test.o: CFLAGS += -O0 -fno-PIC diff --git a/system/memtest86+/patches/memtest86+-5.01-gcc-473.patch b/system/memtest86+/patches/memtest86+-5.01-gcc-473.patch new file mode 100644 index 0000000000..af011d67c7 --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-gcc-473.patch @@ -0,0 +1,33 @@ +http://forum.canardpc.com/threads/110950-fix-controller-loop-error + +--- memtest86+-5.01/controller.c ++++ memtest86+-5.01/controller.c +@@ -292,7 +292,7 @@ static void setup_nhm(void) + + /* First, locate the PCI bus where the MCH is located */ + +- for(i = 0; i < sizeof(possible_nhm_bus); i++) { ++ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); + vid &= 0xFFFF; +@@ -327,7 +327,7 @@ static void setup_nhm32(void) + ctrl.mode = ECC_NONE; + + /* First, locate the PCI bus where the MCH is located */ +- for(i = 0; i < sizeof(possible_nhm_bus); i++) { ++ for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); + pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); + vid &= 0xFFFF; +--- memtest86+-5.01/Makefile ++++ memtest86+-5.01/Makefile +@@ -12,7 +12,7 @@ FDISK=/dev/fd0 + AS=as -32 + CC=gcc + +-CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ ++CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector + + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ diff --git a/system/memtest86+/patches/memtest86+-5.01-hardcoded_cc.patch b/system/memtest86+/patches/memtest86+-5.01-hardcoded_cc.patch new file mode 100644 index 0000000000..21b51c5b7f --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-hardcoded_cc.patch @@ -0,0 +1,16 @@ +--- a/Makefile.orig 2015-02-01 01:08:33.000000000 +0300 ++++ b/Makefile 2015-02-01 01:10:17.624757244 +0300 +@@ -9,11 +9,10 @@ + # + FDISK=/dev/fd0 + +-AS=as -32 +-CC=gcc +- + CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector ++CPPFLAGS= -m32 ++ASFLAGS= -32 + + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ + config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ diff --git a/system/memtest86+/patches/memtest86+-5.01-io-extern-inline.patch b/system/memtest86+/patches/memtest86+-5.01-io-extern-inline.patch new file mode 100644 index 0000000000..682dd5d01a --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-io-extern-inline.patch @@ -0,0 +1,31 @@ +http://forum.canardpc.com/threads/110951-fix-build-with-newer-gcc-versions + +the meaning of extern inline changed between standards. use static inline +for these tiny I/O functions everywhere to keep things simple. + +--- a/io.h ++++ b/io.h +@@ -31,6 +31,6 @@ + */ + + #define __OUT1(s,x) \ +-extern inline void __out##s(unsigned x value, unsigned short port) { ++static inline void __out##s(unsigned x value, unsigned short port) { + + #define __OUT2(s,s1,s2) \ +@@ -43,6 +43,6 @@ + __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } + + #define __IN1(s) \ +-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; ++static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; + + #define __IN2(s,s1,s2) \ +@@ -55,6 +55,6 @@ + __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; } + + #define __OUTS(s) \ +-extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ ++static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ + { __asm__ __volatile__ ("cld ; rep ; outs" #s \ + : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); } diff --git a/system/memtest86+/patches/memtest86+-5.01-no-C-headers.patch b/system/memtest86+/patches/memtest86+-5.01-no-C-headers.patch new file mode 100644 index 0000000000..ce7f906a19 --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-no-C-headers.patch @@ -0,0 +1,49 @@ +http://forum.canardpc.com/threads/110955-PATCH-don-t-pull-in-system-headers + +avoid using C library headers as it'd mean we'd need 32-bit glibc files available + +https://bugs.gentoo.org/592638 + +--- a/dmi.c ++++ b/dmi.c +@@ -10,7 +10,7 @@ + + + #include "test.h" +-#include <stdint.h> ++#include "stdint.h" + + + #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1)) +--- a/test.c ++++ b/test.c +@@ -14,7 +14,28 @@ + #include "stdint.h" + #include "cpuid.h" + #include "smp.h" +-#include <sys/io.h> ++ ++static inline unsigned char ++inb_p (unsigned short int __port) ++{ ++ unsigned char _v; ++ ++ __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port)); ++ return _v; ++} ++ ++static inline void ++outb (unsigned char __value, unsigned short int __port) ++{ ++ __asm__ __volatile__ ("outb %b0,%w1": :"a" (__value), "Nd" (__port)); ++} ++ ++static inline void ++outb_p (unsigned char __value, unsigned short int __port) ++{ ++ __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (__value), ++ "Nd" (__port)); ++} + + extern struct cpu_ident cpu_id; + extern volatile int mstr_cpu; diff --git a/system/memtest86+/patches/memtest86+-5.01-no-clean.patch b/system/memtest86+/patches/memtest86+-5.01-no-clean.patch new file mode 100644 index 0000000000..e9cbf10399 --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-no-clean.patch @@ -0,0 +1,19 @@ +http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues + + +don't run the clean target when building all as we run into parallel races: + - memtest kicks off building of a bunch of .o files + - clean runs in parallel which runs `rm` and deletes some of the new .o + - memtest goes to link and fails because objects are missing + +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ + smp.o vmem.o random.o + + +-all: clean memtest.bin memtest ++all: memtest.bin memtest + + # Link it statically once so I know I don't have undefined + # symbols and then link it dynamically so I have full diff --git a/system/memtest86+/patches/memtest86+-5.01-no-scp.patch b/system/memtest86+/patches/memtest86+-5.01-no-scp.patch new file mode 100644 index 0000000000..8d830e297e --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-no-scp.patch @@ -0,0 +1,14 @@ +http://forum.canardpc.com/threads/110953-PATCH-don-t-try-to-scp-after-building + +this makes no sense in a sane build world + +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,6 @@ + + + all: clean memtest.bin memtest +- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus + + # Link it statically once so I know I don't have undefined + # symbols and then link it dynamically so I have full diff --git a/system/memtest86+/patches/memtest86+-5.01-reboot-def.patch b/system/memtest86+/patches/memtest86+-5.01-reboot-def.patch new file mode 100644 index 0000000000..f4b42feb5f --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-reboot-def.patch @@ -0,0 +1,15 @@ +http://forum.canardpc.com/threads/110952-fix-build-due-to-missing-reboot-symbol + +the reboot func is used elsewhere, so don't mark it inline + +--- a/lib.c ++++ b/lib.c +@@ -33,7 +33,7 @@ struct ascii_map_str { + int keycode; + }; + +-inline void reboot(void) ++void reboot(void) + { + + /* tell the BIOS to do a cold start */ diff --git a/system/memtest86+/patches/memtest86+-5.01-test-random-cflags.patch b/system/memtest86+/patches/memtest86+-5.01-test-random-cflags.patch new file mode 100644 index 0000000000..dcdccb8c6e --- /dev/null +++ b/system/memtest86+/patches/memtest86+-5.01-test-random-cflags.patch @@ -0,0 +1,21 @@ +make sure we re-use the existing CFLAGS settings so that we get all the right +flags (like -fno-stack-protector). just append the few changes we want (the +optimization levels). + +https://bugs.gentoo.org/590974 + +--- a/Makefile ++++ b/Makefile +@@ -52,10 +52,10 @@ reloc.o: reloc.c + $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c + + test.o: test.c +- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c ++test.o: CFLAGS += -O0 -fno-PIC + + random.o: random.c +- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c ++random.o: CFLAGS += -O3 -fno-PIC + + # rule for build number generation + build_number: diff --git a/system/memtest86+/patches/memtest86+-test-7-smp.patch b/system/memtest86+/patches/memtest86+-test-7-smp.patch new file mode 100644 index 0000000000..424a88dcfd --- /dev/null +++ b/system/memtest86+/patches/memtest86+-test-7-smp.patch @@ -0,0 +1,29 @@ +--- a/test.c ++++ b/test.c +@@ -1202,7 +1202,7 @@ void block_move(int iter, int me) + } else { + pe = end; + } +- if (pe >= end) { ++ if ((pe >= end && end != 0) || (pe < p && end == 0)) { + pe = end; + done++; + } +@@ -1280,7 +1280,7 @@ void block_move(int iter, int me) + } else { + pe = end; + } +- if (pe >= end) { ++ if ((pe >= end && end != 0) || (pe < p && end == 0)) { + pe = end; + done++; + } +@@ -1359,7 +1359,7 @@ void block_move(int iter, int me) + } else { + pe = end; + } +- if (pe >= end) { ++ if ((pe >= end && end != 0) || (pe < p && end == 0)) { + pe = end; + done++; + } diff --git a/system/memtest86/memtest86.SlackBuild b/system/memtest86/memtest86.SlackBuild index 303fd0eba9..84d09445d6 100644 --- a/system/memtest86/memtest86.SlackBuild +++ b/system/memtest86/memtest86.SlackBuild @@ -2,29 +2,29 @@ # Slackware build script for memtest86 -# Copyright 2012-2016 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2012-2019 Kyle Guinn <elyk03@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. +# 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. +# 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. PRGNAM=memtest86 -VERSION=${VERSION:-4.1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.3.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # i486 only. Modify the Makefile at your own risk :-) @@ -32,7 +32,7 @@ ARCH=i486 CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} DOCS="README*" @@ -42,19 +42,48 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf src tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz -cd $PRGNAM-$VERSION +cd src chown -R root:root . chmod -R u+w,go-w,a+rX-st . -make CC="gcc -fgnu89-inline" -install -D -m 0644 memtest.bin $PKG/boot/memtest86.bin +# Permissions and line endings need to be sanitized. +# Required so that memtest86+ backported patches will apply cleanly. +find . -type f -exec chmod -x {} + +find . -name precomp.bin -prune -o \ + -type f -exec sed -i 's/\x0d$//' {} \; + +# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/memtest86+/files +patch -p1 < $CWD/patches/memtest86+-5.01-io-extern-inline.patch +patch -p1 < $CWD/patches/memtest86+-5.01-reboot-def.patch + +# The following patches from Gentoo don't apply cleanly and/or have a few +# unnecessary additions or omissions. This combines and fixes them. +#patch -p1 < $CWD/patches/memtest86+-5.01-hardcoded_cc.patch +#patch -p1 < $CWD/patches/memtest86+-5.01-no-clean.patch +#patch -p1 < $CWD/patches/memtest86+-5.01-test-random-cflags.patch +patch -p1 < $CWD/patches/makefile.diff + +# https://bugs.debian.org/779504 -> https://bugs.debian.org/629506 +patch -p1 < $CWD/patches/bug_629506_message_15.mbox + +# TBD whether these memtest86+ patches should be backported: +# https://sources.debian.org/patches/memtest86+/5.01-3/ +# https://bugs.debian.org/250864 suggests that it could be backported. +#patch -p1 < $CWD/patches/multiboot +# https://bugs.debian.org/795421 +#patch -p1 < $CWD/patches/memtest86+-test-7-smp.patch + +make +install -D -m 0755 memtest $PKG/boot/$PRGNAM-$VERSION +install -D -m 0644 memtest.bin $PKG/boot/$PRGNAM-$VERSION.bin +ln -s $PRGNAM-$VERSION $PKG/boot/$PRGNAM +ln -s $PRGNAM-$VERSION.bin $PKG/boot/$PRGNAM.bin 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 -cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/memtest86/memtest86.info b/system/memtest86/memtest86.info index 65170ce52d..9eae7f74da 100644 --- a/system/memtest86/memtest86.info +++ b/system/memtest86/memtest86.info @@ -1,8 +1,8 @@ PRGNAM="memtest86" -VERSION="4.1.0" +VERSION="4.3.7" HOMEPAGE="https://www.memtest86.com/" -DOWNLOAD="https://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz" -MD5SUM="8d6f6590d1bbcfa333bef53f568a09d5" +DOWNLOAD="https://www.memtest86.com/downloads/memtest86-4.3.7-src.tar.gz" +MD5SUM="784f3adf148079b63f925b478dee7c85" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/memtest86/patches/bug_629506_message_15.mbox b/system/memtest86/patches/bug_629506_message_15.mbox new file mode 100644 index 0000000000..0b9362728f --- /dev/null +++ b/system/memtest86/patches/bug_629506_message_15.mbox @@ -0,0 +1,142 @@ +From viro@ftp.linux.org.uk Fri Feb 27 20:21:34 2015 +Received: (at 629506) by bugs.debian.org; 27 Feb 2015 20:21:34 +0000 +X-Spam-Checker-Version: SpamAssassin 3.4.0-bugs.debian.org_2005_01_02 + (2014-02-07) on buxtehude.debian.org +X-Spam-Level: +X-Spam-Status: No, score=-2.3 required=4.0 tests=BAYES_00,FOURLA,MONEY, + MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED,STOCKLIKE,T_RP_MATCHES_RCVD autolearn=no + autolearn_force=no version=3.4.0-bugs.debian.org_2005_01_02 +X-Spam-Bayes: score:0.0000 Tokens: new, 43; hammy, 150; neutral, 234; spammy, + 0. spammytokens: hammytokens:0.000-+--UD:patch, 0.000-+--H*u:1.5.21, + 0.000-+--H*UA:1.5.21, 0.000-+--H*u:2010-09-15, 0.000-+--H*UA:2010-09-15 +Return-path: <viro@ftp.linux.org.uk> +Received: from zeniv.linux.org.uk ([195.92.253.2]) + by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) + (Exim 4.80) + (envelope-from <viro@ftp.linux.org.uk>) + id 1YRRPi-0007QW-72 + for 629506@bugs.debian.org; Fri, 27 Feb 2015 20:21:34 +0000 +Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) + id 1YRQyr-0000Hl-OS + for 629506@bugs.debian.org; Fri, 27 Feb 2015 19:53:49 +0000 +Date: Fri, 27 Feb 2015 19:53:49 +0000 +From: Al Viro <viro@ZenIV.linux.org.uk> +To: 629506@bugs.debian.org +Subject: memtest86+.bin crashes if loader ends up putting it not at 9000:0000 +Message-ID: <20150227195349.GN29656@ZenIV.linux.org.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +User-Agent: Mutt/1.5.21 (2010-09-15) +Sender: Al Viro <viro@ftp.linux.org.uk> +X-Greylist: delayed 1658 seconds by postgrey-1.34 at buxtehude; Fri, 27 Feb 2015 20:21:33 UTC + + FWIW, the effects described in this bug report are 100% reproducible +on any version, as long as the loader (lilo, grub, whatever) ends up putting +the bootsect+setup in any location below 9000:0000. + + zImage-type images consist of 3 parts - bootsect, setup and +payload. Payload is loaded at 1000:0, bootsect and setup - n:0 and +n+2:0 resp., near the top of lowmem. Payload is protected mode code, +setup - real mode one. Bootsect isn't executed at all; when the +same image is booted directly it would've been the only part loaded +by BIOS and it would copy itself and read the rest of the image to +expected locations and pass control to setup. Values in it can be +used by setup, though, so it must be present even when the image had been +brought in by a loader. + + The thing is, we can't be guaranteed n == 0x9000. E.g. ACPI and +SMM have every right to use _anything_ in range 512K..1M for their +state, declaring it reserved. That's what BIOS int 0x12 is for - it +reports how high (in kilobytes) can you go in lowmem without running into +reserved areas. And while having it report 512K is rare, something like +20K reserved just below the VRAM (i.e. report 620K) is nothing unusual. + + I hadn't looked into details of GRUB behaviour, but LILO puts its +secondary loader as high in lowmem as it can, then puts the bootsect and +setup parts of image below that. It tries to load at 9000:0 if possible, +but if there's no space, it'll go lower. With the sizes it uses 20K reserved +below 640K is enough to push bootsect + setup combination (just) below 9000:0. +And memtest86+ setup has that 0x9000 hardwired - this +gdt_48: + .word 0x800 # gdt limit=2048, 256 GDT entries + .word 512+gdt - start,0x9 # gdt base = 0X9xxxx +in setup.S really depends on 'start' (entry to setup) loaded at +0x90200 physical. Have it loaded at any other address and you'll trigger +an exception as soon as you try to assign any segment register after you switch +to protected mode. Which will escalate to triple-fault and reboot the +damn thing immediately. + + GRUB might be better or worse in triggering that "load not at +9000:0" situation, but it can't possibly avoid it in all cases. If nothing +else, 9000:0 might be within one of the reserved areas. It simply isn't +guaranteed to be available, period. + + Another issue is that setup of memtest86+ expects to see in %dx +the value left there by the bootsect of memtest86+. Fortunately, it's +not critical - in + movw $INITSEG, %ax + movw %ax, %ds + movw %ax, %es + movw %ax, %fs + movw %ax, %ss # reset the stack to INITSEG:0x4000-12. + movw %dx, %sp + push %cs + pop %ds +we really need only the last two instructions. The stack footprint +of what follows is fairly low *and* these values are not used past the +reload of segment registers immediately after protected mode switch. + +It's not the only problem in there - the bits after +# start from grub-a20.patch +are clearly cargo-culted from grub, badly. There it was a part of a function +that expects an argument on stack (it can turn A20 both on and off) and that +got blindly copied, nevermind that the value on stack is random or that +we follow it with (unconditional) use of 8042-based method anyway. I'd rather +see upstream opinion on that particular piece of code first, though. + +Anyway, the patch below fixes dependency on being loaded at 9000:0 and it +seems to work here without regressions. Have fun... + +--- memtest86+-5.01/setup.S 2013-08-09 22:01:58.000000000 -0400 ++++ fixed/setup.S 2015-02-27 14:18:47.000000000 -0500 +@@ -26,14 +26,13 @@ + # APs also execute this code + #ljmp $INITSEG, $(reload - start + 0x200) + reload: +- movw $INITSEG, %ax +- movw %ax, %ds +- movw %ax, %es +- movw %ax, %fs +- movw %ax, %ss # reset the stack to INITSEG:0x4000-12. +- movw %dx, %sp ++ xorl %eax, %eax + push %cs +- pop %ds ++ pop %ax ++ movw %ax, %ds ++ shll $4, %eax ++ addl %eax, (gdt_48 - start + 2) ++ + lidt idt_48 - start # load idt with 0,0 + lgdt gdt_48 - start # load gdt with whatever appropriate + +@@ -88,6 +87,7 @@ + movw %ax, %ds + movw %ax, %es + movw %ax, %ss ++ xorl %esp, %esp # 32bit code will set it then + movw %ax, %fs + movw %ax, %gs + +@@ -144,7 +144,7 @@ + + gdt_48: + .word 0x800 # gdt limit=2048, 256 GDT entries +- .word 512+gdt - start,0x9 # gdt base = 0X9xxxx ++ .word gdt - start,0 # gdt base, needs to be adjusted + + msg1: + .asciz "Setup.S\r\n" + + diff --git a/system/memtest86/patches/makefile.diff b/system/memtest86/patches/makefile.diff new file mode 100644 index 0000000000..d899435942 --- /dev/null +++ b/system/memtest86/patches/makefile.diff @@ -0,0 +1,52 @@ +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -8,8 +8,7 @@ + # + FDISK=/dev/fd0 + +-AS=as -32 +-CC=gcc ++ASFLAGS=-32 + + CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector +@@ -17,7 +16,7 @@ + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ + config.o memsize.o error.o smp.o cpuid.o vmem.o random.o + +-all: clean memtest.bin memtest ++all: memtest.bin memtest + + # Link it statically once so I know I don't have undefined + # symbols and then link it dynamically so I have full +@@ -28,7 +27,7 @@ + $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) + + memtest_shared.bin: memtest_shared +- objcopy -O binary $< memtest_shared.bin ++ objcopy -O binary $< $@ + + memtest: memtest_shared.bin memtest.lds + $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@ +@@ -44,16 +43,16 @@ + + memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds + $(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \ +- memtest_shared.bin -o memtest.bin ++ memtest_shared.bin -o $@ + + reloc.o: reloc.c +- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c ++reloc.o: CFLAGS += -fno-strict-aliasing + + test.o: test.c +- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c ++test.o: CFLAGS += -O0 -fno-PIC + + random.o: random.c +- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c ++random.o: CFLAGS += -O3 -fno-PIC + + clean: + rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \ diff --git a/system/memtest86/patches/memtest86+-5.01-io-extern-inline.patch b/system/memtest86/patches/memtest86+-5.01-io-extern-inline.patch new file mode 100644 index 0000000000..682dd5d01a --- /dev/null +++ b/system/memtest86/patches/memtest86+-5.01-io-extern-inline.patch @@ -0,0 +1,31 @@ +http://forum.canardpc.com/threads/110951-fix-build-with-newer-gcc-versions + +the meaning of extern inline changed between standards. use static inline +for these tiny I/O functions everywhere to keep things simple. + +--- a/io.h ++++ b/io.h +@@ -31,6 +31,6 @@ + */ + + #define __OUT1(s,x) \ +-extern inline void __out##s(unsigned x value, unsigned short port) { ++static inline void __out##s(unsigned x value, unsigned short port) { + + #define __OUT2(s,s1,s2) \ +@@ -43,6 +43,6 @@ + __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } + + #define __IN1(s) \ +-extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; ++static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; + + #define __IN2(s,s1,s2) \ +@@ -55,6 +55,6 @@ + __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; } + + #define __OUTS(s) \ +-extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ ++static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ + { __asm__ __volatile__ ("cld ; rep ; outs" #s \ + : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); } diff --git a/system/memtest86/patches/memtest86+-5.01-reboot-def.patch b/system/memtest86/patches/memtest86+-5.01-reboot-def.patch new file mode 100644 index 0000000000..f4b42feb5f --- /dev/null +++ b/system/memtest86/patches/memtest86+-5.01-reboot-def.patch @@ -0,0 +1,15 @@ +http://forum.canardpc.com/threads/110952-fix-build-due-to-missing-reboot-symbol + +the reboot func is used elsewhere, so don't mark it inline + +--- a/lib.c ++++ b/lib.c +@@ -33,7 +33,7 @@ struct ascii_map_str { + int keycode; + }; + +-inline void reboot(void) ++void reboot(void) + { + + /* tell the BIOS to do a cold start */ diff --git a/system/memtester/README b/system/memtester/README new file mode 100644 index 0000000000..df134f1b2e --- /dev/null +++ b/system/memtester/README @@ -0,0 +1,23 @@ +memtester (memory test utility) + +memtester is a userspace utility for testing the memory subsystem for +faults. Unlike memtest86, it runs as a process on a running Linux system, +meaning it can't test all of memory the way memtest86 is able to... but +you don't have to reboot to use it. + +Note that, by definition, memtester counts as a denial-of-service +(resource exhaustion) attack against the local machine. Be cautious +about using it, and definitely *read its man page* before use. + +memtester has traditionally been run as root, so that it can lock the +memory it's testing to prevent swapping and remapping. However, it's +possible to use capabilities to allow it to run correctly as a normal +user. Use something like: + +# chown root:console /usr/bin/memtester +# chmod 0750 /usr/bin/memtester +# setcap cap_ipc_lock=ep /usr/bin/memtester + +This allows anyone in the "console" group to run memtester. You could +also create a memtester group and use it in the chown command above, +if you'd rather have more fine-grained control. diff --git a/system/memtester/memtester.SlackBuild b/system/memtester/memtester.SlackBuild new file mode 100644 index 0000000000..9b17fd3fea --- /dev/null +++ b/system/memtester/memtester.SlackBuild @@ -0,0 +1,78 @@ +#!/bin/sh + +# Slackware build script for memtester + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# The _1 is the debian patchlevel. + +PRGNAM=memtester +VERSION=${VERSION:-4.5.0_1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCVER="$( echo $VERSION | cut -d_ -f1 )" +DEBVER="$( echo $VERSION | cut -d_ -f2 )" + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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/usr $OUTPUT +cd $TMP +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +cd $PRGNAM-$SRCVER +tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz +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 {} \+ + +# These patches don't do much, but they're worth having. +for i in $( cat debian/patches/series ); do + patch -p1 < debian/patches/$i +done + +# After applying the debian patches, CC doesn't get a default value (?) +make CC=${CC:-gcc} CFLAGS="$SLKCFLAGS" +make install INSTALLPATH=$PKG/usr + +# Binary already stripped, manpage already gzipped. + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a BUGS CHANGELOG COPYING README* $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:-tgz} diff --git a/system/memtester/memtester.info b/system/memtester/memtester.info new file mode 100644 index 0000000000..083ffb958c --- /dev/null +++ b/system/memtester/memtester.info @@ -0,0 +1,12 @@ +PRGNAM="memtester" +VERSION="4.5.0_1" +HOMEPAGE="http://pyropus.ca/software/memtester/" +DOWNLOAD="http://pyropus.ca/software/memtester/old-versions/memtester-4.5.0.tar.gz \ + http://deb.debian.org/debian/pool/main/m/memtester/memtester_4.5.0-1.debian.tar.xz" +MD5SUM="674a8a88ff54bdb229ca4148218a41f1 \ + c4c05a502aedeef0d06d7ebd62b73040" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/memtester/slack-desc b/system/memtester/slack-desc new file mode 100644 index 0000000000..d68f3dccba --- /dev/null +++ b/system/memtester/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------------------------------------------------------| +memtester: memtester (memory test utility) +memtester: +memtester: memtester is a userspace utility for testing the memory subsystem +memtester: for faults. Unlike memtest86, it runs as a process on a running +memtester: Linux system, meaning it can't test all of memory the way memtest86 +memtester: is able to... but you don't have to reboot to use it. +memtester: +memtester: +memtester: +memtester: +memtester: diff --git a/system/mjpg-streamer/mjpg-streamer.SlackBuild b/system/mjpg-streamer/mjpg-streamer.SlackBuild index 16bb61b465..91b069ab37 100644 --- a/system/mjpg-streamer/mjpg-streamer.SlackBuild +++ b/system/mjpg-streamer/mjpg-streamer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mjpg-streamer -# Copyright 2011 David Woodfall <dave@dawoodfall.net> +# Copyright 2011 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/mjpg-streamer/mjpg-streamer.info b/system/mjpg-streamer/mjpg-streamer.info index 8ea6352799..72d30a7fcd 100644 --- a/system/mjpg-streamer/mjpg-streamer.info +++ b/system/mjpg-streamer/mjpg-streamer.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dave Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/mksh/README b/system/mksh/README index e741b2c12e..7907a1cfd9 100644 --- a/system/mksh/README +++ b/system/mksh/README @@ -5,3 +5,6 @@ Pass STATIC=yes to the script to create a static build. Pass DIET=yes to the script in order to use dietlibc (this requires the optional dependency dietlibc) + +Pass MUSL=yes to the script in order to use musl (this +requires the optional dependency musl) diff --git a/system/mksh/mksh.SlackBuild b/system/mksh/mksh.SlackBuild index 0faa1ff7a7..9559c2d945 100644 --- a/system/mksh/mksh.SlackBuild +++ b/system/mksh/mksh.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mksh -# Copyright (c) 2011-2018 Markus Reichelt, Aachen, DE +# Copyright (c) 2011-2021 Markus Reichelt, Aachen, DE # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -26,7 +26,7 @@ # Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 PRGNAM=mksh -VERSION=${VERSION:-R56c} +VERSION=${VERSION:-R59c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,6 +66,9 @@ rm -rf $PRGNAM tar xf $CWD/$PRGNAM-$VERSION.tgz cd $PRGNAM +CC="gcc" +SLKCFLAGS="${SLKCFLAGS} -Wall" + if [ "$STATIC" = "yes" ]; then LDFLAGS="${LDFLAGS} -static" CPPFLAGS="${CPPFLAGS} -DMKSH_NOPWNAM" @@ -73,9 +76,10 @@ fi if [ "$DIET" = "yes" ]; then CC="diet -Os gcc" - SLKCFLAGS="${SLKCFLAGS} -Wall" -else - CC="gcc" +fi + +if [ "$MUSL" = "yes" ]; then + CC="musl-gcc" fi chown -R root:root . @@ -92,12 +96,15 @@ LDFLAGS=$LDFLAGS \ CPPFLAGS=$CPPFLAGS \ CFLAGS=$SLKCFLAGS \ CC=$CC \ - sh ../Build.sh -r -c lto + sh ../Build.sh -r +./test.sh mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 $PKG/install ginstall -D -m 755 mksh $PKG/bin/mksh ginstall -D -m 644 ../mksh.1 $PKG/usr/man/man1/ +ginstall -D -m 644 ../lksh.1 $PKG/usr/man/man1/ +ginstall -D -m 644 ../mksh.faq $PKG/usr/doc/$PRGNAM-$VERSION/ ginstall -D -m 644 ../dot.mkshrc $PKG/etc/skel/.mkshrc.new find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/mksh/mksh.info b/system/mksh/mksh.info index 0dd5c6bf0f..e9eacb68f9 100644 --- a/system/mksh/mksh.info +++ b/system/mksh/mksh.info @@ -1,8 +1,8 @@ PRGNAM="mksh" -VERSION="R56c" +VERSION="R59c" HOMEPAGE="http://mirbsd.de/mksh" -DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R56c.tgz" -MD5SUM="4799a9ac6d55871d79ba66713d928663" +DOWNLOAD="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59c.tgz" +MD5SUM="99f8ac3c1d8a30b913d509f1969a4aaa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/mkslack/ChangeLog.txt b/system/mkslack/ChangeLog.txt deleted file mode 100644 index 365b4d14d9..0000000000 --- a/system/mkslack/ChangeLog.txt +++ /dev/null @@ -1,182 +0,0 @@ -Mon 01 Aug 2016 20:22:51 BST -Version 5.1 -Do not rename python and perl packages. -Sat 30 Jul 2016 03:27:00 BST -Version 5.0 -Fix documentation -Thu 28 Jul 2016 02:25:54 BST -Version 4.9 -Updated templates for i586 -Mon 04 May 2015 05:48:43 BST -Version 4.8 -Remove some debugging code -Sat 11 Apr 2015 23:18:49 BST -Version 4.7 -Add autotools as the first option. -Wed 24 Dec 2014 09:32:31 GMT -Update various build templates and revised documentation line. -Mon 07 Apr 2014 10:12:35 BST -Add waf template. -+--------------------------+ -Tue 31 Dec 2013 03:02:59 GMT -Info file: Remove APPROVED. Add REQUIRES. -+--------------------------+ -Mon 30 Dec 2013 11:22:07 GMT -Bugfix for missing manpage lines in autotools template. -+--------------------------+ -Fri 22 Nov 2013 08:49:14 GMT -Updated SlackBuild templates -+--------------------------+ -Sun 30 Oct 2011 00:25:05 BST -Added --infodir to autotools template -+--------------------------+ -Tue 25 Oct 2011 19:25:35 BST -Version 4.0 -Minor edit of mkslack.conf -Added a chmod +x of SlackBuild -+--------------------------+ -Sun 24 Apr 2011 17:30:38 BST -Version 4.0 -Hmm where did 3.9 go? -Fixed a problem with repeating additions to doinst.sh -Removed annoying ... from slack-desc -+--------------------------+ -Tue 08 Feb 2011 22:29:23 GMT -Version 3.8 -Added support to auto-add year into slackbuilds. -+--------------------------+ -Sun Jan 16 18:55:57 GMT 2011 -Version 3.7 -Added ruby support. -+--------------------------+ -Tue 09 Nov 2010 12:07:36 PM GMT -Version 3.6 -Bugfix for docmuentation -+--------------------------+ -Tue 21 Sep 2010 18:45:16 BST -Version 3.5 -Added 'doc' as an option for documentation -+--------------------------+ -Mon 20 Sep 2010 08:28:24 BSTTue 07 Sep 2010 15:24:53 BST -Version 3.4 -Changed .desktop and mimetype grep to case-insensitive. -Added stock doinst.sh to templates for convenience. -+--------------------------+ -Version 3.3 finalised -+--------------------------+ -Thu 12 Aug 2010 06:35:28 BST -Version 3.3rc8 -Small code improvements -+--------------------------+ -Sat 31 Jul 2010 20:59:50 BST -Version 3.3rc6 -Small bugfix for $PKG with python/perl packages. -+--------------------------+ -Thu 01 Jul 2010 03:14:02 BST -Version 3.3rc5 -Small bugfix. -+--------------------------+ -Wed 30 Jun 2010 19:39:47 BST -Version 3.3rc4 -Small bugfix. -+--------------------------+ -Wed 30 Jun 2010 17:28:31 BST -Version 3.3rc3 -Cleaned up message for usr/share/man pages found. -+--------------------------+ -Wed 30 Jun 2010 09:54:37 BST -Version 3.3rc2 -Reverted back to not needing an underscore for TAG. -+--------------------------+ -Wed 30 Jun 2010 09:07:19 BST -Version 3.3rc1 -Incorporated slakmagik's nice, new code. --r is now -b (for build) -A new -V for version check. -With -b you get the choice of having a failed build fixed and -rebuilt. Mostly for manpage/info errors. A new config option -ERRORACTION to do this, which can be PROMPT, AUTO or EXIT. -Now config file errors are reported back. -Now TAG _must_ have a preceding underscore, which keeps it in -line with slackbuilds. -+--------------------------+ -Sun 27 Jun 2010 16:28:32 BST -Version 3.1 -Fixed ARCH bug. -Now puts appname into first line of slack-desc. -+--------------------------+ -Wed 23 Jun 2010 23:59:14 BST -Version 3.0 -Adjusted docs. -+--------------------------+ -Tue 22 Jun 2010 19:47:26 BST -Version 2.9 -Code improvements. -+--------------------------+ -Tue 22 Jun 2010 19:47:05 BST -Version 2.8 -??? -+--------------------------+ -Tue 22 Jun 2010 17:48:34 BST -Version 2.7 -Adjusted docs. -+--------------------------+ -Tue 22 Jun 2010 09:30:00 BST -Version 2.6 -Upgraded to new perl template. -+--------------------------+ -Mon 21 Jun 2010 01:12:41 BST -Version 2.6 -Fixed python support. -+--------------------------+ -Sun 20 Jun 2010 02:35:23 BST -Version 2.5 -Improved backups. Added KEEPBACKUPS option to conf. -+--------------------------+ -Sun 20 Jun 2010 01:20:39 BST -Version 2.4 -Fixed slack-desc. -+--------------------------+ -Sun 20 Jun 2010 00:44:02 BST -Version 2.3 -Code improvements. -+--------------------------+ -Sun 20 Jun 2010 00:12:41 BST -Version 2.2 -Improved support for perl modules. -+--------------------------+ -Fri 18 Jun 2010 01:07:52 BST -Version 2.1 -Added some support for ./autogen.sh or autoreconf in configure -is missing. YMMV on this. -+--------------------------+ -Thu 17 Jun 2010 22:29:57 BST -Version 2.0 -Added function to check for latest version. -+--------------------------+ -Sun 13 Jun 2010 21:51:29 BST -Version 1.9 -Fixed tag error -+--------------------------+ -Sun 13 Jun 2010 19:20:55 BST -Version 1.8 -Various code improvements -+--------------------------+ -Sun 13 Jun 2010 10:24:38 BST -Version 1.7 -Fixed _tag bug in package name. -+--------------------------+ -Thu 10 Jun 2010 21:48:12 BST -Version 1.6 -Updated for all templates on slackbuilds.org -It _should_ detect the correct template to use. -YMMV ;-) -+--------------------------+ -Mon 31 May 2010 01:52:00 BST -Version 1.5 -Minor bugfix. -+--------------------------+ -Sat 29 May 2010 12:35:08 BST -Version 1.4 -Updated SlackBuild template to the latest on slackbuilds.org -+--------------------------+ diff --git a/system/mkslack/README b/system/mkslack/README index 2899a7efdf..02924bf5f3 100644 --- a/system/mkslack/README +++ b/system/mkslack/README @@ -1,70 +1,12 @@ -mkslack - a SlackBuild generator script +NAME + mkslack - a SlackBuild generator -This slackbuild generator uses templates stored in -/usr/share/mkslack/templates and a config file -/etc/mkslack/mkslack.conf which you must edit for name, email, tag and -a few options. +SYNOPSIS + mkslack [options] archive +DESCRIPTION + mkslack generates SlackBuild scripts and supporting + files using the standard SBo templates found at + https://slackbuilds.org/templates/ -Idea for use: - -The initial slackbuild and info file are built by this script, and -when a test build/install is done and working, the files should be -tweaked by hand. Especially don't forget to fill in the rest of the -details in the .info. One thing to point out is that mkslack will -overwrite these files if run again unless you set KEEPBACKUPS="YES" -in the conf (default). - -This is only a starter kit! You ARE expected to edit the created -files by hand afterwards to remove unnecesary parts and add extra -options! - - -Syntax: - -mkslack [options] archive - -Options: --h --help Usage. --b --build Run SlackBuild after creation. Got root? --i --install Install the package after running. --l --list Pipe archive contents to /usr/bin/most and exit. --v --version Version of mkslack. --V --ckver Check for new version. - -With no option set, mkslack will generate the SlackBuild and other -files, print out a small message, and then quit. - - -Config options: - -NAME, EMAIL as they should appear in .SlackBuild and .info TAG should -be your custom tag and defaults to _SBo KEEPBACKUPS="YES|NO" up to 5 -backups of .SlackBuild and other files are kept. The higher the -number, the older they are. ERRORACTION="PROMPT|AUTO|EXIT" what to -do on build errors. Using AUTO or answering 'y' to the prompt will -have the slackbuild adjusted for man and info pages and then rebuilt. -Waf scripts don't exit on a '1' return code so it scans the end of -the to see if there is an unrecognised configure option (the most -frequent error with waf). - - -CLI Options: - -The documents list in top level of source tree can be adjusted by -command: -DOCS="SomeFile" mkslack archive -This will add 'SomeFile' to the list. You can also edit the DOCS list -in this script. Any that it doesn't find will be removed from the -list. - -Build can be specified by: -BUILD=2 mkslack archive -Otherwise it defaults to 1. - -ARCH can be specified by: -ARCH=xxx mkslack archive -It defaults to whatever is set in the system, or what the SlackBuild -finds or sets. - -TAG can also be specified. + See mkslack(1) for comprehensive option descriptions. diff --git a/system/mkslack/mkslack.SlackBuild b/system/mkslack/mkslack.SlackBuild index a428a0afa7..7ca562007c 100644 --- a/system/mkslack/mkslack.SlackBuild +++ b/system/mkslack/mkslack.SlackBuild @@ -2,8 +2,8 @@ # Slackware build script for mkslack -# Copyright 2010 David Woodfall <dave@dawoodfall.net>, -# Modifications copyright slakmagik <slakmagik@gmail.com> +# Copyright 2010-20 Dave Woodfall <dave@slackbuilds.org>, +# slakmagik <slakmagik@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mkslack -VERSION=${VERSION:-5.2} +VERSION=${VERSION:-5.3.5} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -38,12 +38,12 @@ README=$PKG/usr/doc/$PRGNAM-$VERSION/README set -e rm -rf $PKG -mkdir -p $TMP $PKG/usr/bin $PKG/usr/share/mkslack/templates $PKG/etc/mkslack \ - $PKG/usr/man/man1 $OUTPUT +mkdir -p $TMP $OUTPUT $PKG/usr/share/mkslack/{templates,tools} + cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION/$PRGNAM-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -51,30 +51,34 @@ 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 {} \; +sed -i -e "s/@VERSION@/$VERSION/g" mkslack.1 gzip mkslack.1 -install -m 644 mkslack.1.gz $PKG/usr/man/man1 -install -m 755 mkslack $PKG/usr/bin -install -m 644 template* $PKG/usr/share/mkslack/templates -install -m 644 *SlackBuild $PKG/usr/share/mkslack/templates -install -m 644 mkslack.conf.new $PKG/etc/mkslack +install -m 644 -D mkslack.1.gz $PKG/usr/man/man1/mkslack.1.gz +install -m 755 -D mkslack $PKG/usr/bin/mkslack +install -m 644 -D mkslack.conf.new $PKG/etc/mkslack/mkslack.conf.new +install -m 644 templates/* $PKG/usr/share/mkslack/templates +install -m 644 tools/* $PKG/usr/share/mkslack/tools mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a original-templates $PKG/usr/doc/$PRGNAM-$VERSION + # generate the README from some introductory text and a dump of the manual cat << EOF > $README mkslack - a SlackBuild generator script -Copyright 2010 David Woodfall, modification by slakmagik + +Copyright 2010-2020 Dave Woodfall and slakmagik. mkslack is licensed under a "one-clause BSD/Slackware" license. See the script for the full text. -Homepage: http://www.dawoodfall.net/files/slackbuilds/noversion/mkslack/ + +Homepage: http://tty1.uk/slackbuilds/noversion/mkslack EOF -man ./mkslack.1.gz | col -b | expand | cat -s | sed ' +man ./mkslack.1.gz | col -b | expand | fmt -72 | cat -s | sed " 1d s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g /^$/N;/MKSLACK(1)$/D - ' >> $README + " >> $README cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/ChangeLog.txt > $PKG/usr/doc/$PRGNAM-$VERSION/ChangeLog.txt mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/mkslack/mkslack.info b/system/mkslack/mkslack.info index a026024544..58059ed4dc 100644 --- a/system/mkslack/mkslack.info +++ b/system/mkslack/mkslack.info @@ -1,10 +1,10 @@ PRGNAM="mkslack" -VERSION="5.2" -HOMEPAGE="http://dawoodfall.net/slackbuilds/noversion/mkslack" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/mkslack-5.2.tar.gz" -MD5SUM="1866d9b32bee61a5bdfca52230e2a6f0" +VERSION="5.3.5" +HOMEPAGE="http://tty1.uk/slackbuilds/mkslack" +DOWNLOAD="http://git.tty1.uk/cgit.cgi/mkslack/snapshot/mkslack-5.3.5.tar.gz" +MD5SUM="d7debd4ffae89f31a407f0e80e73468b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +MAINTAINER="Dave Woodfall" +EMAIL="dave@tty1.uk" diff --git a/system/mkslack/slack-desc b/system/mkslack/slack-desc index e6e7f58ff4..6d4735561d 100644 --- a/system/mkslack/slack-desc +++ b/system/mkslack/slack-desc @@ -1,19 +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 +# 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------------------------------------------------------| mkslack: mkslack (a SlackBuild generation system) mkslack: -mkslack: mkslack uses templates to generate slackbuilds and .info files. -mkslack: It fills in various things like PRGNAM, VERSION etc and inspects the -mkslack: archive for man, info and documentation. It checks md5sum of archive -mkslack: and writes it into the .info file. +mkslack: mkslack generates SlackBuild scripts and supporting files using the +mkslack: standard SBo templates found at https://slackbuilds.org/templates/ +mkslack: +mkslack: See mkslack(1) for comprehensive option descriptions. +mkslack: +mkslack: http://tty1.uk/slackbuilds/mkslack +mkslack: mkslack: -mkslack: The config file /etc/mkslack/mkslack.conf should be customised with -mkslack: your name, email etc. before use. mkslack: -mkslack: http://dawoodfall.net/slackbuilds/noversion/mkslack diff --git a/system/mktorrent/mktorrent.info b/system/mktorrent/mktorrent.info index 1bc0efc0aa..3d86dbecf1 100644 --- a/system/mktorrent/mktorrent.info +++ b/system/mktorrent/mktorrent.info @@ -6,5 +6,5 @@ MD5SUM="0f583dc6d88c3bc7da736c3f0a8c449e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Grigorios Bouzakis" -EMAIL="grbzks@xsmail.com" +MAINTAINER="Markus Reichelt" +EMAIL="slackbuilds@mareichelt.de" diff --git a/system/mlocate/README b/system/mlocate/README new file mode 100644 index 0000000000..f2029ce76a --- /dev/null +++ b/system/mlocate/README @@ -0,0 +1,31 @@ +mlocate (locate/updatedb implementation) + +mlocate is a locate/updatedb implementation. It keeps a database of all +existing files and allows you to lookup files by name. The 'm' stands for +"merging": updatedb reuses the existing database to avoid rereading most +of the file system, which makes updatedb faster and does not trash the +system caches as much as traditional locate implementations. + +This is the same "locate" that's in Slackware-current (and eventually 15.0). + +This conflicts with Slackware 14.2's slocate package! Before installing +this, add slocate to /etc/slackpkg/blacklist and then: + + # removepkg slocate + +It's also recommended to: + + # rm -rf /var/lib/slocate /etc/updatedb.conf + +The locate database will be created daily, as a cron job. If you don't +want to wait, you can create it manually: + + # /etc/cron.daily/mlocate + +If you want to revert to Slackware's slocate, remove slocate from +/etc/slackpkg/blacklist, then: + + # removepkg mlocate + # rm -rf /var/lib/mlocate /etc/updatedb.conf + # slackpkg update + # slackpkg install slocate diff --git a/system/mlocate/doinst.sh b/system/mlocate/doinst.sh new file mode 100644 index 0000000000..8afb2a4fff --- /dev/null +++ b/system/mlocate/doinst.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# doinst.sh copied from Pat's, got rid of the stuff that creates the +# slocate group. + +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... +} +config etc/updatedb.conf.new + +if [ ! -r var/lib/mlocate/mlocate.db ]; then + touch var/lib/mlocate/mlocate.db + chown root:slocate var/lib/mlocate/mlocate.db + chmod 640 var/lib/mlocate/mlocate.db +fi + diff --git a/system/mlocate/mlocate-run-updatedb b/system/mlocate/mlocate-run-updatedb new file mode 100644 index 0000000000..7d3f2ac526 --- /dev/null +++ b/system/mlocate/mlocate-run-updatedb @@ -0,0 +1,4 @@ +#!/bin/sh + +nodevs=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" && $2 != "zfs" { print $2 }') +/usr/bin/updatedb -f "$nodevs" diff --git a/system/mlocate/mlocate.SlackBuild b/system/mlocate/mlocate.SlackBuild new file mode 100644 index 0000000000..9f213fbb54 --- /dev/null +++ b/system/mlocate/mlocate.SlackBuild @@ -0,0 +1,120 @@ +#!/bin/sh + +# Slackware build script for mlocate + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# Notes: +# - This is intended to be 100% compatible with the mlocate in -current. +# - mlocate and slocate can't read each others' database formats. Bummer. +# - DOWNLOAD is upstream's site, but the file is identical to the one +# from Pat's source/ dir. I used upstream so the file won't disappear if +# Pat upgrades or changes his mind. +# - mlocate on -current uses the slocate group (there's no mlocate group), +# so I do the same here. +# - mlocate's database is about 40% larger than slocate's, on my build box. +# Not a real concern unless you're building a tiny embedded system. + +PRGNAM=mlocate +VERSION=${VERSION:-0.26} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make groupname=slocate +make install-strip DESTDIR=$PKG + +gzip $PKG/usr/man/man?/*.? + +# This stuff comes straight from Pat's mlocate.SlackBuild: +mkdir -p $PKG/etc +cp -a $CWD/updatedb.conf.new $PKG/etc/updatedb.conf.new +chown root:root $PKG/etc/updatedb.conf.new +chmod 644 $PKG/etc/updatedb.conf.new + +mv $PKG/usr/bin/locate $PKG/usr/bin/mlocate +( cd $PKG/usr/bin ; ln -sf mlocate locate ) + +( cd $PKG/usr/man/man1 + ln -sf locate.1 mlocate.1 +) + +mkdir -p $PKG/usr/libexec +cp -a $CWD/mlocate-run-updatedb $PKG/usr/libexec/mlocate-run-updatedb +chown root:root $PKG/usr/libexec/mlocate-run-updatedb +chmod 755 $PKG/usr/libexec/mlocate-run-updatedb + +mkdir -p $PKG/etc/cron.daily +cp -a $CWD/mlocate.cron $PKG/etc/cron.daily/mlocate +chown root:root $PKG/etc/cron.daily/mlocate +chmod 755 $PKG/etc/cron.daily/mlocate + +chown root:slocate $PKG/usr/bin/mlocate +chmod 2711 $PKG/usr/bin/mlocate +mkdir -p $PKG/var/lib/mlocate +chown root:slocate $PKG/var/lib/mlocate +chmod 750 $PKG/var/lib/mlocate +# End of Pat's stuff. + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING* ChangeLog NEWS README* \ + $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:-tgz} diff --git a/system/mlocate/mlocate.cron b/system/mlocate/mlocate.cron new file mode 100644 index 0000000000..5464abad35 --- /dev/null +++ b/system/mlocate/mlocate.cron @@ -0,0 +1,2 @@ +#!/bin/sh +ionice -c3 nice -n 19 /usr/libexec/mlocate-run-updatedb diff --git a/system/mlocate/mlocate.info b/system/mlocate/mlocate.info new file mode 100644 index 0000000000..b9eb39f232 --- /dev/null +++ b/system/mlocate/mlocate.info @@ -0,0 +1,10 @@ +PRGNAM="mlocate" +VERSION="0.26" +HOMEPAGE="https://pagure.io/mlocate/releases" +DOWNLOAD="https://releases.pagure.org/mlocate/mlocate-0.26.tar.xz" +MD5SUM="539e6f86bf387358aa2b14d5f880e49a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README%" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/mlocate/slack-desc b/system/mlocate/slack-desc new file mode 100644 index 0000000000..e28d270792 --- /dev/null +++ b/system/mlocate/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------------------------------------------------------| +mlocate: mlocate (locate/updatedb implementation) +mlocate: +mlocate: mlocate is a locate/updatedb implementation. It keeps a database +mlocate: of all existing files and allows you to lookup files by name. The +mlocate: 'm' stands for "merging": updatedb reuses the existing database +mlocate: to avoid rereading most of the file system, which makes updatedb +mlocate: faster and does not trash the system caches as much as traditional +mlocate: locate implementations. +mlocate: +mlocate: This conflicts with Slackware 14.2's slocate package. See README +mlocate: for details. diff --git a/system/mlocate/updatedb.conf.new b/system/mlocate/updatedb.conf.new new file mode 100644 index 0000000000..542cd7c679 --- /dev/null +++ b/system/mlocate/updatedb.conf.new @@ -0,0 +1,4 @@ +PRUNE_BIND_MOUNTS = "yes" +PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset debugfs devpts ecryptfs exofs fuse fuse.sshfs fusectl gfs gfs2 gpfs hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs sockfs sysfs tmpfs ubifs udf usbfs ceph fuse.ceph" +PRUNENAMES = ".git .hg .svn .bzr .arch-ids {arch} CVS" +PRUNEPATHS = "/afs /dev /media /mnt /net /proc /sys /tmp /usr/tmp /var/cache/ccache /var/lib/ceph /var/spool/cups /var/tmp" diff --git a/system/mlterm/mlterm-3.8.5-fixes.patch b/system/mlterm/mlterm-3.8.5-fixes.patch deleted file mode 100644 index e2bd8d9bec..0000000000 --- a/system/mlterm/mlterm-3.8.5-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r e0fc0db3d486 configure ---- a/configure Wed Mar 07 22:18:10 2018 +0900 -+++ b/configure Wed Mar 07 23:58:10 2018 +0900 -@@ -19871,7 +19871,7 @@ - fi - mkdir -p ${top_srcdir-$srcdir}/fb - for file in ChangeLog Makefile.in common configure etc gtk inputmethod java \ -- main man vtemu script scrollbar uitoolkit doc ; do -+ main man vtemu script scrollbar uitoolkit doc libvterm; do - cp -R ${top_srcdir-$srcdir}/$file ${top_srcdir-$srcdir}/fb/ - done - fi -diff -r e0fc0db3d486 configure.in ---- a/configure.in Wed Mar 07 22:18:10 2018 +0900 -+++ b/configure.in Wed Mar 07 23:58:10 2018 +0900 -@@ -82,7 +82,7 @@ - fi - mkdir -p ${top_srcdir-$srcdir}/fb - for file in ChangeLog Makefile.in common configure etc gtk inputmethod java \ -- main man vtemu script scrollbar uitoolkit doc ; do -+ main man vtemu script scrollbar uitoolkit doc libvterm; do - cp -R ${top_srcdir-$srcdir}/$file ${top_srcdir-$srcdir}/fb/ - done - fi diff --git a/system/mlterm/mlterm.SlackBuild b/system/mlterm/mlterm.SlackBuild index b8922d7740..04efd20c2b 100644 --- a/system/mlterm/mlterm.SlackBuild +++ b/system/mlterm/mlterm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mlterm -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2021 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mlterm -VERSION=${VERSION:-3.8.5} +VERSION=${VERSION:-3.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,8 +69,6 @@ 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/mlterm-3.8.5-fixes.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/mlterm/mlterm.info b/system/mlterm/mlterm.info index fb064f36e0..d34b3828cb 100644 --- a/system/mlterm/mlterm.info +++ b/system/mlterm/mlterm.info @@ -1,8 +1,8 @@ PRGNAM="mlterm" -VERSION="3.8.5" +VERSION="3.9.1" HOMEPAGE="http://mlterm.sourceforge.net" -DOWNLOAD="https://sourceforge.net/projects/mlterm/files/01release/mlterm-3.8.5/mlterm-3.8.5.tar.gz" -MD5SUM="26b1ed70ccadd37b72790fe331f4a667" +DOWNLOAD="https://sourceforge.net/projects/mlterm/files/01release/mlterm-3.9.1/mlterm-3.9.1.tar.gz" +MD5SUM="2811050f2f46fd7a73446b61daeb7999" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/mmv/README b/system/mmv/README new file mode 100644 index 0000000000..6f876d8eb4 --- /dev/null +++ b/system/mmv/README @@ -0,0 +1,10 @@ +mmv (move/copy/append/link multiple files by wildcard patterns) + +This is mmv, a program to move/copy/append/link multiple files +according to a set of wildcard patterns. This multiple action is +performed safely, i.e. without any unexpected deletion of files due +to collisions of target names with existing filenames or with other +target names. Furthermore, before doing anything, mmv attempts to +detect any errors that would result from the entire set of actions +specified and gives the user the choice of either aborting before +beginning, or proceeding by avoiding the offending parts. diff --git a/system/mmv/compilefix.diff b/system/mmv/compilefix.diff new file mode 100644 index 0000000000..9a13a156dc --- /dev/null +++ b/system/mmv/compilefix.diff @@ -0,0 +1,15 @@ +diff -Naur a/mmv.c b/mmv.c +--- a/mmv.c 2020-07-01 18:55:50.961457418 -0400 ++++ b/mmv.c 2020-07-01 19:00:17.724426386 -0400 +@@ -193,10 +193,7 @@ + #ifdef IS_SYSV + + /* for System V and Version 7*/ +-struct utimbuf { +- time_t actime; +- time_t modtime; +-}; ++#include <utime.h> + #define utimes(f, t) utime((f), &(t)) + + #ifndef HAS_RENAME diff --git a/system/mmv/mmv.SlackBuild b/system/mmv/mmv.SlackBuild new file mode 100644 index 0000000000..7ea0d50b3b --- /dev/null +++ b/system/mmv/mmv.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Slackware build script for mmv + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# This is ancient software (1.01b was released in 1990), but still +# useful. We're treating Debian as upstream here, our version number +# matches their patchlevel (with _ intead of -). + +PRGNAM=mmv +VERSION=${VERSION:-1.01b_19} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCVER="$( echo $VERSION | cut -d_ -f1 )" +DEBVER="$( echo $VERSION | cut -d_ -f2 )" + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-$SRCVER.orig +tar xvf $CWD/${PRGNAM}_$SRCVER.orig.tar.gz +cd $PRGNAM-$SRCVER.orig +tar xvf $CWD/${PRGNAM}_$SRCVER-$DEBVER.debian.tar.xz +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 {} \+ + +# apply all Debian's patches: +for i in $( cat debian/patches/series ); do + patch -p1 < debian/patches/$i +done + +# one patch of our own: +patch -p1 < $CWD/compilefix.diff + +# the default LDFLAGS cause the build to fail, override with "nothing". +sed -i "s,-O2,$SLKCFLAGS -Wall," Makefile +make LDFLAGS= + +# easier to do this manually (only 2 files): +mkdir -p $PKG/usr/bin $PKG/usr/man/man1 +install -s -m0755 $PRGNAM $PKG/usr/bin +gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz + +# multi-named executable, uses its name to decide what action to take. +LINKS="mcp mad mln" +for i in $LINKS; do + ln -s $PRGNAM $PKG/usr/bin/$i + ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$i.1.gz +done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ANNOUNCE READ.ME ARTICLE debian/changelog $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:-tgz} diff --git a/system/mmv/mmv.info b/system/mmv/mmv.info new file mode 100644 index 0000000000..c93d2e5da6 --- /dev/null +++ b/system/mmv/mmv.info @@ -0,0 +1,12 @@ +PRGNAM="mmv" +VERSION="1.01b_19" +HOMEPAGE="https://packages.debian.org/sid/mmv" +DOWNLOAD="http://deb.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz \ + http://deb.debian.org/debian/pool/main/m/mmv/mmv_1.01b-19.debian.tar.xz" +MD5SUM="1b2135ab2f17bdfa9e08debbb3c46ad8 \ + 5952faa99a610afdbba73d20d68c6d0f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/mmv/slack-desc b/system/mmv/slack-desc new file mode 100644 index 0000000000..063f2c6f51 --- /dev/null +++ b/system/mmv/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------------------------------------------------------| +mmv: mmv (multiple mv/rename) +mmv: +mmv: This is mmv, a program to move/copy/append/link multiple files +mmv: according to a set of wildcard patterns. This multiple action is +mmv: performed safely, i.e. without any unexpected deletion of files due to +mmv: collisions of target names with existing filenames or with other +mmv: target names. +mmv: +mmv: +mmv: +mmv: diff --git a/system/modules/README b/system/modules/README index 03fca01a81..a740d43f6d 100644 --- a/system/modules/README +++ b/system/modules/README @@ -4,13 +4,13 @@ of a user's environment via modulefiles. Each modulefile contains the information needed to configure the shell for an application. -Once the Modules package is initialized, the environment can be -modified on a per-module basis using the module command which interprets -modulefiles. Typically modulefiles instruct the module command to alter or -set shell environment variables such as PATH, MANPATH, etc. Modulefiles -may be shared by many users on a system and users may have their own -collection to supplement or replace the shared modulefiles. +Once the Modules package is initialized, the environment can be modified +on a per-module basis using the module command which interprets +modulefiles. Typically modulefiles instruct the module command to alter +or set shell environment variables such as PATH, MANPATH, etc. +Modulefiles may be shared by many users on a system and users may have +their own collection to supplement or replace the shared modulefiles. -Modules are useful in managing different versions of applications. Modules -can also be bundled into metamodules that will load an entire suite of -different applications. +Modules are useful in managing different versions of applications. +Modules can also be bundled into metamodules that will load an entire +suite of different applications. diff --git a/system/modules/modules.SlackBuild b/system/modules/modules.SlackBuild index 7c36b567f6..7d1cc2549b 100644 --- a/system/modules/modules.SlackBuild +++ b/system/modules/modules.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for Modules # -# Copyright 2015 Emmanuel N. Millan, Mendoza, Argentina. +# Copyright 2015-2021 Emmanuel N. Millan, Mendoza, Argentina. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=modules -VERSION=${VERSION:-4.1.2} +VERSION=${VERSION:-4.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -DOCS="ChangeLog INSTALL.txt COPYING.GPLv2 NEWS.txt README" +DOCS="CONTRIBUTING.rst ChangeLog INSTALL.rst COPYING.GPLv2 MIGRATING.rst NEWS.rst README.md" CWD=$(pwd) TMP=${TMP:-/tmp/SBo} diff --git a/system/modules/modules.info b/system/modules/modules.info index 8d8fbcf4d1..8aaa2c1982 100644 --- a/system/modules/modules.info +++ b/system/modules/modules.info @@ -1,8 +1,8 @@ PRGNAM="modules" -VERSION="4.1.2" +VERSION="4.7.0" HOMEPAGE="http://modules.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/modules/Modules/modules-4.1.2/modules-4.1.2.tar.bz2" -MD5SUM="f740056070e65af47ca03bedae45e297" +DOWNLOAD="https://downloads.sourceforge.net/project/modules/Modules/modules-4.7.0/modules-4.7.0.tar.bz2" +MD5SUM="d891012c6014de939761b62bbae29155" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/monitorix/README b/system/monitorix/README index 06df82f402..b8041bdce9 100644 --- a/system/monitorix/README +++ b/system/monitorix/README @@ -1,15 +1,17 @@ -Monitorix is a free, open source, lightweight system monitoring tool designed -to monitor as many services and system resources as possible. It has been -created to be used under production Linux/UNIX servers, but due to its -simplicity and small size can be used on embedded devices as well. +Monitorix is a free, open source, lightweight system monitoring tool +designed to monitor as many services and system resources as possible. +It has been created to be used under production Linux/UNIX servers, but +due to its simplicity and small size can be used on embedded devices as +well. -It consists mainly of two programs: a collector, called monitorix, which is a -Perl daemon that is started automatically like any other system service, and a -CGI script called monitorix.cgi. Since 3.0 version Monitorix includes its own -HTTP server built in, so you aren't forced to install a third-party web server -to use it. +It consists mainly of two programs: a collector, called monitorix, which +is a Perl daemon that is started automatically like any other system +service, and a CGI script called monitorix.cgi. Since 3.0 version +Monitorix includes its own HTTP server built in, so you aren't forced to +install a third-party web server to use it. Note: -There are several runtime dependencies (like pflogsumm) I'm unable to test for -all services. Keep an eye on /var/log/monitorix which will tell you. +There are several runtime dependencies (like pflogsumm) I'm unable to +test for all services. Keep an eye on /var/log/monitorix which will tell +you. diff --git a/system/monitorix/monitorix.SlackBuild b/system/monitorix/monitorix.SlackBuild index f88c43d69c..102e27dda1 100644 --- a/system/monitorix/monitorix.SlackBuild +++ b/system/monitorix/monitorix.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2014-2016 Marcel Saegebarth <marc@mos6581.de> # All rights reserved. +# Updated 2019-2021 by Emmanuel N. Millan, Mendoza, Argentina # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -25,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=monitorix -VERSION=${VERSION:-3.9.0} +VERSION=${VERSION:-3.13.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/monitorix/monitorix.info b/system/monitorix/monitorix.info index 6872dafee2..2067f2a6a4 100644 --- a/system/monitorix/monitorix.info +++ b/system/monitorix/monitorix.info @@ -1,10 +1,10 @@ PRGNAM="monitorix" -VERSION="3.9.0" +VERSION="3.13.1" HOMEPAGE="https://www.monitorix.org/" -DOWNLOAD="https://www.monitorix.org/old-versions/monitorix-3.9.0.tar.gz" -MD5SUM="181bf2b83b92e89aa6317dd473a987e3" +DOWNLOAD="https://www.monitorix.org/monitorix-3.13.1.tar.gz" +MD5SUM="ca2b15fb137efded82c5a2bfd189573f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-http-server-simple perl-config-general rrdtool" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" +REQUIRES="perl-lwp-useragent-cached perl-http-server-simple perl-config-general rrdtool" +MAINTAINER="Emmanuel N. Millan" +EMAIL="emmanueln@gmail.com" diff --git a/system/motion/motion.SlackBuild b/system/motion/motion.SlackBuild index 9a9f2bb6f4..bae4bc7990 100644 --- a/system/motion/motion.SlackBuild +++ b/system/motion/motion.SlackBuild @@ -2,9 +2,10 @@ # Slackware build script for motion. # -# Copyright 2013 Sebastian Arcus: sbo {at} open-t {dot} co {dot} uk +# Copyright 2013-2020 Sebastian Arcus: s.arcus {at} open-t [dot] co [dot] uk # Copyright 2009-2010 Pierre Cazenave <pwcazenave> {at} gmail [dot] com # Copyright 2007 Martin Lefebvre <dadexter@sekurity.com> +# With contributions from JB: afrotrap {at} gmail [dot] com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=motion -VERSION=${VERSION:-4.0.1} +VERSION=${VERSION:-4.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,7 +74,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 {} \; -autoreconf +autoreconf -fiv CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -99,7 +100,7 @@ mv $PKG/etc/motion/motion-dist.conf $PKG/etc/motion/motion-dist.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv $PKG/usr/share/doc/motion/* $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/$PRGNAM/examples $PKG/usr/doc/$PRGNAM-$VERSION/ +#mv $PKG/usr/share/$PRGNAM/examples $PKG/usr/doc/$PRGNAM-$VERSION/ rm -rf $PKG/usr/share # We moved the docs from there cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/motion/motion.info b/system/motion/motion.info index d602d0e1bb..b077342cc9 100644 --- a/system/motion/motion.info +++ b/system/motion/motion.info @@ -1,10 +1,10 @@ PRGNAM="motion" -VERSION="4.0.1" -HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" -DOWNLOAD="https://github.com/Motion-Project/motion/archive/release-4.0.1/motion-release-4.0.1.tar.gz" -MD5SUM="5c87f90c4118d8cf0fb14700db69118f" +VERSION="4.3.1" +HOMEPAGE="https://motion-project.github.io" +DOWNLOAD="https://github.com/Motion-Project/motion/archive/release-4.3.1/motion-release-4.3.1.tar.gz" +MD5SUM="2d49f8af48f9deff4ea9204b05cc327c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libmicrohttpd" MAINTAINER="Sebastian Arcus" -EMAIL="sbo <at> open-t {dot} co {dot} uk" +EMAIL="s.arcus <at> open-t [dot] co [dot] uk" diff --git a/system/motion/slack-desc b/system/motion/slack-desc index 491913690d..94c4784a57 100644 --- a/system/motion/slack-desc +++ b/system/motion/slack-desc @@ -16,4 +16,4 @@ motion: Motion is a command line based tool. It has no graphical user motion: interface. Everything is setup via the command line or via a set motion: of configuration files. motion: -motion: http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome +motion: https://motion-project.github.io/ diff --git a/system/mpack/mpack.SlackBuild b/system/mpack/mpack.SlackBuild index 9bd52bc85f..8c6319c70b 100644 --- a/system/mpack/mpack.SlackBuild +++ b/system/mpack/mpack.SlackBuild @@ -21,10 +21,16 @@ # 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. +# +# 2021-03-18 +# - Inc'd BUILD value to 2 +# - Added comments about patch usage. +# - Legacy upstream URL is gone, migrated to gitlab site. +# PRGNAM=mpack VERSION=${VERSION:-1.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,7 +75,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 {} \; -patch -p1 < $CWD/mpack.diff +# The following patch corrects a number of warnings and build errors in +# order to compile on a modern (Slackware 14.2+) Linux system. +patch -p1 < $CWD/mpack.patch CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/mpack/mpack.info b/system/mpack/mpack.info index fd50ec744e..e017fc5020 100644 --- a/system/mpack/mpack.info +++ b/system/mpack/mpack.info @@ -1,8 +1,8 @@ PRGNAM="mpack" VERSION="1.6" -HOMEPAGE="http://ftp.andrew.cmu.edu/pub/mpack" -DOWNLOAD="http://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz" -MD5SUM="a70fa5afa76539a9afb70b9d81568fe8" +HOMEPAGE="https://gitlab.com/osdp/mpack" +DOWNLOAD="https://gitlab.com/osdp/mpack/-/archive/1.6/mpack-1.6.tar.gz" +MD5SUM="3528459d2b45225d18a25359112b2b45" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/mpack/mpack.diff b/system/mpack/mpack.patch index e00b92f25e..e00b92f25e 100644 --- a/system/mpack/mpack.diff +++ b/system/mpack/mpack.patch diff --git a/system/mpich/mpich.SlackBuild b/system/mpich/mpich.SlackBuild index 9ce0a4f62f..3245ac845a 100644 --- a/system/mpich/mpich.SlackBuild +++ b/system/mpich/mpich.SlackBuild @@ -4,7 +4,7 @@ # Earlier version written by Wainamoinen <wainamoinen@gmail.com> # -# Copyright 2016-2018 Christoph Willing Brisbane, Australia +# Copyright 2016-2021 Christoph Willing Brisbane, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mpich -VERSION=${VERSION:-3.3} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -85,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-cxx \ --enable-threads=multiple \ --enable-fast \ + --with-device=ch3 \ --build=$ARCH-slackware-linux make diff --git a/system/mpich/mpich.info b/system/mpich/mpich.info index 13240654af..4d02727e1b 100644 --- a/system/mpich/mpich.info +++ b/system/mpich/mpich.info @@ -1,8 +1,8 @@ PRGNAM="mpich" -VERSION="3.3" +VERSION="3.4.1" HOMEPAGE="https://www.mpich.org/" -DOWNLOAD="https://www.mpich.org/static/downloads/3.3/mpich-3.3.tar.gz" -MD5SUM="574af413dc0dc7fbb929a761822beb06" +DOWNLOAD="https://www.mpich.org/static/downloads/3.4.1/mpich-3.4.1.tar.gz" +MD5SUM="10e43fd61fd1a13c89cfbed3eb30b97a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch b/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch new file mode 100644 index 0000000000..f68c4af0b3 --- /dev/null +++ b/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch @@ -0,0 +1,11 @@ +--- multipathd/Makefile.orig 2017-11-10 17:52:36.070562376 +0200 ++++ multipathd/Makefile 2017-11-10 18:10:47.854895039 +0200 +@@ -11,7 +11,7 @@ CFLAGS += $(BIN_CFLAGS) -I$(multipathdir + LDFLAGS += $(BIN_LDFLAGS) + LIBDEPS += -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \ + -L$(mpathcmddir) -lmpathcmd -ludev -ldl -lurcu -lpthread \ +- -ldevmapper -lreadline ++ -ldevmapper -lreadline -lncurses + + ifdef SYSTEMD + CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD) diff --git a/system/multipath-tools/README b/system/multipath-tools/README index d6b90af8ed..e56ff36245 100644 --- a/system/multipath-tools/README +++ b/system/multipath-tools/README @@ -1 +1,4 @@ Utilities used to drive the Device Mapper multipathing driver + +See README.SLACKWARE for details on how to configure and +start multipathd. diff --git a/system/multipath-tools/README.SLACKWARE b/system/multipath-tools/README.SLACKWARE new file mode 100644 index 0000000000..6f814df9af --- /dev/null +++ b/system/multipath-tools/README.SLACKWARE @@ -0,0 +1,60 @@ +README.SLACKWARE + +First you need to add this to /etc/rc.d/rc.modules.local + + /sbin/modprobe -v dm-multipath + +Also add any modules that may be needed for any storage devices +that may be not be configured up by udev, like eg. qla-2xxxx. + +To use multipath, you need to start the multipath daemon. +The recommended way is to add the following to /etc/rc.d/rc.local + + if [ -x /etc/rc.d/rc.multipathd ]; then + /etc/rc.d/rc.multipathd start + fi + +After starting multipathd you can see the multipaths like this + + multipath -ll + +You have to have the paths connected and presented before +seeing them with the above command. For some storage devices +after presenting them to the host, a host reboot may be +required for the devices and the paths to be show correctly. +This also applies to any volume increase; a host reboot may +be needed to pick up the new size. It seems to be depended +on the storage in hand. + +To blackist any devices that you don't want to be handled by +multipath like local hardware raid controllers, to your +/etc/multipath.conf and entry like this + + blacklist { + wwid 435456... + } + +To setup aliases to multipath devices add entries like these +to /etc/multipath.conf + + multipaths { + multipath { + wwid "534535..." + alias "storage0" + } + } + +Use the following to reload the configuration + + multipath -r + +Then the device will be available under /dev/mapper/storage0 +You can create partitions on this like this + + gdisk /dev/mapper/storage0 + +To make an xfs filesystem on the first partition + + mkfs.xfs /dev/mapper/storage0-part1 + +See the manpages for more details. diff --git a/system/multipath-tools/doinst.sh b/system/multipath-tools/doinst.sh new file mode 100644 index 0000000000..b845f6b1b1 --- /dev/null +++ b/system/multipath-tools/doinst.sh @@ -0,0 +1,26 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.multipathd.new +preserve_perms etc/multipath.conf.new diff --git a/system/multipath-tools/libmpathpersist.remove.empty.dir.patch.gz b/system/multipath-tools/libmpathpersist.remove.empty.dir.patch.gz Binary files differdeleted file mode 100644 index b288f4f235..0000000000 --- a/system/multipath-tools/libmpathpersist.remove.empty.dir.patch.gz +++ /dev/null diff --git a/system/multipath-tools/multipath-tools.SlackBuild b/system/multipath-tools/multipath-tools.SlackBuild index e4428d9217..7148af368b 100644 --- a/system/multipath-tools/multipath-tools.SlackBuild +++ b/system/multipath-tools/multipath-tools.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2014 Nikos Yotis <nikos.giotis@gmail.com> +# Copyright 2014,2018 Nikos Yotis <nikos.giotis@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -19,8 +19,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 22-Oct-2018 +# Updated for version 0.7.8 + PRGNAM=multipath-tools -VERSION=${VERSION:-0.5.0} +VERSION=${VERSION:-0.7.8} +SRCNAM="index.html?p=multipath-tools%2F.git;a=snapshot;sf=tgz;h=refs%2Ftags%2F$VERSION" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,13 +61,11 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$SRCNAM cd $PRGNAM-$VERSION -# Patches for slackware compatibility -zcat $CWD/multipathd.slackware.patch.gz | patch -p0 --verbose -zcat $CWD/rcdir.patch.gz | patch -p0 --verbose -zcat $CWD/libmpathpersist.remove.empty.dir.patch.gz | patch -p0 --verbose +# Patch for slackware compatibility +cat $CWD/0002-multipathd-add-ncurses-to-linker.patch | patch -p0 --verbose chown -R root:root . find -L . \ @@ -75,24 +77,36 @@ find -L . \ # Build cd $TMP/$PRGNAM-$VERSION CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make -mkdir -p $PKG/usr/bin make install DESTDIR=$PKG +# Move everything in place +mv $PKG/usr/lib/ $PKG/ + +# Manpages mv $PKG/usr/share/man $PKG/usr/ +rm -rf $PKG/usr/share 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 -rm -rf $PKG/usr/share -( - cd $PKG/lib${LIBDIRSUFFIX} - ln -sf libmpathpersist.so.0 libmpathpersist.so -) +# init script +mkdir -p $PKG/etc/rc.d +cat $CWD/rc.multipathd.new > $PKG/etc/rc.d/rc.multipathd.new +chmod 755 $PKG/etc/rc.d/rc.multipathd.new + +# default config +cat $CWD/multipath.conf.new > $PKG/etc/multipath.conf.new +chmod 644 $PKG/etc/multipath.conf.new +# Docs mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING README README.alua $CWD/README.SLACKWARE \ + $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:-tgz} diff --git a/system/multipath-tools/multipath-tools.info b/system/multipath-tools/multipath-tools.info index febf070bee..54ce6d7b3a 100644 --- a/system/multipath-tools/multipath-tools.info +++ b/system/multipath-tools/multipath-tools.info @@ -1,10 +1,10 @@ PRGNAM="multipath-tools" -VERSION="0.5.0" +VERSION="0.7.8" HOMEPAGE="http://christophe.varoqui.free.fr/" -DOWNLOAD="http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-0.5.0.tar.bz2" -MD5SUM="faf261d4cc717bf4c979557dc7bf5f52" +DOWNLOAD="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;sf=tgz;h=refs/tags/0.7.8" +MD5SUM="f8d0faed2913bc725c107b4f84f22a3a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="liburcu" MAINTAINER="Nikos Giotis" -EMAIL="nikos.giotis@gmail.com"
\ No newline at end of file +EMAIL="nikos.giotis@gmail.com" diff --git a/system/multipath-tools/multipath.conf.new b/system/multipath-tools/multipath.conf.new new file mode 100644 index 0000000000..8cdf633c2b --- /dev/null +++ b/system/multipath-tools/multipath.conf.new @@ -0,0 +1,4 @@ +defaults { + find_multipaths yes +} + diff --git a/system/multipath-tools/multipathd.slackware.patch.gz b/system/multipath-tools/multipathd.slackware.patch.gz Binary files differdeleted file mode 100644 index 3d62dd673d..0000000000 --- a/system/multipath-tools/multipathd.slackware.patch.gz +++ /dev/null diff --git a/system/multipath-tools/rc.multipathd.new b/system/multipath-tools/rc.multipathd.new new file mode 100644 index 0000000000..e62690fa8f --- /dev/null +++ b/system/multipath-tools/rc.multipathd.new @@ -0,0 +1,44 @@ +#!/bin/sh + +# This is usually needed for detecting multipaths. The default 5 seems +# to work, but adjustment per case may be needed. +SLEEP=5 + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/sbin/multipathd + +test -x $DAEMON || exit 0 + +case "$1" in + start) + pgrep -f $DAEMON >/dev/null + if [ $? = 0 ]; then + echo 'multipathd is already running' + exit 1 + fi + echo -n "Starting multipath daemon: $DAEMON ." + $DAEMON + echo -n '.'; sleep $SLEEP; echo -n '. ' + pgrep -f $DAEMON >/dev/null + if [ $? = 0 ]; then + echo "ok" + else + echo "error!" + fi + ;; + stop) + echo -n "Stopping multipath daemon: multipathd ... " + $DAEMON shutdown || echo "daemon is not running" + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/multipathd {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 + diff --git a/system/multipath-tools/rcdir.patch.gz b/system/multipath-tools/rcdir.patch.gz Binary files differdeleted file mode 100644 index 9547e76335..0000000000 --- a/system/multipath-tools/rcdir.patch.gz +++ /dev/null diff --git a/system/multipath-tools/slack-desc b/system/multipath-tools/slack-desc index 7d06cfb209..717e2c511c 100644 --- a/system/multipath-tools/slack-desc +++ b/system/multipath-tools/slack-desc @@ -10,9 +10,9 @@ multipath-tools: multipath-tools (Utilities to drive Device Mapper multipath dri multipath-tools: multipath-tools: This project is used to drive the Device Mapper multipathing driver. multipath-tools: +multipath-tools: Home: http://christophe.varoqui.free.fr/ multipath-tools: multipath-tools: -multipath-tools: Home: http://christophe.varoqui.free.fr/ multipath-tools: multipath-tools: multipath-tools: diff --git a/system/multitail/multitail.SlackBuild b/system/multitail/multitail.SlackBuild index 194ac15974..9a6f57a9db 100644 --- a/system/multitail/multitail.SlackBuild +++ b/system/multitail/multitail.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=multitail -VERSION=${VERSION:-6.4.2} +VERSION=${VERSION:-6.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -76,8 +76,9 @@ mkdir -p $PKG/usr/{bin,doc,man/man1} $PKG/etc $PKG/install # Compile and Install CFLAGS="$SLKCFLAGS" make -make install DESTDIR=$PKG -strip --strip-unneeded $PKG/usr/bin/multitail +install -m 755 multitail $PKG/usr/bin/multitail +install -m 644 multitail.1 $PKG/usr/man/man1/multitail.1 +install -m 655 multitail.conf $PKG/etc/multitail.conf.new 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 diff --git a/system/multitail/multitail.info b/system/multitail/multitail.info index aef03180f6..0c50653855 100644 --- a/system/multitail/multitail.info +++ b/system/multitail/multitail.info @@ -1,8 +1,8 @@ PRGNAM="multitail" -VERSION="6.4.2" +VERSION="6.5.0" HOMEPAGE="http://www.vanheusden.com/multitail/" -DOWNLOAD="http://www.vanheusden.com/multitail/multitail-6.4.2.tgz" -MD5SUM="a0959f7b2385061080712afd8ae6e33d" +DOWNLOAD="http://www.vanheusden.com/multitail/multitail-6.5.0.tgz" +MD5SUM="21e692309babbbb5669ef1b17288ee0a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/musl/README b/system/musl/README index cb2417aa99..a72afb60b5 100644 --- a/system/musl/README +++ b/system/musl/README @@ -1,5 +1,6 @@ -Musl is a C standard library that strives to be lightweight, fast, -simple, free, and correct. +Musl is a C standard library that is lightweight, fast, simple, free, +and strives to be correct in the sense of standards-conformance and +safety. Musl includes a wrapper, musl-gcc, for building files linked against musl. It also provides musl-ldd to print the shared libraries loaded by the diff --git a/system/musl/musl.SlackBuild b/system/musl/musl.SlackBuild index 8a3162912d..99ae51d447 100644 --- a/system/musl/musl.SlackBuild +++ b/system/musl/musl.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for musl # Copyright 2014 Weldon Goree <weldon@langurwallah.org> +# Copyright 2019 - 2020 Johannes Schoepfer, Germany # All rights reserved # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=musl -VERSION=${VERSION:-1.1.16} +VERSION=${VERSION:-1.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/musl/musl.info b/system/musl/musl.info index 43fefb326e..827759d98e 100644 --- a/system/musl/musl.info +++ b/system/musl/musl.info @@ -1,10 +1,10 @@ PRGNAM="musl" -VERSION="1.1.16" -HOMEPAGE="http://www.musl-libc.org" -DOWNLOAD="http://www.musl-libc.org/releases/musl-1.1.16.tar.gz" -MD5SUM="ac52ccaec6b06ab0f289d37e8436859b" +VERSION="1.2.0" +HOMEPAGE="https://musl.libc.org/" +DOWNLOAD="https://musl.libc.org/releases/musl-1.2.0.tar.gz" +MD5SUM="5f13b13501d6ab7c2e06c69484e5a7fc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Weldon Goree" -EMAIL="weldon@langurwallah.org" +MAINTAINER="Johannes Schoepfer" +EMAIL="slackbuilds@schoepfer.info" diff --git a/system/musl/slack-desc b/system/musl/slack-desc index fc4ef7f2d0..a52df43f85 100644 --- a/system/musl/slack-desc +++ b/system/musl/slack-desc @@ -12,7 +12,7 @@ musl: The musl C library. A library that attempts to be fast, simple, and musl: correct. Use the musl-gcc wrapper to build against musl, and the musl: musl-ldd wrapper to check linkages on the binaries you build. musl: -musl: http://www.musl-libc.org/ +musl: https://www.musl-libc.org/ musl: musl: musl: diff --git a/system/ncdu/ncdu.SlackBuild b/system/ncdu/ncdu.SlackBuild index 0dd77d2107..82ad23caed 100644 --- a/system/ncdu/ncdu.SlackBuild +++ b/system/ncdu/ncdu.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for ncdu # -# Copyright 2009-2018 Erik W. Hanson, Minneapolis, MN, USA +# Copyright 2009-2020 Erik W. Hanson, Minneapolis, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ncdu -VERSION=${VERSION:-1.13} +VERSION=${VERSION:-1.15.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/ncdu/ncdu.info b/system/ncdu/ncdu.info index efd54bd974..63f5b81f3a 100644 --- a/system/ncdu/ncdu.info +++ b/system/ncdu/ncdu.info @@ -1,8 +1,8 @@ PRGNAM="ncdu" -VERSION="1.13" +VERSION="1.15.1" HOMEPAGE="https://dev.yorhel.nl/ncdu/" -DOWNLOAD="https://dev.yorhel.nl/download/ncdu-1.13.tar.gz" -MD5SUM="67239592ac41f42290f52ab89ff198be" +DOWNLOAD="https://dev.yorhel.nl/download/ncdu-1.15.1.tar.gz" +MD5SUM="af25aa8462a6f29c8a0c4d3d83d186e7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/netatop/netatop.SlackBuild b/system/netatop/netatop.SlackBuild index 5461d728a3..b49b105733 100644 --- a/system/netatop/netatop.SlackBuild +++ b/system/netatop/netatop.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for netatop -# Copyright 2012-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2012-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=netatop -VERSION=${VERSION:-1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} diff --git a/system/netatop/netatop.info b/system/netatop/netatop.info index 07c3233aea..9de4b23775 100644 --- a/system/netatop/netatop.info +++ b/system/netatop/netatop.info @@ -1,8 +1,8 @@ PRGNAM="netatop" -VERSION="1.0" +VERSION="2.0" HOMEPAGE="https://www.atoptool.nl/" -DOWNLOAD="https://www.atoptool.nl/download/netatop-1.0.tar.gz" -MD5SUM="65d5e2c714cbebb256ffa13f48eef5f3" +DOWNLOAD="https://www.atoptool.nl/download/netatop-2.0.tar.gz" +MD5SUM="b7f25ea12c2c47a41500a3705c3924e7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/netdata/README b/system/netdata/README index f4f9eb147c..6abf607387 100644 --- a/system/netdata/README +++ b/system/netdata/README @@ -11,7 +11,7 @@ Optional dependencies: netdata daemon will run under netdata user and group. You need to create the following user/group before building: groupadd -g 338 netdata -useradd -u 338 -g 338 -c \"netdata user\" -s /bin/bash netdata +useradd -u 338 -g 338 -c "netdata user" -s /bin/bash netdata If you want to run this daemon on every boot: chmod +x /etc/rc.d/rc.netdata diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild index a3b5ab56bf..ff9a31865c 100644 --- a/system/netdata/netdata.SlackBuild +++ b/system/netdata/netdata.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for netdata -# Copyright 2017-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=netdata -VERSION=${VERSION:-1.11.1} +VERSION=${VERSION:-1.29.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -88,6 +88,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/9644483b6069bb474942df5afc1156968a99d7b2.patch + autoreconf -fiv CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -113,7 +115,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mkdir -p $PKG/var/lock/subsys/ +mkdir -p $PKG/var/lock/subsys/ $PKG/var/cache/netdata $PKG/var/lib/netdata $PKG/var/log/netdata # set permission chown -R $NETDATA_USER:$NETDATA_GROUP $PKG/var/lib/netdata diff --git a/system/netdata/netdata.info b/system/netdata/netdata.info index 9d29117b8f..95ea1f6c42 100644 --- a/system/netdata/netdata.info +++ b/system/netdata/netdata.info @@ -1,10 +1,10 @@ PRGNAM="netdata" -VERSION="1.11.1" +VERSION="1.29.3" HOMEPAGE="https://github.com/netdata/netdata" -DOWNLOAD="https://github.com/netdata/netdata/archive/v1.11.1/netdata-1.11.1.tar.gz" -MD5SUM="cd4a0836e8688ac5d5da5b4a98e9329b" +DOWNLOAD="https://github.com/netdata/netdata/archive/v1.29.3/netdata-1.29.3.tar.gz" +MD5SUM="9bb47600963c001c7de828e7e2e135a4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="PyYAML" +REQUIRES="PyYAML libuv" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/system/newLd/README b/system/newLd/README new file mode 100644 index 0000000000..77e1c22c6a --- /dev/null +++ b/system/newLd/README @@ -0,0 +1,7 @@ +newLD is a new version of ld linker from binutils. +It is necessary for build some advanced libraries +(libqb as an examlpe) + +To use it set +PATH=/usr/lib$LIBDIRSUFFIX/binutils$VERSION/bin:\\ +$PATH diff --git a/system/newLd/newLd.SlackBuild b/system/newLd/newLd.SlackBuild new file mode 100644 index 0000000000..273ea5546c --- /dev/null +++ b/system/newLd/newLd.SlackBuild @@ -0,0 +1,258 @@ +#!/bin/sh + +# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# 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. + +# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port. + +# Adapted by Jan F. Chadima <jfch@jagda.eu> for use as slackport in Slackware 14.2 + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=newLd +VERSION=${VERSION:-2.33.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + *) export ARCH=$MARCH ;; + esac +fi + +# Not yet in slackbuilds +## 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.txz" +# exit 0 +#fi + +# Set to ld.gold or ld.bfd: +DEFAULT_LD=ld.bfd + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + # The config option below is currently needed to compile on x86: + WERROR="--enable-werror=no" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + # The config option below is currently needed to compile on x86: + WERROR="--enable-werror=no" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +set -e + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf binutils-$VERSION +tar xvf $CWD/binutils-$VERSION.tar.?z +cd binutils-$VERSION + +# Various upstream patches: +zcat $CWD/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.25-version.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.25-set-long-long.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.24-ldforcele.patch.gz | patch -p1 --verbose +zcat $CWD/patches/binutils-2.25.1-cleansweep.patch.gz | patch -p2 --verbose + +# Export the demangle.h header file: +zcat $CWD/patches/binutils.export.demangle.h.diff.gz | patch -p1 --verbose +# Don't check to see if "config.h" was included in the installed headers: +zcat $CWD/patches/binutils.no-config-h-check.diff.gz | patch -p1 --verbose + +# Set %version to something halfway meaningful: +sed -i -e 's/%''{release}/slack15/g' bfd/Makefile{.am,.in} + +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 {} \; + +# End of preparations +if echo "$*" | grep -qw -- --prep ; then + exit 0 +fi + +PREFIX=/usr/lib$LIBDIRSUFFIX/binutils$VERSION + +# Build for an x86 glibc2-based Linux system: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=$PREFIX \ + --libdir=$PREFIX/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --with-docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-compressed-debug-sections \ + --enable-multilib \ + --enable-64-bit-bfd \ + --enable-plugins \ + --enable-threads \ + --enable-targets=i386-efi-pe,${TARGET} \ + --enable-ld=default \ + --enable-initfini-array \ + $WERROR \ + --build=$TARGET + + +# Use "tooldir=/usr" to avoid internal references to the /usr/${TARGET}/ +# directory. While binutils won't actually use that directory after this, +# we'll still create it since some people have made local use of it. +# Note that this will place ldscripts in /usr/lib, even on $ARCH that +# use LIBDIRSUFFIX=64. According to Ian Lance Taylor, the ldscripts have +# been built into the linker for quite some time and the ones in the +# filesystem aren't actually loaded. For the most part they are now +# documentation and it doesn't matter where they reside. +make clean +make tooldir=$PREFIX +make tooldir=$PREFIX install DESTDIR=$PKG + +# Using tooldir=/usr also makes the /usr/${TARGET}/lib${LIBDIRSUFFIX} +# directory obsolete, and the build will no longer install it. But since +# some people might be making local use of that directory, we'll install +# it anyway: +mkdir -p $PKG/$PREFIX/${TARGET}/lib${LIBDIRSUFFIX} +# Same with /usr/${TARGET}/bin: +mkdir -p $PKG/$PREFIX/${TARGET}/bin + +# Don't ship development files: +rm -f $PKG/$PREFIX/lib${LIBDIRSUFFIX}/*.{l,}a +rmdir $PKG/$PREFIX/lib64 || true +rm -rf $PKG/$PREFIX/include + +# Delete unnecessary stuff +rm -rf $PKG/$PREFIX/$ARCH-slackware-linux + +# Delete unwanted programs +rm -f $PKG/$PREFIX/bin/{addr2line,ar,as,c++filt,dlltool,dllwrap,elfedit,gprof,ld.bfd,nm,objcopy,objdump,ranlib,readelf,size,strings,strip,windmc,windres} + +mkdir -p $PKG/usr/bin +cat << EOF > $PKG/usr/bin/ld$VERSION +#!/bin/sh + +exec $PREFIX/bin/ld "\$@" +EOF +chmod +x $PKG/usr/bin/ld$VERSION + +# COMMENTED OUT, since a valid use case was provided for windres on Linux. +# None of these tools are very large, and unless they can be shown to be +# non-functional, there's no good reason to exclude them. +## Remove Windows specific tools / docs (if they exist): +#rm -f $PKG/usr/bin/{dlltool,nlmconv,windres,windmc} +#rm -f $PKG/usr/man/man1/{dlltool,nlmconv,windres,windmc}* + +# DELETE both +# Add a symlink since binutils's version of strings used to be called +# "strings-GNU" on Slackware, and it's possible that people have scripts +# that use that name: +#( cd $PKG/$PREFIX/bin ; ln -sf strings strings-GNU ) + +## OBSOLETE, since we're using tooldir=/usr. But we'll keep this cruft as a +## reference until we get the all clear on the tooldir= changes. :-) +## Move ldscripts to /usr/lib${LIBDIRSUFFIX}, and then put symlinks in place +#mv $PKG/usr/${TARGET}/lib/ldscripts $PKG/usr/lib${LIBDIRSUFFIX} +#( cd $PKG/usr/${TARGET} +# ln -s /usr/lib${LIBDIRSUFFIX}/ldscripts lib/ldscripts +# for FILE in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip ; do +# if [ -r "/usr/bin/$FILE" ]; then +# rm -f bin/$FILE +# ln -s /usr/bin/$FILE bin/$FILE +# fi +# done +#) + +# Only one linker provided +# If the requested default linker is present, make it the default: +# Set the link differently on the system to change the default at runtime. +#if [ -r $PKG/$PREFIX/bin/$DEFAULT_LD ]; then +# ( cd $PKG/$PREFIX/bin ; rm -f ld ; ln -sf $DEFAULT_LD ld ) +#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 + +# Remove some unneeded man pages, and then compress the rest +(cd $PKG/usr/man/man1; mv ld.1 ld$VERSION.1) +rm -f $PKG/usr/man/man1/{addr2line,ar,as,c++filt,dlltool,dllwrap,elfedit,gprof,nm,objcopy,objdump,ranlib,readelf,size,strings,strip,windmc,windres}.1 +( cd $PKG/usr/man + find . -type f -exec gzip -9 {} \+ + for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +) + +# Compress info pages +(cd $PKG/usr/info; mv ld.info ld$VERSION.info) +rm -f $PKG/usr/info/{as,nm,bfd,binutils,gprof}.info +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/* + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp \ + COPYING* ChangeLog.linux MAI* README* \ + $PKG/usr/doc/$PRGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/$PRGNAM-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +chown -R root:root $PKG/$PREFIX/doc/binutils-$VERSION + +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:-tgz} diff --git a/system/newLd/newLd.info b/system/newLd/newLd.info new file mode 100644 index 0000000000..c6aad4eb25 --- /dev/null +++ b/system/newLd/newLd.info @@ -0,0 +1,10 @@ +PRGNAM="newLd" +VERSION="2.33.1" +HOMEPAGE="https://www.gnu.org/software/binutils/" +DOWNLOAD="ftp://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.lz" +MD5SUM="f4e7e023664f087b3017fc42955ebb46" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jan F. Chadima" +EMAIL="jfch@jagda.eu" diff --git a/system/newLd/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz b/system/newLd/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz Binary files differnew file mode 100644 index 0000000000..cfa3d0a772 --- /dev/null +++ b/system/newLd/patches/binutils-2.20.51.0.10-copy-osabi.patch.gz diff --git a/system/newLd/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz b/system/newLd/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz Binary files differnew file mode 100644 index 0000000000..5af120236b --- /dev/null +++ b/system/newLd/patches/binutils-2.20.51.0.10-sec-merge-emit.patch.gz diff --git a/system/newLd/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz b/system/newLd/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz Binary files differnew file mode 100644 index 0000000000..7f2dc3fee3 --- /dev/null +++ b/system/newLd/patches/binutils-2.20.51.0.2-libtool-lib64.patch.gz diff --git a/system/newLd/patches/binutils-2.24-ldforcele.patch.gz b/system/newLd/patches/binutils-2.24-ldforcele.patch.gz Binary files differnew file mode 100644 index 0000000000..0c2ec1f78b --- /dev/null +++ b/system/newLd/patches/binutils-2.24-ldforcele.patch.gz diff --git a/system/newLd/patches/binutils-2.25-set-long-long.patch.gz b/system/newLd/patches/binutils-2.25-set-long-long.patch.gz Binary files differnew file mode 100644 index 0000000000..b248e104cd --- /dev/null +++ b/system/newLd/patches/binutils-2.25-set-long-long.patch.gz diff --git a/system/newLd/patches/binutils-2.25-version.patch.gz b/system/newLd/patches/binutils-2.25-version.patch.gz Binary files differnew file mode 100644 index 0000000000..3ff1845318 --- /dev/null +++ b/system/newLd/patches/binutils-2.25-version.patch.gz diff --git a/system/newLd/patches/binutils-2.25.1-cleansweep.patch.gz b/system/newLd/patches/binutils-2.25.1-cleansweep.patch.gz Binary files differnew file mode 100644 index 0000000000..f67e1cbf2d --- /dev/null +++ b/system/newLd/patches/binutils-2.25.1-cleansweep.patch.gz diff --git a/system/newLd/patches/binutils.export.demangle.h.diff.gz b/system/newLd/patches/binutils.export.demangle.h.diff.gz Binary files differnew file mode 100644 index 0000000000..e16ce38af4 --- /dev/null +++ b/system/newLd/patches/binutils.export.demangle.h.diff.gz diff --git a/system/newLd/patches/binutils.no-config-h-check.diff.gz b/system/newLd/patches/binutils.no-config-h-check.diff.gz Binary files differnew file mode 100644 index 0000000000..0d0ddaa922 --- /dev/null +++ b/system/newLd/patches/binutils.no-config-h-check.diff.gz diff --git a/system/newLd/slack-desc b/system/newLd/slack-desc new file mode 100644 index 0000000000..f61784443d --- /dev/null +++ b/system/newLd/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 ':'. + + |-----handy-ruler------------------------------------------------------| +newLd: newLd (new ld linker) +newLd: +newLd: New version of the ld linker. It have some newer features, +newLd: some bug repaired and some else added. +newLd: +newLd: It is necessary to link programs with libqb. +newLd: +newLd: +newLd: +newLd: +newLd: diff --git a/system/nmtree/README b/system/nmtree/README new file mode 100644 index 0000000000..db6be9cfd4 --- /dev/null +++ b/system/nmtree/README @@ -0,0 +1,7 @@ +nmtree is a utility for mapping and checking directory hierarchies. +This version is ported from NetBSD. + +The binary and manpages will install as nmtree instead of the default +mtree because libarchive provides an mtree(5) manpage. +Regardless, the nmtree manpages will still refer to the program as +mtree. diff --git a/system/nmtree/nmtree.SlackBuild b/system/nmtree/nmtree.SlackBuild new file mode 100644 index 0000000000..9a24c1307e --- /dev/null +++ b/system/nmtree/nmtree.SlackBuild @@ -0,0 +1,114 @@ +#!/bin/sh + +# Slackware build script for nmtree + +# @(#)nmtree.SlackBuild 1.1 20/10/24 06:21:09 + +# Copyright 2020 Pomfland +# 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. + +PRGNAM=nmtree +VERSION=${VERSION:-1.0.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +./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 \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 + +# maintenance work: libarchive provides its own mtree(5) manpage for some unholy +# reason so we're going to just install the whole package as nmtree +# we should also purge documentation it installs on its own +mv -v $PKG/usr/bin/{m,nm}tree +mv -v $PKG/usr/man/man5/{m,nm}tree.5.gz +mv -v $PKG/usr/man/man8/{m,nm}tree.8.gz +rm -r $PKG/usr/share # yes, all of it is worthless + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGES README \ + $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:-tgz} diff --git a/system/nmtree/nmtree.info b/system/nmtree/nmtree.info new file mode 100644 index 0000000000..9b14d8fc3c --- /dev/null +++ b/system/nmtree/nmtree.info @@ -0,0 +1,10 @@ +PRGNAM="nmtree" +VERSION="1.0.0" +HOMEPAGE="https://github.com/archiecobbs/nmtree" +DOWNLOAD="https://github.com/archiecobbs/nmtree/archive/1.0.0/nmtree-1.0.0.tar.gz" +MD5SUM="e1d63ab0eec7b0674ab38983938394fa" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libnbcompat" +MAINTAINER="Pomfland" +EMAIL="pomfland@tfwno.gf" diff --git a/system/nmtree/slack-desc b/system/nmtree/slack-desc new file mode 100644 index 0000000000..645771c912 --- /dev/null +++ b/system/nmtree/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------------------------------------------------------| +nmtree: nmtree (a port of NetBSD's mtree utility to Linux) +nmtree: +nmtree: nmtree is a utility for mapping and checking directory hierarchies. +nmtree: This version is ported from NetBSD. +nmtree: +nmtree: Homepage: https://github.com/archiecobbs/nmtree +nmtree: +nmtree: +nmtree: +nmtree: +nmtree: diff --git a/system/nnn/nnn.SlackBuild b/system/nnn/nnn.SlackBuild index 9266c72771..8e330a69bb 100644 --- a/system/nnn/nnn.SlackBuild +++ b/system/nnn/nnn.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nnn -# Copyright 2017 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2017-2020 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nnn -VERSION=${VERSION:-1.5} +VERSION=${VERSION:-3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/nnn/nnn.info b/system/nnn/nnn.info index 9bf93b3dff..ff9ad707c3 100644 --- a/system/nnn/nnn.info +++ b/system/nnn/nnn.info @@ -1,8 +1,8 @@ PRGNAM="nnn" -VERSION="1.5" +VERSION="3.0" HOMEPAGE="https://github.com/jarun/nnn" -DOWNLOAD="https://github.com/jarun/nnn/archive/v1.5/nnn-1.5.tar.gz" -MD5SUM="9969dc74c8baacecf2bc77f19fd21cc3" +DOWNLOAD="https://github.com/jarun/nnn/archive/v3.0/nnn-3.0.tar.gz" +MD5SUM="5550ba49f52b65f4097c1ac353b7ae64" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/nologind/slack-desc b/system/nologind/slack-desc index 0e808b45f6..061260f7f6 100644 --- a/system/nologind/slack-desc +++ b/system/nologind/slack-desc @@ -13,7 +13,7 @@ nologind: Used as a compatibility layer for applications that require nologind: (parts of) the org.freedesktop.login1.Manager D-Bus system service. nologind: nologind: -nologind: nologind was written by Ole-André Rodlie +nologind: nologind was written by Ole-Andre Rodlie nologind: nologind: Homepage: https://github.com/rodlie/nologind nologind: diff --git a/system/noto-emoji/noto-emoji.SlackBuild b/system/noto-emoji/noto-emoji.SlackBuild index a3c8bc25c8..ed43f6653b 100644 --- a/system/noto-emoji/noto-emoji.SlackBuild +++ b/system/noto-emoji/noto-emoji.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for noto-emoji -# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=noto-emoji -SRCVERSION=${VERSION:-2018-08-10-unicode11} -VERSION=${VERSION:-$(echo "$SRCVERSION" | cut -d- -f-3 | tr -d -)} +VERSION=${VERSION:-20200916} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCVERSION=${SRCVERSION:-2020-09-16-unicode13_1} + ARCH=noarch CWD=$(pwd) @@ -52,9 +53,6 @@ find -L . \ install -d $PKG/usr/share/fonts/TTF/ -# https://github.com/googlei18n/noto-emoji/tree/153e1d4c026c124fbac6ee93e559b5df375f24f5#bw-emoji-font -# skip installing b/w emoji font (colour font is rendered in black and white on -# slack anyway) install -m644 fonts/NotoColorEmoji.ttf $PKG/usr/share/fonts/TTF/ mkdir -p $PKG/etc/fonts/conf.avail/ diff --git a/system/noto-emoji/noto-emoji.info b/system/noto-emoji/noto-emoji.info index 52a76607a4..bf317e605a 100644 --- a/system/noto-emoji/noto-emoji.info +++ b/system/noto-emoji/noto-emoji.info @@ -1,9 +1,9 @@ PRGNAM="noto-emoji" -VERSION="20180810" +VERSION="20200916" HOMEPAGE="https://www.google.com/get/noto/help/emoji/" -DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2018-08-10-unicode11/noto-emoji-2018-08-10-unicode11.tar.gz \ +DOWNLOAD="https://github.com/googlei18n/noto-emoji/archive/v2020-09-16-unicode13_1/noto-emoji-2020-09-16-unicode13_1.tar.gz \ https://gist.githubusercontent.com/hexchain/47f550472e79d0805060/raw/d9ecd5a5fcb901bcfb75115f4b602f6c1d3020c1/51-noto-color-emoji.conf.xml" -MD5SUM="817bc32a0c86e4859f4d0c605ba774d4 \ +MD5SUM="c32147c255b366c28a2c4d702e2cfda2 \ e2d9cf0460fa0315a8da5d8dedacf702" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/nsca-ng/nsca-ng.info b/system/nsca-ng/nsca-ng.info index 073782b345..c6efebaea2 100644 --- a/system/nsca-ng/nsca-ng.info +++ b/system/nsca-ng/nsca-ng.info @@ -1,7 +1,7 @@ PRGNAM="nsca-ng" VERSION="1.5" -HOMEPAGE="http://www.nsca-ng.org/" -DOWNLOAD="http://www.nsca-ng.org/download/nsca-ng-1.5.tar.gz" +HOMEPAGE="https://github.com/weiss/nsca-ng" +DOWNLOAD="http://slackware.uk/sbosrcarch/by-md5/0/a/0a8fe1c635dd053430c7301c1721eecb/nsca-ng-1.5.tar.gz" MD5SUM="0a8fe1c635dd053430c7301c1721eecb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/numactl/numactl.SlackBuild b/system/numactl/numactl.SlackBuild index 4d729d9f3b..c859de402a 100644 --- a/system/numactl/numactl.SlackBuild +++ b/system/numactl/numactl.SlackBuild @@ -5,7 +5,7 @@ # Written by Wainamoinen <wainamoinen@gmail.com> PRGNAM=numactl -VERSION=${VERSION:-2.0.10} +VERSION=${VERSION:-2.0.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,7 +51,6 @@ 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 {} \; -./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -74,8 +73,7 @@ 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 CHANGES README $PKG/usr/doc/$PRGNAM-$VERSION - +cp -ar INSTALL.md README.md test $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/numactl/numactl.info b/system/numactl/numactl.info index 326390a7f5..1cda19b3ff 100644 --- a/system/numactl/numactl.info +++ b/system/numactl/numactl.info @@ -1,8 +1,8 @@ PRGNAM="numactl" -VERSION="2.0.10" -HOMEPAGE="http://oss.sgi.com/projects/libnuma/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/numactl-2.0.10.tar.gz" -MD5SUM="682c38305b2596967881f3d77bc3fc9c" +VERSION="2.0.13" +HOMEPAGE="https://github.com/numactl/numactl" +DOWNLOAD="https://github.com/numactl/numactl/releases/download/v2.0.13/numactl-2.0.13.tar.gz" +MD5SUM="9a9a94bfebf6c9c67defeedc9795e568" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/nvidia-driver/README b/system/nvidia-driver/README index 78d093293b..9f87edbdff 100644 --- a/system/nvidia-driver/README +++ b/system/nvidia-driver/README @@ -1,62 +1,67 @@ This is the proprietary binary video driver from NVidia for the X.Org -X-server. This package does not include the kernel-module - it is a part -of the nvidia-kernel package at SlackBuilds.org. +X-server. This package does not include the kernel-module - it is +part of the nvidia-kernel package at SlackBuilds.org. -NOTE: 64-bit x86_64 support ONLY for Slackware64. For x86 32-bit support, -use nvidia-legacy390-{driver,kernel} +NOTE: This driver is ONLY for Slackware64. For x86 32-bit support, use +nvidia-legacy390-{driver,kernel}. -Installing the 32-bit compatibility libraries is available: if desired, do: +Installing the 32-bit compatibility libraries is available: +if desired, do: COMPAT32="yes" ./nvidia-driver.SlackBuild + +If you plan to test this buildscript on current/15.0, do: -GLVND GLX client libraries are now the default. If these cause any -compatibility issues with older GLX sofware, either upgrade your software -or try: - GLVND="no" ./nvidia-driver.SlackBuild - -Several useful utilities are included: nvidia-xsettings, nvidia-smi, and -nvidia-settings. Please refer to the Nvidia documentation and man pages -for details and usage. - -For CUDA/OpenCL to work after reboot, and for utilites such as nvidia-smi, -you might need to include the following line in your /etc/rc.d/rc.local: --------------8<--------------- -# Create missing nvidia device nodes after reboot -/usr/bin/nvidia-modprobe -c 0 -u -------------->8--------------- - -Since this nvidia-driver conflicts with some files of xorg, it's a bit -complex to install/uninstall the driver. However, installation of the -nvidia-driver package itself backs up the conflicting files and puts -the nvidia-specific files into place. - -Included is a script called nvidia-switch, which is used to switch from -the xorg driver to the nvidia driver, but it will not edit xorg.conf -for you; you have to do that manually. The nvidia-switch script is -installed to /usr/sbin. NOTE: Although nvidia-switch is aware of a -COMPAT32 environment, its use therein is not supported. - -Usage of nvidia-switch: - nvidia-switch --install <--> install the nvidia files and save the - stock xorg files. - nvidia-switch --remove <--> remove the nvidia files and symlinks and - restore the stock xorg files. - -You do NOT have to run nvidia-switch after installing the package. - -Before uninstalling or upgrading this package, it is important that -you execute 'nvidia-switch --remove', which will switch back to the -stock xorg files and remove all links created by nvidia-switch during -installation. If you forget to do this, you might have to do the switch -manually, since 'nvidia-switch --install' may fail, resulting in xorg -not working. Here are the affected files: - - /usr/lib[64]/libGL.so.1.2 - /usr/lib[64]/libGL.la - /usr/lib[64]/libGLESv1_CM.so.1.0.0 - /usr/lib[64]/libGLESv2.so.2.0.0 - /usr/lib[64]/libEGL.so.1.0.0 - /usr/lib[64]/xorg/modules/libwfb.so - /usr/lib[64]/xorg/modules/extensions/libglx.so - -Simply remove the dead nvidia symlinks and and reinstall the mesa and -xorg-server packages. See 'nvidia-switch --help'. + CURRENT="yes" ./nvidia-driver.SlackBuild + +This avoids stomping on the libglvnd libraries, plus it forces the +script to use the prebuilt nvidia-installer since it no longer builds +in current. As a consequence, this script may no longer work in a VM. + +This script now gives the option of installing the nvidia-persitenced +daemon. For details, see README.nvidia-persitenced. + +Several useful utilities are included: nvidia-xsettings, nvidia-smi, +and nvidia-settings. Please refer to the Nvidia documentation and +man pages for details and usage. + +For CUDA/OpenCL to work after reboot, and for utilites such as +nvidia-smi, you might need to include the following line in your +/etc/rc.d/rc.local (This is REQUIRED for nvidia-persistenced to work): + + # Create missing nvidia device nodes after reboot + if [ -x /usr/bin/nvidia-modprobe ]; then + /usr/bin/nvidia-modprobe -c 0 -u + fi + +Notes: +1. You still need to blacklist the open source nouveau driver. + This is easily done by installing xf86-video-nouveau-blacklist in + extra/xf86-video-nouveau-blacklist on the distibution DVD. + +2. If nvidia-driver is already installed, the script will abort with + a prompt to remove the existing driver (it is not necessary to + remove the kernel module). + +3. As of version 450.xx, Nvidia no longer includes libGL.la in their + distribution package. On 14.2 ONLY, nvidia-switch saves these + files to /var/log/nvidia/{32,64}: + + libGL{,ESv1_CM,ESv2}.la + libGL.so.1.2.0 + libGLESv1_cm.so.1.1.0 + libGLESv2.so.2.0.0 + + It then modifies the .la files in /usr/lib{,64} to point to the + nvidia versions of these libraries. If you want to revert back to + the open source drivers, run 'nvidia-switch --remove' to restore + the original mesa libraries, then 'removepkg nvidia-driver' + "should" work in most cases. If you forget to run + nvidia-switch --remove, just copy the original files saved in + /var/log/nvidia/{32,64} back to /usr/lib{,64} (don't forget to run + /sbin/ldconfig). (THIS STEP IS NOT NECESSARY ON CURRENT.) + +4. (IMPORTANT ON 14.2) When it comes time to remove this package with + 'removepkg' (or just about any other package for that matter), you + MUST run '/sbin/ldconfig' to restore any symlinks. This is due to + removepkg not running ldconfig after removing a package. + (This has been added to current/15.0.) diff --git a/system/nvidia-driver/README.nvidia-persistenced b/system/nvidia-driver/README.nvidia-persistenced new file mode 100644 index 0000000000..5dd841ff87 --- /dev/null +++ b/system/nvidia-driver/README.nvidia-persistenced @@ -0,0 +1,33 @@ +The NVIDIA Persistence Daemon is a userspace daemon on Linux to support +persistence of driver state across Cuda job runs. The daemon targets +all current Tesla, Quadro and GRID GPUs. For further information, see + +https://docs.nvidia.com/deploy/driver-persistence/index.html + +The driver now includes rc.nvidia-persistenced as an option. +While it can be run as root, it is more secure to run it as an +unpriveleged user, so we run it as user nvidia. + +To install it, Pass PERSISTENCED=yes to the script. It will create the +user and group nvidia, and install rc.nvidia-persistenced to /etc/rc.d. + +To activate the daemon, add the following to /etc/rc.d/local: + +# Start the nvidia-persistenced daemon: +if [ -x /etc/rc.d/rc.nvidia-persistenced ]; then + /etc/rc.d/rc.nvidia-persistenced start +fi + +and then 'chmod +x /etc/rc.d/rc.nvidia-persistenced' to make it +executable. + +Add the following to /etc/rc.d/rc.local_shutdown: + +# Stop the nvidia-persistenced daemon: +if [ -x /etc/rc.d/rc.nvidia-persistenced ]; then + /etc/rc.d/rc.nvidia-persistenced stop +fi + +NOTE: This may not work on all systems. If you encounter problems +with it, just 'chmod -x /etc/rc.d/rc.persistenced' and it will no +longer load. YMMV. diff --git a/system/nvidia-driver/changelog.txt b/system/nvidia-driver/changelog.txt deleted file mode 100644 index 82cc11e137..0000000000 --- a/system/nvidia-driver/changelog.txt +++ /dev/null @@ -1,41 +0,0 @@ -1.0 20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com> -1.1 10-APR-2011 updated to new version, testing 13.37rc4.6692 -1.2 27-MAY-2011 new version, allow multilib option, minor edits -1.2.1 20-JUN-2011 minor edits, thanks to Robby and Roberto -1.5 01-JUL-2011 new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility. -1.6 27-AUG-2011 version bump, minor edits -1.7 21-OCT-2011 version bump -1.8 24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W. -1.9 02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only -2.0 21-AUG-2012 new version (important security fix), missing vdpau-nvidia, dropped *.h -2.1 25-AUG-2012 new version -Long Lived Branch, fixed symlinks (per Das email) -2.2 22-NOV-2012 new version -Long Lived Branch. Updates: libs, apps -2.3 15-FEB-2013 new version -Long Lived Branch. -2.4 19-MAY-2013 new version -Long Lived Branch. -2.6 20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove -3.0 13-NOV-2013 new version (LLB), update libs -3.1 12-APR-2014 new version (LLB), update libs -3.2a 12-JUL-2014 new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm -3.3 20-NOV-2014 new version (LLB), update libs, fix nvidia-switch -3.4 11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES -4.0 07-FEB-2015 new long lived branch, version update, bug fixes -4.1 27-APR-2015 version update LLB, fix $VERSION usage -4.2 28-JUL-2015 version update LLB, bug fixes, clean-ups. -4.3 05-SEP-2015 version update LLB -4.4 13-DEC-2015 version update, X.Org 1.18 support -4.5 12-MAR-2016 version update LLB, symlink fixes, drop nvidia-installer, get ready for 14.2 -4.5a 26-MAR-2016 fixed broken symlinks -4.6 24-APR-2016 version update LLB, fix symlinks, added to version if multilib -4.7 31-APR-2016 version update LLB, added nvidia-installer, updated libs/symlinks -5.0 20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch -5.1 01-APR-2017 fix nvidia-switch lib names to prevent bad ldconfig symlinks on reboot -5.2 02-JUN-2017 version update LLB, refactor/debug scripts, use nvidia-installer -5.3 13-OCT-2017 version update LLB, bug fixes, update copyright -5.4 18-FEB-2018 version update LLB, updates, bug fix (thanks Leo) -5.5 25-MAR-2018 version update LLB -5.6 23-APR-2018 version update LLB, update symlinks, fix changelog formatting -5.7 28-MAY-2018 version update LLB -5.8 30-JUL-2018 version update LLB -5.9 06-SEP-2018 version update LLB -6.0 09-N0V-2018 version update LLB, 32-bit CPU support dropped, x86_64 COMPAT32 available. -6.1 22-Dec-2018 version update LLB, fix libglx symlink diff --git a/system/nvidia-driver/doinst.sh b/system/nvidia-driver/doinst.sh index 8ee62f049e..392c12adb9 100644 --- a/system/nvidia-driver/doinst.sh +++ b/system/nvidia-driver/doinst.sh @@ -2,5 +2,3 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications fi -./usr/sbin/nvidia-switch --install - diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 8649a1493a..e8e7cf0a8b 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -2,7 +2,9 @@ # Slackware build script for nvidia-driver -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, US +# Copyright 2020 Lenard Spencer, Orlando, FL, USA +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,12 +27,11 @@ # see changelog.txt PRGNAM=nvidia-driver -VERSION=${VERSION:-410.78} +VERSION=${VERSION:-460.67} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -GLVND=${GLVND:-yes} -# libglnvd may land in mesa and is Nvidia recommended +CURRENT=${CURRENT:-no} set -e @@ -58,6 +59,14 @@ else exit 1 fi +# There are a couple of unresolved issues with nvidia-installer, so we +# abort if an Nvidia driver is still installed: +if [ -x /usr/bin/nvidia-installer ]; then + echo -e "\n A previous Nvidia installation has been detected!" + echo -e " Please remove the installed driver and rerun this script.\n" + exit 1 +fi + SRCNAM=NVIDIA-Linux-$TARGET-${VERSION} # make a clean package directory tree @@ -67,8 +76,8 @@ mkdir -p $TMP $PKG $OUTPUT $PKG/install mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \ $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \ $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \ - $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/etc/X11/xorg.conf.d \ - $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64} \ + $PKG/usr/include/GL $PKG/etc/vulkan/{icd.d,implicit_layer.d} $PKG/etc/X11/xorg.conf.d \ + $PKG/etc/X11/glvnd/egl_vendor.d if [ "$COMPAT32" = "yes" ]; then mkdir -p $PKG/usr/lib/tls @@ -82,10 +91,8 @@ rm -rf nvidia-settings-$VERSION tar xvf $CWD/nvidia-settings-$VERSION.tar.bz2 rm -rf nvidia-xconfig-$VERSION tar xvf $CWD/nvidia-xconfig-$VERSION.tar.bz2 -rm -rf nvidia-modprobe-$VERSION.tar.bz2 +rm -rf nvidia-modprobe-$VERSION tar xvf $CWD/nvidia-modprobe-$VERSION.tar.bz2 -rm -rf nvidia-persistenced-$VERSION.tar.bz2 -tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2 sh $CWD/$SRCNAM.run --extract-only cd $SRCNAM chown -R root:root . @@ -97,6 +104,7 @@ find -L . \ # Compiling the various open source apps instead of using the precompiled binaries # Compiling nvidia-installer from source +if [ "$CURRENT" = "no" ]; then cd $TMP/nvidia-installer-$VERSION # Let's try to remove the conflicting files and GPU detection @@ -120,23 +128,14 @@ cd - # to the driver source tree for use mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM - -# Configure options -if [ "$GLVND" = "yes" ]; then - GLVNDOPT="--install-libglvnd --glvnd-glx-client --glvnd-egl-client" -else - GLVNDOPT="--no-install-libglvnd --no-glvnd-glx-client --no-glvnd-egl-client" fi -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then + +if [ "${COMPAT32}" = "yes" ]; then COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" - MULTI="_multi" + MULTI="_multilib" else - if [ ! "$ARCH" = "x86_64" ]; then - COMP32="" - else - COMP32="--no-install-compat32-libs" - MULTI="" - fi + COMP32="--no-install-compat32-libs" + MULTI="" fi # Install the binary libs using nvidia-installer compiled above @@ -157,17 +156,42 @@ cd $TMP/$SRCNAM --log-file-name=$PKG/var/log/nvidia-installer.log \ --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \ --no-nvidia-modprobe \ - $GLVNDOPT \ $COMP32 -# Clean-up: we really do not need this: -rm -rf /var/lib/nvidia -# which 32-bit tls? why? why? -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION - cd $PKG/usr/lib - ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION - cd - + # Move ICDs to $PKG and cleanup (no switch option in installer?) +mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd +mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json +mv /etc/vulkan/implicit_layer.d/nvidia_layers.json $PKG/etc/vulkan/implicit_layer.d/nvidia_layers.json +# In current, mesa now puts an entry into this directory, so we +# leave it alone if it is not empty +if [ -z "$(ls -A /etc/OpenCL/vendors)" ]; then + rm -rf /etc/OpenCL +fi +# just in case any other programs make an entry here +if [ -z "$(ls -A /etc/vulkan)" ]; then + rm -rf /etc/vulkan +fi + +if [ "$CURRENT" = "yes" ]; then +# libOpenCL.so is now included in current (in ocl-icd), +# so we don't need this one. + rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libOpenCL.so.1.0.0 + if [ "${COMPAT32}" = "yes" ]; then + rm -f $PKG/usr/lib/libOpenCL.so.1.0.0 + fi +else +# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia +# files so we don't stomp on any overlapping xorg files. +# Note: switching can be problematic ;-) + mkdir -p $PKG/var/log/nvidia/{32,64} + install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ + sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch + sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch + if [ ${COMPAT32} = "yes" ]; then + sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch + else + sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch + fi fi # Compile utilites from source, replacing the precompiled versions @@ -229,110 +253,19 @@ cd - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" make - - install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/ +# must be installed suid root for nvidia-persistenced to work properly + install -m 4755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-modprobe.1.gz $PKG/usr/man/man1/ cd - -# Compiling nvidia-persistenced - cd $TMP/nvidia-persistenced-$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" make -#FIXME: need rc.nvidia-persistenced script; see doc - install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ - install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ - cd - - -# Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files -# so we don't stomp on the overlapping xorg files. -# Note: switching can be problematic ;-) -install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ -sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch -sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch -if [ "$GLVND" = "yes" ]; then - sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch -else - sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch -fi -if [ ${COMPAT32} = "yes" ]; then - sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch -else - sed -i s/LIB32FLAG/no/g $PKG/usr/sbin/nvidia-switch -fi - -# These add or correct wrong paths -sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la +# These update the paths in nvidia-settings.desktop sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la - sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la - sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la -fi - -# rename wrong/conficting files as needed; remove conflicting symlinks created by installer -# since nvidia-switch tracks them. -cd $PKG/usr/lib$LIBDIRSUFFIX - if [ "$GLVND" = "yes" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi - mv libGL.la libGL.la-nvidia - mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia - mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia - rm -f libEGL.so - rm -f libEGL.so.1 - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGLESv1_CM.so - rm -f libGLESv1_CM.so.1 - rm -f libGLESv2.so - rm -f libGLESv2.so.1 - rm -f xorg/modules/libwfb.so -cd - - -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - cd $PKG/usr/lib - if [ "$GLVND" = "yes" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi - mv libGL.la libGL.la-nvidia - mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia - mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia - rm -f libEGL.so - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGLESv1_CM.so - rm -f libGLESv1_CM.so.1 - rm -f libGLESv2.so - rm -f libGLESv2.so.1 - cd - -# FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1 symlink to $PKG/usr/lib64/libGL.so.1 -# appears? Who would do this, so ignoring for now. -fi - -# Move ICDs to $PKG and cleanup (no switch option in installer?) -mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd -mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json -rm -rf /etc/OpenCL -rm -rf /etc/vulkan - -# Remove xorg conf file since we take care of that in nvidia-driver +# Remove xorg conf file since we handle that in nvidia-kernel rm -rf $PKG/etc/X11/xorg.conf.d -cat <<EOF > $PKG/var/log/nvidia/README.txt -Do NOT delete this directory! -nvidia-switch will backup the original X.org libraries here. -EOF - cd $TMP/$SRCNAM # put docs in the right place mv $PKG/usr/share/man/man1/nvidia-* $PKG/usr/man/man1 @@ -344,8 +277,64 @@ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc +if [ "$COMPAT32" = "yes" ]; then + sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver: This package includes the 32-bit libraries.|" $PKG/install/slack-desc +else + sed -i "s|nvidia-driver: @MULTILIB@|nvidia-driver:|" $PKG/install/slack-desc +fi + cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Flag install as multlib as needed and build package. +# 14.2 needs nvidia-switch, -current does not +if [ "$CURRENT" = "no" ]; then + echo -e "usr/sbin/nvidia-switch --install\n" >> $PKG/install/doinst.sh +fi + +# Add rc.nvidia-persistenced: +if [ "${PERSISTENCED:-no}" = "yes" ]; then + cd $TMP + rm -rf nvidia-persistenced-$VERSION.tar.bz2 + tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2 +# Compiling nvidia-persistenced + cd $TMP/nvidia-persistenced-$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" make + install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ + install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ + + if ! getent group nvidia > /dev/null 2>&1; then + echo "Creating the group nvidia:" + groupadd -g 365 nvidia || exit 1 + fi + if ! getent passwd nvidia > /dev/null 2>&1; then + echo "Creating the user nvidia:" + useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1 + fi + mkdir -p $PKG/var/run/nvidia-persistenced + chown nvidia:nvidia $PKG/var/run/nvidia-persistenced + mkdir -p $PKG/etc/rc.d + install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced + sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced + cat <<EOF >> $PKG/install/doinst.sh +# Create group and user nvidia if they don't already exist +if ! getent group nvidia > /dev/null 2>&1; then + echo "Creating the group nvidia:" + groupadd -g 365 nvidia || exit 1 +fi +if ! getent passwd nvidia > /dev/null 2>&1; then + echo "Creating the user nvidia:" + useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1 +fi + +EOF +fi + +# Flag multlib as needed and build package. cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index 8482d6d107..ca20a48252 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,20 +1,20 @@ PRGNAM="nvidia-driver" -VERSION="410.78" +VERSION="460.67" HOMEPAGE="http://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/410.78/NVIDIA-Linux-x86_64-410.78.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-410.78.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-410.78.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-410.78.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.78.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-410.78.tar.bz2" -MD5SUM_x86_64="5486d21e82fe16b88f43363981dc09d4 \ - 0d494c6b273a284f96b7696aac90c602 \ - 2586f14244bcaa44fcd9b8f6d251f0ab \ - 49fe18bc49fce67002e3329b672fa59f \ - 45be7ddf4e1a5a5c8655dac961331374 \ - f7851eee811367e3f7206a73f5fb18e1" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.67.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.67.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.67.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.67.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.67.tar.bz2" +MD5SUM_x86_64="0b246742eca035b702949631e2fcf6a2 \ + 4243fdeb81aa2025ef293c66d84bd223 \ + 4da687fb436dc72cc4aefc83ca9b1600 \ + 9168f7f3f896d1291f47a6f05ddf7ad9 \ + 774af9ca9829ad9f5acc9716c26ff0c8 \ + 5ee964e0519ae00f4184b49a609682c2" REQUIRES="nvidia-kernel" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch index 2e2750ce15..9196cf7b8a 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2020 Lenard Spencer, Orlando, FL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,92 +21,42 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# nvidia-switch utility 4.0 +# nvidia-switch utility 4.7.2 # -# A tool to install and cleanly remove the nvidia driver without stomping on the xorg files. -# Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still -# need to edit a bunch of other config files. - -# TO-DO: needs more cleanup, simplify linking using system tools - -ROOT="${ROOT:-/}" +# A tool to install and cleanly remove the nvidia driver without stomping +# on the mesa files. Note: this tool "should" allow switching on the fly, +# but why? Pick a driver! You will stilll need to edit a bunch of other +# config files. + +# When ROOT=<PATH> is specified when using {install,upgrade,remove}pkg, +# PATH is usually specified without a trailing "/", so we need to add it +if [ "$ROOT" = "" ]; then + ROOT="${ROOT:-"/"}" +else + ROOT="${ROOT}/" +fi CWD=$(pwd) COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no) LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script INC="${ROOT}usr/include/GL" LIB="${ROOT}usr/lib${LIBSUFFIX}" LIB32="${ROOT}usr/lib" -XMOD="${LIB}/xorg/modules" -XLIB="$XMOD/extensions" -NV_VERSION="PKGVERSION" # This will be replaced in the build script -GL_VERSION="1.2.0" -GLVND="GLVNDFLAG" # This will be replaced in the build script (yes | no) -NV_CONF="${ROOT}usr/share/X11/xorg.conf.d/10-nvidia.conf" -SAVELIBS="${ROOT}var/log/nvidia" save_GL(){ -# backup original mesa and xorg conflicts to /var/log/nvidia +# backup original mesa conflicts cd $2 - # Need to make sure save path is reset incase of multilib - SAVELIBS="${ROOT}var/log/nvidia" - if [ "$2" = "$LIB32" ]; then - SAVELIBS="${SAVELIBS}/32" - elif [ "$2" = "$LIB" ]; then - SAVELIBS="${SAVELIBS}/64" - fi - case "$1" in "nvidia") - - mv libGL.so.$GL_VERSION $SAVELIBS/libGL.so.$GL_VERSION - mv libGL.la $SAVELIBS/libGL.la - mv libEGL.so.1.0.0 $SAVELIBS/libEGL.so.1.0.0 - mv libGLESv1_CM.so.1.1.0 $SAVELIBS/libGLESv1_CM.so.1.1.0 - mv libGLESv2.so.2.0.0 $SAVELIBS/libGLESv2.so.2.0.0 - mv libGL.la-nvidia libGL.la - - if [ "$GLVND" = "yes" ]; then - ln -sf libGL.so.1.7.0 libGL.so.1 - ln -sf libGL.so.1.7.0 libGL.so - ln -sf libEGL.so.1.1.0-nvidia libEGL.so.1.1.0 - ln -sf libEGL.so.1.1.0-nvidia libEGL.so - else - ln -sf libGL.so.$NV_VERSION libGL.so.1 - ln -sf libGL.so.$NV_VERSION libGL.so - ln -sf libEGL.so.$NV_VERSION libEGL.so.1 - ln -sf libEGL.so.$NV_VERSION libEGL.so - fi - - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1.2.0 - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1 - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so - - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2.1.0 - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2 - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so + cp libGL{,ES*}.la /var/log/nvidia/$3 + mv libGL{.so.1.2.0,ESv1_CM.so.1.1.0,ESv2.so.2.0.0} /var/log/nvidia/$3 + sed -i s/1.2.0/1.7.0/g libGL.la + sed -i s/1.1.0/1.2.0/g libGLESv1_CM.la + sed -i s/2.0.0/2.1.0/g libGLESv2.la ;; "xorg") - mv libGL.la libGL.la-nvidia - mv $SAVELIBS/libGL.so.$GL_VERSION libGL.so.$GL_VERSION - mv $SAVELIBS/libGL.la libGL.la - mv $SAVELIBS/libEGL.so.1.0.0 libEGL.so.1.0.0 - mv $SAVELIBS/libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0 - mv $SAVELIBS/libGLESv2.so.2.0.0 libGLESv2.so.2.0.0 - - ln -sf libGL.so.$GL_VERSION libGL.so.1 - ln -sf libGL.so.$GL_VERSION libGL.so - ln -sf libEGL.so.1.0.0 libEGL.so.1 - ln -sf libEGL.so.1.0.0 libEGL.so - rm -f libEGL.so.1.1.0 - - ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1 - ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so - ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2 - ln -sf libGLESv2.so.2.0.0 libGLESv2.so - rm -f libGLESv1_CM.so.1.2.0 - rm -f libGLESv2.so.2.1.0 - ;; + mv /var/log/nvidia/$3/* . + ;; *) echo "nothing to do for save_gl?" @@ -115,135 +66,46 @@ save_GL(){ cd "$CWD" } -save_glx(){ - cd "$XLIB" - case "$1" in - "nvidia") - if [ -e libglx.so ]; then - mv libglx.so xorg-libglx.so - fi - ln -sf libglxserver_nvidia.so.$NV_VERSION libglx.so - ;; - "xorg") - if [ -e xorg-libglx.so ]; then - rm -f libglx.so - mv xorg-libglx.so libglx.so - else - rm -f libglx.so - fi - ;; - *) - echo "nothing to do for save_glx?" - exit 1 - ;; - esac - cd "$CWD" -} - -save_wfb(){ - cd "$XMOD" - if [ -e libwfb.so ]; then - echo "Using existing Xorg libwfb..." - else - if [ "$1" = "nvidia" ]; then - ln -sf libwfb.so.$NV_VERSION libwfb.so.1 - ln -sf libwfb.so.1 libwfb.so - fi - if [ "$1" = "xorg" ]; then - rm -f libwfb.so - rm -f libwfb.so.1 - fi - fi - cd "$CWD" -} - nvidia_install(){ - if [ ! -d $SAVELIBS ]; then - echo "Creating missing $SAVELIB ..." - mkdir -p $SAVELIBS - fi echo $'Installing to nvidia-driver files!\n' echo "Make sure the nvidia driver is ENABLED in /etc/X11/xorg.conf" - echo "and in /etc/X11/xorg.conf.d." - echo "Otherwise, this may lead to improperly working drivers." - - save_glx "nvidia" - save_GL "nvidia" $LIB - save_wfb "nvidia" -# Check for multilib configuration - if [ "$COMPAT32" = "yes" ]; then - save_GL "nvidia" $LIB32 + echo "and/or in either /usr/share/X11/xorg.conf.d or" + echo "/etc/X11/xorg.conf.d. Otherwise, this may lead to improperly" + echo -e "working drivers.\n" + + if [ "$LIBSUFFIX" = "64" ]; then + save_GL "nvidia" $LIB "64" + # Check for multilib configuration + if [ "$COMPAT32" = "yes" ]; then + save_GL "nvidia" $LIB32 "32" + fi + else + save_GL "nvidia" $LIB "32" fi } nvidia_remove(){ echo $'Returning to stock xorg files!\n' - echo "Make sure the nvidia driver is DISABLED in /usr/share/X11/xorg.conf.d" - echo "/etc/X11/xorg.conf and in /etc/X11/xorg.conf.d." + echo "Make sure the nvidia driver is DISABLED in /etc/X11/xorg.conf" + echo "and in /usr/share/X11/xorg.conf.d and /etc/X11/xorg.conf.d." echo "Otherwise, this may lead to improperly working drivers." + echo -e "\nPLEASE run /sbin/ldconfing after removing nvidia-driver.\n" - save_glx "xorg" - save_GL "xorg" $LIB - save_wfb "xorg" - -# Check for multilib configuration - if [ "$COMPAT32" = "yes" ]; then - save_GL "xorg" $LIB32 - fi - - if [ -e $NV_CONF ]; then - echo "removing $NV_CONF: you will need to provide your own" - echo "or reinstall nvidia-driver." - rm -f $NV_CONF - fi -} - -restore(){ -# Attempt to reinstall damaged stock packages if something went wrong. -# Obviously, you will need to run this after '--remove' and before -# 'removepkg nvidia-driver'. -# User must: -# 1. remove any dangling symlinks and xorg-*, *-nvidia files in /usr/lib*/, -# and any other housekeeping tasks. -# 2. copy stock Slackware packages to /root/Slackware or provide an alternate location -# 3. be running Slackware-14.2, not current -# 4. realize that COMPAT32 is not stable ;-) - -if [ "$LIBSUFFIX" = "64" ]; then - ARCH="x86_64" -else - ARCH="x86" -fi - -PKGPATH=${PKGPATH:-/root/Slackware} -MESA="mesa-11.2.2-$ARCH-1.txz" -MESA32="mesa-compat32-11.2.2-$ARCH-1compat32.txz" -XORG="xorg-server-1.18.3-$ARCH-2.txz" -# Note: The above is for stock 14.2; modify as needed for /patches or -# multilib updates -if [ -d $PKGPATH ]; then - if [ `find $PKGPATH -prune -empty -type d` ]; then - echo "Your $PKGPATH is empty!" - else - upgradepkg --reinstall --install-new $MESA $XORG - if [ "COMPAT32" = "yes" ]; then - upgradepkg --reinstall --install-new $MESA32 + if [ "$LIBSUFFIX" = "64" ]; then + save_GL "xorg" $LIB "64" + # Check for multilib configuration + if [ "$COMPAT32" = "yes" ]; then + save_GL "xorg" $LIB32 "32" fi + else + save_GL "xorg" $LIB "32" fi -else - echo "Please create $PKGPATH containing the appropriate packages" -fi } usage(){ echo "Usage:" - echo " --install Set up nvidia driver files" - echo " --remove Return to stock xorg files and restore all symlinks" - echo " --restore Reinstall stock Mesa and xorg-server [EXPERIMENTAL]" - echo " mesa-11.2.2, org-server-1.18.3, and optionally" - echo " mesa-compat32-11.2.2 are expected in /root/Slackware" - echo " Use 'PKGPATH=\"<location>\" nvidia-switch --restore'" - echo " to override." + echo " --install Set up nvidia driver files and update symlinks" + echo " --remove Return to stock xorg files and restore symlinks" echo " --help Show this help message" } @@ -254,9 +116,6 @@ case "$1" in "--remove") nvidia_remove ;; - "--restore") - restore - ;; "--help") usage ;; diff --git a/system/nvidia-driver/rc.nvidia-persistenced b/system/nvidia-driver/rc.nvidia-persistenced new file mode 100644 index 0000000000..59bdf18d11 --- /dev/null +++ b/system/nvidia-driver/rc.nvidia-persistenced @@ -0,0 +1,61 @@ +#!/bin/sh -e +# +# NVIDIA Persistence Daemon Init Script +# +# Copyright (c) 2013 NVIDIA Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +NVPD=nvidia-persistenced +NVPD_BIN=/usr/bin/${NVPD} +NVPD_RUNTIME=/var/run/${NVPD} +NVPD_PIDFILE=${NVPD_RUNTIME}/${NVPD}.pid +NVPD_USER=__USER__ + +if [ -f ${NVPD_PIDFILE} ]; then + read -r NVPD_PID < "${NVPD_PIDFILE}" + # Remove stale runtime files + if [ "${NVPD_PID}" ] && [ ! -d /proc/${NVPD_PID} ]; then + unset NVPD_PID + rm -rf "${NVPD_RUNTIME}" + fi +fi + +case "${1}" in + start) + echo "Starting NVIDIA Persistence Daemon" + + # Execute the daemon as the intended user + ${NVPD_BIN} --user ${NVPD_USER} + ;; + stop) + echo "Stopping NVIDIA Persistence Daemon" + + # Stop the daemon - its PID should have been read in + [ ! -z "${NVPD_PID}" ] && kill ${NVPD_PID} &> /dev/null + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/system/nvidia-driver/skip_conflict-GPU_detect.patch b/system/nvidia-driver/skip_conflict-GPU_detect.patch index 2b979cbf46..a64b671d60 100644 --- a/system/nvidia-driver/skip_conflict-GPU_detect.patch +++ b/system/nvidia-driver/skip_conflict-GPU_detect.patch @@ -1,29 +1,47 @@ -diff -uaN command-list.c command-list.c.new ---- command-list.c 2018-01-24 20:59:24.000000000 -0800 -+++ command-list.c.new 2018-02-18 00:51:13.218202297 -0800 -@@ -903,6 +903,8 @@ +diff -uaN command-list.c command-list.c.new +--- command-list.c 2020-01-29 17:56:11.000000000 -0800 ++++ command-list.c.new 2020-03-08 11:24:03.000000000 -0700 +@@ -890,6 +890,8 @@ // Allocate enough space for the whole file list, plus two extra files and // a NULL at the end. cfList = nvalloc((p->num_entries + 3) * sizeof(ConflictingFileInfo)); -+/* let's just return an empty list! */ ++ /* let's just return an empty list! */ + return cfList; - + for (i = 0; i < p->num_entries; i++) { PackageEntry *entry = &p->entries[i]; - -diff -uaN misc.c misc.c.new ---- misc.c 2018-02-18 00:52:42.822203145 -0800 -+++ misc.c.new 2018-02-18 00:53:28.926203581 -0800 -@@ -2289,7 +2289,10 @@ + +diff -uaN misc.c misc.c.new +--- misc.c 2020-01-29 17:56:11.000000000 -0800 ++++ misc.c.new 2020-03-08 11:42:12.000000000 -0700 +@@ -1153,13 +1153,12 @@ + } + + if (!install) { +- ui_warn(op, "The %s module will not be installed. As a result, %s " +- "will not function with this installation of the NVIDIA " +- "driver.", optional_modules[i].module_name, ++ ui_warn(op, "The %s module will be installed with no gpu detect. As a result, %s " ++ "will function with this installation of the NVIDIA " ++ "driver, but only if the card is installed", optional_modules[i].module_name, + optional_modules[i].optional_module_dependee); +- +- remove_kernel_module_from_package(p, +- optional_modules[i].module_name); ++// remove_kernel_module_from_package(p, ++// optional_modules[i].module_name); + } + } + } +@@ -2036,7 +2035,10 @@ "For further details, please see the appendix SUPPORTED " "NVIDIA GRAPHICS CHIPS in the README available on the Linux " "driver download page at www.nvidia.com.", p->version); - return FALSE; -+/* return FALSE; -+ * We're just going to keep the message but skip the result -+ * so we can run this in a VM. -+ */ ++ /* return FALSE; ++ * We're just going to keep the message but skip the result ++ * so we can run this in a VM. ++ */ } - - if (!found_vga_device) + if (!found_vga_device) diff --git a/system/nvidia-driver/slack-desc b/system/nvidia-driver/slack-desc index 6781f2468f..165da72937 100644 --- a/system/nvidia-driver/slack-desc +++ b/system/nvidia-driver/slack-desc @@ -15,5 +15,5 @@ nvidia-driver: nvidia-driver: See /usr/doc/nvidia-driver-PKGVERSION/README.Slackware nvidia-driver: for more information. nvidia-driver: -nvidia-driver: -nvidia-driver: +nvidia-driver: https://www.nvidia.com +nvidia-driver: @MULTILIB@ diff --git a/system/nvidia-firmware/nvidia-firmware.info b/system/nvidia-firmware/nvidia-firmware.info index ad15a4c39d..2e848a4635 100644 --- a/system/nvidia-firmware/nvidia-firmware.info +++ b/system/nvidia-firmware/nvidia-firmware.info @@ -9,4 +9,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/nvidia-kernel/README b/system/nvidia-kernel/README index 442c313a38..35109efbf0 100644 --- a/system/nvidia-kernel/README +++ b/system/nvidia-kernel/README @@ -1,13 +1,15 @@ -This is the kernel-module needed by the proprietary binary nvidia driver. -You also need the nvidia-driver package from SlackBuilds.org. +This is the kernel-module needed by the proprietary binary nvidia +driver. You also need the nvidia-driver package from SlackBuilds.org. To build the package for a kernel different from the running one, start the script setting the KERNEL variable as in KERNEL=4.6.3 ./nvidia-kernel.SlackBuild -A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf -to make sure that X loads the nvidia module. If you need to make changes, -move that file to /etc/X11/xorg.conf.d/ and edit the copy. You do not need -this file at all if you have a proper and complete xorg.conf. +A default config file is placed at + /usr/share/X11/xorg.conf.d/10-nvidia.conf +to make sure that X loads the nvidia module. +If you need to make changes, copy that file to /etc/X11/xorg.conf.d/ +and edit the copy. You do not need this file at all if you have a +proper and complete xorg.conf. The xf86-video-nouveau-blacklist package from /extra is required. diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild index 23004eb39d..f4e42828c0 100644 --- a/system/nvidia-kernel/nvidia-kernel.SlackBuild +++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild @@ -3,7 +3,8 @@ # Slackware build script for nvidia-kernel # Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA +# Updates cpyright 2020 Lenard Spencer, Orlando, FL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +29,7 @@ # see nvidia-driver/changelog.txt PRGNAM=nvidia-kernel -VERSION=${VERSION:-410.78} +VERSION=${VERSION:-460.67} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -89,10 +90,6 @@ if [ "$TARGET" = "x86_64" ]; then install -m 0664 kernel/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ fi -# Make sure the X is specified to automagically load the -# correct driver, since I always forget. You can remove -# this file if you have an equivilent entry in /etc/X11/xorg.d - mkdir -p $PKG/usr/share/X11/xorg.conf.d/ cat $TMP/$SRCNAM/nvidia-drm-outputclass.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info index 3c6b5e3d73..019df6d1da 100644 --- a/system/nvidia-kernel/nvidia-kernel.info +++ b/system/nvidia-kernel/nvidia-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-kernel" -VERSION="410.78" +VERSION="460.67" HOMEPAGE="http://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/410.78/NVIDIA-Linux-x86_64-410.78.run" -MD5SUM_x86_64="5486d21e82fe16b88f43363981dc09d4" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/460.67/NVIDIA-Linux-x86_64-460.67.run" +MD5SUM_x86_64="0b246742eca035b702949631e2fcf6a2" REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info index 02c14e1688..c81c889258 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.info @@ -18,5 +18,5 @@ MD5SUM_x86_64="a61b391d44aa6e7222f64502ef7f3ea1 \ 51a4d5286557f11f06f42ca949431cf8 \ 40be98ce681fed695e8888f4483f0e48" REQUIRES="nvidia-legacy304-kernel" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="unmaintained" +EMAIL="unmaintained@gmail.com" diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info index 7e532f8bdb..6a12fea304 100644 --- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info +++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.info @@ -6,5 +6,5 @@ MD5SUM="133098e70581f6b81c481338cc20f100" DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run" MD5SUM_x86_64="a61b391d44aa6e7222f64502ef7f3ea1" REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="unmaintained" +EMAIL="unmaintained@gmail.com" diff --git a/system/nvidia-legacy340-driver/README b/system/nvidia-legacy340-driver/README index 1ed005a5f2..28f6b894ef 100644 --- a/system/nvidia-legacy340-driver/README +++ b/system/nvidia-legacy340-driver/README @@ -2,7 +2,7 @@ This is the proprietary binary video driver from NVidia for the X.Org X-server. This package does not include the kernel-module - it is a part of the nvidia-kernel package at SlackBuilds.org. -Installing the 32-bit compatibility libraries is available: if desired, do: +Installing 32-bit compatibility libraries is available. If desired, do: COMPAT32="yes" ./nvidia-driver.SlackBuild Several useful utilities are included: nvidia-xsettings, nvidia-smi, and @@ -21,11 +21,11 @@ complex to install/uninstall the driver. However, installation of the nvidia-driver package itself backs up the conflicting files and puts the nvidia-specific files into place. -Included is a script called nvidia-switch, which is used to switch from the -xorg driver to the nvidia driver, but it will not edit xorg.conf for you; -you have to do that manually. The nvidia-switch script is installed to -/usr/sbin. NOTE: Although nvidia-switch is aware of a COMPAT32 environment, -its use therein is not supported. +Included is a script called nvidia-switch, which is used to switch +from the xorg driver to the nvidia driver, but it will not edit +xorg.conf for you; you have to do that manually. The nvidia-switch +script is installed to /usr/sbin. NOTE: Although nvidia-switch is +aware of a COMPAT32 environment, its use therein is not supported. Usage of nvidia-switch: nvidia-switch --install <--> install the nvidia files and save the diff --git a/system/nvidia-legacy340-driver/changelog.txt b/system/nvidia-legacy340-driver/changelog.txt index c1859b96ae..186143460b 100644 --- a/system/nvidia-legacy340-driver/changelog.txt +++ b/system/nvidia-legacy340-driver/changelog.txt @@ -24,3 +24,5 @@ 4.3 19-MAR-2016 remove nvidia-installer (doesn't compile on 14.2RC1) 5.0 15-FEB-2017 version update, security fixes. 5.1 21-OCT-2017 new version for recent kernels +5.2 11-SEP-2019 version update, patch for kernels 4.4.168+ (thanks to MatsT.) +5.3 18-JAN-2020 version update, last version, X.Org 1.20 support diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild index 383b7f696e..543b3e6516 100644 --- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild +++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild @@ -1,36 +1,13 @@ #!/bin/sh - # Slackware build script for nvidia-driver - -# Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA -# 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. - # See changelog.txt PRGNAM=nvidia-legacy340-driver -VERSION=${VERSION:-340.104} +VERSION=${VERSION:-340.108} MVERS=340 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -CPROXY=${CPROXY:-no} +CPROXY=${CPROXY:-yes} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info index 5fd6b0141e..82a53144d8 100644 --- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info +++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info @@ -1,26 +1,26 @@ PRGNAM="nvidia-legacy340-driver" -VERSION="340.104" +VERSION="340.108" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.104/NVIDIA-Linux-x86-340.104.run \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.104.tar.bz2" -MD5SUM="42e9c98e156f6ac2658ee526d796a428 \ - 68749455b4a2b5fb9e63876ea5c60787 \ - 0b5d473008734588dda2d1b8b7d79d71 \ - 0024eacf3e1b473b300123229a9012ff \ - 9f28850e70824a765918b13345f630f7" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.104/NVIDIA-Linux-x86_64-340.104.run \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.104.tar.bz2" -MD5SUM_x86_64="4750891b7e175c0dc9a04608e493d141 \ - 68749455b4a2b5fb9e63876ea5c60787 \ - 0b5d473008734588dda2d1b8b7d79d71 \ - 0024eacf3e1b473b300123229a9012ff \ - 9f28850e70824a765918b13345f630f7" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.108/NVIDIA-Linux-x86-340.108.run \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.108.tar.bz2" +MD5SUM="ffa278e613337e638fd10de41dae3630 \ + 2f63e63b1c475ed023e3ee31b6ed0116 \ + b76a6500801b96c2296310e17b2e0cdf \ + 86944ff799d5798f407c5051282699b3 \ + da1c2d34014a4aa4e66627ba18364779" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.108.tar.bz2" +MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1\ + 2f63e63b1c475ed023e3ee31b6ed0116 \ + b76a6500801b96c2296310e17b2e0cdf \ + 86944ff799d5798f407c5051282699b3 \ + da1c2d34014a4aa4e66627ba18364779" REQUIRES="nvidia-legacy340-kernel" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="Mats B. Tegner" +EMAIL="mats.bertil.tegner@gmail.com" diff --git a/system/nvidia-legacy340-driver/nvidia-switch b/system/nvidia-legacy340-driver/nvidia-switch index 9226a103bd..fd90c87949 100644 --- a/system/nvidia-legacy340-driver/nvidia-switch +++ b/system/nvidia-legacy340-driver/nvidia-switch @@ -41,6 +41,7 @@ XMOD="${LIB}/xorg/modules" XLIB="$XMOD/extensions" NV_VERSION='PKGVERSION' # This will be replaced in the build script GL_VERSION="1.2.0" +EGL_VERSION="1.0.0" NV_CONF="/usr/share/X11/xorg.conf.d/10-nvidia.conf" save_GL(){ @@ -48,37 +49,33 @@ save_GL(){ if [ "$1" = "nvidia" ]; then if [ ! -e libGL.so.$GL_VERSION-xorg ]; then mv libGL.so.$GL_VERSION libGL.so.$GL_VERSION-xorg - mv libGL.la libGL.la-xorg fi mv libGL.so.$NV_VERSION-nvidia libGL.so.$NV_VERSION ln -sf libGL.so.$NV_VERSION libGL.so.1 ln -sf libGL.so.$NV_VERSION libGL.so - if [ ! -e libEGL.so.1.0.0-xorg ]; then - mv libEGL.so.1.0.0 libEGL.so.1.0.0-xorg + if [ ! -e libEGL.so.$EGL_VERSION-xorg ]; then + mv libEGL.so.$EGL_VERSION libEGL.so.$EGL_VERSION-xorg fi - mv libGL.la-nvidia libGL.la mv libEGL.so.$NV_VERSION-nvidia libEGL.so.$NV_VERSION - ln -sf libEGL.so.$NV_VERSION libGEL.so.1.0.0 + ln -sf libEGL.so.$NV_VERSION libEGL.so.$EGL_VERSION ln -sf libEGL.so.$NV_VERSION libEGL.so.1 ln -sf libEGL.so.$NV_VERSION libEGL.so fi if [ "$1" = "xorg" ]; then mv libGL.so.$NV_VERSION libGL.so.$NV_VERSION-nvidia - mv libGL.la libGL.la-nvidia if [ -e libGL.so.$GL_VERSION-xorg ]; then mv libGL.so.$GL_VERSION-xorg libGL.so.$GL_VERSION ln -sf libGL.so.$GL_VERSION libGL.so.1 ln -sf libGL.so.$GL_VERSION libGL.so - mv libGL.la-xorg libGL.la else echo WARNING: libGL.so is missing. fi mv libEGL.so.$NV_VERSION libEGL.so.$NV_VERSION-nvidia - if [ -e libEGL.so.1.0.0-xorg ]; then - mv libEGL.so.1.0.0-xorg libEGL.so.1.0.0 - ln -sf libEGL.so.1.0.0 libEGL.so.1 - ln -sf libEGL.so.1.0.0 libEGL.so + if [ -e libEGL.so.$EGL_VERSION-xorg ]; then + mv libEGL.so.$EGL_VERSION-xorg libEGL.so.$EGL_VERSION + ln -sf libEGL.so.$EGL_VERSION libEGL.so.1 + ln -sf libEGL.so.$EGL_VERSION libEGL.so fi fi @@ -111,7 +108,6 @@ save_glx(){ cd "$XLIB" if [ "$1" = "nvidia" ]; then if [ ! -e libglx.so-xorg ]; then - mv libglx.la libglx.la-xorg mv libglx.so libglx.so-xorg fi ln -sf libglx.so.$NV_VERSION-nvidia libglx.so.$NV_VERSION @@ -120,7 +116,6 @@ save_glx(){ rm -f libglx.so.$NV_VERSION rm -f libglx.so mv libglx.so-xorg libglx.so - mv libglx.la-xorg libglx.la fi cd "$CWD" } diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild index c89c49cce1..96454d09f9 100644 --- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild +++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild @@ -28,7 +28,7 @@ # See changelog.txt PRGNAM=nvidia-legacy340-kernel -VERSION=${VERSION:-340.104} +VERSION=${VERSION:-340.108} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -80,12 +80,19 @@ find -L . \ (cd kernel || exit 1 make SYSSRC=$KERNELPATH module || exit 1 cd uvm + sed -i "s|-O2$|-O2 -Wno-error=incompatible-pointer-types|" Makefile make SYSSRC=$KERNELPATH module || exit 1 ) mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video install -m 0664 kernel/nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ -install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ + +# Unified Memory kernel module is incompatible with recent Linux kernels, +# and the GPU hardware generations that the 340.xx legacy driver series is +# intended to support do not support Unified Memory. +if [ -e kernel/uvm/nvidia-uvm.ko ]; then + install -m 0664 kernel/uvm/nvidia-uvm.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ +fi # Make sure the X is specified to automagically load the # correct driver, since I always forget. You can remove diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info index 3053c85389..d5e5bec27e 100644 --- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info +++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-legacy340-kernel" -VERSION="340.104" +VERSION="340.108" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.104/NVIDIA-Linux-x86-340.104.run" -MD5SUM="42e9c98e156f6ac2658ee526d796a428" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.104/NVIDIA-Linux-x86_64-340.104.run" -MD5SUM_x86_64="4750891b7e175c0dc9a04608e493d141" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.108/NVIDIA-Linux-x86-340.108.run" +MD5SUM="ffa278e613337e638fd10de41dae3630" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run" +MD5SUM_x86_64="28a7ec013c4ef657d3e9b978e2f653c1" REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="Mats B. Tegner" +EMAIL="mats.bertil.tegner@gmail.com" diff --git a/system/nvidia-legacy390-driver/README b/system/nvidia-legacy390-driver/README index e608bf4c96..56e253398f 100644 --- a/system/nvidia-legacy390-driver/README +++ b/system/nvidia-legacy390-driver/README @@ -2,58 +2,71 @@ This is the proprietary binary video driver from NVidia for the X.Org X-server. This package does not include the kernel module - it is a part of the nvidia-legacy390-kernel package at SlackBuilds.org. -Installing the 32-bit compatibility libraries is available: if desired, do: +Installing the 32-bit compatibility libraries is available: if desired, +do: COMPAT32="yes" ./nvidia-legacy390-driver.SlackBuild -GLVND GLX client libraries are now the default. If these cause any -compatibility issues with older GLX sofware, either upgrade your software -or try: - GLVND="no" ./nvidia-legacy390-driver.SlackBuild +If you plan to test this buildscript on current/15.0, do: + + CURRENT="yes" ./nvidia-legacy390-driver.SlackBuild + +This avoids stomping on the libglvnd libraries, plus it forces the +script to use the prebuilt nvidia-installer since it no longer builds +in current. As a consequence, this script may no longer work in a VM. + +If you build and install this driver on current WITHOUT using the +CURRENT="yes" flag, it will corrupt both xorg-server AND libglvnd, so +after removing the driver both packages will have to be reinstalled. + +This script now gives the option of installing the nvidia-persistenced +daemon. For details see README.nvidia-persistenced. Several useful utilities are included: nvidia-xsettings, nvidia-smi, and nvidia-settings. Please refer to the Nvidia documentation and man pages for details and usage. -For CUDA/OpenCL to work after reboot, and for utilites such as nvidia-smi, -you might need to include the following line in your /etc/rc.d/rc.local: --------------8<--------------- -# Create missing nvidia device nodes after reboot -/usr/bin/nvidia-modprobe -c 0 -u -------------->8--------------- +For CUDA/OpenCL to work after reboot, and for utilites such as +nvidia-smi, you might need to include the following line in your +/etc/rc.d/rc.local: (this is REQUIRED for nvidia-persistenced to work +properly) -Since this nvidia-legacy390-driver conflicts with some files of xorg, it's -a bit complex to install/uninstall the driver. However, installation of the -nvidia-legacy390-driver package itself backs up the conflicting files and puts -the nvidia-specific files into place. + # Create missing nvidia device nodes after reboot + /usr/bin/nvidia-modprobe -c 0 -u -Included is a script called nvidia-switch, which is used to switch from -the xorg driver to the nvidia driver, but it will not edit xorg.conf -for you; you have to do that manually. The nvidia-switch script is -installed to /usr/sbin. NOTE: Although nvidia-switch is aware of a -COMPAT32 environment, its use therein is not supported. +Included is a script called nvidia-switch, which is used to switch +between the xorg and nvidia drivers, but it will not edit xorg.conf for +you; you have to do that manually. The nvidia-switch script is +installed to /usr/sbin. Usage of nvidia-switch: - nvidia-switch --install <--> install the nvidia files and save the - stock xorg files. + nvidia-switch --install <--> save the stock xorg files and + install the nvidia files and symlinks. nvidia-switch --remove <--> remove the nvidia files and symlinks and restore the stock xorg files. -You do NOT have to run nvidia-switch after installing the package. +NOTES: +Since nvidia-legacy390-driver conflicts with some files of xorg, it's a +bit complex to install/uninstall the driver. However, installation of +the nvidia-legacy390-driver package backs up the conflicting files and +puts the nvidia-specific files into place by automatically running +nvidia-switch --install in doinst.sh. -Before uninstalling or upgrading this package, it is important that +Before uninstalling or upgrading this package, it is IMPORTANT that you execute 'nvidia-switch --remove', which will switch back to the stock xorg files and remove all links created by nvidia-switch during installation. If you forget to do this, you might have to do the switch manually, since 'nvidia-switch --install' may fail, resulting in xorg -not working. Here are the affected files: +not working. Here are the affected files (and their packages): - /usr/lib[64]/libGL.so.1.2 - /usr/lib[64]/libGL.la - /usr/lib[64]/libGLESv1_CM.so.1.0.0 - /usr/lib[64]/libGLESv2.so.2.0.0 - /usr/lib[64]/libEGL.so.1.0.0 - /usr/lib[64]/xorg/modules/libwfb.so - /usr/lib[64]/xorg/modules/extensions/libglx.so + /usr/lib[64]/libGL.so.1.2 (mesa) + /usr/lib[64]/libGL.la (mesa) + /usr/lib[64]/libGLESv1_CM.so.1.0.0 (mesa) + /usr/lib[64]/libGLESv2.so.2.0.0 (mesa) + /usr/lib[64]/libEGL.so.1.0.0 (mesa) + /usr/lib[64]/xorg/modules/libwfb.so (xorg-server) + /usr/lib[64]/xorg/modules/extensions/libglx.so (xorg-server) Simply remove the dead nvidia symlinks and and reinstall the mesa and -xorg-server packages. See 'nvidia-switch --help'. +xorg-server packages. (In current, if libglx.so is a dead symlink, +it MUST be removed before reinstalling xorg-server.) + diff --git a/system/nvidia-legacy390-driver/README.nvidia-persistenced b/system/nvidia-legacy390-driver/README.nvidia-persistenced new file mode 100644 index 0000000000..38e8937cde --- /dev/null +++ b/system/nvidia-legacy390-driver/README.nvidia-persistenced @@ -0,0 +1,32 @@ +The NVIDIA Persistence Daemon is a userspace daemon on Linux to support +persistence of driver state across Cuda job runs. The daemon targets all +current Tesla, Quadro and GRID GPUs. For further information, see + +https://docs.nvidia.com/deploy/driver-persistence/index.html + +The driver now includes rc.nvidia-persistenced as an option. While it can +be run as root, it is more secure to run it as an unpriveleged user, so we +run it as user nvidia. + +To install it, Pass PERSISTENCED=yes to the script. It will create the +user and group nvidia, and install rc.nvidia-persistenced to /etc/rc.d. + +To activate the daemon, add the following to /etc/rc.d/local: + +# Start the nvidia-persistenced daemon: +if [ -x /etc/rc.d/rc.nvidia-persistenced ]; then + /etc/rc.d/rc.nvidia-persistenced start +fi + +and then 'chmod +x /etc/rc.d/rc.nvidia-persistenced' to make it executable. + +Add the following to /etc/rc.d/rc.local_shutdown: + +# Stop the nvidia-persistenced daemon: +if [ -x /etc/rc.d/rc.nvidia-persistenced ]; then + /etc/rc.d/rc.nvidia-persistenced stop +fi + +NOTE: This may not work on all systems. If you encounter problems +with it, just 'chmod -x /etc/rc.d/rc.persistenced' and it will no +longer load. YMMV. diff --git a/system/nvidia-legacy390-driver/changelog.txt b/system/nvidia-legacy390-driver/changelog.txt deleted file mode 100644 index 54bb2043a7..0000000000 --- a/system/nvidia-legacy390-driver/changelog.txt +++ /dev/null @@ -1,40 +0,0 @@ -1.0 20-MAR-2011 New Maintainer: Edward W. Koenig <kingbeowulf@gmail.com> -1.1 10-APR-2011 updated to new version, testing 13.37rc4.6692 -1.2 27-MAY-2011 new version, allow multilib option, minor edits -1.2.1 20-JUN-2011 minor edits, thanks to Robby and Roberto -1.5 01-JUL-2011 new version, single driver download, add switch to select pure x86_64 or x86_64 with 32-bit compatibility. -1.6 27-AUG-2011 version bump, minor edits -1.7 21-OCT-2011 version bump -1.8 24-MAR-2012 version bump, fix to nvidia-switch thanks to Phill W. -1.9 02-AUG-2012 version bmp, fixes, updates, nvidia-switch for install/uninstall only -2.0 21-AUG-2012 new version (important security fix), missing vdpau-nvidia, dropped *.h -2.1 25-AUG-2012 new version -Long Lived Branch, fixed symlinks (per Das email) -2.2 22-NOV-2012 new version -Long Lived Branch. Updates: libs, apps -2.3 15-FEB-2013 new version -Long Lived Branch. -2.4 19-MAY-2013 new version -Long Lived Branch. -2.6 20-OCT-2013 new version -Long Lived Branch, add new lib, fix nvidia-switch --remove -3.0 13-NOV-2013 new version (LLB), update libs -3.1 12-APR-2014 new version (LLB), update libs -3.2a 12-JUL-2014 new version (LLB), update libs and bug fixes, fix /dev/nvidia-uvm -3.3 20-NOV-2014 new version (LLB), update libs, fix nvidia-switch -3.4 11-JAN-2015 new version (LLB), monitor detection bug fix, add libEGL/GLES -4.0 07-FEB-2015 new long lived branch, version update, bug fixes -4.1 27-APR-2015 version update LLB, fix $VERSION usage -4.2 28-JUL-2015 version update LLB, bug fixes, clean-ups. -4.3 05-SEP-2015 version update LLB -4.4 13-DEC-2015 version update, X.Org 1.18 support -4.5 12-MAR-2016 version update LLB, symlink fixes, drop nvidia-installer, get ready for 14.2 -4.5a 26-MAR-2016 fixed broken symlinks -4.6 24-APR-2016 version update LLB, fix symlinks, added to version if multilib -4.7 31-APR-2016 version update LLB, added nvidia-installer, updated libs/symlinks -5.0 20-FEB-2017 version update LLB, security fixes, updated libs/symlinks, nvidia-switch -5.1 01-APR-2017 fix nvidia-switch lib names to prevent bad ldconfig symlinks on reboot -5.2 02-JUN-2017 version update LLB, refactor/debug scripts, use nvidia-installer -5.3 13-OCT-2017 version update LLB, bug fixes, update copyright -5.4 18-FEB-2018 version update LLB, updates, bug fix (thanks Leo) -5.5 25-MAR-2018 version update LLB -5.6 23-APR-2018 version update LLB, update symlinks, fix changelog formatting -5.7 28-MAY-2018 version update LLB -5.8 30-JUL-2018 version update LLB -5.9 06-SEP-2018 version update LLB -6.0 09-NOV-2019 renamed to nvidia-legacy390; last version to support 32-bit CPU. diff --git a/system/nvidia-legacy390-driver/doinst.sh b/system/nvidia-legacy390-driver/doinst.sh index 8ee62f049e..e0d49fcf75 100644 --- a/system/nvidia-legacy390-driver/doinst.sh +++ b/system/nvidia-legacy390-driver/doinst.sh @@ -2,5 +2,5 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications fi -./usr/sbin/nvidia-switch --install +usr/sbin/nvidia-switch --install diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild index a43fb0ca7d..b984a32580 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for nvidia-legacy390-driver -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2020 Lenard Spencer, Orlando, FL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,12 +26,11 @@ # see changelog.txt PRGNAM=nvidia-legacy390-driver -VERSION=${VERSION:-390.87} +VERSION=${VERSION:-390.141} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -GLVND=${GLVND:-yes} -# libglnvd may land in mesa and is Nvidia recommended +CURRENT=${CURRENT:-no} set -e @@ -69,6 +69,13 @@ else COMPAT32=no fi +# Abort if an Nvidia driver is still installed: +if [ -x /usr/bin/nvidia-installer ]; then + echo -e "\n A previous Nvidia installation has been detected!" + echo -e " Please remove the installed driver and rerun this script.\n" + exit 1 +fi + SRCNAM=NVIDIA-Linux-$TARGET-${VERSION} # make a clean package directory tree @@ -76,14 +83,11 @@ rm -rf $PKG rm -rf $TMP/$SRCNAM mkdir -p $TMP $PKG $OUTPUT $PKG/install mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/{drivers,extensions} \ - $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1,sbin} \ + $PKG/etc/OpenCL/vendors/ $PKG/usr/{bin,doc,man/man1} \ $PKG/usr/share/{applications,nvidia,pixmaps,egl/egl_external_platform.d} \ $PKG/usr/include/GL $PKG/etc/vulkan/icd.d $PKG/etc/X11/xorg.conf.d \ - $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log/nvidia/{32,64} \ + $PKG/etc/X11/glvnd/egl_vendor.d $PKG/var/log -if [ "$COMPAT32" = "yes" ]; then - mkdir -p $PKG/usr/lib/tls -fi # Extract all the sources cd $TMP @@ -95,8 +99,6 @@ rm -rf nvidia-xconfig-$VERSION tar xvf $CWD/nvidia-xconfig-$VERSION.tar.bz2 rm -rf nvidia-modprobe-$VERSION.tar.bz2 tar xvf $CWD/nvidia-modprobe-$VERSION.tar.bz2 -rm -rf nvidia-persistenced-$VERSION.tar.bz2 -tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2 sh $CWD/$SRCNAM.run --extract-only cd $SRCNAM chown -R root:root . @@ -106,9 +108,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 {} \; -# Compiling the various open source apps instead of using the precompiled binaries # Compiling nvidia-installer from source -cd $TMP/nvidia-installer-$VERSION +if [ "$CURRENT" = "no" ]; then + cd $TMP/nvidia-installer-$VERSION # Let's try to remove the conflicting files and GPU detection patch -p0 < $CWD/skip_conflict-GPU_detect.patch @@ -125,22 +127,18 @@ cd $TMP/nvidia-installer-$VERSION install -m 755 _out/Linux_$TARGET/nvidia-installer $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-installer.1.gz $PKG/usr/man/man1/ -cd - + cd - # Now we need to copy the newly patched and compiled nvidia-installer # to the driver source tree for use -mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM -mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM - -# Configure options -if [ "$GLVND" = "yes" ]; then - GLVNDOPT="--install-libglvnd --glvnd-glx-client --glvnd-egl-client" -else - GLVNDOPT="--no-install-libglvnd --no-glvnd-glx-client --no-glvnd-egl-client" + mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM + mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM fi + if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr" - MULTI="_multi" + MULTI="_multilib" + mkdir $PKG/usr/lib else if [ ! "$ARCH" = "x86_64" ]; then COMP32="" @@ -152,6 +150,7 @@ fi # Install the binary libs using nvidia-installer compiled above cd $TMP/$SRCNAM + ./nvidia-installer -s --no-kernel-module --no-drm --no-unified-memory \ -z -n -b --no-rpms --no-distro-scripts \ --no-kernel-module-source --no-x-check --force-libglx-indirect \ @@ -168,17 +167,19 @@ cd $TMP/$SRCNAM --log-file-name=$PKG/var/log/nvidia-installer.log \ --egl-external-platform-config-path=$PKG/usr/share/egl/egl_external_platform.d \ --no-nvidia-modprobe \ - $GLVNDOPT \ $COMP32 -# Clean-up: we really do not need this: -rm -rf /var/lib/nvidia -# which 32-bit tls? why? why? -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - install -m 755 32/tls/libnvidia-tls.so.$VERSION $PKG/usr/lib/tls/libnvidia-tls.so.$VERSION - cd $PKG/usr/lib - ln -sf tls/libnvidia-tls.so.$VERSION libnvidia-tls.so.$VERSION - cd - +# Move ICDs to $PKG and cleanup (no switch option in installer?) +mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd +mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json +# In current, mesa now puts an entry into this directory, so we +# leave it alone if it is not empty +if [ -z "$(ls -A /etc/OpenCL/vendors)" ]; then + rm -rf /etc/OpenCL +fi +# just in case any other programs make an entry here +if [ -z "$(ls -A /etc/vulkan)" ]; then + rm -rf /etc/vulkan fi # Compile utilites from source, replacing the precompiled versions @@ -198,7 +199,7 @@ cd $TMP/nvidia-settings-$VERSION make cd ../../ - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -fcommon" \ make install -m 755 src/_out/Linux_$TARGET/nvidia-settings $PKG/usr/bin/ @@ -240,36 +241,24 @@ cd - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" make - - install -m 755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/ +# must be installed suid root for nvidia-persistenced to work properly + install -m 4755 _out/Linux_$TARGET/nvidia-modprobe $PKG/usr/bin/ install -m 644 _out/Linux_$TARGET/nvidia-modprobe.1.gz $PKG/usr/man/man1/ cd - -# Compiling nvidia-persistenced - cd $TMP/nvidia-persistenced-$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" make -#FIXME: need rc.nvidia-persistenced script; see doc - install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ - install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ - cd - - # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files # so we don't stomp on the overlapping xorg files. # Note: switching can be problematic ;-) +mkdir -p $PKG/usr/sbin install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch -if [ "$GLVND" = "yes" ]; then +if [ "$CURRENT" = "no" ]; then sed -i s/GLVNDFLAG/yes/g $PKG/usr/sbin/nvidia-switch + sed -i s/GLVERSION/1.2.0/g $PKG/usr/sbin/nvidia-switch else sed -i s/GLVNDFLAG/no/g $PKG/usr/sbin/nvidia-switch + sed -i s/GLVERSION/1.7.0/g $PKG/usr/sbin/nvidia-switch fi if [ ${COMPAT32} = "yes" ]; then sed -i s/LIB32FLAG/yes/g $PKG/usr/sbin/nvidia-switch @@ -278,41 +267,26 @@ else fi # These add or correct wrong paths -sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la +if [ "$CURRENT" = "no" ]; then + sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la + sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la + + if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then + sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la + sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la + sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la + fi +fi sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la - sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la - sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la -fi - # rename wrong/conficting files as needed; remove conflicting symlinks created by installer cd $PKG/usr/lib$LIBDIRSUFFIX - if [ "$GLVND" = "yes" ]; then + if [ "$CURRENT" = "no" ]; then mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi - mv libGL.la libGL.la-nvidia - mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia - mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia - rm -f libEGL.so - rm -f libGL.so - rm -f libGL.so.1 - rm -f libGLESv1_CM.so - rm -f libGLESv2.so - rm -f xorg/modules/libwfb.so - rm -f xorg/modules/extensions/libglx.so -cd - - -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - cd $PKG/usr/lib - if [ "$GLVND" = "yes" ]; then - mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia - fi mv libGL.la libGL.la-nvidia + mv libGL.so.1.7.0 libGL.so.1.7.0-nvidia mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia rm -f libEGL.so @@ -320,24 +294,50 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then rm -f libGL.so.1 rm -f libGLESv1_CM.so rm -f libGLESv2.so + else + rm libGL.la + rm libOpenCL.so.1.0.0 + fi + rm -f xorg/modules/libwfb.so + if [ -e xorg/modules/extensions/libglx.so ]; then + (cd xorg/modules/extensions + rm libglx.so + ) + fi +cd - + +if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then + cd $PKG/usr/lib + if [ "$CURRENT" = "no" ]; then + mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia + mv libGL.la libGL.la-nvidia + mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia + mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia + rm -f libEGL.so + rm -f libGL.so + rm -f libGL.so.1 + rm -f libGLESv1_CM.so + rm -f libGLESv2.so + else + rm libGL.la + rm libOpenCL.so.1.0.0 + fi cd - -# FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1 symlink to $PKG/usr/lib64/libGL.so.1 -# appears? Who would do this, so ignoring for now. +# FIXME With COMPAT32=yes on pure x86_64, a weird /usr/lib/libGL.so.1 +# symlink to $PKG/usr/lib64/libGL.so.1 appears? Who would do this, +# so ignoring for now. fi -# Move ICDs to $PKG and cleanup (no switch option in installer?) -mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd -mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json -rm -rf /etc/OpenCL -rm -rf /etc/vulkan - -# Remove xorg conf file since we take care of that in nvidia-legacy390-driver +# Remove xorg conf file since we handle that in nvidia-legacy390-kernel rm -rf $PKG/etc/X11/xorg.conf.d -cat <<EOF > $PKG/var/log/nvidia/README.txt +if [ "$CURRENT" = "no" ]; then + mkdir -p $PKG/var/log/nvidia/{32,64} + cat <<EOF > $PKG/var/log/nvidia/README.txt Do NOT delete this directory! nvidia-switch will backup the original X.org libraries here. EOF +fi cd $TMP/$SRCNAM # put docs in the right place @@ -347,11 +347,63 @@ mv $PKG/usr/share/doc/NVIDIA_GLX-1.0 $PKG/usr/doc/$PRGNAM-$VERSION rm -rf $PKG/usr/share/doc cp -a LICENSE NVIDIA_Changelog README.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware +cp $CWD/README.nvidia-persistenced $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild sed "s/PKGVERSION/$VERSION/g" $CWD/slack-desc > $PKG/install/slack-desc +if [ "$COMPAT32" = "yes" ]; then + sed -i "s|@MULTILIB@|This package includes the 32-bit compatibility libraries.|" $PKG/install/slack-desc +else + sed -i "s|@MULTILIB@||" $PKG/install/slack-desc +fi + cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Flag install as multlib as needed and build package. +# Add rc.nvidia-persistenced: +if [ "${PERSISTENCED:-no}" = "yes" ]; then + cd $TMP + rm -rf nvidia-persistenced-$VERSION.tar.bz2 + tar xvf $CWD/nvidia-persistenced-$VERSION.tar.bz2 +# Compiling nvidia-persistenced + cd $TMP/nvidia-persistenced-$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" make + install -m 755 _out/Linux_$TARGET/nvidia-persistenced $PKG/usr/bin/ + install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ + + if ! getent group nvidia > /dev/null 2>&1; then + echo "Creating the group nvidia:" + groupadd -g 365 nvidia || exit 1 + fi + if ! getent passwd nvidia > /dev/null 2>&1; then + echo "Creating the user nvidia:" + useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1 + fi + mkdir -p $PKG/var/run/nvidia-persistenced + chown nvidia:nvidia $PKG/var/run/nvidia-persistenced + mkdir -p $PKG/etc/rc.d + install -m 755 $CWD/rc.nvidia-persistenced $PKG/etc/rc.d/rc.nvidia-persistenced + sed -i "s|__USER__|nvidia|" $PKG/etc/rc.d/rc.nvidia-persistenced + cat <<EOF >> $PKG/install/doinst.sh +# Create group and user nvidia if they don't already exist +if ! getent group nvidia > /dev/null 2>&1; then + echo "Creating the group nvidia:" + groupadd -g 365 nvidia || exit 1 +fi +if ! getent passwd nvidia > /dev/null 2>&1; then + echo "Creating the user nvidia:" + useradd -u 365 -g 365 -c "Nvidia" -d /dev/null -s /bin/false nvidia || exit 1 +fi + +EOF +fi + +# Flag multlib as needed and build package. cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info index 52f803c311..110f8ab193 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info @@ -1,30 +1,30 @@ PRGNAM="nvidia-legacy390-driver" -VERSION="390.87" +VERSION="390.141" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.87/NVIDIA-Linux-x86-390.87.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.87.tar.bz2" -MD5SUM="c21fd1e9048d3cf12552a9e9035df3cf \ - c9c0601e5a8ef8242b39033b69f914a6 \ - 36c72558fa7d344445851f760a86b5ba \ - 4143b80f8e0443348514b4b529c518d8 \ - f75356a74ce19adfd4ca50d8f7811e07 \ - 8e7c994a931cd6ce5a384bda6bded72c" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.87/NVIDIA-Linux-x86_64-390.87.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.87.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.87.tar.bz2" -MD5SUM_x86_64="35c36552e252a18297d6e1b976ef247c \ - c9c0601e5a8ef8242b39033b69f914a6 \ - 36c72558fa7d344445851f760a86b5ba \ - 4143b80f8e0443348514b4b529c518d8 \ - f75356a74ce19adfd4ca50d8f7811e07 \ - 8e7c994a931cd6ce5a384bda6bded72c" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.141.tar.bz2" +MD5SUM="f3e6660ffe5338b17b7e643d0eceb57e \ + ff1c359809225ac9fc3562a16bc302bd \ + baa8df62e2449ec6dd55c3d27cf23490 \ + 24c4e151626dc920525966d4bd3a2dbd \ + 61be9b85fd9b2198cdbc555a3625d39b \ + 94c281d2704d87809176e3084102bfee" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.141.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.141.tar.bz2" +MD5SUM_x86_64="0c7fc061349bbb2f0d7e26af9f1b082a \ + ff1c359809225ac9fc3562a16bc302bd \ + baa8df62e2449ec6dd55c3d27cf23490 \ + 24c4e151626dc920525966d4bd3a2dbd \ + 61be9b85fd9b2198cdbc555a3625d39b \ + 94c281d2704d87809176e3084102bfee" REQUIRES="nvidia-legacy390-kernel" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmail.com" diff --git a/system/nvidia-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch index 7d97f3304b..2f57366cfd 100644 --- a/system/nvidia-legacy390-driver/nvidia-switch +++ b/system/nvidia-legacy390-driver/nvidia-switch @@ -1,6 +1,7 @@ #!/bin/sh # Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA +# Updates copyright 2020 Lenard Spencer, Orlando, FL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,15 +21,23 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# nvidia-switch utility 4.0 +# nvidia-switch utility 4.0.1 # -# A tool to install and cleanly remove the nvidia driver without stomping on the xorg files. -# Note: this tool "should" allow switching on the fly, but why? Pick a driver! You will still -# need to edit a bunch of other config files. +# A tool to install and cleanly remove the nvidia driver without +# stomping on the xorg files. Note: this tool "should" allow switching +# on the fly, but why? Pick a driver! You will still need to edit a bunch +#of other config files. # TO-DO: needs more cleanup, simplify linking using system tools -ROOT="${ROOT:-/}" + +# When ROOT=<PATH> is specified when using {install,upgrade,remove}pkg, +# PATH is usually specified without a trailing "/", so we add one here +if [ "$ROOT" = "" ]; then + ROOT="${ROOT:-"/"}" +else + ROOT="${ROOT}/" +fi CWD=$(pwd) COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no) LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script @@ -38,9 +47,8 @@ LIB32="${ROOT}usr/lib" XMOD="${LIB}/xorg/modules" XLIB="$XMOD/extensions" NV_VERSION="PKGVERSION" # This will be replaced in the build script -GL_VERSION="1.2.0" +GL_VERSION="GLVERSION" GLVND="GLVNDFLAG" # This will be replaced in the build script (yes | no) -NV_CONF="${ROOT}usr/share/X11/xorg.conf.d/10-nvidia.conf" SAVELIBS="${ROOT}var/log/nvidia" save_GL(){ @@ -57,54 +65,39 @@ save_GL(){ case "$1" in "nvidia") - mv libGL.so.$GL_VERSION $SAVELIBS/libGL.so.$GL_VERSION - mv libGL.la $SAVELIBS/libGL.la - mv libEGL.so.1.0.0 $SAVELIBS/libEGL.so.1.0.0 - mv libGLESv1_CM.so.1.1.0 $SAVELIBS/libGLESv1_CM.so.1.1.0 - mv libGLESv2.so.2.0.0 $SAVELIBS/libGLESv2.so.2.0.0 - mv libGL.la-nvidia libGL.la - if [ "$GLVND" = "yes" ]; then - ln -sf libGL.so.1.7.0 libGL.so.1 - ln -sf libGL.so.1.7.0 libGL.so + mv libGL.so.$GL_VERSION $SAVELIBS + mv libGL.la $SAVELIBS + mv libEGL.so.1.?.0 $SAVELIBS + mv libGLESv1_CM.so.1.1.0 $SAVELIBS + mv libGLESv2.so.2.0.0 $SAVELIBS + mv libGL.la-nvidia libGL.la + ln -sf libGL.so.1.7.0-nvidia libGL.so.1 + ln -sf libGL.so.1 libGL.so ln -sf libEGL.so.1.1.0-nvidia libEGL.so.1.1.0 - ln -sf libEGL.so.1.1.0-nvidia libEGL.so - else - ln -sf libGL.so.$NV_VERSION libGL.so.1 - ln -sf libGL.so.$NV_VERSION libGL.so - ln -sf libEGL.so.$NV_VERSION libEGL.so.1 - ln -sf libEGL.so.$NV_VERSION libEGL.so + ln -sf libEGL.so.1 libEGL.so + ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.libGLESv1_CM.so.1 + ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so + ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2 + ln -sf libGLESv2.so.2 libGLESv2.so fi - - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1.2.0 - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so.1 - ln -sf libGLESv1_CM.so.1.2.0-nvidia libGLESv1_CM.so - - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2.1.0 - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so.2 - ln -sf libGLESv2.so.2.1.0-nvidia libGLESv2.so ;; "xorg") - mv libGL.la libGL.la-nvidia - mv $SAVELIBS/libGL.so.$GL_VERSION libGL.so.$GL_VERSION - mv $SAVELIBS/libGL.la libGL.la - mv $SAVELIBS/libEGL.so.1.0.0 libEGL.so.1.0.0 - mv $SAVELIBS/libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0 - mv $SAVELIBS/libGLESv2.so.2.0.0 libGLESv2.so.2.0.0 - - ln -sf libGL.so.$GL_VERSION libGL.so.1 - ln -sf libGL.so.$GL_VERSION libGL.so - ln -sf libEGL.so.1.0.0 libEGL.so.1 - ln -sf libEGL.so.1.0.0 libEGL.so - rm -f libEGL.so.1.1.0 - - ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1 - ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so - ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2 - ln -sf libGLESv2.so.2.0.0 libGLESv2.so - rm -f libGLESv1_CM.so.1.2.0 - rm -f libGLESv2.so.2.1.0 + if [ -e libGL.la ]; then + mv libGL.la libGL.la-nvidia + fi + if [ "$GLVND" = "yes" ]; then + mv $SAVELIBS/* . + ln -sf libGL.so.$GL_VERSION libGL.so.1 + ln -sf libGL.so.1 libGL.so + ln -sf libEGL.so.1.0.0 libEGL.so.1 + ln -sf libEGL.so.1 libEGL.so + ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1 + ln -sf libGLESv1_CM.so.1.1.0 libGLESv1_CM.so + ln -sf libGLESv2.so.2.0.0 libGLESv2.so.2 + ln -sf libGLESv2.so.2.0.0 libGLESv2.so + fi ;; *) @@ -120,17 +113,24 @@ save_glx(){ case "$1" in "nvidia") if [ -e libglx.so ]; then - mv libglx.so xorg-libglx.so + cp -a libglx.so libglx.so-xorg fi ln -sf libglx.so.$NV_VERSION libglx.so ;; "xorg") - if [ -e xorg-libglx.so ]; then + if [ -e libglx.so-xorg ]; then rm -f libglx.so - mv xorg-libglx.so libglx.so + mv libglx.so-xorg libglx.so else - rm -f libglx.so - fi + if [ ! -e libglx.so ]; then + echo -e "WARNING: libglx.so not found! Please reinstall xorg-server!\n" + else + if [ -L libglx.so ]; then + rm libglx.so + echo -e "WARNING: removed dead symlink libglx.so! Please reinstall xorg-server!\n" + fi + fi + fi ;; *) echo "nothing to do for save_glx?" @@ -142,18 +142,12 @@ save_glx(){ save_wfb(){ cd "$XMOD" - if [ -e libwfb.so ]; then - echo "Using existing Xorg libwfb..." - else - if [ "$1" = "nvidia" ]; then - ln -sf libwfb.so.$NV_VERSION libwfb.so.1 - ln -sf libwfb.so.1 libwfb.so + if [ "$1" = "nvidia" ]; then + ln -sf libnvidia-wfb.so.$NV_VERSION libnvidia-wfb.so.1 fi if [ "$1" = "xorg" ]; then - rm -f libwfb.so - rm -f libwfb.so.1 + rm -f libnvidia-wfb.so.1 fi - fi cd "$CWD" } @@ -162,10 +156,10 @@ nvidia_install(){ echo "Creating missing $SAVELIB ..." mkdir -p $SAVELIBS fi - echo $'Installing to nvidia-legacy390-driver files!\n' + echo $'Installing to nvidia-legacy390-driver files:\n' echo "Make sure the nvidia driver is ENABLED in /etc/X11/xorg.conf" - echo "and in /etc/X11/xorg.conf.d." - echo "Otherwise, this may lead to improperly working drivers." + echo "and in /etc/X11/xorg.conf.d. Otherwise, this may lead to" + echo -e "improperly working drivers.\n" save_glx "nvidia" save_GL "nvidia" $LIB @@ -177,11 +171,13 @@ nvidia_install(){ } nvidia_remove(){ - echo $'Returning to stock xorg files!\n' + echo $'Returning to stock xorg files:\n' echo "Make sure the nvidia driver is DISABLED in /usr/share/X11/xorg.conf.d" echo "/etc/X11/xorg.conf and in /etc/X11/xorg.conf.d." - echo "Otherwise, this may lead to improperly working drivers." - + echo -e "Otherwise, this may lead to improperly working drivers.\n" + if [ "$GLVND" = "yes" ]; then + echo -e "Be sure to run /sbin/ldconfig after removing nvidia-legacy390-driver.\n" + fi save_glx "xorg" save_GL "xorg" $LIB save_wfb "xorg" @@ -190,63 +186,14 @@ nvidia_remove(){ if [ "$COMPAT32" = "yes" ]; then save_GL "xorg" $LIB32 fi - - if [ -e $NV_CONF ]; then - echo "removing $NV_CONF: you will need to provide your own" - echo "or reinstall nvidia-legacy390-driver." - rm -f $NV_CONF - fi } -restore(){ -# Attempt to reinstall damaged stock packages if something went wrong. -# Obviously, you will need to run this after '--remove' and before -# 'removepkg nvidia-legacy390-driver'. -# User must: -# 1. remove any dangling symlinks and xorg-*, *-nvidia files in /usr/lib*/, -# and any other housekeeping tasks. -# 2. copy stock Slackware packages to /root/Slackware or provide an alternate location -# 3. be running Slackware-14.2, not current -# 4. realize that COMPAT32 is not stable ;-) - if [ "$LIBSUFFIX" = "64" ]; then ARCH="x86_64" else ARCH="x86" fi -PKGPATH=${PKGPATH:-/root/Slackware} -MESA="mesa-11.2.2-$ARCH-1.txz" -MESA32="mesa-compat32-11.2.2-$ARCH-1compat32.txz" -XORG="xorg-server-1.18.3-$ARCH-2.txz" -# Note: The above is for stock 14.2; modify as needed for /patches or -# multilib updates -if [ -d $PKGPATH ]; then - if [ `find $PKGPATH -prune -empty -type d` ]; then - echo "Your $PKGPATH is empty!" - else - upgradepkg --reinstall --install-new $MESA $XORG - if [ "COMPAT32" = "yes" ]; then - upgradepkg --reinstall --install-new $MESA32 - fi - fi -else - echo "Please create $PKGPATH containing the appropriate packages" -fi -} - -usage(){ - echo "Usage:" - echo " --install Set up nvidia driver files" - echo " --remove Return to stock xorg files and restore all symlinks" - echo " --restore Reinstall stock Mesa and xorg-server [EXPERIMENTAL]" - echo " mesa-11.2.2, org-server-1.18.3, and optionally" - echo " mesa-compat32-11.2.2 are expected in /root/Slackware" - echo " Use 'PKGPATH=\"<location>\" nvidia-switch --restore'" - echo " to override." - echo " --help Show this help message" -} - case "$1" in "--install") nvidia_install @@ -254,9 +201,6 @@ case "$1" in "--remove") nvidia_remove ;; - "--restore") - restore - ;; "--help") usage ;; diff --git a/system/nvidia-legacy390-driver/rc.nvidia-persistenced b/system/nvidia-legacy390-driver/rc.nvidia-persistenced new file mode 100644 index 0000000000..59bdf18d11 --- /dev/null +++ b/system/nvidia-legacy390-driver/rc.nvidia-persistenced @@ -0,0 +1,61 @@ +#!/bin/sh -e +# +# NVIDIA Persistence Daemon Init Script +# +# Copyright (c) 2013 NVIDIA Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +NVPD=nvidia-persistenced +NVPD_BIN=/usr/bin/${NVPD} +NVPD_RUNTIME=/var/run/${NVPD} +NVPD_PIDFILE=${NVPD_RUNTIME}/${NVPD}.pid +NVPD_USER=__USER__ + +if [ -f ${NVPD_PIDFILE} ]; then + read -r NVPD_PID < "${NVPD_PIDFILE}" + # Remove stale runtime files + if [ "${NVPD_PID}" ] && [ ! -d /proc/${NVPD_PID} ]; then + unset NVPD_PID + rm -rf "${NVPD_RUNTIME}" + fi +fi + +case "${1}" in + start) + echo "Starting NVIDIA Persistence Daemon" + + # Execute the daemon as the intended user + ${NVPD_BIN} --user ${NVPD_USER} + ;; + stop) + echo "Stopping NVIDIA Persistence Daemon" + + # Stop the daemon - its PID should have been read in + [ ! -z "${NVPD_PID}" ] && kill ${NVPD_PID} &> /dev/null + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/system/nvidia-legacy390-driver/slack-desc b/system/nvidia-legacy390-driver/slack-desc index af1addf510..74666d37f0 100644 --- a/system/nvidia-legacy390-driver/slack-desc +++ b/system/nvidia-legacy390-driver/slack-desc @@ -15,5 +15,5 @@ nvidia-legacy390-driver: nvidia-legacy390-driver: See /usr/doc/nvidia-legacy390-driver-PKGVERSION/README.Slackware nvidia-legacy390-driver: for more information. nvidia-legacy390-driver: -nvidia-legacy390-driver: +nvidia-legacy390-driver: @MULTILIB@ nvidia-legacy390-driver: diff --git a/system/nvidia-legacy390-kernel/README b/system/nvidia-legacy390-kernel/README index ab0d4a748f..adb7c9d3fd 100644 --- a/system/nvidia-legacy390-kernel/README +++ b/system/nvidia-legacy390-kernel/README @@ -1,13 +1,18 @@ -This is the kernel-module needed by the proprietary binary nvidia driver. -You also need the nvidia-legacy390-driver package from SlackBuilds.org. +This is the kernel-module needed by the proprietary binary nvidia +driver. You also need the nvidia-legacy390-driver package from +SlackBuilds.org. To build the package for a kernel different from the running one, start the script setting the KERNEL variable as in KERNEL=4.6.3 ./nvidia-legacy390-kernel.SlackBuild -A default config file is placed at /usr/share/X11/xorg.conf.d/10-nvidia.conf -to make sure that X loads the nvidia module. If you need to make changes, -move that file to /etc/X11/xorg.conf.d/ and edit the copy. You do not need -this file at all if you have a proper and complete xorg.conf. +A default config file is placed at +/usr/share/X11/xorg.conf.d/10-nvidia.conf to make sure that X loads +the nvidia module. If you need to make changes, copy that file to +/etc/X11/xorg.conf.d/ and edit the copy. You do not need this file +at all if you have a proper and complete xorg.conf. + +This script now includes the patches to enable building on newer +kernels. (MANY thanks to willysr and Herecura for the fixes.) The xf86-video-nouveau-blacklist package from /extra is required. diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild index a8a3710ad2..dadc3c08c9 100644 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild +++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for nvidia-legacy390-kernel # Copyright 2007-2011 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2012-2017 Edward W. Koenig, Vancouver, WA, USA +# Copyright 2012-2019 Edward W. Koenig, Vancouver, WA, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ # see nvidia-driver/changelog.txt PRGNAM=nvidia-legacy390-kernel -VERSION=${VERSION:-390.87} +VERSION=${VERSION:-390.141} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -49,10 +49,8 @@ fi if [ "$ARCH" = "i586" ]; then TARGET="x86" - SRCSUFFIX="" elif [ "$ARCH" = "i686" ]; then TARGET="x86" - SRCSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then TARGET="x86_64" fi diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info index 215e292bb7..2cf1128cb0 100644 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info +++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-legacy390-kernel" -VERSION="390.87" +VERSION="390.141" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.87/NVIDIA-Linux-x86-390.87.run" -MD5SUM="c21fd1e9048d3cf12552a9e9035df3cf" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.87/NVIDIA-Linux-x86_64-390.87.run" -MD5SUM_x86_64="35c36552e252a18297d6e1b976ef247c" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.141/NVIDIA-Linux-x86-390.141.run" +MD5SUM="f3e6660ffe5338b17b7e643d0eceb57e" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.141/NVIDIA-Linux-x86_64-390.141.run" +MD5SUM_x86_64="0c7fc061349bbb2f0d7e26af9f1b082a" REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="Lenard Spencer" +EMAIL="lenardrspencer@gmai.com" diff --git a/system/nvme-cli/nvme-cli.SlackBuild b/system/nvme-cli/nvme-cli.SlackBuild index 3c0f4e48a4..e8980f65af 100644 --- a/system/nvme-cli/nvme-cli.SlackBuild +++ b/system/nvme-cli/nvme-cli.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nvme-cli -# Copyright 2017-2019, Alexander Verbovetsky, Moscow, Russia +# Copyright 2017-2020, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nvme-cli -VERSION=${VERSION:-1.7} +VERSION=${VERSION:-1.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,8 +65,14 @@ 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 {} \; -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr -make install DESTDIR=$PKG PREFIX=/usr SBINDIR=/usr/sbin +make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr SBINDIR=/usr/sbin +make install CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ + PREFIX=/usr SBINDIR=/usr/sbin DESTDIR=$PKG + +rm -f $PKG/etc/nvme/* +rm -r $PKG/etc/udev +rm -r $PKG/usr/lib/{dracut,systemd} +rmdir --ignore-fail-on-non-empty $PKG/usr/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 @@ -76,14 +82,13 @@ mv $PKG/usr/share/bash-completion/completions/nvme $PKG/etc/bash_completion.d/nv rmdir $PKG/usr/share/bash-completion/completions/ rmdir $PKG/usr/share/bash-completion/ -mv $PKG/usr/share/man $PKG/usr/ -rmdir --ignore-fail-on-non-empty $PKG/usr/share/ +mv $PKG/usr/share/man $PKG/usr/man 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/completions -cp -a CONTRIBUTING.md README.md LICENSE scripts $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CONTRIBUTING* README* LICENSE* scripts $PKG/usr/doc/$PRGNAM-$VERSION cp -a completions/{README,_nvme} $PKG/usr/doc/$PRGNAM-$VERSION/completions cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/nvme-cli/nvme-cli.info b/system/nvme-cli/nvme-cli.info index eba9cc3ff5..b5ecb010b2 100644 --- a/system/nvme-cli/nvme-cli.info +++ b/system/nvme-cli/nvme-cli.info @@ -1,8 +1,8 @@ PRGNAM="nvme-cli" -VERSION="1.7" +VERSION="1.13" HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.7/nvme-cli-1.7.tar.gz" -MD5SUM="ec64bc935957f6bc52109bde704a5a42" +DOWNLOAD="https://github.com/linux-nvme/nvme-cli/archive/v1.13/nvme-cli-1.13.tar.gz" +MD5SUM="a9a326d481fa7bd68cb03bfc5c5e7f44" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ocfs2-tools/README b/system/ocfs2-tools/README new file mode 100644 index 0000000000..b3c110891f --- /dev/null +++ b/system/ocfs2-tools/README @@ -0,0 +1,7 @@ +These are tools for the OCFS2 filesystem. + +To enable GUI, build with: + + GUI=yes ./ocfs2-tools.SlackBuild + +More information post-install can be found in README.SLACKWARE diff --git a/system/ocfs2-tools/README.SLACKWARE b/system/ocfs2-tools/README.SLACKWARE new file mode 100644 index 0000000000..0a0b3e91e2 --- /dev/null +++ b/system/ocfs2-tools/README.SLACKWARE @@ -0,0 +1,43 @@ +Starting the daemon on boot +--------------------------- + +You may wish to add these lines to /etc/rc.d/rc.local to start the service: + + if [ -x /etc/rc.d/rc.o2cb ]; then + /etc/rc.d/rc.o2cb start + fi + +You may also add these lines to /etc/rc.d/rc.local_shutdown: + + if [ -x /etc/rc.d/rc.o2cb ]; then + /etc/rc.d/rc.o2cb stop + fi + +Remember to give executable permission to /etc/rc.d/rc.local_shutdown: + + chmod 0755 /etc/rc.d/rc.local_shutdown + +Configuring the cluster system +------------------------------ + +Before the o2cb daemon can be started on boot, O2CB_ENABLED variable should +be set to "true" in /etc/default/o2cb + +Creating cluster.conf in /etc/ocfs2 can be done with `o2cb` command. + +For example, to define a cluster named ocfs2 with two nodes: + + o2cb add-cluster ocfs2 + o2cb add-node ocfs2 node0 --ip 10.1.0.100 + o2cb add-node ocfs2 node1 --ip 10.1.0.101 + +Heartbeat is configured with: + + o2cb add-heartbeat cluster_name device1 + +Use the `mkfs.ocfs2` command to create an OCFS2 volume on a block device. + +Mounting OCFS2 volumes on boot is done with /etc/rc.d/rc.ocfs2 init script. + +For additional steps and details, read "Installing and Configuring OCFS2" +that can be found on: https://docs.oracle.com/ diff --git a/system/ocfs2-tools/doinst.sh b/system/ocfs2-tools/doinst.sh new file mode 100644 index 0000000000..fcddf04338 --- /dev/null +++ b/system/ocfs2-tools/doinst.sh @@ -0,0 +1,27 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.o2cb.new +preserve_perms etc/rc.d/rc.ocfs2.new +config etc/default/o2cb.new diff --git a/system/ocfs2-tools/ocfs2-tools.SlackBuild b/system/ocfs2-tools/ocfs2-tools.SlackBuild new file mode 100644 index 0000000000..b0db7d0ce9 --- /dev/null +++ b/system/ocfs2-tools/ocfs2-tools.SlackBuild @@ -0,0 +1,135 @@ +#!/bin/sh + +# Slackware build script for ocfs2-tools + +# Copyright 2019 Mario Preksavec, Zagreb, Croatia +# 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. + +PRGNAM=ocfs2-tools +VERSION=${VERSION:-1.8.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +# GUI support, includes a desktop icon +GUI=${GUI:-no} +case ${GUI,,} in + yes) ENABLE_GUI="--enable-ocfs2console=yes" ;; + *) ENABLE_GUI="" ;; +esac + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-{$VERSION,$PRGNAM-$VERSION} +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION || cd $PRGNAM-$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" \ +./autogen.sh \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + $ENABLE_GUI \ + --build=$ARCH-slackware-linux + +make -j1 +make install DESTDIR=$PKG + +# Copy init scripts and fix them +install -D -m0755 -oroot -groot vendor/common/o2cb.init $PKG/etc/rc.d/rc.o2cb.new +install -D -m0755 -oroot -groot vendor/common/ocfs2.init $PKG/etc/rc.d/rc.ocfs2.new +sed -e 's|/etc/redhat-release|/etc/init.d/functions|' \ + -i $PKG/etc/rc.d/rc.o2cb.new \ + -i $PKG/etc/rc.d/rc.ocfs2.new + +# Default settings, udev rules and sample configuration +install -D -m0644 -oroot -groot vendor/common/o2cb.sysconfig \ + $PKG/etc/default/o2cb.new +install -D -m0644 -oroot -groot vendor/common/51-ocfs2.rules \ + $PKG/lib/udev/rules.d/51-ocfs2.rules +install -D -m0644 -oroot -groot documentation/samples/cluster.conf \ + $PKG/etc/ocfs2/cluster.conf.sample + +# More GUI stuff +case ${GUI,,} in + yes) install -D -m0644 -oroot -groot vendor/common/ocfs2console.desktop \ + $PKG/usr/share/applications/ocfs2console.desktop + install -D -m0644 -oroot -groot vendor/common/ocfs2console.png \ + $PKG/usr/share/icons/hicolor/48x48/apps/ocfs2console.png + sed -e 's#^\(Icon=\).*#\1/usr/share/icons/hicolor/48x48/apps/ocfs2console.png#' \ + -i $PKG/usr/share/applications/ocfs2console.desktop + ;; +esac + +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 CREDITS MAINTAINERS README.O2CB documentation/*.* $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE + +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:-tgz} diff --git a/system/ocfs2-tools/ocfs2-tools.info b/system/ocfs2-tools/ocfs2-tools.info new file mode 100644 index 0000000000..fc59cc59a6 --- /dev/null +++ b/system/ocfs2-tools/ocfs2-tools.info @@ -0,0 +1,10 @@ +PRGNAM="ocfs2-tools" +VERSION="1.8.5" +HOMEPAGE="https://github.com/markfasheh/ocfs2-tools/" +DOWNLOAD="https://github.com/markfasheh/ocfs2-tools/archive/ocfs2-tools-1.8.5.tar.gz" +MD5SUM="d6d76da6006e28272a223065a7802798" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/system/ocfs2-tools/slack-desc b/system/ocfs2-tools/slack-desc new file mode 100644 index 0000000000..9c8aa727a6 --- /dev/null +++ b/system/ocfs2-tools/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------------------------------------------------------| +ocfs2-tools: ocfs2-tools (OCFS2 tools) +ocfs2-tools: +ocfs2-tools: These are tools for the OCFS2 filesystem. +ocfs2-tools: +ocfs2-tools: Homepage: https://github.com/markfasheh/ocfs2-tools +ocfs2-tools: +ocfs2-tools: +ocfs2-tools: +ocfs2-tools: +ocfs2-tools: +ocfs2-tools: diff --git a/system/oksh/README b/system/oksh/README new file mode 100644 index 0000000000..0690eec862 --- /dev/null +++ b/system/oksh/README @@ -0,0 +1 @@ +Portable OpenBSD ksh, based on the Public Domain Korn Shell (pdksh). diff --git a/system/oksh/doinst.sh b/system/oksh/doinst.sh new file mode 100644 index 0000000000..de374ed98d --- /dev/null +++ b/system/oksh/doinst.sh @@ -0,0 +1,8 @@ +if [ ! -r etc/shells ]; then + touch etc/shells + chmod 644 etc/shells +fi + +if ! grep -q /bin/oksh etc/shells ; then + printf %s\\n /bin/oksh >> etc/shells +fi diff --git a/system/oksh/oksh.SlackBuild b/system/oksh/oksh.SlackBuild new file mode 100644 index 0000000000..b1b8988316 --- /dev/null +++ b/system/oksh/oksh.SlackBuild @@ -0,0 +1,100 @@ +#!/bin/sh + +# Slackware build script for oksh + +# Copyright 2019-2020 Hunter Sezen California, USA +# 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. + +PRGNAM=oksh +VERSION=${VERSION:-6.8.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 -eu + +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" \ +./configure \ + --prefix=/usr \ + --bindir=/bin \ + --mandir=/usr/man + +make +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/bin +ln -sf /bin/$PRGNAM $PKG/usr/bin/$PRGNAM + +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 CONTRIBUTORS LEGAL NOTES PROJECTS README.md README.pdksh \ + $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:-tgz} diff --git a/system/oksh/oksh.info b/system/oksh/oksh.info new file mode 100644 index 0000000000..ca37cc9ba1 --- /dev/null +++ b/system/oksh/oksh.info @@ -0,0 +1,10 @@ +PRGNAM="oksh" +VERSION="6.8.1" +HOMEPAGE="https://github.com/ibara/oksh" +DOWNLOAD="https://github.com/ibara/oksh/releases/download/oksh-6.8.1/oksh-6.8.1.tar.gz" +MD5SUM="ce8b7c278e6d36bbbd7b54c218fae7ba" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Hunter Sezen" +EMAIL="orbea@riseup.net" diff --git a/system/oksh/slack-desc b/system/oksh/slack-desc new file mode 100644 index 0000000000..1fbc1b1032 --- /dev/null +++ b/system/oksh/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------------------------------------------------------| +oksh: oksh (Portable OpenBSD ksh) +oksh: +oksh: Portable OpenBSD ksh(1). +oksh: +oksh: Homepage: https://github.com/ibara/oksh +oksh: +oksh: +oksh: +oksh: +oksh: +oksh: diff --git a/system/oldschool-pc-fonts/README b/system/oldschool-pc-fonts/README index 7f05768503..e4d1dc7c58 100644 --- a/system/oldschool-pc-fonts/README +++ b/system/oldschool-pc-fonts/README @@ -1,10 +1,12 @@ oldschool-pc-fonts (remakes of PC text mode fonts) -The Ultimate Oldschool PC Font Pack brings you pixel-perfect remakes of -various type styles from text-mode era PCs - in modern, multi-platform, -Unicode-compatible TrueType form, and/or as Linux .psfu console fonts. +The Ultimate Oldschool PC Font Pack brings you pixel-perfect +remakes of various type styles from text-mode era PCs - in modern, +multi-platform, Unicode-compatible TrueType (and OpenType Bitmap) +form, and/or as Linux .psfu console fonts. -By default, the package will include TrueType fonts. To also include -console fonts, install graphics/psftools before running this script. -If you only want console fonts, set TTF=no in the script's environment. -See README_console.txt for more information. +By default, the package will include TrueType and OTB (OpenType +Bitmap) fonts. To also include console fonts (PSFU), install +graphics/psftools before running this script. If you only want console +fonts, set TTF=no in the script's environment. See README_console.txt +for more information. diff --git a/system/oldschool-pc-fonts/doinst.sh b/system/oldschool-pc-fonts/doinst.sh index 251ce03afb..4d463758c8 100644 --- a/system/oldschool-pc-fonts/doinst.sh +++ b/system/oldschool-pc-fonts/doinst.sh @@ -4,6 +4,10 @@ if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then /usr/bin/mkfontscale . /usr/bin/mkfontdir . ) + ( cd usr/share/fonts/misc + /usr/bin/mkfontscale . + /usr/bin/mkfontdir . + ) fi if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f diff --git a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild index 0058c3ab0e..0cf5777b79 100644 --- a/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild +++ b/system/oldschool-pc-fonts/oldschool-pc-fonts.SlackBuild @@ -24,6 +24,13 @@ # Now maintained by B. Watson <yalhcru@gmail.com> +# 20201207 bkw: +# - Update for v2.2. Enough changes that we can't build the old version with +# the modified script. +# - Include all upstream's documentation. +# - Include OTB fonts, now that they exist. +# - gzip the .psfu fonts. + # 20180108 bkw: # - Take over maintenance. # - BUILD=2. @@ -32,8 +39,8 @@ # - A bit of useful documentation in README_console.txt. PRGNAM=oldschool-pc-fonts -VERSION=${VERSION:-1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH=noarch @@ -43,13 +50,13 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -eu +set -e -# There are 2 sets of fonts that can be installed: the TrueType ones -# and console ones converted from the .FON files. These 2 variables control -# which are installed: +# There are 2 sets of fonts that can be installed: the TrueType (and +# OTB, OpenType Bitmap) ones and console ones converted from the .FON +# files. These 2 variables control which are installed: -TTF=${TTF:-yes} # By default, TTF is installed +TTF=${TTF:-yes} # By default, TTF and OTB are installed CONSOLE=${CONSOLE:-yes} # By default, install console fonts if possible if [ "$CONSOLE" = "yes" ]; then @@ -60,8 +67,8 @@ if [ "$CONSOLE" = "yes" ]; then fi case "$TTF$CONSOLE" in - "yesyes") TYPE="TrueType and console fonts" ;; - "yesno") TYPE="TrueType fonts only" ;; + "yesyes") TYPE="TrueType/OTB and console fonts" ;; + "yesno") TYPE="TrueType/OTB fonts only" ;; "noyes") TYPE="console fonts only" ;; "nono") echo "!!! At least one of TTF or CONSOLE must be set to 'yes'" exit 1; ;; @@ -73,26 +80,25 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -unzip $CWD/ultimate_oldschool_pc_font_pack_v${VERSION}.zip -d $PRGNAM-$VERSION +unzip $CWD/oldschool_pc_font_pack_v${VERSION}_FULL.zip -d $PRGNAM-$VERSION 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 {} \+ +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ if [ "$TTF" = "yes" ]; then - mkdir -p $PKG/usr/share/fonts/TTF + mkdir -p $PKG/usr/share/fonts/TTF $PKG/usr/share/fonts/misc cp -a */*.ttf $PKG/usr/share/fonts/TTF + cp -a */*.otb $PKG/usr/share/fonts/misc fi if [ "$CONSOLE" = "yes" ]; then - # The "PS/2thin" fonts don't extract, because fon2fnts insists on using + # A few of the fonts don't extract, because fon2fnts insists on using # the font name embedded in the .FON file as a filename, and these have # a slash in them. On Windows, no problem, but a slash is a directory # separator here... but, sed can handle binary files, so we can fix it: - sed -i 's,PS/2,PS_2,g' */*IBM_PS2thin*.FON + sed -i 's,PS/55,PS-55,g' */*IBM_PS-55*.FON + sed -i 's,DOS/V,DOS-V,g' */*DOS-V*.FON mkdir -p $PKG/usr/share/kbd/consolefonts @@ -108,10 +114,13 @@ if [ "$CONSOLE" = "yes" ]; then echo "=== $fnt => $psf" fnt2psf --psf2 --codepage=437 "$fnt" $PKG/usr/share/kbd/consolefonts/$psf done + gzip $PKG/usr/share/kbd/consolefonts/*.psfu fi +# Don't include README.NFO, it's the same as README.TXT but with some +# CP437 characters in the ASCII art logo. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.TXT README.NFO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.TXT docs/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README_console.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_console.txt cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/oldschool-pc-fonts/oldschool-pc-fonts.info b/system/oldschool-pc-fonts/oldschool-pc-fonts.info index 171e47a484..50cb1c1984 100644 --- a/system/oldschool-pc-fonts/oldschool-pc-fonts.info +++ b/system/oldschool-pc-fonts/oldschool-pc-fonts.info @@ -1,8 +1,8 @@ PRGNAM="oldschool-pc-fonts" -VERSION="1.0" +VERSION="2.2" HOMEPAGE="https://int10h.org/oldschool-pc-fonts/" -DOWNLOAD="https://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v1.0.zip" -MD5SUM="24acf70a302419895544e32757cfe4c8" +DOWNLOAD="https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v2.2_FULL.zip" +MD5SUM="95561227c894f874127e3776284a0c16" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/oldschool-pc-fonts/slack-desc b/system/oldschool-pc-fonts/slack-desc index a0b79293f7..cc9360e092 100644 --- a/system/oldschool-pc-fonts/slack-desc +++ b/system/oldschool-pc-fonts/slack-desc @@ -10,8 +10,8 @@ oldschool-pc-fonts: oldschool-pc-fonts (remakes of PC text mode fonts) oldschool-pc-fonts: oldschool-pc-fonts: The Ultimate Oldschool PC Font Pack brings you pixel-perfect oldschool-pc-fonts: remakes of various type styles from text-mode era PCs - in modern, -oldschool-pc-fonts: multi-platform, Unicode-compatible TrueType form, and/or as Linux -oldschool-pc-fonts: .psfu console fonts. +oldschool-pc-fonts: multi-platform, Unicode-compatible TrueType and OTB form, and/or as +oldschool-pc-fonts: Linux .psfu console fonts. oldschool-pc-fonts: oldschool-pc-fonts: https://int10h.org/oldschool-pc-fonts/ oldschool-pc-fonts: diff --git a/system/omnidb-app/omnidb-app.SlackBuild b/system/omnidb-app/omnidb-app.SlackBuild index c6dade5cd6..e2e59debad 100644 --- a/system/omnidb-app/omnidb-app.SlackBuild +++ b/system/omnidb-app/omnidb-app.SlackBuild @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=omnidb-app -VERSION=${VERSION:-2.13.0} +VERSION=${VERSION:-2.17.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -44,10 +44,11 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then - DEBARCH="i386" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then +# Doesn't support 32bit anymore. +# if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then +# DEBARCH="i386" +# LIBDIRSUFFIX="" +if [ "$ARCH" = "x86_64" ]; then DEBARCH="amd64" LIBDIRSUFFIX="64" else diff --git a/system/omnidb-app/omnidb-app.info b/system/omnidb-app/omnidb-app.info index 7a7c339f92..35f425e091 100644 --- a/system/omnidb-app/omnidb-app.info +++ b/system/omnidb-app/omnidb-app.info @@ -1,10 +1,10 @@ PRGNAM="omnidb-app" -VERSION="2.13.0" +VERSION="2.17.0" HOMEPAGE="https://omnidb.org/en/" -DOWNLOAD="https://omnidb.org/dist/2.13.0/omnidb-app_2.13.0-debian-i386.deb" -MD5SUM="1d4d2a02965b88d49e2e599e1bf9b8de" -DOWNLOAD_x86_64="https://omnidb.org/dist/2.13.0/omnidb-app_2.13.0-debian-amd64.deb" -MD5SUM_x86_64="83a1581e484dcea6e15ba2e94372b869" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://omnidb.org/dist/2.17.0/omnidb-app_2.17.0-debian-amd64.deb" +MD5SUM_x86_64="1e73923ad22c02d58c5a66207cc2e69d" REQUIRES="" MAINTAINER="Gabriel Diniz Gisoldo" EMAIL="gabrielgisoldi@gmail.com" diff --git a/system/opendoas/README b/system/opendoas/README new file mode 100644 index 0000000000..2e57141ec1 --- /dev/null +++ b/system/opendoas/README @@ -0,0 +1,67 @@ +This is the "OpenDoas" port of OpenBSD's doas. + +The doas utility is a program originally written for OpenBSD that +allows a user to run a command as though they were another user, +typically root. doas acts as an alternative to sudo, with simple +configuration syntax and a smaller code base for ease of security +auditing. + +Please note that running this SlackBuild will install doas with SUID +root. + +To get started, write a configuration file at /etc/doas.conf. As an +example, including the line: + + permit :wheel as root + +will allow all users in the wheel group to act as root with doas. +Consult the doas.conf(5) man page for further details. + +The parameter "keepenv" in /etc/doas.conf allows for opening graphical +applications with doas: + + permit keepenv gene as root + +"exec dbus-launch --exit-with-session" may be required for xinit in +Slackware 14.2. An alternative is to run "export $(dbus-launch)" after +starting the X session. As with su, KDE 4 graphical applications may +fail to open with doas. + +Running this SlackBuild without parameters will provide a build of +OpenDoas with shadow support if PAM is not installed, and with PAM +support if PAM is installed. Password persistence is disabled by +default. + +To enable timestamp-based password persistence, call the SlackBuild +with PERSIST=yes: + + PERSIST=yes ./opendoas.SlackBuild + +In addition, ensure that the appropriate user or group line in +/etc/doas.conf includes the "persist" option, as in this example: + + permit persist jane as root + +Please note that upstream considers timestamp-based password +persistence to be "new and potentially dangerous." + +For users with PAM installed, enable shadow authentication instead by +calling the SlackBuild with PAM=no: + + PAM=no ./opendoas.SlackBuild + +If /etc/pam.d/other and /etc/pam.d/system-auth are unmodified from the +state in which they are shipped in -current, doas will run with PAM +support if so compiled. Otherwise, doas may require a dedicated file at +/etc/pam.d/doas to use PAM authentication. + +To allow OpenDoas to write a new PAM configuration file for doas, call +the SlackBuild with PAM_FILE=yes: + + PAM_FILE=yes ./opendoas.SlackBuild + +Upstream will not include PAM configuration files in releases of +OpenDoas beyond 6.8.1. + +opendoas has no outside dependencies on Slackware 14.2 and adds no +users or groups. opendoas conflicts with all other ports of doas. diff --git a/system/mariadb-plugin-saslauthd/doinst.sh b/system/opendoas/doinst.sh index e0a5cd1676..97b05239d4 100644 --- a/system/mariadb-plugin-saslauthd/doinst.sh +++ b/system/opendoas/doinst.sh @@ -11,4 +11,4 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/my.cnf.d/auth_saslauthd.cnf.new +config etc/pam.d/doas.new diff --git a/system/opendoas/opendoas.SlackBuild b/system/opendoas/opendoas.SlackBuild new file mode 100644 index 0000000000..656a1323f3 --- /dev/null +++ b/system/opendoas/opendoas.SlackBuild @@ -0,0 +1,136 @@ +#!/bin/sh + +# Slackware build script for opendoas + +# Copyright 2021 K. Eugene Carlson Tsukuba, Japan +# 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. + +PRGNAM=opendoas +VERSION=${VERSION:-6.8.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +unset TIMESTAMP +unset SHADOW + +# Use PERSIST=yes to enable timestamp-based password persistence. Upstream +# considers this feature to be "new and potentially dangerous." +[ ${PERSIST:-no} = yes ] && TIMESTAMP="--with-timestamp" + +# Use PAM=no to enable shadow authentication even on systems with PAM +# installed. If shadow is not set, then doas will compile with PAM support +# automatically if PAM is installed. +[ ${PAM:-yes} = no ] && SHADOW="--with-shadow" + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +# Pass in shadow support if PAM is not installed. OpenDoas defaults to PAM +# authentication otherwise. +if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + SHADOW="--with-shadow" +fi + +# No CXXFLAGS +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + $SHADOW \ + $TIMESTAMP \ + --mandir=/usr/man + +make +make install 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 + +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 \ + 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 + +chmod 4711 $PKG/usr/bin/doas + +# If PAM support is enabled, rename the package's PAM file to doas.new. +if [ -f "$PKG/etc/pam.d/doas" ]; then + mv $PKG/etc/pam.d/doas $PKG/etc/pam.d/doas.new +fi + +# Delete the new configuration file and its directory if PAM_FILE=yes was not +# used. For Slackware -current users, doas can use PAM authentication provided +# that /etc/pam.d/other and /etc/pam.d/system-auth have not been altered from +# the state in which they are shipped. Writing new PAM configuration files was +# deprecated after the current release of OpenDoas. To allow OpenDoas to write +# a configuration file anyway, use PAM_FILE=yes. +[ ${PAM_FILE:-no} != yes ] && rm -rf $PKG/etc + +if [ -f "$PKG/etc/pam.d/doas.new" ]; then + cat $CWD/doinst.sh > $PKG/install/doinst.sh +fi + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/opendoas/opendoas.info b/system/opendoas/opendoas.info new file mode 100644 index 0000000000..19ab89a182 --- /dev/null +++ b/system/opendoas/opendoas.info @@ -0,0 +1,10 @@ +PRGNAM="opendoas" +VERSION="6.8.1" +HOMEPAGE="https://github.com/Duncaen/opendoas" +DOWNLOAD="https://github.com/Duncaen/OpenDoas/releases/download/v6.8.1/opendoas-6.8.1.tar.gz" +MD5SUM="c174a9e39ce6d526a1db16f214d0e127" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README%" +MAINTAINER="K. Eugene Carlson" +EMAIL="kvngncrlsn@gmail.com" diff --git a/system/opendoas/slack-desc b/system/opendoas/slack-desc new file mode 100644 index 0000000000..272e764f6a --- /dev/null +++ b/system/opendoas/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------------------------------------------------------| +opendoas: opendoas (port of doas from OpenBSD) +opendoas: +opendoas: doas is a sudo alternative originally written for OpenBSD. It allows +opendoas: a user to run a command as a different user, most often root. doas +opendoas: offers simple configuration syntax; create a config file at +opendoas: /etc/doas.conf to get started. See doas.conf(5). +opendoas: The opendoas package conflicts with all other ports of doas. +opendoas: The opendoas package does not conflict with sudo. +opendoas: Author: Ted Unangst +opendoas: Port author: Duncan Overbruck +opendoas: https://github.com/Duncaen/OpenDoas diff --git a/system/openmpi/README b/system/openmpi/README index 93c12dc74c..0bb48775c8 100644 --- a/system/openmpi/README +++ b/system/openmpi/README @@ -2,5 +2,6 @@ The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. + Optional dependency: -slurm, autodetected by configure +PMI=yes|no (default: no), requires slurm diff --git a/system/openmpi/doinst.sh b/system/openmpi/doinst.sh index 8692f863ca..718699b880 100644 --- a/system/openmpi/doinst.sh +++ b/system/openmpi/doinst.sh @@ -11,6 +11,7 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } +config etc/pmix-mca-params.conf.new config etc/openmpi-default-hostfile.new config etc/openmpi-mca-params.conf.new config etc/openmpi-totalview.tcl.new diff --git a/system/openmpi/openmpi.SlackBuild b/system/openmpi/openmpi.SlackBuild index 3d6144c033..e485215f05 100644 --- a/system/openmpi/openmpi.SlackBuild +++ b/system/openmpi/openmpi.SlackBuild @@ -5,7 +5,7 @@ # Copyright 2010 Erik W. Hanson, Minneapolis, MN, USA # All rights reserved. # -# Copyright 2015 Emmanuel N. Millan, Mendoza, Argentina. +# Copyright 2015-2021 Emmanuel N. Millan, Mendoza, Argentina. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openmpi -VERSION=${VERSION:-2.1.3} -BUILD=${BUILD:-1} +VERSION=${VERSION:-4.1.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -60,6 +60,8 @@ fi set -eu +pmi="" ; [ "${PMI:-no}" != "no" ] && pmi="--with-slurm --with-pmix" + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -80,7 +82,9 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var/lib \ --mandir=/usr/man/ \ + --enable-mpi1-compatibility \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + $pmi \ --disable-static \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --build=$ARCH-slackware-linux diff --git a/system/openmpi/openmpi.info b/system/openmpi/openmpi.info index ea11a17f41..827dbf8fcd 100644 --- a/system/openmpi/openmpi.info +++ b/system/openmpi/openmpi.info @@ -1,8 +1,8 @@ PRGNAM="openmpi" -VERSION="2.1.3" -HOMEPAGE="http://www.open-mpi.org/" -DOWNLOAD="https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.3.tar.bz2" -MD5SUM="46079b6f898a412240a0bf523e6cd24b" +VERSION="4.1.0" +HOMEPAGE="https://www.open-mpi.org/" +DOWNLOAD="https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-4.1.0.tar.bz2" +MD5SUM="c24200d3b3401db465ab0efd6b696f80" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/openrc-services/README.Slackware b/system/openrc-services/README.Slackware index 2e5949809d..0179747800 100644 --- a/system/openrc-services/README.Slackware +++ b/system/openrc-services/README.Slackware @@ -1,12 +1,16 @@ -After installing openrc and openrc-services, on rebooting one is booted to a command line with only a minimum of services enabled. +After installing openrc and openrc-services, one is booted to a command line + with only minimum of services enabled. Some common services that could be enabled: # rc-update add dbus default # rc-update add sysklogd default # rc-update add dcron default -# rc-update add alsasound default +# rc-update add alsasound boot # rc-update add consolekit default +# rc-update add NetworkManager default +# rc-update add dmeventd default # if using lvm +# rc-update add lvmetad default # lvm Enabled services for current runlevel can be queried with: $ rc-status @@ -14,4 +18,4 @@ $ rc-status Enabled services across all runlevels can be queried with: $ rc-update -Note- Services are installed to /etc/openrc/init.d +Note: Services are installed to /etc/openrc/init.d diff --git a/system/openrc-services/doinst.sh b/system/openrc-services/doinst.sh index 2173e4843d..0d935bab1f 100644 --- a/system/openrc-services/doinst.sh +++ b/system/openrc-services/doinst.sh @@ -23,22 +23,12 @@ preserve_perms() { config $NEW } -openrc_accessibility=(espeakup) -openrc_base=(device-mapper dmcrypt lvm mdadm mdraid udev udev-settle udev-trigger) -openrc_desktop=(acpid alsasound xdm gpm wpa_supplicant) -openrc_devel=(git-daemon influxdb mysqld postgresql svn distccd jenkins redis) -openrc_misc=(bitlbee cpupower connman ntpd ntp-client sntp rsyslog saned metalog pulseaudio syslog-ng sensord fancontrol lm_sensors lircd irexec haveged salt-master salt-minion salt-syncdic hdparm clamd boinc atd libvirtd docker) -openrc_net=(named dhcpd dhcrelay dhcrelay6 hostapd dnsmasq iptables ip6tables rpcbind nfs nfsclient nginx openntpd slapd sshd openvpn quota rsyncd samba saslauthd squid transmission-daemon ufw vnstatd xinetd tor NetworkManager httpd syncthing) -openrc_slack=(dcron sendmail snmpd snmptrapd sysklogd fail2ban) -openrc_video=(vgl bumblebee nvidia-persistenced) - -for file in "${openrc_accessibility[@]}" "${openrc_base[@]}" "${openrc_desktop[@]}" "${openrc_devel[@]}" "${openrc_misc[@]}" "${openrc_net[@]}" "${openrc_slack[@]}" "${openrc_video[@]}"; do - config "etc/openrc/conf.d/${file}.new" +for file in etc/openrc/conf.d/*.new; do + config "${file}" done -BACKUP_LOCAL=(rcM.start) -for file in "${BACKUP_LOCAL[@]}"; do - preserve_perms "etc/openrc/local.d/${file}.new" +for file in etc/openrc/local.d/*.new; do + preserve_perms "${file}" done # disable udev-postmount diff --git a/system/openrc-services/openrc-services.SlackBuild b/system/openrc-services/openrc-services.SlackBuild index 873656a271..c9e3b1319d 100644 --- a/system/openrc-services/openrc-services.SlackBuild +++ b/system/openrc-services/openrc-services.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for openrc-services # Based upon https://github.com/manjaro/packages-openrc -# Copyright 2015-2018 Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Copyright 2015-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openrc-services -VERSION=${VERSION:-20181203} +VERSION=${VERSION:-20190917} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -92,6 +92,10 @@ for file in $PKG/etc/openrc/local.d/*; do done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README.md COPYING \ + $PKG/usr/doc/$PRGNAM-$VERSION + cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/openrc-services/openrc-services.info b/system/openrc-services/openrc-services.info index 3e05cec639..c52dd5ae89 100644 --- a/system/openrc-services/openrc-services.info +++ b/system/openrc-services/openrc-services.info @@ -1,8 +1,8 @@ PRGNAM="openrc-services" -VERSION="20181203" +VERSION="20190917" HOMEPAGE="https://gitlab.com/aadityabagga/openrc-services" -DOWNLOAD="https://gitlab.com/aadityabagga/openrc-services/-/archive/20181203/openrc-services-20181203.tar.gz" -MD5SUM="a84ea1d00d1e5c6eb341f9eb8c262bb2" +DOWNLOAD="https://gitlab.com/aadityabagga/openrc-services/-/archive/20190917/openrc-services-20190917.tar.gz" +MD5SUM="96aa3c1c9380b67ae61565baf3f123a9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="openrc" diff --git a/system/openrc-services/slack-desc b/system/openrc-services/slack-desc index c41d839e93..a63e71914e 100644 --- a/system/openrc-services/slack-desc +++ b/system/openrc-services/slack-desc @@ -13,7 +13,7 @@ openrc-services: openrc-services: Various scripts are provided, for packages that are in Slackware openrc-services: plus slackbuilds.org as well as some other packages. openrc-services: -openrc-services: +openrc-services: Homepage: https://gitlab.com/aadityabagga/openrc-services openrc-services: openrc-services: openrc-services: diff --git a/system/openrc/README.Slackware b/system/openrc/README.Slackware index 64a005df16..8d379cf4a0 100644 --- a/system/openrc/README.Slackware +++ b/system/openrc/README.Slackware @@ -22,15 +22,19 @@ After installing, cp /etc/openrc/conf.d/agetty /etc/openrc/conf.d/agetty.ttyS0 echo 'agetty_options="--noclear"' >> /etc/openrc/conf.d/agetty.ttyS0 +2. Setup additional services -2. Add the following to boot parameters (via /etc/lilo.conf for lilo + Checkout out the openrc-services package and instructions provided + there. + +3. Add the following to boot parameters (via /etc/lilo.conf for lilo or /etc/default/grub for grub): init=/sbin/openrc-init Regenerate boot configuration ('lilo -v' or 'grub-mkconfig -o /boot/grub/grub.cfg') -3. Reboot! +4. Reboot! ## Note diff --git a/system/openrc/doinst.sh b/system/openrc/doinst.sh index 36f86cdbce..59a9913953 100644 --- a/system/openrc/doinst.sh +++ b/system/openrc/doinst.sh @@ -25,3 +25,7 @@ done # enable cgroups service as required by openrc 0.35+ [ ! -e etc/openrc/runlevels/sysinit/cgroups ] && ln -s /etc/openrc/init.d/cgroups etc/openrc/runlevels/sysinit/cgroups + +# enable save keymaps and termencoding services as needed by openrc 0.40+ +[ ! -e etc/openrc/runlevels/boot/save-keymaps ] && ln -s /etc/openrc/init.d/save-keymaps etc/openrc/runlevels/boot/save-keymaps +[ ! -e etc/openrc/runlevels/boot/save-termencoding ] && ln -s /etc/openrc/init.d/save-termencoding etc/openrc/runlevels/boot/save-termencoding diff --git a/system/openrc/openrc.SlackBuild b/system/openrc/openrc.SlackBuild index 556197b760..03c759879c 100644 --- a/system/openrc/openrc.SlackBuild +++ b/system/openrc/openrc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for openrc # Based upon https://aur.archlinux.org/packages/openrc/ -# Copyright 2015-2018 Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Copyright 2015-2019 Aaditya Bagga <aaditya_gnulinux@zoho.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openrc -VERSION=${VERSION:-0.39.2} +VERSION=${VERSION:-0.42.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -80,7 +80,9 @@ MAKEARGS+=(SBINDIR=/sbin) MAKEARGS+=(MANDIR=/usr/man) MAKEARGS+=(DOCDIR=/usr/doc/$PRGNAM-$VERSION) MAKEARGS+=(MKTERMCAP=ncurses) +MAKEARGS+=(MKSYSVINIT=no) MAKEARGS+=(MKBASHCOMP=yes) +MAKEARGS+=(MKZSHCOMP=yes) #MAKEARGS+=(BRANDING="$(cat /etc/slackware-version)") make "${MAKEARGS[@]}" diff --git a/system/openrc/openrc.info b/system/openrc/openrc.info index 080d4426cf..13363e8341 100644 --- a/system/openrc/openrc.info +++ b/system/openrc/openrc.info @@ -1,10 +1,10 @@ PRGNAM="openrc" -VERSION="0.39.2" +VERSION="0.42.1" HOMEPAGE="https://github.com/OpenRC/openrc" -DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.39.2.tar.gz" -MD5SUM="e5fe74acd25d691c2c48fc94eef68c90" +DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.42.1.tar.gz" +MD5SUM="1a3de67032d59529460f150e2db859f1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="%README%" +REQUIRES="" MAINTAINER="Aaditya Bagga" EMAIL="aaditya_gnulinux@zoho.com" diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild index e7dc5c71e3..48c2d058bf 100644 --- a/system/opensc/opensc.SlackBuild +++ b/system/opensc/opensc.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for opensc # Copyright 2008-2015 LukenShiro, Italy +# Copyright 2018-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opensc -VERSION=${VERSION:-0.15.0} +VERSION=${VERSION:-0.21.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="README COPYING NEWS ChangeLog" -XSL_STYLESHEETS_VER=1.78.1 +DOCFILES="README COPYING NEWS" +XSL_STYLESHEETS_VER=$(export LS_OPTIONS='' ; ls -1 /usr/share/xml/docbook/ | grep xsl-stylesheets- | cut -d- -f3) # opensc now supports only one reader subsystem (pcsc-lite or openct) OPENCT=${OPENCT:-0} # pcsc-lite is the default, openct disabled @@ -51,8 +52,8 @@ case "$OPENCT" in *) RDRSUBSYS_flags="--disable-pcsc --enable-openct" ;; esac -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info index 91496b60e0..61f33648a0 100644 --- a/system/opensc/opensc.info +++ b/system/opensc/opensc.info @@ -1,10 +1,10 @@ PRGNAM="opensc" -VERSION="0.15.0" +VERSION="0.21.0" HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/" -DOWNLOAD="http://downloads.sourceforge.net/opensc/OpenSC/opensc-0.15.0.tar.gz" -MD5SUM="34c55315b7f381bd047b6435933baab4" +DOWNLOAD="https://github.com/OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz" +MD5SUM="d9f32e065ada3303c349cb5b54cd6e37" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pcsc-lite" -MAINTAINER="LukenShiro" -EMAIL="lukenshiro@ngi.it" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/openstego/README b/system/openstego/README index 5f5c99ed88..0879579ef1 100644 --- a/system/openstego/README +++ b/system/openstego/README @@ -1,6 +1,7 @@ openstego (the free steganography solution) -Note: openstego doesn't work with openjdk. +Note: openstego works with openjdk8, if you prefer not to install the +Oracle jdk. It does NOT work with openjdk7 or older. OpenStego is a tool implemented in Java for generic steganography, with support for password-based encryption of the data. diff --git a/system/openstego/openstego.SlackBuild b/system/openstego/openstego.SlackBuild index 1bdad7e1dd..e45c80a3e4 100644 --- a/system/openstego/openstego.SlackBuild +++ b/system/openstego/openstego.SlackBuild @@ -23,6 +23,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20210221 bkw: update for v0.8.0. + +# 20200708 bkw: +# - Update for v0.7.4. +# - Add README note about openjdk8. + # 20180802 bkw: # - Take over maintenance. # - Update for v0.7.3. @@ -30,7 +36,7 @@ # openstego.sh. This matches upstream's recommendation. PRGNAM=openstego -VERSION=${VERSION:-0.7.3} +VERSION=${VERSION:-0.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/openstego/openstego.info b/system/openstego/openstego.info index 4827e4dd5b..61928e0238 100644 --- a/system/openstego/openstego.info +++ b/system/openstego/openstego.info @@ -1,8 +1,8 @@ PRGNAM="openstego" -VERSION="0.7.3" +VERSION="0.8.0" HOMEPAGE="https://www.openstego.com/" -DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.7.3/openstego-0.7.3.zip" -MD5SUM="65e6acca0faab0774c7b8a6433859c2e" +DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.8.0/openstego-0.8.0.zip" +MD5SUM="e172fae2f0f3aca30ae5998866e7c7f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild index 4c8f905e77..e929584590 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-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=osinfo-db-tools -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -DOCS="AUTHORS ChangeLog COPYING NEWS README" +DOCS="CONTRIBUTING.md COPYING NEWS README" set -e @@ -71,19 +71,21 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc + ninja + DESTDIR=$PKG ninja install +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 diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info index 2fa77a3e77..ca3b2013a9 100644 --- a/system/osinfo-db-tools/osinfo-db-tools.info +++ b/system/osinfo-db-tools/osinfo-db-tools.info @@ -1,10 +1,10 @@ PRGNAM="osinfo-db-tools" -VERSION="1.2.0" +VERSION="1.8.0" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.2.0.tar.gz" -MD5SUM="2f93409f83c948e38f15cb4852bfe0e7" +DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.8.0.tar.xz" +MD5SUM="4a9c1cd3871e1809b44bdb8511cfe2d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="json-glib meson" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild index 1daadfc0d0..9acaaa242c 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-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=osinfo-db -VERSION=${VERSION:-20180612} -SLVERSION=${SLVERSION:-20161227} +VERSION=${VERSION:-20200813} +SLVERSION=${SLVERSION:-20190702} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info index 848ade77cc..9d327df7ee 100644 --- a/system/osinfo-db/osinfo-db.info +++ b/system/osinfo-db/osinfo-db.info @@ -1,10 +1,10 @@ PRGNAM="osinfo-db" -VERSION="20180612" +VERSION="20200813" HOMEPAGE="http://libosinfo.org" -DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20180612.tar.xz \ - http://ponce.cc/slackware/sources/repo/osinfo-db-slackware-20161227.tar.xz" -MD5SUM="b03eccaf96e14542fd3c4be5b439e879 \ - 675fc5c40876b76c2d2924891863a697" +DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20200813.tar.xz \ + http://ponce.cc/slackware/sources/repo/osinfo-db-slackware-20190702.tar.xz" +MD5SUM="da055fc0c589a672f926c346367e218a \ + 988b651d5f600eaa42cc1da91c7d765c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="osinfo-db-tools" diff --git a/system/osquery-bin/README b/system/osquery-bin/README new file mode 100644 index 0000000000..3e8850a5bf --- /dev/null +++ b/system/osquery-bin/README @@ -0,0 +1,4 @@ +osquery - an operating system instrumentation framework + +Osquery uses basic SQL commands to leverage a relational data-model to +describe a device. diff --git a/system/osquery-bin/doinst.sh b/system/osquery-bin/doinst.sh new file mode 100644 index 0000000000..67b687ee90 --- /dev/null +++ b/system/osquery-bin/doinst.sh @@ -0,0 +1,22 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + rm $NEW + fi +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.osqueryd.new diff --git a/system/osquery-bin/osquery-bin.SlackBuild b/system/osquery-bin/osquery-bin.SlackBuild new file mode 100644 index 0000000000..a91e4ae2ff --- /dev/null +++ b/system/osquery-bin/osquery-bin.SlackBuild @@ -0,0 +1,95 @@ +#!/bin/sh + +# Slackware build script for osquery-bin + +# Copyright 2019-2021 Andrew Clemons, Wellington New Zealand +# 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. + +PRGNAM=osquery-bin +SRCNAM=${PRGNAM%-bin} +VERSION=${VERSION:-4.7.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 $PKG + +if [ "$ARCH" = "x86_64" ]; then + tar xvf $CWD/$SRCNAM-$VERSION"_1.linux_x86_64.tar.gz" +else + printf "$ARCH is not supported...\n" + exit 1 +fi + +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 {} \; + +rm -rf .scripts + +mkdir etc/rc.d +mv etc/init.d/osqueryd etc/rc.d/rc.osqueryd.new +rm -rf etc/init.d + +mv usr/local/* usr/ +rm -rf usr/lib usr/local + +mkdir -p $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:-tgz} diff --git a/system/osquery-bin/osquery-bin.info b/system/osquery-bin/osquery-bin.info new file mode 100644 index 0000000000..057c9aa043 --- /dev/null +++ b/system/osquery-bin/osquery-bin.info @@ -0,0 +1,10 @@ +PRGNAM="osquery-bin" +VERSION="4.7.0" +HOMEPAGE="https://osquery.io/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://pkg.osquery.io/linux/osquery-4.7.0_1.linux_x86_64.tar.gz" +MD5SUM_x86_64="e0fc79761a0d8008ee5f5d5f4c04181a" +REQUIRES="" +MAINTAINER="Andrew Clemons" +EMAIL="andrew.clemons@gmail.com" diff --git a/system/osquery-bin/slack-desc b/system/osquery-bin/slack-desc new file mode 100644 index 0000000000..cc16ca601f --- /dev/null +++ b/system/osquery-bin/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------------------------------------------------------| +osquery-bin: osquery-bin (an operating system instrumentation framework) +osquery-bin: +osquery-bin: osquery is an operating system instrumentation framework +osquery-bin: +osquery-bin: https://osquery.io/ +osquery-bin: +osquery-bin: +osquery-bin: +osquery-bin: +osquery-bin: +osquery-bin: diff --git a/system/ossec-agent/README b/system/ossec-agent/README index f973332031..e16fad6ea6 100644 --- a/system/ossec-agent/README +++ b/system/ossec-agent/README @@ -2,4 +2,13 @@ OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response. +The following build options are available: + + GEOIP=yes Enable GeoIP support (requires GeoIP) + INOTIFY=yes Enable inotify for monitoring filesystem events + +Example of enabling the GeoIP and inotify support: + + GEOIP=yes INOTIFY=yes ./ossec-agent.SlackBuild + See README.SLACKWARE for installation instructions. diff --git a/system/ossec-agent/ossec-agent.SlackBuild b/system/ossec-agent/ossec-agent.SlackBuild index 630bddc0f7..6d5963a33e 100644 --- a/system/ossec-agent/ossec-agent.SlackBuild +++ b/system/ossec-agent/ossec-agent.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ossec-agent -# Copyright 2016 Mario Preksavec, Zagreb, Croatia +# Copyright 2016, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Special thanks to Jason Graham for patches and testing + PRGNAM=ossec-agent -VERSION=${VERSION:-2.9.1} +VERSION=${VERSION:-3.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,6 +63,14 @@ USERID_MAIL=${USERID_MAIL:-334} USERID_REMOTE=${USERID_REMOTE:-335} GROUPID=${GROUPID:-333} +if [ "$GEOIP" != "yes" ]; then + GEOIP=no +fi + +if [ "$INOTIFY" != "yes" ]; then + INOTIFY=no +fi + if ! grep ^ossec: /etc/group 2>&1 > /dev/null \ || ! grep -E '^(ossec|ossecm|ossecr):' /etc/passwd 2>&1 > /dev/null; then echo -e "\n You must have ossec users and a group to run this script\n" @@ -113,8 +123,10 @@ sed -e 's|\(./init/adduser.sh.*\)|#\1|' \ # There is no configure script and install.sh is a bit limited ( cd src - make PREFIX=$PKG/var/ossec TARGET=agent build - make PREFIX=$PKG/var/ossec TARGET=agent install + make USE_GEOIP=$GEOIP USE_INOTIFY=$INOTIFY \ + PREFIX=$PKG/var/ossec TARGET=agent build + make USE_GEOIP=$GEOIP USE_INOTIFY=$INOTIFY \ + PREFIX=$PKG/var/ossec TARGET=agent install ) # Prepare system /etc @@ -141,7 +153,8 @@ 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 BUGS CHANGELOG CONFIG CONTRIBUTORS LICENSE README.md doc/{*.txt,README.*} \ +cp -a BUGS CHANGELOG.md CONFIG CONTRIBUTORS INSTALL LICENSE README.md SUPPORT.md \ + doc/{*.txt,README.*} \ $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/ossec-agent/ossec-agent.info b/system/ossec-agent/ossec-agent.info index 7b29fcca51..10cce74f00 100644 --- a/system/ossec-agent/ossec-agent.info +++ b/system/ossec-agent/ossec-agent.info @@ -1,10 +1,10 @@ PRGNAM="ossec-agent" -VERSION="2.9.1" +VERSION="3.6.0" HOMEPAGE="https://ossec.github.io/" -DOWNLOAD="https://github.com/ossec/ossec-hids/archive/2.9.1/ossec-hids-2.9.1.tar.gz" -MD5SUM="51eb7958a752a8f1651395b1fe61e864" +DOWNLOAD="https://github.com/ossec/ossec-hids/archive/3.6.0/ossec-hids-3.6.0.tar.gz" +MD5SUM="03fe101f736e834b3804bac8bb4aa980" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="pcre2" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/system/ossec-local/README b/system/ossec-local/README index f973332031..abc215b6eb 100644 --- a/system/ossec-local/README +++ b/system/ossec-local/README @@ -2,4 +2,13 @@ OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response. +The following build options are available: + + GEOIP=yes Enable GeoIP support (requires GeoIP) + INOTIFY=yes Enable inotify for monitoring filesystem events + +Example of enabling the GeoIP and inotify support: + + GEOIP=yes INOTIFY=yes ./ossec-local.SlackBuild + See README.SLACKWARE for installation instructions. diff --git a/system/ossec-local/ossec-local.SlackBuild b/system/ossec-local/ossec-local.SlackBuild index 51a29e7786..cd43e82965 100644 --- a/system/ossec-local/ossec-local.SlackBuild +++ b/system/ossec-local/ossec-local.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ossec-local -# Copyright 2016 Mario Preksavec, Zagreb, Croatia +# Copyright 2016, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Special thanks to Jason Graham for patches and testing + PRGNAM=ossec-local -VERSION=${VERSION:-2.9.1} +VERSION=${VERSION:-3.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,6 +63,14 @@ USERID_MAIL=${USERID_MAIL:-334} USERID_REMOTE=${USERID_REMOTE:-335} GROUPID=${GROUPID:-333} +if [ "$GEOIP" != "yes" ]; then + GEOIP=no +fi + +if [ "$INOTIFY" != "yes" ]; then + INOTIFY=no +fi + if ! grep ^ossec: /etc/group 2>&1 > /dev/null \ || ! grep -E '^(ossec|ossecm|ossecr):' /etc/passwd 2>&1 > /dev/null; then echo -e "\n You must have ossec users and a group to run this script\n" @@ -113,8 +123,10 @@ sed -e 's|\(./init/adduser.sh.*\)|#\1|' \ # There is no configure script and install.sh is a bit limited ( cd src - make PREFIX=$PKG/var/ossec TARGET=local build - make PREFIX=$PKG/var/ossec TARGET=local install + make USE_GEOIP=$GEOIP USE_INOTIFY=$INOTIFY \ + PREFIX=$PKG/var/ossec TARGET=local build + make USE_GEOIP=$GEOIP USE_INOTIFY=$INOTIFY \ + PREFIX=$PKG/var/ossec TARGET=local install ) # Prepare system /etc @@ -141,7 +153,8 @@ 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 BUGS CHANGELOG CONFIG CONTRIBUTORS LICENSE README.md doc/{*.txt,README.*} \ +cp -a BUGS CHANGELOG.md CONFIG CONTRIBUTORS INSTALL LICENSE README.md SUPPORT.md \ + doc/{*.txt,README.*} \ $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/ossec-local/ossec-local.info b/system/ossec-local/ossec-local.info index f195b5f1fa..8deedf1ab3 100644 --- a/system/ossec-local/ossec-local.info +++ b/system/ossec-local/ossec-local.info @@ -1,10 +1,10 @@ PRGNAM="ossec-local" -VERSION="2.9.1" +VERSION="3.6.0" HOMEPAGE="https://ossec.github.io/" -DOWNLOAD="https://github.com/ossec/ossec-hids/archive/2.9.1/ossec-hids-2.9.1.tar.gz" -MD5SUM="51eb7958a752a8f1651395b1fe61e864" +DOWNLOAD="https://github.com/ossec/ossec-hids/archive/3.6.0/ossec-hids-3.6.0.tar.gz" +MD5SUM="03fe101f736e834b3804bac8bb4aa980" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="pcre2" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/system/ossec-server/README b/system/ossec-server/README index f973332031..119ee06264 100644 --- a/system/ossec-server/README +++ b/system/ossec-server/README @@ -2,4 +2,13 @@ OSSEC is an Open Source Host-based Intrusion Detection System that performs log analysis, file integrity checking, policy monitoring, rootkit detection, real-time alerting and active response. +The following build options are available: + + GEOIP=yes Enable GeoIP support (requires GeoIP) + INOTIFY=yes Enable inotify for monitoring filesystem events + +Example of enabling the GeoIP and inotify support: + + GEOIP=yes INOTIFY=yes ./ossec-server.SlackBuild + See README.SLACKWARE for installation instructions. diff --git a/system/ossec-server/ossec-server.SlackBuild b/system/ossec-server/ossec-server.SlackBuild index e3b7463eb3..31c9994ab8 100644 --- a/system/ossec-server/ossec-server.SlackBuild +++ b/system/ossec-server/ossec-server.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ossec-server -# Copyright 2016 Mario Preksavec, Zagreb, Croatia +# Copyright 2016, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Special thanks to Jason Graham for patches and testing + PRGNAM=ossec-server -VERSION=${VERSION:-2.9.1} +VERSION=${VERSION:-3.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,6 +63,14 @@ USERID_MAIL=${USERID_MAIL:-334} USERID_REMOTE=${USERID_REMOTE:-335} GROUPID=${GROUPID:-333} +if [ "$GEOIP" != "yes" ]; then + GEOIP=no +fi + +if [ "$INOTIFY" != "yes" ]; then + INOTIFY=no +fi + if ! grep ^ossec: /etc/group 2>&1 > /dev/null \ || ! grep -E '^(ossec|ossecm|ossecr):' /etc/passwd 2>&1 > /dev/null; then echo -e "\n You must have ossec users and a group to run this script\n" @@ -113,8 +123,10 @@ sed -e 's|\(./init/adduser.sh.*\)|#\1|' \ # There is no configure script and install.sh is a bit limited ( cd src - make PREFIX=$PKG/var/ossec TARGET=server build - make PREFIX=$PKG/var/ossec TARGET=server install + make USE_GEOIP=$GEOIP USE_INOTIFY=$INOTIFY \ + PREFIX=$PKG/var/ossec TARGET=server build + make USE_GEOIP=$GEOIP USE_INOTIFY=$INOTIFY \ + PREFIX=$PKG/var/ossec TARGET=server install ) # Prepare system /etc @@ -141,7 +153,8 @@ 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 BUGS CHANGELOG CONFIG CONTRIBUTORS LICENSE README.md doc/{*.txt,README.*} \ +cp -a BUGS CHANGELOG.md CONFIG CONTRIBUTORS INSTALL LICENSE README.md SUPPORT.md \ + doc/{*.txt,README.*} \ $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/ossec-server/ossec-server.info b/system/ossec-server/ossec-server.info index 7fbdd21503..05fc9965df 100644 --- a/system/ossec-server/ossec-server.info +++ b/system/ossec-server/ossec-server.info @@ -1,10 +1,10 @@ PRGNAM="ossec-server" -VERSION="2.9.1" +VERSION="3.6.0" HOMEPAGE="https://ossec.github.io/" -DOWNLOAD="https://github.com/ossec/ossec-hids/archive/2.9.1/ossec-hids-2.9.1.tar.gz" -MD5SUM="51eb7958a752a8f1651395b1fe61e864" +DOWNLOAD="https://github.com/ossec/ossec-hids/archive/3.6.0/ossec-hids-3.6.0.tar.gz" +MD5SUM="03fe101f736e834b3804bac8bb4aa980" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="pcre2" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/system/ostree/ostree.SlackBuild b/system/ostree/ostree.SlackBuild index 5f8bd09d88..6d2f938f35 100644 --- a/system/ostree/ostree.SlackBuild +++ b/system/ostree/ostree.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=ostree -VERSION=${VERSION:-2018.9} +VERSION=${VERSION:-2019.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/ostree/ostree.info b/system/ostree/ostree.info index 6f0fe50127..6e294b63c5 100644 --- a/system/ostree/ostree.info +++ b/system/ostree/ostree.info @@ -1,8 +1,8 @@ PRGNAM="ostree" -VERSION="2018.9" +VERSION="2019.6" HOMEPAGE="https://github.com/ostreedev/ostree/" -DOWNLOAD="https://github.com/ostreedev/ostree/releases/download/v2018.9/libostree-2018.9.tar.xz" -MD5SUM="bca7c83a4a55f23ffc69309cd1a0398b" +DOWNLOAD="https://github.com/ostreedev/ostree/releases/download/v2019.6/libostree-2019.6.tar.xz" +MD5SUM="4d00cd2c5bce31b6302c71cbdb2a17eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/otf2bdf/otf2bdf.info b/system/otf2bdf/otf2bdf.info index bac247eb9b..eecb7c1950 100644 --- a/system/otf2bdf/otf2bdf.info +++ b/system/otf2bdf/otf2bdf.info @@ -1,7 +1,7 @@ PRGNAM="otf2bdf" VERSION="3.1" HOMEPAGE="http://web.archive.org/web/20171026195930/https://www.math.nmsu.edu/~mleisher/Software/otf2bdf/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/otf2bdf-3.1.tbz2" +DOWNLOAD="https://slackware.uk/~urchlay/src/otf2bdf-3.1.tbz2" MD5SUM="6af09173615f1dd5ae294bbf67ac52c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/pacemaker/pacemaker.SlackBuild b/system/pacemaker/pacemaker.SlackBuild index b9135b0be0..b7a01dcfc1 100644 --- a/system/pacemaker/pacemaker.SlackBuild +++ b/system/pacemaker/pacemaker.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for pacemaker -# Copyright 2018 Pierre-Philipp Braun, Russia +# Copyright 2018 Pierre-Philipp Braun, Russia +# Copyright 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pacemaker -VERSION=${VERSION:-2.0.0_rc5} +VERSION=${VERSION:-2.0.3} TARVER="Pacemaker-$(echo $VERSION | tr _ -)" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/pacemaker/pacemaker.info b/system/pacemaker/pacemaker.info index dc306399be..4ab60618b5 100644 --- a/system/pacemaker/pacemaker.info +++ b/system/pacemaker/pacemaker.info @@ -1,10 +1,10 @@ PRGNAM="pacemaker" -VERSION="2.0.0_rc5" +VERSION="2.0.3" HOMEPAGE="https://wiki.clusterlabs.org/wiki/Pacemaker" -DOWNLOAD="https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-2.0.0-rc5/pacemaker-Pacemaker-2.0.0-rc5.tar.gz" -MD5SUM="5064b505bb7d7b644991374b05f1e278" +DOWNLOAD="https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-2.0.3/pacemaker-Pacemaker-2.0.3.tar.gz" +MD5SUM="4fee89ca3485f3bf27689ad9bd1670cb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="corosync" -MAINTAINER="Pierre-Philipp Braun" -EMAIL="pbraun@nethence.com" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild index 7ffc2f6552..11043b331e 100644 --- a/system/parallel/parallel.SlackBuild +++ b/system/parallel/parallel.SlackBuild @@ -2,6 +2,7 @@ # Slackware build script for "parallel". +# Copyright 2020-2021 CRTS <crts@gmx.net> # Copyright 2015-2017 Marcel Saegebarth <marc@mos6581.de> # All rights reserved. # @@ -25,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=parallel -VERSION=${VERSION:-20170622} +VERSION=${VERSION:-20210122} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -89,7 +90,8 @@ 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 CITATION COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp CITATION COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp $CWD/GNU_Parallel_2018.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/parallel/parallel.info b/system/parallel/parallel.info index f8ab2f619c..b9f5ef28f2 100644 --- a/system/parallel/parallel.info +++ b/system/parallel/parallel.info @@ -1,10 +1,12 @@ PRGNAM="parallel" -VERSION="20170622" +VERSION="20210122" HOMEPAGE="http://www.gnu.org/software/parallel/" -DOWNLOAD="http://gnu.uberglobalmirror.com/parallel/parallel-20170622.tar.bz2" -MD5SUM="8494ff022451aac0162f18cf3dd3ae7f" +DOWNLOAD="https://ftp.gnu.org/gnu/parallel/parallel-20210122.tar.bz2 + https://zenodo.org/record/1146014/files/GNU_Parallel_2018.pdf" +MD5SUM="d7adb3a5cc00bc024eedd5718351cef4 + e32a78d93e53029d7338eac9f4194924" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" +MAINTAINER="CRTS" +EMAIL="crts@gmx.net" diff --git a/system/pass-otp/README b/system/pass-otp/README new file mode 100644 index 0000000000..40939c0745 --- /dev/null +++ b/system/pass-otp/README @@ -0,0 +1,2 @@ +pass-otp is a pass extension for managing one-time-password (OTP) +tokens. diff --git a/system/pass-otp/pass-otp.SlackBuild b/system/pass-otp/pass-otp.SlackBuild new file mode 100644 index 0000000000..bf7e2c60c6 --- /dev/null +++ b/system/pass-otp/pass-otp.SlackBuild @@ -0,0 +1,65 @@ +#!/bin/sh + +# Slackware build script for pass-otp + +# Copyright 2020 Julian Grinblat <julian@dotcore.co.il> +# 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. + +PRGNAM=pass-otp +VERSION=${VERSION:-1.2.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man/man1 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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md LICENSE CHANGELOG.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:-tgz} diff --git a/system/pass-otp/pass-otp.info b/system/pass-otp/pass-otp.info new file mode 100644 index 0000000000..f0170768eb --- /dev/null +++ b/system/pass-otp/pass-otp.info @@ -0,0 +1,10 @@ +PRGNAM="pass-otp" +VERSION="1.2.0" +HOMEPAGE="https://github.com/tadfisher/pass-otp" +DOWNLOAD="https://github.com/tadfisher/pass-otp/releases/download/v1.2.0/pass-otp-1.2.0.tar.gz" +MD5SUM="20cfa80273813294014577fead8714ca" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="password-store qrencode oath-toolkit" +MAINTAINER="Julian Grinblat" +EMAIL="julian@dotcore.co.il" diff --git a/system/pass-otp/slack-desc b/system/pass-otp/slack-desc new file mode 100644 index 0000000000..c0694a4d42 --- /dev/null +++ b/system/pass-otp/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------------------------------------------------------| +pass-otp: pass-otp (Manage OTP tokens) +pass-otp: +pass-otp: A pass extension for managing one-time-password (OTP) tokens. +pass-otp: +pass-otp: +pass-otp: +pass-otp: +pass-otp: +pass-otp: +pass-otp: +pass-otp: https://github.com/tadfisher/pass-otp diff --git a/system/passwdqc/passwdqc.SlackBuild b/system/passwdqc/passwdqc.SlackBuild index db014e5915..fdf2f40aa1 100644 --- a/system/passwdqc/passwdqc.SlackBuild +++ b/system/passwdqc/passwdqc.SlackBuild @@ -5,7 +5,7 @@ # Written by pyllyukko PRGNAM=passwdqc -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/passwdqc/passwdqc.info b/system/passwdqc/passwdqc.info index 424db4dd82..869b52d24a 100644 --- a/system/passwdqc/passwdqc.info +++ b/system/passwdqc/passwdqc.info @@ -1,8 +1,8 @@ PRGNAM="passwdqc" -VERSION="1.3.1" +VERSION="1.4.0" HOMEPAGE="http://www.openwall.com/passwdqc/" -DOWNLOAD="http://www.openwall.com/passwdqc/passwdqc-1.3.1.tar.gz" -MD5SUM="3878b57bcd3fdbcf3d4b362dbc6228b9" +DOWNLOAD="https://www.openwall.com/passwdqc/passwdqc-1.4.0.tar.gz" +MD5SUM="204de4ff2e95095272bba1b0cbab1579" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/password-store/password-store.SlackBuild b/system/password-store/password-store.SlackBuild index 38d702f3b6..770081cb2c 100644 --- a/system/password-store/password-store.SlackBuild +++ b/system/password-store/password-store.SlackBuild @@ -65,7 +65,7 @@ fi # Uncomment the two lines below to install the fish completion file. #mkdir -p "${PKG}/usr/share/fish/completions" -#install -m 0644 -v contrib/pass.fish-completion "${PKG}/usr/share/fish/completions/pass.fish" +#install -m 0644 -v src/completion/pass.fish-completion "${PKG}/usr/share/fish/completions/pass.fish" 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 diff --git a/system/passwordsafe/README b/system/passwordsafe/README index 7b4a839487..ed4afdd044 100644 --- a/system/passwordsafe/README +++ b/system/passwordsafe/README @@ -1,14 +1,14 @@ -Passwordsafe - password database utility (BETA) +Passwordsafe - password database utility -Portable version of the password manager program originally designed by Bruce -Schneier. passwordsafe is the Linux version of the popular Windows PasswordSafe -password manager. +Portable version of the password manager program originally designed by +Bruce Schneier. passwordsafe is the Linux version of the popular Windows +PasswordSafe password manager. -passwordsafe supports Yubicos Yubikey, a unique USB and NFC device offering one- -touch authentication and supporting multiple authentication protocols for all -devices and platfroms - with no driver or client software needed. +passwordsafe supports Yubicos Yubikey, a unique USB and NFC device +offering one- touch authentication and supporting multiple +authentication protocols for all devices and platfroms - with no driver +or client software needed. -If you do not want support for Yubicos Yubikey do not install ykpers and its -dependency (libyubikey). +Optional dependencies: -Read passwordsafe.info for additional dependencies. +ykpers (for yubikey support). diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild index ebd705f8af..c5108d251a 100644 --- a/system/passwordsafe/passwordsafe.SlackBuild +++ b/system/passwordsafe/passwordsafe.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for passwordsafe -# Copyright 2019 rfmae <rfmae.git@mailbox.org> +# Copyright 2020 rfmae <rfmae.git@mailbox.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=passwordsafe -VERSION=${VERSION:-1.07BETA} +VERSION=${VERSION:-1.13.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info index d75f47ad30..52e1c70c0b 100644 --- a/system/passwordsafe/passwordsafe.info +++ b/system/passwordsafe/passwordsafe.info @@ -1,10 +1,10 @@ PRGNAM="passwordsafe" -VERSION="1.07BETA" +VERSION="1.13.0" HOMEPAGE="https://pwsafe.org" -DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.07BETA/pwsafe-1.07BETA.tar.gz" -MD5SUM="b03002e8dfe7d43dc34b3859b331415a" +DOWNLOAD="https://github.com/pwsafe/pwsafe/archive/1.13.0/pwsafe-1.13.0.tar.gz" +MD5SUM="f75a4f3646227998f34c6732e2b22404" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ykpers xerces-c wxGTK3 xvkbd qrencode" +REQUIRES="xerces-c wxGTK3 xvkbd qrencode" MAINTAINER="rfmae" EMAIL="rfmae.git@mailbox.org" diff --git a/system/patchelf/patchelf.SlackBuild b/system/patchelf/patchelf.SlackBuild index 1636e96d22..7ca4ad1081 100644 --- a/system/patchelf/patchelf.SlackBuild +++ b/system/patchelf/patchelf.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=patchelf -VERSION=${VERSION:-0.9} +VERSION=${VERSION:-0.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -85,7 +85,7 @@ make make install DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp README COPYING BUGS $PKG/usr/doc/$PRGNAM-$VERSION +cp README COPYING $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild gzip $PKG/usr/man/man1/* diff --git a/system/patchelf/patchelf.info b/system/patchelf/patchelf.info index 94c52c0b1a..2697431fba 100644 --- a/system/patchelf/patchelf.info +++ b/system/patchelf/patchelf.info @@ -1,8 +1,8 @@ PRGNAM="patchelf" -VERSION="0.9" +VERSION="0.10" HOMEPAGE="https://nixos.org/patchelf.html" -DOWNLOAD="https://github.com/NixOS/patchelf/archive/0.9.tar.gz" -MD5SUM="69c94a4400e930f938b754d543705eb9" +DOWNLOAD="https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2" +MD5SUM="6c3f3a06a95705870d129494a6880106" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/pax/pax.SlackBuild b/system/pax/pax.SlackBuild index 88d9083792..b316863c42 100644 --- a/system/pax/pax.SlackBuild +++ b/system/pax/pax.SlackBuild @@ -10,6 +10,9 @@ # By: Eric Hameleers <alien@slackware.com> # For: pax # Changelog: +# 20201030: 14/Apr/2021 by Ben Collver <bencollver@gmail.com> +# * switch to MirBSD pax +# * removed gpl-2.0.txt # 3.4-2: 17/Sep/2012 by Willy Sudiarto Raharjo <willysr@slackware-id.org> # * Fix build on Slackware 14.0 # 3.4-1: 30/Nov/2008 by Ben Collver <bencollver@gmail.com> @@ -24,13 +27,13 @@ # ----------------------------------------------------------------------------- PRGNAM=pax -VERSION=${VERSION:-3.4} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20201030} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +44,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,41 +63,32 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM +tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz +cd $PRGNAM 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; +chmod 755 Build.sh CFLAGS="$SLKCFLAGS -Wno-error" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux +./Build.sh -make -make install DESTDIR=$PKG +mkdir -p $PKG/usr/bin $PKG/usr/man/man1 +install -c -s -o root -g bin -m 555 pax $PKG/usr/bin/pax +install -c -o root -g bin -m 444 mans/pax.1 $PKG/usr/man/man1/pax.1 -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +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 COPYING ChangeLog NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod 0644 $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 diff --git a/system/pax/pax.info b/system/pax/pax.info index dd95a443b1..976f2757b7 100644 --- a/system/pax/pax.info +++ b/system/pax/pax.info @@ -1,8 +1,8 @@ PRGNAM="pax" -VERSION="3.4" +VERSION="20201030" HOMEPAGE="http://wiki.bash-hackers.org/howto/pax" -DOWNLOAD="https://downloads.sourceforge.net/project/slackbuildsdirectlinks/pax/pax-3.4.tar.bz2" -MD5SUM="fbd9023b590b45ac3ade95870702a0d6" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/pax_20201030.orig.tar.gz" +MD5SUM="87a0a3870ec437c41eb1b406334fe2c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/pce/pce.SlackBuild b/system/pce/pce.SlackBuild index 7e1c928558..c7cfb212d7 100644 --- a/system/pce/pce.SlackBuild +++ b/system/pce/pce.SlackBuild @@ -23,11 +23,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pce -SRCVER=20160308-72f1e10 -VERSION=$(echo $SRCVER | tr - .) +VERSION=${VERSION:-20160308.72f1e10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCVER=$(echo $VERSION | tr . -) + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; diff --git a/system/pcf2bdf/README b/system/pcf2bdf/README new file mode 100644 index 0000000000..d7871d3a39 --- /dev/null +++ b/system/pcf2bdf/README @@ -0,0 +1,5 @@ +pcf2bdf (convert X fonts from PCF to BDF) + +Pcf2bdf is a font de-compiler. It converts X fonts from Portable Compiled +Format (PCF) to Bitmap Distribution Format (BDF). It can also accept a +compressed/gzipped PCF file as input. diff --git a/system/pcf2bdf/pcf2bdf.SlackBuild b/system/pcf2bdf/pcf2bdf.SlackBuild new file mode 100644 index 0000000000..7dc231f4a0 --- /dev/null +++ b/system/pcf2bdf/pcf2bdf.SlackBuild @@ -0,0 +1,72 @@ +#!/bin/sh + +# Slackware build script for pcf2bdf + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=pcf2bdf +VERSION=${VERSION:-1.06} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +make -f Makefile.gcc all install \ + CXXFLAGS="$SLKCFLAGS" \ + PREFIX=/usr \ + MANPATH=/usr/man/man1 \ + INSTALL_PROGRAM="install -s" \ + DESTDIR=$PKG + +gzip $PKG/usr/man/man?/*.? + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.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:-tgz} diff --git a/system/pcf2bdf/pcf2bdf.info b/system/pcf2bdf/pcf2bdf.info new file mode 100644 index 0000000000..43243ad4b4 --- /dev/null +++ b/system/pcf2bdf/pcf2bdf.info @@ -0,0 +1,10 @@ +PRGNAM="pcf2bdf" +VERSION="1.06" +HOMEPAGE="https://github.com/ganaware/pcf2bdf/" +DOWNLOAD="https://github.com/ganaware/pcf2bdf/archive/1.06/pcf2bdf-1.06.tar.gz" +MD5SUM="7cbdf32d1df7b084dc9549c8ba5f916c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/pcf2bdf/slack-desc b/system/pcf2bdf/slack-desc new file mode 100644 index 0000000000..0547163b9d --- /dev/null +++ b/system/pcf2bdf/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------------------------------------------------------| +pcf2bdf: pcf2bdf (convert X fonts from PCF to BDF) +pcf2bdf: +pcf2bdf: Pcf2bdf is a font de-compiler. It converts X fonts from Portable +pcf2bdf: Compiled Format (PCF) to Bitmap Distribution Format (BDF). It can +pcf2bdf: also accept a compressed/gzipped PCF file as input. +pcf2bdf: +pcf2bdf: +pcf2bdf: +pcf2bdf: +pcf2bdf: +pcf2bdf: diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild index 60612070e8..07edeac2f5 100644 --- a/system/pcmanfm/pcmanfm.SlackBuild +++ b/system/pcmanfm/pcmanfm.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com> # Copyright 2010 Chris Abela <chris.abela@maltats.com> -# Copyright 2011-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2021 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 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pcmanfm -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,8 +42,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO" - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -63,6 +61,8 @@ case "$GTK" in *) gtk="--with-gtk=2" ;; esac +DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO" + set -e rm -rf $PKG @@ -71,13 +71,11 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; sh autogen.sh || true @@ -102,7 +100,6 @@ 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 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc -type f -exec chmod 0644 {} \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info index 0e77c2eb2d..d3546b675e 100644 --- a/system/pcmanfm/pcmanfm.info +++ b/system/pcmanfm/pcmanfm.info @@ -1,8 +1,8 @@ PRGNAM="pcmanfm" -VERSION="1.3.0" +VERSION="1.3.2" HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.0.tar.xz" -MD5SUM="827838f7f6b17dc97e1690c07da8fdb3" +DOWNLOAD="https://downloads.sf.net/pcmanfm/pcmanfm-1.3.2.tar.xz" +MD5SUM="ef7c4417d2697ef138d175db7aeae15a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libfm" diff --git a/system/pcsc-lite/pcsc-lite.SlackBuild b/system/pcsc-lite/pcsc-lite.SlackBuild index 7be660105f..9c5b5a155a 100644 --- a/system/pcsc-lite/pcsc-lite.SlackBuild +++ b/system/pcsc-lite/pcsc-lite.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for pcsc-lite # Copyright 2007-2015 LukenShiro, Italy +# Copyright 2020-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pcsc-lite -VERSION=${VERSION:-1.8.14} +VERSION=${VERSION:-1.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -59,10 +60,10 @@ DEBUGATR=${DEBUGATR:-0} AUTOPOFF=${AUTOPOFF:-0} # disabled by default # README and README.DAEMON are not useful and partly outdated. -DOCFILES="DRIVERS SECURITY ChangeLog* COPYING HELP NEWS TODO AUTHORS INSTALL" +DOCFILES="SECURITY ChangeLog* COPYING HELP NEWS TODO AUTHORS INSTALL" -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -90,10 +91,6 @@ 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 the DRIVERS file to reflect the correct drivers directory as built -# with this script -sed -i "s|\/usr\/local|<libdir>|g" DRIVERS - # ATR (answer to reset) debug parsing output case "$DEBUGATR" in 0) DEBUGATR_FLAG="dis" ;; @@ -126,6 +123,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-usbdropdir="/usr/lib${LIBDIRSUFFIX}/pcsc/drivers" \ --enable-confdir=/etc/reader.conf.d \ --${DEBUGATR_FLAG}able-debugatr \ + --disable-libsystemd \ --build=$ARCH-slackware-linux make @@ -140,9 +138,9 @@ mkdir -p $PKG/etc/rc.d install -m 0755 $CWD/rc.pcscd $PKG/etc/rc.d/rc.pcscd.new # Correct manpages in reader.conf.5 and pcscd.8 -sed -i "s|@confdir@|/etc/reader.conf.d|g" $PKG/usr/man/man5/reader.conf.5 -sed -i "s|@sysconfdir_exp@/init.d/pcscd|/etc/rc.d/rc.pcscd|g" $PKG/usr/man/man8/pcscd.8 -sed -i "s|@sysconfdir_exp@|/etc/reader.conf.d|g" $PKG/usr/man/man8/pcscd.8 +sed -i "s|@confdir@|/etc/reader.conf.d|g" $PKG/usr/man/man5/reader.conf.5 || exit 1 +sed -i "s|@sysconfdir_exp@/init.d/pcscd|/etc/rc.d/rc.pcscd|g" $PKG/usr/man/man8/pcscd.8 || exit 1 +sed -i "s|@sysconfdir_exp@|/etc/reader.conf.d|g" $PKG/usr/man/man8/pcscd.8 || exit 1 # Create the directory for drivers and such (not included with this package) mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pcsc/{drivers,services} diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info index 94205e0b12..2b8a9b9da1 100644 --- a/system/pcsc-lite/pcsc-lite.info +++ b/system/pcsc-lite/pcsc-lite.info @@ -1,10 +1,10 @@ PRGNAM="pcsc-lite" -VERSION="1.8.14" +VERSION="1.9.1" HOMEPAGE="https://pcsclite.apdu.fr/" -DOWNLOAD="https://pcsclite.apdu.fr/files/pcsc-lite-1.8.14.tar.bz2" -MD5SUM="439b2c8892f502e39e5b8997a7ae01ed" +DOWNLOAD="https://pcsclite.apdu.fr/files/pcsc-lite-1.9.1.tar.bz2" +MD5SUM="de449fb9dc0bb57ede502905accc0d8b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LukenShiro" -EMAIL="lukenshiro@ngi.it" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/ph/README b/system/ph/README new file mode 100644 index 0000000000..0b8c1894a3 --- /dev/null +++ b/system/ph/README @@ -0,0 +1,6 @@ +ph - a fast Slackware Package History tool + +[ROOT=/mnt] ph [options] [-][NUM] + +ph prints a filtered list of the packages installed in a Slackware +system, using the package description files in /var/log/packages/. diff --git a/system/ph/ph.SlackBuild b/system/ph/ph.SlackBuild new file mode 100644 index 0000000000..5d2ffe6077 --- /dev/null +++ b/system/ph/ph.SlackBuild @@ -0,0 +1,79 @@ +#!/bin/sh + +# Slackware build script for ph +# +# Copyright 2013 Dave Woodfall <dave@tty1.uk> +# 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. + +PRGNAM=ph +VERSION=${VERSION:-1.1.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} +README=$PKG/usr/doc/$PRGNAM-$VERSION/README + +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 {} \; + +sed -i -e "s/@VERSION@/$VERSION/" ph.1 +gzip ph.1 +install -m 644 -D ph.1.gz $PKG/usr/man/man1/ph.1.gz +install -m 755 -D ph $PKG/usr/bin/ph + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION + +cat << EOF > $README +ph - a fast Slackware Package History tool +Copyright 2013- Dave Woodfall +ph is licensed under a "one-clause BSD/Slackware" license. +See the script for the full text. +Homepage: http://tty1.uk/slackbuilds/noversion/ph +EOF + +man ./ph.1.gz | col -b | expand | fmt -72 | cat -s | sed " + 1d + s/\([^[:space:]]\)[[:space:]][[:space:]]*/\1 /g + /^$/N;/PH(1)$/D + " >> $README + +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:-tgz} diff --git a/system/ph/ph.info b/system/ph/ph.info new file mode 100644 index 0000000000..25ee1ce7fc --- /dev/null +++ b/system/ph/ph.info @@ -0,0 +1,10 @@ +PRGNAM="ph" +VERSION="1.1.0" +HOMEPAGE="http://tty1.uk/slackbuilds/noversion/ph" +DOWNLOAD="http://git.tty1.uk/cgit.cgi/ph/snapshot/ph-1.1.0.tar.gz" +MD5SUM="916cad4a723485a54d4213e5dc46ad7f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/system/ph/slack-desc b/system/ph/slack-desc new file mode 100644 index 0000000000..8275eb17ac --- /dev/null +++ b/system/ph/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------------------------------------------------------| +ph: ph (A fast Slackware Package History tool) +ph: +ph: ph prints a filtered list of the packages installed in a Slackware +ph: system, using the package description files in /var/log/packages/. +ph: +ph: HOMEPAGE="http://tty1.uk/slackbuilds/noversion/ph" +ph: +ph: +ph: +ph: +ph: diff --git a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild index 4d23a8215c..d81b19a469 100644 --- a/system/phoronix-test-suite/phoronix-test-suite.SlackBuild +++ b/system/phoronix-test-suite/phoronix-test-suite.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for phoronix-test-suite -# Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=phoronix-test-suite -VERSION=${VERSION:-8.4.1} +VERSION=${VERSION:-10.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/phoronix-test-suite/phoronix-test-suite.info b/system/phoronix-test-suite/phoronix-test-suite.info index e8e4318dc5..187c8159b8 100644 --- a/system/phoronix-test-suite/phoronix-test-suite.info +++ b/system/phoronix-test-suite/phoronix-test-suite.info @@ -1,8 +1,8 @@ PRGNAM="phoronix-test-suite" -VERSION="8.4.1" +VERSION="10.2.2" HOMEPAGE="https://phoronix-test-suite.com/" -DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-8.4.1.tar.gz" -MD5SUM="ab9a64686dee073b5488cea36158afd3" +DOWNLOAD="https://www.phoronix-test-suite.com/releases/phoronix-test-suite-10.2.2.tar.gz" +MD5SUM="e4a9d3fc2e21a7f15e2b4fbef3ee7a44" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/pigz/README b/system/pigz/README index 0ba01a6bcd..9ffe321dfa 100644 --- a/system/pigz/README +++ b/system/pigz/README @@ -1,4 +1,4 @@ -pigz, which stands for parallel implementation of gzip, is a fully -functional replacement for gzip that exploits multiple processors and -multiple cores to the hilt when compressing data. pigz was written by -Mark Adler, and uses the zlib and pthread libraries. +pigz, which stands for Parallel Implementation of GZip, is a fully functional +replacement for gzip that utilizes multiple processors and CPU cores when +compressing data. pigz was written by Mark Adler, and uses zlib and pthread +libraries. diff --git a/system/pigz/math_fix.diff b/system/pigz/math_fix.diff deleted file mode 100644 index 7123175132..0000000000 --- a/system/pigz/math_fix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/Makefile b/Makefile ---- a/Makefile 2013-03-04 00:06:35.000000000 -0600 -+++ b/Makefile 2013-06-18 08:56:58.111172954 -0500 -@@ -3,7 +3,7 @@ - - - pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o -- $(CC) -o pigz $^ -lpthread -lz -+ $(CC) -o pigz $^ -lpthread -lz -lm - ln -f pigz unpigz - - pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h diff --git a/system/pigz/pigz.SlackBuild b/system/pigz/pigz.SlackBuild index ab0ffedf29..6668f4c69b 100644 --- a/system/pigz/pigz.SlackBuild +++ b/system/pigz/pigz.SlackBuild @@ -2,20 +2,38 @@ # Slackware build script for pigz -# Written by Max Miorim <miorimmax@gmail.com> - -# Currently maintained by Patrick Verner <distrozilla@gmail.com> as of 6/29/2013 -# Changelog... -# Patched to fix missing -lm flag in Makefile. math_fix.diff +# Copyright 2010 Max Miorim <miorimmax@gmail.com> +# Copyright 2010 Diogo Leal <diogo@diogoleal.com> +# Copyright 2012 Matteo Bernardini <ponce@slackbuilds.org> +# Copyright 2013 Patrick Verner <distrozilla@gmail.com> +# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl> +# 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. PRGNAM=pigz -VERSION=${VERSION:-2.3} +VERSION=${VERSION:-2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -26,8 +44,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -40,7 +58,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -50,30 +68,28 @@ 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -sed -i "s/^CFLAGS=.*/CFLAGS=$SLKCFLAGS/g" Makefile - -# Add missing -lm flag to Makefile -patch -p1 < $CWD/math_fix.diff + \( -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 {} \; +# append our SLKCFLAGS to CFLAGS in the Makefile: +sed -i "/^CFLAGS=/s/$/\ $SLKCFLAGS/" Makefile make install -D -m 0755 pigz $PKG/usr/bin/pigz -install -D -m 0755 unpigz $PKG/usr/bin/unpigz install -D -m 0644 pigz.1 $PKG/usr/man/man1/pigz.1 +# don't install pigz binary as unpigz, make a symlink instead: +( cd $PKG/usr/bin ; ln -sf pigz unpigz ) -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README pigz.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/pigz/pigz.info b/system/pigz/pigz.info index 1c5c76bab6..6734070493 100644 --- a/system/pigz/pigz.info +++ b/system/pigz/pigz.info @@ -1,10 +1,10 @@ PRGNAM="pigz" -VERSION="2.3" -HOMEPAGE="http://www.zlib.net/pigz/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/pigz-2.3.tar.gz" -MD5SUM="042e3322534f2c3d761736350cac303f" +VERSION="2.4" +HOMEPAGE="https://www.zlib.net/pigz/" +DOWNLOAD="https://www.zlib.net/pigz/pigz-2.4.tar.gz" +MD5SUM="def2f6e19d9d8231445adc1349d346df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Patrick Verner" -EMAIL="distrozilla@gmail.com" +MAINTAINER="Dominik Drobek" +EMAIL="dominik.drobek (at) o2.pl" diff --git a/system/pigz/slack-desc b/system/pigz/slack-desc index 95cba60bb2..a7a2f85cf7 100644 --- a/system/pigz/slack-desc +++ b/system/pigz/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -pigz: pigz (Parallel gzip) +pigz: pigz (Parallel Implementation of GZip) pigz: -pigz: pigz, which stands for parallel implementation of gzip, is a fully -pigz: functional replacement for gzip that exploits multiple processors and -pigz: multiple cores to the hilt when compressing data. pigz was written by -pigz: Mark Adler, and uses the zlib and pthread libraries. +pigz: pigz is a fully functional replacement for gzip that utilizes +pigz: multiple processors and CPU cores when compressing data. pigz +pigz: was written by Mark Adler, and uses zlib and pthread libraries. +pigz: +pigz: Homepage: https://www.zlib.net/pigz/ pigz: -pigz: Home page: http://www.zlib.net/pigz/ pigz: pigz: pigz: diff --git a/system/pixma/00_IPP_PRIVATE_STRUCTURES.diff b/system/pixma/00_IPP_PRIVATE_STRUCTURES.diff new file mode 100644 index 0000000000..6aa7c3afa7 --- /dev/null +++ b/system/pixma/00_IPP_PRIVATE_STRUCTURES.diff @@ -0,0 +1,20 @@ +--- cngpij/cngpij/bjcups.c.orig 2013-07-17 11:33:45.000000000 +1000 ++++ cngpij/cngpij/bjcups.c 2019-03-05 21:47:19.748034963 +1000 +@@ -21,6 +21,7 @@ + #include <config.h> + #endif // HAVE_CONFIG_H + ++#define _IPP_PRIVATE_STRUCTURES 1 + #include <cups/cups.h> + #include <cups/language.h> + #include <cups/ppd.h> +--- cngpijmnt/src/main.c.orig 2013-07-17 11:33:45.000000000 +1000 ++++ cngpijmnt/src/main.c 2019-03-05 21:53:32.803734632 +1000 +@@ -21,6 +21,7 @@ + #include <config.h> + #endif // HAVE_CONFIG_H + ++#define _IPP_PRIVATE_STRUCTURES 1 + #include <cups/cups.h> + #include <cups/language.h> + #include <cups/ppd.h> diff --git a/system/pixma/04_ppd_h.diff b/system/pixma/04_ppd_h.diff new file mode 100644 index 0000000000..f8f865d930 --- /dev/null +++ b/system/pixma/04_ppd_h.diff @@ -0,0 +1,10 @@ +--- backend/src/cnij_backend_common.c.orig 2013-07-17 11:33:45.000000000 +1000 ++++ backend/src/cnij_backend_common.c 2019-03-05 22:02:03.105361333 +1000 +@@ -38,6 +38,7 @@ + // CUPS Header + #include <cups/cups.h> + #include <cups/ipp.h> ++#include <cups/ppd.h> + + // Header file for CANON + #include "cnij_backend_common.h" diff --git a/system/pixma/README b/system/pixma/README new file mode 100644 index 0000000000..ae3198c72d --- /dev/null +++ b/system/pixma/README @@ -0,0 +1,30 @@ +Driver & PPD files for Canon PIXMA printers. + +By default, this SlackBuild supports all the following Canon PIXMA printer +families: + cnijfilter-mg2500-429 + cnijfilter-mg2400-428 + cnijfilter-mg3500-427 + cnijfilter-mg5500-426 + cnijfilter-mg6400-425 + cnijfilter-mg6500-424 + cnijfilter-mg7100-423 + cnijfilter-p200-430 + +Support for only certain printers may be built by specifying one/some of the +listed printer families in the MODELS environment variable. + +For example to support only the MG2522 printer, run: + MODELS="cnijfilter-mg2500-429" sh pixma.SlackBuild + +To support both the MG2522 and MG7164 printers, run: + MODELS="cnijfilter-mg2500-429 cnijfilter-mg7100-423" sh pixma.SlackBuild + +To support all available printers, don't specify any MODELS; just run: + sh pixma.SlackBuild + + +NB. see also SBo system/cnijfilter2 SlackBuild for support of related Canon +printers. It supports MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, +iB4000, MB5000, MB5300, iP110, E450, MX490 and E480 series. + diff --git a/system/pixma/pixma.SlackBuild b/system/pixma/pixma.SlackBuild new file mode 100644 index 0000000000..1770fffead --- /dev/null +++ b/system/pixma/pixma.SlackBuild @@ -0,0 +1,177 @@ +#!/bin/sh + +# Slackware build script for pixma + +# Copyright 2019 Christoph Willing Brisbane, Australia +# 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. + +PRGNAM=pixma +VERSION=${VERSION:-4.00.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=cnijfilter-source +SRCVERSION=${SRCVERSION:-4.00-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$SRCNAM +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 + +PRINTER_PKG_PROGRAM="ppd cnijfilter" +MODELS=${MODELS:-} +if [ -z $MODELS ]; then + PRINTER_DEPEND_PKG="cnijfilter-mg2500-429 cnijfilter-mg2400-428 cnijfilter-mg3500-427 cnijfilter-mg5500-426 cnijfilter-mg6400-425 cnijfilter-mg6500-424 cnijfilter-mg7100-423 cnijfilter-p200-430" + echo "PRINTER_DEPEND_PKG = $PRINTER_DEPEND_PKG" +else + PRINTER_DEPEND_PKG="" + for m in $MODELS ; do + PRINTER_DEPEND_PKG="$PRINTER_DEPEND_PKG $m" + done + echo "PRINTER_DEPEND_PKG = $PRINTER_DEPEND_PKG" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$SRCVERSION +tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz +cd $SRCNAM-$SRCVERSION + +# Cups >= 1.6 +patch -p0 < $CWD/00_IPP_PRIVATE_STRUCTURES.diff +patch -p0 < $CWD/04_ppd_h.diff + +# Correct cups directory location +sed -i -e "s/lib\/cups/lib$LIBDIRSUFFIX\/cups/" cnijbe/src/Makefile.am +sed -i -e "s/lib\/cups/lib$LIBDIRSUFFIX\/cups/" backend/src/Makefile.am +sed -i -e "s/lib\/cups/lib$LIBDIRSUFFIX\/cups/" backendnet/backend/Makefile.am + +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 {} \; + +(cd ./libs; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr ) +(cd ./bscc2sts; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh ) +(cd ./cnijnpr; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib$LIBDIRSUFFIX/bjlib ) +(cd ./cngpij; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin ) +(cd ./cngpijmnt; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin ) +(cd ./pstocanonij; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --libdir=/usr/lib$LIBDIRSUFFIX --enable-progpath=/usr/bin ) +(cd ./backend; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin ) +(cd ./backendnet; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/libs_bin$LIBDIRSUFFIX" ) +(cd ./cmdtocanonij; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --libdir=/usr/lib$LIBDIRSUFFIX ) +(cd ./cnijbe; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin ) +(cd ./lgmon2; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-progpath=/usr/bin LDFLAGS="-L../../com/libs_bin$LIBDIRSUFFIX" ) + +(cd ./ppd; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-ppdpath=/usr/share/ppd --program-suffix=CN_IJ_MODEL ) +(cd ./cnijfilter; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib$LIBDIRSUFFIX/bjlib --enable-binpath=/usr/bin --program-suffix=CN_IJ_MODEL ) + +for pkg in $PRINTER_DEPEND_PKG ; do + model_name=`echo ${pkg} | cut -d- -f2` && \ + comm_name=`echo ${pkg} | cut -d- -f1` && \ + model_num=`echo ${pkg} | cut -d- -f3` && \ + model_dir=${comm_name}-${model_name}series && \ + for pg_name in $PRINTER_PKG_PROGRAM ; do + pushd ./$pg_name + find . -name Makefile -print > file_lists; \ + find . -name config.h -print >> file_lists; \ + for fn in $(cat file_lists) ; do + if [ ! -f ${fn}.org ]; then + cp ${fn} ${fn}.org + fi + sed -e s/CN_IJ_MODEL_NUM/${model_num}/g ${fn}.org | sed -e s/CN_IJ_MODEL/${model_name}/ > cn_ij_tmp; mv cn_ij_tmp ${fn} + done + make clean; make; make install DESTDIR=$PKG + popd + done + mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX} + install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcmcm${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ + install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcnclapi${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ + install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcnclbjcmd${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ + install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpcnclui${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ + install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpess${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ + install -m 755 ${model_num}/libs_bin${LIBDIRSUFFIX}/libcnbpo${model_num}.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ + mkdir -p ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib + install -m 644 ${model_num}/database/cif${model_name}.conf ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib + install -m 644 ${model_num}/database/cnb_${model_num}0.tbl ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib + install -m 644 ${model_num}/database/cnbpname${model_num}.tbl ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib + if [ -f ${model_num}/database/cif${model_name}.bscc ]; then + install -m 644 -o lp -g lp ${model_num}/database/cif${model_name}.bscc ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib || true + fi +done + +( cd ./libs; make clean; make ) +( cd ./bscc2sts; make clean; make ) +( cd ./cnijnpr; make clean; make; make install DESTDIR=$PKG ) +( cd ./cngpij; make clean; make; make install DESTDIR=$PKG) +( cd ./cngpijmnt; make clean; make; make install DESTDIR=$PKG) +( cd ./pstocanonij; make clean; make; make install DESTDIR=$PKG ) +( cd ./backend; make clean; make; make install DESTDIR=$PKG ) +( cd ./backendnet; make clean; make; make install DESTDIR=$PKG ) +( cd ./cmdtocanonij; make clean; make; make install DESTDIR=$PKG ) +( cd ./cnijbe; make clean; make; make install DESTDIR=$PKG ) +( cd ./lgmon2; make clean; make; make install DESTDIR=$PKG ) + +install -m 755 com/libs_bin${LIBDIRSUFFIX}/libcnnet.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ +install -m 755 com/libs_bin${LIBDIRSUFFIX}/libcnbpcnclapicom.so.* ${PKG}/usr/lib${LIBDIRSUFFIX}/ +install -m 644 -o lp -g lp com/ini/cnnet.ini ${PKG}/usr/lib${LIBDIRSUFFIX}/bjlib/ || true + +mkdir -p $PKG/etc/udev/rules.d +install -m 644 etc/*.rules ${PKG}/etc/udev/rules.d/ + +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 +cp -a LICENSE-cnijfilter-4*.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:-tgz} diff --git a/system/pixma/pixma.info b/system/pixma/pixma.info new file mode 100644 index 0000000000..faff1ae9ba --- /dev/null +++ b/system/pixma/pixma.info @@ -0,0 +1,10 @@ +PRGNAM="pixma" +VERSION="4.00.1" +HOMEPAGE="https://www.canon-wireless.com/2018/11/canon-pixma-mg2522-driver-download.html" +DOWNLOAD="http://gdlp01.c-wss.com/gds/5/0100005515/01/cnijfilter-source-4.00-1.tar.gz" +MD5SUM="52e625dfa42459ead1929c07900b8e44" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Christoph Willing" +EMAIL="chris.willing@linux.com" diff --git a/system/pixma/slack-desc b/system/pixma/slack-desc new file mode 100644 index 0000000000..50f35ede2f --- /dev/null +++ b/system/pixma/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------------------------------------------------------| +pixma: pixma (Canon PIXMA printer driver) +pixma: +pixma: Driver & PPD files for Canon PIXMA family printers. +pixma: +pixma: +pixma: +pixma: +pixma: +pixma: +pixma: +pixma: diff --git a/system/plan9port/README b/system/plan9port/README index 62a5c143bc..2029535263 100644 --- a/system/plan9port/README +++ b/system/plan9port/README @@ -10,20 +10,14 @@ want to use the mirrored sources: https://github.com/9fans/plan9port/archive/master.zip There may be differences in the checksum as it is the development branch. - Notes on using rc with uxterm from Eric Lindblad, -Email (in rc): Geirfugl^ApS^@^yahoo.com - Tested with Slackware 14.0 with Danish and English keyboards settings. -Ctrl-i tab Ctrl-Bksp +Ctrl-i tab + +Ctrl-u delete line back to prompt -Ctrl-u delete line - back to prompt or open Menu - and uncheck +Ctrl-w delete word to left of cursor -Ctrl-w delete word to BackArrow Key (BS/Del) - left of cursor then Bksp will - work independently - but Ctrl-Bksp will - not work +Ctrl-Bksp backspace, or open Menu and uncheck BackArrow Key (BS/Del) + then Bksp will work independently but Ctrl-Bksp will not work diff --git a/system/plan9port/plan9port.SlackBuild b/system/plan9port/plan9port.SlackBuild index d2f59e2b2e..4038cf29ff 100644 --- a/system/plan9port/plan9port.SlackBuild +++ b/system/plan9port/plan9port.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for plan9port -# Copyright (c) 2012-2017 Ruben Schuller +# Copyright (c) 2012-2019 Ruben Schuller # # Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com> # All rights reserved. @@ -26,9 +26,10 @@ # 2012-10-23: added some changes to reflect the usage of nightly tarballs PRGNAM=plan9port -VERSION=${VERSION:-20171222} +VERSION=${VERSION:-20190501} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +COMMIT="3197719090b3fd0a038767f7e8e15e771b1515be" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -48,9 +49,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG/opt $OUTPUT cd $TMP -rm -rf $PRGNAM-master -unzip $CWD/master.zip || unzip $CWD/plan9port-master.zip -cd $PRGNAM-master +rm -rf $PRGNAM-${COMMIT} +unzip $CWD/${COMMIT} || unzip $CWD/plan9port-${COMMIT}.zip +cd $PRGNAM-${COMMIT} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -62,7 +63,7 @@ find -L . \ PLAN9_TARGET=/opt/plan9 ./INSTALL cd $TMP -mv $PRGNAM-master $PKG/opt/plan9 +mv $PRGNAM-${COMMIT} $PKG/opt/plan9 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 diff --git a/system/plan9port/plan9port.info b/system/plan9port/plan9port.info index 7cf3c1e3dd..eab8312767 100644 --- a/system/plan9port/plan9port.info +++ b/system/plan9port/plan9port.info @@ -1,7 +1,7 @@ PRGNAM="plan9port" -VERSION="20171222" +VERSION="20190501" HOMEPAGE="https://9fans.github.io/plan9port/" -DOWNLOAD="https://rbn.im/files/sources/plan9port/20171222/master.zip" +DOWNLOAD="https://rbn.im/files/sources/plan9port/20190501/master.zip" MD5SUM="3ca89a88e239f732a33d329a9fdb6f9d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/plymouth/README b/system/plymouth/README new file mode 100644 index 0000000000..83850a937e --- /dev/null +++ b/system/plymouth/README @@ -0,0 +1,11 @@ +plymouth (graphical boot animation and logger) + +Plymouth is an application that runs very early in the boot process +(even before the root filesystem is mounted!) that provides a +graphical boot animation while the boot process happens in the +background. + + +Homepage: https://www.freedesktop.org/wiki/Software/Plymouth/ + + diff --git a/system/plymouth/gpl-2.0.txt b/system/plymouth/gpl-2.0.txt new file mode 100644 index 0000000000..5deaa182ff --- /dev/null +++ b/system/plymouth/gpl-2.0.txt @@ -0,0 +1,308 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + plymouth.SlackBuild script + Copyright (C) 2019 Marian Marinov <mm@yuhu.biz> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff --git a/system/plymouth/plymouth.SlackBuild b/system/plymouth/plymouth.SlackBuild new file mode 100644 index 0000000000..68224347a9 --- /dev/null +++ b/system/plymouth/plymouth.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for plymouth + +# Copyright 2019 Marian Marinov +# 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. + +PRGNAM=plymouth +VERSION=${VERSION:-0.9.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +PREFIX=/usr + +mkdir -p $PKG/$PREFIX/bin +./configure \ +--prefix=/usr \ +--libdir=/usr/lib${LIBDIRSUFFIX} \ +--docdir=/usr/doc/$PRGNAM-$VERSION \ +--mandir=/usr/man \ +--build=$ARCH-slackware-linux \ +--with-logo \ +--with-background-color='#000000' \ +--disable-systemd-integration + + +make +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION + +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 + +cp -a AUTHORS COPYING INSTALL ChangeLog NEWS README TODO $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:-tgz} diff --git a/system/plymouth/plymouth.info b/system/plymouth/plymouth.info new file mode 100644 index 0000000000..ce0f47c6e1 --- /dev/null +++ b/system/plymouth/plymouth.info @@ -0,0 +1,10 @@ +PRGNAM="plymouth" +VERSION="0.9.4" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/Plymouth/" +DOWNLOAD="https://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.4.tar.xz" +MD5SUM="4efa5551d230165981b105e7c6a50aa7" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Marian Marinov" +EMAIL="mm@yuhu.biz" diff --git a/system/plymouth/slack-desc b/system/plymouth/slack-desc new file mode 100644 index 0000000000..5034fa870f --- /dev/null +++ b/system/plymouth/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------------------------------------------------------| +plymouth: plymouth (graphical boot animation and logger) +plymouth: +plymouth: Plymouth is an application that runs very early in the boot process +plymouth: (even before the root filesystem is mounted!) that provides a +plymouth: graphical boot animation while the boot process happens in the +plymouth: background. +plymouth: +plymouth: +plymouth: Homepage: https://www.freedesktop.org/wiki/Software/Plymouth/ +plymouth: +plymouth: diff --git a/system/podman/README b/system/podman/README new file mode 100644 index 0000000000..f7d3cfec14 --- /dev/null +++ b/system/podman/README @@ -0,0 +1,21 @@ +podman - for running OCI-based containers in Pods + +libpod provides a library for applications looking to use the Container Pod +concept popularized by Kubernetes. libpod also contains a tool called podman +for managing Pods, Containers, and Container Images. + +At a high level, the scope of libpod and podman is the following: +* Support multiple image formats including the existing Docker/OCI image formats. +* Support for multiple means to download images including trust & image verification. +* Container image management (managing image layers, overlay filesystems, etc). +* Full management of container lifecycle +* Support for pods to manage groups of containers together +* Resource isolation of containers and pods. + +These container runtimes can run as non-root, but require sub-uid/gid mappings + +To run podman as a user: + + echo 'user.max_user_namespaces=30111' >> /etc/sysctl.conf + echo '<YOUR_USER>:100000:65536' >> /etc/subuid + echo '<YOUR_USER>:100000:65536' >> /etc/subgid diff --git a/system/podman/doinst.sh b/system/podman/doinst.sh new file mode 100644 index 0000000000..b93a3a48a2 --- /dev/null +++ b/system/podman/doinst.sh @@ -0,0 +1,18 @@ +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... +} + +config etc/containers/libpod.conf.new +config etc/containers/registries.conf.new +config etc/containers/mounts.conf.new +config etc/containers/seccomp.json.new +config etc/containers/policy.json.new diff --git a/system/podman/mounts.conf b/system/podman/mounts.conf new file mode 100644 index 0000000000..270d316922 --- /dev/null +++ b/system/podman/mounts.conf @@ -0,0 +1 @@ +/etc/containers/secrets:/run/secrets diff --git a/system/podman/podman.SlackBuild b/system/podman/podman.SlackBuild new file mode 100644 index 0000000000..7a727b07f3 --- /dev/null +++ b/system/podman/podman.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Slackware build script for podman + +# Copyright 2019 Gabriel Diaz, Madrid, Spain +# Copyright 2019 Vincent Batts, Raleigh, NC, USA +# 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. + +PRGNAM=podman +REPONAME=libpod +VERSION=${VERSION:-1.6.2} +GIT_COMMIT="f3ffda1e08f19e9a6a88484136b5eed76533f21a" +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +# The domain part of the go package name, usually the hosting platform +DOMAIN=github.com +# The name of the organization/owner of the package +ORG=containers + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 $REPONAME-$VERSION +mkdir -p $REPONAME-$VERSION/src/$DOMAIN/$ORG +cd $REPONAME-$VERSION/src/$DOMAIN/$ORG +tar xvf $CWD/$REPONAME-$VERSION.tar.gz +mv $PRGNAM-$VERSION $REPONAME +cd $REPONAME +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 {} \; + +# Point go to the location of the source tree +export GOPATH="$TMP/$REPONAME-$VERSION" + +make GIT_COMMIT="$GIT_COMMIT" +make install DESTDIR="$PKG" PREFIX="/usr/" MANDIR="/usr/man/" GIT_COMMIT="$GIT_COMMIT" + +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 \ + 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 + +mkdir -p $PKG/etc/containers/secrets + +# use upstream's default seccomp policy +cp seccomp.json $PKG/etc/containers/seccomp.json.new +# use upstream config, but default to cgroupfs +cat libpod.conf | sed 's/^cgroup_manager = "systemd"/cgroup_manager = "cgroupfs"/g' > $PKG/etc/containers/libpod.conf.new + +cp $CWD/registries.conf $PKG/etc/containers/registries.conf.new +cp $CWD/mounts.conf $PKG/etc/containers/mounts.conf.new +cp $CWD/policy.json $PKG/etc/containers/policy.json.new + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/podman/podman.info b/system/podman/podman.info new file mode 100644 index 0000000000..725e924d15 --- /dev/null +++ b/system/podman/podman.info @@ -0,0 +1,10 @@ +PRGNAM="podman" +VERSION="1.6.2" +HOMEPAGE="https://github.com/containers/libpod" +DOWNLOAD="https://github.com/containers/libpod/archive/v1.6.2/libpod-1.6.2.tar.gz" +MD5SUM="bf43121bc45b19404d8bcfaf87e5046d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="cni-plugins conmon runc go-md2man slirp4netns" +MAINTAINER="Vincent Batts" +EMAIL="vbatts@hashbangbash.com" diff --git a/system/podman/policy.json b/system/podman/policy.json new file mode 100644 index 0000000000..dffc54a626 --- /dev/null +++ b/system/podman/policy.json @@ -0,0 +1,14 @@ +{ + "default": [ + { + "type": "insecureAcceptAnything" + } + ], + "transports": + { + "docker-daemon": + { + "": [{"type":"insecureAcceptAnything"}] + } + } +} diff --git a/system/podman/registries.conf b/system/podman/registries.conf new file mode 100644 index 0000000000..21ddef2871 --- /dev/null +++ b/system/podman/registries.conf @@ -0,0 +1,82 @@ +# For more information on this configuration file, see containers-registries.conf(5). +# +# There are multiple versions of the configuration syntax available, where the +# second iteration is backwards compatible to the first one. Mixing up both +# formats will result in an runtime error. +# +# The initial configuration format looks like this: +# +# Registries to search for images that are not fully-qualified. +# i.e. foobar.com/my_image:latest vs my_image:latest +[registries.search] +registries = ['docker.io', 'quay.io', 'registry.fedoraproject.org', 'registry.access.redhat.com', 'registry.centos.org'] + +# Registries that do not use TLS when pulling images or uses self-signed +# certificates. +[registries.insecure] +registries = [] + +# Blocked Registries, blocks the `docker daemon` from pulling from the blocked registry. If you specify +# "*", then the docker daemon will only be allowed to pull from registries listed above in the search +# registries. Blocked Registries is deprecated because other container runtimes and tools will not use it. +# It is recommended that you use the trust policy file /etc/containers/policy.json to control which +# registries you want to allow users to pull and push from. policy.json gives greater flexibility, and +# supports all container runtimes and tools including the docker daemon, cri-o, buildah ... +# The atomic CLI `atomic trust` can be used to easily configure the policy.json file. +[registries.block] +registries = [] + +# The second version of the configuration format allows to specify registry +# mirrors: +# +# # An array of host[:port] registries to try when pulling an unqualified image, in order. +# unqualified-search-registries = ["example.com"] +# +# [[registry]] +# # The "prefix" field is used to choose the relevant [[registry]] TOML table; +# # (only) the TOML table with the longest match for the input image name +# # (taking into account namespace/repo/tag/digest separators) is used. +# # +# # If the prefix field is missing, it defaults to be the same as the "location" field. +# prefix = "example.com/foo" +# +# # If true, unencrypted HTTP as well as TLS connections with untrusted +# # certificates are allowed. +# insecure = false +# +# # If true, pulling images with matching names is forbidden. +# blocked = false +# +# # The physical location of the "prefix"-rooted namespace. +# # +# # By default, this equal to "prefix" (in which case "prefix" can be omitted +# # and the [[registry]] TOML table can only specify "location"). +# # +# # Example: Given +# # prefix = "example.com/foo" +# # location = "internal-registry-for-example.net/bar" +# # requests for the image example.com/foo/myimage:latest will actually work with the +# # internal-registry-for-example.net/bar/myimage:latest image. +# location = internal-registry-for-example.com/bar" +# +# # (Possibly-partial) mirrors for the "prefix"-rooted namespace. +# # +# # The mirrors are attempted in the specified order; the first one that can be +# # contacted and contains the image will be used (and if none of the mirrors contains the image, +# # the primary location specified by the "registry.location" field, or using the unmodified +# # user-specified reference, is tried last). +# # +# # Each TOML table in the "mirror" array can contain the following fields, with the same semantics +# # as if specified in the [[registry]] TOML table directly: +# # - location +# # - insecure +# [[registry.mirror]] +# location = "example-mirror-0.local/mirror-for-foo" +# [[registry.mirror]] +# location = "example-mirror-1.local/mirrors/foo" +# insecure = true +# # Given the above, a pull of example.com/foo/image:latest will try: +# # 1. example-mirror-0.local/mirror-for-foo/image:latest +# # 2. example-mirror-1.local/mirrors/foo/image:latest +# # 3. internal-registry-for-example.net/bar/myimage:latest +# # in order, and use the first one that exists. diff --git a/system/podman/slack-desc b/system/podman/slack-desc new file mode 100644 index 0000000000..618134f96c --- /dev/null +++ b/system/podman/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------------------------------------------------------| +podman: podman (utility to run OCI-based containers) +podman: +podman: libpod provides a library for applications looking to use the +podman: Container Pod concept popularized by Kubernetes. libpod also contains +podman: a tool called podman for managing Pods, Containers, and Container +podman: Images. +podman: +podman: Site: https://github.com/containers/libpod +podman: +podman: +podman: diff --git a/system/pommed-light/slack-desc b/system/pommed-light/slack-desc index ea62e9da6a..15bfb62be9 100644 --- a/system/pommed-light/slack-desc +++ b/system/pommed-light/slack-desc @@ -5,15 +5,15 @@ # 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-------------------------------------------------| + |-----handy-ruler------------------------------------------------------| pommed-light: pommed-light (Apple laptops hotkeys events handler) pommed-light: pommed-light: pommed handles the hotkeys found on the Apple MacBook Pro and pommed-light: MacBook laptops and adjusts the LCD backlight, sound volume, pommed-light: keyboard backlight or ejects the CD-ROM drive accordingly. pommed-light: +pommed-light: Homepage: https://github.com/bytbox/pommed-light pommed-light: pommed-light: pommed-light: -pommed-light: Homepage: https://github.com/bytbox/pommed-light pommed-light: diff --git a/system/porg/porg.SlackBuild b/system/porg/porg.SlackBuild index a2f4ca1ad5..61219d02c0 100644 --- a/system/porg/porg.SlackBuild +++ b/system/porg/porg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for porg -# Written by Jostein Berntsen <jbernts@broadpark.no> +# Written by Jostein Berntsen <jvbernts@online.no> PRGNAM=porg VERSION=${VERSION:-0.10} diff --git a/system/porg/porg.info b/system/porg/porg.info index 57d779505d..6efa7e1524 100644 --- a/system/porg/porg.info +++ b/system/porg/porg.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/system/posh/doinst.sh b/system/posh/doinst.sh new file mode 100644 index 0000000000..6910686719 --- /dev/null +++ b/system/posh/doinst.sh @@ -0,0 +1,8 @@ +if [ ! -r etc/shells ]; then + touch etc/shells + chmod 644 etc/shells +fi + +if ! grep -q /bin/posh etc/shells ; then + printf %s\\n /bin/posh >> etc/shells +fi diff --git a/system/posh/posh.SlackBuild b/system/posh/posh.SlackBuild index 0e22a2b0e9..62f1c8dcd6 100644 --- a/system/posh/posh.SlackBuild +++ b/system/posh/posh.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for posh -# Copyright 2017-2018 Hunter Sezen California, USA +# Copyright 2017-2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=posh -VERSION=${VERSION:-0.13.2} +VERSION=${VERSION:-0.14.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -85,8 +85,8 @@ make install DESTDIR=$PKG mkdir -p $PKG/usr/bin ln -s /bin/$PRGNAM $PKG/usr/bin/$PRGNAM -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 -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 @@ -97,6 +97,7 @@ 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:-tgz} diff --git a/system/posh/posh.info b/system/posh/posh.info index dc22b8bee3..5867da639a 100644 --- a/system/posh/posh.info +++ b/system/posh/posh.info @@ -1,10 +1,10 @@ PRGNAM="posh" -VERSION="0.13.2" +VERSION="0.14.1" HOMEPAGE="https://packages.qa.debian.org/p/posh.html" -DOWNLOAD="http://http.debian.net/debian/pool/main/p/posh/posh_0.13.2.tar.xz" -MD5SUM="d4e4bd477bc68d78442f9967faab2406" +DOWNLOAD="http://http.debian.net/debian/pool/main/p/posh/posh_0.14.1.tar.xz" +MD5SUM="71f482c9a8815f209abf6ac134543bc9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/posixovl/slack-desc b/system/posixovl/slack-desc index e9026a93f9..df81acbaaa 100644 --- a/system/posixovl/slack-desc +++ b/system/posixovl/slack-desc @@ -12,7 +12,7 @@ posixovl: posixovl provides a filesystem view that supports various POSIX posixovl: operations while using an otherwise incapable lower filesystem. posixovl: Filesystems of various degrees of POSIXness can be utilitzed. VFAT posixovl: is a common denominator when it comes to cross-compatibility, -posixovl: though NTFS — its features are unused in Linux — would be another +posixovl: though NTFS - its features are unused in Linux - would be another posixovl: possibility. Secondly, potent native POSIX-style filesystems can posixovl: also be used, though the actual use of doing that remains to be posixovl: discovered. diff --git a/system/postgresql/postgresql.SlackBuild b/system/postgresql/postgresql.SlackBuild index 6eb97b2e1a..0c043fa2bc 100644 --- a/system/postgresql/postgresql.SlackBuild +++ b/system/postgresql/postgresql.SlackBuild @@ -25,11 +25,11 @@ # Modified by the SlackBuilds.org Project PRGNAM=postgresql -VERSION=${VERSION:-10.2} +VERSION=${VERSION:-10.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -PG_VERSION=${PG_VERSION:-10.2} +PG_VERSION=${PG_VERSION:-10.10} PG_PORT=${PG_PORT:-5432} PG_UID=${PG_UID:-209} PG_GID=${PG_GID:-209} @@ -87,7 +87,7 @@ set -e rm -rf $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/postgresql/postgresql.info b/system/postgresql/postgresql.info index a73180c6c6..cb379a5c22 100644 --- a/system/postgresql/postgresql.info +++ b/system/postgresql/postgresql.info @@ -1,10 +1,10 @@ PRGNAM="postgresql" -VERSION="10.2" +VERSION="10.10" HOMEPAGE="https://www.postgresql.org" -DOWNLOAD="https://ftp.postgresql.org/pub/source/v10.2/postgresql-10.2.tar.bz2" -MD5SUM="e97c3cc72bdf661441f29069299b260a" +DOWNLOAD="https://ftp.postgresql.org/pub/source/v10.10/postgresql-10.10.tar.gz" +MD5SUM="e4cc4587fb830065f9386e16a949019e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Adis Nezirovic" -EMAIL="adis_at_linux.org.ba" +MAINTAINER="Dionysis Ntreou" +EMAIL="yakizarns1@gmail.com" diff --git a/system/powerkit/README b/system/powerkit/README index 9fb732ba51..87098342bb 100644 --- a/system/powerkit/README +++ b/system/powerkit/README @@ -1,3 +1,9 @@ -powerkit is an lightweight desktop independent full featured power manager, originally created for Slackware for use with alternative desktop environments and window managers, like Fluxbox, Blackbox, FVWM, WindowMaker, Openbox, Lumina and others. +powerkit is an lightweight desktop independent full featured power +manager, originally created for Slackware for use with alternative +desktop environments and window managers, like Fluxbox, Blackbox, FVWM, +WindowMaker, Openbox, Lumina and others. -Hibernation/HybridSleep requires the kernel option resume=<swap_partition/swap_file>. Backlight support requires proper udev rules, see /usr/doc/powerkit-VERSION/90-backlight.rules. Read 'man powerkit' and /usr/doc/powerkit-VERSION/README.md for more information. +Hibernation/HybridSleep requires the kernel option +resume=<swap_partition/swap_file>. Backlight support requires proper +udev rules, see /usr/doc/powerkit-VERSION/90-backlight.rules. Read 'man +powerkit' and /usr/doc/powerkit-VERSION/README.md for more information. diff --git a/system/powerkit/powerkit.SlackBuild b/system/powerkit/powerkit.SlackBuild index 630de8fe57..287dffbf57 100644 --- a/system/powerkit/powerkit.SlackBuild +++ b/system/powerkit/powerkit.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=powerkit -VERSION=${VERSION:-1.0.0rc2} +VERSION=${VERSION:-1.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} QMAKE=${QMAKE:-qmake} diff --git a/system/powerkit/powerkit.info b/system/powerkit/powerkit.info index abe8a23d6f..fe719c9a15 100644 --- a/system/powerkit/powerkit.info +++ b/system/powerkit/powerkit.info @@ -1,8 +1,8 @@ PRGNAM="powerkit" -VERSION="1.0.0rc2" +VERSION="1.0.0" HOMEPAGE="https://github.com/rodlie/powerkit" -DOWNLOAD="https://github.com/rodlie/powerkit/releases/download/1.0.0rc2/powerkit-1.0.0rc2.tar.xz" -MD5SUM="ac4d2d4251702890d71e99e7c3f3178b" +DOWNLOAD="https://github.com/rodlie/powerkit/releases/download/1.0.0/powerkit-1.0.0.tar.xz" +MD5SUM="e5a613f2219c0491d1bdae1fa1afe4d5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/powerkit/slack-desc b/system/powerkit/slack-desc index 3521964240..76e6d88325 100644 --- a/system/powerkit/slack-desc +++ b/system/powerkit/slack-desc @@ -13,7 +13,7 @@ powerkit: manager, originally created for Slackware for use with alternative powerkit: desktop environments and window managers, like Fluxbox, Blackbox, powerkit: FVWM, WindowMaker, Openbox, Lumina and others. powerkit: -powerkit: powerkit was written by Ole-André Rodlie +powerkit: powerkit was written by Ole-Andre Rodlie powerkit: powerkit: Homepage: https://github.com/rodlie/powerkit powerkit: diff --git a/system/powerline-status/README b/system/powerline-status/README index bf44e92102..f2f6f0f86b 100644 --- a/system/powerline-status/README +++ b/system/powerline-status/README @@ -1,3 +1,5 @@ Powerline is a statusline plugin for vim, and provides statuslines and prompts for several other applications, including zsh, bash, tmux, IPython, Awesome, i3 and Qtile. + +Optional dependency: python3 diff --git a/system/powerline-status/powerline-status.SlackBuild b/system/powerline-status/powerline-status.SlackBuild index 99103b3371..edc99f6570 100644 --- a/system/powerline-status/powerline-status.SlackBuild +++ b/system/powerline-status/powerline-status.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for powerline-status -# Copyright 2016-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=powerline-status VERSION=${VERSION:-2.7} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,6 +71,11 @@ find -L . \ python setup.py install --root=$PKG +# Python 3 support. +if $(python3 -c 'import sys' 2>/dev/null); then + python3 setup.py install --root=$PKG +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 diff --git a/system/powernowd/powernowd.SlackBuild b/system/powernowd/powernowd.SlackBuild index f17ad33837..c5d7cb8831 100644 --- a/system/powernowd/powernowd.SlackBuild +++ b/system/powernowd/powernowd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for powernowd -# Written by David Woodfall info@davidwoodfall.co.uk +# Written by David Woodfall <dave@slackbuilds.org> PRGNAM=powernowd VERSION=${VERSION:-1.00} diff --git a/system/powernowd/powernowd.info b/system/powernowd/powernowd.info index 61240ccd55..bed5c35b49 100644 --- a/system/powernowd/powernowd.info +++ b/system/powernowd/powernowd.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/powerpanel/powerpanel.SlackBuild b/system/powerpanel/powerpanel.SlackBuild index 02f3c3b86f..ae11ec630c 100644 --- a/system/powerpanel/powerpanel.SlackBuild +++ b/system/powerpanel/powerpanel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for powerpanel -# Copyright 2017 Jason Graham Baltimore, MD, USA +# Copyright 2017,2020 Jason Graham <jgraham@compukix.net> MD, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=powerpanel -VERSION=${VERSION:-1.3.2} -PKGVER=${VERSION//./} +VERSION=${VERSION:-1.3.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -37,9 +36,9 @@ if [ -z "$ARCH" ]; then fi if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then - PKGARCH=i386 + PKGARCH=32 elif [ "$ARCH" = "x86_64" ]; then - PKGARCH=x86_64 + PKGARCH=64 else printf "$ARCH is not supported.\n"; exit 1 fi @@ -55,7 +54,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$PKGVER-$PKGARCH.tar.gz +tar xvf $CWD/PPL-$VERSION-${PKGARCH}bit.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/powerpanel/powerpanel.info b/system/powerpanel/powerpanel.info index 6405578e56..15ba1327e1 100644 --- a/system/powerpanel/powerpanel.info +++ b/system/powerpanel/powerpanel.info @@ -1,10 +1,10 @@ PRGNAM="powerpanel" -VERSION="1.3.2" +VERSION="1.3.3" HOMEPAGE="https://www.cyberpowersystems.com/products/software/power-panel-personal/" -DOWNLOAD="https://dl4jz3rbrsfum.cloudfront.net/software/powerpanel-132-i386.tar.gz" -MD5SUM="833f35179a8b0ca303698de08f048c8b" -DOWNLOAD_x86_64="https://dl4jz3rbrsfum.cloudfront.net/software/powerpanel-132-x86_64.tar.gz" -MD5SUM_x86_64="d69233e117f92611931cb820bad141df" +DOWNLOAD="https://dl4jz3rbrsfum.cloudfront.net/software/PPL-1.3.3-32bit.tar.gz" +MD5SUM="56a53554cbf523617c447f426521bf75" +DOWNLOAD_x86_64="https://dl4jz3rbrsfum.cloudfront.net/software/PPL-1.3.3-64bit.tar.gz" +MD5SUM_x86_64="d0af21f2e3f654a4813701932bb2fd2e" REQUIRES="" MAINTAINER="Jason Graham" -EMAIL="jgraha8@gmail.com" +EMAIL="jgraham@compukix.net" diff --git a/system/powershell/README b/system/powershell/README new file mode 100644 index 0000000000..b78bb03596 --- /dev/null +++ b/system/powershell/README @@ -0,0 +1,7 @@ +PowerShell is a task-based command-line shell and scripting language +built on .NET. PowerShell helps system administrators and power-users +rapidly automate tasks that manage operating systems (Linux, macOS, and +Windows) and processes. + +After installing, you can start using PowerShell by typing "pwsh" in the +Terminal. diff --git a/system/powershell/powershell.SlackBuild b/system/powershell/powershell.SlackBuild new file mode 100644 index 0000000000..bcdfa13d76 --- /dev/null +++ b/system/powershell/powershell.SlackBuild @@ -0,0 +1,68 @@ +#!/bin/sh +# +# Slackware build script for powershell. +# +# Copyright 2019 Reza Talebi, Shahin Shahr, Iran. +# 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. + +PRGNAM=powershell +VERSION=${VERSION:-7.1.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + ARCH=$( uname -m ) +fi + +if [ "$ARCH" = "x86_64" ]; then + ARCHITECTURE="x64" +else + echo "Package for $ARCH architecture is not available." + exit 1 +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-${VERSION}-${BUILD} +mkdir -p $PRGNAM-${VERSION}-${BUILD} +cd $PKG +mkdir -p opt/microsoft/powershell +tar -zxf $CWD/$PRGNAM-${VERSION}-linux-${ARCHITECTURE}.tar.gz -C opt/microsoft/powershell +chown -R root:root opt/microsoft/powershell + +mkdir -p usr/bin/ +ln -s /opt/microsoft/powershell/pwsh usr/bin/pwsh + +mkdir -p 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:-tgz} diff --git a/system/powershell/powershell.info b/system/powershell/powershell.info new file mode 100644 index 0000000000..9e7c9aaa3f --- /dev/null +++ b/system/powershell/powershell.info @@ -0,0 +1,10 @@ +PRGNAM="powershell" +VERSION="7.1.3" +HOMEPAGE="https://www.microsoft.com/powershell/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/PowerShell/PowerShell/releases/download/v7.1.3/powershell-7.1.3-linux-x64.tar.gz" +MD5SUM_x86_64="bdeb7d2a5cf51b97b02d4c16a055c8eb" +REQUIRES="" +MAINTAINER="Reza Talebi" +EMAIL="reza.talebi.73@outlook.com" diff --git a/system/powershell/slack-desc b/system/powershell/slack-desc new file mode 100644 index 0000000000..88ee249010 --- /dev/null +++ b/system/powershell/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------------------------------------------------------| +powershell: powershell (A task-based command-line shell and scripting language) +powershell: +powershell: PowerShell is a task-based command-line shell and scripting language +powershell: built on .NET. PowerShell helps system administrators and power-users +powershell: rapidly automate tasks that manage operating systems (Linux, macOS, +powershell: and Windows) and processes. +powershell: PowerShell base source code is now available in GitHub +powershell: and open to community contributions. +powershell: +powershell: https://www.microsoft.com/powershell/ +powershell: diff --git a/system/progress/progress.SlackBuild b/system/progress/progress.SlackBuild index 86f7a98f83..3266673bcb 100644 --- a/system/progress/progress.SlackBuild +++ b/system/progress/progress.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for progress -# Copyright 2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=progress -VERSION=${VERSION:-0.13} +VERSION=${VERSION:-0.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/progress/progress.info b/system/progress/progress.info index 246738eaac..7f524ebd74 100644 --- a/system/progress/progress.info +++ b/system/progress/progress.info @@ -1,8 +1,8 @@ PRGNAM="progress" -VERSION="0.13" +VERSION="0.14" HOMEPAGE="https://github.com/Xfennec/progress" -DOWNLOAD="https://github.com/Xfennec/progress/archive/v0.13.tar.gz" -MD5SUM="c7c53dbfd84825a9ac037e81b685fdfb" +DOWNLOAD="https://github.com/Xfennec/progress/archive/v0.14/progress-0.14.tar.gz" +MD5SUM="37103cc9ac32a6e8a2286c56ec5a10c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/prometheus/README b/system/prometheus/README new file mode 100644 index 0000000000..32872f5f9c --- /dev/null +++ b/system/prometheus/README @@ -0,0 +1,24 @@ +Prometheus (An Open-Source Monitoring and Alerting Toolkit) + +Prometheus is an open-source systems monitoring and alerting toolkit +originally built at SoundCloud. + +Prometheus's main features are: + +- a multi-dimensional data model with time series data identified by + metric name and key/value pairs +- PromQL, a flexible query language to leverage this dimensionality +- no reliance on distributed storage; single server nodes are autonomous +- time series collection happens via a pull model over HTTP +- pushing time series is supported via an intermediary gateway +- targets are discovered via service discovery or static configuration +- multiple modes of graphing and dashboarding support + +Groupname and Username + +You must have the "prometheus" group and user to run this script, for +example: + + groupadd -g 368 prometheus + useradd -u 368 -s /bin/false -d /var/lib/prometheus \ + -g prometheus prometheus diff --git a/system/prometheus/doinst.sh b/system/prometheus/doinst.sh new file mode 100644 index 0000000000..5e73a492a1 --- /dev/null +++ b/system/prometheus/doinst.sh @@ -0,0 +1,26 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +config etc/prometheus/prometheus.yml.new + +preserve_perms etc/rc.d/rc.prometheus.new diff --git a/system/prometheus/prometheus.SlackBuild b/system/prometheus/prometheus.SlackBuild new file mode 100644 index 0000000000..57ec494f66 --- /dev/null +++ b/system/prometheus/prometheus.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for Prometheus + +# Copyright 2017-2020 Ebben Aries <slackbuilds@dscp.org> +# 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. + +PRGNAM=prometheus +VERSION=${VERSION:-2.26.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +UIDGID=368 +if ! getent group $PRGNAM; then + echo " You must have the \"$PRGNAM\" group to run this script." + echo " # groupadd -g $UIDGID $PRGNAM" + exit 1 +elif ! getent passwd $PRGNAM; then + echo " You must have the \"$PRGNAM\" user to run this script." + echo " # useradd -u $UIDGID -s /bin/false -d /var/lib/$PRGNAM -g $PRGNAM $PRGNAM" + exit 1 +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "x86_64" ]; then + PKG_ARCH=amd64 +else + echo "$ARCH is not supported." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-${VERSION}.linux-${PKG_ARCH}.tar.gz +cd $PRGNAM-${VERSION}.linux-${PKG_ARCH} +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 {} \; + +mkdir -p $PKG/etc/prometheus +cp -a prometheus.yml $PKG/etc/prometheus/prometheus.yml.new + +mkdir -p $PKG/usr/bin +cp -a prometheus $PKG/usr/bin +cp -a promtool $PKG/usr/bin + +mkdir -p $PKG/usr/share/prometheus +cp -ar console_libraries $PKG/usr/share/prometheus +cp -ar consoles $PKG/usr/share/prometheus + +mkdir -p $PKG/var/lib/prometheus +chown -R prometheus:prometheus $PKG/var/lib/prometheus + +mkdir -p $PKG/etc/rc.d +cat $CWD/rc.prometheus.new > $PKG/etc/rc.d/rc.prometheus.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 +cp -a LICENSE NOTICE $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:-tgz} diff --git a/system/prometheus/prometheus.info b/system/prometheus/prometheus.info new file mode 100644 index 0000000000..1d9ae489f1 --- /dev/null +++ b/system/prometheus/prometheus.info @@ -0,0 +1,10 @@ +PRGNAM="prometheus" +VERSION="2.26.0" +HOMEPAGE="https://prometheus.io" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/prometheus/prometheus/releases/download/v2.26.0/prometheus-2.26.0.linux-amd64.tar.gz" +MD5SUM_x86_64="839c1fc55ea026611f56eec5b36d61c3" +REQUIRES="" +MAINTAINER="Ebben Aries" +EMAIL="slackbuilds@dscp.org" diff --git a/system/prometheus/rc.prometheus.new b/system/prometheus/rc.prometheus.new new file mode 100644 index 0000000000..6d1e705e0e --- /dev/null +++ b/system/prometheus/rc.prometheus.new @@ -0,0 +1,65 @@ +#!/bin/sh + +# Copyright 2020, Ebben Aries, USA +# 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. + +PROG=/usr/bin/prometheus +USER=prometheus +LOGFILE=/var/log/prometheus.log +CONF=/etc/prometheus/prometheus.yml +TSDB=/var/lib/prometheus +WEB_LIBS=/usr/share/prometheus/console_libraries +WEB_TEMPLATES=/usr/share/prometheus/consoles + +prometheus_start() { + echo -e "Starting Prometheus..." + nohup sudo -u $USER $PROG \ + --config.file=$CONF \ + --storage.tsdb.path=$TSDB \ + --web.console.libraries=$WEB_LIBS \ + --web.console.templates=$WEB_TEMPLATES \ + > $LOGFILE 2>&1 & +} + +prometheus_stop() { + echo -e "Stopping Prometheus..." + killall prometheus +} + +prometheus_restart() { + prometheus_stop + sleep 3 + prometheus_start +} + +case "$1" in + start) + prometheus_start + ;; + stop) + prometheus_stop + ;; + restart) + prometheus_restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac diff --git a/system/prometheus/slack-desc b/system/prometheus/slack-desc new file mode 100644 index 0000000000..30bd4f1c35 --- /dev/null +++ b/system/prometheus/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------------------------------------------------------| +prometheus: Prometheus (An Open-Source Monitoring and Alerting Toolkit) +prometheus: +prometheus: Prometheus is an open-source systems monitoring and alerting toolkit +prometheus: originally built at SoundCloud. +prometheus: +prometheus: +prometheus: +prometheus: +prometheus: +prometheus: Home-Page: https://prometheus.io +prometheus: diff --git a/system/pspg/pspg.SlackBuild b/system/pspg/pspg.SlackBuild index e8c08e920d..2c8b6c788a 100644 --- a/system/pspg/pspg.SlackBuild +++ b/system/pspg/pspg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pspg -# Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2017-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pspg -VERSION=${VERSION:-1.6.3} +VERSION=${VERSION:-4.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/pspg/pspg.info b/system/pspg/pspg.info index 2d3d1dfdb0..8316fa3959 100644 --- a/system/pspg/pspg.info +++ b/system/pspg/pspg.info @@ -1,8 +1,8 @@ PRGNAM="pspg" -VERSION="1.6.3" +VERSION="4.5.0" HOMEPAGE="https://github.com/okbob/pspg" -DOWNLOAD="https://github.com/okbob/pspg/archive/1.6.3/pspg-1.6.3.tar.gz" -MD5SUM="fcb2ba4fd752f4f4491dfb1dd6fbb8d7" +DOWNLOAD="https://github.com/okbob/pspg/archive/4.5.0/pspg-4.5.0.tar.gz" +MD5SUM="f09bd3aa94affc2cc008ee78f64e774b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/psuinfo/README b/system/psuinfo/README new file mode 100644 index 0000000000..ebf249ba33 --- /dev/null +++ b/system/psuinfo/README @@ -0,0 +1,5 @@ +A Python3 psutil-based command to display customizable system usage +info as icons or text. Intended for Tint2 panel executors, may also +be used in other panels or executed in terminal. + +Note: required package psutil must have been built with Python3 support diff --git a/system/psuinfo/psuinfo.SlackBuild b/system/psuinfo/psuinfo.SlackBuild new file mode 100644 index 0000000000..23cb95e2fb --- /dev/null +++ b/system/psuinfo/psuinfo.SlackBuild @@ -0,0 +1,70 @@ +#!/bin/sh + +# Slackware build script for psuinfo + +# Copyright 2020 Leonardo Citrolo, 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. + +PRGNAM=psuinfo +VERSION=${VERSION:-1.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +mkdir -p $PKG/usr/bin +cp -a $PRGNAM $PKG/usr/bin + +mkdir -p $PKG/usr/share/$PRGNAM +cp -a icons/* $PKG/usr/share/$PRGNAM + +mkdir -p $PKG/usr/share/tint2 +cp -a configs/* $PKG/usr/share/tint2 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/psuinfo/psuinfo.info b/system/psuinfo/psuinfo.info new file mode 100644 index 0000000000..54fcce6768 --- /dev/null +++ b/system/psuinfo/psuinfo.info @@ -0,0 +1,10 @@ +PRGNAM="psuinfo" +VERSION="1.1" +HOMEPAGE="https://github.com/nwg-piotr/psuinfo" +DOWNLOAD="https://github.com/nwg-piotr/psuinfo/archive/v1.1/psuinfo-1.1.tar.gz" +MD5SUM="ddbcfab6a6a9111fe3ea9e57186e9833" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="psutil python3" +MAINTAINER="Leo C." +EMAIL="leoc@gmx.com" diff --git a/system/psuinfo/slack-desc b/system/psuinfo/slack-desc new file mode 100644 index 0000000000..503c9b2bd5 --- /dev/null +++ b/system/psuinfo/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------------------------------------------------------| +psuinfo: psuinfo (Custom system usage info for Tint2 panel executors or CLI) +psuinfo: +psuinfo: A Python3 psutil-based command to display customizable system usage +psuinfo: info as icons or text. Intended for Tint2 panel executors, may also +psuinfo: be used in other panels or executed in terminal. +psuinfo: +psuinfo: +psuinfo: +psuinfo: +psuinfo: Homepage: https://github.com/nwg-piotr/psuinfo +psuinfo: diff --git a/system/pucrunch/pucrunch.info b/system/pucrunch/pucrunch.info index a6f3e16bc0..d7adcce7e5 100644 --- a/system/pucrunch/pucrunch.info +++ b/system/pucrunch/pucrunch.info @@ -1,7 +1,7 @@ PRGNAM="pucrunch" VERSION="20081122" HOMEPAGE="http://a1bert.kapsi.fi/Dev/pucrunch/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/pucrunch-20081122.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/pucrunch-20081122.tar.xz" MD5SUM="dbc3e129a9d963e96f34a3495307aeff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/pwman/README b/system/pwman/README new file mode 100644 index 0000000000..7f4ec3cf94 --- /dev/null +++ b/system/pwman/README @@ -0,0 +1,19 @@ +PWman (An NCurses password management program) + +PWMan is a password manager which uses gpg encryption to safeguard your data. +It provides a simple and easy to use command line (NCurses) interface to +manage, store, search and retrieve your passwords. + +The look and feel is based on Jaakko Heinonen's abook. + +BEFORE USING PWMAN + +While compilation does not directly require it, usage relies on Gnu Privacy +Guard (gpg) being installed. You will need to specify a GnuPG ID the +first time a user runs pwman, so this must be set up beforehand. + +There is more information on the gpg manpage, but you can probably just run + + % gpg --gen-key + +and follow the on-screen instructions. diff --git a/system/pwman/pwman.SlackBuild b/system/pwman/pwman.SlackBuild new file mode 100644 index 0000000000..a057496866 --- /dev/null +++ b/system/pwman/pwman.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# 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. + + +PRGNAM=pwman +VERSION=${VERSION:-0.4.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" = "s390" ]; then + SLKCFLAGS="-O2" + 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 . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION + +# In case they ever add this stuff: + +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +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:-tgz} diff --git a/system/pwman/pwman.info b/system/pwman/pwman.info new file mode 100644 index 0000000000..215d57511c --- /dev/null +++ b/system/pwman/pwman.info @@ -0,0 +1,10 @@ +PRGNAM="pwman" +VERSION="0.4.5" +HOMEPAGE="https://sourceforge.net/projects/pwman/" +DOWNLOAD="https://liquidtelecom.dl.sourceforge.net/project/pwman/pwman/pwman-0.4.5/pwman-0.4.5.tar.gz" +MD5SUM="091a97b23bea2f5e02f28f66814df55b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="kchan" +EMAIL="kenneth.t.chan@gmail.com" diff --git a/system/pwman/slack-desc b/system/pwman/slack-desc new file mode 100644 index 0000000000..8eaec8ba06 --- /dev/null +++ b/system/pwman/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 ':'. + + |-----handy-ruler------------------------------------------------------| +pwman: pwman (An NCurses password management program) +pwman: +pwman: PWman is a text-based application based on the ui design of abook +pwman: (http://abook.sourceforge.net). PWman works on Linux, and should also +pwman: run on most other UNIXes(untested). +pwman: +pwman: +pwman: +pwman: +pwman: +pwman: diff --git a/system/pycp/pycp.SlackBuild b/system/pycp/pycp.SlackBuild index f0f2e3ea1d..ef909d2738 100644 --- a/system/pycp/pycp.SlackBuild +++ b/system/pycp/pycp.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for pycp. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pycp -VERSION=${VERSION:-7.3.0} +VERSION=${VERSION:-8.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,13 +40,16 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +SRCVER=${SRCVER:-2d662473e930094f69ce79871386d8f9d660fba5} + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +mv $PRGNAM-$SRCVER $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -55,12 +58,13 @@ 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 setup.py install --root=$PKG --optimize=1 +python3 setup.py build +python3 setup.py install --root=$PKG --optimize=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 -DOCS="AUTHORS Changelog.rst COPYING.txt README.rst TODO" +DOCS="AUTHORS Changelog.rst COPYING.txt README.rst TODO.md" mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/pycp/pycp.info b/system/pycp/pycp.info index d9ab982c2f..78e420bc8a 100644 --- a/system/pycp/pycp.info +++ b/system/pycp/pycp.info @@ -1,10 +1,10 @@ PRGNAM="pycp" -VERSION="7.3.0" +VERSION="8.0.8" HOMEPAGE="https://github.com/yannicklm/pycp" -DOWNLOAD="https://github.com/yannicklm/pycp/archive/v7.3.0/pycp-7.3.0.tar.gz" -MD5SUM="0bd55052c7a47a8614aa400b1a22805c" +DOWNLOAD="https://github.com/yannicklm/pycp/archive/2d662473e930094f69ce79871386d8f9d660fba5/pycp-2d662473e930094f69ce79871386d8f9d660fba5.tar.gz" +MD5SUM="4af09dc8290f410751545da615eabcd9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3-attrs" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/system/python3-urwid/python3-urwid.SlackBuild b/system/python3-urwid/python3-urwid.SlackBuild index 6849d5503e..94695a76fe 100644 --- a/system/python3-urwid/python3-urwid.SlackBuild +++ b/system/python3-urwid/python3-urwid.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for python3-urwid -# Copyright 2017 David Woodfall <dave@dawoodfall.net> +# Copyright 2017 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/python3-urwid/python3-urwid.info b/system/python3-urwid/python3-urwid.info index e8437431b2..f883fa3cc8 100644 --- a/system/python3-urwid/python3-urwid.info +++ b/system/python3-urwid/python3-urwid.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/pytrash/pytrash.SlackBuild b/system/pytrash/pytrash.SlackBuild index 64904a5615..f39bc84d71 100644 --- a/system/pytrash/pytrash.SlackBuild +++ b/system/pytrash/pytrash.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=pytrash -VERSION=${VERSION:-1.1.3} +VERSION=${VERSION:-1.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/pytrash/pytrash.info b/system/pytrash/pytrash.info index 867147b5ca..52f87d15fd 100644 --- a/system/pytrash/pytrash.info +++ b/system/pytrash/pytrash.info @@ -1,8 +1,8 @@ PRGNAM="pytrash" -VERSION="1.1.3" +VERSION="1.1.4" HOMEPAGE="https://github.com/MyRequiem/pytrash" -DOWNLOAD="https://github.com/MyRequiem/pytrash/archive/1.1.3/pytrash-1.1.3.tar.gz" -MD5SUM="8f1ce8a11baaa2b668a13e8d7250b41e" +DOWNLOAD="https://github.com/MyRequiem/pytrash/archive/1.1.4/pytrash-1.1.4.tar.gz" +MD5SUM="4752cb6a3e71922fe4c3df7f2eecaf90" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/system/qdirstat/qdirstat.SlackBuild b/system/qdirstat/qdirstat.SlackBuild index f5d4619b72..623a675d77 100644 --- a/system/qdirstat/qdirstat.SlackBuild +++ b/system/qdirstat/qdirstat.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qdirstat -# Copyright 2016 Alan Aversa +# Copyright 2018 Alan Aversa # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qdirstat -VERSION=${VERSION:-1.4} +VERSION=${VERSION:-1.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/qdirstat/qdirstat.info b/system/qdirstat/qdirstat.info index 202aa5e17a..20f34ac13d 100644 --- a/system/qdirstat/qdirstat.info +++ b/system/qdirstat/qdirstat.info @@ -1,8 +1,8 @@ PRGNAM="qdirstat" -VERSION="1.4" +VERSION="1.7.1" HOMEPAGE="https://github.com/shundhammer/qdirstat/" -DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.4/qdirstat-1.4.tar.gz" -MD5SUM="fcd3bcbdb5a78a1ea64bf3f8c12f392e" +DOWNLOAD="https://github.com/shundhammer/qdirstat/archive/1.7.1/qdirstat-1.7.1.tar.gz" +MD5SUM="551b48dcb8006727166d5b167a2af675" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/system/qemu/README b/system/qemu/README index 5a93f4648b..a7d678fa8d 100644 --- a/system/qemu/README +++ b/system/qemu/README @@ -39,11 +39,20 @@ 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. -libcacard, spice, usbredir, virglrenderer, device-tree-compiler, -libnfs, snappy, glusterfs and vde2 are optional dependencies. +libiscsi, libcacard, spice, usbredir, virglrenderer, +device-tree-compiler, libnfs, snappy, glusterfs and vde2 are optional +dependencies. -libseccomp is an optional dependency to use libvirt and will be picked -up, if present, during the compilation. +NOTE: +To compile with virglrenderer, you will need to upgrade to +mesa-12.0.0 or higher. + +Sphinx is optional but required in order for any of the documentation to be +built. + +libseccomp (to use libvirt) and libiscsi (to access iSCSI targets +directly) are optional dependencies, and will be picked up, if +present, during the compilation. If you wish to emulate ARM, you will want device-tree-compiler. diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index 3f8fe1a59b..57a43b834a 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -53,10 +53,13 @@ # 4.3 06-JAN-2018 version update to 2.10.x release # 4.4 17-Feb-2018 version update to 2.11.x release, Spectre/Meltdown mitigation # 4.5 03-Jun-2018 version update to 2.12.0 release, note new deps: sdl2, gtk+3 -# 5.0 14-Dec-2018 verion update to 3.1.0 release, note minimum dependency versions on release notes +# 5.0 14-Dec-2018 version update to 3.1.0 release, note minimum dependency versions on release notes +# 6.0 14-JUL-2019 version update to 4.0.0 release, note minimum dependency versions on release notes, doc fixes +# 6.1 19-AUG-2019 version update +# 6.2 16-Nov-2020 version update, 14.2 final release. PRGNAM=qemu -VERSION=${VERSION:-3.1.0} +VERSION=${VERSION:-4.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -188,7 +191,7 @@ fi # Add docs to the proper location mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README qemu-*.html docs/* \ +cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README docs/* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index 224cc14cfa..ff582deea0 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,8 +1,8 @@ PRGNAM="qemu" -VERSION="3.1.0" -HOMEPAGE="http://www.qemu-project.org" -DOWNLOAD="http://download.qemu-project.org/qemu-3.1.0.tar.xz" -MD5SUM="fb687ce0b02d3bf4327e36d3b99427a8" +VERSION="4.1.1" +HOMEPAGE="https://www.qemu.org" +DOWNLOAD="https://download.qemu.org/qemu-4.1.1.tar.xz" +MD5SUM="53879f792ef2675c6c5e6cbf5cc1ac6c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2" diff --git a/system/qterminal/qterminal.SlackBuild b/system/qterminal/qterminal.SlackBuild index db92e6261c..f939c03e7a 100644 --- a/system/qterminal/qterminal.SlackBuild +++ b/system/qterminal/qterminal.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qterminal -# Copyright 2011-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2011-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qterminal -VERSION=${VERSION:-0.9.0} +VERSION=${VERSION:-0.14.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,7 +77,6 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DPULL_TRANSLATIONS=No \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/system/qterminal/qterminal.info b/system/qterminal/qterminal.info index d70937ea6d..cf48e2f5a5 100644 --- a/system/qterminal/qterminal.info +++ b/system/qterminal/qterminal.info @@ -1,8 +1,8 @@ PRGNAM="qterminal" -VERSION="0.9.0" +VERSION="0.14.1" HOMEPAGE="https://github.com/lxde/qterminal" -DOWNLOAD="https://github.com/lxde/qterminal/releases/download/0.9.0/qterminal-0.9.0.tar.xz" -MD5SUM="e31af75d375e72c298a4130cdd6d012c" +DOWNLOAD="https://github.com/lxde/qterminal/releases/download/0.14.1/qterminal-0.14.1.tar.xz" +MD5SUM="8b2e83a5a0daf8cd9a1b770f9e719a7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qtermwidget" diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild index 2f541e9440..f651ab3978 100644 --- a/system/qtfm/qtfm.SlackBuild +++ b/system/qtfm/qtfm.SlackBuild @@ -25,7 +25,7 @@ # Modified by Ole-André Rodlie, <ole.andre.rodlie@gmail.com> PRGNAM=qtfm -VERSION=${VERSION:-6.1.5} +VERSION=${VERSION:-6.1.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/qtfm/qtfm.info b/system/qtfm/qtfm.info index 842f83ba29..d5c1d4935d 100644 --- a/system/qtfm/qtfm.info +++ b/system/qtfm/qtfm.info @@ -1,8 +1,8 @@ PRGNAM="qtfm" -VERSION="6.1.5" +VERSION="6.1.9" HOMEPAGE="https://qtfm.eu" -DOWNLOAD="https://github.com/rodlie/qtfm/archive/6.1.5/qtfm-6.1.5.tar.gz" -MD5SUM="af73a1a888dc9bd5efe579d04c86ac6e" +DOWNLOAD="https://github.com/rodlie/qtfm/archive/6.1.9/qtfm-6.1.9.tar.gz" +MD5SUM="ff09bb9024d0f23e4d65ac87fa331469" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/quake-par/README b/system/quake-par/README new file mode 100644 index 0000000000..7e309a41e6 --- /dev/null +++ b/system/quake-par/README @@ -0,0 +1,19 @@ +This is par, an archiver for Quake pak?.pak files. +It has been written for all those who don't like to use windoze +(pakexplr byAshley Bone) for pak file processing. + +par knows about listing, extraction and creation of pak archives: + + quake-par -l pak0.pak [files] + quake-par -x pak0.pak [files] + quake-par -c pak9.pak [files]. + +In addition, you may specify -v for having par to be more talketive +and -f to force some actions or/and suppress error messages. +Since pak archives usually contain hundreds of files, instead of +specifying them on the command line you may put the names to textfiles +and use the -t switch. This option may be used instead of +(not implemented) wildcards: + + quake-par -l pak0.pak | egrep "^models/weapons" > list + quake-par -xvt pak0.pak list diff --git a/system/quake-par/quake-par.SlackBuild b/system/quake-par/quake-par.SlackBuild new file mode 100644 index 0000000000..84d0fd6958 --- /dev/null +++ b/system/quake-par/quake-par.SlackBuild @@ -0,0 +1,112 @@ +#!/bin/sh + +# Slackware build script for quake-par + +# Copyright 2019 Hexxend, USA +# 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. + +PRGNAM=quake-par +SRCNAME=par +VERSION=${VERSION:-0.03.01} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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/{'usr/bin','usr/man/man1'} $OUTPUT +cd $TMP +rm -rf $SRCNAME-$VERSION +tar xvf $CWD/$SRCNAME-$VERSION.tar.gz +cd $SRCNAME-$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 {} \; + +sed -i "s|usr/local|usr|g" Makefile.Linux + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make + +sed -i '41,42 s/$(PRG)/quake-par/' Makefile +sed -i 's/$(INSTALLDIR_BIN)/$(DESTDIR)$(INSTALLDIR_BIN)/g' Makefile +sed -i 's/$(INSTALLDIR_MAN)/$(DESTDIR)$(INSTALLDIR_MAN)/g' Makefile +sed -i 's/rm -f $(PRG) $(PRG).$(MAN_NO) header.h mkmkman mkman* all install/rm -f quake-par quake-par.$(MAN_NO) $(PRG) $(PRG).$(MAN_NO) header.h mkmkman mkman* all install/' Makefile + +mv $SRCNAME $PRGNAM +mv $SRCNAME.1 $PRGNAM.1 + +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" | 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/man1 -type l ) ; do ln -s $( readlink $i ).gz $i.gz \ + ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $TMP/$SRCNAME-$VERSION/README > $PKG/usr/doc/$PRGNAM-$VERSION/README +cat $TMP/$SRCNAME-$VERSION/pak-format.txt > \ + $PKG/usr/doc/$PRGNAM-$VERSION/pak-format.txt +cat $TMP/$SRCNAME-$VERSION/COPYING > $PKG/usr/doc/$PRGNAM-$VERSION/COPYING + +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:-tgz} diff --git a/system/quake-par/quake-par.info b/system/quake-par/quake-par.info new file mode 100644 index 0000000000..3d1b8cdba4 --- /dev/null +++ b/system/quake-par/quake-par.info @@ -0,0 +1,10 @@ +PRGNAM="quake-par" +VERSION="0.03.01" +HOMEPAGE="http://ftp.vim.org/ibiblio/games/quake/" +DOWNLOAD="http://ftp.vim.org/ibiblio/games/quake/par-0.03.01.tar.gz" +MD5SUM="39a73b5b95b04067dfc9acb8ef6bc9ff" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Hexxend" +EMAIL="hexxend@protonmail.com" diff --git a/system/quake-par/slack-desc b/system/quake-par/slack-desc new file mode 100644 index 0000000000..bf841cae6a --- /dev/null +++ b/system/quake-par/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------------------------------------------------------| +quake-par: quake-par (Quake archiver) +quake-par: +quake-par: This is par, an archiver for Quake pak?.pak files. +quake-par: It has been written for all those who don't like to use +quake-par: windoze (pakexplr by Ashley Bone) for pak file processing. +quake-par: +quake-par: Released under the GPLv2 +quake-par: +quake-par: +quake-par: +quake-par: diff --git a/system/rEFInd/README b/system/rEFInd/README new file mode 100644 index 0000000000..2909b3d5d2 --- /dev/null +++ b/system/rEFInd/README @@ -0,0 +1,13 @@ +rEFInd (An EFI boot manager utility) + +A graphical boot manager for EFI- and UEFI-based computers, such as all +Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents +a boot menu showing all the EFI boot loaders on the EFI-accessible +partitions, and optionally BIOS-bootable partitions on Macs. +EFI-compatible OSes, including Linux, provide boot loaders that rEFInd +can detect and launch. rEFInd can launch Linux EFI boot loaders such +as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI +stub support. + +This package is optionally depends on python3 if you want to run the +refind-mkdefault script, otherwise you don't need python3. diff --git a/system/rEFInd/rEFInd.SlackBuild b/system/rEFInd/rEFInd.SlackBuild new file mode 100644 index 0000000000..9046b5f8fa --- /dev/null +++ b/system/rEFInd/rEFInd.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/sh + +# Slackware build script for refind + +# Copyright 2020 Zhu Qun-Ying 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. + +PRGNAM=rEFInd +SRCNAME=refind +VERSION=${VERSION:-0.13.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "i586" ] && [ "$ARCH" != "i686" ]; then + echo "Platform $ARCH not supported." + exit +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAME-$VERSION +tar xvf $CWD/$SRCNAME-src-$VERSION.tar.gz +cd $SRCNAME-$VERSION +chown -R root:root . + +if [ "$ARCH" == "x86_64" ]; then + sed -i -s 's/usr\/lib/usr\/lib64/' Make.common + REFIND_SUFFIX=x64 +else + REFIND_SUFFIX=ia32 +fi +sed -i '/^EFICRT0/ s/$/\/gnuefi/' Make.common +make all_gnuefi +REFIND_SHARE_DIR=$PKG/usr/share/$PRGNAM-$VERSION +mkdir -p $PKG/usr/sbin +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $REFIND_SHARE_DIR + +# copy keys +cp -ra keys refind-install refind-mkdefault fonts banners $REFIND_SHARE_DIR +mkdir $REFIND_SHARE_DIR/refind +cp refind/*.efi $REFIND_SHARE_DIR/refind +cp refind.conf-sample $REFIND_SHARE_DIR/refind +cp refind-install refind-mkdefault $REFIND_SHARE_DIR/ +cp -ra icons $REFIND_SHARE_DIR/refind +mkdir $REFIND_SHARE_DIR/refind/drivers_$REFIND_SUFFIX +cp ./filesystems/*.efi $REFIND_SHARE_DIR/refind/drivers_$REFIND_SUFFIX +cp ./filesystems/LICENSE* $REFIND_SHARE_DIR/refind/drivers_$REFIND_SUFFIX +mkdir $REFIND_SHARE_DIR/refind/tools_$REFIND_SUFFIX +cp ./gptsync/*.efi $REFIND_SHARE_DIR/refind/tools_$REFIND_SUFFIX + +cp mkrlconf mvrefind mountesp $PKG/usr/sbin +(cd $PKG/usr/sbin + ln -sf /usr/share/$PRGNAM-$VERSION/refind-mkdefault + ln -sf /usr/share/$PRGNAM-$VERSION/refind-install +) +cp -a docs/* *.txt $PKG/usr/doc/$PRGNAM-$VERSION + +# include a slackware banner made by me, including the svg version +cp $CWD/slackware-banner.* $REFIND_SHARE_DIR/banners + +mkdir -p $PKG/usr/man/man8 +mv $PKG/usr/doc/$PRGNAM-$VERSION/man/*.8 $PKG/usr/man/man8 +rmdir $PKG/usr/doc/$PRGNAM-$VERSION/man +gzip $PKG/usr/man/man8/* + +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:-tgz} diff --git a/system/rEFInd/rEFInd.info b/system/rEFInd/rEFInd.info new file mode 100644 index 0000000000..d4bded634f --- /dev/null +++ b/system/rEFInd/rEFInd.info @@ -0,0 +1,10 @@ +PRGNAM="rEFInd" +VERSION="0.13.1" +HOMEPAGE="http://www.rodsbooks.com/refind/index.html" +DOWNLOAD="https://sourceforge.net/projects/refind/files/0.13.1/refind-src-0.13.1.tar.gz" +MD5SUM="816252968231915b3445ab00b067f011" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Zhu Qun-Ying" +EMAIL="zhu.qunying@gmail.com" diff --git a/system/rEFInd/slack-desc b/system/rEFInd/slack-desc new file mode 100644 index 0000000000..9110c5da70 --- /dev/null +++ b/system/rEFInd/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------------------------------------------------------| +rEFInd: rEFInd (An EFI boot manager utility) +rEFInd: +rEFInd: A graphical boot manager for EFI and UEFI-based computers, such as all +rEFInd: Intel-based Macs and recent (most 2011 and later) PCs. rEFInd presents +rEFInd: a boot menu showing all the EFI boot loaders on the EFI-accessible +rEFInd: partitions, and optionally BIOS-bootable partitions on Macs. +rEFInd: EFI-compatible OSes, including Linux, provide boot loaders that rEFInd +rEFInd: can detect and launch. rEFInd can launch Linux EFI boot loaders such +rEFInd: as ELILO, GRUB Legacy, GRUB 2, and 3.3.0 and later kernels with EFI +rEFInd: stub support. +rEFInd: Home page: http://www.rodsbooks.com/refind/ diff --git a/system/rEFInd/slackware-banner.png b/system/rEFInd/slackware-banner.png Binary files differnew file mode 100644 index 0000000000..3458904c3d --- /dev/null +++ b/system/rEFInd/slackware-banner.png diff --git a/system/rEFInd/slackware-banner.svg b/system/rEFInd/slackware-banner.svg new file mode 100644 index 0000000000..78baf4d4d0 --- /dev/null +++ b/system/rEFInd/slackware-banner.svg @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="716.16858" + height="246.74951" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="slackware-banner.svg" + inkscape:export-filename="slackware-banner.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="397.44654" + inkscape:cy="94.748334" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="960" + inkscape:window-height="1043" + inkscape:window-x="960" + inkscape:window-y="37" + inkscape:window-maximized="0" + showguides="false" + inkscape:snap-from-guide="false" + inkscape:object-paths="true" + inkscape:snap-global="true" + showborder="false" + inkscape:showpageshadow="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + <inkscape:grid + type="xygrid" + id="grid3005" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="226.53154px" + originy="8.6054773px" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(226.53154,-814.21814)"> + <rect + style="fill:#000000;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" + id="rect2985" + width="716.16858" + height="246.74951" + x="-226.53154" + y="814.21814" + inkscape:export-filename="/root/slackware-banner.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <text + xml:space="preserve" + style="font-size:120px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:CMU Typewriter Text Variable Width;-inkscape-font-specification:CMU Typewriter Text Variable Width Medium" + x="-133.22945" + y="931.62817" + id="text2991" + sodipodi:linespacing="125%" + inkscape:export-filename="/root/slackware-banner.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3003" + x="-133.22945" + y="931.62817">Slackware</tspan></text> + <text + xml:space="preserve" + style="font-size:48px;font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:CMU Typewriter Text;-inkscape-font-specification:CMU Typewriter Text Ultra-Light" + x="168.72957" + y="968.2403" + id="text3023" + sodipodi:linespacing="125%" + inkscape:transform-center-x="36.42857" + inkscape:transform-center-y="-14.832038" + inkscape:export-filename="/root/slackware-banner.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan + sodipodi:role="line" + id="tspan3025" + x="168.72957" + y="968.2403">l i n u x</tspan></text> + <text + xml:space="preserve" + style="font-size:36px;font-style:italic;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:CMU Typewriter Text;-inkscape-font-specification:CMU Typewriter Text Medium Italic" + x="-70.634323" + y="1068.5151" + id="text3063" + sodipodi:linespacing="125%" + transform="scale(1.0429907,0.95878132)"><tspan + sodipodi:role="line" + id="tspan3067" + x="-70.634323" + y="1068.5151">http://www.slackware.com</tspan></text> + <path + style="fill:none;stroke:#ffffff;stroke-width:2.50000000000000000;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m -152,909.3622 0,48 309,0" + id="path3783" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/system/radeontop/radeontop.info b/system/radeontop/radeontop.info index 7813cb81a2..8652cbfc76 100644 --- a/system/radeontop/radeontop.info +++ b/system/radeontop/radeontop.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/ranger/ranger.SlackBuild b/system/ranger/ranger.SlackBuild index f7eb3b046d..a016f269c6 100644 --- a/system/ranger/ranger.SlackBuild +++ b/system/ranger/ranger.SlackBuild @@ -1,7 +1,9 @@ #!/bin/sh # Slackware build script for ranger -# Copyright 2013 David Woodfall <dave@dawoodfall.net> + +# Copyright 2019-2020 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2013 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ranger -VERSION=${VERSION:-1.9.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.9.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +71,17 @@ find -L . \ -exec chmod 644 {} \; [ "$PYTHON3" = "yes" ] && PY=3 +PYVER=$(python$PY -V 2>&1 | sed -nr "s,.* ([0-9]\.[0-9]).*,\1,p") + +# Fix some incorrect paths in man page +sed -i " + s,doc/configs,/usr/doc/$PRGNAM-$VERSION/config, + s,usr/share/doc/ranger/config,usr/lib64/python$PYVER/site-packages/ranger/config, + s,\\\\fIexamples,\\\\fI/usr/doc-$PRGNAM-$VERSION/examples, + s,They are usually installed to,, + 0,/\\\\&\\\\fI\/usr\/share\/doc\/ranger\/examples\\\\fR./s,,, + s,/usr/share/doc/ranger/examples/,/usr/doc-$PRGNAM-$VERSION/examples, + " doc/ranger.1 python$PY setup.py install -O1 --root=$PKG @@ -83,7 +96,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/ranger $PKG/usr/doc/$PRGNAM-$VERSION rm -fr $PKG/usr/share -cp -a AUTHORS *.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS *.md examples/ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/ranger/ranger.info b/system/ranger/ranger.info index caa4f8bfb9..056416b111 100644 --- a/system/ranger/ranger.info +++ b/system/ranger/ranger.info @@ -1,10 +1,10 @@ PRGNAM="ranger" -VERSION="1.9.2" +VERSION="1.9.3" HOMEPAGE="https://ranger.github.io" -DOWNLOAD="https://github.com/ranger/ranger/archive/v1.9.2/ranger-1.9.2.tar.gz" -MD5SUM="4ce283e451a40a61590cf9aa504e926c" +DOWNLOAD="https://github.com/ranger/ranger/archive/v1.9.3/ranger-1.9.3.tar.gz" +MD5SUM="d491987cd9fb06bee100264cfea55d26" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +MAINTAINER="Dimitris Zlatanidis" +EMAIL="d.zlatanidis@gmail.com" diff --git a/system/rar2fs/rar2fs.SlackBuild b/system/rar2fs/rar2fs.SlackBuild index d58f7dc9ba..a0b1dcb813 100644 --- a/system/rar2fs/rar2fs.SlackBuild +++ b/system/rar2fs/rar2fs.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for rar2fs -# Copyright 2011, 2015, 2016, 2017 Mario Preksavec, Zagreb, Croatia +# Copyright 2011, 2015, 2016, 2017, 2021 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rar2fs -VERSION=${VERSION:-1.26.0} +VERSION=${VERSION:-1.29.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,14 +81,14 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -install -D -m 755 mkr2i $PKG/usr/bin/mkr2i -install -D -m 755 rar2fs $PKG/usr/bin/rar2fs +install -D -m 755 src/mkr2i $PKG/usr/bin/mkr2i +install -D -m 755 src/rar2fs $PKG/usr/bin/rar2fs -install -D -m 644 rar2fs.1 $PKG/usr/man/man1/rar2fs.1 +install -D -m 644 man/rar2fs.1 $PKG/usr/man/man1/rar2fs.1 find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/rar2fs/rar2fs.info b/system/rar2fs/rar2fs.info index adff04cbcb..97643ff11b 100644 --- a/system/rar2fs/rar2fs.info +++ b/system/rar2fs/rar2fs.info @@ -1,8 +1,8 @@ PRGNAM="rar2fs" -VERSION="1.26.0" +VERSION="1.29.4" HOMEPAGE="https://github.com/hasse69/rar2fs" -DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.26.0/rar2fs-1.26.0.tar.gz" -MD5SUM="30acf457c7ecec179b1cdcfbbe601410" +DOWNLOAD="https://github.com/hasse69/rar2fs/releases/download/v1.29.4/rar2fs-1.29.4.tar.gz" +MD5SUM="e4437a32e16ff03e78e3c65834bbe1dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="unrar" diff --git a/system/rdiff-backup/rdiff-backup.info b/system/rdiff-backup/rdiff-backup.info index 101ae00e71..fe58d9070b 100644 --- a/system/rdiff-backup/rdiff-backup.info +++ b/system/rdiff-backup/rdiff-backup.info @@ -6,5 +6,5 @@ MD5SUM="1a94dc537fcf74d6a3a80bd27808e77b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="librsync" -MAINTAINER="paul wisehart" -EMAIL="wise@lupulin.net" +MAINTAINER="Ricardo J. Barberis" +EMAIL="ricardo.barberis@gmail.com" diff --git a/system/refind/README b/system/refind/README index c84f46eaf9..5a347d4823 100644 --- a/system/refind/README +++ b/system/refind/README @@ -14,3 +14,5 @@ the pre-build binary then convert to Slackware's. This package is optionally depends on python3 if you want to run the refind-mkdefault script, otherwise you don't need python3. + +There is an another Sbo script "rEFInd", which builds from source. diff --git a/system/refind/refind.SlackBuild b/system/refind/refind.SlackBuild index bb4cda4abd..4d319171f8 100644 --- a/system/refind/refind.SlackBuild +++ b/system/refind/refind.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for refind -# Copyright 2014-2018 Zhu Qun-Ying +# Copyright 2014-2020 Zhu Qun-Ying # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=refind -VERSION=${VERSION:-0.11.4} +VERSION=${VERSION:-0.13.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,6 +65,10 @@ cp -ra keys refind refind-install refind-mkdefault fonts banners $REFIND_SHARE_D cp mkrlconf mvrefind mountesp $PKG/usr/sbin cp -a docs/* *.txt $PKG/usr/doc/$PRGNAM-$VERSION +(cd $PKG/usr/sbin + ln -sf /usr/share/refind-$VERSION/refind-install + ln -sf /usr/share/refind-$VERSION/refind-mkdefault) + AA64_PKG="$REFIND_SHARE_DIR/refind/drivers_aa64 \ $REFIND_SHARE_DIR/refind/tools_aa64 \ $REFIND_SHARE_DIR/refind/refind_aa64.efi" diff --git a/system/refind/refind.info b/system/refind/refind.info index d03482468d..bc3c09e94d 100644 --- a/system/refind/refind.info +++ b/system/refind/refind.info @@ -1,8 +1,8 @@ PRGNAM="refind" -VERSION="0.11.4" -HOMEPAGE="http://www.rodsbooks.com/refind/index.html" -DOWNLOAD="http://sourceforge.net/projects/refind/files/0.11.4/refind-bin-0.11.4.zip" -MD5SUM="7553ce542ff626396bec5a587161e28f" +VERSION="0.13.1" +HOMEPAGE="http://www.rodsbooks.com/refind" +DOWNLOAD="http://sourceforge.net/projects/refind/files/0.13.1/refind-bin-0.13.1.zip" +MD5SUM="c59ade5e8d63768abf30fc96cc2e77ad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/regionset/regionset.SlackBuild b/system/regionset/regionset.SlackBuild index 1196dc8ad0..a43b7764bd 100644 --- a/system/regionset/regionset.SlackBuild +++ b/system/regionset/regionset.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for regionset -# Copyright 2009-2013 David Woodfall <dave@dawoodfall.net> +# Copyright 2009-2013 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/regionset/regionset.info b/system/regionset/regionset.info index 0a344c6a1e..f9792ed4ae 100644 --- a/system/regionset/regionset.info +++ b/system/regionset/regionset.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/reiser4progs/reiser4progs.SlackBuild b/system/reiser4progs/reiser4progs.SlackBuild index 1728c00da4..32714ac9b5 100644 --- a/system/reiser4progs/reiser4progs.SlackBuild +++ b/system/reiser4progs/reiser4progs.SlackBuild @@ -2,11 +2,9 @@ # Slackware build script for reiser4progs -# Written by Kurt Erickson <kurt_erickson@att.net> - PRGNAM=reiser4progs -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.2.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -81,7 +79,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 AUTHORS BUGS COPYING CREDITS CUSTOM_INSTALL_README ChangeLog \ - INSTALL INSTALL_README README THANKS TODO \ + INSTALL INSTALL_README NEWS README THANKS TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/reiser4progs/reiser4progs.info b/system/reiser4progs/reiser4progs.info index 65ab962b31..6ce1610ece 100644 --- a/system/reiser4progs/reiser4progs.info +++ b/system/reiser4progs/reiser4progs.info @@ -1,10 +1,10 @@ PRGNAM="reiser4progs" -VERSION="1.1.0" +VERSION="1.2.1" HOMEPAGE="https://sourceforge.net/projects/reiser4/" -DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.1.0.tar.gz" -MD5SUM="4abfda040a0ef152bc2f42152e247a5e" +DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.2.1.tar.gz" +MD5SUM="5c3af8644a4ab291fd59ccff6539a1ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libaal" -MAINTAINER="Kurt Erickson" -EMAIL="kerickson@lavabit.com" +MAINTAINER="Pierre-Philipp Braun" +EMAIL="pbraun@nethence.com" diff --git a/system/reptyr/reptyr.SlackBuild b/system/reptyr/reptyr.SlackBuild index f2825c71f6..532699761d 100644 --- a/system/reptyr/reptyr.SlackBuild +++ b/system/reptyr/reptyr.SlackBuild @@ -6,12 +6,14 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20201103 bkw: updated for v0.8.0 +# 20191128 bkw: updated for v0.7.0 # 20170621 bkw: get rid of -Werror (-current needs this) # 20170302 bkw: use long-format github URL # 20150505 bkw: updated for v0.6.2 PRGNAM=reptyr -VERSION=${VERSION:-0.6.2} +VERSION=${VERSION:-0.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,11 +49,8 @@ rm -rf $PRGNAM-$PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ sed -i \ -e 's,share/man,man,g' \ diff --git a/system/reptyr/reptyr.info b/system/reptyr/reptyr.info index c758f3ac6a..844cb53c3e 100644 --- a/system/reptyr/reptyr.info +++ b/system/reptyr/reptyr.info @@ -1,8 +1,8 @@ PRGNAM="reptyr" -VERSION="0.6.2" +VERSION="0.8.0" HOMEPAGE="https://github.com/nelhage/reptyr" -DOWNLOAD="https://github.com/nelhage/reptyr/archive/reptyr-0.6.2/reptyr-reptyr-0.6.2.tar.gz" -MD5SUM="9beb26462407f229c9e900466dc25b56" +DOWNLOAD="https://github.com/nelhage/reptyr/archive/reptyr-0.8.0/reptyr-reptyr-0.8.0.tar.gz" +MD5SUM="f682c73ebf2f0fc2fa577e84ba991e97" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/reptyr/slack-desc b/system/reptyr/slack-desc index 52e0bc0486..95315b7afb 100644 --- a/system/reptyr/slack-desc +++ b/system/reptyr/slack-desc @@ -14,6 +14,6 @@ reptyr: ssh, but have to leave and don't want to interrupt it? Just start reptyr: a screen, use reptyr to grab it, and then kill the ssh session and reptyr: head on home. reptyr: -reptyr: homepage: https://github.com/nelhage/reptyr +reptyr: Homepage: https://github.com/nelhage/reptyr reptyr: reptyr: diff --git a/system/resource-agents/README b/system/resource-agents/README index 5e29e87044..1a3187e18b 100644 --- a/system/resource-agents/README +++ b/system/resource-agents/README @@ -2,8 +2,8 @@ resource-agents (cluster service executables) Combined repository of OCF agents from the RHCS and Linux-HA projects -You might also want to install corosync, pacemaker, resource-agents, crmsh, -fence-agents and eventually cluster-glue. +You might also want to install cluster-glue, heartbeat, resource-agents, +fence-agents. Define OCF_ROOT and eventually OCF_RESKEY_<param> if you need to test the resource executables manually. diff --git a/system/resource-agents/resource-agents.SlackBuild b/system/resource-agents/resource-agents.SlackBuild index 2755856326..e25b48105e 100644 --- a/system/resource-agents/resource-agents.SlackBuild +++ b/system/resource-agents/resource-agents.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=resource-agents -VERSION=${VERSION:-4.1.1} +VERSION=${VERSION:-4.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -94,7 +94,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 \ - AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL ChangeLog README \ + AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL ChangeLog NEWS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/resource-agents/resource-agents.info b/system/resource-agents/resource-agents.info index f926462310..1d1d04d0cf 100644 --- a/system/resource-agents/resource-agents.info +++ b/system/resource-agents/resource-agents.info @@ -1,8 +1,8 @@ PRGNAM="resource-agents" -VERSION="4.1.1" +VERSION="4.5.0" HOMEPAGE="https://github.com/ClusterLabs/resource-agents" -DOWNLOAD="https://github.com/ClusterLabs/resource-agents/archive/v4.1.1/resource-agents-4.1.1.tar.gz" -MD5SUM="82e3a335f942347f1b7c27b9f8e8e984" +DOWNLOAD="https://github.com/ClusterLabs/resource-agents/archive/v4.5.0/resource-agents-4.5.0.tar.gz" +MD5SUM="265fd01a2b4119b7b733c829c4c36d32" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/resource-agents/slack-desc b/system/resource-agents/slack-desc index 8912e4fd0a..375e8809f5 100644 --- a/system/resource-agents/slack-desc +++ b/system/resource-agents/slack-desc @@ -10,8 +10,8 @@ resource-agents: resource-agents (cluster service executables) resource-agents: resource-agents: Combined repository of OCF agents from the RHCS and Linux-HA projects resource-agents: -resource-agents: You might also want to install corosync, pacemaker, resource-agents, -resource-agents: crmsh, fence-agents and eventually cluster-glue. +resource-agents: You might also want to install cluster-glue, heartbeat, +resource-agents: resource-agents, fence-agents. resource-agents: resource-agents: resource-agents: diff --git a/system/restic/README b/system/restic/README new file mode 100644 index 0000000000..8aaf2e13bc --- /dev/null +++ b/system/restic/README @@ -0,0 +1,5 @@ +restic (Modern backup program to backup your files) + +restic is a backup program that is fast, efficient and secure. It +supports the three major operating systems (Linux, macOS, Windows) and +a few smaller ones (FreeBSD, OpenBSD). diff --git a/system/restic/restic.SlackBuild b/system/restic/restic.SlackBuild new file mode 100644 index 0000000000..18a06b43b7 --- /dev/null +++ b/system/restic/restic.SlackBuild @@ -0,0 +1,82 @@ +#!/bin/sh + +# Slackware build script for restic + +# Copyright 2020-2021 Ebben Aries <slackbuilds@dscp.org> +# 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. + +PRGNAM=restic +VERSION=${VERSION:-0.12.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +case "$ARCH" in + x86_64) + BINARCH="amd64" + ;; + i?86) + BINARCH="386" + ;; + *) + echo "$ARCH is not supported." + exit 1 + ;; +esac + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION +cd $PRGNAM-$VERSION +bzip2 -ckd $CWD/${PRGNAM}_${VERSION}_linux_${BINARCH}.bz2 > $PRGNAM +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 {} \; + +mkdir -p $PKG/usr/bin +install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM + +mkdir -p $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:-tgz} diff --git a/system/restic/restic.info b/system/restic/restic.info new file mode 100644 index 0000000000..2a720df865 --- /dev/null +++ b/system/restic/restic.info @@ -0,0 +1,10 @@ +PRGNAM="restic" +VERSION="0.12.0" +HOMEPAGE="https://restic.net/" +DOWNLOAD="https://github.com/restic/restic/releases/download/v0.12.0/restic_0.12.0_linux_386.bz2" +MD5SUM="ff4c35d9f4dbddf248e03b1994d7e27c" +DOWNLOAD_x86_64="https://github.com/restic/restic/releases/download/v0.12.0/restic_0.12.0_linux_amd64.bz2" +MD5SUM_x86_64="ed501c292a7b6dac355cc8f867699bc2" +REQUIRES="" +MAINTAINER="Ebben Aries" +EMAIL="slackbuilds@dscp.org" diff --git a/system/restic/slack-desc b/system/restic/slack-desc new file mode 100644 index 0000000000..b0125b8a08 --- /dev/null +++ b/system/restic/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------------------------------------------------------| +restic: restic (Modern backup program to backup your files) +restic: +restic: restic is a backup program that is fast, efficient and secure. It +restic: supports the three major operating systems (Linux, macOS, Windows) and +restic: a few smaller ones (FreeBSD, OpenBSD). +restic: +restic: Home-Page: https://restic.net/ +restic: +restic: +restic: +restic: diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild index 2da73ebd2d..24d4602337 100644 --- a/system/rhash/rhash.SlackBuild +++ b/system/rhash/rhash.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright (c) 2014, Симонъ–Севаръ Болокановъ, Bulgaria <sbolokanov@abv.bg> +# Copyright 2014-2021 S. S. Bolokanar, Bulgaria <sbolokanov@abv.bg> +# С. С. Болоканаръ, Ð‘ÑŠÐ»Ð³Ð°Ñ€Ð¸Ñ # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +21,6 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Written by: Симонъ Болокановъ <sbolokanov@abv.bg> -# Date: Unknown - # Changelog: # v1.3.3 - Re-done the sript and send it to SBo # 27.2.2015 - no headers!? - thanks to Marcel Saegebarth for spotting this @@ -32,7 +30,7 @@ # 3 Мартъ 1878 – възÑтановѧване на Българиѧ, 3 Мартъ 1918 (40 г. по–къÑно) – победа надъ РуÑиѧ PRGNAM=rhash -VERSION=${VERSION:-1.3.7} +VERSION=${VERSION:-1.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -83,10 +81,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz -mv RHash-$VERSION $PRGNAM-$VERSION -cd $PRGNAM-$VERSION +rm -rf RHash-$VERSION +tar xvf $CWD/RHash-$VERSION.tar.gz +cd RHash-$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/rhash/rhash.info b/system/rhash/rhash.info index b46a0203b2..1e86e18c74 100644 --- a/system/rhash/rhash.info +++ b/system/rhash/rhash.info @@ -1,10 +1,10 @@ PRGNAM="rhash" -VERSION="1.3.7" -HOMEPAGE="http://rhash.anz.ru/?l=en" -DOWNLOAD="http://downloads.sourceforge.net/rhash/rhash-1.3.7-src.tar.gz" -MD5SUM="269b26054c15ead504d763f5c39208e2" +VERSION="1.4.1" +HOMEPAGE="https://github.com/rhash/RHash/" +DOWNLOAD="https://github.com/rhash/RHash/archive/v1.4.1/RHash-1.4.1.tar.gz" +MD5SUM="5059d052270e92302dbb08de3f6d7fee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Симонъ–Севаръ С. Болокановъ" +MAINTAINER="S. S. Bolokanar" EMAIL="sbolokanov@abv.bg" diff --git a/system/ripgrep/ripgrep.SlackBuild b/system/ripgrep/ripgrep.SlackBuild index 15a40ee49a..3e469f5fd7 100644 --- a/system/ripgrep/ripgrep.SlackBuild +++ b/system/ripgrep/ripgrep.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ripgrep -# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ripgrep -VERSION=${VERSION:-0.10.0} +VERSION=${VERSION:-12.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,84 +91,13 @@ mkdir vendor ( cd vendor - for dependency in aho-corasick=0.6.8 \ - arrayvec=0.4.7 \ - atty=0.2.11 \ - base64=0.9.2 \ - bitflags=1.0.4 \ - bytecount=0.3.2 \ - byteorder=1.2.6 \ - cc=1.0.24 \ - cfg-if=0.1.5 \ - clap=2.32.0 \ - cloudabi=0.0.3 \ - crossbeam-channel=0.2.4 \ - crossbeam-epoch=0.5.2 \ - crossbeam-utils=0.5.0 \ - encoding_rs=0.8.6 \ - encoding_rs_io=0.1.2 \ - fnv=1.0.6 \ - fuchsia-zircon-sys=0.3.3 \ - fuchsia-zircon=0.3.3 \ - glob=0.2.11 \ - itoa=0.4.2 \ - lazy_static=1.1.0 \ - libc=0.2.43 \ - lock_api=0.1.3 \ - log=0.4.5 \ - memchr=2.0.2 \ - memmap=0.6.2 \ - memoffset=0.2.1 \ - nodrop=0.1.12 \ - num_cpus=1.8.0 \ - owning_ref=0.3.3 \ - parking_lot=0.6.4 \ - parking_lot_core=0.3.0 \ - pcre2-sys=0.1.1 \ - pcre2=0.1.0 \ - pkg-config=0.3.14 \ - proc-macro2=0.4.18 \ - quote=0.6.8 \ - rand=0.4.3 \ - rand=0.5.5 \ - rand_core=0.2.1 \ - redox_syscall=0.1.40 \ - redox_termios=0.1.1 \ - regex-syntax=0.6.2 \ - regex=1.0.5 \ - remove_dir_all=0.5.1 \ - ryu=0.2.6 \ - safemem=0.2.0 \ - same-file=1.0.3 \ - scopeguard=0.3.3 \ - serde=1.0.77 \ - serde_derive=1.0.77 \ - serde_json=1.0.27 \ - simd=0.2.2 \ - smallvec=0.6.5 \ - stable_deref_trait=1.1.1 \ - strsim=0.7.0 \ - syn=0.15.1 \ - tempdir=0.3.7 \ - termcolor=1.0.3 \ - termion=1.5.1 \ - textwrap=0.10.0 \ - thread_local=0.3.6 \ - ucd-util=0.1.1 \ - unicode-width=0.1.5 \ - unicode-xid=0.1.0 \ - unreachable=1.0.0 \ - utf8-ranges=1.0.1 \ - version_check=0.1.4 \ - void=1.0.2 \ - walkdir=2.2.5 \ - winapi-i686-pc-windows-gnu=0.4.0 \ - winapi-util=0.1.1 \ - winapi-x86_64-pc-windows-gnu=0.4.0 \ - winapi=0.3.5 \ - wincolor=1.0.1; do - dep="$(echo "$dependency" | cut -d= -f1)" - ver="$(echo "$dependency" | cut -d= -f2)" + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" tar xvf $CWD/$dep-$ver.crate @@ -190,7 +119,7 @@ mkdir vendor sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' printf "}\n" - } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + } > $dep-$ver/.cargo-checksum.json done ) @@ -225,7 +154,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 CHANGELOG.md COPYING FAQ.md GUIDE.md ISSUE_TEMPLATE.md LICENSE-MIT README.md UNLICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md COPYING FAQ.md GUIDE.md LICENSE-MIT README.md RELEASE-CHECKLIST.md UNLICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/ripgrep/ripgrep.info b/system/ripgrep/ripgrep.info index 3ba47ce53e..8ffbd6693e 100644 --- a/system/ripgrep/ripgrep.info +++ b/system/ripgrep/ripgrep.info @@ -1,160 +1,118 @@ PRGNAM="ripgrep" -VERSION="0.10.0" +VERSION="12.1.1" HOMEPAGE="https://github.com/BurntSushi/ripgrep" -DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/0.10.0/ripgrep-0.10.0.tar.gz \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.6.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.9.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.0.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bytecount/bytecount-0.3.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.2.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.24.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.32.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/cloudabi/cloudabi-0.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.2.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.5.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.5.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs_io/encoding_rs_io-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.2.11.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.43.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.6.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/nodrop/nodrop-0.1.12.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.8.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/owning_ref/owning_ref-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.6.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.3.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2-sys/pcre2-sys-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2/pcre2-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.14.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.18.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-0.6.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.4.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.5.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_core/rand_core-0.2.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.40.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_termios/redox_termios-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.0.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/remove_dir_all/remove_dir_all-0.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-0.2.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/safemem/safemem-0.2.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-0.3.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.77.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.77.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.27.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/simd/simd-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/smallvec/smallvec-0.6.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/stable_deref_trait/stable_deref_trait-1.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.7.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/tempdir/tempdir-0.3.7.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.0.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/termion/termion-1.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.10.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-0.3.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unreachable/unreachable-1.0.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8-ranges/utf8-ranges-1.0.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.1.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.2.5.crate \ +DOWNLOAD="https://github.com/BurntSushi/ripgrep/archive/12.1.1/ripgrep-12.1.1.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.12.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bstr/bstr-0.2.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bytecount/bytecount-0.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/byteorder/byteorder-1.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.54.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs/encoding_rs-0.8.23.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/encoding_rs_io/encoding_rs_io-0.1.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fs_extra/fs_extra-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/glob/glob-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jemalloc-sys/jemalloc-sys-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/jemallocator/jemallocator-0.3.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.71.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memmap/memmap-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/packed_simd/packed_simd-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2-sys/pcre2-sys-0.2.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pcre2/pcre2-0.2.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-automata/regex-automata-0.1.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.18.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.3.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/same-file/same-file-1.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.110.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.110.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.53.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.27.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/walkdir/walkdir-2.3.1.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wincolor/wincolor-1.0.1.crate" -MD5SUM="60fd999c5a7b63d426d3f946a3a9fef4 \ - 851ec573d64fa799d588fbf3733aab2f \ - f31fdfa8e7d7c1a6707ba071f7e83ada \ - 5d7155b7fbc0e234c017f418f0dc9d64 \ - bc77ecac2564ebbfafcb12f131021df3 \ - e5767560aad375059c975285c07022c0 \ - 2a9a32fb1957699f85723b57210365a1 \ - ef65c8896b47528d0496e46c77419c4b \ - ca118d13bd0e320d9ce210a4a6005d9e \ - 097e0d2392a5e65f9471f7af7001940a \ - cff9adf6952db7c0442bd9639440bb90 \ - 1c8b50f8528dd37df7d984e0e4b61bd5 \ - 91f5bac1ff87a6d175b6438d4cde338f \ - 0cbfc89f88b5c1327b66fa46e19cb4e1 \ - d447a68c467150d94b4e63c55d23f179 \ - aa90a5cce076dbe95d7c3a5115610772 \ - c0e2f7441746d177ee21253e0d8f65ee \ - b0fd8ad50f5e64c71f0daf8af79ca952 \ - 54cfab480b7a5f7302eadf44129d3f4b \ - dd7c80c2d04d2e9ceba82826cf69764d \ - f8ece52bd2dc2019f8ccc8401d259ecf \ - 4d2690f40b4b325c8d2e1b73889fb4cf \ - 5ad17e4d6ff2d31f4f487d67bd2ac6e3 \ - 5524b53de0aad9352ca0d4d899f87046 \ - c53281f4c69dd831363bb97c8e39291c \ - f9550f0fca0cefb4556c4a44429eec99 \ - 6655ea455968851f1107eb9db1ba0794 \ - 390733563cb6464678c4536423fd8ccf \ - 43452a6296aea71bef32661bee169d21 \ - 6c96e2e8e38d79600ff91591da2b4c97 \ - b702f35cca52b56d1fb6e5bd4a048fbf \ - 5d1a7bdbe77f74a2e2eefbb360dfcd55 \ - cfc2fa00b6829d7e27c3c81c669e5fed \ - 6d2a2d092c54c9d74eb67e85089b2140 \ - b9edaabd365fec513a6a2e199d54f101 \ - 1c6dc52f200c1278981b0700c850e920 \ - 87a9d36f5ebe5eae0c3e8d69d58752e1 \ - 86cfb903492f41ed285892b95f42168c \ - 0fb98687d43d7ffd5c1aa097a076f1e6 \ - b8e402de21805717cdaa0c2f122a2a26 \ - 47bbc871bdfc0b6c2213c1b60890fe92 \ - f482ef382222a148f39c5442ee966154 \ - 7e94bf91e9faf1557da812a3444f23cc \ - 01cb5402c0fd99cebac702b76f2f2669 \ - 34abd5937facf3194234568f2c7143be \ - c0cf8269a2d978e59014d104166d0f04 \ - 09422dcb1cd6e3c30598296d2d3d4798 \ - eb5f242e1152146eda805ada56599088 \ - c94d50b55cb25cfca45c83f753ea7fda \ - fa3def67df338a3a66a6f1a9cde20c47 \ - 500e5bb7d9b5a8882e2e961012391a58 \ - 40d1f98e5a00e1361bc5f7b218e31d32 \ - 2a8a259cd4e5e3bc91ea723f825bed93 \ - e4aecf66252fefac1da21873e26bb9fc \ - 43d12ec0a90570c9376fce095a201240 \ - 9f481a2e33bc27a6be63ab49b6811ae6 \ - a986c51d8a91f91704da0c440295640d \ - fbb6473579065c9fe4dc3d48c5d5d8a5 \ - 27c1336ce86a695d206dee9f772db23c \ - 918b2d65f7489e154483e3d6e54118a0 \ - 0d6e38a45f0669b6959b3139f03ff6b5 \ - de04800c89d374b8a843f91d26fa05ad \ - 63268e3f02616082705227f0a58fed87 \ - baaa166f66e90e94b76b7418afd5df90 \ - 5a31b770d7063a98028d2b3de67e7a7a \ - d7c493ca4f84a7d50b53646421a37487 \ - 5aaf04f9a94a6450e3e4963ddd62b92d \ - b390278bbea483da591b1bc026be5fa2 \ - eb64e0712afe3a8bdaaaee8eaf876c86 \ - 42251e6747c29cf0b8cd6ee7c6b1f7e0 \ - 689203efc084fc0f1d1f74f5d354ae75 \ - 23d2410324fcb8980865c853d2f826bb \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.8.crate" +MD5SUM="d3190853d47d51ad077a65aadbf55448 \ + abc51f82118d86e83165ba87e2521e96 \ + 142cb4b9a653e56e56311f0c883b8582 \ + 7c6515c4b7f4c7723a3c6d1f07acc261 \ + 468f237829e960715055da5d484681b9 \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + d25e25d08adce75c63f3969191141f28 \ + fe9c56d3d43021538850fcad8404bdad \ + e502e6c6b0dca9c1ae2d99e92b26f645 \ + 720e6fb5478963221c58e4ef0fc44356 \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 42af3a1e965585d80dcc1e0324fda6eb \ + e9d5377e649441c6984e17b9679f2773 \ + ff67cf2eb9668167782b8012d3b48e7b \ + cba3538d5dac64d269dda867ba6c5011 \ + 98dd664015c5a6c5e1d3cfb8dce1c4ff \ + 8dab3b3ec00dc56cffde0b0c410d47b5 \ + 8b98db48d2cecf5843b75e2f668c58fa \ + e7c07242a95ee1df865efe9534e10a34 \ + be4d52524ec8485abc40efba317b1e4c \ + 493f4bd45cf2a6c3963f66f58884f622 \ + 85dae509b4cda41fa820b3ad3b302479 \ + 9f10bcc7b3ab24a0cdbaa0addc65b88d \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 0a258dcd990afe3d83e0c103edd7f095 \ + 61e508ca2eee543023c5e1ba777e5ede \ + b5cf10e268e8a3bee2de8a734104245e \ + 124ec4f35274a0e9c1a4ef3dc0958643 \ + bdb38691302aeb63500e053919f5f0f7 \ + c36d452e37c73b1e99f40bae18cddfdb \ + 9551c939b35e3eb367843e03d71ba155 \ + 2cc140411a55694fa07baa857a720af2 \ + 244c87ebce1ce19de9283d14e218618d \ + d6f8f8aba0bdb5edb2dc41705b9d1144 \ + e0941025a0c5ed64fa8837efd892ecce \ + ef0afe60eee17cc47bc3cb6f88b843a6 \ + 3b298ba1d0e5e75b14765b2c48d52b13 \ + 24118e5657591c6f208dbb1d77fbc482 \ + eee136546e9f4735577dd20f45727c69 \ + 44d95c1ed46baee736c9420ad1de3228 \ + 2d8d8b377d144f5e32b4f65a69eb0b24 \ + 3879349fe374e764e24f37ce40ac9824 \ + 9b7d58f6341fb619ff2190481ce13b84 \ + ce76f5430cd6d2ab76d0d86ecb8a4f4d \ + 781d4ccf5d04c98fa02af207a9639249 \ + 6fcb4505d0da4df3c5747dc23afe6622 \ + 62e883807a65ebe1ba9d0e555d703339 \ + a8de006fe0c7e373c560dd51599287a8 \ + a5dd75e77c7324f5c1d2d372c990d0a7 \ + 0f65fd26370e1fd67c8e8812cabea574 \ + e628ca8adb2b572bffb210f014656b6f \ + 1092a4a24e80f8856efc71af51a06114 \ db96b50050277bf05a3c68534bbb9586 \ - e003af62de1097ee482635cff7bdf6ca \ + b9e37d5fc4ad28b612b78ad37816684d \ 09de9d01e7331ff3da11f58be8bef0df \ - 2125e7b9377edde8dc250554b47c7442 \ - 2f9f840bd479751f715a8f530976b6bf" + ce68e06a2cd4f180747cf169fc388a95" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/rmw/README b/system/rmw/README index 201e917723..d51625f973 100644 --- a/system/rmw/README +++ b/system/rmw/README @@ -1,4 +1,6 @@ -rmw (ReMove to Waste) is a cross-platform command-line "trash can" -utility. It can send files to your "Desktop" trash, or a completely -separate folder; restore files and append a unique string to the -filenames so they won't be overwritten (duplication protection). +rmw (ReMove to Waste) is a safe-remove utility for the command line. +Its goal is to conform to the FreeDesktop.org Trash specification and +therefore be compatible with KDE, GNOME, XFCE, and others. Desktop +integration is optional however, and by default, rmw will only use a +unique features is the ability to purge files from your Waste/Trash +directories after x number of days. diff --git a/system/rmw/README.Slackware b/system/rmw/README.Slackware index d1e8f1c504..a93201f522 100644 --- a/system/rmw/README.Slackware +++ b/system/rmw/README.Slackware @@ -1,45 +1,42 @@ -# rmw v0.7.01 +# rmw-0.7.05 -rmw (ReMove to Waste) is a cross-platform command-line "trash can" -utility. It can send files to your "Desktop" trash, or a completely -separate folder; restore files and append a unique string to the -filenames so they won't be overwritten (duplication protection). +## Description -Web site: https://remove-to-waste.info/ +rmw (ReMove to Waste) is a safe-remove utility for the command line. +Its goal is to conform to [the FreeDesktop.org Trash +specification](https://specifications.freedesktop.org/trash-spec/trashspec-latest.html) +and therefore be compatible with KDE, GNOME, XFCE, and others. Desktop +integration is optional however, and by default, rmw will only use a +waste folder separated from your desktop trash. One of its unique +features is the ability to purge files from your Waste/Trash +directories after x number of days. + +Web site: <https://remove-to-waste.info/> ## Build Status -* [Travis Build](https://travis-ci.org/theimpossibleastronaut/rmw)  -* [Semaphore Build](https://semaphoreci.com/andy5995/rmw-3)  +* [](https://travis-ci.org/theimpossibleastronaut/rmw) +* [](https://semaphoreci.com/andy5995/rmw-3) ## Screenshots - + [More Screenshots](https://remove-to-waste.info/screenshots.html) ## Contact / Support -See website [Help and Support section](https://remove-to-waste.info/#support) +* [Bug Reports and Feature Requests](https://github.com/theimpossibleastronaut/rmw/blob/master/CONTRIBUTING.md#bug-reports-and-feature-requests) +* [General Help, Support, Discussion](https://remove-to-waste.info/#support) ## Required libraries -libncursesw - -If you are building from source, you will need the libncursesw(5 or 6)-dev -package from your operating system distribution. - -Note: On OpenBSD, you must precede `./configure` with `MENU_LIBS=-lmenuw`. -Example: +* libncursesw (ncurses-devel on some systems, such as CentOS) +* gettext (or use --disable-nls if you only need English language support) - MENU_LIBS=-lmenuw ./configure - -Note: rmw has been built on Windows 2 years ago using Cygwin but it -didn't use the proper directories. We have no Windows developers -working on this project and are hoping that some will join soon!. As -stated in the description, the goal of this project is a -"cross-platform" utility; so getting rmw to work reliably on Windows is -still on the TODO list. +If you are building from source, you will need the libncursesw(5 or +6)-dev package from your operating system distribution. On some systems +just the ncurses packages is needed, and it's often already installed. ## Compiling @@ -61,20 +58,28 @@ that you have write access to. Example: make make install -rmw will be installed to $HOME/usr/bin and the configuration file will be -copied to $HOME/usr/etc +The rmw binary will be installed to `$HOME/usr/bin` and documentation to +`$HOME/usr/doc`. -### Pre-built binary packages +### If configure fails -Packages for some operating systems are available on the -[Downloads](https://github.com/theimpossibleastronaut/rmw/releases) page +On **OSX**, ncursesw isn't provided by default but can be installed +using `brew install ncurses`. Then precede `./configure` with +`PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig"` Example: -### Using _Homebrew_ on Mac OS X + PKG_CONFIG_PATH="/usr/local/opt/ncurses/lib/pkgconfig" ../configure -Add a tap and install rmw: +If you can't use [brew](https://brew.sh/), or install libncursesw or +libmenuw some other way, rmw will use `ncurses` but you may experience +[this minor +bug](https://github.com/theimpossibleastronaut/rmw/issues/205). -* brew tap [theimpossibleastronaut/homebrew-extras](https://github.com/theimpossibleastronaut/homebrew-extras) -* brew install rmw +Note: rmw was built on **Windows** 2 years ago using Cygwin but it +didn't use the proper directories. We have no Windows developers +working on this project and are hoping that some will join soon!. As +stated in the description, the goal of this project is a +"cross-platform" utility; so getting rmw to work on Windows is +still on the TODO list. ## Uninstall / Cleaning up @@ -86,24 +91,31 @@ Add a tap and install rmw: ``` == First-time use == -If you installed rmw as a normal user, this next step can be skipped. - -After rmw is installed, create the user configuration directory by -typing 'rmw' and hitting enter. A configuration file will be -automatically created in $HOME/.config/rmw. Edit the file as desired. +After rmw is installed, running `rmw` will create a configuration file +(rmwrc) in $HOME/.config (or $XDG_CONFIG_HOME). Edit the file as +desired. == Configuration File == -Documentation explaining the configuration can be found in rmwrc. +Documentation explaining the configuration can be found in your config +file. -Waste folders will be created automatically. (e.g. if '$HOME/trash.rmw' -is listed in the config file, these 3 directories will be created: -$HOME/trash.rmw -$HOME/trash.rmw/files -$HOME/trash.rmw/info +Waste folders will be created automatically; e.g. if '$HOME/.local/share/Waste' +is uncommented in the config file, these 3 directories will be created: +$HOME/.local/share/Waste +$HOME/.local/share/Waste/files +$HOME/.local/share/Waste/info If one of the WASTE folders is on removable media, then the user has the -option of appending ',removable' (details in etc/rmwrc). +option of appending ',removable'. + +If a folder has ',removable' appended to it, rmw will not try to create +it; it must be initially created manually. If the folder exists when +rmw is run, it will be used; if not, it will be skipped. Once you +create "example_waste", rmw will automatically create +example_waste/info and example_waste/files + + e.g.: WASTE=/mnt/sda10000/example_waste, removable == Features and Options == @@ -116,20 +128,22 @@ ReMove the FILE(s) to a WASTE directory listed in configuration file Restore FILE(s) from a WASTE directory -h, --help --t, --translate display a translation of the configuration file -c, --config filename use an alternate configuration -l, --list list waste directories -g, --purge run purge even if it's been run today -o, --orphaned check for orphaned files (maintenance) -f, --force allow purge to run +-e, --empty completely empty (purge) all waste folders +-r, -R, --recursive option used for compatibility with rm + (recursive operation is enabled by default) -v, --verbose increase output messages -w, --warranty display warranty -V, --version display version and license information - ===] Restoring [=== + ===] Restoring [=== --z, --restore <wildcard filename(s) pattern> +-z, --restore <wildcard filename(s) pattern> (e.g. ~/.local/share/Waste/files/foo*) -s, --select select files from list to restore -u, --undo-last undo last ReMove @@ -140,53 +154,33 @@ specified in the configuration file after 'x' number of days. Purging can be disabled by using 'purge_after = 0' in configuration file. rmw will only check once per day if it's time to purge (use -g to check more often). -Purge requires -f (--force) to run. +The time of the last automatic purge check is stored in `purge-time`, +located in $HOME/.local/share/rmw (or $XDG_DATA_HOME/rmw). -To skip that requirement, add the line +== -e, --empty == -force_not_required +Completely empty (purge) all waste folders -to your configuration file. +== -u, --undo == -The day of the last purge is stored in $HOME/config/rmw/lastpurge +Restores files that were last rmw'ed. No arguments for `-u` are +necessary. The list of files that were last rmw'ed is stored in `mrl`, located in +$HOME/.local/share/rmw (or $XDG_DATA_HOME/rmw). -== Empty the Trash == +== -z, --restore == -To empty the trash completely, rmw can use the environmental variable -RMWTRASH. Usage: -RMWTRASH=empty rmw -fg - -== -z option == - -To restore a file, or multiple files, specify the path to them in in the +To restore a file, or multiple files, specify the path to them in the <WASTE>/files folder (wildcards ok). -e.g. 'rmw -z ~/.local/share/Trash/files/foo*' - -Files can also be restored using only the basename, from within any directory. -NOTE: That feature will not process wildcards unless the user is in a -<WASTE>/files folder and the filespec actually exists in the present working -directory. - -== -t, --translate == - -A translation of the configuration file in your native -language (if available) will be displayed. - -(If you would be interested in adding a translation, please visit -https://github.com/theimpossibleastronaut/rmw/wiki/Translating) +e.g. 'rmw -z ~/.local/share/Waste/files/foo*' == -f, --force == -rmw will normally refuse to purge directories if they contain non-writable +A change from previous versions, purge is allowed to run without the '-f' +option. If you'd rather require the use of '-f', you can add the line +'force_required' in your configuration file. + +rmw will refuse to purge directories if they contain non-writable subdirectories. You can use -f 2 times if you ever see a message that tells you "permission denied; directory still contains files" (e.g. rwm -gff). -## Notes - -After you use rmw, it will create a 'lastpurge' and 'lastrmw' file in -$HOME/config/rmw. `lastpurge` contains the day of the last time rmw did -a purge check (it only checks once per day). `lastrmw` contains the -filenames of the last rmw operation; the file is read when `rmw -u` is -used. - ``` diff --git a/system/rmw/doinst.sh b/system/rmw/doinst.sh index a8f047556c..51a97b4ab0 100644 --- a/system/rmw/doinst.sh +++ b/system/rmw/doinst.sh @@ -1,12 +1,4 @@ -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... -} -config etc/rmwrc.new +DEPRECATED="etc/rmwrc" +if [ -f "$DEPRECATED" ]; then + rm "$DEPRECATED" +fi diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild index 1d20a46e0c..81fd0b5f17 100644 --- a/system/rmw/rmw.SlackBuild +++ b/system/rmw/rmw.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for rmw # -# Copyright 2018 / Andy Alt / United States +# Copyright 2019-2021 / Andy Alt / United States # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rmw -VERSION=${VERSION:-0.7.01} +VERSION=${VERSION:-0.7.06} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,7 +73,6 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ --mandir=/usr/man \ --localedir=/usr/share/locale \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -82,8 +81,11 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG -mkdir -p $PKG/etc -cat rmwrc > $PKG/etc/rmwrc.new +# +# rmw no longer searches for a system-wide config file +# +#mkdir -p $PKG/etc +#cat rmwrc > $PKG/etc/rmwrc.new 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 diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info index 54fcbb68d7..778de6ab12 100644 --- a/system/rmw/rmw.info +++ b/system/rmw/rmw.info @@ -1,8 +1,8 @@ PRGNAM="rmw" -VERSION="0.7.01" +VERSION="0.7.06" HOMEPAGE="https://remove-to-waste.info/" -DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.01/rmw-0.7.01.tar.gz" -MD5SUM="33cbad38e4feb796b26ac39584f89794" +DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.06/rmw-0.7.06.tar.gz" +MD5SUM="9b5e0fcda2e32b1886efd50030e51a5e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/rmw/slack-desc b/system/rmw/slack-desc index e041e63999..ad3af3da9d 100644 --- a/system/rmw/slack-desc +++ b/system/rmw/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| rmw: rmw (command line trash can/recycle bin) rmw: -rmw: ReMove to Waste is a cross-platform command-line "trash can" -rmw: utility. It can send files to your "Desktop" trash, or a completely -rmw: separate folder; restore files and append a unique string to the -rmw: filenames so they won't be overwritten (duplication protection). +rmw: rmw (ReMove to Waste) is a safe-remove utility for the command line. +rmw: Its goal is to conform to the FreeDesktop.org Trash specification and +rmw: therefore be compatible with KDE, GNOME, XFCE, and others. Desktop +rmw: integration is optional however, and by default, rmw will only use a +rmw: waste folder separated from your desktop trash. One of its unique +rmw: features is the ability to purge files from your Waste/Trash +rmw: directories after x number of days. rmw: rmw: Homepage: https://remove-to-waste.info/ -rmw: -rmw: -rmw: diff --git a/system/rover/rover.info b/system/rover/rover.info index 0e2a092db5..b30ac71025 100644 --- a/system/rover/rover.info +++ b/system/rover/rover.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/rox-filer/rox-filer.SlackBuild b/system/rox-filer/rox-filer.SlackBuild index b5ae022667..858f57f768 100644 --- a/system/rox-filer/rox-filer.SlackBuild +++ b/system/rox-filer/rox-filer.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=rox-filer VERSION=${VERSION:-2.11} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -44,6 +44,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION +patch -p0 < $CWD/session_auto_respawn.diff chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/system/rox-filer/rox-filer.info b/system/rox-filer/rox-filer.info index 915ba4ca49..cf0df141a1 100644 --- a/system/rox-filer/rox-filer.info +++ b/system/rox-filer/rox-filer.info @@ -6,5 +6,5 @@ MD5SUM="0eebf05a67f7932367750ebf9faf215d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="slakmagik" -EMAIL="slakmagik@gmail.com" +MAINTAINER="Emmanuel N. Millan" +EMAIL="emmanueln@gmail.com" diff --git a/system/rox-filer/session_auto_respawn.diff b/system/rox-filer/session_auto_respawn.diff new file mode 100644 index 0000000000..0ade6b556b --- /dev/null +++ b/system/rox-filer/session_auto_respawn.diff @@ -0,0 +1,11 @@ +--- ROX-Filer/src/session.h~ 2011-10-09 16:31:59.000000000 +0200 ++++ ROX-Filer/src/session.h 2020-12-17 11:11:19.302291214 +0100 +@@ -10,7 +10,7 @@ + #include <gtk/gtk.h> + #include <X11/SM/SMlib.h> + +-gboolean session_auto_respawn; ++extern gboolean session_auto_respawn; + + void session_init(const gchar *client_id); + diff --git a/system/rsyslog/rsyslog.SlackBuild b/system/rsyslog/rsyslog.SlackBuild index ee97e95104..5f66b8c68f 100644 --- a/system/rsyslog/rsyslog.SlackBuild +++ b/system/rsyslog/rsyslog.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for rsyslog -# Copyright (c) 2018, Christophe Trussardi, Paris, France +# Copyright (c) 2021, Christophe Trussardi, Paris, France # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rsyslog -VERSION=${VERSION:-8.33.1} +VERSION=${VERSION:-8.2102.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,6 +58,7 @@ fi [ "${LIBDBI:-no}" = "no" ] || libdbi_option="--enable-libdbi" [ "${GNUTLS:-no}" = "no" ] || gnutls_option="--enable-gnutls" [ "${RELP:-no}" = "no" ] || relp_option="--enable-relp" +[ "${LIBLOGGING:-no}" = "no" ] || liblogging_option="--enable-liblogging-stdlog" set -e @@ -85,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-generate-man-pages \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ - $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option + $mysql_option $pgsql_option $libdbi_option $gnutls_option $relp_option $liblogging_option make make install-strip DESTDIR=$PKG diff --git a/system/rsyslog/rsyslog.info b/system/rsyslog/rsyslog.info index b6bfde49cb..4b184817d9 100644 --- a/system/rsyslog/rsyslog.info +++ b/system/rsyslog/rsyslog.info @@ -1,10 +1,10 @@ PRGNAM="rsyslog" -VERSION="8.33.1" +VERSION="8.2102.0" HOMEPAGE="https://www.rsyslog.com/" -DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.33.1.tar.gz" -MD5SUM="972f57f4c4cdbf48a803ee1ba0fce843" +DOWNLOAD="https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2102.0.tar.gz" +MD5SUM="1f6150dfd2ef38db37c2165e98d2f2b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="%README% docutils libee libestr libfastjson liblogging" +REQUIRES="%README% docutils libee libestr libfastjson" MAINTAINER="Christophe Trussardi" EMAIL="chris@teria.org" diff --git a/system/rtirq/rtirq.info b/system/rtirq/rtirq.info index 6376ed271b..70b90d606b 100644 --- a/system/rtirq/rtirq.info +++ b/system/rtirq/rtirq.info @@ -1,7 +1,7 @@ PRGNAM="rtirq" VERSION="20150216" HOMEPAGE="https://alsa.opensrc.org/Rtirq" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/rtirq-20150216.tar.gz" +DOWNLOAD="https://slackware.uk/~urchlay/src/rtirq-20150216.tar.gz" MD5SUM="59e8b012c16b1e879ce8648f537400c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/runc/runc.SlackBuild b/system/runc/runc.SlackBuild index 0fd24df67a..4352b4126f 100644 --- a/system/runc/runc.SlackBuild +++ b/system/runc/runc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for runc # Copyright 2016 Asaf Ohayon <asaf@sysbind.co.il> -# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=runc -VERSION=${VERSION:-1.0.0_rc6} -GITHASH=${GITHASH:-ccb5efd37fb7c86364786e9137e22948751de7ed} +VERSION=${VERSION:-1.0.0_rc92} +GITHASH=${GITHASH:-ff819c7e9184c13b7c2607fe6c30ae19403a7aff} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,16 +59,12 @@ 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 {} \; -mkdir build -mv vendor build/src -ln -sf $TMP/$PRGNAM-$SRCVER build/src/github.com/opencontainers/runc - # Do not try to get git commit hash, we're not inside git repository. sed -i '/^COMMIT/d' Makefile make \ - COMMIT=$GITHASH \ - GOPATH=$TMP/$PRGNAM-$SRCVER/build + BUILDTAGS="seccomp" \ + COMMIT=$GITHASH make install BINDIR=$PKG/usr/bin make install-bash PREFIX=$PKG/usr diff --git a/system/runc/runc.info b/system/runc/runc.info index 7d76abd26f..a43ca11b09 100644 --- a/system/runc/runc.info +++ b/system/runc/runc.info @@ -1,10 +1,10 @@ PRGNAM="runc" -VERSION="1.0.0_rc6" +VERSION="1.0.0_rc92" HOMEPAGE="https://github.com/opencontainers/runc" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/v1.0.0-rc6/runc-1.0.0-rc6.tar.gz" -MD5SUM_x86_64="7ebd2593d8faace9a96241c973b27002" +DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/v1.0.0-rc92/runc-1.0.0-rc92.tar.gz" +MD5SUM_x86_64="7c4dcdf8d481c8d25b88af3f40846a4b" REQUIRES="google-go-lang libseccomp" MAINTAINER="Audrius Kažukauskas" EMAIL="audrius@neutrino.lt" diff --git a/system/runit-services/README b/system/runit-services/README new file mode 100644 index 0000000000..680f20aa40 --- /dev/null +++ b/system/runit-services/README @@ -0,0 +1,15 @@ +Contains various services for using with runit. + +The services are installed in /etc/sv. + +To enable a service, simply symlink it to your service directory, ie, +/service or /var/service. + +The default service directory is assumed to be /service. +If its different, RUNITSVDIR can be set while executing the Slackbuild, ie: + +# RUNITSVDIR=/var/service ./runit-services.Slackbuild + +Service logging is done via runit's svlogd or via syslog as applicable. +tai64nlocal from daemontools is recommended for checking log timestamps. + diff --git a/system/runit-services/doinst.sh b/system/runit-services/doinst.sh new file mode 100644 index 0000000000..55e9fb3f73 --- /dev/null +++ b/system/runit-services/doinst.sh @@ -0,0 +1,25 @@ + +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... +} + +CONF_FILES=$() +while IFS= read -r -d ''; do + CONF_FILES+=( "$REPLY" ) +done < <(find -L etc/sv -type f -name conf.new -print0) + +for conf_file in "${CONF_FILES[@]}"; do + if [ "$conf_file" != '' ]; then + config "${conf_file}" + fi +done + diff --git a/system/runit-services/runit-services.SlackBuild b/system/runit-services/runit-services.SlackBuild new file mode 100644 index 0000000000..b44e068d80 --- /dev/null +++ b/system/runit-services/runit-services.SlackBuild @@ -0,0 +1,74 @@ +#!/bin/sh + +# Slackware build script for runit-services + +# Copyright 2019 Aaditya Bagga <aaditya_gnulinux@zoho.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. + +PRGNAM=runit-services +VERSION=${VERSION:-20191026} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +# Install +make install DESTDIR="$PKG" +if [ "${RUNITSVDIR:-/service}" != '/service' ]; then + make update-config DESTDIR="$PKG" RUNITSVDIR="$RUNITSVDIR" +fi + +# Fix some things +# ntp user does not exist in 14.2 +sed 's/ntp:daemon/daemon:adm/' -i "${PKG}/etc/sv/ntpd/log/conf" +sed 's/ntp:ntp/root:root/' -i "${PKG}/etc/sv/ntpd/conf" + +# Backup config files +find -L "${PKG}/etc/sv" -type f -name conf -exec mv {} {}.new \; + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/runit-services/runit-services.info b/system/runit-services/runit-services.info new file mode 100644 index 0000000000..2707d2feae --- /dev/null +++ b/system/runit-services/runit-services.info @@ -0,0 +1,10 @@ +PRGNAM="runit-services" +VERSION="20191026" +HOMEPAGE="https://github.com/aadityabagga/runit-services" +DOWNLOAD="https://github.com/aadityabagga/runit-services/archive/20191026/runit-services-20191026.tar.gz" +MD5SUM="385c9b879b56aadd61d54d6e9b8dac9f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="runit pause" +MAINTAINER="Aaditya Bagga" +EMAIL="aaditya_gnulinux@zoho.com" diff --git a/system/runit-services/slack-desc b/system/runit-services/slack-desc new file mode 100644 index 0000000000..361d60d4b0 --- /dev/null +++ b/system/runit-services/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 ':'. + + |-----handy-ruler------------------------------------------------------| +runit-services: runit-services (services to use with runit) +runit-services: +runit-services: This package contains runit run scripts for services like +runit-services: syslogd, crond, dbus, dhcpcd, etc. +runit-services: +runit-services: The script collection comprises packages both in Slackware +runit-services: repository and addtional repositories like slackbuilds.org. +runit-services: +runit-services: Service logging is done via runit's svlogd or via syslog +runit-services: as applicable. +runit-services: diff --git a/system/runit/config.tar b/system/runit/config.tar Binary files differindex 342cc163ce..7f7beec36e 100644 --- a/system/runit/config.tar +++ b/system/runit/config.tar diff --git a/system/rush/README b/system/rush/README new file mode 100644 index 0000000000..33e117d04c --- /dev/null +++ b/system/rush/README @@ -0,0 +1,11 @@ +GNU rush is a Restricted User Shell, designed for sites providing limited +remote access to their resources, e.g. scp, sftp, or access to VCS +repositories over ssh. Accounts of the users that are allowed remote +access to the machine are configured to use /sbin/rush as the login +shell. + +Using a flexible configuration file, GNU rush gives administrators +complete control over the commands that users are allowed to run and their +possible arguments. It also makes it possible to run commands in chrooted +environments, limit usage of system resources, and do various other +administrative tasks. diff --git a/system/rush/doinst.sh b/system/rush/doinst.sh new file mode 100644 index 0000000000..8dfecc59bd --- /dev/null +++ b/system/rush/doinst.sh @@ -0,0 +1,14 @@ +#! /bin/sh +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... +} + +config etc/rush.rc.new diff --git a/system/rush/rush.SlackBuild b/system/rush/rush.SlackBuild new file mode 100644 index 0000000000..c6ee742e96 --- /dev/null +++ b/system/rush/rush.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/sh + +# Slackware build script for rush + +# Copyright 2019 Sergey Poznyakoff <gray@gnu.org> +# 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. + +PRGNAM=rush +VERSION=${VERSION:-2.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 . + +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install 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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog NEWS README THANKS \ + $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 +mv etc/rush.rc etc/rush.rc.new + +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/rush/rush.info b/system/rush/rush.info new file mode 100644 index 0000000000..b78a024e9e --- /dev/null +++ b/system/rush/rush.info @@ -0,0 +1,10 @@ +PRGNAM="rush" +VERSION="2.1" +HOMEPAGE="http://www.gnu.org.ua/software/rush" +DOWNLOAD="https://ftp.gnu.org/gnu/rush/rush-2.1.tar.gz" +MD5SUM="a4d1a18bf89f82be210cf40504bc715c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Sergey Poznyakoff" +EMAIL="gray@gnu.org" diff --git a/system/rush/slack-desc b/system/rush/slack-desc new file mode 100644 index 0000000000..c696c1b5e7 --- /dev/null +++ b/system/rush/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------------------------------------------------------| +rush: rush (Restricted User Shell) +rush: +rush: Rush is designed as a login shell for users with limited access to +rush: the system. Using a flexible configuration file, it gives the +rush: administrator complete control over the commands that the user is +rush: allowed to run and over the system resources he is allowed to use. +rush: +rush: Rush home page is http://www.gnu.org.ua/software/rush +rush: +rush: +rush: diff --git a/system/rxvt-unicode/rxvt-unicode.SlackBuild b/system/rxvt-unicode/rxvt-unicode.SlackBuild index ab2f3f1387..5a955c787b 100644 --- a/system/rxvt-unicode/rxvt-unicode.SlackBuild +++ b/system/rxvt-unicode/rxvt-unicode.SlackBuild @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Currently maintained by Glenn Becker (glenn.becker@gmail.com) +# Currently maintained by Jason Graham (jgraha8@gmail.com) # Updates by Kevin Paulus, aka "goarilla" (goarilla@gmail.com) # Previously maintained by LEVAI Daniel, 2010-2014 # Initial SlackBuild written by Dugan Chen (dugan_c@fastmail.fm) diff --git a/system/s3fs-fuse/README b/system/s3fs-fuse/README new file mode 100644 index 0000000000..5f80545687 --- /dev/null +++ b/system/s3fs-fuse/README @@ -0,0 +1,7 @@ +s3fs allows Linux and macOS to mount an S3 bucket via FUSE. + +s3fs preserves the native object format for files, allowing +use of other tools like AWS CLI + +NOTE: awscli is runtime dependency as it needs to be properly +configured to be able to connect to AWS S3 Buckets. diff --git a/system/s3fs-fuse/s3fs-fuse.SlackBuild b/system/s3fs-fuse/s3fs-fuse.SlackBuild new file mode 100644 index 0000000000..8bf183152a --- /dev/null +++ b/system/s3fs-fuse/s3fs-fuse.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh + +# Slackware build script for s3fs-fuse + +# Copyright 2020-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# 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. + +PRGNAM=s3fs-fuse +VERSION=${VERSION:-1.89} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +./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 \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 AUTHORS COPYING ChangeLog INSTALL *.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:-tgz} diff --git a/system/s3fs-fuse/s3fs-fuse.info b/system/s3fs-fuse/s3fs-fuse.info new file mode 100644 index 0000000000..b1075b5180 --- /dev/null +++ b/system/s3fs-fuse/s3fs-fuse.info @@ -0,0 +1,10 @@ +PRGNAM="s3fs-fuse" +VERSION="1.89" +HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse" +DOWNLOAD="https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.89/s3fs-fuse-1.89.tar.gz" +MD5SUM="b1b5e5cb7478e411d4470f1058e7c011" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="awscli" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/system/s3fs-fuse/slack-desc b/system/s3fs-fuse/slack-desc new file mode 100644 index 0000000000..91af0e7c4e --- /dev/null +++ b/system/s3fs-fuse/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------------------------------------------------------| +s3fs-fuse: s3fs-fuse (FUSE-based file system) +s3fs-fuse: +s3fs-fuse: s3fs allows Linux and macOS to mount an S3 bucket via FUSE. +s3fs-fuse: +s3fs-fuse: s3fs preserves the native object format for files, allowing use of +s3fs-fuse: other tools like AWS CLI. +s3fs-fuse: +s3fs-fuse: +s3fs-fuse: Project URL: https://github.com/s3fs-fuse/s3fs-fuse +s3fs-fuse: +s3fs-fuse: diff --git a/system/s6-linux-init/README b/system/s6-linux-init/README new file mode 100644 index 0000000000..21fdbd752a --- /dev/null +++ b/system/s6-linux-init/README @@ -0,0 +1,64 @@ +s6-linux-init is a set of minimalistic tools used to create a s6-based +init system, including a /sbin/init binary, on a Linux kernel. + +The resulting architecture follows the Unix philosophy (one job -> one +tool) as closely as possible, and is fully dedicated to the s6 way of +managing a system: + +- s6-svscan runs as process 1 for the whole machine lifetime. +- Every daemon is supervised. +- No logs are ever lost. +- Policy is entirely left to the user. Typically, any service manager + can be run on top of s6-linux-init. + +Nevertheless, the architecture is fully compliant with various empirical +and historical specifications. For instance, it provides: + +- utmp management compatible with sysvinit, +- runlevel management, with a configurable default, overridable from the + kernel command line, +- sysvinit-like commands to shut the system down, including a shutdown + command that follows the LSB specification. + +Optional dependencies: +nsss (https://skarnet.org/software/nsss/) (not available at SBo) +utmps (https://skarnet.org/software/utmps/) (not available at SBo) + +NOTE: +s6-linux-init has some skeleton files that will be used to build the +complete s6-based init system. These files will be placed under +/etc/s6-linux-init/skel by default. You can change this by passing +SKEL_DIR=/path/to/directory environment variable to the SlackBuild +script like below: + + SKEL_DIR=/path/to/directory ./s6-linux-init.SlackBuild + +The init system created by s6-linux-init will need an early boot tmpfs +in order to work properly. By default, s6-linux-init will assume that +this tmpfs will be mounted on /run. You can change this by passing +TMPFS_DIR=/path/to/directory to the script like below: + + TMPFS_DIR=/path/to/directory ./s6-linux-init.SlackBuild + +Upstream recommends building skarnet.org softwares with static libraries +as most of skarnet.org softwares are small enough that using shared +libraries are generally not worth using. Therefore, by default, shared +libraries are not built and binaries are linked against the static +versions of the skarnet.org libraries. + +If you want to also build the shared libraries, pass BUILD_SHARED=yes +to the script like below: + + BUILD_SHARED=yes ./s6-linux-init.SlackBuild + +Similarly, to avoid building the static libraries, you can pass +BUILD_STATIC=no to the script. For example, to only build the shared +libraries and not the static ones, you can do something like: + + BUILD_SHARED=yes BUILD_STATIC=no ./s6-linux-init.SlackBuild + +If you just want to build and use skarnet.org softwares, building only +the static libraries should be sufficient. + +If you want the binaries to be linked against the shared versions of the +skarnet.org libraries, pass LINK_SHARED=yes to the script. diff --git a/system/s6-linux-init/s6-linux-init.SlackBuild b/system/s6-linux-init/s6-linux-init.SlackBuild new file mode 100644 index 0000000000..12bf4948a3 --- /dev/null +++ b/system/s6-linux-init/s6-linux-init.SlackBuild @@ -0,0 +1,131 @@ +#!/bin/sh + +# Slackware build script for s6-linux-init + +# Copyright 2020 Muhammad Mahendra Subrata Depok, Indonesia +# 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. + +PRGNAM=s6-linux-init +VERSION=${VERSION:-1.0.6.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +# By default, only static libraries are built. If you need to build the shared libraries, just pass +# BUILD_SHARED=yes to this script +BUILD_STATIC=${BUILD_STATIC:-yes} +BUILD_SHARED=${BUILD_SHARED:-no} + +if [ "$BUILD_STATIC" = "no" ]; then + LIBS_CONF="--disable-static" +fi + +if [ "$BUILD_SHARED" = "yes" ]; then + LIBS_CONF="--enable-shared $LIBS_CONF" +fi + +# By default, all binaries are linked against the static versions of the skarnet.org libraries +# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries +# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be +# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script +LINK_SHARED=${LINK_SHARED:-no} + +if [ "$LINK_SHARED" = "yes" ]; then + LIBS_CONF="--disable-allstatic $LIBS_CONF" +fi + +# By default, all the skeleton files from s6-linux-init are placed under /etc/s6-linux-init/skel +# Pass SKEL_DIR=/path/to/directory to this script if you want to place it somewhere else +SKEL_DIR=${SKEL_DIR:-/etc/s6-linux-init/skel} + +# By default, s6-linux-init will assume that the initial tmpfs is mounted on /run +# Pass TMPFS_DIR=/path/to/directory to this script if you want to change it +TMPFS_DIR=${TMPFS_DIR:-/run} + +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" \ +./configure \ + --dynlibdir=/lib${LIBDIRSUFFIX} \ + --bindir=/sbin \ + --libexecdir=/usr/libexec \ + --libdir=/usr/lib${LIBDIRSUFFIX}/s6-linux-init \ + --includedir=/usr/include \ + --skeldir=${SKEL_DIR} \ + --tmpfsdir=${TMPFS_DIR} \ + --with-sysdeps=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/skalibs \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/execline \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/s6 \ + $LIBS_CONF + +make +make strip +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING INSTALL NEWS README doc $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:-tgz} diff --git a/system/s6-linux-init/s6-linux-init.info b/system/s6-linux-init/s6-linux-init.info new file mode 100644 index 0000000000..2efba226a8 --- /dev/null +++ b/system/s6-linux-init/s6-linux-init.info @@ -0,0 +1,10 @@ +PRGNAM="s6-linux-init" +VERSION="1.0.6.2" +HOMEPAGE="https://skarnet.org/software/s6-linux-init/" +DOWNLOAD="https://skarnet.org/software/s6-linux-init/s6-linux-init-1.0.6.2.tar.gz" +MD5SUM="8ac36600894f2624eb3a2e9bb440e857" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="s6" +MAINTAINER="Muhammad Mahendra Subrata" +EMAIL="mumahendras3@gmail.com" diff --git a/system/s6-linux-init/slack-desc b/system/s6-linux-init/slack-desc new file mode 100644 index 0000000000..2df638d9b3 --- /dev/null +++ b/system/s6-linux-init/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------------------------------------------------------| +s6-linux-init: s6-linux-init (a set of small tools to create an s6-based init system) +s6-linux-init: +s6-linux-init: s6-linux-init is a set of minimalistic tools used to create an +s6-linux-init: s6-based init system, including a /sbin/init binary, on a Linux +s6-linux-init: kernel. The resulting architecture follows the Unix philosophy (one +s6-linux-init: job -> one tool) as closely as possible, and is fully dedicated to +s6-linux-init: the s6 way of managing a system while still be fully compliant with +s6-linux-init: various empirical and historical specifications. +s6-linux-init: +s6-linux-init: Homepage: https://skarnet.org/software/s6-linux-init/ +s6-linux-init: diff --git a/system/s6-rc/README b/system/s6-rc/README new file mode 100644 index 0000000000..fcc650f1d7 --- /dev/null +++ b/system/s6-rc/README @@ -0,0 +1,41 @@ +s6-rc is a service manager for s6-based systems, i.e. a suite of +programs that can start and stop services, both long-running daemons and +one-time initialization scripts, in the proper order according to a +dependency tree. It ensures that long-running daemons are supervised by +the s6 infrastructure, and that one-time scripts are also run in a +controlled environment. + +NOTE: +s6-rc has a "live directory" where it puts some internal files that are +needed at runtime, which defaults to /run/s6-rc. This can be changed to +other directory by passing LIVE_DIR=/path/to/directory environment +variable to the SlackBuild script like below: + + LIVE_DIR=/path/to/directory ./s6-rc.SlackBuild + +Make sure /path/to/directory is readable and writable by s6-rc or it +will not work correctly. A good recommendation is to put the live +directory inside a RAM filesystem (e.g. tmpfs). + +Upstream recommends building skarnet.org softwares with static libraries +as most of skarnet.org softwares are small enough that using shared +libraries are generally not worth using. Therefore, by default, shared +libraries are not built and binaries are linked against the static +versions of the skarnet.org libraries. + +If you want to also build the shared libraries, pass BUILD_SHARED=yes to +the SlackBuild script like below: + + BUILD_SHARED=yes ./s6-rc.SlackBuild + +Similarly, to avoid building the static libraries, you can pass +BUILD_STATIC=no to the script. For example, to only build the shared +libraries and not the static ones, you can do something like: + + BUILD_SHARED=yes BUILD_STATIC=no ./s6-rc.SlackBuild + +If you just want to build and use skarnet.org softwares, building only +the static libraries should be sufficient. + +If you want the binaries to be linked against the shared versions of the +skarnet.org libraries, pass LINK_SHARED=yes to the script. diff --git a/system/s6-rc/s6-rc.SlackBuild b/system/s6-rc/s6-rc.SlackBuild new file mode 100644 index 0000000000..bbbd9c5755 --- /dev/null +++ b/system/s6-rc/s6-rc.SlackBuild @@ -0,0 +1,117 @@ +#!/bin/sh + +# Slackware build script for s6-rc + +# Copyright 2020 Muhammad Mahendra Subrata Depok, Indonesia +# 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. + +PRGNAM=s6-rc +VERSION=${VERSION:-0.5.2.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +# By default, only static libraries are built. If you need to build the shared libraries, just pass +# BUILD_SHARED=yes to this script +BUILD_STATIC=${BUILD_STATIC:-yes} +BUILD_SHARED=${BUILD_SHARED:-no} +[ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static" +[ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF" + +# By default, all binaries are linked against the static versions of the skarnet.org libraries +# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries +# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be +# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script +LINK_SHARED=${LINK_SHARED:-no} +[ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF" + +# /run/s6-rc is the default live directory, pass LIVE_DIR=/path/to/directory to this script to change it +# make sure /path/to/directory is readable and writable by s6-rc or it will not work correctly +LIVE_DIR=${LIVE_DIR:-/run/s6-rc} + +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" \ +./configure \ + --dynlibdir=/lib${LIBDIRSUFFIX} \ + --bindir=/bin \ + --libexecdir=/usr/libexec \ + --libdir=/usr/lib${LIBDIRSUFFIX}/s6-rc \ + --includedir=/usr/include \ + --livedir=${LIVE_DIR} \ + --with-sysdeps=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/skalibs \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/execline \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/s6 \ + $LIBS_CONF + +make +make strip +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING INSTALL NEWS README doc examples $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:-tgz} diff --git a/system/s6-rc/s6-rc.info b/system/s6-rc/s6-rc.info new file mode 100644 index 0000000000..7fec7a8ac7 --- /dev/null +++ b/system/s6-rc/s6-rc.info @@ -0,0 +1,10 @@ +PRGNAM="s6-rc" +VERSION="0.5.2.2" +HOMEPAGE="https://skarnet.org/software/s6-rc/" +DOWNLOAD="https://skarnet.org/software/s6-rc/s6-rc-0.5.2.2.tar.gz" +MD5SUM="1e003badbde728137170775806c6776b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="s6" +MAINTAINER="Muhammad Mahendra Subrata" +EMAIL="mumahendras3@gmail.com" diff --git a/system/s6-rc/slack-desc b/system/s6-rc/slack-desc new file mode 100644 index 0000000000..2682b6b1c8 --- /dev/null +++ b/system/s6-rc/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------------------------------------------------------| +s6-rc: s6-rc (service manager for s6-based systems) +s6-rc: +s6-rc: s6-rc is a service manager for s6-based systems, i.e. a suite of +s6-rc: programs that can start and stop services, both long-running daemons +s6-rc: and one-time initialization scripts, in the proper order according +s6-rc: to a dependency tree. It ensures that long-running daemons are +s6-rc: supervised by the s6 infrastructure, and that one-time scripts are +s6-rc: also run in a controlled environment. +s6-rc: +s6-rc: Homepage: https://skarnet.org/software/s6-rc/ +s6-rc: diff --git a/system/s6/README b/system/s6/README new file mode 100644 index 0000000000..2c7ec758e3 --- /dev/null +++ b/system/s6/README @@ -0,0 +1,45 @@ +s6 is a small suite of programs for UNIX, designed to allow process +supervision (a.k.a service supervision), in the line of daemontools +and runit, as well as various operations on processes and daemons. It +is meant to be a toolbox for low-level process and service +administration, providing different sets of independent tools that can +be used within or without the framework, and that can be assembled +together to achieve powerful functionality with a very small amount of +code. + +Examples of things you can do by assembling together several programs +provided by s6 - besides process supervision: + +- syslogd functionality, using much less resources than the traditional + syslogd. +- Reliable service readiness notification, which is the basis for + service dependency management. +- Controlled privileged gain as with sudo, without using any suid + programs. +- The useful parts of socket activation without having to change + application code or link servers against any specific library, and + without having to switch to any specific init system. + +NOTE: +Upstream recommends building skarnet.org softwares with static libraries +as most of skarnet.org softwares are small enough that using shared +libraries are generally not worth using. Therefore, by default, shared +libraries are not built and binaries are linked against the static +versions of the skarnet.org libraries. + +If you want to also build the shared libraries, pass BUILD_SHARED=yes +environment variable to the SlackBuild script like below: + + BUILD_SHARED=yes ./s6.SlackBuild + +Similarly, to avoid building the static libraries, you can pass +BUILD_STATIC=no to the script. For example, to only build the shared +libraries and not the static ones, you can do something like: + + BUILD_SHARED=yes BUILD_STATIC=no ./s6.SlackBuild + +If you just want to build and use skarnet.org softwares, building only +the static libraries should be sufficient. + +If you want the binaries to be linked against the shared versions of the +skarnet.org libraries, pass LINK_SHARED=yes to the script. diff --git a/system/s6/README.Slackware b/system/s6/README.Slackware new file mode 100644 index 0000000000..5842f3888d --- /dev/null +++ b/system/s6/README.Slackware @@ -0,0 +1,21 @@ +Some hints for using this package alongside Slackware's default +init system: + +I added the following to my /etc/inittab: + + # S6 + sv:12345:respawn:/bin/s6-svscanboot + +Then did a 'telinit q' to start it. + +Note that the default s6-svscanboot provided disables polling +(-t0). So after adding a new service to /service you should call: + + /bin/s6-svscanctl -a /service + +where /service is a directory that contains all the services that +s6 will supervise. You can change it to other places such as +/etc/service, /var/service, etc. and edit the provided +/bin/s6-svscanboot script to change the scan directory to the new +service directory (i.e. change /service in the script to the new service +directory). diff --git a/system/s6/s6.SlackBuild b/system/s6/s6.SlackBuild new file mode 100644 index 0000000000..7bf12235fe --- /dev/null +++ b/system/s6/s6.SlackBuild @@ -0,0 +1,126 @@ +#!/bin/sh + +# Slackware build script for s6 + +# Copyright 2019 Sean MacLennan Ottawa, Canada +# Copyright 2020 Muhammad Mahendra Subrata Depok, Indonesia +# 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. + +PRGNAM=s6 +VERSION=${VERSION:-2.10.0.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +# By default, only static libraries are built. If you need to build the shared libraries, just pass +# BUILD_SHARED=yes to this script +BUILD_STATIC=${BUILD_STATIC:-yes} +BUILD_SHARED=${BUILD_SHARED:-no} + +if [ "$BUILD_STATIC" = "no" ]; then + LIBS_CONF="--disable-static" +fi + +if [ "$BUILD_SHARED" = "yes" ]; then + LIBS_CONF="--enable-shared $LIBS_CONF" +fi + +# By default, all binaries are linked against the static versions of the skarnet.org libraries +# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries +# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be +# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script +LINK_SHARED=${LINK_SHARED:-no} + +if [ "$LINK_SHARED" = "yes" ]; then + LIBS_CONF="--disable-allstatic $LIBS_CONF" +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" \ +./configure \ + --dynlibdir=/lib${LIBDIRSUFFIX} \ + --bindir=/bin \ + --libexecdir=/usr/libexec \ + --libdir=/usr/lib${LIBDIRSUFFIX}/s6 \ + --includedir=/usr/include \ + --with-sysdeps=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/skalibs \ + --with-lib=/usr/lib${LIBDIRSUFFIX}/execline \ + $LIBS_CONF + +make +make strip +make install DESTDIR=$PKG + +# Promote s6-svscanboot to /bin for users that want to use s6 +# alongside the system's default init system +install examples/s6-svscanboot $PKG/bin +sed -i 's|command|bin|g' $PKG/bin/s6-svscanboot + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING INSTALL NEWS README doc examples $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:-tgz} diff --git a/system/s6/s6.info b/system/s6/s6.info new file mode 100644 index 0000000000..d17ff68653 --- /dev/null +++ b/system/s6/s6.info @@ -0,0 +1,10 @@ +PRGNAM="s6" +VERSION="2.10.0.3" +HOMEPAGE="https://skarnet.org/software/s6/" +DOWNLOAD="https://skarnet.org/software/s6/s6-2.10.0.3.tar.gz" +MD5SUM="c3956a7c46522e4eea3bf89634d29f88" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="skalibs execline" +MAINTAINER="Muhammad Mahendra Subrata" +EMAIL="mumahendras3@gmail.com" diff --git a/system/s6/slack-desc b/system/s6/slack-desc new file mode 100644 index 0000000000..57896e4006 --- /dev/null +++ b/system/s6/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------------------------------------------------------| +s6: s6 (process/service supervision suite) +s6: +s6: s6 is a small suite of programs for UNIX, designed to allow process +s6: supervision (a.k.a service supervision), in the line of daemontools +s6: and runit, as well as various operations on processes and daemons. It +s6: is meant to be a toolbox for low-level process and service +s6: administration, providing different sets of independent tools that can +s6: be used within or without the framework, and can be assembled together +s6: to achieve powerful functionality with a very small amount of code. +s6: +s6: Homepage: https://skarnet.org/software/s6/ diff --git a/system/saleae-logic/README b/system/saleae-logic/README new file mode 100644 index 0000000000..e681467141 --- /dev/null +++ b/system/saleae-logic/README @@ -0,0 +1,8 @@ +The Saleae Logic Analyzer is a powerful tool capable of capturing +multiple signals from a digital circuit and displaying that information +in the form of timing diagrams. + +Saleae's Logic software can help you decode a variety of digital protocols, +including UART, SPI, I2C, 1-Wire, I2S, CAN, USB, and many more. + +These features can make debugging your embedded designs much simpler. diff --git a/system/saleae-logic/doinst.sh b/system/saleae-logic/doinst.sh new file mode 100644 index 0000000000..dd240ff2ae --- /dev/null +++ b/system/saleae-logic/doinst.sh @@ -0,0 +1,7 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime > /dev/null 2>&1 +fi diff --git a/system/saleae-logic/saleae-logic.SlackBuild b/system/saleae-logic/saleae-logic.SlackBuild new file mode 100644 index 0000000000..28af6cb3a4 --- /dev/null +++ b/system/saleae-logic/saleae-logic.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/sh + +# Slackware build script for saleae logic analyzer + +# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@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. + +PRGNAM=saleae-logic +VERSION=${VERSION:-1.2.18} +SRCNAME="Logic 1.2.18 (64-bit)" +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=x86_64 + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +SLKCFLAGS="-O2 -fPIC" +LIBDIRSUFFIX="64" + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +unzip -o $CWD/"${SRCNAME}".zip +mv "${SRCNAME}" $PRGNAM-$VERSION +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 {} \; + +mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM-$VERSION + +install -D -m755 Logic $PKG/usr/share/$PRGNAM-$VERSION/saleae-logic +ln -sf /usr/share/$PRGNAM-$VERSION/saleae-logic /usr/bin/saleae-logic + +install -D -m755 libAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/libAnalyzer.so +install -D -m755 libQt5XcbQpa.so.5 $PKG/usr/share/$PRGNAM-$VERSION/libQt5XcbQpa.so.5 +install -D -m755 libQt5Widgets.so.5 $PKG/usr/share/$PRGNAM-$VERSION/libQt5Widgets.so.5 +install -D -m755 libQt5Sql.so.5 $PKG/usr/share/$PRGNAM-$VERSION/libQt5Sql.so.5 +install -D -m755 libQt5Network.so.5 $PKG/usr/share/$PRGNAM-$VERSION/libQt5Network.so.5 +install -D -m755 libQt5Gui.so.5 $PKG/usr/share/$PRGNAM-$VERSION/libQt5Gui.so.5 +install -D -m755 libQt5DBus.so.5 $PKG/usr/share/$PRGNAM-$VERSION/libQt5DBus.so.5 +install -D -m755 libQt5Core.so.5 $PKG/usr/share/$PRGNAM-$VERSION/libQt5Core.so.5 +install -D -m755 libicuuc.so.56 $PKG/usr/share/$PRGNAM-$VERSION/libicuuc.so.56 +install -D -m755 libicui18n.so.56 $PKG/usr/share/$PRGNAM-$VERSION/libicui18n.so.56 +install -D -m755 libicudata.so.56 $PKG/usr/share/$PRGNAM-$VERSION/libicudata.so.56 + +install -D -m755 imageformats/libqjpeg.so $PKG/usr/share/$PRGNAM-$VERSION/imageformats/libqjpeg.so +install -D -m755 platforms/libqxcb.so $PKG/usr/share/$PRGNAM-$VERSION/platforms/libqxcb.so +install -D -m755 sqldrivers/libqsqlite.so $PKG/usr/share/$PRGNAM-$VERSION/sqldrivers/libqsqlite.so + +install -D -m755 Analyzers/libUSBAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libUSBAnalyzer.so +install -D -m755 Analyzers/libUnioAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libUnioAnalyzer.so +install -D -m755 Analyzers/libSWDAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libSWDAnalyzer.so +install -D -m755 Analyzers/libSpiAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libSpiAnalyzer.so +install -D -m755 Analyzers/libSMBusAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libSMBusAnalyzer.so +install -D -m755 Analyzers/libSimpleParallelAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libSimpleParallelAnalyzer.so +install -D -m755 Analyzers/libSerialAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libSerialAnalyzer.so +install -D -m755 Analyzers/libPS2KeyboardAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libPS2KeyboardAnalyzer.so +install -D -m755 Analyzers/libOneWireAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libOneWireAnalyzer.so +install -D -m755 Analyzers/libModbusAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libModbusAnalyzer.so +install -D -m755 Analyzers/libMIDIAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libMIDIAnalyzer.so +install -D -m755 Analyzers/libMDIOAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libMDIOAnalyzer.so +install -D -m755 Analyzers/libManchesterAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libManchesterAnalyzer.so +install -D -m755 Analyzers/libLinAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libLinAnalyzer.so +install -D -m755 Analyzers/libJtagAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libJtagAnalyzer.so +install -D -m755 Analyzers/libI2sAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libI2sAnalyzer.so +install -D -m755 Analyzers/libI2CAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libI2CAnalyzer.so +install -D -m755 Analyzers/libHdmiCecAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libHdmiCecAnalyzer.so +install -D -m755 Analyzers/libHdlcAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libHdlcAnalyzer.so +install -D -m755 Analyzers/libHD44780Analyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libHD44780Analyzer.so +install -D -m755 Analyzers/libDmx512Analyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libDmx512Analyzer.so +install -D -m755 Analyzers/libCANAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libCANAnalyzer.so +install -D -m755 Analyzers/libBISSAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libBISSAnalyzer.so +install -D -m755 Analyzers/libAtmelSWIAnalyzer.so $PKG/usr/share/$PRGNAM-$VERSION/Analyzers/libAtmelSWIAnalyzer.so + +install -D -m755 Drivers/99-SaleaeLogic.rules $PKG/etc/udev/rules.d/99-saleaelogic.rules + +find $PKG | xargs 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 +cp -a \ + License.txt linux_readme.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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/saleae-logic/saleae-logic.info b/system/saleae-logic/saleae-logic.info new file mode 100644 index 0000000000..3b72aa5ace --- /dev/null +++ b/system/saleae-logic/saleae-logic.info @@ -0,0 +1,10 @@ +PRGNAM="saleae-logic" +VERSION="1.2.18" +HOMEPAGE="https://www.saleae.com" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="http://downloads.saleae.com/logic/1.2.18/Logic%201.2.18%20(64-bit).zip" +MD5SUM_x86_64="8c586a272a89019540cc365c82ade451" +REQUIRES="" +MAINTAINER="Fernando Lopez Jr." +EMAIL="fernando.lopezjr@gmail.com" diff --git a/system/saleae-logic/slack-desc b/system/saleae-logic/slack-desc new file mode 100644 index 0000000000..9fd9e5f742 --- /dev/null +++ b/system/saleae-logic/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------------------------------------------------------| +saleae-logic: saleae-logic (Logic Analyzer Software) +saleae-logic: +saleae-logic: Saleae Logic Analyzer is a powerful tool capable of capturing multiple +saleae-logic: signals from a digital circuit and displaying that information in the +saleae-logic: form of timing diagrams. Saleae's Logic software can help you decode a +saleae-logic: variety of digital protocols, including UART, SPI, I2C, 1-Wire, I2S, +saleae-logic: CAN, USB, and many more. +saleae-logic: +saleae-logic: These features can make debugging your embedded designs much simpler. +saleae-logic: +saleae-logic: diff --git a/system/samsung-mfp-drivers/README b/system/samsung-mfp-drivers/README index 166dabe38d..f32641e046 100644 --- a/system/samsung-mfp-drivers/README +++ b/system/samsung-mfp-drivers/README @@ -2,8 +2,9 @@ The samsung-mfp-drivers package contains a set of drivers for various Samsung printers and multifunction devices. Given that the maintainer of this build script only possesses -a Samsung ML-2955ND laser printer, results may vary with other -devices (and fixes for those are certainly welcome). +a Samsung ML-2955ND laser printer, and a confirmed test has +been reported otherwise only with an M2825ND, results may vary +with other devices (and fixes for those are certainly welcome). After the package is installed, if you plan to use the scanner function of your device (assuming it's present), you'll need to diff --git a/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild b/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild index da9e2be7a0..7aba46f955 100644 --- a/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild +++ b/system/samsung-mfp-drivers/samsung-mfp-drivers.SlackBuild @@ -23,11 +23,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=samsung-mfp-drivers -VERSION=${VERSION:-1.00.36} -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.00.39} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -TARNAM="uld_v${VERSION}_00.91" +TARNAM="uld_V${VERSION}_01.17" SRCNAM="uld" if [ -z "$ARCH" ]; then diff --git a/system/samsung-mfp-drivers/samsung-mfp-drivers.info b/system/samsung-mfp-drivers/samsung-mfp-drivers.info index 9891c03315..8cf67a618f 100644 --- a/system/samsung-mfp-drivers/samsung-mfp-drivers.info +++ b/system/samsung-mfp-drivers/samsung-mfp-drivers.info @@ -1,8 +1,8 @@ PRGNAM="samsung-mfp-drivers" -VERSION="1.00.36" +VERSION="1.00.39" HOMEPAGE="https://www.samsung.com/us/support/" -DOWNLOAD="http://downloadcenter.samsung.com/content/DR/201510/20151027103428932/uld_v1.00.36_00.91.tar.gz" -MD5SUM="ba1d213aa726efaf20c1b31f4da9fcdc" +DOWNLOAD="https://ftp.hp.com/pub/softlib/software13/printers/SS/SL-C4010ND/uld_V1.00.39_01.17.tar.gz" +MD5SUM="1c5a88bc07785b17e8ecc899149327ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/samsung-mfp-drivers/slack-desc b/system/samsung-mfp-drivers/slack-desc index cddbe5aa5c..af9d8b4889 100644 --- a/system/samsung-mfp-drivers/slack-desc +++ b/system/samsung-mfp-drivers/slack-desc @@ -12,8 +12,8 @@ samsung-mfp-drivers: The samsung-mfp-drivers package contains a set of drivers f samsung-mfp-drivers: various Samsung printers and multifunction devices. samsung-mfp-drivers: samsung-mfp-drivers: Given that the maintainer of this build script only possesses -samsung-mfp-drivers: a Samsung ML-2955ND laser printer, results may vary with other -samsung-mfp-drivers: devices (and fixes for those are certainly welcome). +samsung-mfp-drivers: a Samsung ML-2955ND laser printer, and a confirmed test has +samsung-mfp-drivers: been reported otherwise only with an M2825ND, results may vary +samsung-mfp-drivers: with other devices (and fixes for those are certainly welcome). samsung-mfp-drivers: samsung-mfp-drivers: Homepage: https://www.samsung.com/us/support/ -samsung-mfp-drivers: diff --git a/system/sandbox/sandbox.SlackBuild b/system/sandbox/sandbox.SlackBuild index 6f18bc38c2..e1c592ca8f 100644 --- a/system/sandbox/sandbox.SlackBuild +++ b/system/sandbox/sandbox.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sandbox -# Copyright 2018-2019 Hunter Sezen California, USA +# Copyright 2018-2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sandbox -VERSION=${VERSION:-2.15} +VERSION=${VERSION:-2.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/sandbox/sandbox.info b/system/sandbox/sandbox.info index 58e5fd1422..7ea79a2f57 100644 --- a/system/sandbox/sandbox.info +++ b/system/sandbox/sandbox.info @@ -1,10 +1,10 @@ PRGNAM="sandbox" -VERSION="2.15" +VERSION="2.20" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox" -DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.15.tar.bz2" -MD5SUM="c6c8cddea42cd601a3511b6ebfc74239" +DOWNLOAD="https://gitweb.gentoo.org/proj/sandbox.git/snapshot/sandbox-2.20.tar.bz2" +MD5SUM="9f0fc6baae17190fdd78cda967936e80" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/sandy/sandy.info b/system/sandy/sandy.info index c77f0e5943..629649b220 100644 --- a/system/sandy/sandy.info +++ b/system/sandy/sandy.info @@ -1,7 +1,7 @@ PRGNAM="sandy" VERSION="0.4_20140727" HOMEPAGE="https://web.archive.org/web/20180213024506/https://tools.suckless.org/sandy" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sandy-0.4_20140727.tar.gz" +DOWNLOAD="https://slackware.uk/~urchlay/src/sandy-0.4_20140727.tar.gz" MD5SUM="b046a5271584fea2fb1e881dfc86c899" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/sanlock/README b/system/sanlock/README new file mode 100644 index 0000000000..fe32fa73d1 --- /dev/null +++ b/system/sanlock/README @@ -0,0 +1,13 @@ +The sanlock daemon manages leases for applications on hosts using shared +storage. + +You must have a sanlock user to run this script: + + # groupadd -g 363 sanlock + # useradd -u 363 -d /var/run/sanlock -s /bin/false -g sanlock sanlock + +The disk group is also needed: + + # usermod -a -G disk sanlock + +More information post-install can be found in README.SLACKWARE diff --git a/system/sanlock/README.SLACKWARE b/system/sanlock/README.SLACKWARE new file mode 100644 index 0000000000..aa2f6ea006 --- /dev/null +++ b/system/sanlock/README.SLACKWARE @@ -0,0 +1,26 @@ +Starting the daemon on boot +--------------------------- + +You may wish to add these lines to /etc/rc.d/rc.local to start the service: + + if [ -x /etc/rc.d/rc.wdmd ]; then + /etc/rc.d/rc.wdmd start + fi + + if [ -x /etc/rc.d/rc.sanlock ]; then + /etc/rc.d/rc.sanlock start + fi + +You may also add these lines to /etc/rc.d/rc.local_shutdown: + + if [ -x /etc/rc.d/rc.sanlock ]; then + /etc/rc.d/rc.sanlock stop + fi + + if [ -x /etc/rc.d/rc.wdmd ]; then + /etc/rc.d/rc.wdmd stop + fi + +Remember to give executable permission to /etc/rc.d/rc.local_shutdown: + + chmod 0755 /etc/rc.d/rc.local_shutdown diff --git a/system/sanlock/doinst.sh b/system/sanlock/doinst.sh new file mode 100644 index 0000000000..a4c200227e --- /dev/null +++ b/system/sanlock/doinst.sh @@ -0,0 +1,29 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.sanlock.new +preserve_perms etc/rc.d/rc.wdmd.new +config etc/logrotate.d/sanlock.new +config etc/sanlock/sanlock.conf.new +config etc/default/wdmd.new diff --git a/system/sanlock/sanlock.SlackBuild b/system/sanlock/sanlock.SlackBuild new file mode 100644 index 0000000000..522d5552e6 --- /dev/null +++ b/system/sanlock/sanlock.SlackBuild @@ -0,0 +1,131 @@ +#!/bin/sh + +# Slackware build script for sanlock + +# Copyright 2019 Mario Preksavec, Zagreb, Croatia +# 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. + +PRGNAM=sanlock +VERSION=${VERSION:-3.7.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +# Bail if user or group isn't valid on your system +if ! grep ^$PRGNAM: /etc/passwd 2>&1 > /dev/null; then + cat << EOF + + You must have a $PRGNAM user to run this script + + # groupadd -g 363 $PRGNAM + # useradd -u 363 -d /var/run/$PRGNAM -s /bin/false -g $PRGNAM $PRGNAM + + The disk group is also needed + + # usermod -a -G disk $PRGNAM + +EOF + exit +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf {,$PRGNAM-}$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION || cd $PRGNAM-$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 {} \; + +# We don't have stack clash protection support yet +sed -i 's/-fstack-clash-protection//' */Makefile + +CFLAGS="$SLKCFLAGS" make -C wdmd +CFLAGS="$SLKCFLAGS" make -C src +CFLAGS="$SLKCFLAGS" make -C python + +make -C src install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG +make -C wdmd install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG +make -C python install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG + +install -D -m0755 -oroot -groot init.d/sanlock $PKG/etc/rc.d/rc.sanlock.new +install -D -m0755 -oroot -groot init.d/wdmd $PKG/etc/rc.d/rc.wdmd.new +sed -e "s|/etc/sysconfig|/etc/default|g" \ + -i $PKG/etc/rc.d/rc.sanlock.new \ + -i $PKG/etc/rc.d/rc.wdmd.new + +install -D -m0644 -oroot -groot src/logrotate.sanlock $PKG/etc/logrotate.d/sanlock.new +install -D -m0644 -oroot -groot src/sanlock.conf $PKG/etc/sanlock/sanlock.conf.new +install -D -m0644 -oroot -groot init.d/wdmd.sysconfig $PKG/etc/default/wdmd.new + +mkdir -p $PKG/{etc/wdmd.d,var/run/sanlock} + +mv $PKG/usr/share/man $PKG/usr +rmdir $PKG/usr/share + +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.rst $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE + +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:-tgz} diff --git a/system/sanlock/sanlock.info b/system/sanlock/sanlock.info new file mode 100644 index 0000000000..864a393d5f --- /dev/null +++ b/system/sanlock/sanlock.info @@ -0,0 +1,10 @@ +PRGNAM="sanlock" +VERSION="3.7.1" +HOMEPAGE="https://pagure.io/sanlock" +DOWNLOAD="https://pagure.io/sanlock/archive/sanlock-3.7.1/sanlock-sanlock-3.7.1.tar.gz" +MD5SUM="d78996fcdc6965c238a7a33ba1a2d10e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/system/sanlock/slack-desc b/system/sanlock/slack-desc new file mode 100644 index 0000000000..cab0bffee3 --- /dev/null +++ b/system/sanlock/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------------------------------------------------------| +sanlock: sanlock (shared storage daemon) +sanlock: +sanlock: The sanlock daemon manages leases for applications on hosts using +sanlock: shared storage. +sanlock: +sanlock: Homepage: https://pagure.io/sanlock +sanlock: +sanlock: +sanlock: +sanlock: +sanlock: diff --git a/system/sargon/README b/system/sargon/README new file mode 100644 index 0000000000..1b3fbb636b --- /dev/null +++ b/system/sargon/README @@ -0,0 +1,8 @@ +User privilege system for docker that controls container and volume +creation. It enables the administrator to exercise control over the +containers that users are allowed to create and decide whether to permit +creation of privileged containers, what parts of the host file system +can be visible to containers via bind or volume mechanism, what memory +limits to apply, etc. + +User privileges are kept in LDAP. diff --git a/system/sargon/doinst.sh b/system/sargon/doinst.sh new file mode 100644 index 0000000000..8c4165ff18 --- /dev/null +++ b/system/sargon/doinst.sh @@ -0,0 +1,14 @@ +#! /bin/sh +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... +} + +config etc/rc.d/rc.sargon.new diff --git a/system/sargon/rc.sargon b/system/sargon/rc.sargon new file mode 100644 index 0000000000..a73ccef363 --- /dev/null +++ b/system/sargon/rc.sargon @@ -0,0 +1,50 @@ +#! /bin/sh + +CMD=sargon +OPTIONS= + +test -r /etc/default/sargon && . /etc/default/sargon + +if [ "$SARGON_TRACE" = "yes" ]; then + OPTIONS="$OPTIONS${OPTIONS:+ }-trace" +fi + +if [ "$SARGON_DEBUG" = "yes" ]; then + OPTIONS="$OPTIONS${OPTIONS:+ }-debug" +fi + +sargon_start() { + if [ -n "$(/sbin/pidof $CMD)" ]; then + echo >&2 "$0: $CMD is already running" + else + /usr/bin/$CMD $OPTIONS | /usr/bin/logger -t $CMD -p daemon.info & + fi +} + +sargon_stop() { + /usr/bin/pkill $CMD +} + +sargon_status() { + pid=$(/sbin/pidof $CMD) + if [ -n "$pid" ]; then + echo "$CMD is running (pid $pid)" + else + echo "$CMD is not running" + fi +} + +case $1 in + start) + sargon_start + ;; + stop) + sargon_stop + ;; + restart) + sargon_stop + sargon_start + ;; + status) + sargon_status +esac diff --git a/system/sargon/sargon.SlackBuild b/system/sargon/sargon.SlackBuild new file mode 100644 index 0000000000..f5a648a05e --- /dev/null +++ b/system/sargon/sargon.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Slackware build script for sargon + +# Copyright 2019 Sergey Poznyakoff <gray@gnu.org> +# 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. + +PRGNAM=sargon +VERSION=${VERSION:-1.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +# Make sure go binary is in PATH +if [ -x /etc/profile.d/go.sh ]; then + . /etc/profile.d/go.sh +fi + +# Build the project +go mod init sargon +go build + +# Create installation filesystem +mkdir -p $PKG/usr/bin $PKG/etc/rc.d $PKG/etc/default $PKG/etc/docker $PKG/install + +# Install the binary +cp sargon $PKG/usr/bin +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 + +# Install startup script and configuration file. +cp $CWD/rc.sargon $PKG/etc/rc.d/rc.sargon.new +chmod 644 $PKG/etc/rc.d/rc.sargon.new +cp $CWD/sargon.json $PKG/etc/docker +cp $CWD/sargon.default $PKG/etc/default/sargon + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README.md sargon.schema \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cp $CWD/doinst.sh $PKG/install/doinst.sh +cp $CWD/slack-desc $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/sargon/sargon.default b/system/sargon/sargon.default new file mode 100644 index 0000000000..27d5403bc3 --- /dev/null +++ b/system/sargon/sargon.default @@ -0,0 +1,10 @@ +# Startup defaults for sargon docker plugin. +# +# This file is a valid shell script defining variables that control +# the startup of the sargon daemon by /etc/rc.d/rc.sargon. + +# Change to "yes" in order to enable tracing of the decisions taken by sargon. +SARGON_TRACE=no + +# Change to "yes" to enable verbose debugging. +SARGON_DEBUG=no diff --git a/system/sargon/sargon.info b/system/sargon/sargon.info new file mode 100644 index 0000000000..9532b7a0a6 --- /dev/null +++ b/system/sargon/sargon.info @@ -0,0 +1,10 @@ +PRGNAM="sargon" +VERSION="1.0" +HOMEPAGE="https://github.com/graygnuorg/sargon" +DOWNLOAD="https://github.com/graygnuorg/sargon/archive/v1.0/sargon-1.0.tar.gz" +MD5SUM="158b725c02b4bdf377d2b08790f2a770" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="google-go-lang" +MAINTAINER="Sergey Poznyakoff" +EMAIL="gray@gnu.org" diff --git a/system/sargon/sargon.json b/system/sargon/sargon.json new file mode 100644 index 0000000000..e73b0d7b99 --- /dev/null +++ b/system/sargon/sargon.json @@ -0,0 +1,2 @@ +{ "pidfile":"/var/run/sargon.pid" } + diff --git a/system/sargon/slack-desc b/system/sargon/slack-desc new file mode 100644 index 0000000000..5ad58ec29d --- /dev/null +++ b/system/sargon/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------------------------------------------------------| +sargon: sargon (User privilege system for docker) +sargon: +sargon: Docker authorization plugin that controls container and volume +sargon: creation. It enables the administrator to exercise control over the +sargon: containers that users are allowed to create and decide whether to +sargon: permit creation of privileged containers, what parts of the host file +sargon: system can be visible to containers via bind or volume mechanism, +sargon: what memory limits to apply, etc. +sargon: +sargon: Homepage: https://github.com/graygnuorg/sargon +sargon: diff --git a/system/sbotools/sbotools.SlackBuild b/system/sbotools/sbotools.SlackBuild index 63102f7331..e09fd42338 100644 --- a/system/sbotools/sbotools.SlackBuild +++ b/system/sbotools/sbotools.SlackBuild @@ -5,7 +5,7 @@ # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING> PRGNAM=sbotools -VERSION=${VERSION:-2.5} +VERSION=${VERSION:-2.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/sbotools/sbotools.info b/system/sbotools/sbotools.info index cdfa4697e4..5b21404112 100644 --- a/system/sbotools/sbotools.info +++ b/system/sbotools/sbotools.info @@ -1,8 +1,8 @@ PRGNAM="sbotools" -VERSION="2.5" +VERSION="2.7" HOMEPAGE="https://pink-mist.github.io/sbotools/" -DOWNLOAD="https://pink-mist.github.io/sbotools/downloads/sbotools-2.5.tar.gz" -MD5SUM="fad33686af13dcf3f2b295c9fb00c46e" +DOWNLOAD="https://pink-mist.github.io/sbotools/downloads/sbotools-2.7.tar.gz" +MD5SUM="ddf4b174fa29839564d7e784ff142581" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/sboui/README b/system/sboui/README index dafb1bdd8f..bd84518b26 100644 --- a/system/sboui/README +++ b/system/sboui/README @@ -6,13 +6,21 @@ sbotools, or custom package managers. Its main features include forward and inverse dependency resolution, blacklisting, storing build options for scripts, a menu bar, full mouse and keyboard support, and more. +Optional dependencies (see build options for more information): + +python-requests (for system tray notifier) +psutil (for system tray notifier) +gksu, ktsuss (instead of kdesu to launch from the desktop) +ninja (to build with ninja instead of make) + Build options: INSTALL_SYSTRAY_NOTIFIER=yes|no (default no): install a cronjob to sync the local repository hourly and display a system tray notification when SBo package updates are available. To use the system tray notifier, add sboui-update-notifier as a startup application for your desktop environment or - window manager. + window manager. If this is enabled, python-requests and psutil become + dependencies. GRAPHICAL_SU=kdesu|gksu|ktsuss (default kdesu): change the graphical su command for launching sboui from the .desktop file and system tray notifier. gksu or diff --git a/system/sboui/sboui.SlackBuild b/system/sboui/sboui.SlackBuild index dc6d83c204..28076d324b 100644 --- a/system/sboui/sboui.SlackBuild +++ b/system/sboui/sboui.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sboui -# Copyright 2018 | Daniel Prosser | Lexington Park, MD +# Copyright 2019 | Daniel Prosser | Lexington Park, MD # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sboui -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/sboui/sboui.info b/system/sboui/sboui.info index 1b90df3644..c5abbd71c2 100644 --- a/system/sboui/sboui.info +++ b/system/sboui/sboui.info @@ -1,10 +1,10 @@ PRGNAM="sboui" -VERSION="2.0.1" +VERSION="2.1" HOMEPAGE="https://github.com/montagdude/sboui" -DOWNLOAD="https://github.com/montagdude/sboui/archive/2.0.1/sboui-2.0.1.tar.gz" -MD5SUM="2a0170abe92d3505f116fae9b2029543" +DOWNLOAD="https://github.com/montagdude/sboui/archive/2.1/sboui-2.1.tar.gz" +MD5SUM="c4f7c1c757efc1d7523cace75c1c1078" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libconfig python-requests" +REQUIRES="libconfig" MAINTAINER="Daniel Prosser" EMAIL="dpross1100@msn.com" diff --git a/system/scangearmp2/README b/system/scangearmp2/README new file mode 100644 index 0000000000..f4d82f23af --- /dev/null +++ b/system/scangearmp2/README @@ -0,0 +1,9 @@ +scangearmp2 (scanning front-end GUI for Canon Multifunction Inkjet Printer) + +scangearmp2 is a scanning program for Canon Multifunction Inkjet Printer. +You can scan image from Canon Multifunction Inkjet Printer, and select the +scanning parameters, for example, scan mode, size, etc. + +Support MG7500 series, MG6600 series, MG5600 series, MG2900 series, +MB2000 series, MB2300 series, MB5000 series, MB5300 series, E460 series, +MX490 series, E480 series. diff --git a/system/scangearmp2/scangearmp2.SlackBuild b/system/scangearmp2/scangearmp2.SlackBuild new file mode 100644 index 0000000000..162fcbc20a --- /dev/null +++ b/system/scangearmp2/scangearmp2.SlackBuild @@ -0,0 +1,117 @@ +#!/bin/sh + +# Slackware build script for scangearmp2 + +# Copyright 2019 Kenneth Chan, Hong Kong +# 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. + +PRGNAM=scangearmp2 +VERSION=${VERSION:-3.90.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=$PRGNAM-source +SRCVERSION=3.90-1 + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" + LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin32" + BITS="i386" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" + LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin32" + BITS="i386" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + LDFLAGS="-L$TMP/$SRCNAM-${SRCVERSION}/com/libs_bin64" + BITS="amd64" +else + echo "Package for $(uname -m) architecture is not available." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$SRCVERSION + +tar xvzf $CWD/$SRCNAM-${SRCVERSION}.tar.gz +cd $SRCNAM-$SRCVERSION +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 {} \; +find -L . \ + \( -type f \! -name autogen.sh \) \ + -exec chmod 644 {} \; + +cd $PRGNAM + +./autogen.sh --prefix=/usr LDFLAGS="$LDFLAGS" +make +make install-strip DESTDIR=$PKG + +# Follow debian/rules +if [ "$ARCH" = "x86_64" ]; then + mv $PKG/usr/lib $PKG/usr/lib64 + install -s -m 755 ../com/libs_bin64/*.so $PKG/usr/lib64/ + install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib64/bjlib/ +elif [ "$ARCH" = "i586" ]; then + install -s -m 755 ../com/libs_bin32/*.so $PKG/usr/lib/ + install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib/bjlib/ +elif [ "$ARCH" = "i686" ]; then + install -s -m 755 ../com/libs_bin32/*.so $PKG/usr/lib/ + install -m 666 ../com/ini/canon_mfp2_net.ini $PKG/usr/lib/bjlib/ +fi + +mkdir -p $PKG/lib/udev/rules.d +install -m 644 etc/80-canon_mfp2.rules $PKG/lib/udev/rules.d + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README ../doc/* \ + $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:-tgz} diff --git a/system/scangearmp2/scangearmp2.info b/system/scangearmp2/scangearmp2.info new file mode 100644 index 0000000000..977724b7ed --- /dev/null +++ b/system/scangearmp2/scangearmp2.info @@ -0,0 +1,10 @@ +PRGNAM="scangearmp2" +VERSION="3.90.1" +HOMEPAGE="https://asia.canon/en/support/0101048701/1" +DOWNLOAD="http://gdlp01.c-wss.com/gds/7/0100010487/01/scangearmp2-source-3.90-1.tar.gz" +MD5SUM="6c22dd63e8ed0e8badd5f012f773497d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Kenneth Chan" +EMAIL="kenneth.t.chan@gmail.com" diff --git a/system/scangearmp2/slack-desc b/system/scangearmp2/slack-desc new file mode 100644 index 0000000000..714f021816 --- /dev/null +++ b/system/scangearmp2/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------------------------------------------------------| +scangearmp2: scangearmp2 (Front-end GUI for Canon Multifunction Inkjet Printer) +scangearmp2: +scangearmp2: A scanning program for Canon Multifunction Inkjet Printer. +scangearmp2: You can scan image from Canon Multifunction Inkjet Printer, and +scangearmp2: select the scanning parameters, for example, scan mode, size, etc. +scangearmp2: +scangearmp2: Support MG7500 series, MG6600 series, MG5600 series, MG2900 series, +scangearmp2: MB2000 series, MB2300 series, MB5000 series, MB5300 series, E460 +scangearmp2: series, MX490 series, E480 series. +scangearmp2: +scangearmp2: Homepage: https://asia.canon/en/support/0101048701/1 diff --git a/system/scdoc/README b/system/scdoc/README new file mode 100644 index 0000000000..3c4b288e25 --- /dev/null +++ b/system/scdoc/README @@ -0,0 +1,3 @@ +scdoc is a simple man page generator for POSIX systems written in C99. + +It requires the input files to be UTF-8 encoded. diff --git a/system/scdoc/fix-makefile.patch.gz b/system/scdoc/fix-makefile.patch.gz Binary files differnew file mode 100644 index 0000000000..a9918c14cc --- /dev/null +++ b/system/scdoc/fix-makefile.patch.gz diff --git a/system/scdoc/scdoc.SlackBuild b/system/scdoc/scdoc.SlackBuild new file mode 100644 index 0000000000..fb7418e537 --- /dev/null +++ b/system/scdoc/scdoc.SlackBuild @@ -0,0 +1,97 @@ +#!/bin/sh + +# Slackware build script for scdoc + +# Copyright 2021 Manuel Argüelles Panama City, Panama +# 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. + +PRGNAM=scdoc +VERSION=${VERSION:-1.11.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 || tar xvf $CWD/$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 {} \; + +zcat $CWD/fix-makefile.patch.gz | patch -p1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +PREFIX=/usr \ +make +make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man + +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 \ + COPYING \ + 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/scdoc/scdoc.info b/system/scdoc/scdoc.info new file mode 100644 index 0000000000..fd8e496116 --- /dev/null +++ b/system/scdoc/scdoc.info @@ -0,0 +1,10 @@ +PRGNAM="scdoc" +VERSION="1.11.1" +HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc" +DOWNLOAD="https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz" +MD5SUM="ce8369cb5d2406786f61cf805ceae66f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Manuel Argüelles" +EMAIL="manuel.arguelles@gmail.com" diff --git a/system/scdoc/slack-desc b/system/scdoc/slack-desc new file mode 100644 index 0000000000..1f56aa5e39 --- /dev/null +++ b/system/scdoc/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------------------------------------------------------| +scdoc: scdoc (small man page generator) +scdoc: +scdoc: Simple man page generator for POSIX systems written in C99. +scdoc: +scdoc: +scdoc: +scdoc: +scdoc: +scdoc: +scdoc: +scdoc: diff --git a/system/scrypt/README b/system/scrypt/README index 90be1eb4e0..2dda616f34 100644 --- a/system/scrypt/README +++ b/system/scrypt/README @@ -1,11 +1,16 @@ -The scrypt key derivation function was originally developed for use in the -Tarsnap online backup system and is designed to be far more secure against -hardware brute-force attacks than alternative functions such as PBKDF2 or -bcrypt. +The scrypt key derivation function was originally developed for use in +the Tarsnap online backup system and is designed to be far more secure +against hardware brute-force attacks than alternative functions such as +PBKDF2 or bcrypt. -This simple password-based encryption utility is available as a demonstration -of the scrypt key derivation function. On modern hardware and with default -parameters, the cost of cracking the password on a file encrypted by scrypt -enc is approximately 100 billion times more than the cost of cracking the same -password on a file encrypted by openssl enc; this means that a five-character -password using scrypt is stronger than a ten-character password using openssl. +A simple password-based encryption utility is available as a +demonstration of the scrypt key derivation function. On modern hardware +and with default parameters, the cost of cracking the password on a file +encrypted by scrypt enc is approximately 100 billion times more than the +cost of cracking the same password on a file encrypted by openssl enc; +this means that a five-character password using scrypt is stronger than +a ten-character password using openssl. + +In addition to the scrypt command-line utility, a development library +libscrypt-kdf can be built and installed by setting the LIB environment +variable: LIB=yes ./scrypt.SlackBuild diff --git a/system/scrypt/scrypt.SlackBuild b/system/scrypt/scrypt.SlackBuild index a9c388d707..3f1f51f3c2 100644 --- a/system/scrypt/scrypt.SlackBuild +++ b/system/scrypt/scrypt.SlackBuild @@ -1,36 +1,34 @@ #!/bin/sh +# Slackware build script for scrypt + # Copyright (c) 2011-2013 LEVAI Daniel +# Copyright 2020, Alexander Verbovetsky, Moscow, Russia # All rights reserved. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# * Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright notice -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED ''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 -# COPYRIGHT HOLDER 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. +# 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. PRGNAM=scrypt -VERSION=${VERSION:-1.2.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i686) ARCH=i686 ;; i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; @@ -58,6 +56,9 @@ fi set -e +libscrypt_kdf="" +[ "${LIB:-no}" != "no" ] && libscrypt_kdf="--enable-libscrypt-kdf" + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -67,15 +68,18 @@ 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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - --docdir=/usr/doc \ + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc \ + --enable-static=no \ + $libscrypt_kdf \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG @@ -87,7 +91,7 @@ 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 $CWD/README FORMAT $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a FORMAT tests $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/scrypt/scrypt.info b/system/scrypt/scrypt.info index 9bbf775555..5f88fd121f 100644 --- a/system/scrypt/scrypt.info +++ b/system/scrypt/scrypt.info @@ -1,10 +1,10 @@ PRGNAM="scrypt" -VERSION="1.2.1" +VERSION="1.3.1" HOMEPAGE="http://www.tarsnap.com/scrypt.html" -DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.2.1.tgz" -MD5SUM="b33d22cd35032743047d30f1f5a49514" +DOWNLOAD="http://www.tarsnap.com/scrypt/scrypt-1.3.1.tgz" +MD5SUM="1f5aded31478319357c2c611eb5c4f71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LEVAI Daniel" -EMAIL="leva@ecentrum.hu" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/system/scrypt/slack-desc b/system/scrypt/slack-desc index 379ee0fc64..2141b59125 100644 --- a/system/scrypt/slack-desc +++ b/system/scrypt/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| scrypt: scrypt (scrypt encryption utility) scrypt: -scrypt: A simple password-based encryption utility that is a demonstration of -scrypt: the scrypt key derivation function. -scrypt: -scrypt: -scrypt: Homepage: http://www.tarsnap.com/scrypt.html -scrypt: -scrypt: -scrypt: +scrypt: The scrypt key derivation function was originally developed for use in +scrypt: the Tarsnap online backup system and is designed to be far more secure +scrypt: against hardware brute-force attacks than alternative functions such +scrypt: as PBKDF2 or bcrypt. A simple password-based encryption utility and an +scrypt: optional library are available as a demonstration of the scrypt key +scrypt: derivation function. scrypt: +scrypt: Homepage: https://www.tarsnap.com/scrypt.html +scrypt: Development: https://github.com/Tarsnap/scrypt diff --git a/system/sddm/sddm.SlackBuild b/system/sddm/sddm.SlackBuild index 1f1e73f547..a977bd5c30 100644 --- a/system/sddm/sddm.SlackBuild +++ b/system/sddm/sddm.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for sddm -# Copyright 2017 David Woodfall <dave@dawoodfall.net> +# Copyright 2017 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sddm -VERSION=${VERSION:-0.18.0} +VERSION=${VERSION:-0.18.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,12 +53,15 @@ else LIBDIRSUFFIX="" fi -if grep sddm /etc/passwd | grep "/var/empty"; then - printf "%s\n%s\n%s\n%s\n" \ - "It appears that SDDM's home is set to /var/empty in /etc/passwd." \ - "This needs to be changed to /var/lib/sddm." \ - "To do this, run: usermod -d /var/lib/sddm sddm" \ - "This installation will now terminate." +SDDM_HOME="/var/lib/sddm" +PW_HOME="$( getent passwd sddm | cut -d: -f6 )" +if [ "$PW_HOME" != "$SDDM_HOME" ]; then + cat <<EOF +It appears that the sddm user's home is set to $PW_HOME in /etc/passwd. +This needs to be changed to $SDDM_HOME +To do this, run: usermod -d $SDDM_HOME sddm +This installation will now terminate. +EOF exit 1 fi @@ -68,7 +71,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -108,8 +111,8 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -mkdir -p $PKG/var/lib/sddm -chown sddm:sddm $PKG/var/lib/sddm +mkdir -p $PKG/$SDDM_HOME +chown sddm:sddm $PKG/$SDDM_HOME mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/sddm/sddm.info b/system/sddm/sddm.info index 81cb4edc2f..6b38805b07 100644 --- a/system/sddm/sddm.info +++ b/system/sddm/sddm.info @@ -1,10 +1,10 @@ PRGNAM="sddm" -VERSION="0.18.0" +VERSION="0.18.1" HOMEPAGE="https://github.com/sddm/sddm" -DOWNLOAD="https://github.com/sddm/sddm/releases/download/v0.18.0/sddm-0.18.0.tar.gz" -MD5SUM="f8656aa61020c727b6925225fa681996" +DOWNLOAD="https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz" +MD5SUM="c1ca638a3faf76c526df3049cbc9668a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="extra-cmake-modules qt5" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/system/sdl-jstest/sdl-jstest.info b/system/sdl-jstest/sdl-jstest.info index c70abad9ff..cf78c56ffc 100644 --- a/system/sdl-jstest/sdl-jstest.info +++ b/system/sdl-jstest/sdl-jstest.info @@ -1,7 +1,7 @@ PRGNAM="sdl-jstest" VERSION="20180715_aafbdb1" HOMEPAGE="https://gitlab.com/sdl-jstest/sdl-jstest" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sdl-jstest-20180715_aafbdb1.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/sdl-jstest-20180715_aafbdb1.tar.xz" MD5SUM="68e335dec338030aedfdb07100bc18d8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/secure-delete/README b/system/secure-delete/README index aae5cfa3b6..a9100b9943 100644 --- a/system/secure-delete/README +++ b/system/secure-delete/README @@ -2,7 +2,8 @@ Tools to wipe files, free disk space, swap and memory. Gutmann method based tools for securely wiping data. -From files (srm), free disk space (sfill), swap (sswap) and memory (sdmem). +From files (srm), free disk space (sfill), swap (sswap) and memory +(sdmem). -This package maybe conflict with "srm" program and "srm" manpage present in -"srm" package also available on SlackBuilds. +This package maybe conflict with "srm" program and "srm" manpage present +in "srm" package also available on SlackBuilds. diff --git a/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch b/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch deleted file mode 100644 index a685b81bc6..0000000000 --- a/system/secure-delete/secure-delete-3.1-do-not-use-the-kernel-module.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- Makefile.old 2006-03-08 14:59:53.000000000 -0500 -+++ Makefile 2006-03-08 15:00:23.000000000 -0500 -@@ -7,7 +7,7 @@ - OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2 - #LD_MOD=-r - --all: sdel-lib.o srm sfill sswap smem sdel-mod.o -+all: sdel-lib.o srm sfill sswap smem - @echo - @echo "A Puritan is someone who is deathly afraid that someone, somewhere, is" - @echo "having fun." -@@ -15,9 +15,6 @@ - @echo "I hope YOU have fun!" - @echo - --sdel-mod.o: sdel-mod.c -- $(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c -- - sdel-lib.o: sdel-lib.c - $(CC) ${OPT} -c sdel-lib.c - -@@ -35,7 +32,7 @@ - -strip smem - - clean: -- rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~ -+ rm -f sfill srm sswap smem sdel sdel-lib.o - - install: all - mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null -@@ -47,8 +44,8 @@ - chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1 - mkdir -p -m 755 ${DOC_DIR} 2> /dev/null - cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR} -- -test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char --# @-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete" -+ -test -e -+# @-test '!' -e - @echo - @echo "If men could get pregnant, abortion would be a sacrament." - @echo diff --git a/system/secure-delete/secure-delete-3.1-makefile.patch b/system/secure-delete/secure-delete-3.1-makefile.patch deleted file mode 100644 index b9aad3d04a..0000000000 --- a/system/secure-delete/secure-delete-3.1-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile 2010-08-10 10:44:37.000000000 -0400 -+++ Makefile.secure 2010-08-10 10:44:43.000000000 -0400 -@@ -18,14 +19,14 @@ - sdel-lib.o: sdel-lib.c - $(CC) ${OPT} -c sdel-lib.c - --srm: srm.c -- $(CC) ${OPT} -o srm srm.c sdel-lib.o --sfill: sfill.c -- $(CC) ${OPT} -o sfill sfill.c sdel-lib.o --sswap: sswap.c -- $(CC) ${OPT} -o sswap sswap.c sdel-lib.o --smem: smem.c -- $(CC) ${OPT} -o smem smem.c sdel-lib.o -+srm: srm.o sdel-lib.o -+ $(CC) $(LDFLAGS) srm.o sdel-lib.o -o srm -+sfill: sfill.o sdel-lib.o -+ $(CC) $(LDFLAGS) sfill.o sdel-lib.o -o sfill -+sswap: sswap.o sdel-lib.o -+ $(CC) $(LDFLAGS) sswap.o sdel-lib.o -o sswap -+smem: smem.o sdel-lib.o -+ $(CC) $(LDFLAGS) smem.o sdel-lib.o -o smem - - clean: - rm -f sfill srm sswap smem sdel sdel-lib.o diff --git a/system/secure-delete/secure-delete.SlackBuild b/system/secure-delete/secure-delete.SlackBuild index 538c630156..3d05a44e21 100644 --- a/system/secure-delete/secure-delete.SlackBuild +++ b/system/secure-delete/secure-delete.SlackBuild @@ -2,8 +2,9 @@ # # Slackware build script for secure-delete. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. +# Copyright Jefferson Rocha, Curitiba, Brazil. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -23,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=secure-delete -VERSION=${VERSION:-3.1} -BUILD=${BUILD:-6} +VERSION=${VERSION:-3.1_6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -73,10 +74,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 {} \; -sed -i -e 's|mktemp|mkstemp|g' sfill.c -sed -i -e "/strip/d" Makefile -patch < $CWD/secure-delete-3.1-do-not-use-the-kernel-module.patch -patch < $CWD/secure-delete-3.1-makefile.patch +patch < $CWD/${PRGNAM}_${VERSION}.diff make -j1 prefix=/usr DESTDIR=$PKG diff --git a/system/secure-delete/secure-delete.info b/system/secure-delete/secure-delete.info index c7ee40dfd7..09f4883535 100644 --- a/system/secure-delete/secure-delete.info +++ b/system/secure-delete/secure-delete.info @@ -1,10 +1,10 @@ PRGNAM="secure-delete" -VERSION="3.1" -HOMEPAGE="https://packages.debian.org/search?keywords=secure-delete/" -DOWNLOAD="http://ftp.debian.org/debian/pool/main//s/secure-delete/secure-delete_3.1.orig.tar.gz" +VERSION="3.1_6" +HOMEPAGE="https://packages.debian.org/buster/secure-delete" +DOWNLOAD="http://deb.debian.org/debian/pool/main/s/secure-delete/secure-delete_3.1.orig.tar.gz" MD5SUM="1a9d31a049f9ee916c994cb613a2754e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="Jefferson Rocha" +EMAIL="root@slackjeff.com.br" diff --git a/system/secure-delete/secure-delete_3.1_6.diff b/system/secure-delete/secure-delete_3.1_6.diff new file mode 100644 index 0000000000..288092f59a --- /dev/null +++ b/system/secure-delete/secure-delete_3.1_6.diff @@ -0,0 +1,478 @@ +--- secure-delete-3.1.orig/srm.1 ++++ secure-delete-3.1/srm.1 +@@ -55,7 +55,7 @@ + .TP + .B \-d + ignore the two special dot files . and .. on the commandline. (so you can +-execute it like "srm -d .* *") ++execute it like "srm \-d .* *") + .TP + .B \-f + fast (and insecure mode): no /dev/urandom, no synchronize mode. +@@ -65,7 +65,7 @@ + and a final mode random values. + .TP + .B \-l +--l for a second time lessons the security even more: only one random pass ++\-l for a second time lessons the security even more: only one random pass + is written. + .TP + .B \-r +@@ -95,7 +95,7 @@ + which comes with the + .I secure_deletion package + to ensure to wipe also the free diskspace. However, If already a small +-file aquired a block with your precious data, no tool known to me can help ++file acquired a block with your precious data, no tool known to me can help + you here. For a secure deletion of the swap space + .I sswap + is available. +@@ -136,5 +136,5 @@ + (1), + .I sswap + (1), +-.I smem ++.I sdmem + (1) +--- secure-delete-3.1.orig/sfill.1 ++++ secure-delete-3.1/sfill.1 +@@ -16,7 +16,7 @@ + is designed to delete data which lies on available diskspace on mediums + in a secure manner which can not be recovered by thiefs, law enforcement + or other threats. +-The wipe algorythm is based on the paper "Secure Deletion of Data from ++The wipe algorithm is based on the paper "Secure Deletion of Data from + Magnetic and Solid-State Memory" presented at the 6th Usenix Security + Symposium by Peter Gutmann, one of the leading civilian cryptographers. + .PP +@@ -59,7 +59,7 @@ + and a final mode with random values. + .TP + .B \-l +--l for a second time lessons the security even more: only one random pass ++\-l for a second time lessons the security even more: only one random pass + is written. + .TP + .B \-v +@@ -130,5 +130,5 @@ + (1), + .I sswap + (1), +-.I smem ++.I sdmem + (1) +--- secure-delete-3.1.orig/Makefile ++++ secure-delete-3.1/Makefile +@@ -1,19 +1,19 @@ + CC=gcc +-OPT=-O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE ++OPT=$(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + #OPT=-Wall -D_DEBUG_ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE +-INSTALL_DIR=/usr/local/bin ++INSTALL_DIR=$(prefix)/bin + MAN_DIR=/usr/local/man + DOC_DIR=/usr/share/doc/secure_delete + OPT_MOD=-D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strict-aliasing -pipe -mpreferred-stack-boundary=2 + #LD_MOD=-r + +-all: sdel-lib.o srm sfill sswap smem sdel-mod.o +- @echo +- @echo "A Puritan is someone who is deathly afraid that someone, somewhere, is" +- @echo "having fun." +- @echo +- @echo "I hope YOU have fun!" +- @echo ++all: sdel-lib.o srm sfill sswap smem ++# @echo ++# @echo "A Puritan is someone who is deathly afraid that someone, somewhere, is" ++# @echo "having fun." ++# @echo ++# @echo "I hope YOU have fun!" ++# @echo + + sdel-mod.o: sdel-mod.c + $(CC) $(OPT) $(OPT_MOD) $(LD_MOD) -I/lib/modules/`uname -r`/build/include -c sdel-mod.c +@@ -23,32 +23,28 @@ + + srm: srm.c + $(CC) ${OPT} -o srm srm.c sdel-lib.o +- -strip srm + sfill: sfill.c + $(CC) ${OPT} -o sfill sfill.c sdel-lib.o +- -strip sfill + sswap: sswap.c + $(CC) ${OPT} -o sswap sswap.c sdel-lib.o +- -strip sswap + smem: smem.c + $(CC) ${OPT} -o smem smem.c sdel-lib.o +- -strip smem + + clean: + rm -f sfill srm sswap smem sdel sdel-lib.o sdel-mod.o core *~ + + install: all + mkdir -p -m 755 ${INSTALL_DIR} 2> /dev/null +- rm -f sdel && ln -s srm sdel +- cp -f sdel srm sfill sswap smem the_cleaner.sh ${INSTALL_DIR} +- chmod 711 ${INSTALL_DIR}/srm ${INSTALL_DIR}/sfill ${INSTALL_DIR}/sswap ${INSTALL_DIR}/smem ${INSTALL_DIR}/the_cleaner.sh +- mkdir -p -m 755 ${MAN_DIR}/man1 2> /dev/null +- cp -f srm.1 sfill.1 sswap.1 smem.1 ${MAN_DIR}/man1 +- chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1 +- mkdir -p -m 755 ${DOC_DIR} 2> /dev/null +- cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR} +- -test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char ++# rm -f sdel && ln -s srm sdel ++ cp -f srm sfill sswap smem ${INSTALL_DIR} ++ chmod 711 ${INSTALL_DIR}/srm ${INSTALL_DIR}/sfill ${INSTALL_DIR}/sswap ${INSTALL_DIR}/smem ++# mkdir -p -m 755 ${MAN_DIR}/man1 2> /dev/null ++# cp -f srm.1 sfill.1 sswap.1 smem.1 ${MAN_DIR}/man1 ++# chmod 644 ${MAN_DIR}/man1/srm.1 ${MAN_DIR}/man1/sfill.1 ${MAN_DIR}/man1/sswap.1 ${MAN_DIR}/man1/smem.1 ++# mkdir -p -m 755 ${DOC_DIR} 2> /dev/null ++# cp -f CHANGES FILES README secure_delete.doc usenix6-gutmann.doc ${DOC_DIR} ++# -test -e sdel-mod.o && cp -f sdel-mod.o /lib/modules/`uname -r`/kernel/drivers/char + # @-test '!' -e sdel-mod.o -a `uname -s` = 'Linux' && echo "type \"make sdel-mod install\" to compile and install the Linux loadable kernel module for secure delete" +- @echo +- @echo "If men could get pregnant, abortion would be a sacrament." +- @echo ++# @echo ++# @echo "If men could get pregnant, abortion would be a sacrament." ++# @echo +--- secure-delete-3.1.orig/srm.c ++++ secure-delete-3.1/srm.c +@@ -110,7 +110,7 @@ + if ( (filestat.st_dev != controlstat.st_dev) || (filestat.st_ino != controlstat.st_ino) ) { + fprintf(stderr, "Race found! (directory %s became a link)\n", filename); + } else { +- if ((dir = opendir (".")) != NULL) { ++ if ((dir = opendir (".")) < 0) { + (void) chmod(".", 0700); /* ignore permission errors */ + dir = opendir ("."); + } +@@ -166,8 +166,10 @@ + return 3; + } + +- if (sdel_overwrite(mode, fd, 0, bufsize, filestat.st_size > 0 ? filestat.st_size : 1, zero) == 0) ++ if (sdel_overwrite(mode, fd, 0, bufsize, filestat.st_size > 0 ? filestat.st_size : 1, zero) == 0) { ++ close(fd); + return sdel_unlink(filename, 0, 1, slow); ++ } + } /* end IS_REG() */ + else { + if (S_ISDIR(filestat.st_mode)) { +--- secure-delete-3.1.orig/smem.1 ++++ secure-delete-3.1/smem.1 +@@ -3,16 +3,16 @@ + .if n .sp + .if t .sp 0.4 + .. +-.TH SMEM 1 ++.TH SDMEM 1 + + .SH NAME +-smem \- secure memory wiper (secure_deletion toolkit) ++sdmem \- secure memory wiper (secure_deletion toolkit) + + .SH SYNOPSIS +-.B smem [-f] [-l] [-l] [-v] ++.B sdmem [-f] [-l] [-l] [-v] + + .SH DESCRIPTION +-.I smem ++.I sdmem + is designed to delete data which may lie still in your memory (RAM) + in a secure manner which can not be recovered by thiefs, law enforcement + or other threats. +@@ -24,7 +24,7 @@ + .PP + The + .I secure data deletion +-process of smem goes like this: ++process of sdmem goes like this: + .PP + .TP + .B * +@@ -51,20 +51,26 @@ + and a final random one. + .TP + .B \-l +--l for a second time lessons the security even more: only one pass with ++\-l for a second time lessons the security even more: only one pass with + 0x00 is written. + .TP + .B \-v + verbose mode + .PP + ++.SH NOTE ++.TP ++This utility was originally called ++.I smem ++but was renamed for debian to avoid name clashes with another package. ++ + .SH BEWARE + .TP + .B SLOW +-Wiping the memory is very slow. You might use smem with the -ll option. (tip) ++Wiping the memory is very slow. You might use sdmem with the \-ll option. (tip) + .TP + .B BETA! +-.I smem ++.I sdmem + is still beta. + + .PP +@@ -84,7 +90,7 @@ + can be obtained from + .I http://www.thc.org + .Sp +-.I smem ++.I sdmem + and the + .I secure_deletion package + is (C) 1997-2003 by van Hauser / THC (vh@thc.org) +--- secure-delete-3.1.orig/sswap.1 ++++ secure-delete-3.1/sswap.1 +@@ -49,7 +49,7 @@ + a final mode with random values. + .TP + .B \-l +--l for a second time lessons the security even more: only one pass with ++\-l for a second time lessons the security even more: only one pass with + random values is written. + .TP + .B \-v +@@ -106,5 +106,5 @@ + (1), + .I sfill + (1), +-.I smem ++.I sdmem + (1) +--- secure-delete-3.1.orig/debian/docs ++++ secure-delete-3.1/debian/docs +@@ -0,0 +1,4 @@ ++README ++TODO ++secure_delete.doc ++usenix6-gutmann.doc +--- secure-delete-3.1.orig/debian/control ++++ secure-delete-3.1/debian/control +@@ -0,0 +1,13 @@ ++Source: secure-delete ++Section: utils ++Priority: optional ++Maintainer: Robert Lemmen <robertle@semistable.com> ++Build-Depends: debhelper (>= 7.0.0) ++Standards-Version: 3.9.4 ++ ++Package: secure-delete ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Description: tools to wipe files, free disk space, swap and memory ++ Gutmann method based tools for securely wiping data from files, free ++ disk space, swap and memory: srm, sfill, sswap and sdmem. +--- secure-delete-3.1.orig/debian/compat ++++ secure-delete-3.1/debian/compat +@@ -0,0 +1 @@ ++7 +--- secure-delete-3.1.orig/debian/changelog ++++ secure-delete-3.1/debian/changelog +@@ -0,0 +1,46 @@ ++secure-delete (3.1-6) unstable; urgency=low ++ ++ * Enable hardening flags during build ++ * Update packaging ++ * Bump standards-version ++ * Fix a few minus-vs-hyphen bugs in manpages ++ * Fixed a few typos (closes: #486018, #653260) ++ * Tone down description a little bit and include binary names ++ (closes: #680336, #538151) ++ ++ -- Robert Lemmen <robertle@semistable.com> Fri, 05 Jul 2013 08:50:37 +0100 ++ ++secure-delete (3.1-5) unstable; urgency=low ++ ++ * Rename smem to sdmem to avoid name clash with smem package ++ * Bumped Standards-Version to 3.8.3 and related fixes ++ ++ -- Robert Lemmen <robertle@semistable.com> Tue, 05 Jan 2010 14:55:00 +0000 ++ ++secure-delete (3.1-4) unstable; urgency=low ++ ++ * Fixed licensing info (closes: #428102) ++ * Fixed handling of nostrip build option (closes: #438009) ++ ++ -- Robert Lemmen <robertle@semistable.com> Tue, 28 Aug 2007 13:21:17 +0200 ++ ++secure-delete (3.1-3) unstable; urgency=low ++ ++ * Moved from experimental ++ * Added more documentation ++ ++ -- Robert Lemmen <robertle@semistable.com> Thu, 5 Oct 2006 22:04:17 +0200 ++ ++secure-delete (3.1-2) experimental; urgency=low ++ ++ * Upload to experimental instead of unstable. ++ * Added description on how to test security to README.Debian. ++ ++ -- Robert Lemmen <robertle@semistable.com> Mon, 2 May 2005 11:55:11 +0200 ++ ++secure-delete (3.1-1) unstable; urgency=low ++ ++ * Initial Release. ++ ++ -- Robert Lemmen <robertle@semistable.com> Thu, 29 Jan 2004 18:09:26 +0100 ++ +--- secure-delete-3.1.orig/debian/copyright ++++ secure-delete-3.1/debian/copyright +@@ -0,0 +1,17 @@ ++This package was debianized by Robert Lemmen <robertle@semistable.com> on ++Thu, 29 Jan 2004 18:09:26 +0100. ++ ++It was downloaded from http://www.thc.org ++ ++Upstream Author: van Hauser <vh@thc.org> ++ ++Copyright: 1999-2004 van Hauser ++ ++ You are free to distribute this software under the terms of ++ the GNU General Public License. ++ On Debian systems, the complete text of the GNU General Public ++ License can be found in /usr/share/common-licenses/GPL file. ++ ++The file "usenix6-gutmann.doc" is licensed under the "Creative Commons ++Attribution 3.0" license, which you can find at ++http://creativecommons.org/licenses/by/3.0/ +--- secure-delete-3.1.orig/debian/watch ++++ secure-delete-3.1/debian/watch +@@ -0,0 +1,3 @@ ++version=2 ++http://www.thc.org/releases.php .*secure[-_]delete-(.*)\.tar\.gz ++ +--- secure-delete-3.1.orig/debian/README.Debian ++++ secure-delete-3.1/debian/README.Debian +@@ -0,0 +1,56 @@ ++secure-delete for Debian ++------------------------ ++ ++The original package and debian versions prio to 3.1-5 contained a utility ++called smem that wiped memory. This utility seems to be of limited use and ++clashes with another binary of the same name, it is therefore renamed to sdmem. ++ ++The source for secure_delete contains a 2.4 kernel module that turns every ++call to unlink() into a secure remove, this module is not yet part of this ++package for technical reasons. if you need it please "apt_get source ++secure-delete" and build it yourself for now. ++ ++Also note that securely wiping data from magnetic media is a difficult task and ++depends a lot on the filesystem in question (among other things). So there is no ++guarantee that this program will work in your configuration, but you can and ++should check for yourself by creating a loopback filesystem, mountig it and ++creating a file in it, then securely wiping it and grepping for it's contents in ++the loopback file: ++ ++dd if=/dev/zero of=disk bs=4096 count=1024 ++mke2fs disk ++losetup /dev/loop0 disk ++mkdir test ++mount /dev/loop0 test ++cd test ++for ((i=0; i<10000; i++)) ++do ++ echo "ofenrohr" >> file; ++done ++cd .. ++umount test ++losetup -d /dev/loop0 ++grep "ofenrohr" disk ++--> this should result in a "binary file disk matches" ++losetup /dev/loop0 disk ++mount /dev/loop0 test ++cd test ++srm file ++cd .. ++umount test ++losetup -d /dev/loop0 ++grep "ofenrohr" disk ++--> this should not find anything ++ ++Please make sure you use the correct filesystem type and options during the ++mkfs! ++ ++Another general problem of wiping data from disks is that most harddisks will ++occasionally mark a sector as "bad" and copy it's contents to a new location ++that the disk will pretend is at the original location. Since this is completely ++transparent, there is no way to access these sectors without touching the disks ++hardware. These sectors may then contain sensitive information that could be ++retrieved from the disk. If you want better security, use an encrypting ++filesystem (dm-crypt, loop-aes), and forget the key if you want to wipe it. ++ ++ -- Robert Lemmen <robertle@semistable.com>, Thu, 29 Jan 2004 18:09:26 +0100 +--- secure-delete-3.1.orig/debian/rules ++++ secure-delete-3.1/debian/rules +@@ -0,0 +1,59 @@ ++#!/usr/bin/make -f ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) ++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) ++CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) ++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) ++ ++build: build-arch build-indep ++build-arch: build-stamp ++build-indep: build-stamp ++ ++build-stamp: ++ dh_testdir ++ CFLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" $(MAKE) ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp ++ $(MAKE) clean ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_prep ++ dh_installdirs ++ $(MAKE) install prefix=$(CURDIR)/debian/secure-delete/usr ++ ++ ++binary-indep: build install ++ ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installchangelogs CHANGES ++ dh_installdocs README TODO ++ dh_installman sfill.1 srm.1 smem.1 sswap.1 ++ # rename smem ++ mv $(CURDIR)/debian/secure-delete/usr/bin/smem \ ++ $(CURDIR)/debian/secure-delete/usr/bin/sdmem ++ mv $(CURDIR)/debian/secure-delete/usr/share/man/man1/smem.1 \ ++ $(CURDIR)/debian/secure-delete/usr/share/man/man1/sdmem.1 ++ dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install +--- secure-delete-3.1.orig/debian/source/format ++++ secure-delete-3.1/debian/source/format +@@ -0,0 +1 @@ ++1.0 diff --git a/system/secure-delete/slack-desc b/system/secure-delete/slack-desc index 4b8772474e..e18b5dd8e1 100644 --- a/system/secure-delete/slack-desc +++ b/system/secure-delete/slack-desc @@ -10,7 +10,7 @@ secure-delete: secure-delete (wipe files, free disk space, swap and memory) secure-delete: secure-delete: Gutmann method based tools for securely wiping data. secure-delete: -secure-delete: Home page: https://packages.debian.org/search?keywords=secure-delete/ +secure-delete: Home page: https://packages.debian.org/buster/secure-delete secure-delete: secure-delete: secure-delete: diff --git a/system/setconf/setconf.SlackBuild b/system/setconf/setconf.SlackBuild index 70c0de5801..5efa224d3e 100644 --- a/system/setconf/setconf.SlackBuild +++ b/system/setconf/setconf.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for setconf -# Copyright 2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2017-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=setconf -VERSION=${VERSION:-0.7.5} +VERSION=${VERSION:-0.7.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/setconf/setconf.info b/system/setconf/setconf.info index 8d17308025..fe6a24cbd7 100644 --- a/system/setconf/setconf.info +++ b/system/setconf/setconf.info @@ -1,8 +1,8 @@ PRGNAM="setconf" -VERSION="0.7.5" +VERSION="0.7.7" HOMEPAGE="http://setconf.roboticoverlords.org/" -DOWNLOAD="http://setconf.roboticoverlords.org/setconf-0.7.5.tar.xz" -MD5SUM="b6828051bc84d6d8ff3d6d36a1a803ad" +DOWNLOAD="http://setconf.roboticoverlords.org/setconf-0.7.7.tar.xz" +MD5SUM="ee72aa823120aa3affcd0ec75667147c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/siji-font/siji-font.SlackBuild b/system/siji-font/siji-font.SlackBuild index 706b558a74..f82f75eb08 100644 --- a/system/siji-font/siji-font.SlackBuild +++ b/system/siji-font/siji-font.SlackBuild @@ -23,11 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=siji-font -SRCNAM=${PRGNAM%-*} -SRCVER=25468227348e2d4b3abbc163b2e2d68882fa2ba6 -VERSION=${VERSION:-20171023_${SRCVER%${SRCVER#???????}}} +VERSION=${VERSION:-20171023_2546822} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + +SRCNAM=${PRGNAM%-*} +SRCVER=25468227348e2d4b3abbc163b2e2d68882fa2ba6 + ARCH=noarch CWD=$(pwd) diff --git a/system/skim/README b/system/skim/README new file mode 100644 index 0000000000..5f5f45da93 --- /dev/null +++ b/system/skim/README @@ -0,0 +1,2 @@ +skim is a fuzzy finder that can be used as a general filter like grep or as an +interactive interface for invoking commands. diff --git a/system/skim/skim.SlackBuild b/system/skim/skim.SlackBuild new file mode 100644 index 0000000000..874b531085 --- /dev/null +++ b/system/skim/skim.SlackBuild @@ -0,0 +1,161 @@ +#!/bin/sh + +# Slackware build script for skim + +# Copyright 2019-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# 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. + +PRGNAM=skim +BINNAM=sk +VERSION=${VERSION:-0.9.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac + + if [ "$ARCH" = "i586" ]; then + if rustc -Vv | grep host | grep i686 > /dev/null ; then + ARCH=i686 + fi + fi +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" + CARGOTARGET="--target i586-unknown-linux-gnu" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" + CARGOTARGET="--target i686-unknown-linux-gnu" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + CARGOTARGET="--target x86_64-unknown-linux-gnu" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + CARGOTARGET="" +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 + +# build offline +# configuration tells cargo to use the configured directory +# for dependencies intead of downloading from crates.io +mkdir .cargo +cat << EOF >> .cargo/config +[source.crates-io] +registry = 'https://github.com/rust-lang/crates.io-index' +replace-with = 'vendored-sources' + +[source.vendored-sources] +directory = '$(pwd)/vendor' +EOF + +# deps and versions come from Cargo.lock +mkdir vendor +( + cd vendor + + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" + + tar xvf $CWD/$dep-$ver.crate + + touch $dep-$ver/.cargo-ok + + # generate checksum + { + printf "{\n" + printf ' "files": {\n' + + ( + cd $dep-$ver + find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/' + ) | sed '$ s/,$//' + + printf " },\n" + printf ' "package": "' + + sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' + + printf "}\n" + } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + done +) + +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" \ +cargo build --offline --release $CARGOTARGET + +mkdir -p $PKG/usr/bin/ +find target -name $BINNAM -exec install -m 755 {} $PKG/usr/bin/$BINNAM \; + +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/etc/bash_completion.d +install -m 755 shell/completion.bash $PKG/etc/bash_completion.d/skim + +mkdir -p $PKG/usr/man/man1 +cp -a man/man1/*.1 $PKG/usr/man/man1 +gzip -9 $PKG/usr/man/man1/*.1 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a -r \ + CHANGELOG.md 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/skim/skim.info b/system/skim/skim.info new file mode 100644 index 0000000000..a971c13ed0 --- /dev/null +++ b/system/skim/skim.info @@ -0,0 +1,240 @@ +PRGNAM="skim" +VERSION="0.9.4" +HOMEPAGE="https://github.com/lotabout/skim" +DOWNLOAD="https://github.com/lotabout/skim/archive/v0.9.4/skim-0.9.4.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/aho-corasick/aho-corasick-0.7.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayref/arrayref-0.3.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.5.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/base-x/base-x-0.2.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/base64/base64-0.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/beef/beef-0.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/blake2b_simd/blake2b_simd-0.5.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bumpalo/bumpalo-3.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.66.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/chrono/chrono-0.4.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/const_fn/const_fn-0.4.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/constant_time_eq/constant_time_eq-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam/crossbeam-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.4.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-channel/crossbeam-channel-0.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-deque/crossbeam-deque-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-epoch/crossbeam-epoch-0.9.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-queue/crossbeam-queue-0.3.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.7.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/crossbeam-utils/crossbeam-utils-0.8.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/darling/darling-0.10.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_core/darling_core-0.10.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/darling_macro/darling_macro-0.10.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/defer-drop/defer-drop-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder/derive_builder-0.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/derive_builder_core/derive_builder_core-0.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs/dirs-2.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dirs-sys/dirs-sys-0.3.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/discard/discard-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/either/either-1.6.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/env_logger/env_logger-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fnv/fnv-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fuzzy-matcher/fuzzy-matcher-0.3.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/getrandom/getrandom-0.1.15.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.17.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/humantime/humantime-2.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ident_case/ident_case-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.81.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/maybe-uninit/maybe-uninit-2.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memoffset/memoffset-0.6.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.14.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nix/nix-0.19.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-integer/num-integer-0.1.44.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num-traits/num-traits-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.5.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-hack/proc-macro-hack-0.5.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon/rayon-1.5.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rayon-core/rayon-core-1.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_syscall/redox_syscall-0.1.57.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/redox_users/redox_users-0.3.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex/regex-1.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/regex-syntax/regex-syntax-0.6.21.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rust-argon2/rust-argon2-0.8.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rustc_version/rustc_version-0.2.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/scopeguard/scopeguard-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/semver/semver-0.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/semver-parser/semver-parser-0.7.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.118.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.118.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.60.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/sha1/sha1-0.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/shlex/shlex-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/skim/skim-0.9.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/standback/standback-0.2.13.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb/stdweb-0.4.20.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb-derive/stdweb-derive-0.5.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb-internal-macros/stdweb-internal-macros-0.2.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/stdweb-internal-runtime/stdweb-internal-runtime-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.10.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.54.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/term/term-0.6.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/termcolor/termcolor-1.1.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/thread_local/thread_local-1.0.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.44.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.2.23.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/time-macros/time-macros-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/time-macros-impl/time-macros-impl-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/timer/timer-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tuikit/tuikit-0.4.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/utf8parse/utf8parse-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/void/void-1.0.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vte/vte-0.9.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vte_generate_state_changes/vte_generate_state_changes-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.9.0+wasi-snapshot-preview1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasi/wasi-0.10.0+wasi-snapshot-preview1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen/wasm-bindgen-0.2.69.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-backend/wasm-bindgen-backend-0.2.69.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.69.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.69.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.69.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-util/winapi-util-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate" +MD5SUM="3e7211f090f11b340f4bafed14c22cd6 \ + 93850f8bf39e61dcf80ce49b5e0943d7 \ + 294a49d3c53865fa7ac5d0ce2f5d5735 \ + 6ff474dd60c839a9c788844b7a42c72c \ + c83252f91435a921e7e4434956010344 \ + 142cb4b9a653e56e56311f0c883b8582 \ + c6443ec8d007c729ba5482008d0c864d \ + 50b80bd6ac81e09a40eb3e865b0920e2 \ + 80a2c27647a6acb1890a3a7de8fded72 \ + d362615e7ec599233fa4e9da5393bbcf \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + 8dcd8db8f0e4971b7c9b13c273ab8b10 \ + 7f74a18288dd952887eb53f90404ea23 \ + b3ebb5d4433417e998d982d46334a6f4 \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 74634128440dbc3766bda76fdf0aaa05 \ + 1581b390d17f6e73a43ffc8a7b009e57 \ + bc79e0eb364df515a33755ac9a581cfd \ + e1081b868a908a7094894b7409e99c27 \ + ec9751a4c0d35e7313e52ddb7147376b \ + 04382bb2ecb2336f49f3e437f9deeeca \ + 093c5099d3cef0f418550fe28788d34d \ + 8248cc4466ea3a77b9c2666ed4fc7963 \ + e38f9483da311ab0e0811a12201dfa1a \ + 9ae7be25dee514b764ee2f73c2a90791 \ + f6454b63029b247e2e8b7feac1695009 \ + ff67cf2eb9668167782b8012d3b48e7b \ + 9e1f73325eeb9647ee68eeaa4bff975c \ + fd22741b59a28330936c5da4f933596d \ + 6dd72935005d24990488f13c94c13e23 \ + 0fdb86d5f53dd375a39576e90c621b6b \ + 1d0a8951a71eff8e28acc555152902ac \ + a9045fa57c1e4ed702e51da973b658cb \ + 2ff8927b9cc3e6bcec18745859808751 \ + 8b418106a3968619300a2af8f6b4f200 \ + 8b70009baf55df3c0eea3582883f148b \ + 20006dab4b1bd43c86688877ecd58e8f \ + b4e2b229c362ad0dd313ff631816d5db \ + e70f67200b1a8bbf0bfe7061510f20c2 \ + 8dab3b3ec00dc56cffde0b0c410d47b5 \ + 39767ee14933b0006f02f295314668af \ + 704babd757a22f163230a36fa5474890 \ + 553b325a602b701eb7eaef228e69d0f2 \ + 3f94dd669aafea2fcd7c8c63236029c4 \ + fe77a3f609b6fd8d5b08f3b2ef14d2ad \ + 396bc88987f4bc192f975d94cdf326c7 \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 21a815dce24180ddceb02d732eb431ec \ + f50d2e280b4a3491fffda43b90982544 \ + b5cf10e268e8a3bee2de8a734104245e \ + fa3630e5867493e09296155763e4f4a0 \ + a7a8c0f9d8d00f65fabad79005560dfa \ + 0cddb62b3dcfb814b4e0b9441c5c1a18 \ + 4ade3dff4f5f96ff3aa1c04fd28ac11d \ + a8ec1126ef06244ac1e3773981a005f1 \ + c0e036fd990d0c9cae11b5876a5cb572 \ + c36d452e37c73b1e99f40bae18cddfdb \ + d227ca24b102ae4ab2a4f3bc3bd44bf3 \ + c7c38eb603bed6f42edbc4294806a44a \ + 0736e4f76f4f8f0a29563b0608ca3974 \ + 63b29211eef9ccee0b0401d423db0efd \ + e4e9750df83fa662872061952e155d9a \ + 21235a4cec107822e39c144242a95bf1 \ + 3cc3a4bd5861ca93d7c0d19129334703 \ + 870008bba2e68db4988c31e511fbd9c4 \ + 40d1ab8fd9b6e5e376b0839a9132abe1 \ + 13373372c7ce2e894925d846625a7987 \ + 29e548496d699fbd888e4a65ec2d1488 \ + 4d101ab24d14c54937c5f45ece8fad5f \ + a69721c73263cd2040e1a5f120b03a6f \ + b4a0a98a54439a5a37952c8879187ee3 \ + 64111c20b69aa1532fb66b70c4660b55 \ + 8b4d8c7b6e3a060d365bc1ad650929fa \ + 0a3d0ff7244041ee2b77883faf44fa80 \ + 448ce60d31dd153eea161fe376cf80d0 \ + 8ca07aa626d9d47730bfee5685057309 \ + 5d57f977a55f0b99139cc46ac4cee784 \ + e4e7efe2ab7921499d5c247a349e9e1f \ + c201a2cd25aec8a2ca35b3d6ac8a0ca0 \ + 765021b931e839c0f4789b62a211cc38 \ + 82d13642cb366d10feed4e06220eea64 \ + f74dd8f5f9f972335eff63649cfcd5ba \ + 0d449ec619ac8336ef533d6b7df91c14 \ + bcc5d4659d3210ea73d37c9f02adbbd3 \ + 781d4ccf5d04c98fa02af207a9639249 \ + 82d98dc87dc8503400aa095f5aa70f13 \ + 2102f53f0ab0767dd835190f11aad054 \ + 03a495cfd0e710b3528a8792883e2572 \ + ebdff467249aa3dca005a441dc824236 \ + a8de006fe0c7e373c560dd51599287a8 \ + a5dd75e77c7324f5c1d2d372c990d0a7 \ + c6c50e4feea5f4cc4e1fb3c7e88606a5 \ + af3c7593729923b6559c5fe02377788c \ + c7d88c3e5879e6ff1c468568c049d9c7 \ + 30b97559c13b9352aa881be16251def4 \ + a2eb00593ac747dfeced9d0376bd3728 \ + a2cc84e2e831bda7908261812a982e01 \ + 4272c279b06b88f8b0ffce7109348e27 \ + a51c43692084979295641a7ffba4b297 \ + 9d83f7627e511837fb2d94fbad338d35 \ + 333b4ba3f64c35b6f89b521e8d64548b \ + 8b01b016a9b6deebc1b43f296057efb5 \ + 689203efc084fc0f1d1f74f5d354ae75 \ + d167b9d56ec24513738d4779703b3ebf \ + a29fec77b1e07caf7b682b881b676c06 \ + 6e23e0eee42b1ba9ec61a6db7ec2dc08 \ + a312b55a428f827a91097d1d8497b02b \ + 6bf1f415139a3e7ce1e21511ac667911 \ + 2e2de28b44543b57cbb053676a312be2 \ + 2aa28a36d14358020490e8794d23eb70 \ + 8918afebbbed63e050fe091800945aaa \ + e29146f0c630bc9a4dc02df90ab18dc6 \ + 0498c4a11448bfc35dc7bb2caa64c753 \ + db96b50050277bf05a3c68534bbb9586 \ + b9e37d5fc4ad28b612b78ad37816684d \ + 09de9d01e7331ff3da11f58be8bef0df" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Benjamin Trigona-Harany" +EMAIL="slackbuilds@jaxartes.net" diff --git a/system/skim/slack-desc b/system/skim/slack-desc new file mode 100644 index 0000000000..2febe2361d --- /dev/null +++ b/system/skim/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------------------------------------------------------| +skim: skim (fuzzy finder) +skim: +skim: skim is a fuzzy finder that can be used as a general filter like grep +skim: or as an interactive interface for invoking commands. +skim: +skim: +skim: +skim: +skim: +skim: +skim: diff --git a/system/skopeo/README b/system/skopeo/README new file mode 100644 index 0000000000..faf0aa1990 --- /dev/null +++ b/system/skopeo/README @@ -0,0 +1,7 @@ +skopeo is a command line utility that performs various operations on container +images and image repositories. It can work with OCI images as well as the +original Docker v2 images. It works with API V2 registries such as Docker +registries, private registries, local directories and local OCI-layout +directories. + +`skopeo inspect docker://docker.io/vbatts/slackware` diff --git a/system/skopeo/skopeo.SlackBuild b/system/skopeo/skopeo.SlackBuild new file mode 100644 index 0000000000..20b80f6b6f --- /dev/null +++ b/system/skopeo/skopeo.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for skopeo + +# Copyright 2019 Vincent Batts, Raleigh, NC, USA +# 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. + +PRGNAM=skopeo +VERSION=${VERSION:-0.2.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +DOMAIN=github.com +ORG=containers + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-$VERSION +mkdir -p $PRGNAM-$VERSION/src/$DOMAIN/$ORG +cd $PRGNAM-$VERSION/src/$DOMAIN/$ORG +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +mv $PRGNAM-$VERSION $PRGNAM +cd $PRGNAM +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 {} \; + +# Point go to the location of the source tree +export GOPATH="$TMP/$PRGNAM-$VERSION" + +make binary-local BUILDTAGS="containers_image_ostree_stub" +make install DESTDIR="$PKG" MANINSTALLDIR="$PKG/usr/man" +#install -m 755 ./skopeo $PKG/usr/bin/skopeo + +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 \ + LICENSE README.md go.mod go.sum \ + $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:-tgz} diff --git a/system/skopeo/skopeo.info b/system/skopeo/skopeo.info new file mode 100644 index 0000000000..bff6ed8d23 --- /dev/null +++ b/system/skopeo/skopeo.info @@ -0,0 +1,10 @@ +PRGNAM="skopeo" +VERSION="0.2.0" +HOMEPAGE="https://github.com/containers/skopeo" +DOWNLOAD="https://github.com/containers/skopeo/archive/v0.2.0/skopeo-0.2.0.tar.gz" +MD5SUM="51ec7580f5a7110bf39e885f6b1fe28f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="go-md2man" +MAINTAINER="Vincent Batts" +EMAIL="vbatts@hashbangbash.com" diff --git a/system/skopeo/slack-desc b/system/skopeo/slack-desc new file mode 100644 index 0000000000..cc512f917d --- /dev/null +++ b/system/skopeo/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------------------------------------------------------| +skopeo: skopeo (utility for container images and registries) +skopeo: +skopeo: skopeo is a command line utility that performs various operations +skopeo: on container images and image repositories. It can work with OCI +skopeo: images as well as the original Docker v2 images. It works with API V2 +skopeo: registries such as Docker registries, private registries, local +skopeo: directories and local OCI-layout directories. +skopeo: +skopeo: Site: https://github.com/containers/skopeo +skopeo: +skopeo: diff --git a/system/slack-osquery/README b/system/slack-osquery/README new file mode 100644 index 0000000000..0b825b4c5c --- /dev/null +++ b/system/slack-osquery/README @@ -0,0 +1,11 @@ +slack-osquery - osquery extensions for Slackware + +This extension provides extra tables for osquery on slackware. + +After installation, you will need to configure osquery to load your extension: +https://osquery.readthedocs.io/en/stable/deployment/extensions/ + +The extension currently exposes the package database through a table called +slackware_packages. + +NOTE: google-go-lang is only needed at compile time - not at runtime. diff --git a/system/fs-uae-arcade/slack-desc b/system/slack-osquery/slack-desc index 7fc57b1154..9c484c4c96 100644 --- a/system/fs-uae-arcade/slack-desc +++ b/system/slack-osquery/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fs-uae-arcade: fs-uae-arcade (fullscreen game browser) -fs-uae-arcade: -fs-uae-arcade: FS-UAE Arcade is a fullscreen Amiga game browser for FS-UAE. -fs-uae-arcade: -fs-uae-arcade: Homepage: http://fs-uae.net/ -fs-uae-arcade: -fs-uae-arcade: -fs-uae-arcade: -fs-uae-arcade: -fs-uae-arcade: -fs-uae-arcade: +slack-osquery: slack-osquery (osquery extensions for slackware) +slack-osquery: +slack-osquery: osquery extensions for slackware +slack-osquery: +slack-osquery: https://github.com/aclemons/slack-osquery +slack-osquery: +slack-osquery: +slack-osquery: +slack-osquery: +slack-osquery: +slack-osquery: diff --git a/system/slack-osquery/slack-osquery.SlackBuild b/system/slack-osquery/slack-osquery.SlackBuild new file mode 100644 index 0000000000..d8ec7d4871 --- /dev/null +++ b/system/slack-osquery/slack-osquery.SlackBuild @@ -0,0 +1,120 @@ +#!/bin/sh + +# Slackware build script for slack-osquery + +# Copyright 2020 Andrew Clemons, Wellington New Zealand +# 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. + +PRGNAM=slack-osquery +VERSION=${VERSION:-1.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +mkdir -p vendor/github.com + +for DEPENDENCY in Microsoft/go-winio/0.4.9 \ + apache/thrift/0.12.0 \ + davecgh/go-spew/1.1.0 \ + kolide/osquery-go/a74aa860032dacda9b8304c6565efcb9d80dfaa9 \ + pkg/errors/0.8.0 \ + pmezard/go-difflib/1.0.0 \ + stretchr/testify/1.2.2 ; do + DEPENDENCY_OWNER="$(echo "$DEPENDENCY" | cut -d/ -f1)" + DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f2)" + DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f3)" + + mkdir -p "vendor/github.com/$DEPENDENCY_OWNER" + + tar xf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz" + mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" "vendor/github.com/$DEPENDENCY_OWNER/$DEPENDENCY_NAME" +done + +mkdir -p vendor/golang.org/x +for DEPENDENCY in sys/14742f9018cd6651ec7364dc6ee08af0baaa1031 ; do + DEPENDENCY_NAME="$(echo "$DEPENDENCY" | cut -d/ -f1)" + DEPENDENCY_REV="$(echo "$DEPENDENCY" | cut -d/ -f2)" + + tar xf "$CWD/$DEPENDENCY_NAME-$DEPENDENCY_REV.tar.gz" + mv "$DEPENDENCY_NAME-$DEPENDENCY_REV" "vendor/golang.org/x/$DEPENDENCY_NAME" +done + +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 {} \; + +go build -a -mod=vendor -o target/slackware.ext +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/osquery/extensions + +install -m 0700 target/slackware.ext $PKG/usr/lib${LIBDIRSUFFIX}/osquery/extensions/slackware.ext + +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 +cp -a \ + 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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/slack-osquery/slack-osquery.info b/system/slack-osquery/slack-osquery.info new file mode 100644 index 0000000000..21b713f5f6 --- /dev/null +++ b/system/slack-osquery/slack-osquery.info @@ -0,0 +1,26 @@ +PRGNAM="slack-osquery" +VERSION="1.0" +HOMEPAGE="https://github.com/aclemosn/slack-osquery" +DOWNLOAD="https://github.com/aclemons/slack-osquery/archive/v1.0/slack-osquery-1.0.tar.gz \ + https://github.com/Microsoft/go-winio/archive/v0.4.9/go-winio-0.4.9.tar.gz \ + https://github.com/apache/thrift/archive/v0.12.0/thrift-0.12.0.tar.gz \ + https://github.com/davecgh/go-spew/archive/v1.1.0/go-spew-1.1.0.tar.gz \ + https://github.com/kolide/osquery-go/archive/a74aa860032dacda9b8304c6565efcb9d80dfaa9/osquery-go-a74aa860032dacda9b8304c6565efcb9d80dfaa9.tar.gz \ + https://github.com/pkg/errors/archive/v0.8.0/errors-0.8.0.tar.gz \ + https://github.com/pmezard/go-difflib/archive/v1.0.0/go-difflib-1.0.0.tar.gz \ + https://github.com/stretchr/testify/archive/v1.2.2/testify-1.2.2.tar.gz \ + https://github.com/golang/sys/archive/14742f9018cd6651ec7364dc6ee08af0baaa1031/sys-14742f9018cd6651ec7364dc6ee08af0baaa1031.tar.gz" +MD5SUM="6f9cdd4f0f8e2d5e5a41568f1c80eb7e \ + 8696fc61920c07d8591b5f5c6920cf82 \ + ff9af01fec424b5a279fa8a3c9e95c0c \ + 89875fb674e0ea72a189e5048186206c \ + c11f2cbf425ccf11292e0caaf9619a69 \ + 8072f1b5f0f97a9167caff82f812edeb \ + 56e81fe945d04771dcb79964ce958a5f \ + cae3d38d807581cd78da0a9dc6b0eb70 \ + e854fa1c61cb6d71bf9feb71b3f97f97" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="google-go-lang" +MAINTAINER="Andrew Clemons" +EMAIL="andrew.clemons@gmail.com" diff --git a/system/slack-scripts/README b/system/slack-scripts/README deleted file mode 100644 index c26044807e..0000000000 --- a/system/slack-scripts/README +++ /dev/null @@ -1,79 +0,0 @@ -slack-scripts (Some Slackware Utilities) - -ph - A Slackware Package History -slkcfg - A Sysvinit Script Utility - -=============================================================================== - -ph N - -Lists last installed N packages by date order, newest first unless N is -negative, then it lists oldest first. With no number it outputs all, suitable -for grepping etc. - -It supports a few options about listing style such as date, tag, version, and -can be used in conjunction with other applications such as removepkg. - -Example: - -ph -s 5 (list last 5 slackbuilds.org packages installed) -ph -t alien 10 (list last 10 packages with tag 'alien') -ph -d 5 (list last 5 without printing the dates) -pn -v 5 (list last 5 without printing versions) - -Or combine them: - -ph -v -d -s 5 (list only the names of the last 5 slackbuilds.org packages) - -It also supports the $ROOT environmental option so that it will work with mounted -file systems and partitions. - -See ph -h for more details and ph --help for more examples. - -=============================================================================== - -slkcfg runs commands on the rc scripts in /etc/rc.d/ but without needing to -specify the full path. Any output is printed. - -It can run the usual start/stop/restart/status commands and set/unset the -executable bit. - -eg: - -slkcfg cups on|off (chmod +/-x) -slkcfg cups start|stop|status - -and so on. - -It greps the rc file to find options. If it doesn't find any options but you -know that some exist you can force the command by adding 'force' at the end. - -Running with just the name of the rc file will 'ls -l' it and print any found -options. - -/etc/rc.d/rc.inet1 is treated specially and will try to find the names of -interfaces using ifconfig -a. - -At the moment it supports the following: eth, wlan, br, virbr, vmnet, vboxnet, -pan and ppp. - -If you would like me to add extra interface support just drop me a line with -the details or send a patch. - -Example output from inet1: - -slkcfg inet1 (viins) --rwxr-xr-x 1 root root 10878 Nov 19 2015 /etc/rc.d/rc.inet1* - -Options: -start stop restart -lo_start lo_stop -eth0_start eth0_stop eth0_restart -virbr0_start virbr0_stop virbr0_restart -wlan0_start wlan0_stop wlan0_restart - -slkcfg uses 'sh' to run commands (apart from chmod) so it should work even if -the rc file isn't executable. In that case it will print a message to tell you -at the end of the output. - -See slkcfg -h for more details. diff --git a/system/slack-scripts/slack-scripts.info b/system/slack-scripts/slack-scripts.info deleted file mode 100644 index 95494eddaa..0000000000 --- a/system/slack-scripts/slack-scripts.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="slack-scripts" -VERSION="0.0.3" -HOMEPAGE="http://dawoodfall.net" -DOWNLOAD="http://unrealize.co.uk/source/slack-scripts-0.0.3.tar.gz" -MD5SUM="25d081be066dcb16b282c727449d0772" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" diff --git a/system/slackroll/slackroll.SlackBuild b/system/slackroll/slackroll.SlackBuild index 4088c4a1d6..b67bb23661 100644 --- a/system/slackroll/slackroll.SlackBuild +++ b/system/slackroll/slackroll.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for slackroll -# Copyright 2011-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2011-2018,2020-2021 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slackroll -VERSION=${VERSION:-v48} -SRCVER=${VERSION#v} +GITREV="${GITREV:-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac}" +VERSION=${VERSION:-git$(echo "$GITREV" | sed 's/^\(.\{7\}\).*$/\1/')} +SRCVER=${SRCVER:-v48} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,9 +41,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz -cd $PRGNAM-$SRCVER +rm -rf $PRGNAM-$GITREV +tar xvf $CWD/$PRGNAM-$GITREV.tar.gz +cd $PRGNAM-$GITREV chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -67,6 +68,8 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mv $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$SRCVER + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/slackroll/slackroll.info b/system/slackroll/slackroll.info index 6cad4e8adb..aa3edaa433 100644 --- a/system/slackroll/slackroll.info +++ b/system/slackroll/slackroll.info @@ -1,8 +1,8 @@ PRGNAM="slackroll" -VERSION="v48" +VERSION="git0c6ab0b" HOMEPAGE="http://rg3.github.io/slackroll/" -DOWNLOAD="https://github.com/rg3/slackroll/archive/v48/slackroll-48.tar.gz" -MD5SUM="145652bb1b1170dfd7b2ca661bfd3301" +DOWNLOAD="https://github.com/rg3/slackroll/archive/0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac/slackroll-0c6ab0b24b9ec48fb1f1058b92720a6ff794d8ac.tar.gz" +MD5SUM="4474bcb2e48cf55947c9b30022381a9e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/sleepd/fix_acpica_version.patch b/system/sleepd/fix_acpica_version.patch new file mode 100644 index 0000000000..02422ed0be --- /dev/null +++ b/system/sleepd/fix_acpica_version.patch @@ -0,0 +1,12 @@ +diff -uNr sleepd-2.05.orig/acpi.c sleepd-2.05/acpi.c +--- sleepd-2.05.orig/acpi.c 2014-05-28 04:06:50.000000000 +0800 ++++ sleepd-2.05/acpi.c 2020-07-17 22:51:39.340113991 +0800 +@@ -67,7 +67,7 @@ + fd = open(file, O_RDONLY); + if (fd == -1) return NULL; + end = read(fd, buf, sizeof(buf)); +- buf[end-1] = '\0'; ++ ((buf[end-1]) == '\n') && (buf[end-1] = '\0'); + close(fd); + return buf; + } diff --git a/system/sleepd/rc.sleepd b/system/sleepd/rc.sleepd index bbfa1b0f15..66587a2f8c 100644 --- a/system/sleepd/rc.sleepd +++ b/system/sleepd/rc.sleepd @@ -1,26 +1,36 @@ #!/bin/sh # /etc/rc.d/rc.sleepd -# Start/stop/restart the Wicd daemon +# Start/stop/restart the sleepd daemon PIDFILE="/var/run/sleepd.pid" DAEMON="/usr/sbin/sleepd" +. /etc/sleepd.conf + # Define start and stop functions sleepd_start() { + [ $UID -eq 0 ] || exit 4 if [ -e $PIDFILE ]; then - echo "sleepd appears to already be running." - echo "If this is not the case, then remove " - echo "$PIDFILE and try again..." + echo "sleepd appears to already be running. If this is not the case," + echo "remove $PIDFILE and try again." exit 1 else - echo "Starting sleepd: $DAEMON &" - sleepd 2>/dev/null 1>&2 & + echo "Starting sleepd: $DAEMON" + sleepd $PARAMS > /dev/null 2>&1 + ps -p `cat $PIDFILE` > /dev/null 2>&1 + if [ "$?" == 1 ]; then + rm -f $PIDFILE + echo "ERROR: $DAEMON failed to start." + echo "ERROR: For more verbosity, run \"$DAEMON -n -v\" manually." + echo "ERROR: Exiting..." + fi fi } sleepd_force_stop() { + [ $UID -eq 0 ] || exit 4 echo "Force stopping sleepd..." if [ -e $PIDFILE ]; then kill $(cat $PIDFILE) 2>/dev/null @@ -31,6 +41,7 @@ sleepd_force_stop() { } sleepd_stop() { + [ $UID -eq 0 ] || exit 4 echo "Stopping sleepd..." if [ -e $PIDFILE ]; then kill $(cat $PIDFILE) 2>/dev/null @@ -62,7 +73,7 @@ case $1 in sleepd_status ;; *) - echo "Usage: $0 {start|stop|restart|status}" + echo "Usage: $0 {start|stop|force_stop|restart|status}" exit 1 ;; esac diff --git a/system/sleepd/sleepd.SlackBuild b/system/sleepd/sleepd.SlackBuild index 2d16819b8c..d4847ffee4 100644 --- a/system/sleepd/sleepd.SlackBuild +++ b/system/sleepd/sleepd.SlackBuild @@ -23,7 +23,7 @@ PRGNAM="sleepd" VERSION=${VERSION:-2.05} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,6 +70,8 @@ find -L . \ sed -i "s|share/man|man|"g Makefile +patch -p1 < $CWD/fix_acpica_version.patch + make make install PREFIX=$PKG @@ -78,6 +80,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/etc/rc.d cat $CWD/rc.sleepd > $PKG/etc/rc.d/rc.sleepd.new +cp -a debian/default $PKG/etc/sleepd.conf mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a GPL INSTALL TODO $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/sleuthkit/sleuthkit.SlackBuild b/system/sleuthkit/sleuthkit.SlackBuild index 919ad336ac..470f81084a 100644 --- a/system/sleuthkit/sleuthkit.SlackBuild +++ b/system/sleuthkit/sleuthkit.SlackBuild @@ -2,31 +2,35 @@ # Slackware build script for sleuthkit -# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at> -# All rights reserved. +# Copyright 2008 Heinz Wiesinger <pprkut@liwjatan.at> All rights +# reserved. # -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: +# 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. +# 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. +# 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. -# Updated v4.6.5 Jan 2019. -# Barry J. Grundy <bgrundy(at)linuxleo.com> +# Updated v4.10.1 December 2020. Barry J. Grundy +# <bgrundy(at)linuxleo.com> PRGNAM=sleuthkit -VERSION=${VERSION:-4.6.5} +VERSION=${VERSION:-4.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/sleuthkit/sleuthkit.info b/system/sleuthkit/sleuthkit.info index 27dc52a3c2..5654baee56 100644 --- a/system/sleuthkit/sleuthkit.info +++ b/system/sleuthkit/sleuthkit.info @@ -1,8 +1,8 @@ PRGNAM="sleuthkit" -VERSION="4.6.5" +VERSION="4.10.1" HOMEPAGE="http://www.sleuthkit.org/sleuthkit/" -DOWNLOAD="https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.6.5/sleuthkit-4.6.5.tar.gz" -MD5SUM="bef6af66db485c9b55243902d72e80e1" +DOWNLOAD="https://github.com/sleuthkit/sleuthkit/releases/download/sleuthkit-4.10.1/sleuthkit-4.10.1.tar.gz" +MD5SUM="c37bb35897a471c52ec18e0cbb807e9e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/slpkg/README b/system/slpkg/README index 48a2063b79..5828dd8d0e 100644 --- a/system/slpkg/README +++ b/system/slpkg/README @@ -1,12 +1,36 @@ -Slpkg is a powerful software package manager that installs, updates -and removes packages on Slackware based systems. It automatically -computes dependencies and figures out what things should occur -to install packages. Slpkg makes it easier to maintain groups -of machines without having to manually update. +Slpkg is a powerful software package manager that installs, +updates, and removes packages on Slackware based systems. +It automatically computes dependencies and figures out what +things should occur to install packages. Slpkg makes it easier +to maintain groups of machines without having to manually update. +Slpkg works in accordance with the standards of the organization +slackbuilds.org to builds packages. Also uses the Slackware Linux +instructions for installation, upgrading or removing packages. + +What makes slpkg to distinguish it from the other tools; +The user-friendliness it's a primary target as well as easy to +understand and use, also use colours (by default) to highlight +packages and display warning messages, and many of the others +available options it's ready to use. + +Features + +* Dependencies resolutions +* Dependencies visualizations +* Multiple options +* Multiple repositories +* Easy configuration +* Fully configurable +* Adaptability +* Powerful options +* Source builder +* Faster process +* Better Security Optional dependencies: - - python2-pythondialog (for dialog box interface) - - pygraphviz (for drawing dependencies diagram) - - graph-easy (for drawing ascii dependencies diagram) - - aria2 (alternative downloader) - - httpie (alternative downloader) + +* python3-pythondialog (for dialog box interface) +* pygraphviz (for drawing dependencies diagram) +* graph-easy (for drawing ascii dependencies diagram) +* aria2 (alternative downloader) +* httpie (alternative downloader) diff --git a/system/slpkg/slack-desc b/system/slpkg/slack-desc index 4137504ddb..9eebd74623 100644 --- a/system/slpkg/slack-desc +++ b/system/slpkg/slack-desc @@ -14,6 +14,6 @@ slpkg: computes dependencies and figures out what things should occur slpkg: to install packages. Slpkg makes it easier to maintain groups of slpkg: of machines without having to manually update. slpkg: -slpkg: Homepage: https://github.com/dslackw/slpkg +slpkg: Homepage: https://dslackw.gitlab.io/slpkg slpkg: slpkg: diff --git a/system/slpkg/slpkg.SlackBuild b/system/slpkg/slpkg.SlackBuild index 4fe921e256..317c863c13 100644 --- a/system/slpkg/slpkg.SlackBuild +++ b/system/slpkg/slpkg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for slpkg -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2021 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slpkg -VERSION=${VERSION:-3.3.8} +VERSION=${VERSION:-3.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,10 +69,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 {} \; -# avoid install configuration files and man page over setup.py -sed -i 's/if "install"/if ""/' setup.py - -python setup.py install --root=$PKG +python3 setup.py install --root=$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 @@ -92,8 +89,8 @@ 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.rst ChangeLog.txt LICENSE TESTING ISSUES KNOWN_ISSUES REPOSITORIES \ - requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md ChangeLog.txt LICENSE TESTING ISSUES KNOWN_ISSUES REPOSITORIES.md \ + INSTALL.md requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/slpkg/slpkg.info b/system/slpkg/slpkg.info index 6e7f63699a..66c1162c9f 100644 --- a/system/slpkg/slpkg.info +++ b/system/slpkg/slpkg.info @@ -1,10 +1,10 @@ PRGNAM="slpkg" -VERSION="3.3.8" -HOMEPAGE="https://gitlab.com/dslackw/slpkg" -DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.3.8/slpkg-3.3.8.tar.gz" -MD5SUM="86024e707ff696ebecf8de77da14500e" +VERSION="3.9.1" +HOMEPAGE="https://dslackw.gitlab.io/slpkg" +DOWNLOAD="https://gitlab.com/dslackw/slpkg/-/archive/3.9.1/slpkg-3.9.1.tar.gz" +MD5SUM="19d4b05df424482d8532892fc6271666" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3 python-urllib3" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/system/socketcand/README b/system/socketcand/README new file mode 100644 index 0000000000..75f3f6f1ff --- /dev/null +++ b/system/socketcand/README @@ -0,0 +1,5 @@ +Socketcand is a daemon that provides access to CAN interfaces on a +machine via a network interface. The communication protocol uses a +TCP/IP connection and a specific protocol to transfer CAN frames and +control commands. The protocol specification can be found in +./doc/protocol.md. diff --git a/system/socketcand/doinst.sh b/system/socketcand/doinst.sh new file mode 100644 index 0000000000..44358298d5 --- /dev/null +++ b/system/socketcand/doinst.sh @@ -0,0 +1,15 @@ +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... +} + +config etc/socketcand.conf.new + diff --git a/system/socketcand/slack-desc b/system/socketcand/slack-desc new file mode 100644 index 0000000000..2b7c9d6cf3 --- /dev/null +++ b/system/socketcand/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------------------------------------------------------| +socketcand: socketcand (CAN Interfaces Daemon) +socketcand: +socketcand: Socketcand is a daemon that provides access to CAN interfaces on a +socketcand: machine via a network interface. The communication protocol uses a +socketcand: TCP/IP connection and a specific protocol to transfer CAN frames and +socketcand: control commands. The protocol specification can be found in +socketcand: ./doc/protocol.md. +socketcand: +socketcand: +socketcand: +socketcand: diff --git a/system/socketcand/socketcand.SlackBuild b/system/socketcand/socketcand.SlackBuild new file mode 100644 index 0000000000..1b883e3fe7 --- /dev/null +++ b/system/socketcand/socketcand.SlackBuild @@ -0,0 +1,107 @@ +#!/bin/sh + +# Slackware build script for socketcand + +# Copyright 2018 Fernando Lopez Jr. <fernando.lopezjr@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. + +PRGNAM=socketcand +VERSION=${VERSION:-0.4.2} +COMMIT=${COMMIT:-df7fb4ff8a4439d7737fe2df3540e1ab7465721a} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-$COMMIT.tar.gz +mv $PRGNAM-$COMMIT $PRGNAM-$VERSION +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 -fgnu89-inline" \ +CXXFLAGS="$SLKCFLAGS -fgnu89-inline" \ +autoconf +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + --without-config + +make +make install DESTDIR=$PKG + +mv $PKG/etc/socketcand.conf $PKG/etc/socketcand.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 + +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 $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:-tgz} diff --git a/system/socketcand/socketcand.info b/system/socketcand/socketcand.info new file mode 100644 index 0000000000..dca84918cc --- /dev/null +++ b/system/socketcand/socketcand.info @@ -0,0 +1,10 @@ +PRGNAM="socketcand" +VERSION="0.4.2" +HOMEPAGE="https://github.com/dschanoeh/socketcand" +DOWNLOAD="https://github.com/dschanoeh/socketcand/archive/df7fb4ff8a4439d7737fe2df3540e1ab7465721a/socketcand-df7fb4ff8a4439d7737fe2df3540e1ab7465721a.tar.gz" +MD5SUM="4be5e8db2eea4312f787cf7fcbe74eb5" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Fernando Lopez Jr." +EMAIL="fernando.lopezjr@gmail.com" diff --git a/system/socklog/README b/system/socklog/README new file mode 100644 index 0000000000..808c505ff3 --- /dev/null +++ b/system/socklog/README @@ -0,0 +1,12 @@ +socklog, in cooperation with the runit package, is a small and secure replacement for syslogd. + +It can receive syslog messages from a unix domain socket ("/dev/log") and +write them to various files on disk depending on facility and priority. + +It can receive messages from a udp socket ("0.0.0.0:514") and write them to +disk, or forward the messages to another udp socket ("a.b.c.d:514"). + +svlogd has a built in log file rotation based on file size, +so there is no need for any cron jobs or similar to rotate the logs. + +Check README.Slackware on how to use it after installation. diff --git a/system/socklog/README.Slackware b/system/socklog/README.Slackware new file mode 100644 index 0000000000..4cc0c2b4d8 --- /dev/null +++ b/system/socklog/README.Slackware @@ -0,0 +1,55 @@ +To use the socklog package for system logging, following steps can be followed: + +Create the service directory and log directories by running the socklog-conf program: + + # socklog-conf unix daemon adm + +If you are replacing another service providing system logging through the socket /dev/log, + such as syslogd, stop it now and ensure that it will not be restarted on runlevel change + or system reboot. + +Tell runsvdir about the new service: + + # ln -s /etc/sv/socklog-unix /var/service/ + +Wait five seconds for the service to start and then check the log directories, e.g.: + + # less /var/log/socklog/main/current + + Optionally configure the socklog-unix service by editing the corresponding run scripts and config files: + + /var/service/socklog-unix/run + /var/service/socklog-unix/log/run + /var/log/socklog/*/config + +------------------------------------- + +For capturing kernel log: + +Create the service directory and log directories by running the socklog-conf program: + + # socklog-conf klog daemon adm + +If you are replacing another service providing kernel logging, such as klogd on Linux or syslogd on BSD, + stop it now and ensure that it will not be restarted on runlevel change or system reboot. + +Tell runsvdir about the new service: + + # ln -s /etc/sv/socklog-klog /var/service/ + +Wait five seconds for the service to start and then check the log directory: + + # less /var/log/socklog-klog/main/current + +Optionally configure the socklog-klog service by editing the corresponding run scripts and config file: + + /var/service/socklog-klog/run + /var/service/socklog-klog/log/run + /var/log/socklog-klog/config + +---------------------------------------- + +For more details and setting up network logging, check the following link: + +http://smarden.org/socklog/configuration.html + diff --git a/system/socklog/headers.patch b/system/socklog/headers.patch new file mode 100644 index 0000000000..6f7ec5ace7 --- /dev/null +++ b/system/socklog/headers.patch @@ -0,0 +1,55 @@ +add missing headers for misc funcs and types + +--- a/chkshsgr.c ++++ b/chkshsgr.c +@@ -1,10 +1,11 @@ + /* Public domain. */ + + #include <unistd.h> ++#include <grp.h> + + int main() + { +- short x[4]; ++ gid_t x[4]; + + x[0] = x[1] = 0; + if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); +--- a/pathexec_run.c ++++ b/pathexec_run.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include <unistd.h> + #include "error.h" + #include "stralloc.h" + #include "str.h" +--- a/prot.c ++++ b/prot.c +@@ -1,12 +1,15 @@ + /* Public domain. */ + ++#include <unistd.h> ++#include <grp.h> ++ + #include "hasshsgr.h" + #include "prot.h" + + int prot_gid(int gid) + { + #ifdef HASSHORTSETGROUPS +- short x[2]; ++ gid_t x[2]; + x[0] = gid; x[1] = 73; /* catch errors */ + if (setgroups(1,x) == -1) return -1; + #else +--- a/seek_set.c ++++ b/seek_set.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include <unistd.h> + #include <sys/types.h> + #include "seek.h" + + diff --git a/system/socklog/slack-desc b/system/socklog/slack-desc new file mode 100644 index 0000000000..cd8b5f1d3e --- /dev/null +++ b/system/socklog/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 ':'. + + |-----handy-ruler------------------------------------------------------| +socklog: socklog (system and kernel logging services) +socklog: +socklog: socklog, in cooperation with the runit package, is a small and secure +socklog: replacement for syslogd. +socklog: +socklog: It can receive syslog messages from a unix domain socket ("/dev/log") +socklog: and write them to various files on disk depending on facility +socklog: and priority. It can also read from and write to a udp socket. +socklog: +socklog: svlogd has a built in log file rotation based on file size, +socklog: so there is no need for any cron jobs or similar to rotate the logs. diff --git a/system/socklog/socklog.SlackBuild b/system/socklog/socklog.SlackBuild new file mode 100644 index 0000000000..a58f15fac8 --- /dev/null +++ b/system/socklog/socklog.SlackBuild @@ -0,0 +1,112 @@ +#!/bin/sh + +# Slackware build script for socklog +# generated with mkslack, based on aur and gentoo pkg +# +# Copyright 2019 Aaditya Bagga <aaditya_gnulinux@zoho.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. + +PRGNAM=socklog +VERSION=${VERSION:-2.1.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 --strip-components=1 +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 {} \; + +echo "${CC:-gcc} $SLKCFLAGS -Wall" > src/conf-cc +echo "${LD:-gcc -s}" > src/conf-ld + +cd src +patch -p1 < "$CWD/headers.patch" +cd - +sed -i -e 's:^#define _PATH_KLOG "\/dev\/klog"$:#define _PATH_KLOG "\/proc\/kmsg":' src/socklog-conf.c + +package/compile +package/check + +install -d $PKG/{bin,sbin} +install -m 755 command/{tryto,uncat,socklog-check} $PKG/bin/ +install -m 755 command/{socklog,socklog-conf} $PKG/sbin/ + +install -d $PKG/usr/man/man{1,8} +install -m 644 man/*.1 $PKG/usr/man/man1/ +install -m 644 man/*.8 $PKG/usr/man/man8/ + +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 \ + package/CHANGES package/README package/COPYING \ + $PKG/usr/doc/$PRGNAM-$VERSION + +mkdir $PKG/usr/doc/$PRGNAM-$VERSION/html +cp doc/* $PKG/usr/doc/$PRGNAM-$VERSION/html/ + +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:-tgz} diff --git a/system/socklog/socklog.info b/system/socklog/socklog.info new file mode 100644 index 0000000000..40788fe0be --- /dev/null +++ b/system/socklog/socklog.info @@ -0,0 +1,10 @@ +PRGNAM="socklog" +VERSION="2.1.0" +HOMEPAGE="http://smarden.org/socklog/" +DOWNLOAD="http://smarden.org/socklog/socklog-2.1.0.tar.gz" +MD5SUM="5d0e8e28c9329ad3af982c5241df9ff1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="runit" +MAINTAINER="Aaditya Bagga" +EMAIL="aaditya_gnulinux@zoho.com" diff --git a/system/softhsm/doinst.sh b/system/softhsm/doinst.sh new file mode 100644 index 0000000000..a3383ce28e --- /dev/null +++ b/system/softhsm/doinst.sh @@ -0,0 +1,14 @@ +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... +} + +config etc/softhsm2.conf.new diff --git a/system/softhsm/softhsm.SlackBuild b/system/softhsm/softhsm.SlackBuild index a853328cf7..245fb58135 100644 --- a/system/softhsm/softhsm.SlackBuild +++ b/system/softhsm/softhsm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for softhsm -# Copyright 2016-2018 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> +# Copyright 2016-2021 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=softhsm -VERSION=${VERSION:-2.5.0} +VERSION=${VERSION:-2.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,12 +91,15 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 $PKG/etc/softhsm2.conf $PKG/etc/softhsm2.conf.new + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a *.md NEWS LICENSE $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:-tgz} diff --git a/system/softhsm/softhsm.info b/system/softhsm/softhsm.info index 4f6f6b88f2..8cb44f0374 100644 --- a/system/softhsm/softhsm.info +++ b/system/softhsm/softhsm.info @@ -1,8 +1,8 @@ PRGNAM="softhsm" -VERSION="2.5.0" +VERSION="2.6.1" HOMEPAGE="https://www.opendnssec.org" -DOWNLOAD="https://dist.opendnssec.org/source/softhsm-2.5.0.tar.gz" -MD5SUM="fb0e490aa5d83de1b3936288c22c2475" +DOWNLOAD="https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz" +MD5SUM="040b93ca327cbe0a3a8661e7c371ab16" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/solarize-12x29-psf/solarize-12x29-psf.info b/system/solarize-12x29-psf/solarize-12x29-psf.info index c163f58194..7752ca27e9 100644 --- a/system/solarize-12x29-psf/solarize-12x29-psf.info +++ b/system/solarize-12x29-psf/solarize-12x29-psf.info @@ -1,7 +1,7 @@ PRGNAM="solarize-12x29-psf" VERSION="20150529" HOMEPAGE="https://github.com/talamus/solarize-12x29-psf" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/solarize-12x29-psf-20150529.tar.gz" +DOWNLOAD="https://slackware.uk/~urchlay/src/solarize-12x29-psf-20150529.tar.gz" MD5SUM="a43342ae0d02a2c0d19909a52681f9e1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/spl-solaris/spl-solaris.SlackBuild b/system/spl-solaris/spl-solaris.SlackBuild index d555b86cc5..b98925ff28 100644 --- a/system/spl-solaris/spl-solaris.SlackBuild +++ b/system/spl-solaris/spl-solaris.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=spl-solaris SRCNAM=spl -VERSION=${VERSION:-0.7.12} +VERSION=${VERSION:-0.7.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/spl-solaris/spl-solaris.info b/system/spl-solaris/spl-solaris.info index d360002d14..d9263db039 100644 --- a/system/spl-solaris/spl-solaris.info +++ b/system/spl-solaris/spl-solaris.info @@ -1,8 +1,8 @@ PRGNAM="spl-solaris" -VERSION="0.7.12" +VERSION="0.7.13" HOMEPAGE="https://zfsonlinux.org" -DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/spl-0.7.12.tar.gz" -MD5SUM="a4f0c6d96be206b357ff564f28d0975f" +DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/spl-0.7.13.tar.gz" +MD5SUM="b36a84314e7fc8ebb68affeb1e22a9dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/splix/README b/system/splix/README index 17714ab92e..f8a1037680 100644 --- a/system/splix/README +++ b/system/splix/README @@ -1,18 +1,14 @@ -SpliX is a set of CUPS printer drivers for SPL (Samsung Printer Language) -printers. It covers several Samsung and Xerox printers. See ppd/*.ppd in -the tarball for supported models. Only SPL2 and SPLc printers are -currently supported; however, work is in progress to implement support -for other SPL printers. +SpliX is a set of CUPS printer drivers for SPL (Samsung Printer +Language) printers. It covers several Samsung and Xerox printers. See +ppd/*.ppd in the tarball for supported models. Only SPL2 and SPLc +printers are supported. -IMPORTANT NOTICE: -If you are upgrading your current version, you MUST delete your printer -in the CUPS interface and install it again. This operation MUST be done -since CUPS caches a copy of the PPD file, so if the PPD changes from one -version of splix to the next, cups will still have the cached copy. +JBIG-KIT is an optional dependency. To build SpliX with support for JBIG printers: + JBIG=yes ./splix.SlackBuild -IMPORTANT NOTICE ABOUT THE JBIG ALGORITHM: -JBIG-KIT is an optional dependency for SpliX, but it seems that parts of this -algorithm was previously or is still patented. To disable the use of JBIG, add -NO_JBIG=1 when executing the build script: NO_JBIG=1 ./splix.SlackBuild -Unfortunately, JBIG printers (such as the CLP-600) won't work with SpliX if -the JBIG algorithm is disabled. +IMPORTANT: +If you are upgrading your current version, you MUST delete your +printer in the CUPS interface and install it again. This operation +MUST be done since CUPS caches a copy of the PPD file, so if the PPD +changes from one version of splix to the next, CUPS will still have +the cached copy. diff --git a/system/splix/splix.SlackBuild b/system/splix/splix.SlackBuild index 6b631c785c..52d2f8d914 100644 --- a/system/splix/splix.SlackBuild +++ b/system/splix/splix.SlackBuild @@ -2,11 +2,12 @@ # Slackware build script for splix # Written by Iskar Enev <iskar.enev[@]gmail.com> -# Currently maintained by Glenn Becker <burningc@sdf.lonestar.org> +# Currently maintained by endspiel <endspiel@disroot.org> PRGNAM=splix -VERSION=${VERSION:-2.0.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.0.0_76268c4} +SRCVERSION=${SRCVERSION:-76268c4dd7dbc8218ea7426401104c3b40cc707a} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -22,6 +23,9 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +[ ${JBIG:-no} = "yes" ] \ + && JBIGOPT=0 || JBIGOPT=1 + CUPSCFLAGS=$(cups-config --cflags) CUPSLDFLAGS=$(cups-config --ldflags) CUPSLIBS=$(cups-config --libs) @@ -42,17 +46,17 @@ else LIBDIRSUFFIX="" fi -# Whether or not to use JBIG (see README) -# 0 - enable JBIG (default), 1 - disable JBIG -NO_JBIG=${NO_JBIG:-0} - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +mkdir $PRGNAM-$VERSION +tar \ + -C $PRGNAM-$VERSION \ + --strip-components=2 \ + -xvf $CWD/$PRGNAM-$SRCVERSION.tar.bz2 $PRGNAM-$SRCVERSION/$PRGNAM cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -61,24 +65,23 @@ 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 {} \; -sed -i "s%\`cups-config --cflags\`%$CUPSCFLAGS%" module.mk -sed -i "s%\`cups-config --ldflags\`%$CUPSLDFLAGS%" module.mk -sed -i "s%\`cups-config --libs\`%$CUPSLIBS%" module.mk -sed -i "s%\`cups-config --serverbin\`%$CUPSSERVERBIN%" module.mk -sed -i "s%\`cups-config --datadir\`%$CUPSDATADIR%" module.mk - -sed -i 's#const PPDFile::Value::Value #const PPDFile::Value #' src/ppdfile.cpp +sed -e "s%\`cups-config --cflags\`%$CUPSCFLAGS%" \ + -e "s%\`cups-config --ldflags\`%$CUPSLDFLAGS%" \ + -e "s%\`cups-config --libs\`%$CUPSLIBS%" \ + -e "s%\`cups-config --serverbin\`%$CUPSSERVERBIN%" \ + -e "s%\`cups-config --datadir\`%$CUPSDATADIR%" \ + -i module.mk make \ V=1 \ - DISABLE_JBIG=$NO_JBIG \ + DISABLE_JBIG=$JBIGOPT \ OPTIM_CFLAGS="$SLKCFLAGS" \ OPTIM_CXXFLAGS="$SLKCFLAGS" mkdir -p ${PKG}${CUPSSERVERBIN}/filter ${PKG}${CUPSDATADIR}/model make install \ - DISABLE_JBIG=$NO_JBIG \ + DISABLE_JBIG=$JBIGOPT \ DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/splix/splix.info b/system/splix/splix.info index d18fff909d..d81de53ea6 100644 --- a/system/splix/splix.info +++ b/system/splix/splix.info @@ -1,10 +1,10 @@ PRGNAM="splix" -VERSION="2.0.0" -HOMEPAGE="http://splix.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/splix/splix-2.0.0.tar.bz2" -MD5SUM="f3aa735c22a926818b3d8b26c9964186" +VERSION="2.0.0_76268c4" +HOMEPAGE="https://gitlab.com/ScumCoder/splix" +DOWNLOAD="https://gitlab.com/ScumCoder/splix/-/archive/76268c4dd7dbc8218ea7426401104c3b40cc707a/splix-76268c4dd7dbc8218ea7426401104c3b40cc707a.tar.bz2" +MD5SUM="a7ef1c396b221b962c8f2b6838c67cbf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jbigkit" -MAINTAINER="Glenn Becker" -EMAIL="burningc@sdf.lonestar.org" +REQUIRES="" +MAINTAINER="endspiel" +EMAIL="endspiel@disroot.org" diff --git a/system/spman/README b/system/spman/README index 3bcd75af0f..26c997450e 100644 --- a/system/spman/README +++ b/system/spman/README @@ -27,6 +27,10 @@ Supported repositories: Alien's Alien's multilib +NOTE: + Make sure python3 is installed before building any dependencies + as we need Python3 bindings. + Optional dependencies: - sbbdep (for search dependency problems functionality) - tqdm (progress bar for some parameters) diff --git a/system/spman/spman.SlackBuild b/system/spman/spman.SlackBuild index 18cc2c58da..0a5d50e02c 100644 --- a/system/spman/spman.SlackBuild +++ b/system/spman/spman.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=spman -VERSION=${VERSION:-2.2.0} +VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/spman/spman.info b/system/spman/spman.info index 5f65b38bc5..ad07383348 100644 --- a/system/spman/spman.info +++ b/system/spman/spman.info @@ -1,8 +1,8 @@ PRGNAM="spman" -VERSION="2.2.0" +VERSION="2.2.2" HOMEPAGE="https://github.com/MyRequiem/spman" -DOWNLOAD="https://github.com/MyRequiem/spman/archive/2.2.0/spman-2.2.0.tar.gz" -MD5SUM="170e8b181e7b686251527e60f073c8cb" +DOWNLOAD="https://github.com/MyRequiem/spman/archive/2.2.2/spman-2.2.2.tar.gz" +MD5SUM="d3db7abfb252c2121a38975a1d1e0564" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3 python-requests" diff --git a/system/sqlcipher/sqlcipher.SlackBuild b/system/sqlcipher/sqlcipher.SlackBuild index e997211ef6..5ae180c8cb 100644 --- a/system/sqlcipher/sqlcipher.SlackBuild +++ b/system/sqlcipher/sqlcipher.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sqlcipher -# Copyright 2015, 2016, 2017 Mario Preksavec, Zagreb, Croatia +# Copyright 2015, 2021 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sqlcipher -VERSION=${VERSION:-3.4.1} +VERSION=${VERSION:-4.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,8 +56,7 @@ fi # Do not build TCL extension by default case ${WITH_TCL:-no} in - y|yes|Y|YES) : ;; - *) WITH_TCL="--disable-tcl" ;; + n*|N*) CONF_TCL="--disable-tcl" ;; esac set -e @@ -87,7 +86,7 @@ LDFLAGS="-lcrypto" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-tempstore=yes \ --disable-static \ - $WITH_TCL \ + $CONF_TCL \ --build=$ARCH-slackware-linux make diff --git a/system/sqlcipher/sqlcipher.info b/system/sqlcipher/sqlcipher.info index 3c87c1007c..04cde44605 100644 --- a/system/sqlcipher/sqlcipher.info +++ b/system/sqlcipher/sqlcipher.info @@ -1,8 +1,8 @@ PRGNAM="sqlcipher" -VERSION="3.4.1" +VERSION="4.4.2" HOMEPAGE="http://sqlcipher.net" -DOWNLOAD="https://github.com/sqlcipher/sqlcipher/archive/v3.4.1/sqlcipher-3.4.1.tar.gz" -MD5SUM="edd1c57129c21a22ab2c2fd7f47d4ccd" +DOWNLOAD="https://github.com/sqlcipher/sqlcipher/archive/v4.4.2/sqlcipher-4.4.2.tar.gz" +MD5SUM="c306b8f5de6bde3d7ae40bdb2ab5535c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/sqlite2/sqlite2.info b/system/sqlite2/sqlite2.info index 4176372a7d..aaa7b6674f 100644 --- a/system/sqlite2/sqlite2.info +++ b/system/sqlite2/sqlite2.info @@ -2,7 +2,7 @@ PRGNAM="sqlite2" VERSION="2.8.17_7" HOMEPAGE="http://www.sqlite.org" DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17.orig.tar.gz \ - http://ftp.de.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz" + http://archive.debian.org/debian/pool/main/s/sqlite/sqlite_2.8.17-7.diff.gz" MD5SUM="04f15ed552134b06528b3628be7d7315 \ 9d926474caaed0d12f2fb418bdcf1ccf" DOWNLOAD_x86_64="" diff --git a/system/st/doinst.sh b/system/st/doinst.sh deleted file mode 100644 index 492b5a6c42..0000000000 --- a/system/st/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -e /usr/bin/tic ]; then - /usr/bin/tic -s usr/share/st/st.info >/dev/null 2>&1 -fi diff --git a/system/st/st.SlackBuild b/system/st/st.SlackBuild index 35e8d6225f..38aecd74ee 100644 --- a/system/st/st.SlackBuild +++ b/system/st/st.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for st -# Copyright 2011-2018, Nikolay Korotkiy <sikmir@gmail.com> +# Copyright 2011-2020, Nikolay Korotkiy <sikmir@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified by the SlackBuilds.org project + PRGNAM=st -VERSION=${VERSION:-0.8.1} +VERSION=${VERSION:-0.8.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,13 +72,24 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Now apply any other patches that users might have added -for i in $(ls $CWD/patches); do +for i in $(ls $CWD/patches 2>/dev/null); do echo "Applying patch $i" patch -p1 < $CWD/patches/$i done # Remove "tic" line from Makefile - we cannot do this here! -sed -i "/^\t@tic/d" Makefile +#sed -i "/^\t@tic/d" Makefile + +# 20200123 bkw: Actually, yes we can: +sed -i "s|\\<tic\\>|& -o $PKG/usr/share/terminfo|" Makefile + +# Above sed command got broken by upstream (they removed the @) +# so files were being written to the real /usr, not $PKG/usr. +# Doing it this way means the terminfo stuff is cleanly removed +# when the package is removed. tic won't create the dir, so: +mkdir -p $PKG/usr/share/terminfo + +[ -f "$CWD/config.h" ] && cp -f $CWD/config.h config.h CFLAGS="$SLKCFLAGS" make && \ make install \ @@ -84,10 +97,6 @@ make install \ MANPREFIX=/usr/man \ DESTDIR=$PKG -# Incluse st.info in package -mkdir -p $PKG/usr/share/st -cp st.info $PKG/usr/share/st/ - 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 @@ -100,7 +109,6 @@ 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:-tgz} diff --git a/system/st/st.info b/system/st/st.info index 14cdc1c7e3..471bfcaa6a 100644 --- a/system/st/st.info +++ b/system/st/st.info @@ -1,8 +1,8 @@ PRGNAM="st" -VERSION="0.8.1" +VERSION="0.8.4" HOMEPAGE="https://st.suckless.org" -DOWNLOAD="https://dl.suckless.org/st/st-0.8.1.tar.gz" -MD5SUM="92135aecdba29300bb2e274a55f5b71e" +DOWNLOAD="https://dl.suckless.org/st/st-0.8.4.tar.gz" +MD5SUM="e00b074c0e5d55513745c99f027b7a34" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/steghide/README b/system/steghide/README new file mode 100644 index 0000000000..70510ec141 --- /dev/null +++ b/system/steghide/README @@ -0,0 +1,4 @@ +Steghide is a steganography program that is able to hide data in +various kinds of image- and audio-files. +The color- respectivly sample-frequencies are not changed thus making +the embedding resistant against first-order statistical tests. diff --git a/system/steghide/gcc-4.2.patch b/system/steghide/gcc-4.2.patch new file mode 100644 index 0000000000..36848dd4c0 --- /dev/null +++ b/system/steghide/gcc-4.2.patch @@ -0,0 +1,75 @@ +diff -Naur steghide-0.5.1.orig/src/AuData.h steghide-0.5.1.new/src/AuData.h +--- steghide-0.5.1.orig/src/AuData.h 2003-09-28 11:30:29.000000000 -0400 ++++ steghide-0.5.1.new/src/AuData.h 2007-06-28 17:22:44.000000000 -0400 +@@ -26,22 +26,30 @@ + + // AuMuLawAudioData + typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ; ++template<> + inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; } ++template<> + inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; } + + // AuPCM8AudioData + typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ; ++template<> + inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; } ++template<> + inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; } + + // AuPCM16AudioData + typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ; ++template<> + inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; } ++template<> + inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; } + + // AuPCM32AudioData + typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ; ++template<> + inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; } ++template<> + inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; } + + #endif // ndef SH_AUDATA_H +diff -Naur steghide-0.5.1.orig/src/AuSampleValues.cc steghide-0.5.1.new/src/AuSampleValues.cc +--- steghide-0.5.1.orig/src/AuSampleValues.cc 2003-09-28 11:30:30.000000000 -0400 ++++ steghide-0.5.1.new/src/AuSampleValues.cc 2007-06-28 17:23:52.000000000 -0400 +@@ -21,17 +21,25 @@ + #include "AuSampleValues.h" + + // AuMuLawSampleValue ++template<> + const BYTE AuMuLawSampleValue::MinValue = 0 ; ++template<> + const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ; + + // AuPCM8SampleValue ++template<> + const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ; ++template<> + const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ; + + // AuPCM16SampleValue ++template<> + const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ; ++template<> + const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ; + + // AuPCM32SampleValue ++template<> + const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ; ++template<> + const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ; +diff -Naur steghide-0.5.1.orig/src/MHashPP.cc steghide-0.5.1.new/src/MHashPP.cc +--- steghide-0.5.1.orig/src/MHashPP.cc 2003-10-05 06:17:50.000000000 -0400 ++++ steghide-0.5.1.new/src/MHashPP.cc 2007-06-28 17:22:44.000000000 -0400 +@@ -120,7 +120,7 @@ + + std::string MHashPP::getAlgorithmName (hashid id) + { +- char *name = mhash_get_hash_name (id) ; ++ char *name = (char *) mhash_get_hash_name (id) ; + std::string retval ; + if (name == NULL) { + retval = std::string ("<algorithm not found>") ; diff --git a/system/steghide/slack-desc b/system/steghide/slack-desc new file mode 100644 index 0000000000..d10db1c3d4 --- /dev/null +++ b/system/steghide/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------------------------------------------------------| +steghide: steghide (steganography program) +steghide: +steghide: Steghide is a steganography program that is able to hide data in +steghide: various kinds of image- and audio-files. +steghide: The color- respectivly sample-frequencies are not changed thus making +steghide: the embedding resistant against first-order statistical tests. +steghide: +steghide: +steghide: Project URL: http://steghide.sourceforge.net/ +steghide: +steghide: diff --git a/system/steghide/steghide-climits.patch b/system/steghide/steghide-climits.patch new file mode 100644 index 0000000000..a7e54f51c1 --- /dev/null +++ b/system/steghide/steghide-climits.patch @@ -0,0 +1,11 @@ +diff -ruN steghide-0.5.1.orig/src/Graph.cc steghide-0.5.1/src/Graph.cc +--- steghide-0.5.1.orig/src/Graph.cc 2003-10-11 23:54:26.000000000 +0200 ++++ steghide-0.5.1/src/Graph.cc 2008-12-14 14:23:27.000000000 +0100 +@@ -22,6 +22,7 @@ + #include <list> + #include <map> + #include <vector> ++#include <climits> + + #include "BitString.h" + #include "CvrStgFile.h" diff --git a/system/steghide/steghide-gcc6.patch b/system/steghide/steghide-gcc6.patch new file mode 100644 index 0000000000..a3a3067912 --- /dev/null +++ b/system/steghide/steghide-gcc6.patch @@ -0,0 +1,22 @@ +--- steghide-0.5.1/src/Arguments.h.orig 2018-06-09 11:04:48.795952519 +0000 ++++ steghide-0.5.1/src/Arguments.h 2018-06-09 11:00:57.239290249 +0000 +@@ -100,7 +100,7 @@ + static const VERBOSITY Default_Verbosity = NORMAL ; + static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats + static const unsigned int Max_Algorithm = 3 ; +- static const float Default_Goal = 100.0 ; ++ static constexpr float Default_Goal = 100.0 ; + static const DEBUGCOMMAND Default_DebugCommand = NONE ; + static const bool Default_Check = false ; + static const unsigned int Default_DebugLevel = 0 ; +--- steghide-0.5.1/src/ProgressOutput.h.orig 2018-06-09 11:01:44.662622682 +0000 ++++ steghide-0.5.1/src/ProgressOutput.h 2018-06-09 11:01:57.755955767 +0000 +@@ -64,7 +64,7 @@ + **/ + void done (float rate, float avgweight = NoAvgWeight) const ; + +- static const float NoAvgWeight = -1.0 ; ++ static constexpr float NoAvgWeight = -1.0 ; + + protected: + std::string vcompose (const char *msgfmt, va_list ap) const ; diff --git a/system/steghide/steghide.SlackBuild b/system/steghide/steghide.SlackBuild new file mode 100644 index 0000000000..ce643226b8 --- /dev/null +++ b/system/steghide/steghide.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for steghide + +# Copyright 2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# 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. + +PRGNAM=steghide +VERSION=${VERSION:-0.5.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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.bz2 +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 {} \; + +# Thanks to Arch Linux for these patches +patch -p1 < $CWD/gcc-4.2.patch +patch -p1 < $CWD/steghide-climits.patch + +# This patch is for -current +#patch -p1 < $CWD/steghide-gcc6.patch + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 BUGS COPYING CREDITS HISTORY INSTALL README TODO $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:-tgz} diff --git a/system/steghide/steghide.info b/system/steghide/steghide.info new file mode 100644 index 0000000000..ff45c520a0 --- /dev/null +++ b/system/steghide/steghide.info @@ -0,0 +1,10 @@ +PRGNAM="steghide" +VERSION="0.5.1" +HOMEPAGE="http://steghide.sourceforge.net/" +DOWNLOAD="http://prdownloads.sourceforge.net/steghide/steghide-0.5.1.tar.bz2" +MD5SUM="cf37f7ac51d36f66a8d6d155bbc90f17" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/system/stegseek/README b/system/stegseek/README new file mode 100644 index 0000000000..e83ddcf068 --- /dev/null +++ b/system/stegseek/README @@ -0,0 +1 @@ +stegseek is a fast steghide cracker diff --git a/system/stegseek/slack-desc b/system/stegseek/slack-desc new file mode 100644 index 0000000000..0d7e28d046 --- /dev/null +++ b/system/stegseek/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------------------------------------------------------| +stegseek: stegseek (fast steghide cracker) +stegseek: +stegseek: a fast steghide cracker +stegseek: +stegseek: +stegseek: +stegseek: +stegseek: +stegseek: +stegseek: +stegseek: diff --git a/system/stegseek/stegseek.SlackBuild b/system/stegseek/stegseek.SlackBuild new file mode 100644 index 0000000000..f0dc0bcf28 --- /dev/null +++ b/system/stegseek/stegseek.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/sh + +# Slackware build script for stegseek + +# Copyright 2021 toolonely <lonely_@tutanota.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. + +PRGNAM=stegseek +VERSION=${VERSION:-0.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_STANDARD:STRING=11 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -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 + +mkdir -p $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:-tgz} diff --git a/system/stegseek/stegseek.info b/system/stegseek/stegseek.info new file mode 100644 index 0000000000..5b3c57ea31 --- /dev/null +++ b/system/stegseek/stegseek.info @@ -0,0 +1,10 @@ +PRGNAM="stegseek" +VERSION="0.5" +HOMEPAGE="https://github.com/RickdeJager/stegseek" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/RickdeJager/stegseek/archive/v0.5/stegseek-0.5.tar.gz" +MD5SUM_x86_64="d8f0ed0cabea7ab95262de9d65f017ce" +REQUIRES="" +MAINTAINER="toolonely" +EMAIL="lonely_@tutanota.com" diff --git a/system/stow/stow.SlackBuild b/system/stow/stow.SlackBuild index 331021e003..f6189b5089 100644 --- a/system/stow/stow.SlackBuild +++ b/system/stow/stow.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for stow -# Copyright 2018 Pedro R.M. Júnior, Campinas, SP, Brazil +# Copyright 2018, 2019 Pedro R.M. Júnior, Campinas, SP, Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=stow -VERSION=${VERSION:-2.2.2} +VERSION=${VERSION:-2.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,6 +62,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -87,7 +88,7 @@ rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info* cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ + AUTHORS COPYING ChangeLog INSTALL.md NEWS README.md THANKS TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/stow/stow.info b/system/stow/stow.info index 89bd7d82f0..2b4c944068 100644 --- a/system/stow/stow.info +++ b/system/stow/stow.info @@ -1,8 +1,8 @@ PRGNAM="stow" -VERSION="2.2.2" +VERSION="2.3.1" HOMEPAGE="https://www.gnu.org/software/stow" -DOWNLOAD="https://ftp.gnu.org/gnu/stow/stow-2.2.2.tar.bz2" -MD5SUM="af1e1de9d973c835bee80c745b5ee849" +DOWNLOAD="https://ftp.gnu.org/gnu/stow/stow-2.3.1.tar.bz2" +MD5SUM="d18bea2eb6369f52af8cdb9c91bc93ac" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/stress-ng/stress-ng.SlackBuild b/system/stress-ng/stress-ng.SlackBuild index 4ecf19207b..18ecea0125 100644 --- a/system/stress-ng/stress-ng.SlackBuild +++ b/system/stress-ng/stress-ng.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for stress-ng -# Copyright 2018 David Woodfall <dave@dawoodfall.net> +# Copyright 2018 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=stress-ng VERSION=${VERSION:-0.09.48} BUILD=${BUILD:-1} -TAG=${TAG:-daw} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/stress-ng/stress-ng.info b/system/stress-ng/stress-ng.info index 65cf8489c2..8c292bea66 100644 --- a/system/stress-ng/stress-ng.info +++ b/system/stress-ng/stress-ng.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +EMAIL="dave@slackbuilds.org" diff --git a/system/sunflower/README b/system/sunflower/README new file mode 100644 index 0000000000..711a5bd496 --- /dev/null +++ b/system/sunflower/README @@ -0,0 +1,5 @@ +Sunflower is a small and highly customizable twin-panel file manager +with support for plugins. It contains a built-in terminal. + +Sunflower 0.4 requires GTK+ 3.22 (and thus is unsupported on +Slackware 14.2). diff --git a/system/fs-uae-launcher/doinst.sh b/system/sunflower/doinst.sh index 65c7e2eeb9..65c7e2eeb9 100644 --- a/system/fs-uae-launcher/doinst.sh +++ b/system/sunflower/doinst.sh diff --git a/system/sunflower/slack-desc b/system/sunflower/slack-desc new file mode 100644 index 0000000000..633b0afd27 --- /dev/null +++ b/system/sunflower/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------------------------------------------------------| +sunflower: sunflower (Twin-panel file manager) +sunflower: +sunflower: Sunflower is a small and highly customizable twin-panel file manager +sunflower: with support for plugins. +sunflower: +sunflower: +sunflower: +sunflower: +sunflower: +sunflower: +sunflower: diff --git a/system/sunflower/sunflower.SlackBuild b/system/sunflower/sunflower.SlackBuild new file mode 100644 index 0000000000..a4d545f82a --- /dev/null +++ b/system/sunflower/sunflower.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for sunflower +# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.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. + +PRGNAM=sunflower +VERSION=${VERSION:-0.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +COMMIT=61 + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 Sunflower +tar xvf $CWD/$PRGNAM-$VERSION-$COMMIT.tgz +cd Sunflower +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 {} \; + +# Treat sunflower as an executable +mkdir -p "$PKG/usr/bin" +[ ! -f "$PKG/usr/bin/sunflower" ] \ + && echo -e '#!/bin/bash\nexec python /usr/share/sunflower/Sunflower.py "$@"' > "$PKG/usr/bin/sunflower" +chmod 755 "$PKG/usr/bin/sunflower" + +# Copy other files +mkdir -p "$PKG/usr/share/sunflower" +cp -r Sunflower.py application images translations "$PKG/usr/share/sunflower/" +install -Dm644 Sunflower.desktop "$PKG/usr/share/applications/sunflower.desktop" +install -Dm644 images/sunflower.svg "$PKG/usr/share/pixmaps/sunflower.svg" +install -Dm644 images/sunflower.png "$PKG/usr/share/pixmaps/sunflower.png" + +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 +cp AUTHORS CHANGES COPYING DEPENDS LICENSE README.md TODO $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:-tgz} diff --git a/system/sunflower/sunflower.info b/system/sunflower/sunflower.info new file mode 100644 index 0000000000..e2d5a51dc6 --- /dev/null +++ b/system/sunflower/sunflower.info @@ -0,0 +1,10 @@ +PRGNAM="sunflower" +VERSION="0.3" +HOMEPAGE="https://sunflower-fm.org" +DOWNLOAD="https://sunflower-fm.org/pub/sunflower-0.3-61.tgz" +MD5SUM="a5cd28438e83b88e5a4edeb3aacef0c6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python-chardet" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu1@isaacyu1.com" diff --git a/system/symbola-font-ttf/README b/system/symbola-font-ttf/README index 45fd94f070..9744e70cd7 100644 --- a/system/symbola-font-ttf/README +++ b/system/symbola-font-ttf/README @@ -1,2 +1,6 @@ -Symbola is a ttf font, which contains many scripts, special symbols, +Symbola is a otf font, which contains many scripts, special symbols, and emoji characters supported by The Unicode Standard. + +Symbola is free strictly for personal, non-commercial use. + +This script also creates the ttf font file using the FontForge. diff --git a/system/symbola-font-ttf/doinst.sh b/system/symbola-font-ttf/doinst.sh index 883c47ac0a..ed20b4faf0 100644 --- a/system/symbola-font-ttf/doinst.sh +++ b/system/symbola-font-ttf/doinst.sh @@ -1,6 +1,9 @@ # Update the X font indexes: if [ -x /usr/bin/mkfontdir ]; then - ( cd /usr/share/fonts/TTF + ( cd /usr/share/fonts/OTF + mkfontscale . + mkfontdir . + cd /usr/share/fonts/TTF mkfontscale . mkfontdir . ) diff --git a/system/symbola-font-ttf/slack-desc b/system/symbola-font-ttf/slack-desc index 3426eec538..7276850d5a 100644 --- a/system/symbola-font-ttf/slack-desc +++ b/system/symbola-font-ttf/slack-desc @@ -11,9 +11,9 @@ symbola-font-ttf: symbola-font-ttf: Symbola is a ttf font, which contains many scripts, special symbols, symbola-font-ttf: and emoji characters supported by The Unicode Standard. symbola-font-ttf: -symbola-font-ttf: It was created by George Douros. +symbola-font-ttf: Symbola is free strictly for personal, non-commercial use. symbola-font-ttf: -symbola-font-ttf: symbola-font-ttf home: http://users.teilar.gr/~g1951d/ +symbola-font-ttf: Homepage: https://dn-works.com/ufas/ symbola-font-ttf: symbola-font-ttf: symbola-font-ttf: diff --git a/system/symbola-font-ttf/symbola-font-ttf.SlackBuild b/system/symbola-font-ttf/symbola-font-ttf.SlackBuild index d17da1010e..0c3420e93e 100644 --- a/system/symbola-font-ttf/symbola-font-ttf.SlackBuild +++ b/system/symbola-font-ttf/symbola-font-ttf.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for symbola-font-ttf -# Copyright 2016-2017 Alexander Verbovetsky, Moscow, Russia +# Copyright 2016-2020 Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=symbola-font-ttf -VERSION=${VERSION:-10.24} +VERSION=${VERSION:-13.00} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,19 +42,17 @@ cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION -unzip $CWD/symbola-font-ttf-${VERSION}.zip -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 {} \; +unzip $CWD/Symbola.zip -mkdir -p $PKG/usr/share/fonts/TTF/ -cp -a hintedSymbola.ttf $PKG/usr/share/fonts/TTF/ +fontforge -lang=ff -c 'Open("Symbola.otf");Generate("Symbola.ttf");Close();' + +mkdir -p $PKG/usr/share/fonts/{O,T}TF/ +install -m 0644 -o root -g root Symbola.otf $PKG/usr/share/fonts/OTF/ +install -m 0644 -o root -g root Symbola.ttf $PKG/usr/share/fonts/TTF/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Symbola.pdf Symbola.odt $PKG/usr/doc/$PRGNAM-$VERSION +install -m 0644 -o root -g root Symbola.odt Symbola.pdf $CWD/License.pdf \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/symbola-font-ttf/symbola-font-ttf.info b/system/symbola-font-ttf/symbola-font-ttf.info index 1d534b401a..c2a8c85655 100644 --- a/system/symbola-font-ttf/symbola-font-ttf.info +++ b/system/symbola-font-ttf/symbola-font-ttf.info @@ -1,10 +1,12 @@ PRGNAM="symbola-font-ttf" -VERSION="10.24" -HOMEPAGE="http://users.teilar.gr/~g1951d/" -DOWNLOAD="http://downloads.sourceforge.net/slackbuildsdirectlinks/symbola-font-ttf-10.24.zip" -MD5SUM="359d6b29e337f7259fb84a0569b56a53" +VERSION="13.00" +HOMEPAGE="https://dn-works.com/ufas/" +DOWNLOAD="https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/Symbola.zip \ + https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf" +MD5SUM="a14dda162bd1cb407059f62d77fcc5ea \ + bb6edb616a86a98826cd269486b095b5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="fontforge" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/system/sysbench/README b/system/sysbench/README new file mode 100644 index 0000000000..ad4a872557 --- /dev/null +++ b/system/sysbench/README @@ -0,0 +1,4 @@ +sysbench is a benchmark suite which allows you to quickly get an +impression of system performance which is important if you plan to +run a database under intensive load. This article explains how to +benchmark your CPU, file IO, and MySQL performance with sysbench. diff --git a/system/sysbench/slack-desc b/system/sysbench/slack-desc new file mode 100644 index 0000000000..792f18d6d7 --- /dev/null +++ b/system/sysbench/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 ':'. + + |-----handy-ruler------------------------------------------------------| +sysbench: sysbench (benchmark suite) +sysbench: +sysbench: sysbench is a benchmark suite which allows you to quickly get an +sysbench: impression of system performance which is important if you plan to +sysbench: run a database under intensive load. This article explains how to +sysbench: benchmark your CPU, file IO, and MySQL performance with sysbench. +sysbench: +sysbench: +sysbench: +sysbench: +sysbench: diff --git a/system/sysbench/sysbench.SlackBuild b/system/sysbench/sysbench.SlackBuild new file mode 100644 index 0000000000..69dc96805f --- /dev/null +++ b/system/sysbench/sysbench.SlackBuild @@ -0,0 +1,103 @@ +#!/bin/sh + +# Slackware build script for sysbench + +# Copyright 2020 Sergio Vicari <devteamtuc[at]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. + +PRGNAM=sysbench +VERSION=${VERSION:-1.0.19} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" \ +./autogen.sh +./configure \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + --bindir=/usr/bin \ + --datarootdir=/usr/share \ + --datadir=/usr/share \ + --htmldir=/usr/doc/$PRGNAM-$VERSION/html + +make +make install 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 + + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README.md README-Oracle.md ChangeLog COPYING \ + $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:-tgz} diff --git a/system/sysbench/sysbench.info b/system/sysbench/sysbench.info new file mode 100644 index 0000000000..ff5bc4deaa --- /dev/null +++ b/system/sysbench/sysbench.info @@ -0,0 +1,10 @@ +PRGNAM="sysbench" +VERSION="1.0.19" +HOMEPAGE="https://github.com/akopytov/sysbench" +DOWNLOAD="https://github.com/akopytov/sysbench/archive/1.0.19/sysbench-1.0.19.tar.gz" +MD5SUM="2912bfe7238cac7351459019a84e2557" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="lua" +MAINTAINER="Sergio Vicari" +EMAIL="devteamtuc@gmail.com" diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild index aa84cac1d5..6ef570486d 100644 --- a/system/sysdig/sysdig.SlackBuild +++ b/system/sysdig/sysdig.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sysdig -# Copyright 2015-2018 Larry Hajali <larryhaja[at]gmail[dot]com> +# Copyright 2015-2020 Larry Hajali <larryhaja[at]gmail[dot]com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sysdig -VERSION=${VERSION:-0.24.1} +VERSION=${VERSION:-0.26.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/sysdig/sysdig.info b/system/sysdig/sysdig.info index 61f0494c16..0e203261da 100644 --- a/system/sysdig/sysdig.info +++ b/system/sysdig/sysdig.info @@ -1,10 +1,10 @@ PRGNAM="sysdig" -VERSION="0.24.1" +VERSION="0.26.6" HOMEPAGE="https://www.sysdig.org" -DOWNLOAD="https://github.com/draios/sysdig/archive/0.24.1/sysdig-0.24.1.tar.gz" -MD5SUM="180a7332e159b0e24cd19df5214dd803" +DOWNLOAD="https://github.com/draios/sysdig/archive/0.26.6/sysdig-0.26.6.tar.gz" +MD5SUM="60f9498c97b6e69639a8be8e9d6ed032" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jsoncpp lua libb64 jq tbb" +REQUIRES="jsoncpp lua libb64 jq tbb grpc gtest" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" diff --git a/system/syslog-ng/syslog-ng.SlackBuild b/system/syslog-ng/syslog-ng.SlackBuild index 06c9d5b7cc..8a199d7a02 100644 --- a/system/syslog-ng/syslog-ng.SlackBuild +++ b/system/syslog-ng/syslog-ng.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for syslog-ng -# Copyright 2010, 2012, 2013, 2016, 2017 Mario Preksavec, Zagreb, Croatia +# Copyright 2010, 2012, 2013, 2016, 2017, 2019 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/syslog-ng/syslog-ng.conf b/system/syslog-ng/syslog-ng.conf index 1770521d79..8ef417f569 100644 --- a/system/syslog-ng/syslog-ng.conf +++ b/system/syslog-ng/syslog-ng.conf @@ -5,6 +5,7 @@ # For info about the format of this file, see "man syslog-ng.conf" # Written by Mario Preksavec <mario at slackware dot hr> # Updated by Janos Szigetvari <jszigetvari at gmail dot com> +# Thanks to Andrea Biardi <a.biardi at tiscali dot it> options { flush_lines(0); @@ -45,7 +46,15 @@ destination d_debug { file("/var/log/debug"); }; destination d_secure { file("/var/log/secure"); }; destination d_cron { file("/var/log/cron"); }; destination d_maillog { file("/var/log/maillog"); }; -destination d_usertty { usertty("*"); }; +destination d_usertty { + usertty("*"); + # Notify all logged-in users; note that, although running as root, + # syslog-ng drops some key capabilities at runtime, so the process + # must belong to the tty group in order to be able to open /dev/tty* + # and /dev/pts/* for writing. + # This can be done either by running sylog-ng with "-g tty" or by + # adding root to the "tty" group. +}; destination d_spooler { file("/var/log/spooler"); }; # Log anything 'info' or higher, but lower than 'warn'. diff --git a/system/system76-io-dkms/README b/system/system76-io-dkms/README new file mode 100644 index 0000000000..66dbcbc7b9 --- /dev/null +++ b/system/system76-io-dkms/README @@ -0,0 +1,17 @@ +DKMS module for controlling System76 Io board. + +This kernel module enables reading/controlling the fan speed of fans plugged +into the System76 Io board on Thelio desktops. + +To ensure loading of the system76-io kernel module, you may need to add +modprobe system76-io +to /etc/rc.d/rc.modules.local. + +See system76-power (available on SBo) for a daemon to control the fan speed. + +The system76-io dkms module is automatically registered with dkms by +doinst.sh with the following command: +dkms install system76-io/$VER + +Old versions of system76-io should be manually unregistered from dkms using: +dkms remove system76-io/$OLD_VER --all diff --git a/system/system76-io-dkms/doinst.sh b/system/system76-io-dkms/doinst.sh new file mode 100644 index 0000000000..6b33ed6c28 --- /dev/null +++ b/system/system76-io-dkms/doinst.sh @@ -0,0 +1,7 @@ +VER=@MODULE_VERSION@ +dkms install system76-io/$VER + +# Before removing the system76-io package, the following command should +# be run to unregister the module from dkms: +# +# dkms remove system76-io/$VER --all diff --git a/system/system76-io-dkms/slack-desc b/system/system76-io-dkms/slack-desc new file mode 100644 index 0000000000..dda12d5b94 --- /dev/null +++ b/system/system76-io-dkms/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------------------------------------------------------| +system76-io-dkms: system76-io-dkms (DKMS module for controlling System76 Io board) +system76-io-dkms: +system76-io-dkms: This kernel module enables reading/controlling the fan speed of fans +system76-io-dkms: plugged into the System76 Io board on Thelio desktops. +system76-io-dkms: +system76-io-dkms: The kernel module is named system76-io. +system76-io-dkms: +system76-io-dkms: Homepage: https://github.com/pop-os/system76-io-dkms +system76-io-dkms: +system76-io-dkms: +system76-io-dkms: diff --git a/system/system76-io-dkms/system76-io-dkms.SlackBuild b/system/system76-io-dkms/system76-io-dkms.SlackBuild new file mode 100644 index 0000000000..3b9dead3d7 --- /dev/null +++ b/system/system76-io-dkms/system76-io-dkms.SlackBuild @@ -0,0 +1,83 @@ +#!/bin/sh + +# Slackware build script for system76-io-dkms + +# Copyright 2019 Erich Ritz, Scottsdale, Arizona, USA +# 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. + +PRGNAM=system76-io-dkms +MODNAM=system76-io +VERSION=${VERSION:-1.0.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +if [ -e $CWD/$VERSION.tar.gz ]; then + tar xvf $CWD/$VERSION.tar.gz +else + tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +fi +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 {} \; + +# Install source files +mkdir -p $PKG/usr/src/$MODNAM-$VERSION +cp -a \ + Makefile ./*.c \ + $PKG/usr/src/$MODNAM-$VERSION + +# Edit and install dkms configuration +sed "s/@MODULE_VERSION@/${VERSION}/" "debian/system76-io-dkms.dkms" > "$PKG/usr/src/$MODNAM-$VERSION/dkms.conf" + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + LICENSE* README* \ + $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 +sed "s/@MODULE_VERSION@/${VERSION}/" "$CWD/doinst.sh" > "$PKG/install/doinst.sh" + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/system76-io-dkms/system76-io-dkms.info b/system/system76-io-dkms/system76-io-dkms.info new file mode 100644 index 0000000000..e4d59ba66a --- /dev/null +++ b/system/system76-io-dkms/system76-io-dkms.info @@ -0,0 +1,10 @@ +PRGNAM="system76-io-dkms" +VERSION="1.0.1" +HOMEPAGE="https://github.com/pop-os/system76-io-dkms" +DOWNLOAD="https://github.com/pop-os/system76-io-dkms/archive/1.0.1/system76-io-dkms-1.0.1.tar.gz" +MD5SUM="7b78b9397bac972ebe4503262fea33c4" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="dkms" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com" diff --git a/system/system76-power/README b/system/system76-power/README new file mode 100644 index 0000000000..6e1f40fa8f --- /dev/null +++ b/system/system76-power/README @@ -0,0 +1,25 @@ +system76-power is a utility for managing graphics and power profiles. + +When run in daemon mode, system76-power manages the fan speed of fans +connected to the System76 Io board on Thelio desktops. + +To start the daemon at boot, add the following to your +/etc/rc.d/rc.local script and make sure rc.system76-power has executable +permissions set: + if [ -x /etc/rc.d/rc.system76-power ]; then + /etc/rc.d/rc.system76-power start + fi + +The system76-power daemon log messages are logged to +/var/log/system76-power.log by default. Logging can be disabled by +setting LOG_FILE=/dev/null in /etc/rc.d/rc.system76-power. + +This project is pinned to a specific Rust version, currently 1.41.0. As +such, rustup is a compile time only dependency. If this specific +version of the Rust toolchain is not already installed, it will be +downloaded and installed automatically during build script execution. +It can be installed manually beforehand by running + rustup toolchain install 1.41.0 + +NOTE: The directions in rustup's README must be followed so that the +rust installed by rustup is preferred over the system rust. diff --git a/system/system76-power/config/rc.system76-power b/system/system76-power/config/rc.system76-power new file mode 100644 index 0000000000..93e3e25dfa --- /dev/null +++ b/system/system76-power/config/rc.system76-power @@ -0,0 +1,60 @@ +#!/bin/sh +# Start system76-power daemon +# + +LOG_FILE=/var/log/system76-power.log + +add_log_msg() { + echo "[$(date "+%Y-%m-%d %T")] $1" >> $LOG_FILE +} + +s76pwr_start() { + PWR_DIR=/usr/bin + if [ -x $PWR_DIR/system76-power ] ; then + echo "Starting system76-power..." + add_log_msg "Starting system76-power daemon from /etc/rc.d/rc.system76-power" + $PWR_DIR/system76-power daemon >>$LOG_FILE 2>&1 & + fi +} + +s76pwr_stop() { + add_log_msg "Killing system76-power daemon from /etc/rc.d/rc.system76-power" + killall system76-power 2> /dev/null +} + +s76pwr_restart() { + s76pwr_stop + sleep 1 + s76pwr_start +} + +s76pwr_help() { + cat <<EOF +usage: $0 start|stop|restart + +$0 start + Starts the system76-power daemon + +$0 stop + Stops the system76-power daemon + +$0 restart + Restarts the system76-power daemon + +EOF +} + +case "$1" in +'start') + s76pwr_start + ;; +'stop') + s76pwr_stop + ;; +'restart') + s76pwr_restart + ;; +*) + s76pwr_help + ;; +esac diff --git a/system/system76-power/config/system76-power.logrotate b/system/system76-power/config/system76-power.logrotate new file mode 100644 index 0000000000..513d6193ed --- /dev/null +++ b/system/system76-power/config/system76-power.logrotate @@ -0,0 +1,8 @@ +/var/log/system76-power.log { + copytruncate + delaycompress + compress + notifempty + missingok + size 1M +} diff --git a/system/system76-power/doinst.sh b/system/system76-power/doinst.sh new file mode 100644 index 0000000000..c7e601af05 --- /dev/null +++ b/system/system76-power/doinst.sh @@ -0,0 +1,26 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.system76-power.new +config etc/logrotate.d/system76-power.new diff --git a/system/system76-power/slack-desc b/system/system76-power/slack-desc new file mode 100644 index 0000000000..585ae4237d --- /dev/null +++ b/system/system76-power/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------------------------------------------------------| +system76-power: system76-power (utility for managing graphics and power profiles) +system76-power: +system76-power: When run in daemon mode, system76-power manages the fan speed of fans +system76-power: connected to the System76 Io board on Thelio desktops. +system76-power: +system76-power: Homepage: https://github.com/pop-os/system76-power +system76-power: +system76-power: +system76-power: +system76-power: +system76-power: diff --git a/system/system76-power/system76-power.SlackBuild b/system/system76-power/system76-power.SlackBuild new file mode 100644 index 0000000000..a149369ba6 --- /dev/null +++ b/system/system76-power/system76-power.SlackBuild @@ -0,0 +1,245 @@ +#!/bin/sh + +# Slackware build script for system76-power + +# Copyright 2019-2021 Erich Ritz, Scottsdale, Arizona, USA +# 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. + +PRGNAM=system76-power +VERSION=${VERSION:-1.1.16} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac + + if [ "$ARCH" = "i586" ]; then + if rustc -Vv | grep host | grep i686 > /dev/null ; then + ARCH=i686 + fi + fi +fi + +CWD=$(pwd) +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 +if [ -e $CWD/$VERSION.tar.gz ]; then + tar xvf $CWD/$VERSION.tar.gz +else + tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +fi +cd $PRGNAM-$VERSION + +# build offline +# configuration tells cargo to use the configured directory +# for dependencies intead of downloading from crates.io +mkdir .cargo +cat << EOF >> .cargo/config +[source.crates-io] +replace-with = "vendored-sources" + +[source."https://github.com/pop-os/sysfs-class"] +git = "https://github.com/pop-os/sysfs-class" +branch = "master" +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "$(pwd)/vendor" +EOF + +mkdir vendor +# deps and versions come from Cargo.lock +( + cd vendor + + for dependency in \ + ansi_term=0.11.0 \ + atty=0.2.14 \ + bitflags=1.2.1 \ + bytes=0.5.6 \ + cc=1.0.67 \ + cfg-if=0.1.10 \ + cfg-if=1.0.0 \ + clap=2.33.3 \ + dbus=0.9.2 \ + dbus-crossroads=0.3.0 \ + dbus-tokio=0.6.0 \ + err-derive=0.2.4 \ + fern=0.6.0 \ + fuchsia-zircon=0.3.3 \ + fuchsia-zircon-sys=0.3.3 \ + futures-channel=0.3.12 \ + futures-core=0.3.12 \ + futures-io=0.3.12 \ + futures-macro=0.3.12 \ + futures-task=0.3.12 \ + futures-util=0.3.12 \ + hermit-abi=0.1.18 \ + hidapi=1.2.5 \ + inotify=0.8.3 \ + inotify-sys=0.1.5 \ + intel-pstate=0.2.1 \ + iovec=0.1.4 \ + itoa=0.4.7 \ + kernel32-sys=0.2.2 \ + lazy_static=1.4.0 \ + libc=0.2.86 \ + libdbus-sys=0.2.1 \ + log=0.4.14 \ + memchr=2.3.4 \ + mio=0.6.23 \ + mio-uds=0.6.8 \ + miow=0.2.2 \ + net2=0.2.37 \ + num_cpus=1.13.0 \ + numtoa=0.2.3 \ + once_cell=1.6.0 \ + pin-project-lite=0.1.11 \ + pin-project-lite=0.2.4 \ + pin-utils=0.1.0 \ + pkg-config=0.3.19 \ + proc-macro-error=1.0.4 \ + proc-macro-error-attr=1.0.4 \ + proc-macro-hack=0.5.19 \ + proc-macro-nested=0.1.7 \ + proc-macro2=1.0.24 \ + quote=1.0.9 \ + rustversion=1.0.4 \ + ryu=1.0.5 \ + serde=1.0.123 \ + serde_derive=1.0.123 \ + serde_json=1.0.62 \ + signal-hook-registry=1.3.0 \ + slab=0.4.2 \ + smart-default=0.6.0 \ + strsim=0.8.0 \ + syn=1.0.60 \ + synstructure=0.12.4 \ + sysfs-class=0.1.3 \ + textwrap=0.11.0 \ + tokio=0.2.25 \ + tokio-macros=0.2.6 \ + unicode-width=0.1.8 \ + unicode-xid=0.2.1 \ + vec_map=0.8.2 \ + version_check=0.9.2 \ + winapi=0.2.8 \ + winapi=0.3.9 \ + winapi-build=0.1.1 \ + winapi-i686-pc-windows-gnu=0.4.0 \ + winapi-x86_64-pc-windows-gnu=0.4.0 \ + ws2_32-sys=0.2.1; do + + dep="$(echo "$dependency" | cut -d= -f1)" + ver="$(echo "$dependency" | cut -d= -f2)" + + if [ -e $CWD/$dep-$ver.crate ]; then + CRATE_FILE=$CWD/$dep-$ver.crate + else + if [ -e $CWD/$ver.tar.gz ]; then + CRATE_FILE=$CWD/$ver.tar.gz + else + CRATE_FILE=$CWD/$dep-$ver.tar.gz + fi + fi + tar xvf $CRATE_FILE + + touch $dep-$ver/.cargo-ok + + # generate checksum + { + printf "{\n" + printf ' "files": {\n' + + ( + cd $dep-$ver + find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/' + ) | sed '$ s/,$//' + + printf " },\n" + printf ' "package": "' + + sha256sum "$CRATE_FILE" | cut -f1 -d' ' | sed 's/$/"/' + + printf "}\n" + } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + # Change selected package checksums to null + if [ "$dep" == "sysfs-class" ] ; then + sed -i 's/"package" : ".\{64\}"/"package" : null/' $dep-$ver/.cargo-checksum.json + fi + done +) + +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" \ +libdir=/usr/lib${LIBDIRSUFFIX} \ +make +make install 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 + +mkdir -p $PKG/etc/logrotate.d $PKG/etc/rc.d +install -m 0644 $CWD/config/system76-power.logrotate $PKG/etc/logrotate.d/system76-power.new +install -m 0644 $CWD/config/rc.system76-power $PKG/etc/rc.d/rc.system76-power.new + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a 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:-tgz} diff --git a/system/system76-power/system76-power.info b/system/system76-power/system76-power.info new file mode 100644 index 0000000000..940ac9a283 --- /dev/null +++ b/system/system76-power/system76-power.info @@ -0,0 +1,162 @@ +PRGNAM="system76-power" +VERSION="1.1.16" +HOMEPAGE="https://github.com/pop-os/system76-power" +DOWNLOAD="https://github.com/pop-os/system76-power/archive/1.1.16/system76-power-1.1.16.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ansi_term/ansi_term-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/atty/atty-0.2.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bitflags/bitflags-1.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/bytes/bytes-0.5.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cc/cc-1.0.67.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-0.1.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cfg-if/cfg-if-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus/dbus-0.9.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus-crossroads/dbus-crossroads-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/dbus-tokio/dbus-tokio-0.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/err-derive/err-derive-0.2.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fern/fern-0.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon/fuchsia-zircon-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/fuchsia-zircon-sys/fuchsia-zircon-sys-0.3.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-channel/futures-channel-0.3.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-core/futures-core-0.3.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-io/futures-io-0.3.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-macro/futures-macro-0.3.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-task/futures-task-0.3.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/futures-util/futures-util-0.3.12.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hermit-abi/hermit-abi-0.1.18.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/hidapi/hidapi-1.2.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify/inotify-0.8.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/inotify-sys/inotify-sys-0.1.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/intel-pstate/intel-pstate-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/iovec/iovec-0.1.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/itoa/itoa-0.4.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/kernel32-sys/kernel32-sys-0.2.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.86.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libdbus-sys/libdbus-sys-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/log/log-0.4.14.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/memchr/memchr-2.3.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/mio/mio-0.6.23.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/mio-uds/mio-uds-0.6.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/miow/miow-0.2.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/net2/net2-0.2.37.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/num_cpus/num_cpus-1.13.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/numtoa/numtoa-0.2.3.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.1.11.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-project-lite/pin-project-lite-0.2.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pin-utils/pin-utils-0.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/pkg-config/pkg-config-0.3.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error/proc-macro-error-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-error-attr/proc-macro-error-attr-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-hack/proc-macro-hack-0.5.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro-nested/proc-macro-nested-0.1.7.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-1.0.24.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/quote/quote-1.0.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rustversion/rustversion-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ryu/ryu-1.0.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde/serde-1.0.123.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_derive/serde_derive-1.0.123.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/serde_json/serde_json-1.0.62.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/signal-hook-registry/signal-hook-registry-1.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/slab/slab-0.4.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/smart-default/smart-default-0.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/strsim/strsim-0.8.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.60.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/synstructure/synstructure-0.12.4.crate \ + https://github.com/pop-os/sysfs-class/archive/0.1.3/sysfs-class-0.1.3.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/textwrap/textwrap-0.11.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio/tokio-0.2.25.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tokio-macros/tokio-macros-0.2.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-xid/unicode-xid-0.2.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/vec_map/vec_map-0.8.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/version_check/version_check-0.9.2.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.2.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi/winapi-0.3.9.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-build/winapi-build-0.1.1.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/ws2_32-sys/ws2_32-sys-0.2.1.crate" +MD5SUM="dcb250b54de23e7d1c26529653668384 \ + 294a49d3c53865fa7ac5d0ce2f5d5735 \ + 142cb4b9a653e56e56311f0c883b8582 \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + d123f33f646e37ca5b825ea6eb2dd150 \ + 8637708206e07c0b9e726c7b2f4412d6 \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 74634128440dbc3766bda76fdf0aaa05 \ + bc79e0eb364df515a33755ac9a581cfd \ + d2857f71826c749b5f086d57039a5e5e \ + d228b7c6e0d220d40c064e3feaaceb7f \ + 409eecafa64d119eca370486e49dd522 \ + 9d53a61cdf8af705fd38cc26481b610d \ + 9bb99bc31c32da009e64621f4c635748 \ + dd7c80c2d04d2e9ceba82826cf69764d \ + 54cfab480b7a5f7302eadf44129d3f4b \ + 26e7ab2c497aa1c096c0bcdd0ca609d0 \ + 5089653abbfb3f23c1c805eec737ab0d \ + fe677f0fd8f467037f4fd5b1331c82a6 \ + c7948dfaf0320378998df01203bb894c \ + b98894ea67edeb6618196552c484b79d \ + 6d799b8e9321f6882053f1ceb0e3e817 \ + 2c4bc5c16b345ce4d4bbf977577fab35 \ + 551b1e3feb17b3e30fab6e9c92f129b7 \ + e7696ea7bac5b2d62b5306498960430b \ + 639af0cca65c012e6a028acfb657e417 \ + 1c4f7ad251632c854fa67dc1f1f314e3 \ + f1c40b9836035b69e464df711a1d2950 \ + 4379362bf1be77d47a45c7223a01eead \ + 9d033cc2daa6924420a4a89e6705773f \ + fba3b040a55c01be7376d3dd5c4d4920 \ + 04f84e88732a1057a37b5d01c23eac1d \ + 78e11acb853ee9a9c1b905e209b33d4a \ + 40e508baeee8cdccbc471489b0f449ff \ + fa3630e5867493e09296155763e4f4a0 \ + 257e573f323c639630b31f147671b627 \ + 10e28d0be14899dcbad91142a228fb35 \ + 1fbbe598255c0addb31bdfbe3e76420d \ + ff6c054468eab826f0dab7cc9a3fe557 \ + c36d452e37c73b1e99f40bae18cddfdb \ + 28a4e2e962d9723f131cdd5acb140b6d \ + 67168b70886fe5bd86af5619a3f35ce4 \ + 8771ed9f596c68a307bef4b2ac20acde \ + cec81553116d1234d8a2a618593848ad \ + 07c75fec267864bcbb800ca7709ceae2 \ + 448bc61aee07661464d98da7660e9a1d \ + 6a32bab57772c3a1146d599b65ffb0cb \ + 7d76a523677de261dda1b65d29a93c4e \ + c7c38eb603bed6f42edbc4294806a44a \ + e6fd8764e2acb835d7d2f04d052e30ce \ + 0736e4f76f4f8f0a29563b0608ca3974 \ + 3233400d1bc56e7c78d4d7564d8e5b74 \ + 6261b6f5fb803ee74f3916c6550ea9b3 \ + a69721c73263cd2040e1a5f120b03a6f \ + e16bb0d9c46839fbf5d1a69673b00c4c \ + 6ec70075835fed0250bc4407f32d5928 \ + f024ce4a4f4ff7326d9bbe3039017081 \ + b006529e0475297e0e2346e2a4558931 \ + c7bfa89e6da163f1474bb3787987bb12 \ + 26b4ac1432c227434bc943817f42872e \ + 781d4ccf5d04c98fa02af207a9639249 \ + c72a927acc4cc7695ae9c73c19964a6f \ + 09f09b3f56045183393726a31d8a0192 \ + 80ca0de72168dc03e90bc3c519153305 \ + a8de006fe0c7e373c560dd51599287a8 \ + 1c63947b82fb656602a15cff8cc7c360 \ + 2c8f1fe04919c09e705eccb13a2aa583 \ + 4272c279b06b88f8b0ffce7109348e27 \ + a51c43692084979295641a7ffba4b297 \ + 333b4ba3f64c35b6f89b521e8d64548b \ + 8b01b016a9b6deebc1b43f296057efb5 \ + b44489eb4799c4fabac3fceb48de54f7 \ + 0498c4a11448bfc35dc7bb2caa64c753 \ + c900e7dbce808ff8ced375077b17a163 \ + db96b50050277bf05a3c68534bbb9586 \ + 09de9d01e7331ff3da11f58be8bef0df \ + 38346bab0933c9eb1e36d22fe4220ba7" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="system76-io-dkms rustup %README%" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com" diff --git a/system/t1utils/t1utils.SlackBuild b/system/t1utils/t1utils.SlackBuild index ab9ef7ba50..5b0176ceb1 100644 --- a/system/t1utils/t1utils.SlackBuild +++ b/system/t1utils/t1utils.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for t1utils -# Copyright 2013-2017 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=t1utils -VERSION=${VERSION:-1.41} +VERSION=${VERSION:-1.42} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,6 +71,7 @@ chown -R root:root . chmod -R u+w,go-w,a+rX-st . # -D_GNU_SOURCE is to fix https://github.com/kohler/t1utils/issues/8 +# (Was fixed in 1.42, but keep this workaround to prefer the system memmem.) ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/system/t1utils/t1utils.info b/system/t1utils/t1utils.info index 99d640b848..d1d725aa09 100644 --- a/system/t1utils/t1utils.info +++ b/system/t1utils/t1utils.info @@ -1,8 +1,8 @@ PRGNAM="t1utils" -VERSION="1.41" +VERSION="1.42" HOMEPAGE="https://www.lcdf.org/type/#t1utils" -DOWNLOAD="https://www.lcdf.org/type/t1utils-1.41.tar.gz" -MD5SUM="5430f82fcc27ccfc44526a59fa64849a" +DOWNLOAD="https://www.lcdf.org/type/t1utils-1.42.tar.gz" +MD5SUM="acc4bc832bafbdc059fb3b0cad8c3ab0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/fs-uae/doinst.sh b/system/tagainijisho/doinst.sh index 4a25de5e6f..65c7e2eeb9 100644 --- a/system/fs-uae/doinst.sh +++ b/system/tagainijisho/doinst.sh @@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi - diff --git a/system/tagainijisho/embed-sqlite.patch b/system/tagainijisho/embed-sqlite.patch deleted file mode 100644 index 14ef270a0e..0000000000 --- a/system/tagainijisho/embed-sqlite.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -u -r tagainijisho-1.0.1/src/sqlite/CMakeLists.txt tagainijisho-1.0.1-patched/src/sqlite/CMakeLists.txt ---- tagainijisho-1.0.1/src/sqlite/CMakeLists.txt 2013-11-18 23:32:01.000000000 +0000 -+++ tagainijisho-1.0.1-patched/src/sqlite/CMakeLists.txt 2016-04-11 15:44:13.408359228 +0100 -@@ -3,19 +3,15 @@ - - set(SQLITE_MIN_VERSION "3007004") - set(SQLITE_BLACKLIST "3007007;3007008;3008000") --set(SQLITE_DOWNLOAD_VERSION "3080100") -+set(SQLITE_DOWNLOAD_VERSION "3110100") - --set(SQLITE_SOURCE http://www.sqlite.org/2013/sqlite-amalgamation-${SQLITE_DOWNLOAD_VERSION}.zip) -+set(SQLITE_SOURCE http://www.sqlite.org/2016/sqlite-amalgamation-${SQLITE_DOWNLOAD_VERSION}.zip) - - option(SHARED_SQLITE_LIBRARY "Build the SQLite library as a shared library (loadable by SQLite's interpreter)" OFF) - - # Embed SQLite even if the system version looks good? --option(EMBED_SQLITE "Embed SQLite even if a system version is present and valid" OFF) -- --# Force embedded version on Apple --if (APPLE) -- set (EMBED_SQLITE "ON") --endif(APPLE) -+# This should be enabled by default as we require features (e.g. FTS3 tokenizer) that may not be enabled on the system -+option(EMBED_SQLITE "Embed SQLite even if a system version is present and valid" ON) - - # Look for system SQLite - find_path(SQLITE_INCLUDE_DIR sqlite3.h) -@@ -89,7 +85,7 @@ - endif() - - include_directories(${QT_INCLUDE_DIR}) --add_definitions(-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_OMIT_DEPRECATED) -+add_definitions(-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_FTS3_TOKENIZER) - - if(SHARED_SQLITE_LIBRARY) - add_library(tagaini_sqlite SHARED ${tagainijisho_sqlite_SRCS} ${tagainijisho_sqlite_MOC_SRCS}) -diff -u -r tagainijisho-1.0.1/src/sqlite/sqlite3ext.cc tagainijisho-1.0.1-patched/src/sqlite/sqlite3ext.cc ---- tagainijisho-1.0.1/src/sqlite/sqlite3ext.cc 2013-11-18 23:32:01.000000000 +0000 -+++ tagainijisho-1.0.1-patched/src/sqlite/sqlite3ext.cc 2016-04-11 15:44:10.505347246 +0100 -@@ -118,6 +118,10 @@ - sqlite3_stmt *pStmt; - const char *zSql = "SELECT fts3_tokenizer(?, ?)"; - -+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER -+ sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); -+#endif -+ - rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); - if( rc!=SQLITE_OK ){ - return rc; diff --git a/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch b/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch new file mode 100644 index 0000000000..adae7c8862 --- /dev/null +++ b/system/tagainijisho/tagainijisho-1.0.3-fts3_tokenizer.patch @@ -0,0 +1,14 @@ +diff -up tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc.fts3_tokenizer tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc +--- tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc.fts3_tokenizer 2018-07-22 14:22:31.597931031 +0200 ++++ tagainijisho-1.0.3/src/sqlite/sqlite3ext.cc 2018-07-22 14:22:35.858945041 +0200 +@@ -118,6 +118,10 @@ int register_tokenizer(sqlite3 *db, cons + sqlite3_stmt *pStmt; + const char *zSql = "SELECT fts3_tokenizer(?, ?)"; + ++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER ++ sqlite3_db_config(db, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); ++#endif ++ + rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); + if( rc!=SQLITE_OK ){ + return rc; diff --git a/system/tagainijisho/tagainijisho.SlackBuild b/system/tagainijisho/tagainijisho.SlackBuild index 39193deba1..950586963a 100644 --- a/system/tagainijisho/tagainijisho.SlackBuild +++ b/system/tagainijisho/tagainijisho.SlackBuild @@ -1,32 +1,37 @@ #!/bin/sh -# Slackware build script for Tagaini Jisho +# Slackware build script for tagainijisho -# written by Alex-P. Natsios <drakevr@2f30.org> +# originally written by Alex-P. Natsios <drakevr@2f30.org> -# Permission to use, copy, modify, and distribute this software for any purpose -# with or without fee is hereby granted, provided that the above copyright -# notice and this permission notice appear in all copies. +# Copyright 2019 Andrew Clemons, Wellington New Zealand +# All rights reserved. # -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 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. PRGNAM=tagainijisho -VERSION=${VERSION:-1.0.1} +VERSION=${VERSION:-1.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -37,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,16 +65,14 @@ 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 {} \; -# Fix build with sqlite-3.11 onwards -# https://github.com/Gnurou/tagainijisho/issues/163 -patch -p1 < $CWD/embed-sqlite.patch +# thanks to fedora +patch -p1 < $CWD/tagainijisho-1.0.3-fts3_tokenizer.patch cd $TMP/$PRGNAM-$VERSION cmake . \ @@ -105,6 +108,7 @@ 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:-tgz} diff --git a/system/tagainijisho/tagainijisho.info b/system/tagainijisho/tagainijisho.info index f8d6355d4d..cb96e001b9 100644 --- a/system/tagainijisho/tagainijisho.info +++ b/system/tagainijisho/tagainijisho.info @@ -1,10 +1,10 @@ PRGNAM="tagainijisho" -VERSION="1.0.1" +VERSION="1.0.3" HOMEPAGE="http://tagaini.net/" -DOWNLOAD="https://github.com/Gnurou/tagainijisho/releases/download/1.0.1/tagainijisho-1.0.1.tar.gz" -MD5SUM="73c5b2fe03d40d20208119b37e3da0e9" +DOWNLOAD="https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz" +MD5SUM="e3aef7b1a3e4a38e0f144dd98fdcb680" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Alex-P. Natsios" -EMAIL="drakevr@2f30.org" +MAINTAINER="Andrew Clemons" +EMAIL="andrew.clemons@gmail.com" diff --git a/system/tagtools/tagtools.info b/system/tagtools/tagtools.info index 8e23eed2b0..cae7b1a6e5 100644 --- a/system/tagtools/tagtools.info +++ b/system/tagtools/tagtools.info @@ -1,5 +1,5 @@ PRGNAM="tagtools" -VERSION="1.0" +VERSION="v1" HOMEPAGE="https://notabug.org/jeffersonrocha/tagtools" DOWNLOAD="https://notabug.org/jeffersonrocha/tagtools/raw/master/tagtools.tar.xz" MD5SUM="d56b71d973b6b764d5f69187d55f1fc6" diff --git a/system/targetcli-fb/targetcli-fb.SlackBuild b/system/targetcli-fb/targetcli-fb.SlackBuild index 084a79d396..8a8eb91dca 100644 --- a/system/targetcli-fb/targetcli-fb.SlackBuild +++ b/system/targetcli-fb/targetcli-fb.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for targetcli-fb # Copyright 2016 Zach Lewis koni@archlinux.us -# Copyright 2018 Marek Wodzinski <majek@w7i.pl> +# Copyright 2018-2019 Marek Wodzinski <majek@w7i.pl> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=targetcli-fb -VERSION=${VERSION:-2.1.fb49} -RTVERSION=${RTVERSION:-2.1.fb69} -CSVERSION=${CSVERSION:-1.1.fb25} +VERSION=${VERSION:-2.1.53} +RTVERSION=${RTVERSION:-2.1.73} +CSVERSION=${CSVERSION:-1.1.28} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/targetcli-fb/targetcli-fb.info b/system/targetcli-fb/targetcli-fb.info index 197c1d8128..99d90cc03d 100644 --- a/system/targetcli-fb/targetcli-fb.info +++ b/system/targetcli-fb/targetcli-fb.info @@ -1,12 +1,12 @@ PRGNAM="targetcli-fb" -VERSION="2.1.fb49" +VERSION="2.1.53" HOMEPAGE="https://github.com/open-iscsi/targetcli-fb" -DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.fb49/targetcli-fb-2.1.fb49.tar.gz \ - https://github.com/open-iscsi/rtslib-fb/archive/v2.1.fb69/rtslib-fb-2.1.fb69.tar.gz \ - https://github.com/open-iscsi/configshell-fb/archive/v1.1.fb25/configshell-fb-1.1.fb25.tar.gz" -MD5SUM="416eeda8f7ddeb7f00fe98dc1a6245b3 \ - 52aee05f7a67119054b28b0a4248d127 \ - e4d5394815712f661c04917a429f3e06" +DOWNLOAD="https://github.com/open-iscsi/targetcli-fb/archive/v2.1.53/targetcli-fb-2.1.53.tar.gz \ + https://github.com/open-iscsi/rtslib-fb/archive/v2.1.73/rtslib-fb-2.1.73.tar.gz \ + https://github.com/open-iscsi/configshell-fb/archive/v1.1.28/configshell-fb-1.1.28.tar.gz" +MD5SUM="61cdf4c71a0b206b021232fb9e845bd8 \ + 5eb1fc54a5f16566b76b6037950c0dc6 \ + d1908982dffb1df700fa52ed65949729" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pyudev pyparsing six" diff --git a/system/tbsm/README b/system/tbsm/README new file mode 100644 index 0000000000..a02d5c305a --- /dev/null +++ b/system/tbsm/README @@ -0,0 +1,13 @@ +tbsm is a pure bash session or application launcher, inspired by cdm, +tdm and krunner. It supports X and Wayland sessions. + +Autostart tbsm upon login by adding the following to $HOME/.profile +(Reference: https://wiki.gentoo.org/wiki/Start_X_on_login): + +# Autostart tbsm on tty1 +if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then + exec tbsm +fi + +/usr/share/doc/tbsm-0.5/01_Manual.txt contains instructions. +README.SLACKWARE contains additional tips. diff --git a/system/tbsm/README.SLACKWARE b/system/tbsm/README.SLACKWARE new file mode 100644 index 0000000000..2a04e39c6a --- /dev/null +++ b/system/tbsm/README.SLACKWARE @@ -0,0 +1,6 @@ +tbsm may run desktop sessions, such as i3, without consolekit and dbus +support. Thus, given that tbsm detects available .desktop files from +/usr/share/xsessions, create a copy of the .desktop file and modify +the Name and Exec lines as such: +Name=i3-dbus +Exec=ck-launch-session dbus-launch --sh-syntax --exit-with-session i3 diff --git a/system/tbsm/slack-desc b/system/tbsm/slack-desc new file mode 100644 index 0000000000..e2899396f6 --- /dev/null +++ b/system/tbsm/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------------------------------------------------------| +tbsm: tbsm (Terminal Based Session Manager) +tbsm: +tbsm: tbsm is a pure bash session or application launcher, inspired by cdm, +tbsm: tdm and krunner. +tbsm: +tbsm: +tbsm: +tbsm: +tbsm: +tbsm: +tbsm: diff --git a/system/tbsm/tbsm.SlackBuild b/system/tbsm/tbsm.SlackBuild new file mode 100644 index 0000000000..0d01a210fb --- /dev/null +++ b/system/tbsm/tbsm.SlackBuild @@ -0,0 +1,90 @@ +#!/bin/sh + +# Slackware build script for tbsm + +# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.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. + +PRGNAM=tbsm +VERSION=${VERSION:-0.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +make +make install PREFIX=/usr 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 + +# Redundant directory +rm -r $PKG/usr/share/doc/tbsm + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/ changelog license readme-install.txt README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE + +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:-tgz} diff --git a/system/tbsm/tbsm.info b/system/tbsm/tbsm.info new file mode 100644 index 0000000000..b28e8cd25e --- /dev/null +++ b/system/tbsm/tbsm.info @@ -0,0 +1,10 @@ +PRGNAM="tbsm" +VERSION="0.5" +HOMEPAGE="https://github.com/loh-tar/tbsm" +DOWNLOAD="https://github.com/loh-tar/tbsm/archive/v0.5/tbsm-0.5.tar.gz" +MD5SUM="35faadd3c3cdba0c87541823cadb65f1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu1@isaacyu1.com" diff --git a/system/telegraf/telegraf.SlackBuild b/system/telegraf/telegraf.SlackBuild index 8bd8c980c6..6fecbd774f 100644 --- a/system/telegraf/telegraf.SlackBuild +++ b/system/telegraf/telegraf.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Telegraf -# Copyright 2017, 2018 Ebben Aries <e@dscp.org> +# Copyright 2017-2021 Ebben Aries <slackbuilds@dscp.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=telegraf -VERSION=${VERSION:-1.9.2} +VERSION=${VERSION:-1.18.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,7 +67,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM tar xvf $CWD/$PRGNAM-${VERSION}_linux_${PKG_ARCH}.tar.gz -cd $PRGNAM +cd $PRGNAM-${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/telegraf/telegraf.info b/system/telegraf/telegraf.info index 787052b19a..92f01bc041 100644 --- a/system/telegraf/telegraf.info +++ b/system/telegraf/telegraf.info @@ -1,10 +1,10 @@ PRGNAM="telegraf" -VERSION="1.9.2" +VERSION="1.18.1" HOMEPAGE="https://www.influxdata.com" -DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.9.2_linux_i386.tar.gz" -MD5SUM="e5e07d2a5110ab519f26cb36b7ff1994" -DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.9.2_linux_amd64.tar.gz" -MD5SUM_x86_64="7549a11a6282a86ab67b3cd0435b316f" +DOWNLOAD="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.1_linux_i386.tar.gz" +MD5SUM="5c5fa71a4c28be188604727ee06e7704" +DOWNLOAD_x86_64="https://dl.influxdata.com/telegraf/releases/telegraf-1.18.1_linux_amd64.tar.gz" +MD5SUM_x86_64="a7bb19afa8fcbf3144129f5fb45d559f" REQUIRES="" MAINTAINER="Ebben Aries" -EMAIL="e@dscp.org" +EMAIL="slackbuilds@dscp.org" diff --git a/system/terminology/terminology.SlackBuild b/system/terminology/terminology.SlackBuild index 75fc18ae75..ba6ce393f3 100644 --- a/system/terminology/terminology.SlackBuild +++ b/system/terminology/terminology.SlackBuild @@ -1,33 +1,35 @@ #!/bin/sh -# Copyright 2018 Erik Falor <ewfalor@gmail.com>, Logan, Utah, USA -# 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. +# Slackware build script for terminology +# Erik Falor | Logan, UT | ewfalor@gmail.com + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version, with the following exception: +# the text of the GPL license may be omitted. + +# This program 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. Compiling, +# interpreting, executing or merely reading the text of the program +# may result in lapses of consciousness and/or very being, up to and +# including the end of all existence and the Universe as we know it. +# See the GNU General Public License for more details. + +# You may have received a copy of the GNU General Public License along +# with this program (most likely, a file named COPYING). If not, see +# <http://www.gnu.org/licenses/>. + PRGNAM=terminology -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-1.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -38,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -52,7 +54,8 @@ else LIBDIRSUFFIX="" fi -DOCS="AUTHORS COPYING ChangeLog DESIGN.md NEWS README.md TODO" + +DOCS="AUTHORS COPYING ChangeLog ChangeLog.theme DESIGN.md NEWS README.md THEME.md TODO" set -e @@ -74,8 +77,6 @@ CXXFLAGS="$SLKCFLAGS" \ meson \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ --mandir=/usr/man \ . build diff --git a/system/terminology/terminology.info b/system/terminology/terminology.info index 6870051e96..6c5301afc7 100644 --- a/system/terminology/terminology.info +++ b/system/terminology/terminology.info @@ -1,10 +1,10 @@ PRGNAM="terminology" -VERSION="1.2.1" +VERSION="1.8.1" HOMEPAGE="https://www.enlightenment.org/about-terminology" -DOWNLOAD="https://download.enlightenment.org/rel/apps/terminology/terminology-1.2.1.tar.xz" -MD5SUM="fd3970b3f5383ac34f7f7105d92e74ea" +DOWNLOAD="https://download.enlightenment.org/rel/apps/terminology/terminology-1.8.1.tar.xz" +MD5SUM="a01667086dd35557ecbbe3836ba66740" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="efl meson ninja" +REQUIRES="efl" MAINTAINER="Erik Falor" EMAIL="ewfalor@gmail.com" diff --git a/system/termsyn-font/README b/system/termsyn-font/README new file mode 100644 index 0000000000..915243d9ae --- /dev/null +++ b/system/termsyn-font/README @@ -0,0 +1,7 @@ +Termsyn is a clean monospaced bitmap font based on Terminus and +Tamsyn. + +There are four sizes: 6x11, 7x12, 6x13 and 7x14. Formats ISO8859-1, +ISO10646-1 and icons. + +Created by stlarch (stlarchie@gmail.com) diff --git a/system/termsyn-font/doinst.sh b/system/termsyn-font/doinst.sh new file mode 100644 index 0000000000..440f45861f --- /dev/null +++ b/system/termsyn-font/doinst.sh @@ -0,0 +1,12 @@ +if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then + ( cd /usr/share/fonts/misc + mkfontdir . + ) +fi +if [ -x /usr/bin/xset ]; then + /usr/bin/xset +fp /usr/share/fonts/misc + /usr/bin/xset fp rehash +fi +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi diff --git a/system/termsyn-font/slack-desc b/system/termsyn-font/slack-desc new file mode 100644 index 0000000000..618db8b031 --- /dev/null +++ b/system/termsyn-font/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------------------------------------------------------| +termsyn-font: termsyn-font (bitmap font) +termsyn-font: +termsyn-font: Termsyn is a clean monospaced bitmap font based on Terminus and +termsyn-font: Tamsyn. +termsyn-font: +termsyn-font: +termsyn-font: +termsyn-font: +termsyn-font: +termsyn-font: +termsyn-font: diff --git a/system/termsyn-font/termsyn-font.SlackBuild b/system/termsyn-font/termsyn-font.SlackBuild new file mode 100644 index 0000000000..2d448a6456 --- /dev/null +++ b/system/termsyn-font/termsyn-font.SlackBuild @@ -0,0 +1,67 @@ +#!/bin/sh + +# Slackware build script for termsyn-font + +# Copyright 2019 Manuel Argüelles <manuel.arguelles@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. + +PRGNAM=termsyn-font +TARNAM=termsyn +VERSION=${VERSION:-1.8.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $TARNAM-$VERSION +tar xvf $CWD/$TARNAM-$VERSION.tar.gz +cd $TARNAM-$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 {} \; + +mkdir -p $PKG/usr/share/fonts/misc +cp *.pcf $PKG/usr/share/fonts/misc/ +( cd $PKG/usr/share/fonts/misc + gzip -9 *.pcf +) + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.termsyn $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:-tgz} diff --git a/system/termsyn-font/termsyn-font.info b/system/termsyn-font/termsyn-font.info new file mode 100644 index 0000000000..1ed0186917 --- /dev/null +++ b/system/termsyn-font/termsyn-font.info @@ -0,0 +1,10 @@ +PRGNAM="termsyn-font" +VERSION="1.8.7" +HOMEPAGE="https://sourceforge.net/projects/termsyn/" +DOWNLOAD="https://downloads.sourceforge.net/project/termsyn/termsyn-1.8.7.tar.gz" +MD5SUM="e870a0952bc1c5137a216e03095fe2db" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Manuel Argüelles" +EMAIL="manuel.arguelles@gmail.com" diff --git a/system/thermald/thermald.SlackBuild b/system/thermald/thermald.SlackBuild index bbee988722..a12ea9a03c 100644 --- a/system/thermald/thermald.SlackBuild +++ b/system/thermald/thermald.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=thermald SRCNAM=thermal_daemon -VERSION=${VERSION:-1.8} +VERSION=${VERSION:-1.9} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} diff --git a/system/thermald/thermald.info b/system/thermald/thermald.info index a4c76c1e19..a0088c2259 100644 --- a/system/thermald/thermald.info +++ b/system/thermald/thermald.info @@ -1,8 +1,8 @@ PRGNAM="thermald" -VERSION="1.8" +VERSION="1.9" HOMEPAGE="https://github.com/01org/thermal_daemon" -DOWNLOAD="https://github.com/01org/thermal_daemon/archive/v1.8/thermal_daemon-1.8.tar.gz" -MD5SUM="135ba1317598da2ef7be2f47b469ca3e" +DOWNLOAD="https://github.com/01org/thermal_daemon/archive/v1.9/thermal_daemon-1.9.tar.gz" +MD5SUM="b0a56ae78a8fdbe71107e17240874235" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild b/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild index 6e65e1a99a..c2ad2a330f 100644 --- a/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild +++ b/system/thin-provisioning-tools/thin-provisioning-tools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for thin-provisioning-tools -# Copyright 2016-2018 Marek Wodzinski +# Copyright 2016-2020 Marek Wodzinski # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=thin-provisioning-tools -VERSION=${VERSION:-0.7.6} +VERSION=${VERSION:-0.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/thin-provisioning-tools/thin-provisioning-tools.info b/system/thin-provisioning-tools/thin-provisioning-tools.info index 5c34e44989..096e0a9fed 100644 --- a/system/thin-provisioning-tools/thin-provisioning-tools.info +++ b/system/thin-provisioning-tools/thin-provisioning-tools.info @@ -1,8 +1,8 @@ PRGNAM="thin-provisioning-tools" -VERSION="0.7.6" +VERSION="0.9.0" HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools" -DOWNLOAD="https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.6/thin-provisioning-tools-0.7.6.tar.gz" -MD5SUM="3ebdb158448d779ba0cd2035e2a2efe2" +DOWNLOAD="https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0/thin-provisioning-tools-0.9.0.tar.gz" +MD5SUM="b3ce6f476a5b7ea64c583e7d910d2db7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/thinkfan/thinkfan.SlackBuild b/system/thinkfan/thinkfan.SlackBuild index 1c23a629c3..b3a0afefcc 100644 --- a/system/thinkfan/thinkfan.SlackBuild +++ b/system/thinkfan/thinkfan.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for thinkfan -# Copyright 2014 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2014-2020 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=thinkfan -VERSION=${VERSION:-0.9.3} +VERSION=${VERSION:-1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,6 @@ 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 {} \; -mv src/thinkfan.1 . mkdir -p build cd build cmake \ @@ -77,7 +76,9 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -D USE_ATASMART:BOOL=ON .. + -DUSE_ATASMART:BOOL=ON \ + -DUSE_YAML:BOOL=OFF \ + .. make install DESTDIR=$PKG cd .. @@ -96,6 +97,7 @@ mkdir -p $PKG/usr/doc # docs are installed in the wrong location mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION rmdir $PKG/usr/share/doc +rmdir $PKG/usr/share cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/thinkfan/thinkfan.info b/system/thinkfan/thinkfan.info index ce5536b9d6..736fd11b37 100644 --- a/system/thinkfan/thinkfan.info +++ b/system/thinkfan/thinkfan.info @@ -1,8 +1,8 @@ PRGNAM="thinkfan" -VERSION="0.9.3" -HOMEPAGE="http://thinkfan.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/thinkfan/files/thinkfan-0.9.3.tar.gz" -MD5SUM="1519f3a098a414fad6557720414b1689" +VERSION="1.1" +HOMEPAGE="https://github.com/vmatare/thinkfan" +DOWNLOAD="https://github.com/vmatare/thinkfan/archive/1.1/thinkfan-1.1.tar.gz" +MD5SUM="cf9caa107e17bea95871d78955f49e3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ticpp/README b/system/ticpp/README new file mode 100644 index 0000000000..4d25e1098c --- /dev/null +++ b/system/ticpp/README @@ -0,0 +1,8 @@ +TiCPP is short for the official name TinyXML++. It is a completely +new interface to TinyXML that uses MANY of the C++ strengths. +Templates, exceptions, and much better error handling. It is also +fully documented in Doxygen. It is really cool because this version +lets you interface tiny the exact same way as before or you can +choose to use the new ticpp classes. All you need to do is define +TIXML_USE_TICPP. It has been tested in VC 6.0, VC 7.0, VC 7.1, +VC 8.0, MinGW gcc 3.4.5, and in Linux GNU gcc 3+. diff --git a/system/ticpp/slack-desc b/system/ticpp/slack-desc new file mode 100644 index 0000000000..e924f8e05e --- /dev/null +++ b/system/ticpp/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------------------------------------------------------| +ticpp: ticpp (xml parser) +ticpp: +ticpp: TiCPP is short for the official name TinyXML++. It is a completely +ticpp: new interface to TinyXML that uses MANY of the C++ strengths. +ticpp: +ticpp: +ticpp: +ticpp: +ticpp: +ticpp: Homepage: https://github.com/wxFormBuilder/ticpp +ticpp: diff --git a/system/ticpp/ticpp.SlackBuild b/system/ticpp/ticpp.SlackBuild new file mode 100644 index 0000000000..9fe9e6543b --- /dev/null +++ b/system/ticpp/ticpp.SlackBuild @@ -0,0 +1,111 @@ +#!/bin/sh + +# Slackware build script for TiCPP +# XML Parser + +# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@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. + +# Revision date: 2020/Nov/25 + +PRGNAM=ticpp +VERSION=${VERSION:-0.1} +COMVER=eb79120ea16b847ce9f483a298a394050f463d6b +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC -std=c++11" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2 -std=c++11" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$COMVER.tar.?z +mv $PRGNAM-$COMVER $PRGNAM-$VERSION +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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make VERBOSE=1 + make CONFIG=Release DESTDIR=$PKG +cd .. + +mkdir -p "$PKG/usr/include" +install -Dm775 ticpp.h "$PKG/usr/include" +install -Dm775 ticppapi.h "$PKG/usr/include" +install -Dm775 ticpprc.h "$PKG/usr/include" +install -Dm775 tinystr.h "$PKG/usr/include" +install -Dm775 tinyxml.h "$PKG/usr/include" + +mkdir -p "$PKG/usr/lib${LIBDIRSUFFIX}" +install -Dm775 build/libticpp.a "$PKG"/usr/lib${LIBDIRSUFFIX} + +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 +cp -a build_instructions.txt changes.txt LICENSE README.md tutorial_gettingStarted.txt \ + tutorial_ticpp.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:-tgz} diff --git a/system/ticpp/ticpp.info b/system/ticpp/ticpp.info new file mode 100644 index 0000000000..04f790e583 --- /dev/null +++ b/system/ticpp/ticpp.info @@ -0,0 +1,10 @@ +PRGNAM="ticpp" +VERSION="0.1" +HOMEPAGE="https://github.com/wxFormBuilder/ticpp" +DOWNLOAD="https://github.com/wxFormBuilder/ticpp/archive/eb79120ea16b847ce9f483a298a394050f463d6b/ticpp-eb79120ea16b847ce9f483a298a394050f463d6b.tar.gz" +MD5SUM="250643c6562957da9993734c8f2f4b51" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Fernando Lopez Jr." +EMAIL="fernando.lopezjr@gmail.com" diff --git a/system/tiger/tiger.SlackBuild b/system/tiger/tiger.SlackBuild index 1561f5a513..d9ae3e69b9 100644 --- a/system/tiger/tiger.SlackBuild +++ b/system/tiger/tiger.SlackBuild @@ -48,7 +48,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -# The package can be verified with Javier Fernández-Sanguino's PGP key (0xDC814B09) +# The package can be verified with Javier Fernández-Sanguino's PGP key (0xDC814B09) # If we have GnuPG installed, we try to verify the signature. if [ -x "/usr/bin/gpg" -a -x "/usr/bin/gpgv" ] then diff --git a/system/tini/tini.SlackBuild b/system/tini/tini.SlackBuild index a243946f75..5ffafbcb8e 100644 --- a/system/tini/tini.SlackBuild +++ b/system/tini/tini.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tini -# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2017-2021 Audrius Kažukauskas <audrius@neutrino.lt> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tini -GITHASH=${GITHASH:-fec3683} -VERSION=${VERSION:-0.18.0} +GITHASH=${GITHASH:-de40ad0} +VERSION=${VERSION:-0.19.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/tini/tini.info b/system/tini/tini.info index e9d45b913f..ec5fa869c9 100644 --- a/system/tini/tini.info +++ b/system/tini/tini.info @@ -1,8 +1,8 @@ PRGNAM="tini" -VERSION="0.18.0" +VERSION="0.19.0" HOMEPAGE="https://github.com/krallin/tini" -DOWNLOAD="https://github.com/krallin/tini/archive/v0.18.0/tini-0.18.0.tar.gz" -MD5SUM="cc3b205a1b83b8e6ed6892fc5e8ef2c3" +DOWNLOAD="https://github.com/krallin/tini/archive/v0.19.0/tini-0.19.0.tar.gz" +MD5SUM="72935bca9232313409a052833068fb1d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/tinycdb/README b/system/tinycdb/README new file mode 100644 index 0000000000..3c3724c74c --- /dev/null +++ b/system/tinycdb/README @@ -0,0 +1,16 @@ +TinyCDB is a very fast and simple package for creating and reading constant +data bases, a data structure introduced by Dan J. Bernstein in his cdb +package. It may be used to speed up searches in a sequence of (key,value) +pairs with very big number of records. Example usage is indexing a big list +of users - where a search will require linear reading of a large /etc/passwd +file, and for many other tasks. It's usage/API is similar to ones found in +BerkeleyDB, gdbm and traditional *nix dbm/ndbm libraries, and is compatible +in great extent to cdb-0.75 package by Dan Bernstein. + +CDB is a constant database, that is, it cannot be updated at a runtime, only +rebuilt. Rebuilding is atomic operation and is very fast - much faster than of +many other similar packages. Once created, CDB may be queried, and a query +takes very little time to complete. + +The SlackBuild will install both the binary cdb as well the system library for +use in other applications such as Postfix. diff --git a/system/tinycdb/slack-desc b/system/tinycdb/slack-desc new file mode 100644 index 0000000000..16149d7a8b --- /dev/null +++ b/system/tinycdb/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 ':'. + + |-----handy-ruler------------------------------------------------------| +tinycdb: tinycdb (Constant Database) +tinycdb: +tinycdb: TinyCDB is a very fast and simple package for creating and reading +tinycdb: constant data bases, a data structure introduced by Dan J. Bernstein +tinycdb: in his cdb package. It may be used to speed up searches in a +tinycdb: sequence of (key,value) pairs with very big number of records. +tinycdb: between remote client and local (inetd-startable) or remote servers. +tinycdb: +tinycdb: +tinycdb: +tinycdb: diff --git a/system/tinycdb/tinycdb.SlackBuild b/system/tinycdb/tinycdb.SlackBuild new file mode 100644 index 0000000000..d83e626f57 --- /dev/null +++ b/system/tinycdb/tinycdb.SlackBuild @@ -0,0 +1,78 @@ +#!/bin/sh + +# Slackware build script for tinycdb + +# Maintainer: Dejan Strbac <me at dejanstrbac dot com> + +# This script is released in the public domain. +# I am not responsible for any consequences that follow from the +# incorrect use of this script. + +PRGNAM=tinycdb +VERSION=${VERSION:-0.78} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +make +make install prefix=$PKG includedir=$PKG/usr/include mandir=$PKG/usr/man libdir=$PKG/usr/lib$LIBDIRSUFFIX bindir=$PKG/usr/bin + +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 + +# Create the directory for program documentation. +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION + +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 + +cp -a ChangeLog* NEWS $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:-tgz} + diff --git a/system/tinycdb/tinycdb.info b/system/tinycdb/tinycdb.info new file mode 100644 index 0000000000..0caf0d8665 --- /dev/null +++ b/system/tinycdb/tinycdb.info @@ -0,0 +1,10 @@ +PRGNAM="tinycdb" +VERSION="0.78" +HOMEPAGE="http://www.corpit.ru/mjt/tinycdb.html" +DOWNLOAD="http://www.corpit.ru/mjt/tinycdb/tinycdb-0.78.tar.gz" +MD5SUM="976266afc3f6e7e17492a8d18f21f8f6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Dejan Strbac" +EMAIL="me@dejanstrbac.com" diff --git a/system/tinyterm/tinyterm.SlackBuild b/system/tinyterm/tinyterm.SlackBuild index 0abd5e9dbb..d7d3da0215 100644 --- a/system/tinyterm/tinyterm.SlackBuild +++ b/system/tinyterm/tinyterm.SlackBuild @@ -25,6 +25,8 @@ # with this program (most likely, a file named COPYING). If not, see # <http://www.gnu.org/licenses/>. +# 20200114 bkw: update for v0.6.0 + # 20170308 bkw: # - take over maintenance # - cosmetics in slack-desc and README @@ -34,8 +36,8 @@ # - BUILD=2 PRGNAM=tinyterm -VERSION=${VERSION:-0.5.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.6.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,8 +53,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="COPYING README.md" - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -76,11 +76,8 @@ 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ [ -e "$CWD/config.h" ] && cp "$CWD/config.h" config.h @@ -91,8 +88,12 @@ make install \ MANPREFIX=/usr/man \ DESTDIR=$PKG +for i in LICENSE COPYING; do + [ -e $i ] && lic="$i $lic" +done + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README* $lic $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/tinyterm/tinyterm.info b/system/tinyterm/tinyterm.info index 64685cb803..d27383884f 100644 --- a/system/tinyterm/tinyterm.info +++ b/system/tinyterm/tinyterm.info @@ -1,8 +1,8 @@ PRGNAM="tinyterm" -VERSION="0.5.8" +VERSION="0.6.0" HOMEPAGE="https://github.com/ryanpcmcquen/tinyterm" -DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.5.8/tinyterm-0.5.8.tar.gz" -MD5SUM="d79ebef1fd122a5b06e348bd24437e41" +DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.6.0/tinyterm-0.6.0.tar.gz" +MD5SUM="e9adc2bc038576dfaa51cb4390b1100b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/tinyvm/tinyvm.SlackBuild b/system/tinyvm/tinyvm.SlackBuild index 55b728d155..94b2eb5c1b 100644 --- a/system/tinyvm/tinyvm.SlackBuild +++ b/system/tinyvm/tinyvm.SlackBuild @@ -25,6 +25,7 @@ # with this program (most likely, a file named COPYING). If not, see # <http://www.gnu.org/licenses/>. +# 20201108 bkw: update for 20180322 (latest git) # 20170308 bkw: # - take over maintenance # - update to 20170212 (latest git commit) @@ -32,8 +33,8 @@ # - add some clarification to README PRGNAM=tinyvm -VERSION=${VERSION:-20170212} -SRCVER=${SRCVER:-a652f7219f3378450ccdb05154832558bdf5f22d} +VERSION=${VERSION:-20180322} +SRCVER=${SRCVER:-10c25d83e442caf0c1fc4b0ab29a91b3805d72ec} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,6 +72,8 @@ cd $TMP rm -rf $PRGNAM-$SRCVER tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz cd $PRGNAM-$SRCVER +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ ## default compiler (clang) make OPTS="$SLKCFLAGS" diff --git a/system/tinyvm/tinyvm.info b/system/tinyvm/tinyvm.info index b36c0976c0..1bad6e47dd 100644 --- a/system/tinyvm/tinyvm.info +++ b/system/tinyvm/tinyvm.info @@ -1,8 +1,8 @@ PRGNAM="tinyvm" -VERSION="20170212" +VERSION="20180322" HOMEPAGE="https://github.com/jakogut/tinyvm" -DOWNLOAD="https://github.com/jakogut/tinyvm/archive/a652f7219f3378450ccdb05154832558bdf5f22d/tinyvm-a652f7219f3378450ccdb05154832558bdf5f22d.tar.gz" -MD5SUM="e8d48db43f9e1c5f27b9c0ac20a682d2" +DOWNLOAD="https://github.com/jakogut/tinyvm/archive/10c25d83e442caf0c1fc4b0ab29a91b3805d72ec/tinyvm-10c25d83e442caf0c1fc4b0ab29a91b3805d72ec.tar.gz" +MD5SUM="95f649139746c6c5100fac113de518e1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/tmpwatch/README b/system/tmpwatch/README new file mode 100644 index 0000000000..89a87bce2a --- /dev/null +++ b/system/tmpwatch/README @@ -0,0 +1,5 @@ +The tmpwatch utility recursively searches through specified +directories and removes files which have not been accessed in a +specified period of time. tmpwatch is normally used to clean up +directories which are used for temporarily holding files (for example, +/tmp). diff --git a/system/tmpwatch/slack-desc b/system/tmpwatch/slack-desc new file mode 100644 index 0000000000..c6326fe026 --- /dev/null +++ b/system/tmpwatch/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------------------------------------------------------| +tmpwatch: tmpwatch (A utility for removing temporary files) +tmpwatch: +tmpwatch: The tmpwatch utility recursively searches through specified +tmpwatch: directories and removes files which have not been accessed in a +tmpwatch: specified period of time. Tmpwatch is normally used to clean up +tmpwatch: directories which are used for temporarily holding files (for example, +tmpwatch: /tmp). Tmpwatch ignores symlinks, won't switch filesystems and only +tmpwatch: removes empty directories and regular files. +tmpwatch: +tmpwatch: https://fedorahosted.org/tmpwatch/ +tmpwatch: diff --git a/system/tmpwatch/tmpwatch.SlackBuild b/system/tmpwatch/tmpwatch.SlackBuild new file mode 100644 index 0000000000..ade8a5fdd8 --- /dev/null +++ b/system/tmpwatch/tmpwatch.SlackBuild @@ -0,0 +1,80 @@ +#!/bin/sh + +# Slackware build script for tmpwatch + +# Maintainer: Dejan Strbac <me at dejanstrbac dot com> + +# This script is released in the public domain. +# I am not responsible for any consequences that follow from the +# incorrect use of this script. + +PRGNAM=tmpwatch +VERSION=${VERSION:-2.11} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 xvfj $CWD/$PRGNAM-$VERSION.tar.bz2 +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 {} \; + +./configure +make +make install prefix=$PKG mandir=$PKG/usr/man libdir=$PKG/usr/lib$LIBDIRSUFFIX bindir=$PKG/usr/bin + +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 + +# Create the directory for program documentation. +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION + +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 + +cp -a ChangeLog* NEWS $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:-tgz} + + diff --git a/system/tmpwatch/tmpwatch.info b/system/tmpwatch/tmpwatch.info new file mode 100644 index 0000000000..4c0046b586 --- /dev/null +++ b/system/tmpwatch/tmpwatch.info @@ -0,0 +1,10 @@ +PRGNAM="tmpwatch" +VERSION="2.11" +HOMEPAGE="https://pagure.io/tmpwatch" +DOWNLOAD="https://releases.pagure.org/tmpwatch/tmpwatch-2.11.tar.bz2" +MD5SUM="9ea7e169296eb1196b80fe05bba1cbd0" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Dejan Strbac" +EMAIL="me@dejanstrbac.com" diff --git a/system/tmuxp/tmuxp.SlackBuild b/system/tmuxp/tmuxp.SlackBuild index 6c9fcb62de..aa4879755a 100644 --- a/system/tmuxp/tmuxp.SlackBuild +++ b/system/tmuxp/tmuxp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tmuxp -# Copyright 2014-2017 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2021 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tmuxp -VERSION=${VERSION:-1.2.8} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,13 +69,13 @@ 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 setup.py install --root=$PKG +python3 setup.py install --root=$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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES LICENSE PKG-INFO README.rst doc/*.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES LICENSE PKG-INFO README.rst docs/*.rst $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/tmuxp/tmuxp.info b/system/tmuxp/tmuxp.info index d2444821b7..53558856aa 100644 --- a/system/tmuxp/tmuxp.info +++ b/system/tmuxp/tmuxp.info @@ -1,10 +1,10 @@ PRGNAM="tmuxp" -VERSION="1.2.8" +VERSION="1.7.0" HOMEPAGE="https://github.com/tony/tmuxp/" -DOWNLOAD="https://pypi.python.org/packages/8b/48/0c325729ff41e73e8044b286ead20aedec1e127c898aa0b6646fe34043d9/tmuxp-1.2.8.tar.gz" -MD5SUM="e31e492b4f1e7191531a79e0df4fa51a" +DOWNLOAD="https://files.pythonhosted.org/packages/4f/c8/80c974b3c373d479945a2e4ad6b3a655547af5121854b5213ad78ec46401/tmuxp-1.7.0.tar.gz" +MD5SUM="c12a96d257b78337422f04418367ccae" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="kaptan click colorama python-libtmux" +REQUIRES="kaptan click colorama python-libtmux python3-PyYAML" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/system/tomb/README b/system/tomb/README index a0537d31d6..2c2fbc2fba 100644 --- a/system/tomb/README +++ b/system/tomb/README @@ -1,2 +1,8 @@ Tomb is an 100% free and open source system for file encryption on GNU/Linux, facilitating the backup of secret files. + +Optional deps: +- haveged: fast entropy generation for key forging +- unoconv: fast search of contents in PDF and DOC files +- qrencode: engrave keys into printable qrcode sheets +- steghide: bury and exhume keys inside images diff --git a/system/tomb/tomb.SlackBuild b/system/tomb/tomb.SlackBuild index 1bc5319dfa..261fc0c050 100644 --- a/system/tomb/tomb.SlackBuild +++ b/system/tomb/tomb.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tomb -# Copyright 2015-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2015-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=tomb SRCNAM=Tomb -VERSION=${VERSION:-2.5} +VERSION=${VERSION:-2.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/tomb/tomb.info b/system/tomb/tomb.info index da70899723..b1c0476815 100644 --- a/system/tomb/tomb.info +++ b/system/tomb/tomb.info @@ -1,8 +1,8 @@ PRGNAM="tomb" -VERSION="2.5" +VERSION="2.9" HOMEPAGE="https://www.dyne.org/software/tomb/" -DOWNLOAD="https://github.com/dyne/Tomb/archive/v2.5/Tomb-2.5.tar.gz" -MD5SUM="5f4a233d6429bbfcfa8f5f94fac9c7fc" +DOWNLOAD="https://github.com/dyne/Tomb/archive/v2.9/Tomb-2.9.tar.gz" +MD5SUM="e0640de7b613f80b91776af476ea525e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/tpc/README b/system/tpc/README index 7c80c34b9e..01ca47b20d 100644 --- a/system/tpc/README +++ b/system/tpc/README @@ -1 +1 @@ -Cross-platform utility to control and tweak modern AMD processors
\ No newline at end of file +Cross-platform utility to control and tweak modern AMD processors diff --git a/system/tpe-kmod/README b/system/tpe-kmod/README new file mode 100644 index 0000000000..87899273e1 --- /dev/null +++ b/system/tpe-kmod/README @@ -0,0 +1,8 @@ +Trusted Path Execution is a security feature that denies users from executing +programs that are not owned by root, or are writable. This closes the door on a +whole category of exploits where a malicious user tries to execute his or her +own code to attack the system. + +Since this module doesn't use any kind of ACLs, it works out of the box with no +configuration. It isn't complicated to test or deploy to current production +systems. Just install it and you're done! diff --git a/system/tpe-kmod/doinst.sh b/system/tpe-kmod/doinst.sh new file mode 100644 index 0000000000..ecc1b57efb --- /dev/null +++ b/system/tpe-kmod/doinst.sh @@ -0,0 +1,15 @@ +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... +} + +config etc/modprobe.d/tpe.conf.new +config etc/sysctl.d/tpe.conf.new diff --git a/system/tpe-kmod/slack-desc b/system/tpe-kmod/slack-desc new file mode 100644 index 0000000000..c7475ac19b --- /dev/null +++ b/system/tpe-kmod/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------------------------------------------------------| +tpe-kmod: tpe-kmod (Trusted Path Execution Linux Kernel Module) +tpe-kmod: +tpe-kmod: Trusted Path Execution is a security feature that denies users from +tpe-kmod: executing programs that are not owned by root, or are writable. +tpe-kmod: This closes the door on a whole category of exploits where a malicious +tpe-kmod: user tries to execute his or her own code to attack the system. +tpe-kmod: +tpe-kmod: +tpe-kmod: +tpe-kmod: Homepage: https://github.com/cormander/tpe-lkm +tpe-kmod: diff --git a/system/tpe-kmod/tpe-kmod.SlackBuild b/system/tpe-kmod/tpe-kmod.SlackBuild new file mode 100644 index 0000000000..6cbcbd8144 --- /dev/null +++ b/system/tpe-kmod/tpe-kmod.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/sh + +# Slackware build script for TPE LKM + +# Copyright 2019 pyllyukko +# 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. + +PRGNAM=tpe-kmod +VERSION=${VERSION:-2.0.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd tpe-lkm-$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 {} \; + +make +make install_files DESTDIR=$PKG + +mv -v $PKG/etc/sysctl.d/tpe.conf{,.new} +mv -v $PKG/etc/modprobe.d/tpe.conf{,.new} + +# Sign the kernel module (if available) +if [ -f /proc/config.gz ] +then + if [ -z "${CONFIG_MODULE_SIG_HASH}" ]; then + eval $(zgrep "^CONFIG_MODULE_SIG_HASH=" /proc/config.gz) + fi + KERNVER=$(uname -r) + KERNSRC=${KERNSRC:-/lib/modules/${KERNVER}/source} + if [ -n "${CONFIG_MODULE_SIG_HASH}" ] && \ + [ -f $KERNSRC/certs/signing_key.pem ] && \ + [ -f $KERNSRC/certs/signing_key.x509 ] && \ + [ -x $KERNSRC/scripts/sign-file ] + then + $KERNSRC/scripts/sign-file \ + ${CONFIG_MODULE_SIG_HASH} \ + $KERNSRC/certs/signing_key.pem \ + $KERNSRC/certs/signing_key.x509 \ + ${PKG}/lib/modules/${KERNVER}/extra/tpe/tpe.ko + fi +fi + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + FAQ GPL INSTALL LICENSE README \ + $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}_${KERNVER//-/_}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/tpe-kmod/tpe-kmod.info b/system/tpe-kmod/tpe-kmod.info new file mode 100644 index 0000000000..7dc4f3725c --- /dev/null +++ b/system/tpe-kmod/tpe-kmod.info @@ -0,0 +1,10 @@ +PRGNAM="tpe-kmod" +VERSION="2.0.4" +HOMEPAGE="https://github.com/cormander/tpe-lkm" +DOWNLOAD="https://github.com/cormander/tpe-lkm/archive/2.0.4/tpe-kmod-2.0.4.tar.gz" +MD5SUM="e90cd220d299ca9adde7206c7d6fdf8b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="pyllyukko" +EMAIL="pyllyukko@maimed.org" diff --git a/system/tpm/README b/system/tpm/README index c306fc218f..0cdc921316 100644 --- a/system/tpm/README +++ b/system/tpm/README @@ -1,10 +1,11 @@ tpm is a tiny shell script which is heavily inspired and largely -compatible with pass. Just like pass it uses gpg2 to securely store your -passwords, the major difference between pass and tpm is that the latter is -a lot more minimal. Furthermore, tpm is written entirely in POSIX shell. +compatible with pass. Just like pass it uses gpg2 to securely store +your passwords, the major difference between pass and tpm is that the +latter is a lot more minimal. Furthermore, tpm is written entirely +in POSIX shell. -Invoking tpm consists of specifying a command either insert or show and -supplying one entry as a target. If insert is specified as a command, -tpm will create a new entry and prompt for the corresponding password. If -you specify show as a command, tpm will write the password for the given -entry to standard output. +Invoking tpm consists of specifying a command either insert or show +and supplying one entry as a target. If insert is specified as a +command, tpm will create a new entry and prompt for the corresponding +password. If you specify show as a command, tpm will write the password +for the given entry to standard output. diff --git a/system/tpm/tpm.SlackBuild b/system/tpm/tpm.SlackBuild index b0d689f9d9..d6cd6a2979 100644 --- a/system/tpm/tpm.SlackBuild +++ b/system/tpm/tpm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tpm -# Copyright 2015-2016 Hunter Sezen California, USA +# Copyright 2015-2016, 2020 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tpm -VERSION=${VERSION:-1.3.2} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.3.3} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} ARCH=noarch @@ -34,7 +34,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -49,15 +49,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 {} \; -make make install \ PREFIX=/usr \ MANDIR=/usr/man \ 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 - 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 diff --git a/system/tpm/tpm.info b/system/tpm/tpm.info index ee36551ea9..4b0f8ba320 100644 --- a/system/tpm/tpm.info +++ b/system/tpm/tpm.info @@ -1,10 +1,10 @@ PRGNAM="tpm" -VERSION="1.3.2" +VERSION="1.3.3" HOMEPAGE="https://github.com/nmeum/tpm" -DOWNLOAD="https://github.com/nmeum/tpm/archive/1.3.2/tpm-1.3.2.tar.gz" -MD5SUM="d86118c38e908663c8d1422c79f6ce1d" +DOWNLOAD="https://github.com/nmeum/tpm/archive/1.3.3/tpm-1.3.3.tar.gz" +MD5SUM="9a5244e8f5e5bf0ba491ab7a029e79c1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/trackfs/trackfs.info b/system/trackfs/trackfs.info index 5951bbd27d..fa78cc69d4 100644 --- a/system/trackfs/trackfs.info +++ b/system/trackfs/trackfs.info @@ -1,7 +1,7 @@ PRGNAM="trackfs" VERSION="0.1.0" -HOMEPAGE="http://www.mr511.de/software/english.html" -DOWNLOAD="http://www.mr511.de/software/trackfs-0.1.0.tar.gz" +HOMEPAGE="http://web.archive.org/web/20180104142349/http://www.mr511.de/software/english.html" +DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/6/0/602bdd3c74862c3cf2c1e06fd96e6f21/trackfs-0.1.0.tar.gz" MD5SUM="602bdd3c74862c3cf2c1e06fd96e6f21" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/triggerhappy/README b/system/triggerhappy/README new file mode 100644 index 0000000000..fc8e62f25f --- /dev/null +++ b/system/triggerhappy/README @@ -0,0 +1,29 @@ +triggerhappy (a lightweight global hotkey daemon) + +Triggerhappy is a hotkey daemon that operates on a system wide +scale. It watches all configured input devices for key, switch, +or button events and can launch arbitrary commands specified by the +administrator. In contrast to hotkey services provided by desktop +environments, Triggerhappy is especially suited to hardware related +switches like volume or wifi control; it works independently from +a specific user being logged in and is also suitable for embedded +systems that do not have a graphical user interface. + +The disadvantage of using triggerhappy is that it must be run with +root privileges. + +After installing the package, you'll want to: + + 1. Read the man page for thd, particularly the EXAMPLES section. + + 2. Create one or more confg files, matching the pattern: + /etc/triggerhappy/triggers.d/*.conf + See the example files in /etc/triggerhappy/triggers.d/ for ideas. + + 3. chmod +x /etc/rc.d/rc.triggerhappy + + 4. /etc/rc.d/rc.triggerhappy start + +After this, the daemon will start on boot. To add devices to the +running daemon, use th-cmd's --passfd option (not --add, since the +daemon drops privileges after startup). diff --git a/system/triggerhappy/rc.triggerhappy b/system/triggerhappy/rc.triggerhappy new file mode 100644 index 0000000000..d8f3266484 --- /dev/null +++ b/system/triggerhappy/rc.triggerhappy @@ -0,0 +1,24 @@ +#!/bin/sh + +# rc.triggerhappy, sysv-style init script for triggerhappy. +# part of the slackbuilds.org triggerhappy build. + +THD_SOCKET=/var/run/thd.socket +THD_ARGS="--daemon --user nobody --socket $THD_SOCKET --triggers /etc/triggerhappy/triggers.d/ /dev/input/event*" + +case "$1" in + ""|"start") if [ -e $THD_SOCKET ]; then + echo "$0: $THD_SOCKET already exists (daemon running or stale socket?)" + exit 1; + fi + echo "Starting triggerhappy daemon (thd)" + /usr/sbin/thd $THD_ARGS ;; + stop) echo "Stopping triggerhappy daemon (thd)" + /usr/sbin/th-cmd --socket $THD_SOCKET --quit + /bin/rm -f $THD_SOCKET ;; + restart) $0 stop ; /bin/sleep 1; exec $0 start ;; + *) echo "Usage: $0 [stop|start|restart]" + exit 1 ;; +esac + +exit 0 diff --git a/system/triggerhappy/slack-desc b/system/triggerhappy/slack-desc new file mode 100644 index 0000000000..49485ed1fb --- /dev/null +++ b/system/triggerhappy/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------------------------------------------------------| +triggerhappy: triggerhappy (a lightweight global hotkey daemon) +triggerhappy: +triggerhappy: Triggerhappy is a hotkey daemon that operates on a system wide +triggerhappy: scale. It watches all configured input devices for key, switch, +triggerhappy: or button events and can launch arbitrary commands specified by the +triggerhappy: administrator. In contrast to hotkey services provided by desktop +triggerhappy: environments, Triggerhappy is especially suited to hardware related +triggerhappy: switches like volume or wifi control; it works independently from +triggerhappy: a specific user being logged in and is also suitable for embedded +triggerhappy: systems that do not have a graphical user interface. +triggerhappy: diff --git a/system/triggerhappy/test.conf.example b/system/triggerhappy/test.conf.example new file mode 100644 index 0000000000..458e6433b4 --- /dev/null +++ b/system/triggerhappy/test.conf.example @@ -0,0 +1,10 @@ +# 20201031 bkw: very simple test config. +# cp test.conf.example test.conf +# /etc/rc.d/rc.triggerhappy start +# Press F11 and F12, while running: +# watch ls /tmp/triggerhappy_works +# Note that comments are allowed in triggerhappy's .conf files, +# but blank lines ARE NOT allowed! That's why this looks so +# cramped and hard to read... +KEY_F11 1 /usr/bin/touch /tmp/triggerhappy_works +KEY_F12 1 /usr/bin/rm /tmp/triggerhappy_works diff --git a/system/triggerhappy/triggerhappy.SlackBuild b/system/triggerhappy/triggerhappy.SlackBuild new file mode 100644 index 0000000000..8c8adb0f49 --- /dev/null +++ b/system/triggerhappy/triggerhappy.SlackBuild @@ -0,0 +1,84 @@ +#!/bin/sh + +# Slackware build script for triggerhappy + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=triggerhappy +VERSION=${VERSION:-0.5.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCVER=release-$VERSION + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-$SRCVER +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +cd $PRGNAM-$SRCVER +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 {} \+ + +make CFLAGS="$SLKCFLAGS" +make install BINDIR=$PKG/usr/sbin MANDIR=$PKG/usr/man/man1 +strip $PKG/usr/sbin/* + +# man pages are installed +x, *gag* +chmod -x $PKG/usr/man/man1/*.1 +gzip -9 $PKG/usr/man/man1/*.1 + +# The example config won't actually get used unless renamed to end +# in .conf (per the man page). Also include a much simpler test +# config that can be used as-is. +mkdir -p $PKG/etc/$PRGNAM/triggers.d +cp -a *.conf.examples $PKG/etc/$PRGNAM/triggers.d +cat $CWD/test.conf.example > $PKG/etc/$PRGNAM/triggers.d/test.conf.example + +# init script written by SlackBuild author. It's pretty rudimentary. +mkdir -p $PKG/etc/rc.d +cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM + +# Include our own README since it has manual config instructions. +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt +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:-tgz} diff --git a/system/triggerhappy/triggerhappy.info b/system/triggerhappy/triggerhappy.info new file mode 100644 index 0000000000..edaa5e53e6 --- /dev/null +++ b/system/triggerhappy/triggerhappy.info @@ -0,0 +1,10 @@ +PRGNAM="triggerhappy" +VERSION="0.5.0" +HOMEPAGE="https://github.com/wertarbyte/triggerhappy" +DOWNLOAD="https://github.com/wertarbyte/triggerhappy/archive/release/0.5.0/triggerhappy-release-0.5.0.tar.gz" +MD5SUM="2056cda4e9127cd375067f2cd3234616" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/ttf-ancient-fonts/README b/system/ttf-ancient-fonts/README new file mode 100644 index 0000000000..79c9476e25 --- /dev/null +++ b/system/ttf-ancient-fonts/README @@ -0,0 +1,20 @@ +ttf-ancient-fonts (Unicode fonts for ancient scripts) + +These are free unicode fonts for Aegean Scripts, other ancient scripts +in the greater Aegean vicinity, Egyptian Hieroglyphs, Sumero-Akkadian +Cuneiform, and Musical Symbols in the Unicode Standard. + +Despite the "ttf" in the name, the package includes a few .otf fonts +as well. + +The fonts installed by this package include hinting, by default. If you +for some reason require unhinted fonts, export HINTS=no in the +environment before running the SlackBuild. If you don't know what font +hinting is, you probably shouldn't worry about it. + +The source tarball contains an older version of the Symbola font. +By default it's not included here, as there's already a symbola-font-ttf +on SBo. It's a much newer version of Symbola, but is licensed under +highly restrictive terms. If you'd rather have the older but free-to-use +version of Symbola, set SYMBOLA=yes in the environment for this build, +and don't install symbola-font-ttf. diff --git a/system/ttf-ancient-fonts/README.debian b/system/ttf-ancient-fonts/README.debian new file mode 100644 index 0000000000..2978e4a02a --- /dev/null +++ b/system/ttf-ancient-fonts/README.debian @@ -0,0 +1,21 @@ +Versions of the fonts included in this package +============================================== + +Aegean v.9.17 02/2017 Scripts and symbols of the Aegean world +Textfonts v.7.17 02/2017 Fonts based on early Greek editions + +Symbola v.9.17 07/2017 Symbol blocks of The Unicode Standard +Abydos v.1.23 07/2017 A data-font of 7440 Egyptian Hieroglyphs +Aegyptus v.6.17 02/2017 Egyptian Hieroglyphs, Coptic, Meroitic +Akkadian v.7.17 02/2017 Sumero-Akkadian Cuneiform +Anatolian v.5.17 02/2017 Anatolian Hieroglyphs +Maya v.4.17 02/2017 Maya Hieroglyphs +Unidings v.9.17 07/2017 Icons for blocks of The Unicode Standard +Musica v.3.17 02/2017 Musical Notation +Analecta v.5.17 02/2017 Coptic, Gothic, Deseret + +The package also includes the following fonts obsoleted by the author: + +Alfios (superseded by Asea) +Atavyros +Avdira diff --git a/system/ttf-ancient-fonts/copyright.debian b/system/ttf-ancient-fonts/copyright.debian new file mode 100644 index 0000000000..24cd414239 --- /dev/null +++ b/system/ttf-ancient-fonts/copyright.debian @@ -0,0 +1,26 @@ +This package was debianized by: + + Gürkan Myczko <gurkan@phys.ethz.ch> on Mon, 26 Nov 2007 12:13:25 +0100. + +It was downloaded from: + + http://users.teilar.gr/~g1951d/ + +Upstream Author: + + George Douros <g1951d@teilar.gr> + +Copyright: + + Copyright (C) 2007-2015 George Douros + +License: + + Fonts are free for any use; they may be opened, edited, + modified, regenerated, packaged and redistributed. + +The Debian packaging is: + + Copyright (C) 2007-2017 Gürkan Myczko <gurkan@phys.ethz.ch> + Copyright (C) 2015 Andrew Shadura <andrewsh@debian.org> + is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/system/ttf-ancient-fonts/doinst.sh b/system/ttf-ancient-fonts/doinst.sh new file mode 100644 index 0000000000..2b48ae510c --- /dev/null +++ b/system/ttf-ancient-fonts/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/mkfontdir ]; then + ( cd usr/share/fonts/TTF + mkfontscale . + mkfontdir . + ) + ( cd usr/share/fonts/OTF + mkfontscale . + mkfontdir . + ) +fi +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi diff --git a/system/ttf-ancient-fonts/slack-desc b/system/ttf-ancient-fonts/slack-desc new file mode 100644 index 0000000000..9df1af7ee8 --- /dev/null +++ b/system/ttf-ancient-fonts/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------------------------------------------------------| +ttf-ancient-fonts: ttf-ancient-fonts (Unicode fonts for ancient scripts) +ttf-ancient-fonts: +ttf-ancient-fonts: These are free unicode fonts for Aegean Scripts, other ancient scripts +ttf-ancient-fonts: in the greater Aegean vicinity, Egyptian Hieroglyphs, Sumero-Akkadian +ttf-ancient-fonts: Cuneiform, and Musical Symbols in the Unicode Standard. +ttf-ancient-fonts: +ttf-ancient-fonts: The TTF fonts in this package are @UN@hinted. +ttf-ancient-fonts: +ttf-ancient-fonts: +ttf-ancient-fonts: +ttf-ancient-fonts: diff --git a/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild new file mode 100644 index 0000000000..f01844ad7e --- /dev/null +++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.SlackBuild @@ -0,0 +1,89 @@ +#!/bin/sh + +# Slackware build script for ttf-ancient-fonts + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# Notes to self (or anyone else who cares): + +# The tarball includes both hinted and unhinted versions of the fonts. The +# Debian package installs <font>.ttf and <font>_hint.ttf for all the +# fonts. However, if I do this, it's impossible to select the _hint +# versions in any application (because the TTF names conflict). Since +# it's possible to disable hinting in fontconfig or specific apps, +# I'm only going to include the _hint versions here by default. User +# can override with HINTS=no. The .otf fonts only come in one variety, +# so they're always installed as-is. + +# There are newer versions of these fonts at https://dn-works.com/ufas/ +# but they're under what I consider a ludicrously restrictive license, +# so I'm not going to touch them with a 10 foot pole. The symbola-font-ttf +# package is the restrictive version, so I've made it possible to include +# the older (free-to-use) Symbola here, though it's not the default. + +# There's no documentation in the tarball, so I borrow it from Debian. +# There's no license info in the tarball, and neither the original site +# nor web.archive.org still has has the "un-Debianized" zip files that +# presumably included the licenses, so I'm including Debian's copyright +# file that asserts these fonts are "free for any use". + +PRGNAM=ttf-ancient-fonts +VERSION=${VERSION:-2.60} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +HINTS="${HINTS:-yes}" + +# If the user requested unhinted fonts, don't even bother to extract +# the hinted versions. +[ "$HINTS" != "yes" ] && UN=un && TAROPT="--exclude=*_hint.ttf" + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION.orig +tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.xz $TAROPT +cd $PRGNAM-$VERSION.orig +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 {} \+ + +HAS_SYMBOLA=yes +[ "${SYMBOLA:-no}" = "no" ] && rm -f Symbola* && HAS_SYMBOLA=no + +# If we're doing hinted fonts, get rid of the unhinted ones. I can't think +# of a sane way to avoid extracting them in the first place... +[ "$HINTS" = "yes" ] && /bin/ls *.ttf | grep -v _hint | xargs rm -f + +for i in TTF OTF; do + mkdir -p $PKG/usr/share/fonts/$i + install -m0644 *.$( echo $i | tr A-Z a-z) $PKG/usr/share/fonts/$i +done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +for i in README.debian copyright.debian; do + cat $CWD/$i > $PKG/usr/doc/$PRGNAM-$VERSION/$i +done +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +sed "s,@UN@,$UN," $CWD/slack-desc > $PKG/install/slack-desc +if [ "$HAS_SYMBOLA" = "yes" ]; then + sed -i \ + '17s/$/ This package includes the Symbola font, and will conflict with symbola-font-ttf/' \ + $PKG/install/slack-desc +fi +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/ttf-ancient-fonts/ttf-ancient-fonts.info b/system/ttf-ancient-fonts/ttf-ancient-fonts.info new file mode 100644 index 0000000000..3e51b06439 --- /dev/null +++ b/system/ttf-ancient-fonts/ttf-ancient-fonts.info @@ -0,0 +1,10 @@ +PRGNAM="ttf-ancient-fonts" +VERSION="2.60" +HOMEPAGE="https://packages.debian.org/sid/ttf-ancient-fonts" +DOWNLOAD="http://deb.debian.org/debian/pool/main/t/ttf-ancient-fonts/ttf-ancient-fonts_2.60.orig.tar.xz" +MD5SUM="a0132b3262b3eec9bc2fc8ff8c4ed9f3" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/ttf-console-fonts/ttf-console-fonts.info b/system/ttf-console-fonts/ttf-console-fonts.info index 8121f46f78..84c4372ff6 100644 --- a/system/ttf-console-fonts/ttf-console-fonts.info +++ b/system/ttf-console-fonts/ttf-console-fonts.info @@ -1,7 +1,7 @@ PRGNAM="ttf-console-fonts" VERSION="20170403_abc5771" -HOMEPAGE="http://urchlay.naptime.net/repos/ttf-console-fonts/about/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ttf-console-fonts-20170403_abc5771.tar.gz" +HOMEPAGE="https://slackware.uk/~urchlay/repos/ttf-console-fonts/about/" +DOWNLOAD="https://slackware.uk/~urchlay/src/ttf-console-fonts-20170403_abc5771.tar.gz" MD5SUM="36be7b721871c2c21f15a9e9206066cb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/ttf-dark-courier/slack-desc b/system/ttf-dark-courier/slack-desc index 88035e8e31..c765d1c2ec 100644 --- a/system/ttf-dark-courier/slack-desc +++ b/system/ttf-dark-courier/slack-desc @@ -9,7 +9,7 @@ ttf-dark-courier: ttf-dark-courier (HP font based on courier-new) ttf-dark-courier: ttf-dark-courier: Originally distributed by Hewlett-Packard many years ago. Dark -ttf-dark-courier: Courier’s main goal is to make Courier-New more readable by making +ttf-dark-courier: Courier's main goal is to make Courier-New more readable by making ttf-dark-courier: it heavier and darker on the page. The slightly darker font gives ttf-dark-courier: greater readability while being identical to the original courier-new ttf-dark-courier: font shipped with Windows operating systems. diff --git a/system/ttf-ibm-plex/slack-desc b/system/ttf-ibm-plex/slack-desc index 3276be677c..696a49ef6f 100644 --- a/system/ttf-ibm-plex/slack-desc +++ b/system/ttf-ibm-plex/slack-desc @@ -5,15 +5,15 @@ # 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------------------------------------------------------| -appname: ttf-ibm-plex (True Type Font) -appname: -appname: IBM Plex font family. -appname: -appname: Home page: https://github.com/IBM/plex -appname: -appname: -appname: -appname: -appname: -appname: + |-----handy-ruler------------------------------------------------------| +ttf-ibm-plex: ttf-ibm-plex (True Type Font) +ttf-ibm-plex: +ttf-ibm-plex: IBM Plex font family. +ttf-ibm-plex: +ttf-ibm-plex: Homepage: https://github.com/IBM/plex +ttf-ibm-plex: +ttf-ibm-plex: +ttf-ibm-plex: +ttf-ibm-plex: +ttf-ibm-plex: +ttf-ibm-plex: diff --git a/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild b/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild index e94c0d2b6c..d7fd215368 100644 --- a/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild +++ b/system/ttf-ibm-plex/ttf-ibm-plex.SlackBuild @@ -4,7 +4,7 @@ # # ISC License # -# Copyright (c) 2019, Lazar Isailovic <etflazar@gmail.com> +# Copyright (c) 2019, 2020 Lazar Isailovic <etflazar@gmail.com> # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -19,7 +19,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. PRGNAM=ttf-ibm-plex -VERSION=${VERSION:-1.2.3} +VERSION=${VERSION:-5.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/ttf-ibm-plex/ttf-ibm-plex.info b/system/ttf-ibm-plex/ttf-ibm-plex.info index 08f9efd196..86067dc59d 100644 --- a/system/ttf-ibm-plex/ttf-ibm-plex.info +++ b/system/ttf-ibm-plex/ttf-ibm-plex.info @@ -1,8 +1,8 @@ PRGNAM="ttf-ibm-plex" -VERSION="1.2.3" +VERSION="5.1.3" HOMEPAGE="https://github.com/IBM/plex" -DOWNLOAD="https://github.com/IBM/plex/releases/download/v1.2.3/TrueType.zip" -MD5SUM="bd4dccee6dc353e21c511dc23ca577ce" +DOWNLOAD="https://github.com/IBM/plex/releases/download/v5.1.3/TrueType.zip" +MD5SUM="813956ffd825da7d502adb545bb4367c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttf-ipaex/ttf-ipaex.SlackBuild b/system/ttf-ipaex/ttf-ipaex.SlackBuild index b0504fac8d..979f694305 100644 --- a/system/ttf-ipaex/ttf-ipaex.SlackBuild +++ b/system/ttf-ipaex/ttf-ipaex.SlackBuild @@ -1,9 +1,8 @@ #!/bin/sh # Slackware build script for ttf-ipaex -# $Id: ttf-ipaex.SlackBuild,v 1.2 2018/09/18 03:45:07 pomf Exp pomf $ -# Copyright 2018 pomfland +# Copyright 2020 pomfland # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ttf-ipaex -VERSION=${VERSION:-003.01} +VERSION=${VERSION:-004.01} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/ttf-ipaex/ttf-ipaex.info b/system/ttf-ipaex/ttf-ipaex.info index 19f9df4f8d..303be395b9 100644 --- a/system/ttf-ipaex/ttf-ipaex.info +++ b/system/ttf-ipaex/ttf-ipaex.info @@ -1,8 +1,8 @@ PRGNAM="ttf-ipaex" -VERSION="003.01" +VERSION="004.01" HOMEPAGE="https://ipafont.ipa.go.jp" -DOWNLOAD="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont00301.zip" -MD5SUM="1dfe7be38d73b389b63525b785423d2c" +DOWNLOAD="https://ipafont.ipa.go.jp/IPAexfont/IPAexfont00401.zip" +MD5SUM="57f2631833c1049ea89320971cc74ce5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttf-mononoki/ttf-mononoki.SlackBuild b/system/ttf-mononoki/ttf-mononoki.SlackBuild index ca2952723d..8c1dcee09a 100644 --- a/system/ttf-mononoki/ttf-mononoki.SlackBuild +++ b/system/ttf-mononoki/ttf-mononoki.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ttf-mononoki -# Copyright 2016-2017 Andrew Clemons, Wellington New Zealand +# Copyright 2016-2017,2021 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=ttf-mononoki SRCNAM=${PRGNAM#ttf-} -VERSION=${VERSION:-1.2} +VERSION=${VERSION:-1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/ttf-mononoki/ttf-mononoki.info b/system/ttf-mononoki/ttf-mononoki.info index 60e4396fab..a38db1a554 100644 --- a/system/ttf-mononoki/ttf-mononoki.info +++ b/system/ttf-mononoki/ttf-mononoki.info @@ -1,8 +1,8 @@ PRGNAM="ttf-mononoki" -VERSION="1.2" +VERSION="1.3" HOMEPAGE="https://github.com/madmalik/mononoki" -DOWNLOAD="https://github.com/madmalik/mononoki/archive/1.2/mononoki-1.2.tar.gz" -MD5SUM="363cc670712f5c5decdc4bf5691e8828" +DOWNLOAD="https://github.com/madmalik/mononoki/archive/1.3/mononoki-1.3.tar.gz" +MD5SUM="48c04185ec480173990d6b8853662da5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttf-paratype-pt-fonts/OFL.txt b/system/ttf-paratype-pt-fonts/OFL.txt new file mode 100644 index 0000000000..18c908ba35 --- /dev/null +++ b/system/ttf-paratype-pt-fonts/OFL.txt @@ -0,0 +1,90 @@ +This Font Software is licensed under the Open Font License, Version 1.1 +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/system/ttf-paratype-pt-fonts/README b/system/ttf-paratype-pt-fonts/README index 551e37c317..8d66ce0b39 100644 --- a/system/ttf-paratype-pt-fonts/README +++ b/system/ttf-paratype-pt-fonts/README @@ -1,18 +1,27 @@ -The Public Type (PT) fonts are free OFL licensed fonts released in -2009-2011 by the ParaType company. They consists of PT Sans (includes 8 -styles), PT Serif (6 styles), and PT Mono (2 styles) families. +This package contains free OFL licensed fonts released in 2009-2019 by +the ParaType company. They consist of 7 families: + +* PT Sans (8 styles) +* PT Serif (6 styles) +* PT Mono (2 styles) +* PT Astra Sans (4 styles) +* PT Astra Serif (4 styles) +* PT Root UI (5 styles) +* Golos Text (6 styles) The fonts cover a long list of Eurasian languages based on Latin and Cyrillic scripts. -The PT fonts were primarily designed by Alexandra Korolkova. +PT Astra Sans and PT Astra Serif fonts are metrically compatible with +Times New Roman. -The texlive-fonts package contains a different variant of PT fonts in +The texlive-fonts package contains earlier versions of PT Sans, PT +Serif, and PT Mono fonts in /usr/share/texmf-dist/fonts/truetype/paratype/ -The present package contains fonts with the truetype specific -hhea-metrics adapted for linux environment. +In this package these families have the truetype specific hhea-metrics +adapted for linux environment. -PT fonts are primarily designed to be used with subpixel hinting (aka +These fonts are primarily designed to be used with subpixel hinting (aka ClearType) activated. When using subpixel hinting, it is recommended to disable embedded diff --git a/system/ttf-paratype-pt-fonts/slack-desc b/system/ttf-paratype-pt-fonts/slack-desc index 887ca2238d..9d00d224db 100644 --- a/system/ttf-paratype-pt-fonts/slack-desc +++ b/system/ttf-paratype-pt-fonts/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -ttf-paratype-pt-fonts: ttf-paratype-pt-fonts (Public Type (PT) +ttf-paratype-pt-fonts: ttf-paratype-pt-fonts (ParaType free fonts) ttf-paratype-pt-fonts: -ttf-paratype-pt-fonts: The Public Type (PT) fonts are free OFL licensed fonts released in -ttf-paratype-pt-fonts: 2009-2011 by the ParaType company. They consists of PT Sans (includes -ttf-paratype-pt-fonts: 8 styles), PT Serif (6 styles), and PT Mono (2 styles) families. +ttf-paratype-pt-fonts: This package contains 7 free OFL licensed fonts released in 2009-2019 +ttf-paratype-pt-fonts: by the ParaType company. The fonts include 35 styles and cover a long +ttf-paratype-pt-fonts: list of Eurasian languages based on Latin and Cyrillic scripts. +ttf-paratype-pt-fonts: +ttf-paratype-pt-fonts: +ttf-paratype-pt-fonts: Homepage: https://www.paratype.com/catalog?freefonts=true ttf-paratype-pt-fonts: -ttf-paratype-pt-fonts: The fonts cover a long list of Eurasian languages based on Latin and -ttf-paratype-pt-fonts: Cyrillic scripts. ttf-paratype-pt-fonts: -ttf-paratype-pt-fonts: Homepage: https://company.paratype.com/pt-sans-pt-serif ttf-paratype-pt-fonts: diff --git a/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild b/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild index b55b37fbea..206f546920 100644 --- a/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild +++ b/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ttf-paratype-pt-fonts -# Copyright 2016, Alexander Verbovetsky, Moscow, Russia +# Copyright 2016-2020, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ttf-paratype-pt-fonts -VERSION=${VERSION:-2.5_1.2_1.3} # Sans_Serif_Mono +VERSION=${VERSION:-2019} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -38,15 +38,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -unzip $CWD/PTSansOFL.zip -rm PTSSM_OFL.txt -unzip $CWD/PTSerifOFL.zip -rm PTSSM_OFL.txt -unzip $CWD/PTMonoOFL.zip +mkdir -p $PKG/usr/share/fonts/TTF +unzip -j "$CWD/*.zip" *.ttf -d $PKG/usr/share/fonts/TTF + +cd $PKG/usr/share/fonts/TTF chown -R root:root . find -L . \ @@ -55,11 +50,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 {} \; -mkdir -p $PKG/usr/share/fonts/TTF -cp -a *.ttf $PKG/usr/share/fonts/TTF - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a PTSSM_OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $CWD/OFL.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/etc/fonts/conf.{d,avail} diff --git a/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.info b/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.info index 622b61443d..27da7a2807 100644 --- a/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.info +++ b/system/ttf-paratype-pt-fonts/ttf-paratype-pt-fonts.info @@ -1,12 +1,22 @@ PRGNAM="ttf-paratype-pt-fonts" -VERSION="2.5_1.2_1.3" -HOMEPAGE="https://company.paratype.com/pt-sans-pt-serif" +VERSION="2019" +HOMEPAGE="https://www.paratype.com/catalog?freefonts=true" DOWNLOAD="https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PTSansOFL.zip \ https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PTSerifOFL.zip \ - https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PTMonoOFL.zip" + https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PTMonoOFL.zip \ + https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PT%20Astra%20Sans_OtTt.zip \ + https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PT%20Astra%20Serif_OtTt.zip \ + https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PT%20Root%20UI_OtTt.zip \ + https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/PT%20Root%20UI%20VF_OtTt.zip \ + https://downloads.sourceforge.net/slackbuildsdirectlinks/ttf-paratype-pt-fonts/Golos%20Text_OtTt.zip" MD5SUM="e5b99133d3b72cd35400b5aa810ad0ee \ 4dd07baa86fd30977cdfabd82bf2ad1d \ - 1c6d5c30fca24130b2888b9427a75134" + 1c6d5c30fca24130b2888b9427a75134 \ + 1033f9d5a25ff79e13f9f5fc68ed6cbc \ + da2896d7d602090dc14af9c7da0dde24 \ + 43ca19bdada4b1287b162fb098ebbe9d \ + 0387e570db7f99f77bf5d76dbfcb8242 \ + 98dd266db0d1e1e66b54df53e61e2223" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ttf-xo-fonts/README b/system/ttf-xo-fonts/README new file mode 100644 index 0000000000..87cbb0ebe1 --- /dev/null +++ b/system/ttf-xo-fonts/README @@ -0,0 +1,17 @@ +This package contains free fonts released in 2016-2019 by the New Cloud +Technologies company (the developer of the office suite "MyOffice"). +They consist of 10 families based on Latin and Cyrillic scripts: + +* XO Oriel (4 styles) +* XO Thames (4 styles) +* XO Caliburn (4 styles) +* XO Courser (4 styles) +* XO Tahion (2 styles) +* XO Windy +* XO Symbol (2 variants) +* XO Oriel Condensed +* XO Trebizond +* XO Verbena + +XO Fonts are metrically compatible with common Microsoft and Monotype +fonts and are designed as an alternative to them. diff --git a/system/ttf-xo-fonts/doinst.sh b/system/ttf-xo-fonts/doinst.sh new file mode 100644 index 0000000000..883c47ac0a --- /dev/null +++ b/system/ttf-xo-fonts/doinst.sh @@ -0,0 +1,10 @@ +# Update the X font indexes: +if [ -x /usr/bin/mkfontdir ]; then + ( cd /usr/share/fonts/TTF + mkfontscale . + mkfontdir . + ) +fi +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi diff --git a/system/ttf-xo-fonts/slack-desc b/system/ttf-xo-fonts/slack-desc new file mode 100644 index 0000000000..37e45d5fdc --- /dev/null +++ b/system/ttf-xo-fonts/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------------------------------------------------------| +ttf-xo-fonts: ttf-xo-fonts (free XO Fonts) +ttf-xo-fonts: +ttf-xo-fonts: This package contains 10 free fonts released in 2016-2019 by the New +ttf-xo-fonts: Cloud Technologies company. The fonts include 24 styles and are based +ttf-xo-fonts: on Latin and Cyrillic scripts. XO Fonts are metrically compatible with +ttf-xo-fonts: common Microsoft and Monotype fonts and are designed as an alternative +ttf-xo-fonts: to them. +ttf-xo-fonts: +ttf-xo-fonts: Homepage: https://fonts.myoffice.ru +ttf-xo-fonts: +ttf-xo-fonts: diff --git a/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild b/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild new file mode 100644 index 0000000000..907790f575 --- /dev/null +++ b/system/ttf-xo-fonts/ttf-xo-fonts.SlackBuild @@ -0,0 +1,61 @@ +#!/bin/sh + +# Slackware build script for ttf-xo-fonts + +# Copyright 2020, Alexander Verbovetsky, Moscow, Russia +# 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. + +PRGNAM=ttf-xo-fonts +VERSION=${VERSION:-2019} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +mkdir -p $PKG/usr/share/fonts/TTF +unzip -j $CWD/all_fonts_myoffice.zip *.ttf -x "*__*" -d $PKG/usr/share/fonts/TTF + +cd $PKG/usr/share/fonts/TTF + +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 {} \; + +mkdir -p $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:-tgz} diff --git a/system/ttf-xo-fonts/ttf-xo-fonts.info b/system/ttf-xo-fonts/ttf-xo-fonts.info new file mode 100644 index 0000000000..f62e5b18cf --- /dev/null +++ b/system/ttf-xo-fonts/ttf-xo-fonts.info @@ -0,0 +1,10 @@ +PRGNAM="ttf-xo-fonts" +VERSION="2019" +HOMEPAGE="https://fonts.myoffice.ru" +DOWNLOAD="https://fonts.myoffice.ru/wp-content/themes/template/fonts_page/files/all_fonts_myoffice.zip" +MD5SUM="16d1ea41f10ad0ecdb2afcac3ee56361" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/system/udiskie/udiskie.SlackBuild b/system/udiskie/udiskie.SlackBuild index 7468f6d9b7..17d1af476c 100644 --- a/system/udiskie/udiskie.SlackBuild +++ b/system/udiskie/udiskie.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for udiskie -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=udiskie -VERSION=${VERSION:-1.7.5} +VERSION=${VERSION:-1.7.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/udiskie/udiskie.info b/system/udiskie/udiskie.info index 8a2138b614..a36cb232f7 100644 --- a/system/udiskie/udiskie.info +++ b/system/udiskie/udiskie.info @@ -1,8 +1,8 @@ PRGNAM="udiskie" -VERSION="1.7.5" +VERSION="1.7.6" HOMEPAGE="https://github.com/coldfix/udiskie" -DOWNLOAD="https://files.pythonhosted.org/packages/e0/5f/ab915ec251dfdc27f852204196976cb14e74cfb04a5dd58b7e7678592def/udiskie-1.7.5.tar.gz" -MD5SUM="ddfb4225062577c7f11461308dd6b82b" +DOWNLOAD="https://files.pythonhosted.org/packages/41/cc/cdc93457255376f0a69867ce84fadade21fac102abc48684b9294195a818/udiskie-1.7.6.tar.gz" +MD5SUM="cadf952fc38434c2f13c0b00f82999a3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="PyYAML docopt" diff --git a/system/ufiformat/slack-desc b/system/ufiformat/slack-desc index 169617d50a..897e7412ec 100644 --- a/system/ufiformat/slack-desc +++ b/system/ufiformat/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| ufiformat: ufiformat (a formatting utility for USB floppy drives) ufiformat: -ufiformat: Homepage: http://www.geocities.jp/tedi_world/format_usbfdd_e.html +ufiformat: https://github.com/tedigh/ufiformat ufiformat: ufiformat: ufiformat: diff --git a/system/ufiformat/ufiformat.SlackBuild b/system/ufiformat/ufiformat.SlackBuild index 9363d136f4..670c9432e0 100644 --- a/system/ufiformat/ufiformat.SlackBuild +++ b/system/ufiformat/ufiformat.SlackBuild @@ -2,9 +2,13 @@ # Slackware build script for ufiFormat # Written by Ben Collver <bencollver@gmail.com> +# Modified by Bojan Popovic <bojanpopovic@slackware-srbija.org> + +# 02 feb 2020 - 0.9.9 build 1 - Updated to 0.9.9. Updated homepage and download links. +# (Bojan) PRGNAM=ufiformat -VERSION=${VERSION:-0.9.6} +VERSION=${VERSION:-0.9.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/ufiformat/ufiformat.info b/system/ufiformat/ufiformat.info index a5ab921ab0..aa9e4668e7 100644 --- a/system/ufiformat/ufiformat.info +++ b/system/ufiformat/ufiformat.info @@ -1,10 +1,10 @@ PRGNAM="ufiformat" -VERSION="0.9.6" -HOMEPAGE="http://www.geocities.jp/tedi_world/format_usbfdd_e.html" -DOWNLOAD="http://www.geocities.jp/tedi_world/ufiformat-0.9.6.tar.gz" -MD5SUM="53a1c033bfca4f182a2c1199484484d8" +VERSION="0.9.9" +HOMEPAGE="https://github.com/tedigh/ufiformat" +DOWNLOAD="https://github.com/tedigh/ufiformat/archive/v0.9.9/ufiformat-0.9.9.tar.gz" +MD5SUM="9a5766b70c469732624d6f7d7941be7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Ben Collver" -EMAIL="bencollver@gmail.com" +MAINTAINER="Bojan Popovic" +EMAIL="bocke@slackware-srbija.org" diff --git a/system/uhubctl/README b/system/uhubctl/README new file mode 100644 index 0000000000..9b5480b0cc --- /dev/null +++ b/system/uhubctl/README @@ -0,0 +1,12 @@ +uhuctl is a utility to control USB power per-port on smart USB hubs. +Smart hub is defined as one that implements per-port power switching. + +Some hub give false report (lsusb -v) that they support per-port +power switching. + +It also works for devices that support unbind. Example: you want to +disconnect a device programmatically, but no physically. In this case +the usb has still power but the device 'unplugs'. + +Original idea for this code was inspired by hub-ctrl.c by Niibe Yutaka: +http://www.gniibe.org/development/ac-power-control-by-USB-hub diff --git a/system/uhubctl/slack-desc b/system/uhubctl/slack-desc new file mode 100644 index 0000000000..ea4df7fdbe --- /dev/null +++ b/system/uhubctl/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------------------------------------------------------| +uhubctl: uhubctl (control the power of compatible USB hubs) +uhubctl: +uhubctl: uhuctl is a utility to control USB power per-por on smart USB hubs. +uhubctl: Smart hub is defined as one that implements per-port power switching. +uhubctl: +uhubctl: Original idea for this code was inspired by hub-ctrl.c by Niibe Yutaka: +uhubctl: http://www.gniibe.org/development/ac-power-control-by-USB-hub +uhubctl: +uhubctl: +uhubctl: +uhubctl: diff --git a/system/mariadb-plugin-saslauthd/mariadb-plugin-saslauthd.SlackBuild b/system/uhubctl/uhubctl.SlackBuild index 0acbe37958..6ebf7e1171 100644 --- a/system/mariadb-plugin-saslauthd/mariadb-plugin-saslauthd.SlackBuild +++ b/system/uhubctl/uhubctl.SlackBuild @@ -1,23 +1,10 @@ #!/bin/sh - -# Slackware build script for mariadb-plugin-saslauthd - -# Copyright 2017-2018 Andreas Voegele <andreas@andreasvoegele.com> +# Slackware build script for <uhubctl> # -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# Michales (clavisound) Michaloudes korgie@gmail.com <2019> -PRGNAM=mariadb-plugin-saslauthd -VERSION=${VERSION:-1.5} +PRGNAM=uhubctl +VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -30,7 +17,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -63,21 +50,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 {} \; -make OPTIMIZE="$SLKCFLAGS" SASLAUTHD_PATH="/var/state/saslauthd/mux" +CFLAGS="$SLKCFLAGS" make make install DESTDIR=$PKG -install -D -m 0644 $CWD/auth_saslauthd.cnf.new $PKG/etc/my.cnf.d/auth_saslauthd.cnf.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 -cp -a Changes LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING 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:-tgz} diff --git a/system/uhubctl/uhubctl.info b/system/uhubctl/uhubctl.info new file mode 100644 index 0000000000..40cbfaa5e4 --- /dev/null +++ b/system/uhubctl/uhubctl.info @@ -0,0 +1,10 @@ +PRGNAM="uhubctl" +VERSION="2.0.0" +HOMEPAGE="https://github.com/mvp/uhubctl/" +DOWNLOAD="https://github.com/mvp/uhubctl/archive/v2.0.0/uhubctl-2.0.0.tar.gz" +MD5SUM="5c711911d766d76813333c3812277574" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Michales Michaloudes" +EMAIL="korgie@gmail.com" diff --git a/system/uif2iso/uif2iso.SlackBuild b/system/uif2iso/uif2iso.SlackBuild index 3c80bf8c12..1b9a9ac20b 100644 --- a/system/uif2iso/uif2iso.SlackBuild +++ b/system/uif2iso/uif2iso.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for uif2iso -# Copyright 2009 David Woodfall <dave@dawoodfall.net> +# Copyright 2009 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # aka dive in #slackware on freenode.net diff --git a/system/uif2iso/uif2iso.info b/system/uif2iso/uif2iso.info index d1e3a7d511..645d3d6045 100644 --- a/system/uif2iso/uif2iso.info +++ b/system/uif2iso/uif2iso.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/unar/document-undocumented-options.patch b/system/unar/document-undocumented-options.patch deleted file mode 100644 index 3e7a5342f5..0000000000 --- a/system/unar/document-undocumented-options.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: Document undocumented options - lsar's -L and -v options and unar's -v option are not documented in - their respective manual pages, so do so. -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/unar/+bug/1393321 -Bug: https://code.google.com/p/theunarchiver/issues/detail?id=352 -Author: Matt Kraai <kraai@ftbfs.org> -Last-Update: 2014-12-15 - -Index: unar/Extra/lsar.1 -=================================================================== ---- unar.orig/Extra/lsar.1 2014-12-15 07:00:54.285823351 -0800 -+++ unar/Extra/lsar.1 2014-12-15 07:01:24.095917401 -0800 -@@ -11,6 +11,9 @@ - .BR \-l ", " \-long - Print more information about each file in the archive. - .TP -+.BR \-L ", " \-verylong -+Print all available information about each file in the archive. -+.TP - .BR \-t ", " \-test - Test the integrity of the files in the archive, if possible. - .TP -@@ -49,5 +52,8 @@ - .TP - .BR \-h ", " \-help - Display help information. -+.TP -+.BR \-v ", " \-version -+Print version and exit. - .SH SEE ALSO - .BR unar (1) -Index: unar/Extra/unar.1 -=================================================================== ---- unar.orig/Extra/unar.1 2014-12-15 07:00:54.285823351 -0800 -+++ unar/Extra/unar.1 2014-12-15 07:01:24.095917401 -0800 -@@ -68,6 +68,9 @@ - .BR \-q ", " \-quiet - Run in quiet mode. - .TP -+.BR \-v ", " \-version -+Print version and exit. -+.TP - .BR \-h ", " \-help - Display help information. - .SH SEE ALSO diff --git a/system/unar/unar.SlackBuild b/system/unar/unar.SlackBuild index 61017e129a..bf543ed322 100644 --- a/system/unar/unar.SlackBuild +++ b/system/unar/unar.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for <appname> -# Copyright 2016-2017 Alexander Verbovetsky, Moscow, Russia +# Copyright 2016-2020 Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=unar -VERSION=${VERSION:-1.10.1} +VERSION=${VERSION:-1.10.7} +UDVERSION=${UDVERSION:-1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,10 +56,11 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf "The Unarchiver" $PRGNAM-$VERSION -unzip "$CWD/$PRGNAM$VERSION"_src.zip -mv "The Unarchiver" $PRGNAM-$VERSION -cd $PRGNAM-$VERSION +rm -rf XADMaster-$VERSION UniversalDetector +tar xvf $CWD/XADMaster-$VERSION.tar.gz +tar xvf $CWD/universal-detector-$UDVERSION.tar.gz +mv universal-detector-$UDVERSION UniversalDetector +cd XADMaster-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -70,25 +72,21 @@ export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" export OBJCFLAGS="$SLKCFLAGS" -cd XADMaster make -f Makefile.linux mkdir -p $PKG/usr/bin install -m 0755 -o root -g root lsar unar $PKG/usr/bin/ -cd ../Extra -patch -p2 < $CWD/document-undocumented-options.patch mkdir -p $PKG/usr/man/man1 -install -m 0644 -o root -g root lsar.1 unar.1 $PKG/usr/man/man1 +install -m 0644 -o root -g root Extra/lsar.1 Extra/unar.1 \ + $PKG/usr/man/man1 mkdir -p $PKG/usr/share/bash-completion/completions -install -m 0644 -o root -g root unar.bash_completion \ +install -m 0644 -o root -g root Extra/unar.bash_completion \ $PKG/usr/share/bash-completion/completions/unar -install -m 0644 -o root -g root lsar.bash_completion \ +install -m 0644 -o root -g root Extra/lsar.bash_completion \ $PKG/usr/share/bash-completion/completions/lsar -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 diff --git a/system/unar/unar.info b/system/unar/unar.info index 70c0b95762..d0aad06e4a 100644 --- a/system/unar/unar.info +++ b/system/unar/unar.info @@ -1,8 +1,10 @@ PRGNAM="unar" -VERSION="1.10.1" +VERSION="1.10.7" HOMEPAGE="https://theunarchiver.com/command-line" -DOWNLOAD="http://downloads.sourceforge.net/slackbuildsdirectlinks/unar1.10.1_src.zip" -MD5SUM="8fb16cf42ee2832d63ff378fd049e08c" +DOWNLOAD="https://github.com/MacPaw/XADMaster/archive/v1.10.7/XADMaster-1.10.7.tar.gz \ + https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz" +MD5SUM="6cbb0629367e4f0fc0eac5af39786c6d \ + 5c87b87c72609b23110236c6d7aac8e5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gnustep-base" diff --git a/system/unetbootin/unetbootin.SlackBuild b/system/unetbootin/unetbootin.SlackBuild index dedae6b2e7..23e9f5ba58 100644 --- a/system/unetbootin/unetbootin.SlackBuild +++ b/system/unetbootin/unetbootin.SlackBuild @@ -9,9 +9,10 @@ # v608: (jw) version bump to 608 21 March 2015 (also tested on multilib 14.1) # v647: (jw) version bump to 647 26 May 2017 # v661: (jw) version bump to 661 29 July 2018 / take sources from github.com as the sourceforge page seems to be somehow obsolete +# v677: (SBo) version bump to 677 14 April 2020 PRGNAM=unetbootin -VERSION=${VERSION:-661} +VERSION=${VERSION:-677} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/unetbootin/unetbootin.info b/system/unetbootin/unetbootin.info index d6f3dbb6d5..43633d144b 100644 --- a/system/unetbootin/unetbootin.info +++ b/system/unetbootin/unetbootin.info @@ -1,8 +1,8 @@ PRGNAM="unetbootin" -VERSION="661" +VERSION="677" HOMEPAGE="https://unetbootin.github.io" -DOWNLOAD="https://github.com/unetbootin/unetbootin/releases/download/661/unetbootin-source-661.tar.gz" -MD5SUM="eafb57095669add5d3eef49193bcb5a9" +DOWNLOAD="https://github.com/unetbootin/unetbootin/releases/download/677/unetbootin-source-677.tar.gz" +MD5SUM="1478ccd53e0ea003fd33135cf458b9e3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="p7zip" diff --git a/system/unicode-character-database/unicode-character-database.SlackBuild b/system/unicode-character-database/unicode-character-database.SlackBuild index 8bf2d581b3..166ad24775 100644 --- a/system/unicode-character-database/unicode-character-database.SlackBuild +++ b/system/unicode-character-database/unicode-character-database.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for unicode-character-database -# Copyright 2016-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2016-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PRGNAM=unicode-character-database SRCNAM1=UCD SRCNAM2=Unihan -VERSION=${VERSION:-11.0.0} +VERSION=${VERSION:-13.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/unicode-character-database/unicode-character-database.info b/system/unicode-character-database/unicode-character-database.info index 1d9c7f3fd5..841babe8e8 100644 --- a/system/unicode-character-database/unicode-character-database.info +++ b/system/unicode-character-database/unicode-character-database.info @@ -1,10 +1,10 @@ PRGNAM="unicode-character-database" -VERSION="11.0.0" +VERSION="13.0.0" HOMEPAGE="https://www.unicode.org/ucd/" -DOWNLOAD="https://www.unicode.org/Public/zipped/11.0.0/UCD.zip \ - https://www.unicode.org/Public/zipped/11.0.0/Unihan.zip" -MD5SUM="12c91fa6a99e73903aad4d7d97f828fd \ - fb1e7437ff3fc2516469f9904cf3fc7c" +DOWNLOAD="https://www.unicode.org/Public/zipped/13.0.0/UCD.zip \ + https://www.unicode.org/Public/zipped/13.0.0/Unihan.zip" +MD5SUM="23f7bf8cc99adef525718b2bee0867ba \ + 1e7f8b6bf1cf69d3602fe91f97aaee01" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/unigine-heaven-benchmark/README b/system/unigine-heaven-benchmark/README new file mode 100644 index 0000000000..81758f21e6 --- /dev/null +++ b/system/unigine-heaven-benchmark/README @@ -0,0 +1,9 @@ +Heaven Benchmark is a GPU-intensive benchmark that hammers graphics +cards to the limits. This powerful tool can be effectively used +to determine the stability of a GPU under extremely stressful +conditions, as well as check the cooling system's potential +under maximum heat output. + +Please note that the source file is 273mb if you are on a slow +internet connection. + diff --git a/system/unigine-heaven-benchmark/doinst.sh b/system/unigine-heaven-benchmark/doinst.sh new file mode 100644 index 0000000000..392c12adb9 --- /dev/null +++ b/system/unigine-heaven-benchmark/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + diff --git a/system/unigine-heaven-benchmark/slack-desc b/system/unigine-heaven-benchmark/slack-desc new file mode 100644 index 0000000000..3a3cc4a94d --- /dev/null +++ b/system/unigine-heaven-benchmark/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 ':'. + + |-----handy-ruler------------------------------------------------------| +unigine-heaven-benchmark: unigine-heaven-benchmark (benchmark software) +unigine-heaven-benchmark: +unigine-heaven-benchmark: Heaven Benchmark is a GPU-intensive benchmark that hammers graphics +unigine-heaven-benchmark: cards to the limits. This powerful tool can be effectively used +unigine-heaven-benchmark: to determine the stability of a GPU under extremely stressful +unigine-heaven-benchmark: conditions, as well as check the cooling system's potential +unigine-heaven-benchmark: under maximum heat output. +unigine-heaven-benchmark: +unigine-heaven-benchmark: +unigine-heaven-benchmark: +unigine-heaven-benchmark: diff --git a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild new file mode 100644 index 0000000000..315b37cdaf --- /dev/null +++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.SlackBuild @@ -0,0 +1,94 @@ +#!/bin/sh + +# Slackware build script for unigine-heaven-benchmark + +# Copyright 2020 Matt Dinslage Springfield, MO +# 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. + +PRGNAM=unigine-heaven-benchmark +VERSION=${VERSION:-4.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=Unigine_Heaven + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 +cd $PKG +sh $CWD/$SRCNAM-$VERSION.run --target "$PKG/opt/$PRGNAM" --noexec +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 {} \; + +# copy excutable +mkdir -p $PKG/usr/bin +cp $PKG/opt/$PRGNAM/heaven $PKG/usr/bin + +# fix excutable +sed -i 's,./bin,/opt/unigine-heaven-benchmark/bin,g' $PKG/usr/bin/heaven + +#add application launcher +mkdir -p $PKG/usr/share/applications +cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $PKG/opt/$PRGNAM/documentation/User_Manual.pdf $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:-tgz} diff --git a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop new file mode 100644 index 0000000000..c28649c996 --- /dev/null +++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=unigine-heaven-benchmark +GenericName=System benchmarking software +Exec=heaven +Terminal=false +Type=Application +Categories=Game; +Icon=/opt/unigine-heaven-benchmark/data/launcher/icon.png +StartupNotify=false diff --git a/system/unigine-heaven-benchmark/unigine-heaven-benchmark.info b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.info new file mode 100644 index 0000000000..6feb42d90c --- /dev/null +++ b/system/unigine-heaven-benchmark/unigine-heaven-benchmark.info @@ -0,0 +1,10 @@ +PRGNAM="unigine-heaven-benchmark" +VERSION="4.0" +HOMEPAGE="https://benchmark.unigine.com/heaven" +DOWNLOAD="https://assets.unigine.com/d/Unigine_Heaven-4.0.run" +MD5SUM="71e87df9f7b7569e9a2ea307fde2d8f4" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="M.Dinslage" +EMAIL="daedra1980@gmail.com" diff --git a/system/unigine-valley-benchmark/README b/system/unigine-valley-benchmark/README new file mode 100644 index 0000000000..b567bdc095 --- /dev/null +++ b/system/unigine-valley-benchmark/README @@ -0,0 +1,7 @@ +unigine-valley-benchmark is an extreme performance and stability test +for PC hardware: video card, power supply, cooling system. Check +your rig in stock and overclocking modes with real-life load! Also +includes interactive experience in a beautiful, detailed environment. + +Please not the source is 394mb if you are on a slow internet +connection. diff --git a/system/unigine-valley-benchmark/doinst.sh b/system/unigine-valley-benchmark/doinst.sh new file mode 100644 index 0000000000..392c12adb9 --- /dev/null +++ b/system/unigine-valley-benchmark/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi + diff --git a/system/unigine-valley-benchmark/slack-desc b/system/unigine-valley-benchmark/slack-desc new file mode 100644 index 0000000000..cd8e8cc8a5 --- /dev/null +++ b/system/unigine-valley-benchmark/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 ':'. + + |-----handy-ruler------------------------------------------------------| +unigine-valley-benchmark: unigine-valley-benchmark (System benchmark tool) +unigine-valley-benchmark: +unigine-valley-benchmark: unigine-valley-benchmark is an extreme performance and stability test +unigine-valley-benchmark: for PC hardware: video card, power supply, cooling system. Check +unigine-valley-benchmark: your rig in stock and overclocking modes with real-life load! Also +unigine-valley-benchmark: includes interactive experience in a beautiful, detailed environment. +unigine-valley-benchmark: +unigine-valley-benchmark: +unigine-valley-benchmark: +unigine-valley-benchmark: +unigine-valley-benchmark: diff --git a/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild b/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild new file mode 100644 index 0000000000..3f55ff015b --- /dev/null +++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.SlackBuild @@ -0,0 +1,94 @@ +#!/bin/sh + +# Slackware build script for unigine-valley-benchmark + +# Copyright 2020 Matt Dinslage Springfield, MO +# 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. + +PRGNAM=unigine-valley-benchmark +VERSION=${VERSION:-1.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=Unigine_Valley + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 +cd $PKG +sh $CWD/$SRCNAM-$VERSION.run --target "$PKG/opt/$PRGNAM" --noexec +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 {} \; + +# copy excutable +mkdir -p $PKG/usr/bin +cp $PKG/opt/$PRGNAM/valley $PKG/usr/bin + +# fix excutable +sed -i 's,./bin,/opt/unigine-valley-benchmark/bin,g' $PKG/usr/bin/valley + +#add application launcher +mkdir -p $PKG/usr/share/applications +cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $PKG/opt/$PRGNAM/documentation/*.pdf $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:-tgz} diff --git a/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop b/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop new file mode 100644 index 0000000000..f67847e9d3 --- /dev/null +++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=unigine-valley-benchmark +GenericName=System benchmarking software +Exec=valley +Terminal=false +Type=Application +Categories=Game; +Icon=/opt/unigine-valley-benchmark/data/launcher/icon.png +StartupNotify=false diff --git a/system/unigine-valley-benchmark/unigine-valley-benchmark.info b/system/unigine-valley-benchmark/unigine-valley-benchmark.info new file mode 100644 index 0000000000..5de76a9744 --- /dev/null +++ b/system/unigine-valley-benchmark/unigine-valley-benchmark.info @@ -0,0 +1,10 @@ +PRGNAM="unigine-valley-benchmark" +VERSION="1.0" +HOMEPAGE="https://benchmark.unigine.com/valley" +DOWNLOAD="https://assets.unigine.com/d/Unigine_Valley-1.0.run" +MD5SUM="186268c769db82f51a01cc8e0810752f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="M.Dinslage" +EMAIL="daedra1980@gmail.com" diff --git a/system/unionfs-fuse/README b/system/unionfs-fuse/README new file mode 100644 index 0000000000..15eb5cc1bc --- /dev/null +++ b/system/unionfs-fuse/README @@ -0,0 +1,15 @@ +unionfs-fuse is a unionfs filesystem implementation using fuse. +It is meant to be way more flexible than the current in-kernel unionfs +solution. + +Why choose this stuff? + * The filesystem has to be mounted after the roots are mounted when + using the standard module. With unionfs-fuse, you can mount the + roots later and their contents will appear seamlesly. + * You get caching (provided by the underlying FUSE page cache) which + speeds things up a lot for free. + * Advanced features like copy-on-write and more. + +Why NOT choose it? + * Compared to kernel-space solution we need lots of useless context + switches which makes a kernel-only solution clear speed-winner. diff --git a/system/unionfs-fuse/slack-desc b/system/unionfs-fuse/slack-desc new file mode 100644 index 0000000000..e3d09b34de --- /dev/null +++ b/system/unionfs-fuse/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------------------------------------------------------| +unionfs-fuse: unionfs-fuse (unionfs filesystem) +unionfs-fuse: +unionfs-fuse: unionfs-fuse is a unionfs filesystem implementation using fuse. +unionfs-fuse: +unionfs-fuse: It is meant to be way more flexible than the current in-kernel +unionfs-fuse: unionfs solution. +unionfs-fuse: +unionfs-fuse: Project URL: https://github.com/rpodgorny/unionfs-fuse +unionfs-fuse: +unionfs-fuse: +unionfs-fuse: diff --git a/system/unionfs-fuse/unionfs-fuse.SlackBuild b/system/unionfs-fuse/unionfs-fuse.SlackBuild new file mode 100644 index 0000000000..8b5241e008 --- /dev/null +++ b/system/unionfs-fuse/unionfs-fuse.SlackBuild @@ -0,0 +1,92 @@ +#!/bin/sh +# Slackware build script for unionfs-fuse. +# +# Yth | Pont-en-Royans, France | yth@ythogtha.org +# +# 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. + +PRGNAM=unionfs-fuse +VERSION=${VERSION:-2.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +DOCFILES="CREDITS LICENSE NEWS README*" + +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 {} \; + +sed -i -e 's|share/man|man|' Makefile +sed -i -e 's|usr/local|usr|' Makefile + +make PREFIX=/usr CFLAGS_EXTRA="$SLKCFLAGS" +make install 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 + +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 $DOCFILES $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:-tgz} diff --git a/system/unionfs-fuse/unionfs-fuse.info b/system/unionfs-fuse/unionfs-fuse.info new file mode 100644 index 0000000000..e8c9d31d6a --- /dev/null +++ b/system/unionfs-fuse/unionfs-fuse.info @@ -0,0 +1,10 @@ +PRGNAM="unionfs-fuse" +VERSION="2.1" +HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse" +DOWNLOAD="https://github.com/rpodgorny/unionfs-fuse/archive/v2.1/unionfs-fuse-2.1.tar.gz" +MD5SUM="07f877d5b440b526fcf4532905183085" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Yth - Arnaud" +EMAIL="yth@ythogtha.org" diff --git a/system/unison/old_ocaml.diff.gz b/system/unison/old_ocaml.diff.gz Binary files differnew file mode 100644 index 0000000000..9fd8b1b527 --- /dev/null +++ b/system/unison/old_ocaml.diff.gz diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild index 6d43f2fab0..3e82e4a68b 100644 --- a/system/unison/unison.SlackBuild +++ b/system/unison/unison.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for unison # Copyright 2007-2011 Ferenc Deak <ferenc.deak@gmail.com> -# Copyright 2018 Andrew Clemons, Wellington New Zealand +# Copyright 2018,2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=unison -VERSION=${VERSION:-2.51.2} +VERSION=${VERSION:-2.51.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,6 +63,11 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION + +if [ "$(ocamlc --version | cut -d. -f1)" = "4" ] && [ "$(ocamlc --version | cut -d. -f2)" = "03" ] ; then + zcat $CWD/old_ocaml.diff.gz | patch -p1 +fi + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/unison/unison.info b/system/unison/unison.info index ec88247672..3db7c7da02 100644 --- a/system/unison/unison.info +++ b/system/unison/unison.info @@ -1,8 +1,8 @@ PRGNAM="unison" -VERSION="2.51.2" -HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/" -DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.2/unison-2.51.2.tar.gz" -MD5SUM="11991eddcf6fdd8b50041eefe44bad61" +VERSION="2.51.3" +HOMEPAGE="https://www.cis.upenn.edu/~bcpierce/unison/" +DOWNLOAD="https://github.com/bcpierce00/unison/archive/v2.51.3/unison-2.51.3.tar.gz" +MD5SUM="015533d6f89b47d8862c0e56350d1b0a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lablgtk" diff --git a/system/univga-font/README b/system/univga-font/README index 8550419cbf..10e0670927 100644 --- a/system/univga-font/README +++ b/system/univga-font/README @@ -1,17 +1,30 @@ univga-font (unicode terminal font) UNI-VGA is a Unicode VGA font for X11 and console. It is primarily -intended to be the single source of fonts for console and for XDosEmu. +intended to be the single source of fonts for console and for MS-DOS +emulators. -One of the aims while creating the font was its internal consistency. For -example, accented glyphs shouldn't differ too much from unaccented ones, -as it was in original IBM's VGA font. It also allowed to render Latin -Extended Additional glyphs with two accents, which was impossible with -IBM's accents' size. +One of the aims while creating the font was its internal consistency. +For example, accented glyphs shouldn't differ too much from unaccented +ones, as it was in original IBM's VGA font. It also allows rendering +Latin Extended Additional glyphs with two accents, which was +impossible with IBM's accents' size. -X11 calls the font "-bolkhov-vga-medium-r-normal--16-160-75-75-c-80-iso10646-1" -and an alias called "univga" is added, so you can say e.g. "xterm -fn univga". +X11 calls the font: + -bolkhov-vga-medium-r-normal--16-160-75-75-c-80-iso10646-1 +...and an alias called "univga" is added, so you can say e.g.: + xterm -fn univga -Also 3 varieties of the font are installed for use with the Linux console: -AsianCyr-vga-8x16, WinCyr-vga-8x16, and UniCyrX-vga-8x16. They can be -used in /etc/rc.d/rc.font, but won't show up in the setconsolefont menu. +In most applications' font pickers, the font is just "VGA". + +Also 3 varieties of the font are installed for use with +the Linux console: AsianCyr-vga-8x16, WinCyr-vga-8x16, and +UniCyrX-vga-8x16. They can be used in /etc/rc.d/rc.font, but won't +show up in the setconsolefont menu. + +By default, the BDF (old style X bitmap), PSF (Linux console), and +OTB (new style Pango/Harfbuzz bitmap) fonts are installed. If you for +some reason need it, you can also install the PCF (portable compiled +X font) version, with PCF=yes in the environment. You can also set +BDF=no, PSF=no, and/or OTB=no, if you want to omit one or more of +these font types. Setting all 4 variables to "no" is an error, though. diff --git a/system/univga-font/doinst.sh b/system/univga-font/doinst.sh index 4316eac64c..11dff54efe 100644 --- a/system/univga-font/doinst.sh +++ b/system/univga-font/doinst.sh @@ -11,6 +11,11 @@ if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then ) fi +# If X is running... +if [ "$DISPLAY" != "" ] && [ -x /usr/bin/xset ]; then + /usr/bin/xset fp rehash >/dev/null 2>&1 +fi + # Update the X font indexes: if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f diff --git a/system/univga-font/slack-desc b/system/univga-font/slack-desc index 79e4dfc1e4..6ec95c65cf 100644 --- a/system/univga-font/slack-desc +++ b/system/univga-font/slack-desc @@ -9,11 +9,11 @@ univga-font: univga-font (unicode terminal font) univga-font: univga-font: UNI-VGA is a Unicode VGA font for X11 and console. It is primarily -univga-font: intended to be the single source of fonts for console and for XDosEmu. -univga-font: -univga-font: -univga-font: +univga-font: intended to be the single source of fonts for console and for MS-DOS univga-font: +univga-font: emulators. +univga-font: Font types included in this package: univga-font: +univga-font: PSF=@PSF@, BDF=@BDF@, OTB=@OTB@, PCF=@PCF@ univga-font: univga-font: diff --git a/system/univga-font/univga-font.SlackBuild b/system/univga-font/univga-font.SlackBuild index 8a4f44caa0..907dd8d16b 100644 --- a/system/univga-font/univga-font.SlackBuild +++ b/system/univga-font/univga-font.SlackBuild @@ -8,9 +8,16 @@ # VERSION taken from the datestamp of the tarball. +# 20201206 bkw: BUILD=3, added OTB font since -current's pango wants it. +# Also add PCF (disabled by default). Based on a patch from +# Tomasz Bywalec. Update README. Have slack-desc list the +# font types included in the package. + +# 20191224 bkw: BUILD=2, xset fp rehash in doinst.sh. + PRGNAM=univga-font VERSION=${VERSION:-20021031} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} ARCH=noarch @@ -23,6 +30,7 @@ OUTPUT=${OUTPUT:-/tmp} set -e TARNAME=uni-vga +FNAME=u_vga16 DIRNAME=${TARNAME/-/_} rm -rf $PKG @@ -32,11 +40,14 @@ rm -rf $DIRNAME tar xvf $CWD/$TARNAME.tgz cd $DIRNAME 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ + +# Defaults: +PSF="${PSF:-yes}" +BDF="${BDF:-yes}" +OTB="${OTB:-yes}" +PCF="${PCF:-no}" # modern perl needs a slight change to the bdf2psf.pl script, and modern # psfaddtable has different options than whatever this was written for. @@ -44,22 +55,46 @@ patch -p1 < $CWD/buildfix.diff # The console fonts. They're very similar to the ones shipped with the kbd # package, but not identical. -make allfonts -mkdir -p $PKG/usr/share/kbd/consolefonts/ -for i in *.psf; do - gzip -9c < $i > $PKG/usr/share/kbd/consolefonts/${i}u.gz -done +if [ "$PSF" = "yes" ]; then + make allfonts + mkdir -p $PKG/usr/share/kbd/consolefonts/ + for i in *.psf; do + gzip -9c < $i > $PKG/usr/share/kbd/consolefonts/${i}u.gz + done + ok=yes +fi # The X font. Use with xterm or such, very nice. -mkdir -p $PKG/usr/share/fonts/misc -gzip -9c < u_vga16.bdf > $PKG/usr/share/fonts/misc/u_vga16.bdf.gz - -# thought about using PCF instead, it's a trade-off: the compiled PCF is -# bigger than the BDF, and after gzipping both, it's still bigger. The -# BDF supposedly takes longer to load when first accessed, but I doubt -# anyone's got a slow enough system to notice. - -#bdftopcf -t u_vga16.bdf | gzip -9c > $PKG/usr/share/fonts/misc/u_vga16.pcf.gz +if [ "$BDF" = "yes" ]; then + mkdir -p $PKG/usr/share/fonts/misc + gzip -9c < $FNAME.bdf > $PKG/usr/share/fonts/misc/$FNAME.bdf.gz + ok=yes +fi + +# If you *really* want the PCF version, you can have it via PCF=yes. +# It's a trade-off: the compiled PCF is bigger than the BDF, and after +# gzipping both, it's still bigger. The BDF supposedly takes longer +# to load when first accessed, but I doubt anyone's got a slow enough +# system to notice. +if [ "$PCF" = "yes" ]; then + mkdir -p $PKG/usr/share/fonts/misc + bdftopcf -t $FNAME.bdf | gzip -9c > $PKG/usr/share/fonts/misc/$FNAME.pcf.gz + ok=yes +fi + +# OpenType Bitmap (OTB) fonts, compatible with recent versions of Pango. +# Necessary for -current and eventually 15.0. Support added by Tomasz Bywalec. +if [ "$OTB" = "yes" ]; then + mkdir -p $PKG/usr/share/fonts/misc + fonttosfnt -o "$PKG/usr/share/fonts/misc/$FNAME.otb" $FNAME.bdf + ok=yes +fi + +if [ "$ok" != "yes" ]; then + echo "*** No fonts selected to be included in the package." 1>&2 + echo "*** At least one of the PCF BDF PSF OTB environment variables must be 'yes'." 1>&2 + exit 1 +fi # include the converter script, someone might find it useful. mkdir -p $PKG/usr/bin @@ -70,7 +105,11 @@ cp -a *.lsm $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 +sed -e "s,@PCF@,$PCF," \ + -e "s,@BDF@,$BDF," \ + -e "s,@PSF@,$PSF," \ + -e "s,@OTB@,$OTB," \ + $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG diff --git a/system/upass/upass.SlackBuild b/system/upass/upass.SlackBuild index ce1a84f4ea..428b6700f0 100644 --- a/system/upass/upass.SlackBuild +++ b/system/upass/upass.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for upass -# Copyright 2017 David Woodfall <dave@dawoodfall.net> +# Copyright 2017 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/upass/upass.info b/system/upass/upass.info index f34cb0fafe..978cd80dd7 100644 --- a/system/upass/upass.info +++ b/system/upass/upass.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-urwid pyperclip password-store" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/system/usbguard/README b/system/usbguard/README new file mode 100644 index 0000000000..543066146e --- /dev/null +++ b/system/usbguard/README @@ -0,0 +1,40 @@ +The USBGuard software framework helps to protect your +computer against unauthorized use of USB ports on +a machine. To enforce the user-defined policy, it uses +the USB device authorization feature implemented in the +Linux kernel since 2007. + +USBGuard supports granular policy options as well as +blacklisting and whitelisting capabilities for specifying +how USB devices will interact with a particular host system. + +A device that is blocked will be listed by the operating +system as being connected, but no communication is allowed +for it. A device that is rejected will be completely ignored +after it is inserted into the port. + +Optional dependencies: + - audit + - libseccomp + +To have the USBGuard daemon start and stop with your host, +add to /etc/rc.d/rc.local: + + if [ -x /etc/rc.d/rc.usbguard ]; then + /etc/rc.d/rc.usbguard start + fi + +and to /etc/rc.d/rc.local_shutdown (creating it if needed): + + if [ -x /etc/rc.d/rc.usbguard]; then + /etc/rc.d/rc.usbguard stop + fi + +Warning: You must configure the daemon before you start it +or all USB devices will immediately be blocked! + +In order to view the current policy execute the following +command: sudo usbguard generate-policy + +If you are satisfied with the output then copy it to the rules file. +sudo usbguard generate-policy >> /etc/usbguard/rules.conf diff --git a/system/usbguard/config/rc.usbguard b/system/usbguard/config/rc.usbguard new file mode 100644 index 0000000000..71f7975d24 --- /dev/null +++ b/system/usbguard/config/rc.usbguard @@ -0,0 +1,63 @@ +#!/bin/sh +# +# Start/Stop/Restart the USBGuard daemon. +# + +PIDFILE=/var/run/usbguard.pid +USBGUARD_OPTS="-f -s" + +# Start +usbguard_start() { + if [ -x /usr/sbin/usbguard-daemon ]; then + if [ -e "$PIDFILE" ]; then + echo "USBGuard daemon already started!" + else + echo "Starting USBGuard daemon..." + /usr/sbin/usbguard-daemon $USBGUARD_OPTS + fi + fi +} + +# Stop +usbguard_stop() { + echo "Stopping USBGuard daemon..." + if [ -e "$PIDFILE" ]; then + kill $(cat $PIDFILE) + rm -f $PIDFILE 2>&1 >/dev/null + fi + # Just in case: + killall usbguard-daemon 2>&1 >/dev/null +} + +# Restart +usbguard_restart() { + usbguard_stop + sleep 3 + usbguard_start +} + +# Status +usbguard_status() { + if [ -e "$PIDFILE" ]; then + echo "usbguard-daemon is running." + else + echo "usbguard-daemon is stopped." + fi +} + +case "$1" in +'start') + usbguard_start + ;; +'stop') + usbguard_stop + ;; +'restart') + usbguard_restart + ;; +'status') + usbguard_status + ;; +*) + echo "usage: $0 start|stop|restart|status" +esac diff --git a/system/usbguard/config/usbguard.logrotate b/system/usbguard/config/usbguard.logrotate new file mode 100644 index 0000000000..1ed4e106fe --- /dev/null +++ b/system/usbguard/config/usbguard.logrotate @@ -0,0 +1,10 @@ +/var/log/usbguard/usbguard-audit.log { + daily + rotate 7 + copytruncate + delaycompress + compress + notifempty + missingok +} + diff --git a/system/usbguard/doinst.sh b/system/usbguard/doinst.sh new file mode 100644 index 0000000000..1d67f5cd4a --- /dev/null +++ b/system/usbguard/doinst.sh @@ -0,0 +1,25 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.usbguard.new +config etc/logrotate.d/usbguard.new diff --git a/system/usbguard/slack-desc b/system/usbguard/slack-desc new file mode 100644 index 0000000000..5a155841ea --- /dev/null +++ b/system/usbguard/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------------------------------------------------------| +usbguard: usbguard (Software protection against rogue USB devices) +usbguard: +usbguard: The USBGuard software framework helps to protect your +usbguard: computer against rogue USB devices (a.k.a. BadUSB) by +usbguard: implementing basic whitelisting and blacklisting +usbguard: capabilities based on device attributes. +usbguard: +usbguard: +usbguard: https://usbguard.github.io/ +usbguard: +usbguard: diff --git a/system/usbguard/usbguard.SlackBuild b/system/usbguard/usbguard.SlackBuild new file mode 100644 index 0000000000..0bd7c48f96 --- /dev/null +++ b/system/usbguard/usbguard.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/sh + +# Slackware build script for usbguard + +# Copyright 2019 Michael Edie Orlando, FL USA +# 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. + +PRGNAM=usbguard +VERSION=${VERSION:-0.7.8} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux \ + --with-crypto-library=sodium \ + --with-bundled-catch \ + --with-bundled-pegtl + +make +make install 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 + +DOCS="VERSION LICENSE CHANGELOG.md README.adoc" + +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 -D -m 0644 $CWD/config/usbguard.logrotate $PKG/etc/logrotate.d/usbguard.new +install -D -m 0644 $CWD/config/rc.usbguard $PKG/etc/rc.d/rc.usbguard.new + +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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/usbguard/usbguard.info b/system/usbguard/usbguard.info new file mode 100644 index 0000000000..2f91cbf1b3 --- /dev/null +++ b/system/usbguard/usbguard.info @@ -0,0 +1,10 @@ +PRGNAM="usbguard" +VERSION="0.7.8" +HOMEPAGE="https://usbguard.github.io/" +DOWNLOAD="https://github.com/USBGuard/usbguard/releases/download/usbguard-0.7.8/usbguard-0.7.8.tar.gz" +MD5SUM="b96dcae8c4169c455ac81adab44d59c8" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="protobuf libqb libsodium" +MAINTAINER="Michael Edie" +EMAIL="michael@sawbox.net" diff --git a/system/usbrelay/slack-desc b/system/usbrelay/slack-desc index 04076d196a..b43db4071d 100644 --- a/system/usbrelay/slack-desc +++ b/system/usbrelay/slack-desc @@ -12,7 +12,7 @@ usbrelay: Command line tool for 1,2,4 and 8 output usb relays based on HID usbrelay: compatible chips. usbrelay: usbrelay: Usage instructions at: https://github.com/darrylb123/usbrelay -usbrelay: +usbrelay: usbrelay: usbrelay: usbrelay: diff --git a/system/usbrelay/usbrelay.SlackBuild b/system/usbrelay/usbrelay.SlackBuild index e57a8c8f76..1e6d5ca66d 100644 --- a/system/usbrelay/usbrelay.SlackBuild +++ b/system/usbrelay/usbrelay.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=usbrelay -VERSION=${VERSION:-0.3} +VERSION=${VERSION:-0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/usbrelay/usbrelay.info b/system/usbrelay/usbrelay.info index c6447b97e7..2c1c413699 100644 --- a/system/usbrelay/usbrelay.info +++ b/system/usbrelay/usbrelay.info @@ -1,8 +1,8 @@ PRGNAM="usbrelay" -VERSION="0.3" +VERSION="0.7" HOMEPAGE="https://github.com/darrylb123/usbrelay" -DOWNLOAD="https://github.com/darrylb123/usbrelay/archive/v0.3/usbrelay-0.3.tar.gz" -MD5SUM="7daec063f9ad565209c6c06ea5a98821" +DOWNLOAD="https://github.com/darrylb123/usbrelay/archive/0.7/usbrelay-0.7.tar.gz" +MD5SUM="67b1d297db24a294722abcf7de5f9f71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="hidapi" diff --git a/system/usermin/usermin.SlackBuild b/system/usermin/usermin.SlackBuild index 5b805a70b5..7d222a0742 100644 --- a/system/usermin/usermin.SlackBuild +++ b/system/usermin/usermin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for usermin -# Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=usermin -VERSION=${VERSION:-1.750} +VERSION=${VERSION:-1.823} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/usermin/usermin.info b/system/usermin/usermin.info index e134302af6..79cf82e572 100644 --- a/system/usermin/usermin.info +++ b/system/usermin/usermin.info @@ -1,8 +1,8 @@ PRGNAM="usermin" -VERSION="1.750" +VERSION="1.823" HOMEPAGE="http://webmin.com/usermin.html" -DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/1.750/usermin-1.750.tar.gz" -MD5SUM="0f209d9256c4453527e94d7cf6a577f6" +DOWNLOAD="http://jaist.dl.sourceforge.net/project/webadmin/usermin/1.823/usermin-1.823.tar.gz" +MD5SUM="f4f75578881f2cb43372b5d5d54adfbf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webmin" diff --git a/system/v4l2loopback/README b/system/v4l2loopback/README new file mode 100644 index 0000000000..2c78fe244c --- /dev/null +++ b/system/v4l2loopback/README @@ -0,0 +1,9 @@ +v4l2loopback - a kernel module to create V4L2 loopback devices + +This module allows you to create "virtual video devices". +Normal (v4l2) applications will read these devices as if they +were ordinary video devices, but the video will not be read +from, e.g. a capture card or webcam, but instead video generated +by another application. + +You must rebuild this package if you upgrade your kernel. diff --git a/system/v4l2loopback/doinst.sh b/system/v4l2loopback/doinst.sh new file mode 100644 index 0000000000..dcfb80855f --- /dev/null +++ b/system/v4l2loopback/doinst.sh @@ -0,0 +1,3 @@ + +chroot . /sbin/depmod -a @KERNEL@ 2>/dev/null + diff --git a/system/v4l2loopback/slack-desc b/system/v4l2loopback/slack-desc new file mode 100644 index 0000000000..bf660f214d --- /dev/null +++ b/system/v4l2loopback/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------------------------------------------------------| +v4l2loopback: v4l2loopback (kernel module to create V4L2 loopback devices) +v4l2loopback: +v4l2loopback: This module allows you to create "virtual video +v4l2loopback: devices". Normal (v4l2) applications will read these +v4l2loopback: devices as if they were ordinary video devices, but +v4l2loopback: the video will not be read from, e.g. a capture card +v4l2loopback: or webcam, but instead video generated by another +v4l2loopback: application. +v4l2loopback: +v4l2loopback: Project URL: +v4l2loopback: http://github.com/umlaeute/v4l2loopback/ diff --git a/system/v4l2loopback/update_to_master_17JUN2020.patch b/system/v4l2loopback/update_to_master_17JUN2020.patch new file mode 100644 index 0000000000..cd44185102 --- /dev/null +++ b/system/v4l2loopback/update_to_master_17JUN2020.patch @@ -0,0 +1,671 @@ +diff --git a/README.md b/README.md +index d8b295a..d8d338b 100644 +--- a/README.md ++++ b/README.md +@@ -18,9 +18,31 @@ only be of limited use... + + # ISSUES + for current issues, checkout https://github.com/umlaeute/v4l2loopback/issues +-please use the issue-tracker for reporting any problems ++please use the issue-tracker for reporting any problems. ++ ++before you create a new ticket in our issue tracker, please make sure that you have read ++*this* document and followed any instructions found within. ++ ++also, please search the issue-tracker *before* reporting any problems: it's much better ++to add your information to an existing ticket than to create a new ticket with essentially ++the same information. ++ ++## SEEKING HELP ++the issue tracker is meant to track specific bugs in the code (and new features). ++however, it is ill-suited as a user support forum. ++ ++if you have general questions or problems, please use the `v4l2loopback` tag ++on [Stack Overflow](https://stackoverflow.com/questions/tagged/v4l2loopback) instead: ++https://stackoverflow.com/questions/tagged/v4l2loopback ++ + + # DEPENDENCIES ++in order to build (compile,...) anything, you must have a *working* build-environment ++(compiler, GNU make,...). ++the kernel can be somewhat picky if you try to load a module that was compiled with ++a different compiler than was used to compile the kernel itself. ++so make sure to have the right compiler in place. ++ + the v4l2loopback module is a *kernel module*. + in order to build it, you *must have* the kernel headers installed that match + the linux kernel with which you want to use the module (in most cases this will +@@ -31,6 +53,12 @@ the first few number are the same. + (modules will be incompatible if the versions don't match. if you are lucky, the module will + simply refuse to load. if you are unlucky, your computer will spit in your eye or do worse.) + ++there are distribution-specific differences on how to get the correct kernel headers ++(or to install a compilation toolchain). ++documenting all those possibilities would go far beyond the scope of `v4l2loopback`. ++please understnd that we cannot provide support for questions regarding dependencies. ++ ++ + # BUILD + to build the kernel module run: + +diff --git a/v4l2loopback.c b/v4l2loopback.c +index bcf7667..b0f7b93 100644 +--- a/v4l2loopback.c ++++ b/v4l2loopback.c +@@ -48,9 +48,9 @@ + + MODULE_DESCRIPTION("V4L2 loopback video device"); + MODULE_AUTHOR("Vasily Levin, " \ +- "IOhannes m zmoelnig <zmoelnig@iem.at>," \ +- "Stefan Diewald," \ +- "Anton Novikov" \ ++ "IOhannes m zmoelnig <zmoelnig@iem.at>," \ ++ "Stefan Diewald," \ ++ "Anton Novikov" \ + "et al." \ + ); + MODULE_LICENSE("GPL"); +@@ -61,18 +61,18 @@ MODULE_LICENSE("GPL"); + #define STRINGIFY(s) #s + #define STRINGIFY2(s) STRINGIFY(s) + +-#define dprintk(fmt, args...) \ +- do { if (debug > 0) { \ ++#define dprintk(fmt, args...) \ ++ do { if (debug > 0) { \ + printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__) "]: " fmt, ##args); \ + } } while (0) + +-#define MARK() \ +- do { if (debug > 1) { \ ++#define MARK() \ ++ do { if (debug > 1) { \ + printk(KERN_INFO "%s:%d[%s]\n", __FILE__, __LINE__, __func__); \ + } } while (0) + +-#define dprintkrw(fmt, args...) \ +- do { if (debug > 2) { \ ++#define dprintkrw(fmt, args...) \ ++ do { if (debug > 2) { \ + printk(KERN_INFO "v4l2-loopback[" STRINGIFY2(__LINE__)"]: " fmt, ##args); \ + } } while (0) + +@@ -85,14 +85,14 @@ struct v4l2_ctrl_handler { + int error; + }; + struct v4l2_ctrl_config { +- void *ops; +- u32 id; ++ void *ops; ++ u32 id; + const char *name; + int type; +- s32 min; +- s32 max; +- u32 step; +- s32 def; ++ s32 min; ++ s32 max; ++ u32 step; ++ s32 def; + }; + int v4l2_ctrl_handler_init(struct v4l2_ctrl_handler*hdl, + unsigned nr_of_controls_hint) +@@ -119,7 +119,7 @@ struct v4l2_device { + char name[V4L2_DEVICE_NAME_SIZE]; + struct v4l2_ctrl_handler*ctrl_handler; + }; +-static inline int v4l2_device_register (void *dev, void *v4l2_dev) { return 0; } ++static inline int v4l2_device_register(void *dev, void *v4l2_dev) { return 0; } + static inline void v4l2_device_unregister(struct v4l2_device *v4l2_dev) { return; } + #endif /* HAVE__V4L2_DEVICE */ + +@@ -155,7 +155,7 @@ static inline void v4l2l_get_timestamp(struct v4l2_buffer *b) { + + /* module constants + * can be overridden during he build process using something like +- * make KCPPFLAGS="-DMAX_DEVICES=100" ++ * make KCPPFLAGS="-DMAX_DEVICES=100" + */ + + +@@ -235,13 +235,13 @@ MODULE_PARM_DESC(max_height, "maximum frame height"); + + /* control IDs */ + #ifndef HAVE__V4L2_CTRLS +-# define V4L2LOOPBACK_CID_BASE (V4L2_CID_PRIVATE_BASE) ++# define V4L2LOOPBACK_CID_BASE (V4L2_CID_PRIVATE_BASE) + #else +-# define V4L2LOOPBACK_CID_BASE (V4L2_CID_USER_BASE | 0xf000) ++# define V4L2LOOPBACK_CID_BASE (V4L2_CID_USER_BASE | 0xf000) + #endif +-#define CID_KEEP_FORMAT (V4L2LOOPBACK_CID_BASE + 0) ++#define CID_KEEP_FORMAT (V4L2LOOPBACK_CID_BASE + 0) + #define CID_SUSTAIN_FRAMERATE (V4L2LOOPBACK_CID_BASE + 1) +-#define CID_TIMEOUT (V4L2LOOPBACK_CID_BASE + 2) ++#define CID_TIMEOUT (V4L2LOOPBACK_CID_BASE + 2) + #define CID_TIMEOUT_IMAGE_IO (V4L2LOOPBACK_CID_BASE + 3) + + static int v4l2loopback_s_ctrl(struct v4l2_ctrl *ctrl); +@@ -249,44 +249,44 @@ static const struct v4l2_ctrl_ops v4l2loopback_ctrl_ops = { + .s_ctrl = v4l2loopback_s_ctrl, + }; + static const struct v4l2_ctrl_config v4l2loopback_ctrl_keepformat = { +- .ops = &v4l2loopback_ctrl_ops, +- .id = CID_KEEP_FORMAT, +- .name = "keep_format", +- .type = V4L2_CTRL_TYPE_BOOLEAN, +- .min = 0, +- .max = 1, +- .step = 1, +- .def = 0, ++ .ops = &v4l2loopback_ctrl_ops, ++ .id = CID_KEEP_FORMAT, ++ .name = "keep_format", ++ .type = V4L2_CTRL_TYPE_BOOLEAN, ++ .min = 0, ++ .max = 1, ++ .step = 1, ++ .def = 0, + }; + static const struct v4l2_ctrl_config v4l2loopback_ctrl_sustainframerate = { +- .ops = &v4l2loopback_ctrl_ops, +- .id = CID_SUSTAIN_FRAMERATE, +- .name = "sustain_framerate", +- .type = V4L2_CTRL_TYPE_BOOLEAN, +- .min = 0, +- .max = 1, +- .step = 1, +- .def = 0, ++ .ops = &v4l2loopback_ctrl_ops, ++ .id = CID_SUSTAIN_FRAMERATE, ++ .name = "sustain_framerate", ++ .type = V4L2_CTRL_TYPE_BOOLEAN, ++ .min = 0, ++ .max = 1, ++ .step = 1, ++ .def = 0, + }; + static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeout = { +- .ops = &v4l2loopback_ctrl_ops, +- .id = CID_TIMEOUT, +- .name = "timeout", +- .type = V4L2_CTRL_TYPE_INTEGER, +- .min = 0, +- .max = MAX_TIMEOUT, +- .step = 1, +- .def = 0, ++ .ops = &v4l2loopback_ctrl_ops, ++ .id = CID_TIMEOUT, ++ .name = "timeout", ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .min = 0, ++ .max = MAX_TIMEOUT, ++ .step = 1, ++ .def = 0, + }; + static const struct v4l2_ctrl_config v4l2loopback_ctrl_timeoutimageio = { +- .ops = &v4l2loopback_ctrl_ops, +- .id = CID_TIMEOUT_IMAGE_IO, +- .name = "timeout_image_io", +- .type = V4L2_CTRL_TYPE_BOOLEAN, +- .min = 0, +- .max = 1, +- .step = 1, +- .def = 0, ++ .ops = &v4l2loopback_ctrl_ops, ++ .id = CID_TIMEOUT_IMAGE_IO, ++ .name = "timeout_image_io", ++ .type = V4L2_CTRL_TYPE_BOOLEAN, ++ .min = 0, ++ .max = 1, ++ .step = 1, ++ .def = 0, + }; + + +@@ -321,7 +321,7 @@ struct v4l2_loopback_device { + (close to) nominal framerate */ + + /* buffers stuff */ +- u8 *image; /* pointer to actual buffers data */ ++ u8 *image; /* pointer to actual buffers data */ + unsigned long int imagesize; /* size of buffers data */ + int buffers_number; /* should not be big, 4 is a good choice */ + struct v4l2l_buffer buffers[MAX_BUFFERS]; /* inner driver buffers */ +@@ -386,13 +386,13 @@ struct v4l2_loopback_opener { + /* this is heavily inspired by the bttv driver found in the linux kernel */ + struct v4l2l_format { + char *name; +- int fourcc; /* video4linux 2 */ +- int depth; /* bit/pixel */ ++ int fourcc; /* video4linux 2 */ ++ int depth; /* bit/pixel */ + int flags; + }; + /* set the v4l2l_format.flags to PLANAR for non-packed formats */ +-#define FORMAT_FLAGS_PLANAR 0x01 +-#define FORMAT_FLAGS_COMPRESSED 0x02 ++#define FORMAT_FLAGS_PLANAR 0x01 ++#define FORMAT_FLAGS_COMPRESSED 0x02 + + #ifndef V4L2_PIX_FMT_VP9 + #define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0') +@@ -446,7 +446,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f, + f->bytesperline = width; /* Y plane */ + f->sizeimage = (width * height * fmt->depth) >> 3; + } else if (fmt->flags & FORMAT_FLAGS_COMPRESSED) { +- /* doesn't make sense for compressed formats */ ++ /* doesn't make sense for compressed formats */ + f->bytesperline = 0; + f->sizeimage = (width * height * fmt->depth) >> 3; + } else { +@@ -458,7 +458,7 @@ static void pix_format_set_size(struct v4l2_pix_format *f, + static int set_timeperframe(struct v4l2_loopback_device *dev, + struct v4l2_fract *tpf) + { +- if((tpf->denominator < 1) || (tpf->numerator < 1)) { ++ if((tpf->denominator < 1) || (tpf->numerator < 1)) { + return -EINVAL; + } + dev->capture_param.timeperframe = *tpf; +@@ -485,7 +485,7 @@ static ssize_t attr_show_format(struct device *cd, + tpf = &dev->capture_param.timeperframe; + + fourcc2str(dev->pix_format.pixelformat, buf4cc); +- buf4cc[4]=0; ++ buf4cc[4]=0; + if (tpf->numerator == 1) + snprintf(buf_fps, sizeof(buf_fps), "%d", tpf->denominator); + else +@@ -578,7 +578,7 @@ static void v4l2loopback_create_sysfs(struct video_device *vdev) + { + int res = 0; + +-#define V4L2_SYSFS_CREATE(x) res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break ++#define V4L2_SYSFS_CREATE(x) res = device_create_file(&vdev->dev, &dev_attr_##x); if (res < 0) break + if (!vdev) + return; + do { +@@ -671,7 +671,7 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability + { + struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file); + int devnr = ((struct v4l2loopback_private *)video_get_drvdata(dev->vdev))->devicenr; +- __u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE; ++ __u32 capabilities = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE; + + strlcpy(cap->driver, "v4l2 loopback", sizeof(cap->driver)); + vidioc_fill_name(cap->card, sizeof(cap->card), devnr); +@@ -698,7 +698,10 @@ static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability + } + } + +- dev->vdev->device_caps = cap->device_caps = cap->capabilities = capabilities; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ dev->vdev->device_caps = ++#endif /* >=linux-4.7.0 */ ++ cap->device_caps = cap->capabilities = capabilities; + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) + cap->capabilities |= V4L2_CAP_DEVICE_CAPS; +@@ -891,7 +894,7 @@ static int vidioc_enum_fmt_out(struct file *file, void *fh, struct v4l2_fmtdesc + f->pixelformat = dev->pix_format.pixelformat; + } else { + /* fill in a dummy format */ +- /* coverity[unsigned_compare] */ ++ /* coverity[unsigned_compare] */ + if (f->index < 0 || f->index >= FORMATS) + return -EINVAL; + +@@ -1069,11 +1072,11 @@ static int vidioc_s_parm(struct file *file, void *priv, struct v4l2_streamparm * + + switch (parm->type) { + case V4L2_BUF_TYPE_VIDEO_CAPTURE: +- if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0) ++ if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0) + return err; + break; + case V4L2_BUF_TYPE_VIDEO_OUTPUT: +- if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0) ++ if ((err=set_timeperframe(dev, &parm->parm.capture.timeperframe)) < 0) + return err; + break; + default: +@@ -1249,7 +1252,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o + struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file); + MARK(); + +- if (!dev->announce_all_caps && !dev->ready_for_output) ++ if (!dev->announce_all_caps && !dev->ready_for_output) + return -ENOTTY; + + if (0 != index) +@@ -1279,7 +1282,7 @@ static int vidioc_enum_output(struct file *file, void *fh, struct v4l2_output *o + static int vidioc_g_output(struct file *file, void *fh, unsigned int *i) + { + struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file); +- if (!dev->announce_all_caps && !dev->ready_for_output) ++ if (!dev->announce_all_caps && !dev->ready_for_output) + return -ENOTTY; + if (i) + *i = 0; +@@ -1292,7 +1295,7 @@ static int vidioc_g_output(struct file *file, void *fh, unsigned int *i) + static int vidioc_s_output(struct file *file, void *fh, unsigned int i) + { + struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file); +- if (!dev->announce_all_caps && !dev->ready_for_output) ++ if (!dev->announce_all_caps && !dev->ready_for_output) + return -ENOTTY; + + if (i) +@@ -1340,7 +1343,7 @@ static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *inp + static int vidioc_g_input(struct file *file, void *fh, unsigned int *i) + { + struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file); +- if (!dev->announce_all_caps && !dev->ready_for_capture) ++ if (!dev->announce_all_caps && !dev->ready_for_capture) + return -ENOTTY; + if (i) + *i = 0; +@@ -1353,7 +1356,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *i) + static int vidioc_s_input(struct file *file, void *fh, unsigned int i) + { + struct v4l2_loopback_device *dev = v4l2loopback_getdevice(file); +- if (!dev->announce_all_caps && !dev->ready_for_capture) ++ if (!dev->announce_all_caps && !dev->ready_for_capture) + return -ENOTTY; + if (i == 0) + return 0; +@@ -1527,7 +1530,7 @@ static int vidioc_qbuf(struct file *file, void *private_data, struct v4l2_buffer + /* Hopefully fix 'DQBUF return bad index if queue bigger then 2 for capture' + https://github.com/umlaeute/v4l2loopback/issues/60 */ + buf->flags &= ~V4L2_BUF_FLAG_DONE; +- buf->flags |= V4L2_BUF_FLAG_QUEUED; ++ buf->flags |= V4L2_BUF_FLAG_QUEUED; + + wake_up_all(&dev->read_event); + return 0; +@@ -1666,7 +1669,7 @@ static int vidioc_streamon(struct file *file, void *private_data, enum v4l2_buf_ + default: + return -EINVAL; + } +- return -EINVAL; ++ return -EINVAL; + } + + /* stop streaming +@@ -1896,8 +1899,8 @@ static ssize_t v4l2_loopback_read(struct file *file, + dev = v4l2loopback_getdevice(file); + + read_index = get_capture_buffer(file); +- if (read_index < 0) +- return read_index; ++ if (read_index < 0) ++ return read_index; + if (count > dev->buffer_size) + count = dev->buffer_size; + b = &dev->buffers[read_index].buffer; +@@ -2034,20 +2037,20 @@ static void init_buffers(struct v4l2_loopback_device *dev) + + for (i = 0; i < dev->buffers_number; ++i) { + struct v4l2_buffer *b = &dev->buffers[i].buffer; +- b->index = i; +- b->bytesused = bytesused; +- b->length = buffer_size; +- b->field = V4L2_FIELD_NONE; +- b->flags = 0; ++ b->index = i; ++ b->bytesused = bytesused; ++ b->length = buffer_size; ++ b->field = V4L2_FIELD_NONE; ++ b->flags = 0; + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 1) +- b->input = 0; ++ b->input = 0; + #endif +- b->m.offset = i * buffer_size; +- b->memory = V4L2_MEMORY_MMAP; +- b->sequence = 0; ++ b->m.offset = i * buffer_size; ++ b->memory = V4L2_MEMORY_MMAP; ++ b->sequence = 0; + b->timestamp.tv_sec = 0; + b->timestamp.tv_usec = 0; +- b->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ++ b->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + + v4l2l_get_timestamp(b); + } +@@ -2077,29 +2080,29 @@ static void init_vdev(struct video_device *vdev, int nr) + vidioc_fill_name(vdev->name, sizeof(vdev->name), nr); + + #ifdef V4L2LOOPBACK_WITH_STD +- vdev->tvnorms = V4L2_STD_ALL; ++ vdev->tvnorms = V4L2_STD_ALL; + #endif /* V4L2LOOPBACK_WITH_STD */ + +- vdev->vfl_type = VFL_TYPE_VIDEO; +- vdev->fops = &v4l2_loopback_fops; +- vdev->ioctl_ops = &v4l2_loopback_ioctl_ops; +- vdev->release = &video_device_release; +- vdev->minor = -1; ++ vdev->vfl_type = VFL_TYPE_VIDEO; ++ vdev->fops = &v4l2_loopback_fops; ++ vdev->ioctl_ops = &v4l2_loopback_ioctl_ops; ++ vdev->release = &video_device_release; ++ vdev->minor = -1; + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + vdev->device_caps = +- V4L2_CAP_DEVICE_CAPS | ++ V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | ++ V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; + #ifdef V4L2_CAP_VIDEO_M2M +- V4L2_CAP_VIDEO_M2M | +-#endif +- V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT | +- V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; ++ vdev->device_caps |= V4L2_CAP_VIDEO_M2M; + #endif ++#endif /* >=linux-4.7.0 */ ++ + if (debug > 1) +- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0) + vdev->debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG; +- #else ++#else + vdev->dev_debug = V4L2_DEV_DEBUG_IOCTL | V4L2_DEV_DEBUG_IOCTL_ARG; +- #endif ++#endif + + /* since kernel-3.7, there is a new field 'vfl_dir' that has to be + * set to VFL_DIR_M2M for bidrectional devices */ +@@ -2114,11 +2117,11 @@ static void init_vdev(struct video_device *vdev, int nr) + static void init_capture_param(struct v4l2_captureparm *capture_param) + { + MARK(); +- capture_param->capability = 0; +- capture_param->capturemode = 0; +- capture_param->extendedmode = 0; +- capture_param->readbuffers = max_buffers; +- capture_param->timeperframe.numerator = 1; ++ capture_param->capability = 0; ++ capture_param->capturemode = 0; ++ capture_param->extendedmode = 0; ++ capture_param->readbuffers = max_buffers; ++ capture_param->timeperframe.numerator = 1; + capture_param->timeperframe.denominator = 30; + } + +@@ -2177,10 +2180,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr) + int ret; + struct v4l2_ctrl_handler *hdl = &dev->ctrl_handler; + snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), +- "v4l2loopback-%03d", nr); +- ret = v4l2_device_register(NULL, &dev->v4l2_dev); +- if (ret) +- return ret; ++ "v4l2loopback-%03d", nr); ++ ret = v4l2_device_register(NULL, &dev->v4l2_dev); ++ if (ret) ++ return ret; + + MARK(); + dev->vdev = video_device_alloc(); +@@ -2230,7 +2233,7 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr) + setup_timer(&dev->sustain_timer, sustain_timer_clb, nr); + setup_timer(&dev->timeout_timer, timeout_timer_clb, nr); + #endif +- dev->reread_count = 0; ++ dev->reread_count = 0; + dev->timeout_jiffies = 0; + dev->timeout_image = NULL; + dev->timeout_happened = 0; +@@ -2242,10 +2245,10 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr) + v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_sustainframerate, NULL); + v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeout, NULL); + v4l2_ctrl_new_custom(hdl, &v4l2loopback_ctrl_timeoutimageio, NULL); +- if (hdl->error) { +- ret = hdl->error; +- goto error; +- } ++ if (hdl->error) { ++ ret = hdl->error; ++ goto error; ++ } + dev->v4l2_dev.ctrl_handler = hdl; + + /* FIXME set buffers to 0 */ +@@ -2267,55 +2270,55 @@ static int v4l2_loopback_init(struct v4l2_loopback_device *dev, int nr) + return 0; + + error: +- v4l2_ctrl_handler_free(&dev->ctrl_handler); +- v4l2_device_unregister(&dev->v4l2_dev); ++ v4l2_ctrl_handler_free(&dev->ctrl_handler); ++ v4l2_device_unregister(&dev->v4l2_dev); + kfree(dev->vdev); +- return ret; ++ return ret; + + }; + + /* LINUX KERNEL */ + static const struct v4l2_file_operations v4l2_loopback_fops = { +- .owner = THIS_MODULE, +- .open = v4l2_loopback_open, ++ .owner = THIS_MODULE, ++ .open = v4l2_loopback_open, + .release = v4l2_loopback_close, +- .read = v4l2_loopback_read, +- .write = v4l2_loopback_write, +- .poll = v4l2_loopback_poll, +- .mmap = v4l2_loopback_mmap, +- .unlocked_ioctl = video_ioctl2, ++ .read = v4l2_loopback_read, ++ .write = v4l2_loopback_write, ++ .poll = v4l2_loopback_poll, ++ .mmap = v4l2_loopback_mmap, ++ .unlocked_ioctl = video_ioctl2, + }; + + static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = { +- .vidioc_querycap = &vidioc_querycap, ++ .vidioc_querycap = &vidioc_querycap, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) +- .vidioc_enum_framesizes = &vidioc_enum_framesizes, ++ .vidioc_enum_framesizes = &vidioc_enum_framesizes, + .vidioc_enum_frameintervals = &vidioc_enum_frameintervals, + #endif + + #ifndef HAVE__V4L2_CTRLS +- .vidioc_queryctrl = &vidioc_queryctrl, +- .vidioc_g_ctrl = &vidioc_g_ctrl, +- .vidioc_s_ctrl = &vidioc_s_ctrl, ++ .vidioc_queryctrl = &vidioc_queryctrl, ++ .vidioc_g_ctrl = &vidioc_g_ctrl, ++ .vidioc_s_ctrl = &vidioc_s_ctrl, + #endif /* HAVE__V4L2_CTRLS */ + +- .vidioc_enum_output = &vidioc_enum_output, +- .vidioc_g_output = &vidioc_g_output, +- .vidioc_s_output = &vidioc_s_output, ++ .vidioc_enum_output = &vidioc_enum_output, ++ .vidioc_g_output = &vidioc_g_output, ++ .vidioc_s_output = &vidioc_s_output, + +- .vidioc_enum_input = &vidioc_enum_input, +- .vidioc_g_input = &vidioc_g_input, +- .vidioc_s_input = &vidioc_s_input, ++ .vidioc_enum_input = &vidioc_enum_input, ++ .vidioc_g_input = &vidioc_g_input, ++ .vidioc_s_input = &vidioc_s_input, + + .vidioc_enum_fmt_vid_cap = &vidioc_enum_fmt_cap, +- .vidioc_g_fmt_vid_cap = &vidioc_g_fmt_cap, +- .vidioc_s_fmt_vid_cap = &vidioc_s_fmt_cap, +- .vidioc_try_fmt_vid_cap = &vidioc_try_fmt_cap, ++ .vidioc_g_fmt_vid_cap = &vidioc_g_fmt_cap, ++ .vidioc_s_fmt_vid_cap = &vidioc_s_fmt_cap, ++ .vidioc_try_fmt_vid_cap = &vidioc_try_fmt_cap, + + .vidioc_enum_fmt_vid_out = &vidioc_enum_fmt_out, +- .vidioc_s_fmt_vid_out = &vidioc_s_fmt_out, +- .vidioc_g_fmt_vid_out = &vidioc_g_fmt_out, +- .vidioc_try_fmt_vid_out = &vidioc_try_fmt_out, ++ .vidioc_s_fmt_vid_out = &vidioc_s_fmt_out, ++ .vidioc_g_fmt_vid_out = &vidioc_g_fmt_out, ++ .vidioc_try_fmt_vid_out = &vidioc_try_fmt_out, + + #ifdef V4L2L_OVERLAY + .vidioc_s_fmt_vid_overlay = &vidioc_s_fmt_overlay, +@@ -2323,24 +2326,24 @@ static const struct v4l2_ioctl_ops v4l2_loopback_ioctl_ops = { + #endif + + #ifdef V4L2LOOPBACK_WITH_STD +- .vidioc_s_std = &vidioc_s_std, +- .vidioc_g_std = &vidioc_g_std, +- .vidioc_querystd = &vidioc_querystd, ++ .vidioc_s_std = &vidioc_s_std, ++ .vidioc_g_std = &vidioc_g_std, ++ .vidioc_querystd = &vidioc_querystd, + #endif /* V4L2LOOPBACK_WITH_STD */ + +- .vidioc_g_parm = &vidioc_g_parm, +- .vidioc_s_parm = &vidioc_s_parm, ++ .vidioc_g_parm = &vidioc_g_parm, ++ .vidioc_s_parm = &vidioc_s_parm, + +- .vidioc_reqbufs = &vidioc_reqbufs, +- .vidioc_querybuf = &vidioc_querybuf, +- .vidioc_qbuf = &vidioc_qbuf, +- .vidioc_dqbuf = &vidioc_dqbuf, ++ .vidioc_reqbufs = &vidioc_reqbufs, ++ .vidioc_querybuf = &vidioc_querybuf, ++ .vidioc_qbuf = &vidioc_qbuf, ++ .vidioc_dqbuf = &vidioc_dqbuf, + +- .vidioc_streamon = &vidioc_streamon, +- .vidioc_streamoff = &vidioc_streamoff, ++ .vidioc_streamon = &vidioc_streamon, ++ .vidioc_streamoff = &vidioc_streamoff, + + #ifdef CONFIG_VIDEO_V4L1_COMPAT +- .vidiocgmbuf = &vidiocgmbuf, ++ .vidiocgmbuf = &vidiocgmbuf, + #endif + }; + +@@ -2459,10 +2462,10 @@ static void v4l2loopback_cleanup_module(void) + #ifdef MODULE + int __init init_module(void) + { +- return v4l2loopback_init_module(); ++ return v4l2loopback_init_module(); + } + void __exit cleanup_module(void) { +- return v4l2loopback_cleanup_module(); ++ return v4l2loopback_cleanup_module(); + } + #else + late_initcall(v4l2loopback_init_module); diff --git a/system/v4l2loopback/v4l2loopback.SlackBuild b/system/v4l2loopback/v4l2loopback.SlackBuild new file mode 100644 index 0000000000..7d7fadd788 --- /dev/null +++ b/system/v4l2loopback/v4l2loopback.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for v4l2loopback + +# Copyright 2020 Edward W. Koenig <kingbeowulf@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. + +PRGNAM=v4l2loopback +VERSION=${VERSION:-0.12.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +# Fix for older kernels, etc... +# https://github.com/umlaeute/v4l2loopback/commit/d26e624b4ead762d34152f9f825b3a51fb92fb9c +# https://github.com/umlaeute/v4l2loopback/commit/7dced0f9e6641b7e9e54ced74c5c7611d10f729f +# https://github.com/umlaeute/v4l2loopback/commit/72a32a67dee3a67dff76f565551907a2fc7e88e6 +# only set (struct video_device).device_caps on linux>=4.7.0 +# Set device_caps in init_vdev() for all kernel-versions (not just >4.7.0) +# Don't set the V4L2_CAP_DEVICE_CAPS on device_caps +patch -p1 < $CWD/update_to_master_17JUN2020.patch + +make + +install -D -m 644 $PRGNAM.ko $PKG/lib/modules/$(uname -r)/kernel/extra/$PRGNAM.ko +install -D -m 755 utils/$PRGNAM-ctl $PKG/usr/bin/$PRGNAM-ctl + +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 +cp -a AUTHORS COPYING NEWS README.md TODO doc/ $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:-tgz} diff --git a/system/v4l2loopback/v4l2loopback.info b/system/v4l2loopback/v4l2loopback.info new file mode 100644 index 0000000000..f475983a79 --- /dev/null +++ b/system/v4l2loopback/v4l2loopback.info @@ -0,0 +1,10 @@ +PRGNAM="v4l2loopback" +VERSION="0.12.5" +HOMEPAGE="https://github.com/umlaeute/v4l2loopback/" +DOWNLOAD="https://github.com/umlaeute/v4l2loopback/archive/v0.12.5/v4l2loopback-0.12.5.tar.gz" +MD5SUM="4b0aaae5dd8c4f5dd0f9e2142e92e390" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Edward W. Koenig" +EMAIL="kingbeowulf@gmail.com" diff --git a/system/vagrant-public-key/README b/system/vagrant-public-key/README new file mode 100644 index 0000000000..f3e7692d57 --- /dev/null +++ b/system/vagrant-public-key/README @@ -0,0 +1,11 @@ +Vagrant Public Key + +Preparing a Vagrant virtual machine to be used as a base box +requires the installation of a ssh public key. This package provides +the key and a script called vagrant-basebox to both install the key +and perform some setup of the system. + +THIS PACKAGE WILL MAKE THE MACHINE IT'S INSTALLED ON INSECURE, USE ONLY +WHEN CREATING A VAGRANT BASE BOX FOR SHARING ON VAGRANT CLOUD. + +See: https://www.vagrantup.com/docs/boxes/base.html for further info. diff --git a/system/vagrant-public-key/slack-desc b/system/vagrant-public-key/slack-desc new file mode 100644 index 0000000000..919659c723 --- /dev/null +++ b/system/vagrant-public-key/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------------------------------------------------------| +vagrant-public-key: vagrant-public-key (Vagrant Public Key) +vagrant-public-key: +vagrant-public-key: Preparing a Vagrant virtual machine to be used as a base box +vagrant-public-key: requires the installation of an ssh public key. This package provides +vagrant-public-key: the key and a script called vagrant-basebox to both install it and +vagrant-public-key: setup the system. +vagrant-public-key: +vagrant-public-key: ONLY FOR USE ON VIRTUAL MACHINES YOU INTEND TO SHARE, DO NOT INSTALL +vagrant-public-key: ON A PRODUCTION SYSTEM AS THIS WILL MAKE IT INSECURE. +vagrant-public-key: +vagrant-public-key: See: https://www.vagrantup.com/docs/boxes/base.html for further info. diff --git a/system/vagrant-public-key/vagrant-basebox b/system/vagrant-public-key/vagrant-basebox new file mode 100644 index 0000000000..4211766c38 --- /dev/null +++ b/system/vagrant-public-key/vagrant-basebox @@ -0,0 +1,48 @@ +#!/bin/sh -e + +# vagrant base box preparation script. + + +# Some safeguards +if grep -q "^avagrant:" /etc/passwd ; then + echo "vagrant user has already been created." + exit +fi + +if test -f /root/.ssh/authorized_keys; then + echo "root already has /root/.ssh/authorized_keys, refusing to overwrite it." + exit +fi + + +# Create vagrant user and give them the key. +echo "Creating user vagrant" +useradd -m vagrant +mkdir -p /home/vagrant/.ssh +echo "Adding Vagrant authorized key for user vagrant" +cp /etc/vagrant/vagrant.pub /home/vagrant/.ssh/authorized_keys +chown -R vagrant:users /home/vagrant +chmod 0700 /home/vagrant/.ssh +chmod 0600 /home/vagrant/.ssh/authorized_keys + + +# Add the key to root as well. +echo "Adding vagrant authorized key for user root" +mkdir -p /root/.ssh +cp /etc/vagrant/vagrant.pub /root/.ssh/authorized_keys +chmod 0700 /root/.ssh +chmod 0600 /root/.ssh/authorized_keys + + +echo "Adding vagrant to /etc/sudoers" +echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +echo "Adding 'UseDNS no' to /etc/ssh/sshd_config" +echo "UseDNS no" >> /etc/ssh/sshd_config +echo "PermitRootLogin yes" >> /etc/ssh/sshd_config + + +echo +echo "THIS SYSTEM IS NOW INSECURE, AND ACCESSIBLE TO ANYONE WITH THE VAGRANT PRIVATE KEY" +echo "FROM https://github.com/hashicorp/vagrant/blob/master/keys/vagrant" + + diff --git a/system/vagrant-public-key/vagrant-public-key.SlackBuild b/system/vagrant-public-key/vagrant-public-key.SlackBuild new file mode 100644 index 0000000000..88d40182ad --- /dev/null +++ b/system/vagrant-public-key/vagrant-public-key.SlackBuild @@ -0,0 +1,60 @@ +#!/bin/sh + +# Slackware build script to package the Vagrant insecure public key. + +# Copyright 2020 bifferos@gmail.com UK +# 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. + +PRGNAM=vagrant-public-key +VERSION=${VERSION:-1.0.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir -p $PRGNAM-$VERSION +cd $PRGNAM-$VERSION + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $CWD/README $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 +mkdir -p $PKG/usr/sbin +cp $CWD/vagrant-basebox $PKG/usr/sbin/vagrant-basebox +chmod 744 $PKG/usr/sbin/vagrant-basebox + +mkdir -p $PKG/etc/vagrant +cp $CWD/vagrant.pub $PKG/etc/vagrant +chmod 644 $PKG/etc/vagrant + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/vagrant-public-key/vagrant-public-key.info b/system/vagrant-public-key/vagrant-public-key.info new file mode 100644 index 0000000000..cad8b26950 --- /dev/null +++ b/system/vagrant-public-key/vagrant-public-key.info @@ -0,0 +1,10 @@ +PRGNAM="vagrant-public-key" +VERSION="1.0.0" +HOMEPAGE="https://www.vagrantup.com/docs/boxes/base.html" +DOWNLOAD="https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub" +MD5SUM="b440b5086dd12c3fd8abb762476b9f40" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Bifferos" +EMAIL="bifferos@gmail.com" diff --git a/system/vagrant/vagrant.SlackBuild b/system/vagrant/vagrant.SlackBuild index d03150a372..a81fe9f5f4 100644 --- a/system/vagrant/vagrant.SlackBuild +++ b/system/vagrant/vagrant.SlackBuild @@ -2,7 +2,7 @@ # SlackBuild script for vagrant -# Copyright 2013-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Copyright 2013-2021 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=vagrant -VERSION=${VERSION:-2.2.3} +VERSION=${VERSION:-2.2.15} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/vagrant/vagrant.info b/system/vagrant/vagrant.info index 860d1ccdba..a9f104a145 100644 --- a/system/vagrant/vagrant.info +++ b/system/vagrant/vagrant.info @@ -1,10 +1,10 @@ PRGNAM="vagrant" -VERSION="2.2.3" +VERSION="2.2.15" HOMEPAGE="https://www.vagrantup.com" -DOWNLOAD="https://releases.hashicorp.com/vagrant/2.2.3/vagrant_2.2.3_i686.rpm" -MD5SUM="b0fb8ea560c56acd60c917e082bad1d3" -DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/2.2.3/vagrant_2.2.3_x86_64.rpm" -MD5SUM_x86_64="57bad2a3b0d3a70c67f2a2b4b41a6b44" +DOWNLOAD="https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_i686.rpm" +MD5SUM="ae0d97049ecc03275b12eea6e92c6c91" +DOWNLOAD_x86_64="https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.rpm" +MD5SUM_x86_64="68f7629a4fb363031cc95e00f4c17980" REQUIRES="" MAINTAINER="Benjamin Trigona-Harany" EMAIL="slackbuilds@jaxartes.net" diff --git a/system/vhba-module/slack-desc b/system/vhba-module/slack-desc index 8f4aaa353c..386e09be50 100644 --- a/system/vhba-module/slack-desc +++ b/system/vhba-module/slack-desc @@ -14,6 +14,6 @@ vhba-module: the SCSI layer with a virtual SCSI adapter which can have vhba-module: multiple virtual devices. It is part of the userspace-cdemu vhba-module: suite, a free, GPL CD/DVD-ROM device emulator for linux. vhba-module: -vhba-module: Homepage: http://cdemu.sourceforge.net/about/vhba/ +vhba-module: Homepage: https://cdemu.sourceforge.io/about/vhba/ vhba-module: vhba-module: diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild index f843b49510..64d9365316 100644 --- a/system/vhba-module/vhba-module.SlackBuild +++ b/system/vhba-module/vhba-module.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2010-2012 Niels Horn, Rio de Janeiro, RJ, Brazil <niels.horn@gmail.com> -# Copyright 2018 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2018-2020 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vhba-module -VERSION=${VERSION:-20170610} +VERSION=${VERSION:-20200106} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,7 +51,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/vhba-module/vhba-module.info b/system/vhba-module/vhba-module.info index fb74b84c0b..0662c11db8 100644 --- a/system/vhba-module/vhba-module.info +++ b/system/vhba-module/vhba-module.info @@ -1,8 +1,8 @@ PRGNAM="vhba-module" -VERSION="20170610" -HOMEPAGE="http://cdemu.sourceforge.net/about/vhba/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20170610.tar.bz2" -MD5SUM="f9478a5f5528fc672c204b6b4bd02213" +VERSION="20200106" +HOMEPAGE="https://cdemu.sourceforge.io/about/vhba/" +DOWNLOAD="https://downloads.sourceforge.net/cdemu/vhba-module-20200106.tar.bz2" +MD5SUM="0f0b6d9647197e43929310594afece5f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/vice/README b/system/vice/README index ade2df503f..cf93780f1a 100644 --- a/system/vice/README +++ b/system/vice/README @@ -1,10 +1,8 @@ -VICE is the one and only Versatile Commodore Emulator. It provides emulation -of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers. +vice (Commodore 8-bit emulator) +VICE is the one and only Versatile Commodore Emulator. It provides +emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II +computers. -Optional Dependency - -To enable recording of videos, you need ffmpeg. Enable this by passing -to the script the parameter: - - FFMPEG=yes ./vice.SlackBuild +See README_SBo.txt for build options. The defaults should be fine for +most users. diff --git a/system/vice/README_SBo.txt b/system/vice/README_SBo.txt new file mode 100644 index 0000000000..e8fd15f8de --- /dev/null +++ b/system/vice/README_SBo.txt @@ -0,0 +1,21 @@ +Optional dependencies: ffmpeg and SDL2. + +Vice can use ffmpeg to record videos of the emulated machine. If +ffmpeg is installed, it will be autodetected. If you have ffmpeg +installed but don't want ffmpeg support, you'll have to removepkg +ffmpeg before building (there's no way to override the autodetection). + +By default, vice will be built with SDL2 if it's installed, otherwise +SDL1. You can set SDL=1 to force building with SDL1 even if SDL2 is +installed. + +If you want to build without PulseAudio, set PULSE=no in the environment. + +Note: To use the standard application menu instead of the in-emulator +PETSCII menu, GTK3 v3.22 is required. Slackware 14.2 ships with 3.18 +and there is no upgrade package for this. Slackware -current has +3.22. So to use the normal application menus, either use Slackware +-current or find a way to upgrade your Slackware 14.2's GTK3 to +v3.22. The SlackBuild maintainer has NOT tested this build with +Slackware -current, you're on your own if it doesn't work (fix it and +send me a patch if you can). diff --git a/system/vice/config/vsid.desktop b/system/vice/config/vsid.desktop new file mode 100644 index 0000000000..c1dfd32f55 --- /dev/null +++ b/system/vice/config/vsid.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE SID Player +Comment=A SID Player +StartupNotify=true +Exec=vsid +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/x128.desktop b/system/vice/config/x128.desktop index d4e5d4fad8..92ab76c637 100644 --- a/system/vice/config/x128.desktop +++ b/system/vice/config/x128.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE C128 emulator -Comment=Commodore 128 emulator from the VICE team +Comment=A Commodore 128 emulator StartupNotify=true Exec=x128 Icon=vice diff --git a/system/vice/config/x64.desktop b/system/vice/config/x64.desktop index 41e8485963..7991b5ecd9 100644 --- a/system/vice/config/x64.desktop +++ b/system/vice/config/x64.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE C64 emulator -Comment=Commodore 64 emulator from the VICE team +Comment=A fast Commodore 64 emulator StartupNotify=true Exec=x64 Icon=vice diff --git a/system/vice/config/x64dtv.desktop b/system/vice/config/x64dtv.desktop index b6e1bc1112..f3d82b642d 100644 --- a/system/vice/config/x64dtv.desktop +++ b/system/vice/config/x64dtv.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE C64DTV emulator -Comment=Commodore 64 DTV emulator from the VICE team +Comment=A C64DTV emulator StartupNotify=true Exec=x64dtv Icon=vice diff --git a/system/vice/config/x64sc.desktop b/system/vice/config/x64sc.desktop new file mode 100644 index 0000000000..46d5b89ee0 --- /dev/null +++ b/system/vice/config/x64sc.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE C64 emulator +Comment=An accurate Commodore 64 emulator +StartupNotify=true +Exec=x64sc +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/xcbm2.desktop b/system/vice/config/xcbm2.desktop index 017254e8ac..1411e41883 100644 --- a/system/vice/config/xcbm2.desktop +++ b/system/vice/config/xcbm2.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=VICE CBM2 emulator -Comment=Commodore CBM2 emulator from the VICE team +Name=VICE CBM-II emulator +Comment=A Commodore CBM-II (6x0/7x0) emulator StartupNotify=true Exec=xcbm2 Icon=vice diff --git a/system/vice/config/xcbm5x0.desktop b/system/vice/config/xcbm5x0.desktop new file mode 100644 index 0000000000..2acabe36d5 --- /dev/null +++ b/system/vice/config/xcbm5x0.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE CBM-II emulator +Comment=A Commodore CBM-II (5x0) emulator +StartupNotify=true +Exec=xcbm5x0 +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/xpet.desktop b/system/vice/config/xpet.desktop index 53f125405d..1efabc6b61 100644 --- a/system/vice/config/xpet.desktop +++ b/system/vice/config/xpet.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE PET emulator -Comment=Commodore PET emulator from the VICE team +Comment=A Commodore PET emulator StartupNotify=true Exec=xpet Icon=vice diff --git a/system/vice/config/xplus4.desktop b/system/vice/config/xplus4.desktop index a10f256ef1..63f095c95a 100644 --- a/system/vice/config/xplus4.desktop +++ b/system/vice/config/xplus4.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=VICE PLUS4 emulator -Comment=Commodore PLUS4 emulator from the VICE team +Name=VICE Plus4 emulator +Comment=A Commodore Plus4 emulator StartupNotify=true Exec=xplus4 Icon=vice diff --git a/system/vice/config/xscpu64.desktop b/system/vice/config/xscpu64.desktop new file mode 100644 index 0000000000..295643f0c8 --- /dev/null +++ b/system/vice/config/xscpu64.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VICE C64 SuperCPU emulator +Comment=An accurate SuperCPU64 emulator +StartupNotify=true +Exec=xscpu64 +Icon=vice +Terminal=false +Type=Application +Categories=System diff --git a/system/vice/config/xvic.desktop b/system/vice/config/xvic.desktop index fe29db9bed..d06423e8be 100644 --- a/system/vice/config/xvic.desktop +++ b/system/vice/config/xvic.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=VICE VIC-20 emulator -Comment=Commodore VIC-20 emulator from the VICE team +Comment=A Commodore VIC-20 emulator StartupNotify=true Exec=xvic Icon=vice diff --git a/system/vice/doinst.sh b/system/vice/doinst.sh index 8095c47d9b..2dde7a5cb4 100644 --- a/system/vice/doinst.sh +++ b/system/vice/doinst.sh @@ -1,9 +1,7 @@ -# Update desktop icons if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi -# Update the X font indexes: if [ -x /usr/bin/mkfontdir ]; then ( cd /usr/share/fonts/TTF mkfontscale . @@ -14,3 +12,4 @@ if [ -x /usr/bin/fc-cache ]; then /usr/bin/fc-cache -f fi +chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/vice.info.gz diff --git a/system/vice/psiddrv.h.prebuilt.3.4 b/system/vice/psiddrv.h.prebuilt.3.4 new file mode 100644 index 0000000000..c1820907b8 --- /dev/null +++ b/system/vice/psiddrv.h.prebuilt.3.4 @@ -0,0 +1,28 @@ + 0x01, 0x00, 0x6f, 0x36, 0x35, 0x00, 0x03, 0x00, 0x00, 0x10, 0x35, 0x01, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x70, 0x73, 0x69, 0x64, + 0x64, 0x72, 0x76, 0x2e, 0x6f, 0x36, 0x35, 0x00, 0x1c, 0x03, 0x44, 0x61, 0x67, 0x20, 0x4c, 0x65, + 0x6d, 0x20, 0x3c, 0x72, 0x65, 0x73, 0x69, 0x64, 0x40, 0x6e, 0x69, 0x6d, 0x72, 0x6f, 0x64, 0x2e, + 0x6e, 0x6f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x2b, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x2b, 0x11, 0x31, 0x11, + 0xa9, 0x00, 0x8d, 0x1a, 0xd0, 0xad, 0x19, 0xd0, 0x8d, 0x19, 0xd0, 0xa9, 0x7f, 0x8d, 0x0d, 0xdc, + 0x8d, 0x0d, 0xdd, 0xad, 0x0d, 0xdc, 0xad, 0x0d, 0xdd, 0xa2, 0x08, 0xbd, 0x0c, 0x10, 0x9d, 0x00, + 0x80, 0xca, 0x10, 0xf7, 0xad, 0x18, 0x10, 0xc9, 0x03, 0x90, 0x14, 0xd0, 0x07, 0xad, 0x17, 0x10, + 0xc9, 0x1a, 0x90, 0x0b, 0xa2, 0x05, 0xbd, 0x25, 0x10, 0x9d, 0x14, 0x03, 0xca, 0x10, 0xf7, 0xa9, + 0x1b, 0xa2, 0x00, 0x8d, 0x11, 0xd0, 0x8e, 0x12, 0xd0, 0xad, 0x21, 0x10, 0xf0, 0x06, 0xa9, 0x25, + 0xa2, 0x40, 0xd0, 0x04, 0xa9, 0x95, 0xa2, 0x42, 0x8d, 0x04, 0xdc, 0x8e, 0x05, 0xdc, 0xa9, 0x0f, + 0x8d, 0x18, 0xd4, 0xac, 0x15, 0x10, 0x88, 0xcc, 0x16, 0x10, 0x90, 0x02, 0xa0, 0x00, 0x98, 0x48, + 0xad, 0x1c, 0x10, 0xf0, 0x27, 0xae, 0x1c, 0x10, 0x20, 0xf9, 0x10, 0x8d, 0x24, 0x10, 0xc0, 0x20, + 0x90, 0x02, 0xa0, 0x1f, 0xa9, 0x00, 0xaa, 0x38, 0x2a, 0x90, 0x02, 0x2a, 0xe8, 0x88, 0x10, 0xf8, + 0x3d, 0x1d, 0x10, 0xd0, 0x07, 0xa9, 0x81, 0x8d, 0x1a, 0xd0, 0xd0, 0x0a, 0xa9, 0x81, 0xa2, 0x01, + 0x8d, 0x0d, 0xdc, 0x8e, 0x0e, 0xdc, 0xa9, 0x2f, 0x85, 0x00, 0xad, 0x1a, 0x10, 0xae, 0x23, 0x10, + 0x20, 0xf9, 0x10, 0x85, 0x01, 0x68, 0xaa, 0xa8, 0x20, 0xf3, 0x10, 0xad, 0x1c, 0x10, 0xf0, 0x04, + 0xa9, 0x36, 0x85, 0x01, 0x58, 0x4c, 0xf0, 0x10, 0x6c, 0x19, 0x10, 0x6c, 0x1b, 0x10, 0xc9, 0xe0, + 0x90, 0x03, 0xa9, 0x35, 0x60, 0xc9, 0xd0, 0x90, 0x03, 0xa9, 0x34, 0x60, 0xe0, 0xa0, 0x90, 0x03, + 0xa9, 0x36, 0x60, 0xa9, 0x37, 0x60, 0xad, 0x1c, 0x10, 0xf0, 0x0c, 0xad, 0x24, 0x10, 0x85, 0x01, + 0x20, 0xf6, 0x10, 0xa9, 0x36, 0x85, 0x01, 0xad, 0x19, 0xd0, 0x8d, 0x19, 0xd0, 0xad, 0x0d, 0xdc, + 0x68, 0xa8, 0x68, 0xaa, 0x68, 0x40, 0x2c, 0x0d, 0xdd, 0x40, 0x00, 0x00, 0x0b, 0x82, 0x1b, 0x82, + 0x02, 0x82, 0x02, 0x82, 0x1e, 0x82, 0x09, 0x82, 0x09, 0x82, 0x09, 0x82, 0x13, 0x82, 0x1a, 0x82, + 0x04, 0x82, 0x09, 0x82, 0x05, 0x82, 0x03, 0x82, 0x03, 0x82, 0x15, 0x82, 0x1a, 0x82, 0x03, 0x82, + 0x03, 0x82, 0x08, 0x82, 0x03, 0x82, 0x0a, 0x82, 0x03, 0x82, 0x03, 0x82, 0x1b, 0x82, 0x05, 0x82, + 0x05, 0x82, 0x00, 0x00, 0x00, 0x00, diff --git a/system/vice/slack-desc b/system/vice/slack-desc index 953758d889..589a2077b8 100644 --- a/system/vice/slack-desc +++ b/system/vice/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -vice: vice (the one and only Versatile Commodore Emulator) +vice: vice (Commodore 8-bit emulator) vice: -vice: VICE is a program that runs on a Unix, MS-DOS, Win32, OS/2, Acorn -vice: RISC OS, BeOS, QNX 6.x, Amiga, GP2X or Mac OS X machine and executes -vice: programs intended for the old 8-bit computers. The current version -vice: emulates the C64, the C128, the VIC20, almost all PET models, the -vice: PLUS4 and the CBM-II (aka C610). -vice: -vice: Homepage: http://vice-emu.sourceforge.net +vice: VICE is a program that runs on a modern machine and executes +vice: programs intended for the the C64, the C64DTV, the C128, the +vice: VIC20, practically all PET models, the PLUS4 and the CBM-II (aka +vice: C610/C510). An extra emulator is provided for C64 expanded with +vice: the CMD SuperCPU. vice: +vice: Build options: ffpmeg=@FF@, sdl=@SDL@, pulse=@PA@ vice: +vice: Homepage: http://vice-emu.sourceforge.io diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 72cab8efbd..0b1d3f9e64 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for VICE -# Copyright 2008 Mauro Giachero (mauro dot giachero at gmail dot com) +# Copyright 2008 Mauro Giachero (email removed) +# Copyright 2020 B. Watson (yalhcru@gmail.com) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +23,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Initialize variables +# 20200801 bkw: +# - Take over maintenance +# - Autodetect ffmpeg +# - Allow building with SDL 1.x +# - Allow building without pulseaudio +# - Get rid of xa dep +# - Install TTF fonts in correct place, get rid of other formats +# - install-info in doinst.sh so vice.info shows up in the info dir +# - Have slack-desc show build options +# - Re-enable the old x64 emulator +# - BUILD=3 + PRGNAM=vice -VERSION=${VERSION:-3.2} -BUILD=${BUILD:-1} +VERSION=${VERSION:-3.4} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -58,13 +70,40 @@ else LIBDIRSUFFIX="" fi -# Only an external ffmpeg seems to work ATM (might change from version to version) -if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-external-ffmpeg"; else ffmpeg=""; fi - -# Exit if errors encountered set -e -# Setup for package creation +# The "--enable-shared-ffmpeg" option creates conflicts with external +# ffmpeg libraries, so we don't use it here. Static would be OK, but +# it won't build, so it's not an option for now either: I don't care +# enough about it to spend any more time trying to fix it. If you do +# care, come up with a way to build with --enable-static-ffmpeg, send +# me a patch, and I'll include it here. + +[ -x /usr/bin/ffmpeg ] && ffmpeg="--enable-external-ffmpeg" + +SDL="${SDL:-auto}" +if [ "$SDL" = "auto" ]; then + SDL=1 + pkg-config --exists sdl2 && SDL=2 +fi + +case "$SDL" in + 1) sdlopt="--enable-sdlui" ;; + 2) sdlopt="--enable-sdlui2" ;; + *) echo -e "$( basename $0 ):" \ + "invalid SDL option '$SDL'." \ + "Valid options are:\n auto 1 2" \ + 1>&2 + exit 1 ;; +esac + +# Anticipating 15.0's pure-alsa-system +if [ "${PULSE:-yes}" != "yes" ]; then + pulseopt="--without-pulse" +fi + +echo "=== sdlopt '$sdlopt', ffmpeg '$ffmpeg', pulseopt '$pulseopt'" + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -72,91 +111,104 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # Set proper paths in documentation. sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" \ man/vice.1 sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \ - src/arch/unix/gui/uicommands.c + src/arch/gtk3/uicommands.c sed -i "s/\/usr\/local/\/usr/g" doc/vice.* doc/html/*html sed -i "s/\/usr\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" doc/vice.* doc/html/*html -# Disable PDF generation because it bombs -sed -i "s/AM_CONDITIONAL(BUILD_PDF, true)/AM_CONDITIONAL(BUILD_PDF, false)/g" \ - configure.ac - -# Don't install fonts in $HOME and run fc-cache on the build system -sed -i -e '/@HAVE_FC_CACHE_TRUE@/d' data/fonts/Makefile.am +# Avoid the need for xa. It's only used to generate a small C header +# file, which we include a prebuilt version of here. There's nothing +# dynamic about this header, it's just a small chunk of 6502 object +# code as a C array, and for a given version of vice it'll always be +# the same code. +cat $CWD/psiddrv.h.prebuilt.$VERSION > src/c64/psiddrv.h autoreconf -vif -# Configure the software +DOCDIR=/usr/doc/$PRGNAM-$VERSION +PKGDOC=$PKG/$DOCDIR + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +XA=/bin/true \ ./configure \ + $sdlopt \ + $ffmpeg \ + $pulseopt \ + --enable-x64 \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - $ffmpeg \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-sdlsound \ + --docdir=$DOCDIR \ --with-x \ - --enable-fullscreen \ --enable-quicktime \ --enable-ethernet \ --enable-parsid \ - --enable-gnomeui \ --enable-cpuhistory \ --build=$ARCH-slackware-linux -# Build the software make -make install DESTDIR=$PKG - -# Strip symbols from binaries -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 - -# Compress info files +make install-strip DESTDIR=$PKG rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* +gzip -9 $PKG/usr/man/man?/*.? $PKG/usr/info/* -# Install icon and menu entries mkdir -p $PKG/usr/share/{applications,pixmaps} install -D -m 0644 $CWD/config/*.desktop $PKG/usr/share/applications install -D -m 0644 $CWD/config/vice.png $PKG/usr/share/pixmaps -# Move the original documentation folder to the usual place -# and create a link to where vice expect it to be -mkdir -p $PKG/usr/doc -mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc $PKG/usr/doc/$PRGNAM-$VERSION -( cd $PKG/usr/doc/$PRGNAM-$VERSION +# Move the docs to the Slackware standard place, symlink to where vice +# expects it to be. +mkdir -p $PKGDOC +mv $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/doc/* $PKGDOC +( cd $PKGDOC chmod 644 * mkdir html mv *.html *.png *.gif *.css html/ ) -( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM ; ln -s /usr/doc/$PRGNAM-$VERSION doc ) - -# Copy additional program documentation -cp -a AUTHORS ChangeLog COPYING FEEDBACK INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +( cd $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM + rmdir doc + ln -s $DOCDIR doc ) + +# 20200728 bkw: when I inherited this build, it was installing the +# fonts to the doc dir (where they can't be used), but updating +# the font cache in doinst.sh. I'm not so sure the fonts are +# really necessary, but in case they are, I've moved them to +# /usr/share/fonts/TTF (and gotten rid of the non-TTF ones). +mkdir -p $PKG/usr/share/fonts/TTF +mv $PKGDOC/*.ttf $PKG/usr/share/fonts/TTF +rm -f $PKGDOC/Lato-* + +# This would install Commodore font where other software can use it. +# However, the characters in the font are in PETSCII order, not ASCII +# or Unicode, so it's not all that useful. +#ln -s ../../../lib$LIBDIRSUFFIX/$PRGNAM/common/CBM.ttf $PKG/usr/share/fonts/TTF + +cp -a AUTHORS ChangeLog COPYING FEEDBACK NEWS README $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild + +# Make the slack-desc reflect the build options. +FF=no; SDL=1.2; PA=no + +# We can't use ldd to detect whether ffmpeg is built in since it +# gets loaded with dlopen(). Hence this stuff: +grep -q '^#define USE_SDLUI2\>' src/config.h && SDL=2.0 +grep -q '^#define HAVE_FFMPEG\>' src/config.h && FF=yes +grep -q '^#define USE_PULSE\>' src/config.h && PA=yes -# Setup package install directory mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc +sed -e "s,@FF@,$FF," \ + -e "s,@PA@,$PA," \ + -e "s,@SDL@,$SDL," \ + $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -# Create package cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/vice/vice.info b/system/vice/vice.info index a8cd56e76b..481d98ad3f 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,10 +1,10 @@ PRGNAM="vice" -VERSION="3.2" -HOMEPAGE="http://vice-emu.sourceforge.net" -DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.2.tar.gz" -MD5SUM="58ba6b6653097898e059e0194615705a" +VERSION="3.4" +HOMEPAGE="http://vice-emu.sourceforge.io" +DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.4.tar.gz" +MD5SUM="24d83f692910f5d87de19857e8095f0b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="xa" -MAINTAINER="Eric B. Pratt" -EMAIL="eric.b.pratt@gmail.com" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/victor-mono-fonts/README b/system/victor-mono-fonts/README new file mode 100644 index 0000000000..d4a382def6 --- /dev/null +++ b/system/victor-mono-fonts/README @@ -0,0 +1,9 @@ +Victor Mono is an open-source monospaced font with optional +semi-connected cursive italics and programming symbol ligatures. + +The typeface is clean, crisp and narrow, with a large x-height and clear +punctuation, making it legible and ideal for code. It comes in seven +weights and Roman, Italic and Oblique styles. + +Learn more and optionally support the creator at: +https://rubjo.github.io/victor-mono/ diff --git a/system/victor-mono-fonts/doinst.sh b/system/victor-mono-fonts/doinst.sh new file mode 100644 index 0000000000..887f9240a8 --- /dev/null +++ b/system/victor-mono-fonts/doinst.sh @@ -0,0 +1,14 @@ +# Update the X font indexes: +if [ -x /usr/bin/mkfontdir ]; then + ( cd usr/share/fonts/TTF + /usr/bin/mkfontscale . + /usr/bin/mkfontdir . + ) + ( cd usr/share/fonts/OTF + /usr/bin/mkfontscale . + /usr/bin/mkfontdir . + ) +fi +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi diff --git a/system/victor-mono-fonts/slack-desc b/system/victor-mono-fonts/slack-desc new file mode 100644 index 0000000000..0c60d80a90 --- /dev/null +++ b/system/victor-mono-fonts/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------------------------------------------------------| +victor-mono-fonts: victor-mono-fonts (monospaced font with programming ligatures) +victor-mono-fonts: +victor-mono-fonts: Victor Mono is an open-source monospaced font with optional +victor-mono-fonts: semi-connected cursive italics and programming symbol ligatures. +victor-mono-fonts: +victor-mono-fonts: The typeface is clean, crisp and arow, with a large x-height and +victor-mono-fonts: clear punctuation, making it legible and ideal for code. It comes +victor-mono-fonts: in seven weights and Roman, Italic and Oblique styles. +victor-mono-fonts: +victor-mono-fonts: https://rubjo.github.io/victor-mono/ +victor-mono-fonts: diff --git a/system/victor-mono-fonts/victor-mono-fonts.SlackBuild b/system/victor-mono-fonts/victor-mono-fonts.SlackBuild new file mode 100644 index 0000000000..ba30348900 --- /dev/null +++ b/system/victor-mono-fonts/victor-mono-fonts.SlackBuild @@ -0,0 +1,68 @@ +#!/bin/sh + +# Slackware build script for victor-mono-fonts + +# Copyright 2021 Justin Teague <arcadellama@posteo.net> +# 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. + +PRGNAM=victor-mono-fonts +SRCNAM=VictorMonoAll +VERSION=${VERSION:-1.4.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf ${PRGNAM%-fonts}-$VERSION +tar xvf $CWD/${PRGNAM%-fonts}-$VERSION.tar.gz +cd ${PRGNAM%-fonts}-$VERSION +unzip public/$SRCNAM +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 {} \; + +mkdir -p $PKG/usr/share/fonts/TTF +mv TTF/*.ttf $PKG/usr/share/fonts/TTF + +mkdir -p $PKG/usr/share/fonts/OTF +mv OTF/*.otf $PKG/usr/share/fonts/OTF + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -p 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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/victor-mono-fonts/victor-mono-fonts.info b/system/victor-mono-fonts/victor-mono-fonts.info new file mode 100644 index 0000000000..538ced8141 --- /dev/null +++ b/system/victor-mono-fonts/victor-mono-fonts.info @@ -0,0 +1,10 @@ +PRGNAM="victor-mono-fonts" +VERSION="1.4.2" +HOMEPAGE="https://rubjo.github.io/victor-mono/" +DOWNLOAD="https://github.com/rubjo/victor-mono/archive/v1.4.2/victor-mono-1.4.2.tar.gz" +MD5SUM="b1ddcb2711be3f696fe443d41386e02b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Justin Teague" +EMAIL="arcadellama@posteo.net" diff --git a/system/vifm/README b/system/vifm/README index 54e68874e2..b4fa881ff4 100644 --- a/system/vifm/README +++ b/system/vifm/README @@ -1,6 +1,8 @@ +vifm (a ncurses-based file manager with vi-like keybindings) + Vifm is an ncurses-based file manager with vi-like keybindings. If you use vi, vifm gives you complete keyboard control over your files without having to learn a new set of commands. Vim users: A vifm.vim plugin is included in /usr/share/vifm/vim/. -Read the INSTALL file for usage information. +Read /usr/doc/vifm-$VERSION/README_vim.txt for usage information. diff --git a/system/vifm/slack-desc b/system/vifm/slack-desc index 4d046e0494..2160c75bee 100644 --- a/system/vifm/slack-desc +++ b/system/vifm/slack-desc @@ -12,8 +12,8 @@ vifm: If you use vi, vifm gives you complete keyboard control over your vifm: files without having to learn a new set of commands. vifm: The configuration for vifm sits in ~/.vifm. vifm: -vifm: A vifm.vim plugin is included in /usr/doc/vifm-$VERSION. Read the -vifm: INSTALL file there for usage information. +vifm: Vim users: A vifm.vim plugin is included in /usr/share/vifm/vim/. +vifm: Read /usr/doc/vifm-$VERSION/README_vim.txt for usage information. vifm: vifm: Homepage: https://vifm.sourceforge.net vifm: diff --git a/system/vifm/vifm.SlackBuild b/system/vifm/vifm.SlackBuild index 954455e1b7..5974e05a88 100644 --- a/system/vifm/vifm.SlackBuild +++ b/system/vifm/vifm.SlackBuild @@ -4,12 +4,21 @@ # Originally Written by V'yacheslav Stetskevych # Modified by Charles E. Kauffman +# Modified by B. Watson -# [1-31-18] : Added BETA variable to keep with Slackware's packaging rules. -# export VERSION=0.9.1 BETA=beta; sh vifm.SlackBuild +# Now maintained by B. Watson <yalhcru@gmail.com>. Original version +# had no license; modified version is licensed under the WTFPL. +# See http://www.wtfpl.net/txt/copying/ for details. + +# 20200101 bkw: +# - take over maintenance +# - update for v0.10.1 +# - get rid of BETA kludge (handle beta versions more gracefully). +# script tested with 0.10, 0.10.1-beta, and 0.10.1. I can't be +# bothered to support older versions (you're on your own). PRGNAM=vifm -VERSION=${VERSION:-0.10} +VERSION=${VERSION:-0.10.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,28 +49,29 @@ else LIBDIRSUFFIX="" fi -# Since vifm's beta naming breaks Slackware's packaging rules, -# add the beta suffix, then rename before package creation so -# it preserves Slackware's package naming rules. -if [ "$BETA" != "" ] -then - VERSION=$VERSION-$BETA -fi - set -e +# Handle potential VERSION=10.1-beta (hyphen not allowed). +# Accept either -beta or _beta in VERSION, fix it up. I don't +# plan to ever package a beta version, but if I ever do, the +# VERSION in the script will have the underscore, not the hyphen. +case "$VERSION" in + *-*) SRCVER="$( echo $VERSION | sed 's,_,-,g' )" + VERSION="$( echo $SRCVER | sed 's,-,_,g' )" + ;; + *) SRCVER=$VERSION + ;; +esac + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/$PRGNAM-$SRCVER.tar.bz2 +cd $PRGNAM-$SRCVER 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -70,29 +80,21 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -# Since datarootdir doesn't work as expected, modify Makefile for png and desktop files. -sed -i -e 's;dir)/applications;rootdir)/applications;' -e 's;dir)/pixmaps;rootdir)/pixmaps;' src/Makefile - make -make install DESTDIR=$PKG - -find $PKG/usr/man -type f -exec gzip -9 {} \; +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man?/*.? +DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/$PRGNAM/* $DOCDIR +rm -rf $PKG/usr/share/doc -# If this is a beta package, rename the version to preserve -# Slackware's package naming rules. -if [ "$BETA" != "" ] -then - VERSION=${VERSION//-/_} -fi - -# Add the version number to the /usr/doc/vifm directory. -# and move it to the correct location. -mv $PKG/usr/share/doc $PKG/usr/doc -mv $PKG/usr/doc/vifm $PKG/usr/doc/$PRGNAM-$VERSION +# Include only the vim instructions from INSTALL, nobody cares about compile +# instructions (especially not Windows ones) when using a binary package. +rm -f $DOCDIR/INSTALL +sed -n '/^Vim Specific/,$p' INSTALL > $DOCDIR/README_vim.txt -cp -a AUTHORS BUGS COPYING ChangeLog INSTALL README TODO THANKS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/vifm/vifm.info b/system/vifm/vifm.info index e84b6fbca8..b006ebeac7 100644 --- a/system/vifm/vifm.info +++ b/system/vifm/vifm.info @@ -1,10 +1,10 @@ PRGNAM="vifm" -VERSION="0.10" +VERSION="0.10.1" HOMEPAGE="https://vifm.info" -DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.10.tar.bz2" -MD5SUM="fd50f29c2cbea32ac55d37b470ddc692" +DOWNLOAD="https://downloads.sourceforge.net/vifm/vifm-0.10.1.tar.bz2" +MD5SUM="0afde44205424355ec5f90957971bb07" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Charles E. Kauffman" -EMAIL="molbolom@gmail.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/vinterm/vinterm.info b/system/vinterm/vinterm.info index a456f8af70..39175b37a3 100644 --- a/system/vinterm/vinterm.info +++ b/system/vinterm/vinterm.info @@ -1,8 +1,8 @@ PRGNAM="vinterm" VERSION="0.5.0" HOMEPAGE="https://github.com/andrenho/vinterm" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/vinterm-0.5.0.tar.gz \ - http://urchlay.naptime.net/~urchlay/src/vinterm.vim" +DOWNLOAD="https://slackware.uk/~urchlay/src/vinterm-0.5.0.tar.gz \ + https://slackware.uk/~urchlay/src/vinterm.vim" MD5SUM="307d2285565d9699d62bfc72b8e445c3 \ 15fd1ef04deb529f3aad5aa11b5d1bf4" DOWNLOAD_x86_64="" diff --git a/system/virt-viewer/virt-viewer.SlackBuild b/system/virt-viewer/virt-viewer.SlackBuild index 11fb0c6524..7966171cf5 100644 --- a/system/virt-viewer/virt-viewer.SlackBuild +++ b/system/virt-viewer/virt-viewer.SlackBuild @@ -5,7 +5,7 @@ # Written by Zak B. Elep, <zakame@zakame.net> PRGNAM=virt-viewer -VERSION=${VERSION:-5.0} +VERSION=${VERSION:-7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -76,7 +76,7 @@ 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 NEWS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md NEWS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # If there's a ChangeLog, installing at least part of the recent history diff --git a/system/virt-viewer/virt-viewer.info b/system/virt-viewer/virt-viewer.info index 0d9b0490fb..d6be327cd1 100644 --- a/system/virt-viewer/virt-viewer.info +++ b/system/virt-viewer/virt-viewer.info @@ -1,8 +1,8 @@ PRGNAM="virt-viewer" -VERSION="5.0" +VERSION="7.0" HOMEPAGE="http://virt-manager.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/virt-viewer-5.0.tar.gz" -MD5SUM="b30d5ea7715a2f6e12e0e9727abe7cb4" +DOWNLOAD="https://virt-manager.org/download/sources/virt-viewer/virt-viewer-7.0.tar.gz" +MD5SUM="64c9c4045a7a941a0be4050fc33fc6f5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtk-vnc libvirt-glib" diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild index 3fa214a975..722e60c9b8 100644 --- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild +++ b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-kernel-addons -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=virtualbox-kernel-addons VERSION=${VERSION:-5.0.40} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} @@ -65,6 +65,20 @@ find -L . \ mkdir -p $PKG/lib/modules/$KERNEL/misc +KERNEL_LOCALVERSION=$(zgrep "CONFIG_LOCALVERSION=" /proc/config.gz | cut -d '"' -f 2) +if [ -z "$KERNEL_LOCALVERSION" ]; then + KERNEL_MINOR=$(echo $KERNEL | cut -d "." -f 2) + KERNEL_PATCH=$(echo $KERNEL | cut -d "." -f 3) +else + KERNEL_MINOR=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 2) + KERNEL_PATCH=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 3) +fi + +# Work around API break introduced in kernel 4.4.168 +if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then + sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxguest/r0drv/linux/memobj-r0drv-linux.c +fi + for i in vboxguest vboxsf vboxvideo; do cd $i make KERN_DIR=$KERNELPATH diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild index 2ded2d2429..d879686802 100644 --- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild +++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-kernel -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2019 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PRGNAM=virtualbox-kernel VERSION=${VERSION:-5.0.40} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} @@ -70,6 +70,20 @@ if ! [ "${HARDENING:-yes}" = "yes" ]; then {vboxdrv,vboxnetadp,vboxnetflt,vboxpci}/Makefile fi +KERNEL_LOCALVERSION=$(zgrep "CONFIG_LOCALVERSION=" /proc/config.gz | cut -d '"' -f 2) +if [ -z "$KERNEL_LOCALVERSION" ]; then + KERNEL_MINOR=$(echo $KERNEL | cut -d "." -f 2) + KERNEL_PATCH=$(echo $KERNEL | cut -d "." -f 3) +else + KERNEL_MINOR=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 2) + KERNEL_PATCH=$(echo $KERNEL | sed "s|$KERNEL_LOCALVERSION||" | cut -d "." -f 3) +fi + +# Work around API break introduced in kernel 4.4.168 +if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then + sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxdrv/r0drv/linux/memobj-r0drv-linux.c +fi + make KERN_DIR=${KERNELPATH} mkdir -p $PKG/lib/modules/$KERNEL/misc diff --git a/system/volatility/volatility.SlackBuild b/system/volatility/volatility.SlackBuild index e164596349..fde5d80ace 100644 --- a/system/volatility/volatility.SlackBuild +++ b/system/volatility/volatility.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for volatility -# Copyright 2014-2017 Barry Grundy <bgrundy[at]linuxleo.com> +# Copyright 2014-2019 Barry Grundy <bgrundy[at]linuxleo.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Updated to v2.6 January 2017, Barry J. Grundy. +# Updated to v2.6.1, March 2019 PRGNAM=volatility -VERSION=${VERSION:-2.6} +VERSION=${VERSION:-2.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/volatility/volatility.info b/system/volatility/volatility.info index 143976f7fc..6a43b3c3c7 100644 --- a/system/volatility/volatility.info +++ b/system/volatility/volatility.info @@ -1,10 +1,10 @@ PRGNAM="volatility" -VERSION="2.6" +VERSION="2.6.1" HOMEPAGE="https://github.com/volatilityfoundation/volatility" -DOWNLOAD="https://github.com/volatilityfoundation/volatility/archive/2.6/volatility-2.6.tar.gz" -MD5SUM="78234e807fc31394f22117d6c01a8798" +DOWNLOAD="https://github.com/volatilityfoundation/volatility/archive/2.6.1/volatility-2.6.1.tar.gz" +MD5SUM="53319b202ac6fb6c3a5422bdf0a9f7a0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="distorm pycrypto" +REQUIRES="distorm pycrypto yara-python" MAINTAINER="Barry J. Grundy" EMAIL="bgrundy AT linuxleo.com" diff --git a/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz b/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz Binary files differnew file mode 100644 index 0000000000..45129dff9e --- /dev/null +++ b/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz diff --git a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch deleted file mode 100644 index ef76ea2ef7..0000000000 --- a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9dda18921a25f64e0a0da06e3417ce99f8bf9b41 Mon Sep 17 00:00:00 2001 -From: Andrew Clemons <andrew.clemons@gmail.com> -Date: Wed, 25 Oct 2017 21:35:14 +1300 -Subject: [PATCH] Silence warning for missing path for `vtcol` binary - -vtcol.rs should probably be main.rs, but explicitly setting the -non-standard path also silences the warning. (src/bin would also work) ---- - Cargo.lock | 2 +- - Cargo.toml | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 16590af..0833d44 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -14,6 +14,7 @@ license = "GPL-3.0" - - [[bin]] - name = "vtcol" -+path = "src/vtcol.rs" - test = false - doc = false - diff --git a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz Binary files differnew file mode 100644 index 0000000000..e6f330efc0 --- /dev/null +++ b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz diff --git a/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz b/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz Binary files differnew file mode 100644 index 0000000000..2716a62ed8 --- /dev/null +++ b/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz diff --git a/system/vtcol/slack-desc b/system/vtcol/slack-desc index a0c62537a8..f1e3b5a96d 100644 --- a/system/vtcol/slack-desc +++ b/system/vtcol/slack-desc @@ -13,7 +13,7 @@ vtcol: vtcol: vtcol: vtcol: -vtcol: https://github.com/phi-gamma/vtcol +vtcol: https://gitlab.com/phgsng/vtcol vtcol: vtcol: vtcol: diff --git a/system/vtcol/vtcol.SlackBuild b/system/vtcol/vtcol.SlackBuild index 513c9a5c39..b32862aeef 100644 --- a/system/vtcol/vtcol.SlackBuild +++ b/system/vtcol/vtcol.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vtcol -# Copyright 2017-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=vtcol VERSION=${VERSION:-0.42.2} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -48,19 +48,15 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" CARGOTARGET="--target i586-unknown-linux-gnu" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" CARGOTARGET="--target i686-unknown-linux-gnu" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" CARGOTARGET="--target x86_64-unknown-linux-gnu" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" CARGOTARGET="" fi @@ -69,21 +65,17 @@ 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 {} \; +rm -rf $PRGNAM-v$VERSION +tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz +cd $PRGNAM-v$VERSION -patch -p1 < $CWD/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch +zcat $CWD/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz | patch -p1 +zcat $CWD/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz | patch -p1 +zcat $CWD/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz | patch -p1 # build offline # configuration tells cargo to use the configured directory -# for dependencies intead of downloading from crates.io +# for dependencies instead of downloading from crates.io mkdir .cargo cat << EOF >> .cargo/config [source.crates-io] @@ -95,15 +87,17 @@ directory = '$(pwd)/vendor' EOF # deps and versions come from Cargo.lock -# cargo vender can be used to generate the checksums mkdir vendor ( cd vendor - for dependency in getopts=0.2.14 \ - libc=0.2.19; do - dep="$(echo "$dependency" | cut -d= -f1)" - ver="$(echo "$dependency" | cut -d= -f2)" + grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do + + ver="$(printf "%s\n" "$dep" | cut -d= -f2)" + dep="$(printf "%s\n" "$dep" | cut -d= -f1)" tar xvf $CWD/$dep-$ver.crate @@ -125,17 +119,24 @@ mkdir vendor sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' printf "}\n" - } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json + } > $dep-$ver/.cargo-checksum.json done ) +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" \ cargo build --release $CARGOTARGET mkdir -p $PKG/usr/bin/ -find target -name vtcol -exec install -m 755 {} $PKG/usr/bin/vtcol \; +find target -name $PRGNAM -exec install -m 755 {} $PKG/usr/bin/$PRGNAM \; 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 diff --git a/system/vtcol/vtcol.info b/system/vtcol/vtcol.info index 6c1ae3a964..e55ba739e6 100644 --- a/system/vtcol/vtcol.info +++ b/system/vtcol/vtcol.info @@ -1,12 +1,14 @@ PRGNAM="vtcol" VERSION="0.42.2" -HOMEPAGE="https://github.com/phi-gamma/vtcol" -DOWNLOAD="https://github.com/phi-gamma/vtcol/archive/v0.42.2/vtcol-0.42.2.tar.gz \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.14.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.19.crate" -MD5SUM="80091d0507aff4fe8bfb8d82e70a020c \ - 6d59f4fa29cab7bcc7ea7e0c8f96e27d \ - 604a2edfd52c6e87d8903ef2795da387" +HOMEPAGE="https://gitlab.com/phgsng/vtcol" +DOWNLOAD="https://gitlab.com/phgsng/vtcol/-/archive/v0.42.2/vtcol-v0.42.2.tar.gz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.21.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.19.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate" +MD5SUM="94ec72b7b2cc7d1a2ed80d2a08a70761 \ + c3ec5977ecc0f6244ef3be87f5325e72 \ + 604a2edfd52c6e87d8903ef2795da387 \ + 4272c279b06b88f8b0ffce7109348e27" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/webcore-fonts/webcore-fonts.info b/system/webcore-fonts/webcore-fonts.info index 46dc605cf8..e517530c02 100644 --- a/system/webcore-fonts/webcore-fonts.info +++ b/system/webcore-fonts/webcore-fonts.info @@ -8,5 +8,5 @@ MD5SUM="0ca029d7135f7afdba00be6280ff96c6 \ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Dugan Chen" -EMAIL="thedoogster [at] gmail [dot] com" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild index 22a7f9f30a..3889b03612 100644 --- a/system/webmin/webmin.SlackBuild +++ b/system/webmin/webmin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Webmin http://www.webmin.com -# Copyright 2006-2015 David Somero (dsomero@hotmail.com) +# Copyright 2006-2019 David Somero (dsomero@hotmail.com) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=webmin -VERSION=${VERSION:-1.900} +VERSION=${VERSION:-1.973} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -105,7 +105,7 @@ rm -rf $PKG/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1 rm -f $PKG/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENCE* README $CWD/webmin.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENCE* README.md $CWD/webmin.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info index 44e6fede0f..e51856347c 100644 --- a/system/webmin/webmin.info +++ b/system/webmin/webmin.info @@ -1,8 +1,8 @@ PRGNAM="webmin" -VERSION="1.900" -HOMEPAGE="http://www.webmin.com/" -DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/1.900/webmin-1.900.tar.gz" -MD5SUM="9a760d86c0dc9babb55550211f7c16c3" +VERSION="1.973" +HOMEPAGE="https://www.webmin.com/" +DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/1.973/webmin-1.973.tar.gz" +MD5SUM="6d38a589e4b721a5ae584767713a230a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/system/whowatch/whowatch.SlackBuild b/system/whowatch/whowatch.SlackBuild index 40c3d88617..436bf2d1e2 100644 --- a/system/whowatch/whowatch.SlackBuild +++ b/system/whowatch/whowatch.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for whowatch -# Copyright 2009 David Woodfall <info@davidwoodfall.co.uk> +# Copyright 2009 David Woodfall <dave@slackbuilds.org> # Copyright 2009-2012 Renato Martini, renatomartini.net, Brazil # All rights reserved. # diff --git a/system/wiimms-iso-tools/cflags.diff b/system/wiimms-iso-tools/cflags.diff index 2107bdc175..0e483f6ecd 100644 --- a/system/wiimms-iso-tools/cflags.diff +++ b/system/wiimms-iso-tools/cflags.diff @@ -1,16 +1,27 @@ ---- Makefile.orig 2018-04-01 01:05:20.377566441 -0700 -+++ Makefile 2018-04-01 01:05:59.596953701 -0700 +--- Makefile.orig 2019-12-22 07:58:45.850503487 -0800 ++++ Makefile 2019-12-22 08:17:35.475369649 -0800 +@@ -112,8 +112,8 @@ + # compiler settings + + PRE ?= +-CC = $(PRE)gcc +-CPP = $(PRE)g++ ++CC ?= $(PRE)gcc ++CXX ?= $(PRE)g++ + STRIP = $(PRE)strip + + #------------------------------------------------------------------------------- @@ -243,7 +243,8 @@ DCLIB_DIR := ./dclib DIR_LIST += $(DCLIB_DIR) VPATH += $(DCLIB_DIR) -CFLAGS += -I$(DCLIB_DIR) +CFLAGS ?= -O3 -funroll-loops -+DEF_FLAGS += -I$(DCLIB_DIR) ++DEF_FLAGS := -I$(DCLIB_DIR) # other objects WIT_O := lib-std.o lib-file.o lib-sf.o \ -@@ -297,15 +298,15 @@ +@@ -297,17 +298,17 @@ DEFINES1 += -D_LZMA_PROB32=1 # LZMA option DEFINES = $(strip $(DEFINES1) $(MODE) $(XDEF)) @@ -22,9 +33,12 @@ +DEF_FLAGS += -Wall -Wno-parentheses -Wno-unused-function +#DEF_FLAGS += -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork +DEF_FLAGS += -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork - ifeq ($(SYSTEM),mac) + ifeq ($(SYSTEM),cygwin) +- CFLAGS += -Wno-format-truncation ++ DEF_FLAGS += -Wno-format-truncation + else ifeq ($(SYSTEM),mac) - CFLAGS += -I/usr/local/include -+ DEF_FLAGS += -I/usr/local/include ++ DEF_FLAGS += -I/usr/local/include endif -CFLAGS += $(XFLAGS) -CFLAGS := $(strip $(CFLAGS)) @@ -33,7 +47,7 @@ DEPFLAGS += -MMD -@@ -369,7 +370,7 @@ +@@ -371,7 +372,7 @@ $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS) @printf "$(LOGFORMAT_TOOL)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)" @@ -42,7 +56,7 @@ $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@ @if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi -@@ -382,7 +383,7 @@ +@@ -384,7 +385,7 @@ $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile @printf "$(LOGFORMAT_TOOL)" helper "$@ $(TOBJ_$@)" "$(MODE)" @@ -51,7 +65,7 @@ $(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@ #-------------------------- -@@ -395,19 +396,19 @@ +@@ -397,19 +398,19 @@ $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile @printf "$(LOGFORMAT_CC)" +object "$@" "$(MODE)" @@ -74,7 +88,7 @@ #-------------------------- -@@ -440,11 +441,11 @@ +@@ -442,11 +443,11 @@ $(LIBBZ2_OBJ): %.o: %.c Makefile @printf "$(LOGFORMAT_CC)" object "$(subst src/libbz2/,,$@)" "$(MODE) [libbz2]" @@ -88,7 +102,7 @@ # ############################################################################### -@@ -656,6 +657,8 @@ +@@ -658,6 +659,8 @@ @echo "" @echo "CFLAGS: $(CFLAGS)" @echo "" @@ -97,7 +111,7 @@ @echo "LDFLAGS: $(LDFLAGS)" @echo "" @echo "LIBS: $(LIBS)" -@@ -1003,7 +1006,7 @@ +@@ -1005,7 +1008,7 @@ @echo " make old enable '-DOLD_FEATURES'" @echo " make wait enable '-DWAIT'" @echo " make testtrace enable '-DTESTTRACE'" diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild index a5d51c87dd..d10239ff94 100644 --- a/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild +++ b/system/wiimms-iso-tools/wiimms-iso-tools.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Wiimms ISO Tools # # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it> -# Copyright 2015, 2018 Hunter Sezen California, USA +# Copyright 2015, 2018-2019 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wiimms-iso-tools -VERSION=${VERSION:-3.01a} +VERSION=${VERSION:-3.02a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,9 +60,9 @@ set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM.source-$VERSION +tar xvf $CWD/$PRGNAM.source-$VERSION.txz +cd $PRGNAM.source-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -79,8 +79,8 @@ sed -i "s|/usr/local|$PKG/usr|" templates.sed make install -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 -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 cp -a gpl-2.0.txt $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/wiimms-iso-tools/wiimms-iso-tools.info b/system/wiimms-iso-tools/wiimms-iso-tools.info index 6af4599faa..c15948fdb0 100644 --- a/system/wiimms-iso-tools/wiimms-iso-tools.info +++ b/system/wiimms-iso-tools/wiimms-iso-tools.info @@ -1,10 +1,10 @@ PRGNAM="wiimms-iso-tools" -VERSION="3.01a" +VERSION="3.02a" HOMEPAGE="https://wit.wiimm.de/" -DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/system/wiimms-iso-tools/wiimms-iso-tools-3.01a.tar.xz" -MD5SUM="ebfe94fc14d851770da9c921de1ebb8c" +DOWNLOAD="https://download.wiimm.de/source/wiimms-iso-tools/wiimms-iso-tools.source-3.02a.txz" +MD5SUM="a49c0fe7e5cf7fff7dd13fbdacb946eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/wine-staging/README b/system/wine-staging/README index 973e997edb..eab14d1e07 100644 --- a/system/wine-staging/README +++ b/system/wine-staging/README @@ -9,58 +9,82 @@ before they are integrated into the main branch. This is a current development branch of Wine appended with full patches of the Staging branch. +NOTE -MULTILIB. +libusb in Slackware 14.2 is too old for this version of wine, and +consequently, USB isn't supported. -With no options this script will build the 32bit wine-staging -package ONLY!, for which you need to have a FULL multilib -system installed (see below). +============================================================ -To build a package for both 64bit and 32bit Windows executable -support, use this: +OPTIONS -# WIN64=yes sh wine-staging.SlackBuild +With no options this SlackBuild will build a 32 bit package, +for which you need to have either have multilib installed, or +building in a 32 OS, or in a 32 bit chroot. -See README.SLACKWARE for a giant list of dependencies and -AlienBOB's multilib readme and repo: +To enable 64 bit support use: -https://docs.slackware.com/slackware:multilib -http://www.slackware.com/~alien/multilib/ + WIN64=yes ./wine.SlackBuild -From wine's maintainer David Woodfall you can grab a script -to get and install the multilib packages: +To disable win32 support, use: -http://dawoodfall.net/files/scripts/slackware/alien-multilib-rysnc.sh + WIN32=no ./wine.SlackBuild -Be sure to read the short instructions at the top. If you use -slackpkg then you will also want to blacklist his packages in -/etc/slackpkg/blacklist: +To disable OpenGL support, use: -[0-9]+alien -[0-9]+compat32 + OPENGL=no ./wine.SlackBuild +The above options can be combined. -WINEPREFIX. +============================================================ -With 64bit support you would use the wine64 binary. If you have a -combined 32 and 64bit package you need to set the environmental -variable WINEPREFIX to point to the 64bit wine directory when running -wine64, which should be different to the 32bit directory (~/.wine by -default). Example: +OPTIONAL DEPENDENCIES -$ WINEPREFIX=~/.wine64 wine64 notepad +fontforge: To build tahoma, tahomabd, and marlett fonts. +webcore-fonts: For MS fonts for the web and Windows Vista. +oss +SDL2 +FAudio +libcapi20 +gsm +krb5 +OpenAL +vulkan-sdk -To build the 32bit wine on x86_64 you will need to have multilib -packages installed, unless you want to build for Windows 64 bit -applications only using: +============================================================ -# WIN64=yes NOWIN32=yes sh wine-staging.SlackBuild +MULTILIB +To build the 32 bit wine on x86_64 you will need to have +multilib packages installed, unless you want to build for +Windows 64 bit applications only (using WIN64=yes WIN32=no.) -OPENGL. +alienBOB's multilib readme and repo: -To disable OpenGL support, use: +https://docs.slackware.com/slackware:multilib +http://www.slackware.com/~alien/multilib/ + +A script that rsyncs with alienBOB's repo and installs the +multilib packages which can be found here: + +http://tty1.uk/scripts/slackware/alien-multilib-rsync.sh + +Be sure to read the short instructions at the top. If you +use slackpkg then you will also want to blacklist his +packages in /etc/slackpkg/blacklist: + +[0-9]+alien +[0-9]+compat32 + +============================================================ + +NOTES -# OPENGL=no ./wine.SlackBuild +With 64 bit support you would use the wine64 binary. If you +have a combined 32 and 64 bit package you need to set the +environmental variable WINEPREFIX to point to the 64 bit +wine directory when running wine64, which should be +different to the 32 bit directory (~/.wine by default). +Example: -Optional dependencies: fontforge, webcore-fonts, winetricks +WINEPREFIX=~/.wine64 wine64 notepad diff --git a/system/wine-staging/steam.patch b/system/wine-staging/steam.patch deleted file mode 100644 index deef1b5cd8..0000000000 --- a/system/wine-staging/steam.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c -index 6e7b23e..63eda34 100644 ---- a/dlls/kernel32/process.c -+++ b/dlls/kernel32/process.c -@@ -2429,6 +2429,33 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A - return FALSE; - if (hFile == INVALID_HANDLE_VALUE) goto done; - -+ /* CROSSOVER HACK: bug 13322 (winehq bug 39403) -+ * Insert --no-sandbox in command line of Steam's web helper process to -+ * work around problems hooking our ntdll exports. */ -+ { -+ static const WCHAR steamwebhelperexeW[] = {'s','t','e','a','m','w','e','b','h','e','l','p','e','r','.','e','x','e',0}; -+ static const WCHAR nosandboxW[] = {' ','-','-','n','o','-','s','a','n','d','b','o','x',0}; -+ -+ if (strstrW(name, steamwebhelperexeW)) -+ { -+ LPWSTR new_command_line; -+ -+ new_command_line = HeapAlloc(GetProcessHeap(), 0, -+ sizeof(WCHAR) * (strlenW(tidy_cmdline) + strlenW(nosandboxW) + 1)); -+ -+ if (!new_command_line) return FALSE; -+ -+ strcpyW(new_command_line, tidy_cmdline); -+ strcatW(new_command_line, nosandboxW); -+ -+ TRACE("CrossOver hack changing command line to %s\n", debugstr_w(new_command_line)); -+ -+ if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline ); -+ tidy_cmdline = new_command_line; -+ } -+ } -+ /* end CROSSOVER HACK */ -+ - /* Warn if unsupported features are used */ - - if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS | diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild index 6efc2ceb24..da0da96bc8 100644 --- a/system/wine-staging/wine-staging.SlackBuild +++ b/system/wine-staging/wine-staging.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for wine-staging. # -# Copyright 2016-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2016-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com> # # All rights reserved. @@ -29,8 +29,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Now maintained by Dave Woodfall <dave@slackbuilds.org> + PRGNAM=wine-staging -VERSION=${VERSION:-3.21} +VERSION=${VERSION:-6.5} +WINEVERSION=${WINEVERSION:-6.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,6 +49,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +WIN32=${WIN32:-yes} +WIN64=${WIN64:-no} # If your video card does not support hardware accelerated OpenGL, # run the script like: OPENGL=NO ./wine.SlackBuild @@ -54,27 +59,18 @@ if [ "${OPENGL:-YES}" = "YES" ]; then else do_opengl="without" fi - -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$(uname -m) ;; - esac -fi - -if [ -n "$NOWIN32" ] && [ -z "$WIN64" ]; then +if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then echo "Both 64 and 32 bit builds disabled. Nothing to do." exit 1 fi # These should work for anything not specified below -BUILD_ARCH=$ARCH"-slackware-linux" +BUILD_ARCH="$ARCH-slackware-linux" SLKCFLAGS="-O2" case "$ARCH" in arm) - BUILD_ARCH=$ARCH"-slackware-linux-gnueabi" + BUILD_ARCH="$ARCH-slackware-linux-gnueabi" ;; i?86) # -Os was -O2, fix for: @@ -84,7 +80,6 @@ case "$ARCH" in SLKCFLAGS="-Os -march=$ARCH -mtune=i686" ;; x86_64) - [ -n "$WIN64" ] && WIN64="--enable-win64" SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" ;; @@ -95,8 +90,8 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION wine-$VERSION -tar xvf $CWD/wine-$VERSION.tar.xz +rm -rf $PRGNAM-$VERSION wine-$WINEVERSION +tar xvf $CWD/wine-$WINEVERSION.tar.xz tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION/patches @@ -107,9 +102,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 {} \; -./patchinstall.sh DESTDIR=$TMP/wine-$VERSION --all +./patchinstall.sh DESTDIR=$TMP/wine-$WINEVERSION --all -cd $TMP/wine-$VERSION +cd $TMP/wine-$WINEVERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -123,16 +118,7 @@ patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch # fix path of opencl headers. sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* -# Steam crossover hack for store/web functionality. -# https://bugs.winehq.org/show_bug.cgi?id=39403 -patch -Np1 < $CWD/steam.patch - -# Remove -fPIC for i?86 or the build will hang. -if [ "$ARCH" == "i?86" ]; then - patch -p1 --verbose < $CWD/x86_remove_fpic.patch -fi - -if [ -n "$WIN64" ]; then +if [ "$WIN64" = "yes" ]; then wine64="--with-wine64=../wine64" mkdir wine64 cd wine64 @@ -157,14 +143,11 @@ if [ -n "$WIN64" ]; then make depend make - #NUMJOBS=${NUMJOBS:-"-s -j6 -l6"} - #make depend $NUMJOBS || exit 1 - #make $NUMJOBS || exit 1 make install DESTDIR=$PKG cd .. fi -if [ -z "$NOWIN32" ]; then +if [ "$WIN32" = "yes" ]; then mkdir wine32 cd wine32 @@ -190,9 +173,6 @@ if [ -z "$NOWIN32" ]; then make depend make - #NUMJOBS=${NUMJOBS:-"-s -j6 -l6"} - #make $NUMJOBS depend || exit 1 - #make $NUMJOBS || exit 1 make install DESTDIR=$PKG cd .. fi @@ -229,6 +209,8 @@ cp $CWD/*.desktop $PKG/usr/share/applications/ DOCS="ANNOUNCE AUTHORS COPYING.LIB LICENSE* MAINTAINERS README VERSION" FONTS_LICENSE="COPYING.arial COPYING.cour COPYING.msyh COPYING.times" +VERSION=$( printf %s $VERSION | tr - _ ) + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp $DOCS $FONTS_LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info index 6fcd5b7991..520f7c2dfb 100644 --- a/system/wine-staging/wine-staging.info +++ b/system/wine-staging/wine-staging.info @@ -1,12 +1,12 @@ PRGNAM="wine-staging" -VERSION="3.21" +VERSION="6.5" HOMEPAGE="https://wiki.winehq.org/Wine-Staging" -DOWNLOAD="https://dl.winehq.org/wine/source/3.x/wine-3.21.tar.xz \ - https://github.com/wine-staging/wine-staging/archive/v3.21/wine-staging-3.21.tar.gz" -MD5SUM="b64fa9dce7fa50367b6f4c356b475f3e \ - c2e25baa98823329d487d7c1a98366a7" -DOWNLOAD_x86_64="UNSUPPORTED" +DOWNLOAD="https://dl.winehq.org/wine/source/6.x/wine-6.5.tar.xz \ + https://github.com/wine-staging/wine-staging/archive/v6.5/wine-staging-6.5.tar.gz" +MD5SUM="ff2e13ce3cfce10ab801bbe89261d76b \ + 34ee330a274bec7ad5cb7ab840f424fc" +DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/system/wine-staging/x86_remove_fpic.patch b/system/wine-staging/x86_remove_fpic.patch deleted file mode 100644 index ac949dc86d..0000000000 --- a/system/wine-staging/x86_remove_fpic.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff -Naur a/configure b/configure ---- a/configure 2018-01-02 20:58:13.000000000 +0000 -+++ b/configure 2018-01-08 18:31:55.480995247 +0000 -@@ -8072,7 +8072,7 @@ - done - - LIBEXT="dylib" -- DLLFLAGS="$DLLFLAGS -fPIC" -+ DLLFLAGS="$DLLFLAGS " - LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" - COREFOUNDATION_LIBS="-framework CoreFoundation" -@@ -8304,14 +8304,14 @@ - ;; - - linux-android*) -- DLLFLAGS="$DLLFLAGS -fPIC" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } -+ DLLFLAGS="$DLLFLAGS " -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--export-dynamic" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--export-dynamic... " >&6; } - if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" -+CFLAGS="$CFLAGS -Wl,--export-dynamic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8330,14 +8330,14 @@ - if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : - LDEXECFLAGS="-Wl,--export-dynamic" - fi -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,--rpath,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8358,14 +8358,14 @@ - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" - else -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,-R,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8448,7 +8448,7 @@ - ;; - - *) -- DLLFLAGS="$DLLFLAGS -fPIC" -+ DLLFLAGS="$DLLFLAGS " - LDEXECFLAGS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5 - $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; } -@@ -8456,7 +8456,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic" -+CFLAGS="$CFLAGS -shared -Wl,-Bsymbolic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - void myfunc() {} -@@ -8475,13 +8475,13 @@ - if test "$ac_cv_c_dll_gnuelf" = "yes" - then - LIBWINE_LDFLAGS="-shared" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-soname,confest.so.1" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,-soname,confest.so.1... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1" -+CFLAGS="$CFLAGS -shared -Wl,-soname,confest.so.1" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8500,13 +8500,13 @@ - if test "x$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" = xyes; then : - LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-h,confest.so.1" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,-h,confest.so.1... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1" -+CFLAGS="$CFLAGS -shared -Wl,-h,confest.so.1" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8528,13 +8528,13 @@ - fi - - echo '{ global: *; };' >conftest.map -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,--version-script=conftest.map" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,--version-script=conftest.map... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map" -+CFLAGS="$CFLAGS -shared -Wl,--version-script=conftest.map" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8555,13 +8555,13 @@ - fi - rm -f conftest.map - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--export-dynamic" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--export-dynamic... " >&6; } - if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" -+CFLAGS="$CFLAGS -Wl,--export-dynamic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8581,14 +8581,14 @@ - LDEXECFLAGS="-Wl,--export-dynamic" - fi - -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,--rpath,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8609,14 +8609,14 @@ - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" - else -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,-R,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8804,7 +8804,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic" -+CFLAGS="$CFLAGS -Wl,-G,-h,conftest.so.1.0,-B,symbolic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - void myfunc() {} diff --git a/system/wine/README b/system/wine/README index ded13a1abd..a5830f6347 100644 --- a/system/wine/README +++ b/system/wine/README @@ -4,7 +4,6 @@ top of X for Linux and Unix. NOTE: This builds the stable version of wine. If you need cutting-edge then you may want to check out wine-staging. - OPTIONS With no options this SlackBuild will build a 32 bit package, @@ -25,17 +24,18 @@ To disable OpenGL support, use: The above options can be combined. - OPTIONAL DEPENDENCIES -fontforge: - -To build tahoma, tahomabd, and marlett fonts. - -webcore-fonts: - -For tahoma, lucida console, MS fonts for the web and Win -Vista. +fontforge: To build tahoma, tahomabd, and marlett fonts. +webcore-fonts: For MS fonts for the web and Windows Vista. +oss +SDL2 +FAudio +libcapi20 +gsm +krb5 +OpenAL +vulkan-sdk ============================================================ @@ -62,7 +62,7 @@ http://www.slackware.com/~alien/multilib/ I have a script that rsyncs with alienBOB's repo and installs the multilib packages which can be found here: -http://dawoodfall.net/files/scripts/slackware/alien-multilib-rysnc.sh +http://tty1.uk/scripts/slackware/alien-multilib-rsync.sh Be sure to read the short instructions at the top. If you use slackpkg then you will also want to blacklist his diff --git a/system/wine/wine.SlackBuild b/system/wine/wine.SlackBuild index e3535150b1..64ae4f4275 100644 --- a/system/wine/wine.SlackBuild +++ b/system/wine/wine.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine -VERSION=${VERSION:-3.0.4} +VERSION=${VERSION:-6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -56,12 +56,12 @@ if [ "$WIN32" = "no" ] && [ "$WIN64" = "no" ]; then fi # These should work for anything not specified below -BUILD_ARCH=$ARCH"-slackware-linux" +BUILD_ARCH="$ARCH-slackware-linux" SLKCFLAGS="-O2" case "$ARCH" in arm) - BUILD_ARCH=$ARCH"-slackware-linux-gnueabi" + BUILD_ARCH="$ARCH-slackware-linux-gnueabi" ;; i?86) # -Os was -O2, fix for: @@ -94,11 +94,6 @@ find -L . \ # Fix for flex patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch -# Remove -fPIC for i?86 or the build will hang -if [ "$ARCH" == "i?86" ]; then - patch -p1 --verbose < $CWD/x86_remove_fpic.patch -fi - if [ "$WIN64" = "yes" ]; then wine64="--with-wine64=../wine64" mkdir wine64 @@ -165,8 +160,11 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 +VERSION=$( printf %s $VERSION | tr - _ ) + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ANNOUNCE AUTHORS COPYING.LIB LICENSE* README VERSION \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/wine/wine.info b/system/wine/wine.info index 6e3228de16..44d7b362ae 100644 --- a/system/wine/wine.info +++ b/system/wine/wine.info @@ -1,10 +1,10 @@ PRGNAM="wine" -VERSION="3.0.4" +VERSION="6.0" HOMEPAGE="http://www.winehq.com/" -DOWNLOAD="https://dl.winehq.org/wine/source/3.0/wine-3.0.4.tar.xz" -MD5SUM="21f71387f4975493c392e3019f5d536b" +DOWNLOAD="https://dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz" +MD5SUM="1c8b7e1642a9e532106b88a7b1932ef3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +EMAIL="dave@slackbuilds.org" diff --git a/system/wine/x86_remove_fpic.patch b/system/wine/x86_remove_fpic.patch deleted file mode 100644 index ac949dc86d..0000000000 --- a/system/wine/x86_remove_fpic.patch +++ /dev/null @@ -1,202 +0,0 @@ -diff -Naur a/configure b/configure ---- a/configure 2018-01-02 20:58:13.000000000 +0000 -+++ b/configure 2018-01-08 18:31:55.480995247 +0000 -@@ -8072,7 +8072,7 @@ - done - - LIBEXT="dylib" -- DLLFLAGS="$DLLFLAGS -fPIC" -+ DLLFLAGS="$DLLFLAGS " - LDRPATH_INSTALL="-Wl,-rpath,@loader_path/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,-rpath,@loader_path/\$(top_builddir)/libs/wine" - COREFOUNDATION_LIBS="-framework CoreFoundation" -@@ -8304,14 +8304,14 @@ - ;; - - linux-android*) -- DLLFLAGS="$DLLFLAGS -fPIC" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } -+ DLLFLAGS="$DLLFLAGS " -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--export-dynamic" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--export-dynamic... " >&6; } - if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" -+CFLAGS="$CFLAGS -Wl,--export-dynamic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8330,14 +8330,14 @@ - if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : - LDEXECFLAGS="-Wl,--export-dynamic" - fi -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,--rpath,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8358,14 +8358,14 @@ - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" - else -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,-R,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8448,7 +8448,7 @@ - ;; - - *) -- DLLFLAGS="$DLLFLAGS -fPIC" -+ DLLFLAGS="$DLLFLAGS " - LDEXECFLAGS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5 - $as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; } -@@ -8456,7 +8456,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic" -+CFLAGS="$CFLAGS -shared -Wl,-Bsymbolic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - void myfunc() {} -@@ -8475,13 +8475,13 @@ - if test "$ac_cv_c_dll_gnuelf" = "yes" - then - LIBWINE_LDFLAGS="-shared" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-soname,confest.so.1... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-soname,confest.so.1" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,-soname,confest.so.1... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1" -+CFLAGS="$CFLAGS -shared -Wl,-soname,confest.so.1" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8500,13 +8500,13 @@ - if test "x$ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1" = xyes; then : - LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion" - else -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,-h,confest.so.1... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-h,confest.so.1" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,-h,confest.so.1... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1" -+CFLAGS="$CFLAGS -shared -Wl,-h,confest.so.1" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8528,13 +8528,13 @@ - fi - - echo '{ global: *; };' >conftest.map -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -shared -Wl,--version-script=conftest.map... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,--version-script=conftest.map" >&5 -+$as_echo_n "checking whether the compiler supports -shared -Wl,--version-script=conftest.map... " >&6; } - if ${ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map" -+CFLAGS="$CFLAGS -shared -Wl,--version-script=conftest.map" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8555,13 +8555,13 @@ - fi - rm -f conftest.map - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--export-dynamic" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--export-dynamic... " >&6; } - if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" -+CFLAGS="$CFLAGS -Wl,--export-dynamic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8581,14 +8581,14 @@ - LDEXECFLAGS="-Wl,--export-dynamic" - fi - -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,--rpath,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8609,14 +8609,14 @@ - LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" - LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine" - else -- as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 --$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; } -+ as_ac_var=`$as_echo "ac_cv_cflags_ -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib" >&5 -+$as_echo_n "checking whether the compiler supports -Wl,-R,\$ORIGIN/../lib... " >&6; } - if eval \${$as_ac_var+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" -+CFLAGS="$CFLAGS -Wl,-R,\$ORIGIN/../lib" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int main(int argc, char **argv) { return 0; } -@@ -8804,7 +8804,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_wine_try_cflags_saved=$CFLAGS --CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic" -+CFLAGS="$CFLAGS -Wl,-G,-h,conftest.so.1.0,-B,symbolic" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - void myfunc() {} diff --git a/system/winetricks/winetricks.SlackBuild b/system/winetricks/winetricks.SlackBuild index b213666fb4..161db2cbcb 100644 --- a/system/winetricks/winetricks.SlackBuild +++ b/system/winetricks/winetricks.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Slackware build script for winetricks -# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA +# Copyright 2017-2019 Donald Cooley South Haven, Indiana USA # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=winetricks -VERSION=${VERSION:-20180603} +VERSION=${VERSION:-20190615} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/winetricks/winetricks.info b/system/winetricks/winetricks.info index 9e6af25d7e..9fbaf51e53 100644 --- a/system/winetricks/winetricks.info +++ b/system/winetricks/winetricks.info @@ -1,8 +1,8 @@ PRGNAM="winetricks" -VERSION="20180603" +VERSION="20190615" HOMEPAGE="https://github.com/Winetricks/winetricks" -DOWNLOAD="https://github.com/Winetricks/winetricks/archive/20180603/winetricks-20180603.tar.gz" -MD5SUM="ddb67b7b6e9e73213fb72779291d7a2d" +DOWNLOAD="https://github.com/Winetricks/winetricks/archive/20190615/winetricks-20190615.tar.gz" +MD5SUM="6aab44e45da90fc53890b472dd499c81" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cabextract wine" diff --git a/system/wipe/wipe.SlackBuild b/system/wipe/wipe.SlackBuild index c9f3bf90de..0db357d199 100644 --- a/system/wipe/wipe.SlackBuild +++ b/system/wipe/wipe.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for wipe. # -# Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/system/wipe/wipe.info b/system/wipe/wipe.info index e2d2bef2a1..2d7bb3d47a 100644 --- a/system/wipe/wipe.info +++ b/system/wipe/wipe.info @@ -6,5 +6,5 @@ MD5SUM="3aed00711e0490edbec115bc283b8544" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/system/wmgtemp/bugfix.diff b/system/wmgtemp/bugfix.diff deleted file mode 100644 index 19916400c8..0000000000 --- a/system/wmgtemp/bugfix.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur wmgtemp-1.1/src/wmgtemp.c wmgtemp-1.1.patched/src/wmgtemp.c ---- wmgtemp-1.1/src/wmgtemp.c 2010-06-21 06:54:37.000000000 -0400 -+++ wmgtemp-1.1.patched/src/wmgtemp.c 2016-08-16 08:38:01.208866564 -0400 -@@ -90,8 +90,8 @@ - int SUBFEAT_NUM_CPU = 0; - int SUBFEAT_NUM_SYS = 0; - --double cpu_history[59]; --double sys_history[59]; -+double cpu_history[60]; -+double sys_history[60]; - - double display_min = 20; - double display_max = 35; diff --git a/system/wmgtemp/wmgtemp.SlackBuild b/system/wmgtemp/wmgtemp.SlackBuild index d48afc24a9..f8c546215f 100644 --- a/system/wmgtemp/wmgtemp.SlackBuild +++ b/system/wmgtemp/wmgtemp.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for wmgtemp # # Copyright 2015 Gethyn ThomasQuail <email removed> +# Copyright 2020 B. Watson <yalhcru@gmail.com> # All rights reserved. # # Based on: @@ -27,6 +28,7 @@ # Now maintained by B. Watson <yalhcru@gmail.com> +# 20200609 bkw: update for v1.2, add libdockapp dep # 20160816 bkw: # - take over maintenance # - BUILD=2 @@ -37,8 +39,8 @@ # - don't install INSTALL to doc dir PRGNAM=wmgtemp -VERSION=${VERSION:-1.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -77,21 +79,23 @@ 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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -patch -p1 < $CWD/bugfix.diff +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux -sed -i 's,/etc/sensors\.conf,/etc/sensors3.conf,' src/$PRGNAM.c $PRGNAM.1 - -make CCFLAGS="$SLKCFLAGS -fgnu89-inline" -mkdir -p $PKG/usr/bin -install -s -m0755 src/$PRGNAM $PKG/usr/bin -mkdir -p $PKG/usr/man/man1 -gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +make +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a Artistic ChangeLog CREDITS README TODO $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/wmgtemp/wmgtemp.info b/system/wmgtemp/wmgtemp.info index 8723be139c..0ead6258c1 100644 --- a/system/wmgtemp/wmgtemp.info +++ b/system/wmgtemp/wmgtemp.info @@ -1,10 +1,10 @@ PRGNAM="wmgtemp" -VERSION="1.1" -HOMEPAGE="http://fluxcode.net/projects/wmgtemp" -DOWNLOAD="http://fluxcode.net/files/wmgtemp-1.1.tar.gz" -MD5SUM="cce700b3a4ef74b2ec019d8e89bdf2f6" +VERSION="1.2" +HOMEPAGE="https://www.dockapps.net/wmgtemp" +DOWNLOAD="https://www.dockapps.net/download/wmgtemp-1.2.tar.gz" +MD5SUM="a595053ba7fab25e318d983df3af8ce8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libdockapp" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/system/worker/worker.SlackBuild b/system/worker/worker.SlackBuild index 6d6f567900..543fc06525 100644 --- a/system/worker/worker.SlackBuild +++ b/system/worker/worker.SlackBuild @@ -27,7 +27,7 @@ # Modified by Eugene M., <damagedone at gmx dot com PRGNAM=worker -VERSION=${VERSION:-3.15.3} +VERSION=${VERSION:-4.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/worker/worker.info b/system/worker/worker.info index 5f6481156a..f2e68e7085 100644 --- a/system/worker/worker.info +++ b/system/worker/worker.info @@ -1,8 +1,8 @@ PRGNAM="worker" -VERSION="3.15.3" +VERSION="4.8.0" HOMEPAGE="http://www.boomerangsworld.de/worker/" -DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-3.15.3.tar.bz2" -MD5SUM="a92afb2c02363ed70664e1cf35244cef" +DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-4.8.0.tar.bz2" +MD5SUM="a5319b60723a0a489b7c0426d6aac446" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avfs" diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild index 3bcddd4862..e7837ae2f9 100644 --- a/system/xarchiver/xarchiver.SlackBuild +++ b/system/xarchiver/xarchiver.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Xarchiver # Copyright 2007, 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com> -# Copyright 2017 Edward W. Koenig <kingbeowulf{at}gmail{dot}com> +# Copyright 2019 Edward W. Koenig <kingbeowulf{at}gmail{dot}com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xarchiver -VERSION=${VERSION:-0.5.4.13} +VERSION=${VERSION:-0.5.4.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/xarchiver/xarchiver.info b/system/xarchiver/xarchiver.info index ada0ae9c36..bdf73f4d96 100644 --- a/system/xarchiver/xarchiver.info +++ b/system/xarchiver/xarchiver.info @@ -1,10 +1,10 @@ PRGNAM="xarchiver" -VERSION="0.5.4.13" +VERSION="0.5.4.17" HOMEPAGE="https://github.com/ib/xarchiver" -DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.13/xarchiver-0.5.4.13.tar.gz" -MD5SUM="e4cb50fbd5311d1a67cfdc946904a32a" +DOWNLOAD="https://github.com/ib/xarchiver/archive/0.5.4.17/xarchiver-0.5.4.17.tar.gz" +MD5SUM="f09d266775347f2ebccd94b01cf23c65" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf{at}gmail{dot}com" +EMAIL="kingbeowulf@gmail.com" diff --git a/system/xbattmon/README b/system/xbattmon/README index 3125528794..209c062390 100644 --- a/system/xbattmon/README +++ b/system/xbattmon/README @@ -10,5 +10,6 @@ COLOR_LEFT2CHARGE=<color> (default: grey) COLOR_DRAINED=<color> (default: red) COLOR_LEFT2DRAIN=<color> (default: blue) RAISE=yes|no (default: no), the bar to be raised on top of other windows -CRITICAL=<number> (default: 5), the charge level at which starts blinking +CRITICAL=<number> (default: 5), the charge level at which it starts +blinking TRANSPARENT=yes|no (default: no) diff --git a/system/xbattmon/slack-desc b/system/xbattmon/slack-desc index bee69cf587..25be2d7718 100644 --- a/system/xbattmon/slack-desc +++ b/system/xbattmon/slack-desc @@ -12,8 +12,8 @@ xbattmon: xbattmon is a simple battery status bar for X. It draws a 2 pixels xbattmon: bar at the edge of your screen, which shows battery status with xbattmon: different colors. xbattmon: +xbattmon: Homepage: https://git.2f30.org/xbattmon/log.html xbattmon: -xbattmon: Homepage: http://git.2f30.org/xbattmon/ xbattmon: xbattmon: xbattmon: diff --git a/system/xbattmon/xbattmon.info b/system/xbattmon/xbattmon.info index 0177707fd0..8dd02097bc 100644 --- a/system/xbattmon/xbattmon.info +++ b/system/xbattmon/xbattmon.info @@ -1,7 +1,7 @@ PRGNAM="xbattmon" VERSION="1.1" -HOMEPAGE="http://git.2f30.org/xbattmon/" -DOWNLOAD="http://dl.2f30.org/releases/xbattmon-1.1.tar.gz" +HOMEPAGE="https://git.2f30.org/xbattmon/" +DOWNLOAD="https://dl.2f30.org/releases/xbattmon-1.1.tar.gz" MD5SUM="e2110af877e7bcfcb30201fcc2ad69f5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild index 3a17678fbc..3c62fb1969 100644 --- a/system/xboxdrv-linux/xboxdrv-linux.SlackBuild +++ b/system/xboxdrv-linux/xboxdrv-linux.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=xboxdrv-linux VERSION=${VERSION:-0.8.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -61,7 +61,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +mkdir $PRGNAM-$VERSION +tar xvf $CWD/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz --strip-components 1 -C $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/xboxdrv-linux/xboxdrv-linux.info b/system/xboxdrv-linux/xboxdrv-linux.info index eef98e33fd..467f0b7a1d 100644 --- a/system/xboxdrv-linux/xboxdrv-linux.info +++ b/system/xboxdrv-linux/xboxdrv-linux.info @@ -1,10 +1,10 @@ PRGNAM="xboxdrv-linux" VERSION="0.8.8" HOMEPAGE="https://pingus.seul.org/~grumbel/xboxdrv/" -DOWNLOAD="https://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.8.tar.bz2" -MD5SUM="a62703eda7d59393538b2f22d5b0c791" +DOWNLOAD="https://github.com/chewi/xboxdrv/archive/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz" +MD5SUM="f0cfa15f509a3858ccae94a0d0da3d6a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Erik Hanson" -EMAIL="erik@slackbuilds.org" +MAINTAINER="Zach Lewis" +EMAIL="koni@archlinux.us" diff --git a/system/xbrightness/slack-desc b/system/xbrightness/slack-desc index b99356aace..b3ed334c60 100644 --- a/system/xbrightness/slack-desc +++ b/system/xbrightness/slack-desc @@ -9,10 +9,10 @@ xbrightness: xbrightness (adjusts brightness of the X server display) xbrightness: xbrightness: xbrightness sets the overall brightness of a monitor via the XFree86 -xbrightness: X server video mode extension (XFree86-VidModâ€Extension). +xbrightness: X server video mode extension (XFree86-VidMod-Extension). xbrightness: xbrightness: It uses the XF86VidModeSetGammaRamp function, which provides a -xbrightness: more flexible control than the old XF86VidModeâ€SetGamma. The latter +xbrightness: more flexible control than the old XF86VidMode-SetGamma. The latter xbrightness: function cannot change the endpoints of the gamma curve, only the xbrightness: middle, so full brightness remains full brightness no matter how you xbrightness: set the gamma. diff --git a/system/xcdroast/README b/system/xcdroast/README index b62f6406ea..72bb5a0d7d 100644 --- a/system/xcdroast/README +++ b/system/xcdroast/README @@ -1,6 +1,6 @@ xcdroast (Graphical frontend for cdrtools) -X-CD-Roast tries to be the most flexible CD and DVD burning software -ever. It allows even the unexperienced user to create or copy a CD or -a DVD with a few mouse clicks in a intuitive and nice looking -graphical user interface. +X-CD-Roast tries to be the most flexible CD and DVD burning software +ever. It allows even the unexperienced user to create or copy a CD or a +DVD with a few mouse clicks in a intuitive and nice looking graphical +user interface. diff --git a/system/xcdroast/io_compile.patch b/system/xcdroast/io_compile.patch deleted file mode 100644 index 7285bd335d..0000000000 --- a/system/xcdroast/io_compile.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/io.c.org 2009-02-24 09:38:27.000000000 +0100 -+++ src/io.c 2009-02-24 09:45:18.000000000 +0100 -@@ -1903,7 +1903,8 @@ - } - - strcpy(str,""); -- fgets(str,MAXLINE,fpin); -+ if (fgets(str,MAXLINE,fpin) == NULL) -+ g_error("fgets error\n"); - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); -@@ -4720,7 +4721,7 @@ - dolog(3, "Saving extended output to %s\n", fname); - - /* write to file */ -- fd = open(fname,O_WRONLY | O_CREAT); -+ fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - if (fd < 0) { - g_warning("Can't open file %s for writing\n",fname); - return 1; diff --git a/system/xcdroast/xcdroast.SlackBuild b/system/xcdroast/xcdroast.SlackBuild index 22fcc90522..c0feb67938 100644 --- a/system/xcdroast/xcdroast.SlackBuild +++ b/system/xcdroast/xcdroast.SlackBuild @@ -1,12 +1,35 @@ #!/bin/sh # Slackware build script for xcdroast +# GUI frontend for optical disc authoring. +# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@gmail.com> +# All rights reserved. +# # Written by Georgios Efstathiou gefst@yahoo.com # Heavily based on original slackware script. +# +# 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. + +# Revision date: 2020/Nov/22 PRGNAM=xcdroast -VERSION=${VERSION:-0.98alpha16} +VERSION=${VERSION:-1.19} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -52,14 +75,15 @@ 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/io_compile.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-gtk2 \ --build=$ARCH-slackware-linux @@ -72,17 +96,15 @@ cat $CWD/xcdroast.desktop > $PKG/usr/share/applications/xcdroast.desktop ln -s ../../lib${LIBDIRSUFFIX}/xcdroast/icons/xcdricon.png xcdroast.png ) -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +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 \ - COPYING ChangeLog INSTALL README AUTHORS \ + COPYING ChangeLog INSTALL README AUTHORS NEWS \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/xcdroast/xcdroast.info b/system/xcdroast/xcdroast.info index e0f2ce67ee..3d9e65081c 100644 --- a/system/xcdroast/xcdroast.info +++ b/system/xcdroast/xcdroast.info @@ -1,10 +1,10 @@ PRGNAM="xcdroast" -VERSION="0.98alpha16" +VERSION="1.19" HOMEPAGE="http://www.xcdroast.org/" -DOWNLOAD="http://downloads.sourceforge.net/xcdroast/xcdroast-0.98alpha16.tar.gz" -MD5SUM="bc3d335a30f292067eaaf1ea03ebaf17" +DOWNLOAD="http://downloads.sourceforge.net/xcdroast/xcdroast-1.19.tar.gz" +MD5SUM="435f178db53e14452e923cba6afbb687" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Georgios Efstathiou" -EMAIL="gefst@yahoo.com" +MAINTAINER="Fernando Lopez Jr." +EMAIL="fernando.lopezjr@gmail.com" diff --git a/system/xen/README b/system/xen/README index f5f8c96b6d..2999a8e54d 100644 --- a/system/xen/README +++ b/system/xen/README @@ -7,7 +7,8 @@ Solaris, and various versions of the BSD operating systems. This script has a few optional dependencies: mbootpack - creates LILO compatible kernel images - libssh2 - mostly used by libvirt, enable with USE_LIBSSH2=yes + libssh - mostly used by libvirt, enable with USE_LIBSSH=yes + (previously known as USE_LIBSSH2) ocaml-findlib - autodetected, builds oxenstored binary spice - enable with USE_SPICE=yes @@ -15,6 +16,8 @@ Linking with the stock libraries: bluez - enable with USE_BLUEZ=yes gtk - enable with USE_GTK=yes + audio - enable with USE_AUDIO=yes + (or a comma-delimited list: oss alsa sdl pa) Reading material: diff --git a/system/xen/dom0/README.dom0 b/system/xen/dom0/README.dom0 index 9047c983be..68dbf815fb 100644 --- a/system/xen/dom0/README.dom0 +++ b/system/xen/dom0/README.dom0 @@ -46,7 +46,7 @@ Xen EFI binary. To make things a bit easier, a copy of Xen EFI binary can be found here: - http://slackware.hr/~mario/xen/xen-4.11.1.efi.gz + http://slackware.hr/~mario/xen/xen-4.13.1.efi.gz If an automatic boot to Xen kernel is desired, the binary should be renamed and copied to the following location: /boot/efi/EFI/BOOT/bootx64.efi diff --git a/system/xen/dom0/config-4.4.157-xen.i686 b/system/xen/dom0/config-4.4.240-xen.i686 index 0f409db35c..4bc001ee58 100644 --- a/system/xen/dom0/config-4.4.157-xen.i686 +++ b/system/xen/dom0/config-4.4.240-xen.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.157 Kernel Configuration +# Linux/x86 4.4.240 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -345,6 +345,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m +CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y @@ -354,8 +355,6 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_QUEUED_RWLOCKS=y CONFIG_FREEZER=y @@ -546,6 +545,9 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y # CONFIG_X86_INTEL_MPX is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y # CONFIG_EFI_STUB is not set CONFIG_SECCOMP=y @@ -1550,6 +1552,7 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y @@ -3473,6 +3476,7 @@ CONFIG_N_HDLC=m CONFIG_N_GSM=m CONFIG_TRACE_ROUTER=m CONFIG_TRACE_SINK=m +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y CONFIG_DEVKMEM=y @@ -3553,7 +3557,6 @@ CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m CONFIG_DTLK=m -CONFIG_R3964=m CONFIG_APPLICOM=m CONFIG_SONYPI=m @@ -5124,8 +5127,6 @@ CONFIG_HDMI=y # Console display driver support # CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_MDA_CONSOLE=m CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 @@ -5666,7 +5667,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m CONFIG_USB_LED=m @@ -6669,7 +6669,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -7081,6 +7081,7 @@ CONFIG_TEST_HEXDUMP=m # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_RHASHTABLE is not set +# CONFIG_TEST_HASH is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_DMA_API_DEBUG is not set CONFIG_TEST_LKM=m @@ -7110,6 +7111,7 @@ CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 @@ -7226,7 +7228,7 @@ CONFIG_CRYPTO_VMAC=m # Digest # CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32C_INTEL=y CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y diff --git a/system/xen/dom0/config-4.4.157-xen.x86_64 b/system/xen/dom0/config-4.4.240-xen.x86_64 index 99b7205209..ea3a34d322 100644 --- a/system/xen/dom0/config-4.4.157-xen.x86_64 +++ b/system/xen/dom0/config-4.4.240-xen.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.157 Kernel Configuration +# Linux/x86 4.4.240 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -357,6 +357,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=m +CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y @@ -366,8 +367,6 @@ CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_QUEUED_RWLOCKS=y CONFIG_FREEZER=y @@ -526,6 +525,9 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y # CONFIG_X86_INTEL_MPX is not set +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y @@ -1514,6 +1516,7 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y CONFIG_BT_HCIUART_INTEL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y @@ -3378,6 +3381,7 @@ CONFIG_N_HDLC=m CONFIG_N_GSM=m CONFIG_TRACE_ROUTER=m CONFIG_TRACE_SINK=m +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y CONFIG_DEVKMEM=y @@ -3449,7 +3453,6 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=m -CONFIG_R3964=m CONFIG_APPLICOM=m # @@ -4968,8 +4971,6 @@ CONFIG_HDMI=y # Console display driver support # CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 @@ -5468,7 +5469,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m CONFIG_USB_LED=m @@ -6477,7 +6477,7 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_FANOTIFY=y -# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set @@ -6892,6 +6892,7 @@ CONFIG_TEST_HEXDUMP=m # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_RHASHTABLE is not set +# CONFIG_TEST_HASH is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_DMA_API_DEBUG is not set CONFIG_TEST_LKM=m @@ -6922,6 +6923,7 @@ CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 @@ -7040,7 +7042,7 @@ CONFIG_CRYPTO_VMAC=m # Digest # CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32C_INTEL=y CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF=y diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh index 5c4bf8b459..ce4c95e783 100644 --- a/system/xen/dom0/kernel-xen.sh +++ b/system/xen/dom0/kernel-xen.sh @@ -5,8 +5,8 @@ # Written by Chris Abela <chris.abela@maltats.com>, 20100515 # Modified by Mario Preksavec <mario@slackware.hr> -KERNEL=${KERNEL:-4.4.157} -XEN=${XEN:-4.11.1} +KERNEL=${KERNEL:-4.4.240} +XEN=${XEN:-4.13.1} BOOTLOADER=${BOOTLOADER:-lilo} ROOTMOD=${ROOTMOD:-ext4} diff --git a/system/xen/domU/domU.sh b/system/xen/domU/domU.sh index b9037f4f18..e49e3d58b9 100644 --- a/system/xen/domU/domU.sh +++ b/system/xen/domU/domU.sh @@ -7,7 +7,7 @@ set -e -KERNEL=${KERNEL:-4.4.157} +KERNEL=${KERNEL:-4.4.240} # Build an image for the root file system and another for the swap # Default values : 8GB and 500MB resepectively. diff --git a/system/xen/xen.SlackBuild b/system/xen/xen.SlackBuild index 14d683d841..5c90056af9 100644 --- a/system/xen/xen.SlackBuild +++ b/system/xen/xen.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xen -# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018 Mario Preksavec, Zagreb, Croatia +# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xen -VERSION=${VERSION:-4.11.1} -BUILD=${BUILD:-1} +VERSION=${VERSION:-4.13.1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -SEABIOS=${SEABIOS:-1.11.1} -OVMF=${OVMF:-20170920_947f3737a} -IPXE=${IPXE:-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d} +SEABIOS=${SEABIOS:-1.12.1} +OVMF=${OVMF:-20190606_20d2e5a125} +IPXE=${IPXE:-1dd56dbd11082fb622c2ed21cfaced4f47d798a6} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -90,9 +90,9 @@ EOF esac esac -case "${USE_LIBSSH2:-no}" in - yes) CONF_QEMUU+=" --enable-libssh2" ;; - *) CONF_QEMUU+=" --disable-libssh2" ;; +case "${USE_LIBSSH:-no}" in + yes) CONF_QEMUU+=" --enable-libssh" ;; + *) CONF_QEMUU+=" --disable-libssh" ;; esac case "${USE_BLUEZ:-no}" in @@ -110,6 +110,12 @@ case "${USE_SPICE:-no}" in *) CONF_QEMUU+=" --disable-spice" ;; esac +case "${USE_AUDIO:-no}" in + yes) CONF_QEMUU+="" ;; + no) CONF_QEMUU+=" --audio-drv-list=" ;; + *) CONF_QEMUU+=" --audio-drv-list=$USE_AUDIO" ;; +esac + set -e rm -rf $PKG @@ -142,8 +148,8 @@ cp $CWD/ipxe-git-$IPXE.tar.gz tools/firmware/etherboot/_ipxe.tar.gz ( # Seabios cd tools/firmware - tar -xf $CWD/seabios-$SEABIOS.tar.xz - mv seabios-$SEABIOS seabios-dir-remote + tar -xf $CWD/seabios-$SEABIOS.tar.?z || tar -xf $CWD/seabios-rel-$SEABIOS.tar.?z + mv seabios-$SEABIOS seabios-dir-remote || mv seabios-rel-$SEABIOS seabios-dir-remote ln -s seabios-dir-remote seabios-dir make -C seabios-dir defconfig # OVMF diff --git a/system/xen/xen.info b/system/xen/xen.info index 07fd91f176..c74e7f07d1 100644 --- a/system/xen/xen.info +++ b/system/xen/xen.info @@ -1,8 +1,8 @@ PRGNAM="xen" -VERSION="4.11.1" +VERSION="4.13.1" HOMEPAGE="http://www.xenproject.org/" -DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.11.1.tar.gz \ - http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d.tar.gz \ +DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.13.1.tar.gz \ + http://mirror.slackware.hr/sources/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/lwip-1.3.0.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/zlib-1.2.3.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/newlib-1.16.0.tar.gz \ @@ -11,10 +11,10 @@ DOWNLOAD="http://mirror.slackware.hr/sources/xen/xen-4.11.1.tar.gz \ http://mirror.slackware.hr/sources/xen-extfiles/polarssl-1.1.4-gpl.tgz \ http://mirror.slackware.hr/sources/xen-extfiles/gmp-4.3.2.tar.bz2 \ http://mirror.slackware.hr/sources/xen-extfiles/tpm_emulator-0.7.4.tar.gz \ - http://mirror.slackware.hr/sources/xen-seabios/seabios-1.11.1.tar.xz \ - http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20170920_947f3737a.tar.bz2" -MD5SUM="0c72b97432465e7f81113630fcd6e460 \ - 0061f103c84b25c2e6ac47649b909bde \ + http://mirror.slackware.hr/sources/xen-seabios/seabios-1.12.1.tar.gz \ + http://mirror.slackware.hr/sources/xen-ovmf/xen-ovmf-20190606_20d2e5a125.tar.bz2" +MD5SUM="e26fe8f9ce39463734e6ede45c6e11b8 \ + b3ab0488a989a089207302111d12e1a0 \ 36cc57650cffda9a0269493be2a169bb \ debc62758716a169df9f62e6ab2bc634 \ bf8f1f9e3ca83d732c00a79a6ef29bc4 \ @@ -23,8 +23,8 @@ MD5SUM="0c72b97432465e7f81113630fcd6e460 \ 7b72caf22b01464ee7d6165f2fd85f44 \ dd60683d7057917e34630b4a787932e8 \ e26becb8a6a2b6695f6b3e8097593db8 \ - d63261e22f6423972fd484d995c85f9a \ - 779a40b927fb78a0d1732bb688d7a257" + 6cb6cba431fd725126ddb5ec529ab85c \ + a6063a0d3d45e6f77deea8c80569653e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="acpica yajl" diff --git a/system/xen/xsa/xsa317.patch b/system/xen/xsa/xsa317.patch new file mode 100644 index 0000000000..20e2c643d0 --- /dev/null +++ b/system/xen/xsa/xsa317.patch @@ -0,0 +1,50 @@ +From aeb46e92f915f19a61d5a8a1f4b696793f64e6fb Mon Sep 17 00:00:00 2001 +From: Julien Grall <jgrall@amazon.com> +Date: Thu, 19 Mar 2020 13:17:31 +0000 +Subject: [PATCH] xen/common: event_channel: Don't ignore error in + get_free_port() + +Currently, get_free_port() is assuming that the port has been allocated +when evtchn_allocate_port() is not return -EBUSY. + +However, the function may return an error when: + - We exhausted all the event channels. This can happen if the limit + configured by the administrator for the guest ('max_event_channels' + in xl cfg) is higher than the ABI used by the guest. For instance, + if the guest is using 2L, the limit should not be higher than 4095. + - We cannot allocate memory (e.g Xen has not more memory). + +Users of get_free_port() (such as EVTCHNOP_alloc_unbound) will validly +assuming the port was valid and will next call evtchn_from_port(). This +will result to a crash as the memory backing the event channel structure +is not present. + +Fixes: 368ae9a05fe ("xen/pvshim: forward evtchn ops between L0 Xen and L2 DomU") +Signed-off-by: Julien Grall <jgrall@amazon.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +--- + xen/common/event_channel.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c +index e86e2bfab0..a8d182b584 100644 +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -195,10 +195,10 @@ static int get_free_port(struct domain *d) + { + int rc = evtchn_allocate_port(d, port); + +- if ( rc == -EBUSY ) +- continue; +- +- return port; ++ if ( rc == 0 ) ++ return port; ++ else if ( rc != -EBUSY ) ++ return rc; + } + + return -ENOSPC; +-- +2.17.1 + diff --git a/system/xen/xsa/xsa319.patch b/system/xen/xsa/xsa319.patch new file mode 100644 index 0000000000..769443c900 --- /dev/null +++ b/system/xen/xsa/xsa319.patch @@ -0,0 +1,27 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: x86/shadow: correct an inverted conditional in dirty VRAM tracking + +This originally was "mfn_x(mfn) == INVALID_MFN". Make it like this +again, taking the opportunity to also drop the unnecessary nearby +braces. + +This is XSA-319. + +Fixes: 246a5a3377c2 ("xen: Use a typesafe to define INVALID_MFN") +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> + +--- a/xen/arch/x86/mm/shadow/common.c ++++ b/xen/arch/x86/mm/shadow/common.c +@@ -3252,10 +3252,8 @@ int shadow_track_dirty_vram(struct domai + int dirty = 0; + paddr_t sl1ma = dirty_vram->sl1ma[i]; + +- if ( !mfn_eq(mfn, INVALID_MFN) ) +- { ++ if ( mfn_eq(mfn, INVALID_MFN) ) + dirty = 1; +- } + else + { + page = mfn_to_page(mfn); diff --git a/system/xen/xsa/xsa320-4.13-1.patch b/system/xen/xsa/xsa320-4.13-1.patch new file mode 100644 index 0000000000..09eb8ea98e --- /dev/null +++ b/system/xen/xsa/xsa320-4.13-1.patch @@ -0,0 +1,117 @@ +From: Andrew Cooper <andrew.cooper3@citrix.com> +Subject: x86/spec-ctrl: CPUID/MSR definitions for Special Register Buffer Data Sampling + +This is part of XSA-320 / CVE-2020-0543 + +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +Acked-by: Wei Liu <wl@xen.org> + +diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc +index 1d9d816622..9268454297 100644 +--- a/docs/misc/xen-command-line.pandoc ++++ b/docs/misc/xen-command-line.pandoc +@@ -483,10 +483,10 @@ accounting for hardware capabilities as enumerated via CPUID. + + Currently accepted: + +-The Speculation Control hardware features `md-clear`, `ibrsb`, `stibp`, `ibpb`, +-`l1d-flush` and `ssbd` are used by default if available and applicable. They can +-be ignored, e.g. `no-ibrsb`, at which point Xen won't use them itself, and +-won't offer them to guests. ++The Speculation Control hardware features `srbds-ctrl`, `md-clear`, `ibrsb`, ++`stibp`, `ibpb`, `l1d-flush` and `ssbd` are used by default if available and ++applicable. They can be ignored, e.g. `no-ibrsb`, at which point Xen won't ++use them itself, and won't offer them to guests. + + ### cpuid_mask_cpu + > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b` +diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c +index 6cea4227ba..a78f08b927 100644 +--- a/tools/libxl/libxl_cpuid.c ++++ b/tools/libxl/libxl_cpuid.c +@@ -213,6 +213,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) + + {"avx512-4vnniw",0x00000007, 0, CPUID_REG_EDX, 2, 1}, + {"avx512-4fmaps",0x00000007, 0, CPUID_REG_EDX, 3, 1}, ++ {"srbds-ctrl", 0x00000007, 0, CPUID_REG_EDX, 9, 1}, + {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, + {"cet-ibt", 0x00000007, 0, CPUID_REG_EDX, 20, 1}, + {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, +diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c +index 603e1d65fd..a09440813b 100644 +--- a/tools/misc/xen-cpuid.c ++++ b/tools/misc/xen-cpuid.c +@@ -157,6 +157,7 @@ static const char *const str_7d0[32] = + [ 2] = "avx512_4vnniw", [ 3] = "avx512_4fmaps", + [ 4] = "fsrm", + ++ /* 8 */ [ 9] = "srbds-ctrl", + [10] = "md-clear", + /* 12 */ [13] = "tsx-force-abort", + +diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c +index 4b12103482..0cded3c0ad 100644 +--- a/xen/arch/x86/msr.c ++++ b/xen/arch/x86/msr.c +@@ -134,6 +134,7 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) + /* Write-only */ + case MSR_TSX_FORCE_ABORT: + case MSR_TSX_CTRL: ++ case MSR_MCU_OPT_CTRL: + case MSR_U_CET: + case MSR_S_CET: + case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: +@@ -288,6 +289,7 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) + /* Read-only */ + case MSR_TSX_FORCE_ABORT: + case MSR_TSX_CTRL: ++ case MSR_MCU_OPT_CTRL: + case MSR_U_CET: + case MSR_S_CET: + case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: +diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c +index 6656c44aec..5fc1c6827e 100644 +--- a/xen/arch/x86/spec_ctrl.c ++++ b/xen/arch/x86/spec_ctrl.c +@@ -312,12 +312,13 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) + printk("Speculative mitigation facilities:\n"); + + /* Hardware features which pertain to speculative mitigations. */ +- printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", ++ printk(" Hardware features:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + (_7d0 & cpufeat_mask(X86_FEATURE_IBRSB)) ? " IBRS/IBPB" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_STIBP)) ? " STIBP" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_L1D_FLUSH)) ? " L1D_FLUSH" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_SSBD)) ? " SSBD" : "", + (_7d0 & cpufeat_mask(X86_FEATURE_MD_CLEAR)) ? " MD_CLEAR" : "", ++ (_7d0 & cpufeat_mask(X86_FEATURE_SRBDS_CTRL)) ? " SRBDS_CTRL" : "", + (e8b & cpufeat_mask(X86_FEATURE_IBPB)) ? " IBPB" : "", + (caps & ARCH_CAPS_IBRS_ALL) ? " IBRS_ALL" : "", + (caps & ARCH_CAPS_RDCL_NO) ? " RDCL_NO" : "", +diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h +index 7693c4a71a..91994669e1 100644 +--- a/xen/include/asm-x86/msr-index.h ++++ b/xen/include/asm-x86/msr-index.h +@@ -179,6 +179,9 @@ + #define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x490 + #define MSR_IA32_VMX_VMFUNC 0x491 + ++#define MSR_MCU_OPT_CTRL 0x00000123 ++#define MCU_OPT_CTRL_RNGDS_MITG_DIS (_AC(1, ULL) << 0) ++ + #define MSR_U_CET 0x000006a0 + #define MSR_S_CET 0x000006a2 + #define MSR_PL0_SSP 0x000006a4 +diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h +index 2835688f1c..a2482c3627 100644 +--- a/xen/include/public/arch-x86/cpufeatureset.h ++++ b/xen/include/public/arch-x86/cpufeatureset.h +@@ -252,6 +252,7 @@ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by + /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ + XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ + XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ ++XEN_CPUFEATURE(SRBDS_CTRL, 9*32+ 9) /* MSR_MCU_OPT_CTRL and RNGDS_MITG_DIS. */ + XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffers */ + XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ + XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ diff --git a/system/xen/xsa/xsa320-4.13-2.patch b/system/xen/xsa/xsa320-4.13-2.patch new file mode 100644 index 0000000000..8a8080a312 --- /dev/null +++ b/system/xen/xsa/xsa320-4.13-2.patch @@ -0,0 +1,179 @@ +From: Andrew Cooper <andrew.cooper3@citrix.com> +Subject: x86/spec-ctrl: Mitigate the Special Register Buffer Data Sampling sidechannel + +See patch documentation and comments. + +This is part of XSA-320 / CVE-2020-0543 + +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc +index 9268454297..c780312531 100644 +--- a/docs/misc/xen-command-line.pandoc ++++ b/docs/misc/xen-command-line.pandoc +@@ -1991,7 +1991,7 @@ By default SSBD will be mitigated at runtime (i.e `ssbd=runtime`). + ### spec-ctrl (x86) + > `= List of [ <bool>, xen=<bool>, {pv,hvm,msr-sc,rsb,md-clear}=<bool>, + > bti-thunk=retpoline|lfence|jmp, {ibrs,ibpb,ssbd,eager-fpu, +-> l1d-flush,branch-harden}=<bool> ]` ++> l1d-flush,branch-harden,srb-lock}=<bool> ]` + + Controls for speculative execution sidechannel mitigations. By default, Xen + will pick the most appropriate mitigations based on compiled in support, +@@ -2068,6 +2068,12 @@ If Xen is compiled with `CONFIG_SPECULATIVE_HARDEN_BRANCH`, the + speculation barriers to protect selected conditional branches. By default, + Xen will enable this mitigation. + ++On hardware supporting SRBDS_CTRL, the `srb-lock=` option can be used to force ++or prevent Xen from protect the Special Register Buffer from leaking stale ++data. By default, Xen will enable this mitigation, except on parts where MDS ++is fixed and TAA is fixed/mitigated (in which case, there is believed to be no ++way for an attacker to obtain the stale data). ++ + ### sync_console + > `= <boolean>` + +diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c +index feb0f6ce20..75c6e34164 100644 +--- a/xen/arch/x86/acpi/power.c ++++ b/xen/arch/x86/acpi/power.c +@@ -295,6 +295,9 @@ static int enter_state(u32 state) + ci->spec_ctrl_flags |= (default_spec_ctrl_flags & SCF_ist_wrmsr); + spec_ctrl_exit_idle(ci); + ++ if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) ) ++ wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl); ++ + done: + spin_debug_enable(); + local_irq_restore(flags); +diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c +index dc8fdac1a1..b1e51b3aff 100644 +--- a/xen/arch/x86/smpboot.c ++++ b/xen/arch/x86/smpboot.c +@@ -361,12 +361,14 @@ void start_secondary(void *unused) + microcode_update_one(false); + + /* +- * If MSR_SPEC_CTRL is available, apply Xen's default setting and discard +- * any firmware settings. Note: MSR_SPEC_CTRL may only become available +- * after loading microcode. ++ * If any speculative control MSRs are available, apply Xen's default ++ * settings. Note: These MSRs may only become available after loading ++ * microcode. + */ + if ( boot_cpu_has(X86_FEATURE_IBRSB) ) + wrmsrl(MSR_SPEC_CTRL, default_xen_spec_ctrl); ++ if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) ) ++ wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl); + + tsx_init(); /* Needs microcode. May change HLE/RTM feature bits. */ + +diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c +index 5fc1c6827e..33343062a7 100644 +--- a/xen/arch/x86/spec_ctrl.c ++++ b/xen/arch/x86/spec_ctrl.c +@@ -65,6 +65,9 @@ static unsigned int __initdata l1d_maxphysaddr; + static bool __initdata cpu_has_bug_msbds_only; /* => minimal HT impact. */ + static bool __initdata cpu_has_bug_mds; /* Any other M{LP,SB,FB}DS combination. */ + ++static int8_t __initdata opt_srb_lock = -1; ++uint64_t __read_mostly default_xen_mcu_opt_ctrl; ++ + static int __init parse_spec_ctrl(const char *s) + { + const char *ss; +@@ -112,6 +115,7 @@ static int __init parse_spec_ctrl(const char *s) + opt_ssbd = false; + opt_l1d_flush = 0; + opt_branch_harden = false; ++ opt_srb_lock = 0; + } + else if ( val > 0 ) + rc = -EINVAL; +@@ -178,6 +182,8 @@ static int __init parse_spec_ctrl(const char *s) + opt_l1d_flush = val; + else if ( (val = parse_boolean("branch-harden", s, ss)) >= 0 ) + opt_branch_harden = val; ++ else if ( (val = parse_boolean("srb-lock", s, ss)) >= 0 ) ++ opt_srb_lock = val; + else + rc = -EINVAL; + +@@ -341,7 +347,7 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) + "\n"); + + /* Settings for Xen's protection, irrespective of guests. */ +- printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s, Other:%s%s%s%s\n", ++ printk(" Xen settings: BTI-Thunk %s, SPEC_CTRL: %s%s%s, Other:%s%s%s%s%s\n", + thunk == THUNK_NONE ? "N/A" : + thunk == THUNK_RETPOLINE ? "RETPOLINE" : + thunk == THUNK_LFENCE ? "LFENCE" : +@@ -352,6 +358,8 @@ static void __init print_details(enum ind_thunk thunk, uint64_t caps) + (default_xen_spec_ctrl & SPEC_CTRL_SSBD) ? " SSBD+" : " SSBD-", + !(caps & ARCH_CAPS_TSX_CTRL) ? "" : + (opt_tsx & 1) ? " TSX+" : " TSX-", ++ !boot_cpu_has(X86_FEATURE_SRBDS_CTRL) ? "" : ++ opt_srb_lock ? " SRB_LOCK+" : " SRB_LOCK-", + opt_ibpb ? " IBPB" : "", + opt_l1d_flush ? " L1D_FLUSH" : "", + opt_md_clear_pv || opt_md_clear_hvm ? " VERW" : "", +@@ -1149,6 +1157,34 @@ void __init init_speculation_mitigations(void) + tsx_init(); + } + ++ /* Calculate suitable defaults for MSR_MCU_OPT_CTRL */ ++ if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) ) ++ { ++ uint64_t val; ++ ++ rdmsrl(MSR_MCU_OPT_CTRL, val); ++ ++ /* ++ * On some SRBDS-affected hardware, it may be safe to relax srb-lock ++ * by default. ++ * ++ * On parts which enumerate MDS_NO and not TAA_NO, TSX is the only way ++ * to access the Fill Buffer. If TSX isn't available (inc. SKU ++ * reasons on some models), or TSX is explicitly disabled, then there ++ * is no need for the extra overhead to protect RDRAND/RDSEED. ++ */ ++ if ( opt_srb_lock == -1 && ++ (caps & (ARCH_CAPS_MDS_NO|ARCH_CAPS_TAA_NO)) == ARCH_CAPS_MDS_NO && ++ (!cpu_has_hle || ((caps & ARCH_CAPS_TSX_CTRL) && opt_tsx == 0)) ) ++ opt_srb_lock = 0; ++ ++ val &= ~MCU_OPT_CTRL_RNGDS_MITG_DIS; ++ if ( !opt_srb_lock ) ++ val |= MCU_OPT_CTRL_RNGDS_MITG_DIS; ++ ++ default_xen_mcu_opt_ctrl = val; ++ } ++ + print_details(thunk, caps); + + /* +@@ -1180,6 +1216,9 @@ void __init init_speculation_mitigations(void) + + wrmsrl(MSR_SPEC_CTRL, bsp_delay_spec_ctrl ? 0 : default_xen_spec_ctrl); + } ++ ++ if ( boot_cpu_has(X86_FEATURE_SRBDS_CTRL) ) ++ wrmsrl(MSR_MCU_OPT_CTRL, default_xen_mcu_opt_ctrl); + } + + static void __init __maybe_unused build_assertions(void) +diff --git a/xen/include/asm-x86/spec_ctrl.h b/xen/include/asm-x86/spec_ctrl.h +index 9caecddfec..b252bb8631 100644 +--- a/xen/include/asm-x86/spec_ctrl.h ++++ b/xen/include/asm-x86/spec_ctrl.h +@@ -54,6 +54,8 @@ extern int8_t opt_pv_l1tf_hwdom, opt_pv_l1tf_domu; + */ + extern paddr_t l1tf_addr_mask, l1tf_safe_maddr; + ++extern uint64_t default_xen_mcu_opt_ctrl; ++ + static inline void init_shadow_spec_ctrl_state(void) + { + struct cpu_info *info = get_cpu_info(); diff --git a/system/xen/xsa/xsa320-4.13-3.patch b/system/xen/xsa/xsa320-4.13-3.patch new file mode 100644 index 0000000000..b52eeb338a --- /dev/null +++ b/system/xen/xsa/xsa320-4.13-3.patch @@ -0,0 +1,36 @@ +From: Andrew Cooper <andrew.cooper3@citrix.com> +Subject: x86/spec-ctrl: Update docs with SRBDS workaround + +RDRAND/RDSEED can be hidden using cpuid= to mitigate SRBDS if microcode +isn't available. + +This is part of XSA-320 / CVE-2020-0543. + +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Acked-by: Julien Grall <jgrall@amazon.com> + +diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc +index c780312531..81e12d053c 100644 +--- a/docs/misc/xen-command-line.pandoc ++++ b/docs/misc/xen-command-line.pandoc +@@ -481,12 +481,18 @@ choice of `dom0-kernel` is deprecated and not supported by all Dom0 kernels. + This option allows for fine tuning of the facilities Xen will use, after + accounting for hardware capabilities as enumerated via CPUID. + ++Unless otherwise noted, options only have any effect in their negative form, ++to hide the named feature(s). Ignoring a feature using this mechanism will ++cause Xen not to use the feature, nor offer them as usable to guests. ++ + Currently accepted: + + The Speculation Control hardware features `srbds-ctrl`, `md-clear`, `ibrsb`, + `stibp`, `ibpb`, `l1d-flush` and `ssbd` are used by default if available and +-applicable. They can be ignored, e.g. `no-ibrsb`, at which point Xen won't +-use them itself, and won't offer them to guests. ++applicable. They can all be ignored. ++ ++`rdrand` and `rdseed` can be ignored, as a mitigation to XSA-320 / ++CVE-2020-0543. + + ### cpuid_mask_cpu + > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b` diff --git a/system/xen/xsa/xsa327.patch b/system/xen/xsa/xsa327.patch new file mode 100644 index 0000000000..0541cfa0df --- /dev/null +++ b/system/xen/xsa/xsa327.patch @@ -0,0 +1,63 @@ +From 030300ebbb86c40c12db038714479d746167c767 Mon Sep 17 00:00:00 2001 +From: Julien Grall <jgrall@amazon.com> +Date: Tue, 26 May 2020 18:31:33 +0100 +Subject: [PATCH] xen: Check the alignment of the offset pased via + VCPUOP_register_vcpu_info + +Currently a guest is able to register any guest physical address to use +for the vcpu_info structure as long as the structure can fits in the +rest of the frame. + +This means a guest can provide an address that is not aligned to the +natural alignment of the structure. + +On Arm 32-bit, unaligned access are completely forbidden by the +hypervisor. This will result to a data abort which is fatal. + +On Arm 64-bit, unaligned access are only forbidden when used for atomic +access. As the structure contains fields (such as evtchn_pending_self) +that are updated using atomic operations, any unaligned access will be +fatal as well. + +While the misalignment is only fatal on Arm, a generic check is added +as an x86 guest shouldn't sensibly pass an unaligned address (this +would result to a split lock). + +This is XSA-327. + +Reported-by: Julien Grall <jgrall@amazon.com> +Signed-off-by: Julien Grall <jgrall@amazon.com> +Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> +--- + xen/common/domain.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/xen/common/domain.c b/xen/common/domain.c +index 7cc9526139a6..e9be05f1d05f 100644 +--- a/xen/common/domain.c ++++ b/xen/common/domain.c +@@ -1227,10 +1227,20 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset) + void *mapping; + vcpu_info_t *new_info; + struct page_info *page; ++ unsigned int align; + + if ( offset > (PAGE_SIZE - sizeof(vcpu_info_t)) ) + return -EINVAL; + ++#ifdef CONFIG_COMPAT ++ if ( has_32bit_shinfo(d) ) ++ align = alignof(new_info->compat); ++ else ++#endif ++ align = alignof(*new_info); ++ if ( offset & (align - 1) ) ++ return -EINVAL; ++ + if ( !mfn_eq(v->vcpu_info_mfn, INVALID_MFN) ) + return -EINVAL; + +-- +2.17.1 + diff --git a/system/xen/xsa/xsa328-4.13-1.patch b/system/xen/xsa/xsa328-4.13-1.patch new file mode 100644 index 0000000000..56e48de3e9 --- /dev/null +++ b/system/xen/xsa/xsa328-4.13-1.patch @@ -0,0 +1,118 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: x86/EPT: ept_set_middle_entry() related adjustments + +ept_split_super_page() wants to further modify the newly allocated +table, so have ept_set_middle_entry() return the mapped pointer rather +than tearing it down and then getting re-established right again. + +Similarly ept_next_level() wants to hand back a mapped pointer of +the next level page, so re-use the one established by +ept_set_middle_entry() in case that path was taken. + +Pull the setting of suppress_ve ahead of insertion into the higher level +table, and don't have ept_split_super_page() set the field a 2nd time. + +This is part of XSA-328. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/arch/x86/mm/p2m-ept.c ++++ b/xen/arch/x86/mm/p2m-ept.c +@@ -187,8 +187,9 @@ static void ept_p2m_type_to_flags(struct + #define GUEST_TABLE_SUPER_PAGE 2 + #define GUEST_TABLE_POD_PAGE 3 + +-/* Fill in middle levels of ept table */ +-static int ept_set_middle_entry(struct p2m_domain *p2m, ept_entry_t *ept_entry) ++/* Fill in middle level of ept table; return pointer to mapped new table. */ ++static ept_entry_t *ept_set_middle_entry(struct p2m_domain *p2m, ++ ept_entry_t *ept_entry) + { + mfn_t mfn; + ept_entry_t *table; +@@ -196,7 +197,12 @@ static int ept_set_middle_entry(struct p + + mfn = p2m_alloc_ptp(p2m, 0); + if ( mfn_eq(mfn, INVALID_MFN) ) +- return 0; ++ return NULL; ++ ++ table = map_domain_page(mfn); ++ ++ for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ ) ++ table[i].suppress_ve = 1; + + ept_entry->epte = 0; + ept_entry->mfn = mfn_x(mfn); +@@ -208,14 +214,7 @@ static int ept_set_middle_entry(struct p + + ept_entry->suppress_ve = 1; + +- table = map_domain_page(mfn); +- +- for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ ) +- table[i].suppress_ve = 1; +- +- unmap_domain_page(table); +- +- return 1; ++ return table; + } + + /* free ept sub tree behind an entry */ +@@ -253,10 +252,10 @@ static bool_t ept_split_super_page(struc + + ASSERT(is_epte_superpage(ept_entry)); + +- if ( !ept_set_middle_entry(p2m, &new_ept) ) ++ table = ept_set_middle_entry(p2m, &new_ept); ++ if ( !table ) + return 0; + +- table = map_domain_page(_mfn(new_ept.mfn)); + trunk = 1UL << ((level - 1) * EPT_TABLE_ORDER); + + for ( i = 0; i < EPT_PAGETABLE_ENTRIES; i++ ) +@@ -267,7 +266,6 @@ static bool_t ept_split_super_page(struc + epte->sp = (level > 1); + epte->mfn += i * trunk; + epte->snp = is_iommu_enabled(p2m->domain) && iommu_snoop; +- epte->suppress_ve = 1; + + ept_p2m_type_to_flags(p2m, epte, epte->sa_p2mt, epte->access); + +@@ -306,8 +304,7 @@ static int ept_next_level(struct p2m_dom + ept_entry_t **table, unsigned long *gfn_remainder, + int next_level) + { +- unsigned long mfn; +- ept_entry_t *ept_entry, e; ++ ept_entry_t *ept_entry, *next = NULL, e; + u32 shift, index; + + shift = next_level * EPT_TABLE_ORDER; +@@ -332,19 +329,17 @@ static int ept_next_level(struct p2m_dom + if ( read_only ) + return GUEST_TABLE_MAP_FAILED; + +- if ( !ept_set_middle_entry(p2m, ept_entry) ) ++ next = ept_set_middle_entry(p2m, ept_entry); ++ if ( !next ) + return GUEST_TABLE_MAP_FAILED; +- else +- e = atomic_read_ept_entry(ept_entry); /* Refresh */ ++ /* e is now stale and hence may not be used anymore below. */ + } +- + /* The only time sp would be set here is if we had hit a superpage */ +- if ( is_epte_superpage(&e) ) ++ else if ( is_epte_superpage(&e) ) + return GUEST_TABLE_SUPER_PAGE; + +- mfn = e.mfn; + unmap_domain_page(*table); +- *table = map_domain_page(_mfn(mfn)); ++ *table = next ?: map_domain_page(_mfn(e.mfn)); + *gfn_remainder &= (1UL << shift) - 1; + return GUEST_TABLE_NORMAL_PAGE; + } diff --git a/system/xen/xsa/xsa328-4.13-2.patch b/system/xen/xsa/xsa328-4.13-2.patch new file mode 100644 index 0000000000..c4f437f625 --- /dev/null +++ b/system/xen/xsa/xsa328-4.13-2.patch @@ -0,0 +1,48 @@ +From: <security@xenproject.org> +Subject: x86/ept: atomically modify entries in ept_next_level + +ept_next_level was passing a live PTE pointer to ept_set_middle_entry, +which was then modified without taking into account that the PTE could +be part of a live EPT table. This wasn't a security issue because the +pages returned by p2m_alloc_ptp are zeroed, so adding such an entry +before actually initializing it didn't allow a guest to access +physical memory addresses it wasn't supposed to access. + +This is part of XSA-328. + +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/arch/x86/mm/p2m-ept.c ++++ b/xen/arch/x86/mm/p2m-ept.c +@@ -307,6 +307,8 @@ static int ept_next_level(struct p2m_dom + ept_entry_t *ept_entry, *next = NULL, e; + u32 shift, index; + ++ ASSERT(next_level); ++ + shift = next_level * EPT_TABLE_ORDER; + + index = *gfn_remainder >> shift; +@@ -323,16 +325,20 @@ static int ept_next_level(struct p2m_dom + + if ( !is_epte_present(&e) ) + { ++ int rc; ++ + if ( e.sa_p2mt == p2m_populate_on_demand ) + return GUEST_TABLE_POD_PAGE; + + if ( read_only ) + return GUEST_TABLE_MAP_FAILED; + +- next = ept_set_middle_entry(p2m, ept_entry); ++ next = ept_set_middle_entry(p2m, &e); + if ( !next ) + return GUEST_TABLE_MAP_FAILED; +- /* e is now stale and hence may not be used anymore below. */ ++ ++ rc = atomic_write_ept_entry(p2m, ept_entry, e, next_level); ++ ASSERT(rc == 0); + } + /* The only time sp would be set here is if we had hit a superpage */ + else if ( is_epte_superpage(&e) ) diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch new file mode 100644 index 0000000000..9a08ab240e --- /dev/null +++ b/system/xen/xsa/xsa328-post-xsa321-4.13-1.patch @@ -0,0 +1,31 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: vtd: improve IOMMU TLB flush + +Do not limit PSI flushes to order 0 pages, in order to avoid doing a +full TLB flush if the passed in page has an order greater than 0 and +is aligned. Should increase the performance of IOMMU TLB flushes when +dealing with page orders greater than 0. + +This is part of XSA-321. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/drivers/passthrough/vtd/iommu.c ++++ b/xen/drivers/passthrough/vtd/iommu.c +@@ -570,13 +570,14 @@ static int __must_check iommu_flush_iotl + if ( iommu_domid == -1 ) + continue; + +- if ( page_count != 1 || dfn_eq(dfn, INVALID_DFN) ) ++ if ( !page_count || (page_count & (page_count - 1)) || ++ dfn_eq(dfn, INVALID_DFN) || !IS_ALIGNED(dfn_x(dfn), page_count) ) + rc = iommu_flush_iotlb_dsi(iommu, iommu_domid, + 0, flush_dev_iotlb); + else + rc = iommu_flush_iotlb_psi(iommu, iommu_domid, + dfn_to_daddr(dfn), +- PAGE_ORDER_4K, ++ get_order_from_pages(page_count), + !dma_old_pte_present, + flush_dev_iotlb); + diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch new file mode 100644 index 0000000000..1e48615f2b --- /dev/null +++ b/system/xen/xsa/xsa328-post-xsa321-4.13-2.patch @@ -0,0 +1,175 @@ +From: <security@xenproject.org> +Subject: vtd: prune (and rename) cache flush functions + +Rename __iommu_flush_cache to iommu_sync_cache and remove +iommu_flush_cache_page. Also remove the iommu_flush_cache_entry +wrapper and just use iommu_sync_cache instead. Note the _entry suffix +was meaningless as the wrapper was already taking a size parameter in +bytes. While there also constify the addr parameter. + +No functional change intended. + +This is part of XSA-321. + +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/drivers/passthrough/vtd/extern.h ++++ b/xen/drivers/passthrough/vtd/extern.h +@@ -43,8 +43,7 @@ void disable_qinval(struct vtd_iommu *io + int enable_intremap(struct vtd_iommu *iommu, int eim); + void disable_intremap(struct vtd_iommu *iommu); + +-void iommu_flush_cache_entry(void *addr, unsigned int size); +-void iommu_flush_cache_page(void *addr, unsigned long npages); ++void iommu_sync_cache(const void *addr, unsigned int size); + int iommu_alloc(struct acpi_drhd_unit *drhd); + void iommu_free(struct acpi_drhd_unit *drhd); + +--- a/xen/drivers/passthrough/vtd/intremap.c ++++ b/xen/drivers/passthrough/vtd/intremap.c +@@ -230,7 +230,7 @@ static void free_remap_entry(struct vtd_ + iremap_entries, iremap_entry); + + update_irte(iommu, iremap_entry, &new_ire, false); +- iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry)); ++ iommu_sync_cache(iremap_entry, sizeof(*iremap_entry)); + iommu_flush_iec_index(iommu, 0, index); + + unmap_vtd_domain_page(iremap_entries); +@@ -406,7 +406,7 @@ static int ioapic_rte_to_remap_entry(str + } + + update_irte(iommu, iremap_entry, &new_ire, !init); +- iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry)); ++ iommu_sync_cache(iremap_entry, sizeof(*iremap_entry)); + iommu_flush_iec_index(iommu, 0, index); + + unmap_vtd_domain_page(iremap_entries); +@@ -695,7 +695,7 @@ static int msi_msg_to_remap_entry( + update_irte(iommu, iremap_entry, &new_ire, msi_desc->irte_initialized); + msi_desc->irte_initialized = true; + +- iommu_flush_cache_entry(iremap_entry, sizeof(*iremap_entry)); ++ iommu_sync_cache(iremap_entry, sizeof(*iremap_entry)); + iommu_flush_iec_index(iommu, 0, index); + + unmap_vtd_domain_page(iremap_entries); +--- a/xen/drivers/passthrough/vtd/iommu.c ++++ b/xen/drivers/passthrough/vtd/iommu.c +@@ -140,7 +140,8 @@ static int context_get_domain_id(struct + } + + static int iommus_incoherent; +-static void __iommu_flush_cache(void *addr, unsigned int size) ++ ++void iommu_sync_cache(const void *addr, unsigned int size) + { + int i; + static unsigned int clflush_size = 0; +@@ -155,16 +156,6 @@ static void __iommu_flush_cache(void *ad + cacheline_flush((char *)addr + i); + } + +-void iommu_flush_cache_entry(void *addr, unsigned int size) +-{ +- __iommu_flush_cache(addr, size); +-} +- +-void iommu_flush_cache_page(void *addr, unsigned long npages) +-{ +- __iommu_flush_cache(addr, PAGE_SIZE * npages); +-} +- + /* Allocate page table, return its machine address */ + uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node) + { +@@ -183,7 +174,7 @@ uint64_t alloc_pgtable_maddr(unsigned lo + vaddr = __map_domain_page(cur_pg); + memset(vaddr, 0, PAGE_SIZE); + +- iommu_flush_cache_page(vaddr, 1); ++ iommu_sync_cache(vaddr, PAGE_SIZE); + unmap_domain_page(vaddr); + cur_pg++; + } +@@ -216,7 +207,7 @@ static u64 bus_to_context_maddr(struct v + } + set_root_value(*root, maddr); + set_root_present(*root); +- iommu_flush_cache_entry(root, sizeof(struct root_entry)); ++ iommu_sync_cache(root, sizeof(struct root_entry)); + } + maddr = (u64) get_context_addr(*root); + unmap_vtd_domain_page(root_entries); +@@ -263,7 +254,7 @@ static u64 addr_to_dma_page_maddr(struct + */ + dma_set_pte_readable(*pte); + dma_set_pte_writable(*pte); +- iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); ++ iommu_sync_cache(pte, sizeof(struct dma_pte)); + } + + if ( level == 2 ) +@@ -640,7 +631,7 @@ static int __must_check dma_pte_clear_on + *flush_flags |= IOMMU_FLUSHF_modified; + + spin_unlock(&hd->arch.mapping_lock); +- iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); ++ iommu_sync_cache(pte, sizeof(struct dma_pte)); + + unmap_vtd_domain_page(page); + +@@ -679,7 +670,7 @@ static void iommu_free_page_table(struct + iommu_free_pagetable(dma_pte_addr(*pte), next_level); + + dma_clear_pte(*pte); +- iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); ++ iommu_sync_cache(pte, sizeof(struct dma_pte)); + } + + unmap_vtd_domain_page(pt_vaddr); +@@ -1400,7 +1391,7 @@ int domain_context_mapping_one( + context_set_address_width(*context, agaw); + context_set_fault_enable(*context); + context_set_present(*context); +- iommu_flush_cache_entry(context, sizeof(struct context_entry)); ++ iommu_sync_cache(context, sizeof(struct context_entry)); + spin_unlock(&iommu->lock); + + /* Context entry was previously non-present (with domid 0). */ +@@ -1564,7 +1555,7 @@ int domain_context_unmap_one( + + context_clear_present(*context); + context_clear_entry(*context); +- iommu_flush_cache_entry(context, sizeof(struct context_entry)); ++ iommu_sync_cache(context, sizeof(struct context_entry)); + + iommu_domid= domain_iommu_domid(domain, iommu); + if ( iommu_domid == -1 ) +@@ -1791,7 +1782,7 @@ static int __must_check intel_iommu_map_ + + *pte = new; + +- iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); ++ iommu_sync_cache(pte, sizeof(struct dma_pte)); + spin_unlock(&hd->arch.mapping_lock); + unmap_vtd_domain_page(page); + +@@ -1866,7 +1857,7 @@ int iommu_pte_flush(struct domain *d, ui + int iommu_domid; + int rc = 0; + +- iommu_flush_cache_entry(pte, sizeof(struct dma_pte)); ++ iommu_sync_cache(pte, sizeof(struct dma_pte)); + + for_each_drhd_unit ( drhd ) + { +@@ -2724,7 +2715,7 @@ static int __init intel_iommu_quarantine + dma_set_pte_addr(*pte, maddr); + dma_set_pte_readable(*pte); + } +- iommu_flush_cache_page(parent, 1); ++ iommu_sync_cache(parent, PAGE_SIZE); + + unmap_vtd_domain_page(parent); + parent = map_vtd_domain_page(maddr); diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch new file mode 100644 index 0000000000..c141c4b785 --- /dev/null +++ b/system/xen/xsa/xsa328-post-xsa321-4.13-3.patch @@ -0,0 +1,82 @@ +From: <security@xenproject.org> +Subject: x86/iommu: introduce a cache sync hook + +The hook is only implemented for VT-d and it uses the already existing +iommu_sync_cache function present in VT-d code. The new hook is +added so that the cache can be flushed by code outside of VT-d when +using shared page tables. + +Note that alloc_pgtable_maddr must use the now locally defined +sync_cache function, because IOMMU ops are not yet setup the first +time the function gets called during IOMMU initialization. + +No functional change intended. + +This is part of XSA-321. + +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/drivers/passthrough/vtd/extern.h ++++ b/xen/drivers/passthrough/vtd/extern.h +@@ -43,7 +43,6 @@ void disable_qinval(struct vtd_iommu *io + int enable_intremap(struct vtd_iommu *iommu, int eim); + void disable_intremap(struct vtd_iommu *iommu); + +-void iommu_sync_cache(const void *addr, unsigned int size); + int iommu_alloc(struct acpi_drhd_unit *drhd); + void iommu_free(struct acpi_drhd_unit *drhd); + +--- a/xen/drivers/passthrough/vtd/iommu.c ++++ b/xen/drivers/passthrough/vtd/iommu.c +@@ -141,7 +141,7 @@ static int context_get_domain_id(struct + + static int iommus_incoherent; + +-void iommu_sync_cache(const void *addr, unsigned int size) ++static void sync_cache(const void *addr, unsigned int size) + { + int i; + static unsigned int clflush_size = 0; +@@ -174,7 +174,7 @@ uint64_t alloc_pgtable_maddr(unsigned lo + vaddr = __map_domain_page(cur_pg); + memset(vaddr, 0, PAGE_SIZE); + +- iommu_sync_cache(vaddr, PAGE_SIZE); ++ sync_cache(vaddr, PAGE_SIZE); + unmap_domain_page(vaddr); + cur_pg++; + } +@@ -2763,6 +2763,7 @@ const struct iommu_ops __initconstrel in + .iotlb_flush_all = iommu_flush_iotlb_all, + .get_reserved_device_memory = intel_iommu_get_reserved_device_memory, + .dump_p2m_table = vtd_dump_p2m_table, ++ .sync_cache = sync_cache, + }; + + const struct iommu_init_ops __initconstrel intel_iommu_init_ops = { +--- a/xen/include/asm-x86/iommu.h ++++ b/xen/include/asm-x86/iommu.h +@@ -121,6 +121,13 @@ extern bool untrusted_msi; + int pi_update_irte(const struct pi_desc *pi_desc, const struct pirq *pirq, + const uint8_t gvec); + ++#define iommu_sync_cache(addr, size) ({ \ ++ const struct iommu_ops *ops = iommu_get_ops(); \ ++ \ ++ if ( ops->sync_cache ) \ ++ iommu_vcall(ops, sync_cache, addr, size); \ ++}) ++ + #endif /* !__ARCH_X86_IOMMU_H__ */ + /* + * Local variables: +--- a/xen/include/xen/iommu.h ++++ b/xen/include/xen/iommu.h +@@ -250,6 +250,7 @@ struct iommu_ops { + int (*setup_hpet_msi)(struct msi_desc *); + + int (*adjust_irq_affinities)(void); ++ void (*sync_cache)(const void *addr, unsigned int size); + #endif /* CONFIG_X86 */ + + int __must_check (*suspend)(void); diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch new file mode 100644 index 0000000000..62bbcc7271 --- /dev/null +++ b/system/xen/xsa/xsa328-post-xsa321-4.13-4.patch @@ -0,0 +1,36 @@ +From: <security@xenproject.org> +Subject: vtd: don't assume addresses are aligned in sync_cache + +Current code in sync_cache assume that the address passed in is +aligned to a cache line size. Fix the code to support passing in +arbitrary addresses not necessarily aligned to a cache line size. + +This is part of XSA-321. + +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/drivers/passthrough/vtd/iommu.c ++++ b/xen/drivers/passthrough/vtd/iommu.c +@@ -143,8 +143,8 @@ static int iommus_incoherent; + + static void sync_cache(const void *addr, unsigned int size) + { +- int i; +- static unsigned int clflush_size = 0; ++ static unsigned long clflush_size = 0; ++ const void *end = addr + size; + + if ( !iommus_incoherent ) + return; +@@ -152,8 +152,9 @@ static void sync_cache(const void *addr, + if ( clflush_size == 0 ) + clflush_size = get_cache_line_size(); + +- for ( i = 0; i < size; i += clflush_size ) +- cacheline_flush((char *)addr + i); ++ addr -= (unsigned long)addr & (clflush_size - 1); ++ for ( ; addr < end; addr += clflush_size ) ++ cacheline_flush((char *)addr); + } + + /* Allocate page table, return its machine address */ diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch new file mode 100644 index 0000000000..60cfe6ccdf --- /dev/null +++ b/system/xen/xsa/xsa328-post-xsa321-4.13-5.patch @@ -0,0 +1,24 @@ +From: <security@xenproject.org> +Subject: x86/alternative: introduce alternative_2 + +It's based on alternative_io_2 without inputs or outputs but with an +added memory clobber. + +This is part of XSA-321. + +Acked-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/include/asm-x86/alternative.h ++++ b/xen/include/asm-x86/alternative.h +@@ -114,6 +114,11 @@ extern void alternative_branches(void); + #define alternative(oldinstr, newinstr, feature) \ + asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) : : : "memory") + ++#define alternative_2(oldinstr, newinstr1, feature1, newinstr2, feature2) \ ++ asm volatile (ALTERNATIVE_2(oldinstr, newinstr1, feature1, \ ++ newinstr2, feature2) \ ++ : : : "memory") ++ + /* + * Alternative inline assembly with input. + * diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch new file mode 100644 index 0000000000..4c5c5ab0ba --- /dev/null +++ b/system/xen/xsa/xsa328-post-xsa321-4.13-6.patch @@ -0,0 +1,91 @@ +From: <security@xenproject.org> +Subject: vtd: optimize CPU cache sync + +Some VT-d IOMMUs are non-coherent, which requires a cache write back +in order for the changes made by the CPU to be visible to the IOMMU. +This cache write back was unconditionally done using clflush, but there are +other more efficient instructions to do so, hence implement support +for them using the alternative framework. + +This is part of XSA-321. + +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/drivers/passthrough/vtd/extern.h ++++ b/xen/drivers/passthrough/vtd/extern.h +@@ -68,7 +68,6 @@ int __must_check qinval_device_iotlb_syn + u16 did, u16 size, u64 addr); + + unsigned int get_cache_line_size(void); +-void cacheline_flush(char *); + void flush_all_cache(void); + + uint64_t alloc_pgtable_maddr(unsigned long npages, nodeid_t node); +--- a/xen/drivers/passthrough/vtd/iommu.c ++++ b/xen/drivers/passthrough/vtd/iommu.c +@@ -31,6 +31,7 @@ + #include <xen/pci_regs.h> + #include <xen/keyhandler.h> + #include <asm/msi.h> ++#include <asm/nops.h> + #include <asm/irq.h> + #include <asm/hvm/vmx/vmx.h> + #include <asm/p2m.h> +@@ -154,7 +155,42 @@ static void sync_cache(const void *addr, + + addr -= (unsigned long)addr & (clflush_size - 1); + for ( ; addr < end; addr += clflush_size ) +- cacheline_flush((char *)addr); ++/* ++ * The arguments to a macro must not include preprocessor directives. Doing so ++ * results in undefined behavior, so we have to create some defines here in ++ * order to avoid it. ++ */ ++#if defined(HAVE_AS_CLWB) ++# define CLWB_ENCODING "clwb %[p]" ++#elif defined(HAVE_AS_XSAVEOPT) ++# define CLWB_ENCODING "data16 xsaveopt %[p]" /* clwb */ ++#else ++# define CLWB_ENCODING ".byte 0x66, 0x0f, 0xae, 0x30" /* clwb (%%rax) */ ++#endif ++ ++#define BASE_INPUT(addr) [p] "m" (*(const char *)(addr)) ++#if defined(HAVE_AS_CLWB) || defined(HAVE_AS_XSAVEOPT) ++# define INPUT BASE_INPUT ++#else ++# define INPUT(addr) "a" (addr), BASE_INPUT(addr) ++#endif ++ /* ++ * Note regarding the use of NOP_DS_PREFIX: it's faster to do a clflush ++ * + prefix than a clflush + nop, and hence the prefix is added instead ++ * of letting the alternative framework fill the gap by appending nops. ++ */ ++ alternative_io_2(".byte " __stringify(NOP_DS_PREFIX) "; clflush %[p]", ++ "data16 clflush %[p]", /* clflushopt */ ++ X86_FEATURE_CLFLUSHOPT, ++ CLWB_ENCODING, ++ X86_FEATURE_CLWB, /* no outputs */, ++ INPUT(addr)); ++#undef INPUT ++#undef BASE_INPUT ++#undef CLWB_ENCODING ++ ++ alternative_2("", "sfence", X86_FEATURE_CLFLUSHOPT, ++ "sfence", X86_FEATURE_CLWB); + } + + /* Allocate page table, return its machine address */ +--- a/xen/drivers/passthrough/vtd/x86/vtd.c ++++ b/xen/drivers/passthrough/vtd/x86/vtd.c +@@ -51,11 +51,6 @@ unsigned int get_cache_line_size(void) + return ((cpuid_ebx(1) >> 8) & 0xff) * 8; + } + +-void cacheline_flush(char * addr) +-{ +- clflush(addr); +-} +- + void flush_all_cache() + { + wbinvd(); diff --git a/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch b/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch new file mode 100644 index 0000000000..0bd018f972 --- /dev/null +++ b/system/xen/xsa/xsa328-post-xsa321-4.13-7.patch @@ -0,0 +1,153 @@ +From: <security@xenproject.org> +Subject: x86/ept: flush cache when modifying PTEs and sharing page tables + +Modifications made to the page tables by EPT code need to be written +to memory when the page tables are shared with the IOMMU, as Intel +IOMMUs can be non-coherent and thus require changes to be written to +memory in order to be visible to the IOMMU. + +In order to achieve this make sure data is written back to memory +after writing an EPT entry when the recalc bit is not set in +atomic_write_ept_entry. If such bit is set, the entry will be +adjusted and atomic_write_ept_entry will be called a second time +without the recalc bit set. Note that when splitting a super page the +new tables resulting of the split should also be written back. + +Failure to do so can allow devices behind the IOMMU access to the +stale super page, or cause coherency issues as changes made by the +processor to the page tables are not visible to the IOMMU. + +This allows to remove the VT-d specific iommu_pte_flush helper, since +the cache write back is now performed by atomic_write_ept_entry, and +hence iommu_iotlb_flush can be used to flush the IOMMU TLB. The newly +used method (iommu_iotlb_flush) can result in less flushes, since it +might sometimes be called rightly with 0 flags, in which case it +becomes a no-op. + +This is part of XSA-321. + +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/arch/x86/mm/p2m-ept.c ++++ b/xen/arch/x86/mm/p2m-ept.c +@@ -58,6 +58,19 @@ static int atomic_write_ept_entry(struct + + write_atomic(&entryptr->epte, new.epte); + ++ /* ++ * The recalc field on the EPT is used to signal either that a ++ * recalculation of the EMT field is required (which doesn't effect the ++ * IOMMU), or a type change. Type changes can only be between ram_rw, ++ * logdirty and ioreq_server: changes to/from logdirty won't work well with ++ * an IOMMU anyway, as IOMMU #PFs are not synchronous and will lead to ++ * aborts, and changes to/from ioreq_server are already fully flushed ++ * before returning to guest context (see ++ * XEN_DMOP_map_mem_type_to_ioreq_server). ++ */ ++ if ( !new.recalc && iommu_use_hap_pt(p2m->domain) ) ++ iommu_sync_cache(entryptr, sizeof(*entryptr)); ++ + return 0; + } + +@@ -278,6 +291,9 @@ static bool_t ept_split_super_page(struc + break; + } + ++ if ( iommu_use_hap_pt(p2m->domain) ) ++ iommu_sync_cache(table, EPT_PAGETABLE_ENTRIES * sizeof(ept_entry_t)); ++ + unmap_domain_page(table); + + /* Even failed we should install the newly allocated ept page. */ +@@ -337,6 +353,9 @@ static int ept_next_level(struct p2m_dom + if ( !next ) + return GUEST_TABLE_MAP_FAILED; + ++ if ( iommu_use_hap_pt(p2m->domain) ) ++ iommu_sync_cache(next, EPT_PAGETABLE_ENTRIES * sizeof(ept_entry_t)); ++ + rc = atomic_write_ept_entry(p2m, ept_entry, e, next_level); + ASSERT(rc == 0); + } +@@ -821,7 +840,10 @@ out: + need_modify_vtd_table ) + { + if ( iommu_use_hap_pt(d) ) +- rc = iommu_pte_flush(d, gfn, &ept_entry->epte, order, vtd_pte_present); ++ rc = iommu_iotlb_flush(d, _dfn(gfn), (1u << order), ++ (iommu_flags ? IOMMU_FLUSHF_added : 0) | ++ (vtd_pte_present ? IOMMU_FLUSHF_modified ++ : 0)); + else if ( need_iommu_pt_sync(d) ) + rc = iommu_flags ? + iommu_legacy_map(d, _dfn(gfn), mfn, order, iommu_flags) : +--- a/xen/drivers/passthrough/vtd/iommu.c ++++ b/xen/drivers/passthrough/vtd/iommu.c +@@ -1884,53 +1884,6 @@ static int intel_iommu_lookup_page(struc + return 0; + } + +-int iommu_pte_flush(struct domain *d, uint64_t dfn, uint64_t *pte, +- int order, int present) +-{ +- struct acpi_drhd_unit *drhd; +- struct vtd_iommu *iommu = NULL; +- struct domain_iommu *hd = dom_iommu(d); +- bool_t flush_dev_iotlb; +- int iommu_domid; +- int rc = 0; +- +- iommu_sync_cache(pte, sizeof(struct dma_pte)); +- +- for_each_drhd_unit ( drhd ) +- { +- iommu = drhd->iommu; +- if ( !test_bit(iommu->index, &hd->arch.iommu_bitmap) ) +- continue; +- +- flush_dev_iotlb = !!find_ats_dev_drhd(iommu); +- iommu_domid= domain_iommu_domid(d, iommu); +- if ( iommu_domid == -1 ) +- continue; +- +- rc = iommu_flush_iotlb_psi(iommu, iommu_domid, +- __dfn_to_daddr(dfn), +- order, !present, flush_dev_iotlb); +- if ( rc > 0 ) +- { +- iommu_flush_write_buffer(iommu); +- rc = 0; +- } +- } +- +- if ( unlikely(rc) ) +- { +- if ( !d->is_shutting_down && printk_ratelimit() ) +- printk(XENLOG_ERR VTDPREFIX +- " d%d: IOMMU pages flush failed: %d\n", +- d->domain_id, rc); +- +- if ( !is_hardware_domain(d) ) +- domain_crash(d); +- } +- +- return rc; +-} +- + static int __init vtd_ept_page_compatible(struct vtd_iommu *iommu) + { + u64 ept_cap, vtd_cap = iommu->cap; +--- a/xen/include/asm-x86/iommu.h ++++ b/xen/include/asm-x86/iommu.h +@@ -97,10 +97,6 @@ static inline int iommu_adjust_irq_affin + : 0; + } + +-/* While VT-d specific, this must get declared in a generic header. */ +-int __must_check iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte, +- int order, int present); +- + static inline bool iommu_supports_x2apic(void) + { + return iommu_init_ops && iommu_init_ops->supports_x2apic diff --git a/system/xen/xsa/xsa333.patch b/system/xen/xsa/xsa333.patch new file mode 100644 index 0000000000..6b86c942fa --- /dev/null +++ b/system/xen/xsa/xsa333.patch @@ -0,0 +1,39 @@ +From: Andrew Cooper <andrew.cooper3@citrix.com> +Subject: x86/pv: Handle the Intel-specific MSR_MISC_ENABLE correctly + +This MSR doesn't exist on AMD hardware, and switching away from the safe +functions in the common MSR path was an erroneous change. + +Partially revert the change. + +This is XSA-333. + +Fixes: 4fdc932b3cc ("x86/Intel: drop another 32-bit leftover") +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Wei Liu <wl@xen.org> + +diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c +index efeb2a727e..6332c74b80 100644 +--- a/xen/arch/x86/pv/emul-priv-op.c ++++ b/xen/arch/x86/pv/emul-priv-op.c +@@ -924,7 +924,8 @@ static int read_msr(unsigned int reg, uint64_t *val, + return X86EMUL_OKAY; + + case MSR_IA32_MISC_ENABLE: +- rdmsrl(reg, *val); ++ if ( rdmsr_safe(reg, *val) ) ++ break; + *val = guest_misc_enable(*val); + return X86EMUL_OKAY; + +@@ -1059,7 +1060,8 @@ static int write_msr(unsigned int reg, uint64_t val, + break; + + case MSR_IA32_MISC_ENABLE: +- rdmsrl(reg, temp); ++ if ( rdmsr_safe(reg, temp) ) ++ break; + if ( val != guest_misc_enable(temp) ) + goto invalid; + return X86EMUL_OKAY; diff --git a/system/xen/xsa/xsa334.patch b/system/xen/xsa/xsa334.patch new file mode 100644 index 0000000000..4260cdb2b2 --- /dev/null +++ b/system/xen/xsa/xsa334.patch @@ -0,0 +1,51 @@ +From: Andrew Cooper <andrew.cooper3@citrix.com> +Subject: xen/memory: Don't skip the RCU unlock path in acquire_resource() + +In the case that an HVM Stubdomain makes an XENMEM_acquire_resource hypercall, +the FIXME path will bypass rcu_unlock_domain() on the way out of the function. + +Move the check to the start of the function. This does change the behaviour +of the get-size path for HVM Stubdomains, but that functionality is currently +broken and unused anyway, as well as being quite useless to entities which +can't actually map the resource anyway. + +This is XSA-334. + +Fixes: 83fa6552ce ("common: add a new mappable resource type: XENMEM_resource_grant_table") +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +diff --git a/xen/common/memory.c b/xen/common/memory.c +index 1a3c9ffb30..29741d8904 100644 +--- a/xen/common/memory.c ++++ b/xen/common/memory.c +@@ -1058,6 +1058,14 @@ static int acquire_resource( + xen_pfn_t mfn_list[32]; + int rc; + ++ /* ++ * FIXME: Until foreign pages inserted into the P2M are properly ++ * reference counted, it is unsafe to allow mapping of ++ * resource pages unless the caller is the hardware domain. ++ */ ++ if ( paging_mode_translate(currd) && !is_hardware_domain(currd) ) ++ return -EACCES; ++ + if ( copy_from_guest(&xmar, arg, 1) ) + return -EFAULT; + +@@ -1114,14 +1122,6 @@ static int acquire_resource( + xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; + unsigned int i; + +- /* +- * FIXME: Until foreign pages inserted into the P2M are properly +- * reference counted, it is unsafe to allow mapping of +- * resource pages unless the caller is the hardware domain. +- */ +- if ( !is_hardware_domain(currd) ) +- return -EACCES; +- + if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames) ) + rc = -EFAULT; + diff --git a/system/xen/xsa/xsa335-qemu.patch b/system/xen/xsa/xsa335-qemu.patch new file mode 100644 index 0000000000..5617502359 --- /dev/null +++ b/system/xen/xsa/xsa335-qemu.patch @@ -0,0 +1,84 @@ +From c5bd2924c6d6a5bcbffb8b5e7798a88970131c07 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <kraxel@redhat.com> +Date: Mon, 17 Aug 2020 08:34:22 +0200 +Subject: [PATCH] usb: fix setup_len init (CVE-2020-14364) + +Store calculated setup_len in a local variable, verify it, and only +write it to the struct (USBDevice->setup_len) in case it passed the +sanity checks. + +This prevents other code (do_token_{in,out} functions specifically) +from working with invalid USBDevice->setup_len values and overrunning +the USBDevice->setup_buf[] buffer. + +Fixes: CVE-2020-14364 +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> +--- + hw/usb/core.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/hw/usb/core.c b/hw/usb/core.c +index 5abd128b6bc5..5234dcc73fea 100644 +--- a/hw/usb/core.c ++++ b/hw/usb/core.c +@@ -129,6 +129,7 @@ void usb_wakeup(USBEndpoint *ep, unsigned int stream) + static void do_token_setup(USBDevice *s, USBPacket *p) + { + int request, value, index; ++ unsigned int setup_len; + + if (p->iov.size != 8) { + p->status = USB_RET_STALL; +@@ -138,14 +139,15 @@ static void do_token_setup(USBDevice *s, USBPacket *p) + usb_packet_copy(p, s->setup_buf, p->iov.size); + s->setup_index = 0; + p->actual_length = 0; +- s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; +- if (s->setup_len > sizeof(s->data_buf)) { ++ setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; ++ if (setup_len > sizeof(s->data_buf)) { + fprintf(stderr, + "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n", +- s->setup_len, sizeof(s->data_buf)); ++ setup_len, sizeof(s->data_buf)); + p->status = USB_RET_STALL; + return; + } ++ s->setup_len = setup_len; + + request = (s->setup_buf[0] << 8) | s->setup_buf[1]; + value = (s->setup_buf[3] << 8) | s->setup_buf[2]; +@@ -259,26 +261,28 @@ static void do_token_out(USBDevice *s, USBPacket *p) + static void do_parameter(USBDevice *s, USBPacket *p) + { + int i, request, value, index; ++ unsigned int setup_len; + + for (i = 0; i < 8; i++) { + s->setup_buf[i] = p->parameter >> (i*8); + } + + s->setup_state = SETUP_STATE_PARAM; +- s->setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; + s->setup_index = 0; + + request = (s->setup_buf[0] << 8) | s->setup_buf[1]; + value = (s->setup_buf[3] << 8) | s->setup_buf[2]; + index = (s->setup_buf[5] << 8) | s->setup_buf[4]; + +- if (s->setup_len > sizeof(s->data_buf)) { ++ setup_len = (s->setup_buf[7] << 8) | s->setup_buf[6]; ++ if (setup_len > sizeof(s->data_buf)) { + fprintf(stderr, + "usb_generic_handle_packet: ctrl buffer too small (%d > %zu)\n", +- s->setup_len, sizeof(s->data_buf)); ++ setup_len, sizeof(s->data_buf)); + p->status = USB_RET_STALL; + return; + } ++ s->setup_len = setup_len; + + if (p->pid == USB_TOKEN_OUT) { + usb_packet_copy(p, s->data_buf, s->setup_len); +-- +2.18.4 diff --git a/system/xen/xsa/xsa336.patch b/system/xen/xsa/xsa336.patch new file mode 100644 index 0000000000..b44c298b70 --- /dev/null +++ b/system/xen/xsa/xsa336.patch @@ -0,0 +1,283 @@ +From: Roger Pau Monné <roger.pau@citrix.com> +Subject: x86/vpt: fix race when migrating timers between vCPUs + +The current vPT code will migrate the emulated timers between vCPUs +(change the pt->vcpu field) while just holding the destination lock, +either from create_periodic_time or pt_adjust_global_vcpu_target if +the global target is adjusted. Changing the periodic_timer vCPU field +in this way creates a race where a third party could grab the lock in +the unlocked region of pt_adjust_global_vcpu_target (or before +create_periodic_time performs the vcpu change) and then release the +lock from a different vCPU, creating a locking imbalance. + +Introduce a per-domain rwlock in order to protect periodic_time +migration between vCPU lists. Taking the lock in read mode prevents +any timer from being migrated to a different vCPU, while taking it in +write mode allows performing migration of timers across vCPUs. The +per-vcpu locks are still used to protect all the other fields from the +periodic_timer struct. + +Note that such migration shouldn't happen frequently, and hence +there's no performance drop as a result of such locking. + +This is XSA-336. + +Reported-by: Igor Druzhinin <igor.druzhinin@citrix.com> +Tested-by: Igor Druzhinin <igor.druzhinin@citrix.com> +Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +--- +Changes since v2: + - Re-order pt_adjust_vcpu to remove one if. + - Fix pt_lock to not call pt_vcpu_lock, as we might end up using a + stale value of pt->vcpu when taking the per-vcpu lock. + +Changes since v1: + - Use a per-domain rwlock to protect timer vCPU migration. + +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -658,6 +658,8 @@ int hvm_domain_initialise(struct domain + /* need link to containing domain */ + d->arch.hvm.pl_time->domain = d; + ++ rwlock_init(&d->arch.hvm.pl_time->pt_migrate); ++ + /* Set the default IO Bitmap. */ + if ( is_hardware_domain(d) ) + { +--- a/xen/arch/x86/hvm/vpt.c ++++ b/xen/arch/x86/hvm/vpt.c +@@ -153,23 +153,32 @@ static int pt_irq_masked(struct periodic + return 1; + } + +-static void pt_lock(struct periodic_time *pt) ++static void pt_vcpu_lock(struct vcpu *v) + { +- struct vcpu *v; ++ read_lock(&v->domain->arch.hvm.pl_time->pt_migrate); ++ spin_lock(&v->arch.hvm.tm_lock); ++} + +- for ( ; ; ) +- { +- v = pt->vcpu; +- spin_lock(&v->arch.hvm.tm_lock); +- if ( likely(pt->vcpu == v) ) +- break; +- spin_unlock(&v->arch.hvm.tm_lock); +- } ++static void pt_vcpu_unlock(struct vcpu *v) ++{ ++ spin_unlock(&v->arch.hvm.tm_lock); ++ read_unlock(&v->domain->arch.hvm.pl_time->pt_migrate); ++} ++ ++static void pt_lock(struct periodic_time *pt) ++{ ++ /* ++ * We cannot use pt_vcpu_lock here, because we need to acquire the ++ * per-domain lock first and then (re-)fetch the value of pt->vcpu, or ++ * else we might be using a stale value of pt->vcpu. ++ */ ++ read_lock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate); ++ spin_lock(&pt->vcpu->arch.hvm.tm_lock); + } + + static void pt_unlock(struct periodic_time *pt) + { +- spin_unlock(&pt->vcpu->arch.hvm.tm_lock); ++ pt_vcpu_unlock(pt->vcpu); + } + + static void pt_process_missed_ticks(struct periodic_time *pt) +@@ -219,7 +228,7 @@ void pt_save_timer(struct vcpu *v) + if ( v->pause_flags & VPF_blocked ) + return; + +- spin_lock(&v->arch.hvm.tm_lock); ++ pt_vcpu_lock(v); + + list_for_each_entry ( pt, head, list ) + if ( !pt->do_not_freeze ) +@@ -227,7 +236,7 @@ void pt_save_timer(struct vcpu *v) + + pt_freeze_time(v); + +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + } + + void pt_restore_timer(struct vcpu *v) +@@ -235,7 +244,7 @@ void pt_restore_timer(struct vcpu *v) + struct list_head *head = &v->arch.hvm.tm_list; + struct periodic_time *pt; + +- spin_lock(&v->arch.hvm.tm_lock); ++ pt_vcpu_lock(v); + + list_for_each_entry ( pt, head, list ) + { +@@ -248,7 +257,7 @@ void pt_restore_timer(struct vcpu *v) + + pt_thaw_time(v); + +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + } + + static void pt_timer_fn(void *data) +@@ -309,7 +318,7 @@ int pt_update_irq(struct vcpu *v) + int irq, pt_vector = -1; + bool level; + +- spin_lock(&v->arch.hvm.tm_lock); ++ pt_vcpu_lock(v); + + earliest_pt = NULL; + max_lag = -1ULL; +@@ -339,7 +348,7 @@ int pt_update_irq(struct vcpu *v) + + if ( earliest_pt == NULL ) + { +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + return -1; + } + +@@ -347,7 +356,7 @@ int pt_update_irq(struct vcpu *v) + irq = earliest_pt->irq; + level = earliest_pt->level; + +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + + switch ( earliest_pt->source ) + { +@@ -394,7 +403,7 @@ int pt_update_irq(struct vcpu *v) + time_cb *cb = NULL; + void *cb_priv; + +- spin_lock(&v->arch.hvm.tm_lock); ++ pt_vcpu_lock(v); + /* Make sure the timer is still on the list. */ + list_for_each_entry ( pt, &v->arch.hvm.tm_list, list ) + if ( pt == earliest_pt ) +@@ -404,7 +413,7 @@ int pt_update_irq(struct vcpu *v) + cb_priv = pt->priv; + break; + } +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + + if ( cb != NULL ) + cb(v, cb_priv); +@@ -441,12 +450,12 @@ void pt_intr_post(struct vcpu *v, struct + if ( intack.source == hvm_intsrc_vector ) + return; + +- spin_lock(&v->arch.hvm.tm_lock); ++ pt_vcpu_lock(v); + + pt = is_pt_irq(v, intack); + if ( pt == NULL ) + { +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + return; + } + +@@ -455,7 +464,7 @@ void pt_intr_post(struct vcpu *v, struct + cb = pt->cb; + cb_priv = pt->priv; + +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + + if ( cb != NULL ) + cb(v, cb_priv); +@@ -466,12 +475,12 @@ void pt_migrate(struct vcpu *v) + struct list_head *head = &v->arch.hvm.tm_list; + struct periodic_time *pt; + +- spin_lock(&v->arch.hvm.tm_lock); ++ pt_vcpu_lock(v); + + list_for_each_entry ( pt, head, list ) + migrate_timer(&pt->timer, v->processor); + +- spin_unlock(&v->arch.hvm.tm_lock); ++ pt_vcpu_unlock(v); + } + + void create_periodic_time( +@@ -490,7 +499,7 @@ void create_periodic_time( + + destroy_periodic_time(pt); + +- spin_lock(&v->arch.hvm.tm_lock); ++ write_lock(&v->domain->arch.hvm.pl_time->pt_migrate); + + pt->pending_intr_nr = 0; + pt->do_not_freeze = 0; +@@ -540,7 +549,7 @@ void create_periodic_time( + init_timer(&pt->timer, pt_timer_fn, pt, v->processor); + set_timer(&pt->timer, pt->scheduled); + +- spin_unlock(&v->arch.hvm.tm_lock); ++ write_unlock(&v->domain->arch.hvm.pl_time->pt_migrate); + } + + void destroy_periodic_time(struct periodic_time *pt) +@@ -565,30 +574,20 @@ void destroy_periodic_time(struct period + + static void pt_adjust_vcpu(struct periodic_time *pt, struct vcpu *v) + { +- int on_list; +- + ASSERT(pt->source == PTSRC_isa || pt->source == PTSRC_ioapic); + + if ( pt->vcpu == NULL ) + return; + +- pt_lock(pt); +- on_list = pt->on_list; +- if ( pt->on_list ) +- list_del(&pt->list); +- pt->on_list = 0; +- pt_unlock(pt); +- +- spin_lock(&v->arch.hvm.tm_lock); ++ write_lock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate); + pt->vcpu = v; +- if ( on_list ) ++ if ( pt->on_list ) + { +- pt->on_list = 1; ++ list_del(&pt->list); + list_add(&pt->list, &v->arch.hvm.tm_list); +- + migrate_timer(&pt->timer, v->processor); + } +- spin_unlock(&v->arch.hvm.tm_lock); ++ write_unlock(&pt->vcpu->domain->arch.hvm.pl_time->pt_migrate); + } + + void pt_adjust_global_vcpu_target(struct vcpu *v) +--- a/xen/include/asm-x86/hvm/vpt.h ++++ b/xen/include/asm-x86/hvm/vpt.h +@@ -128,6 +128,13 @@ struct pl_time { /* platform time */ + struct RTCState vrtc; + struct HPETState vhpet; + struct PMTState vpmt; ++ /* ++ * rwlock to prevent periodic_time vCPU migration. Take the lock in read ++ * mode in order to prevent the vcpu field of periodic_time from changing. ++ * Lock must be taken in write mode when changes to the vcpu field are ++ * performed, as it allows exclusive access to all the timers of a domain. ++ */ ++ rwlock_t pt_migrate; + /* guest_time = Xen sys time + stime_offset */ + int64_t stime_offset; + /* Ensures monotonicity in appropriate timer modes. */ diff --git a/system/xen/xsa/xsa337-4.13-1.patch b/system/xen/xsa/xsa337-4.13-1.patch new file mode 100644 index 0000000000..2091626f4f --- /dev/null +++ b/system/xen/xsa/xsa337-4.13-1.patch @@ -0,0 +1,87 @@ +From: Roger Pau Monné <roger.pau@citrix.com> +Subject: x86/msi: get rid of read_msi_msg + +It's safer and faster to just use the cached last written +(untranslated) MSI message stored in msi_desc for the single user that +calls read_msi_msg. + +This also prevents relying on the data read from the device MSI +registers in order to figure out the index into the IOMMU interrupt +remapping table, which is not safe. + +This is part of XSA-337. + +Reported-by: Andrew Cooper <andrew.cooper3@citrix.com> +Requested-by: Andrew Cooper <andrew.cooper3@citrix.com> +Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +--- a/xen/arch/x86/msi.c ++++ b/xen/arch/x86/msi.c +@@ -183,54 +183,6 @@ void msi_compose_msg(unsigned vector, co + MSI_DATA_VECTOR(vector); + } + +-static bool read_msi_msg(struct msi_desc *entry, struct msi_msg *msg) +-{ +- switch ( entry->msi_attrib.type ) +- { +- case PCI_CAP_ID_MSI: +- { +- struct pci_dev *dev = entry->dev; +- int pos = entry->msi_attrib.pos; +- uint16_t data; +- +- msg->address_lo = pci_conf_read32(dev->sbdf, +- msi_lower_address_reg(pos)); +- if ( entry->msi_attrib.is_64 ) +- { +- msg->address_hi = pci_conf_read32(dev->sbdf, +- msi_upper_address_reg(pos)); +- data = pci_conf_read16(dev->sbdf, msi_data_reg(pos, 1)); +- } +- else +- { +- msg->address_hi = 0; +- data = pci_conf_read16(dev->sbdf, msi_data_reg(pos, 0)); +- } +- msg->data = data; +- break; +- } +- case PCI_CAP_ID_MSIX: +- { +- void __iomem *base = entry->mask_base; +- +- if ( unlikely(!msix_memory_decoded(entry->dev, +- entry->msi_attrib.pos)) ) +- return false; +- msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET); +- msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET); +- msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET); +- break; +- } +- default: +- BUG(); +- } +- +- if ( iommu_intremap ) +- iommu_read_msi_from_ire(entry, msg); +- +- return true; +-} +- + static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) + { + entry->msg = *msg; +@@ -302,10 +254,7 @@ void set_msi_affinity(struct irq_desc *d + + ASSERT(spin_is_locked(&desc->lock)); + +- memset(&msg, 0, sizeof(msg)); +- if ( !read_msi_msg(msi_desc, &msg) ) +- return; +- ++ msg = msi_desc->msg; + msg.data &= ~MSI_DATA_VECTOR_MASK; + msg.data |= MSI_DATA_VECTOR(desc->arch.vector); + msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK; diff --git a/system/xen/xsa/xsa337-4.13-2.patch b/system/xen/xsa/xsa337-4.13-2.patch new file mode 100644 index 0000000000..bdefd37cdc --- /dev/null +++ b/system/xen/xsa/xsa337-4.13-2.patch @@ -0,0 +1,181 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: x86/MSI-X: restrict reading of table/PBA bases from BARs + +When assigned to less trusted or un-trusted guests, devices may change +state behind our backs (they may e.g. get reset by means we may not know +about). Therefore we should avoid reading BARs from hardware once a +device is no longer owned by Dom0. Furthermore when we can't read a BAR, +or when we read zero, we shouldn't instead use the caller provided +address unless that caller can be trusted. + +Re-arrange the logic in msix_capability_init() such that only Dom0 (and +only if the device isn't DomU-owned yet) or calls through +PHYSDEVOP_prepare_msix will actually result in the reading of the +respective BAR register(s). Additionally do so only as long as in-use +table entries are known (note that invocation of PHYSDEVOP_prepare_msix +counts as a "pseudo" entry). In all other uses the value already +recorded will get used instead. + +Clear the recorded values in _pci_cleanup_msix() as well as on the one +affected error path. (Adjust this error path to also avoid blindly +disabling MSI-X when it was enabled on entry to the function.) + +While moving around variable declarations (in many cases to reduce their +scopes), also adjust some of their types. + +This is part of XSA-337. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> + +--- a/xen/arch/x86/msi.c ++++ b/xen/arch/x86/msi.c +@@ -769,16 +769,14 @@ static int msix_capability_init(struct p + { + struct arch_msix *msix = dev->msix; + struct msi_desc *entry = NULL; +- int vf; + u16 control; + u64 table_paddr; + u32 table_offset; +- u8 bir, pbus, pslot, pfunc; + u16 seg = dev->seg; + u8 bus = dev->bus; + u8 slot = PCI_SLOT(dev->devfn); + u8 func = PCI_FUNC(dev->devfn); +- bool maskall = msix->host_maskall; ++ bool maskall = msix->host_maskall, zap_on_error = false; + unsigned int pos = pci_find_cap_offset(seg, bus, slot, func, + PCI_CAP_ID_MSIX); + +@@ -820,43 +818,45 @@ static int msix_capability_init(struct p + + /* Locate MSI-X table region */ + table_offset = pci_conf_read32(dev->sbdf, msix_table_offset_reg(pos)); +- bir = (u8)(table_offset & PCI_MSIX_BIRMASK); +- table_offset &= ~PCI_MSIX_BIRMASK; ++ if ( !msix->used_entries && ++ (!msi || ++ (is_hardware_domain(current->domain) && ++ (dev->domain == current->domain || dev->domain == dom_io))) ) ++ { ++ unsigned int bir = table_offset & PCI_MSIX_BIRMASK, pbus, pslot, pfunc; ++ int vf; ++ paddr_t pba_paddr; ++ unsigned int pba_offset; + +- if ( !dev->info.is_virtfn ) +- { +- pbus = bus; +- pslot = slot; +- pfunc = func; +- vf = -1; +- } +- else +- { +- pbus = dev->info.physfn.bus; +- pslot = PCI_SLOT(dev->info.physfn.devfn); +- pfunc = PCI_FUNC(dev->info.physfn.devfn); +- vf = PCI_BDF2(dev->bus, dev->devfn); +- } +- +- table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf); +- WARN_ON(msi && msi->table_base != table_paddr); +- if ( !table_paddr ) +- { +- if ( !msi || !msi->table_base ) ++ if ( !dev->info.is_virtfn ) + { +- pci_conf_write16(dev->sbdf, msix_control_reg(pos), +- control & ~PCI_MSIX_FLAGS_ENABLE); +- xfree(entry); +- return -ENXIO; ++ pbus = bus; ++ pslot = slot; ++ pfunc = func; ++ vf = -1; ++ } ++ else ++ { ++ pbus = dev->info.physfn.bus; ++ pslot = PCI_SLOT(dev->info.physfn.devfn); ++ pfunc = PCI_FUNC(dev->info.physfn.devfn); ++ vf = PCI_BDF2(dev->bus, dev->devfn); + } +- table_paddr = msi->table_base; +- } +- table_paddr += table_offset; + +- if ( !msix->used_entries ) +- { +- u64 pba_paddr; +- u32 pba_offset; ++ table_paddr = read_pci_mem_bar(seg, pbus, pslot, pfunc, bir, vf); ++ WARN_ON(msi && msi->table_base != table_paddr); ++ if ( !table_paddr ) ++ { ++ if ( !msi || !msi->table_base ) ++ { ++ pci_conf_write16(dev->sbdf, msix_control_reg(pos), ++ control & ~PCI_MSIX_FLAGS_ENABLE); ++ xfree(entry); ++ return -ENXIO; ++ } ++ table_paddr = msi->table_base; ++ } ++ table_paddr += table_offset & ~PCI_MSIX_BIRMASK; + + msix->table.first = PFN_DOWN(table_paddr); + msix->table.last = PFN_DOWN(table_paddr + +@@ -875,7 +875,18 @@ static int msix_capability_init(struct p + BITS_TO_LONGS(msix->nr_entries) - 1); + WARN_ON(rangeset_overlaps_range(mmio_ro_ranges, msix->pba.first, + msix->pba.last)); ++ ++ zap_on_error = true; ++ } ++ else if ( !msix->table.first ) ++ { ++ pci_conf_write16(dev->sbdf, msix_control_reg(pos), control); ++ xfree(entry); ++ return -ENODATA; + } ++ else ++ table_paddr = (msix->table.first << PAGE_SHIFT) + ++ (table_offset & ~PCI_MSIX_BIRMASK & ~PAGE_MASK); + + if ( entry ) + { +@@ -886,8 +897,15 @@ static int msix_capability_init(struct p + + if ( idx < 0 ) + { +- pci_conf_write16(dev->sbdf, msix_control_reg(pos), +- control & ~PCI_MSIX_FLAGS_ENABLE); ++ if ( zap_on_error ) ++ { ++ msix->table.first = 0; ++ msix->pba.first = 0; ++ ++ control &= ~PCI_MSIX_FLAGS_ENABLE; ++ } ++ ++ pci_conf_write16(dev->sbdf, msix_control_reg(pos), control); + xfree(entry); + return idx; + } +@@ -1076,9 +1094,14 @@ static void _pci_cleanup_msix(struct arc + if ( rangeset_remove_range(mmio_ro_ranges, msix->table.first, + msix->table.last) ) + WARN(); ++ msix->table.first = 0; ++ msix->table.last = 0; ++ + if ( rangeset_remove_range(mmio_ro_ranges, msix->pba.first, + msix->pba.last) ) + WARN(); ++ msix->pba.first = 0; ++ msix->pba.last = 0; + } + } + diff --git a/system/xen/xsa/xsa338.patch b/system/xen/xsa/xsa338.patch new file mode 100644 index 0000000000..776521990e --- /dev/null +++ b/system/xen/xsa/xsa338.patch @@ -0,0 +1,42 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: evtchn: relax port_is_valid() + +To avoid ports potentially becoming invalid behind the back of certain +other functions (due to ->max_evtchn shrinking) because of +- a guest invoking evtchn_reset() and from a 2nd vCPU opening new + channels in parallel (see also XSA-343), +- alloc_unbound_xen_event_channel() produced channels living above the + 2-level range (see also XSA-342), +drop the max_evtchns check from port_is_valid(). For a port for which +the function once returned "true", the returned value may not turn into +"false" later on. The function's result may only depend on bounds which +can only ever grow (which is the case for d->valid_evtchns). + +This also eliminates a false sense of safety, utilized by some of the +users (see again XSA-343): Without a suitable lock held, d->max_evtchns +may change at any time, and hence deducing that certain other operations +are safe when port_is_valid() returned true is not legitimate. The +opportunities to abuse this may get widened by the change here +(depending on guest and host configuration), but will be taken care of +by the other XSA. + +This is XSA-338. + +Fixes: 48974e6ce52e ("evtchn: use a per-domain variable for the max number of event channels") +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> +Reviewed-by: Julien Grall <jgrall@amazon.com> +--- +v5: New, split from larger patch. + +--- a/xen/include/xen/event.h ++++ b/xen/include/xen/event.h +@@ -107,8 +107,6 @@ void notify_via_xen_event_channel(struct + + static inline bool_t port_is_valid(struct domain *d, unsigned int p) + { +- if ( p >= d->max_evtchns ) +- return 0; + return p < read_atomic(&d->valid_evtchns); + } + diff --git a/system/xen/xsa/xsa339.patch b/system/xen/xsa/xsa339.patch new file mode 100644 index 0000000000..3311ae093f --- /dev/null +++ b/system/xen/xsa/xsa339.patch @@ -0,0 +1,76 @@ +From: Andrew Cooper <andrew.cooper3@citrix.com> +Subject: x86/pv: Avoid double exception injection + +There is at least one path (SYSENTER with NT set, Xen converts to #GP) which +ends up injecting the #GP fault twice, first in compat_sysenter(), and then a +second time in compat_test_all_events(), due to the stale TBF_EXCEPTION left +in TRAPBOUNCE_flags. + +The guest kernel sees the second fault first, which is a kernel level #GP +pointing at the head of the #GP handler, and is therefore a userspace +trigger-able DoS. + +This particular bug has bitten us several times before, so rearrange +{compat_,}create_bounce_frame() to clobber TRAPBOUNCE on success, rather than +leaving this task to one area of code which isn't used uniformly. + +Other scenarios which might result in a double injection (e.g. two calls +directly to compat_create_bounce_frame) will now crash the guest, which is far +more obvious than letting the kernel run with corrupt state. + +This is XSA-339 + +Fixes: fdac9515607b ("x86: clear EFLAGS.NT in SYSENTER entry path") +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> + +diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S +index c3e62f8734..73619f57ca 100644 +--- a/xen/arch/x86/x86_64/compat/entry.S ++++ b/xen/arch/x86/x86_64/compat/entry.S +@@ -78,7 +78,6 @@ compat_process_softirqs: + sti + .Lcompat_bounce_exception: + call compat_create_bounce_frame +- movb $0, TRAPBOUNCE_flags(%rdx) + jmp compat_test_all_events + + ALIGN +@@ -352,7 +351,13 @@ __UNLIKELY_END(compat_bounce_null_selector) + movl %eax,UREGS_cs+8(%rsp) + movl TRAPBOUNCE_eip(%rdx),%eax + movl %eax,UREGS_rip+8(%rsp) ++ ++ /* Trapbounce complete. Clobber state to avoid an erroneous second injection. */ ++ xor %eax, %eax ++ mov %ax, TRAPBOUNCE_cs(%rdx) ++ mov %al, TRAPBOUNCE_flags(%rdx) + ret ++ + .section .fixup,"ax" + .Lfx13: + xorl %edi,%edi +diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S +index 1e880eb9f6..71a00e846b 100644 +--- a/xen/arch/x86/x86_64/entry.S ++++ b/xen/arch/x86/x86_64/entry.S +@@ -90,7 +90,6 @@ process_softirqs: + sti + .Lbounce_exception: + call create_bounce_frame +- movb $0, TRAPBOUNCE_flags(%rdx) + jmp test_all_events + + ALIGN +@@ -512,6 +511,11 @@ UNLIKELY_START(z, create_bounce_frame_bad_bounce_ip) + jmp asm_domain_crash_synchronous /* Does not return */ + __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) + movq %rax,UREGS_rip+8(%rsp) ++ ++ /* Trapbounce complete. Clobber state to avoid an erroneous second injection. */ ++ xor %eax, %eax ++ mov %rax, TRAPBOUNCE_eip(%rdx) ++ mov %al, TRAPBOUNCE_flags(%rdx) + ret + + .pushsection .fixup, "ax", @progbits diff --git a/system/xen/xsa/xsa340.patch b/system/xen/xsa/xsa340.patch new file mode 100644 index 0000000000..38d04da465 --- /dev/null +++ b/system/xen/xsa/xsa340.patch @@ -0,0 +1,65 @@ +From: Julien Grall <jgrall@amazon.com> +Subject: xen/evtchn: Add missing barriers when accessing/allocating an event channel + +While the allocation of a bucket is always performed with the per-domain +lock, the bucket may be accessed without the lock taken (for instance, see +evtchn_send()). + +Instead such sites relies on port_is_valid() to return a non-zero value +when the port has a struct evtchn associated to it. The function will +mostly check whether the port is less than d->valid_evtchns as all the +buckets/event channels should be allocated up to that point. + +Unfortunately a compiler is free to re-order the assignment in +evtchn_allocate_port() so it would be possible to have d->valid_evtchns +updated before the new bucket has finish to allocate. + +Additionally on Arm, even if this was compiled "correctly", the +processor can still re-order the memory access. + +Add a write memory barrier in the allocation side and a read memory +barrier when the port is valid to prevent any re-ordering issue. + +This is XSA-340. + +Reported-by: Julien Grall <jgrall@amazon.com> +Signed-off-by: Julien Grall <jgrall@amazon.com> +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> + +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -178,6 +178,13 @@ int evtchn_allocate_port(struct domain * + return -ENOMEM; + bucket_from_port(d, port) = chn; + ++ /* ++ * d->valid_evtchns is used to check whether the bucket can be ++ * accessed without the per-domain lock. Therefore, ++ * d->valid_evtchns should be seen *after* the new bucket has ++ * been setup. ++ */ ++ smp_wmb(); + write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET); + } + +--- a/xen/include/xen/event.h ++++ b/xen/include/xen/event.h +@@ -107,7 +107,17 @@ void notify_via_xen_event_channel(struct + + static inline bool_t port_is_valid(struct domain *d, unsigned int p) + { +- return p < read_atomic(&d->valid_evtchns); ++ if ( p >= read_atomic(&d->valid_evtchns) ) ++ return false; ++ ++ /* ++ * The caller will usually access the event channel afterwards and ++ * may be done without taking the per-domain lock. The barrier is ++ * going in pair the smp_wmb() barrier in evtchn_allocate_port(). ++ */ ++ smp_rmb(); ++ ++ return true; + } + + static inline struct evtchn *evtchn_from_port(struct domain *d, unsigned int p) diff --git a/system/xen/xsa/xsa342-4.13.patch b/system/xen/xsa/xsa342-4.13.patch new file mode 100644 index 0000000000..334baf1b69 --- /dev/null +++ b/system/xen/xsa/xsa342-4.13.patch @@ -0,0 +1,145 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: evtchn/x86: enforce correct upper limit for 32-bit guests + +The recording of d->max_evtchns in evtchn_2l_init(), in particular with +the limited set of callers of the function, is insufficient. Neither for +PV nor for HVM guests the bitness is known at domain_create() time, yet +the upper bound in 2-level mode depends upon guest bitness. Recording +too high a limit "allows" x86 32-bit domains to open not properly usable +event channels, management of which (inside Xen) would then result in +corruption of the shared info and vCPU info structures. + +Keep the upper limit dynamic for the 2-level case, introducing a helper +function to retrieve the effective limit. This helper is now supposed to +be private to the event channel code. The used in do_poll() and +domain_dump_evtchn_info() weren't consistent with port uses elsewhere +and hence get switched to port_is_valid(). + +Furthermore FIFO mode's setup_ports() gets adjusted to loop only up to +the prior ABI limit, rather than all the way up to the new one. + +Finally a word on the change to do_poll(): Accessing ->max_evtchns +without holding a suitable lock was never safe, as it as well as +->evtchn_port_ops may change behind do_poll()'s back. Using +port_is_valid() instead widens some the window for potential abuse, +until we've dealt with the race altogether (see XSA-343). + +This is XSA-342. + +Reported-by: Julien Grall <jgrall@amazon.com> +Fixes: 48974e6ce52e ("evtchn: use a per-domain variable for the max number of event channels") +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> +Reviewed-by: Julien Grall <jgrall@amazon.com> + +--- a/xen/common/event_2l.c ++++ b/xen/common/event_2l.c +@@ -103,7 +103,6 @@ static const struct evtchn_port_ops evtc + void evtchn_2l_init(struct domain *d) + { + d->evtchn_port_ops = &evtchn_port_ops_2l; +- d->max_evtchns = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d); + } + + /* +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -151,7 +151,7 @@ static void free_evtchn_bucket(struct do + + int evtchn_allocate_port(struct domain *d, evtchn_port_t port) + { +- if ( port > d->max_evtchn_port || port >= d->max_evtchns ) ++ if ( port > d->max_evtchn_port || port >= max_evtchns(d) ) + return -ENOSPC; + + if ( port_is_valid(d, port) ) +@@ -1396,13 +1396,11 @@ static void domain_dump_evtchn_info(stru + + spin_lock(&d->event_lock); + +- for ( port = 1; port < d->max_evtchns; ++port ) ++ for ( port = 1; port_is_valid(d, port); ++port ) + { + const struct evtchn *chn; + char *ssid; + +- if ( !port_is_valid(d, port) ) +- continue; + chn = evtchn_from_port(d, port); + if ( chn->state == ECS_FREE ) + continue; +--- a/xen/common/event_fifo.c ++++ b/xen/common/event_fifo.c +@@ -478,7 +478,7 @@ static void cleanup_event_array(struct d + d->evtchn_fifo = NULL; + } + +-static void setup_ports(struct domain *d) ++static void setup_ports(struct domain *d, unsigned int prev_evtchns) + { + unsigned int port; + +@@ -488,7 +488,7 @@ static void setup_ports(struct domain *d + * - save its pending state. + * - set default priority. + */ +- for ( port = 1; port < d->max_evtchns; port++ ) ++ for ( port = 1; port < prev_evtchns; port++ ) + { + struct evtchn *evtchn; + +@@ -546,6 +546,8 @@ int evtchn_fifo_init_control(struct evtc + if ( !d->evtchn_fifo ) + { + struct vcpu *vcb; ++ /* Latch the value before it changes during setup_event_array(). */ ++ unsigned int prev_evtchns = max_evtchns(d); + + for_each_vcpu ( d, vcb ) { + rc = setup_control_block(vcb); +@@ -562,8 +564,7 @@ int evtchn_fifo_init_control(struct evtc + goto error; + + d->evtchn_port_ops = &evtchn_port_ops_fifo; +- d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; +- setup_ports(d); ++ setup_ports(d, prev_evtchns); + } + else + rc = map_control_block(v, gfn, offset); +--- a/xen/common/schedule.c ++++ b/xen/common/schedule.c +@@ -1434,7 +1434,7 @@ static long do_poll(struct sched_poll *s + goto out; + + rc = -EINVAL; +- if ( port >= d->max_evtchns ) ++ if ( !port_is_valid(d, port) ) + goto out; + + rc = 0; +--- a/xen/include/xen/event.h ++++ b/xen/include/xen/event.h +@@ -105,6 +105,12 @@ void notify_via_xen_event_channel(struct + #define bucket_from_port(d, p) \ + ((group_from_port(d, p))[((p) % EVTCHNS_PER_GROUP) / EVTCHNS_PER_BUCKET]) + ++static inline unsigned int max_evtchns(const struct domain *d) ++{ ++ return d->evtchn_fifo ? EVTCHN_FIFO_NR_CHANNELS ++ : BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d); ++} ++ + static inline bool_t port_is_valid(struct domain *d, unsigned int p) + { + if ( p >= read_atomic(&d->valid_evtchns) ) +--- a/xen/include/xen/sched.h ++++ b/xen/include/xen/sched.h +@@ -382,7 +382,6 @@ struct domain + /* Event channel information. */ + struct evtchn *evtchn; /* first bucket only */ + struct evtchn **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */ +- unsigned int max_evtchns; /* number supported by ABI */ + unsigned int max_evtchn_port; /* max permitted port number */ + unsigned int valid_evtchns; /* number of allocated event channels */ + spinlock_t event_lock; diff --git a/system/xen/xsa/xsa343-1.patch b/system/xen/xsa/xsa343-1.patch new file mode 100644 index 0000000000..0abbc03e8d --- /dev/null +++ b/system/xen/xsa/xsa343-1.patch @@ -0,0 +1,199 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: evtchn: evtchn_reset() shouldn't succeed with still-open ports + +While the function closes all ports, it does so without holding any +lock, and hence racing requests may be issued causing new ports to get +opened. This would have been problematic in particular if such a newly +opened port had a port number above the new implementation limit (i.e. +when switching from FIFO to 2-level) after the reset, as prior to +"evtchn: relax port_is_valid()" this could have led to e.g. +evtchn_close()'s "BUG_ON(!port_is_valid(d2, port2))" to trigger. + +Introduce a counter of active ports and check that it's (still) no +larger then the number of Xen internally used ones after obtaining the +necessary lock in evtchn_reset(). + +As to the access model of the new {active,xen}_evtchns fields - while +all writes get done using write_atomic(), reads ought to use +read_atomic() only when outside of a suitably locked region. + +Note that as of now evtchn_bind_virq() and evtchn_bind_ipi() don't have +a need to call check_free_port(). + +This is part of XSA-343. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> +Reviewed-by: Julien Grall <jgrall@amazon.com> +--- +v7: Drop optimization from evtchn_reset(). +v6: Fix loop exit condition in evtchn_reset(). Use {read,write}_atomic() + also for xen_evtchns. +v5: Move increment in alloc_unbound_xen_event_channel() out of the inner + locked region. +v4: Account for Xen internal ports. +v3: Document intended access next to new struct field. +v2: Add comment to check_free_port(). Drop commented out calls. + +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -188,6 +188,8 @@ int evtchn_allocate_port(struct domain * + write_atomic(&d->valid_evtchns, d->valid_evtchns + EVTCHNS_PER_BUCKET); + } + ++ write_atomic(&d->active_evtchns, d->active_evtchns + 1); ++ + return 0; + } + +@@ -211,11 +213,26 @@ static int get_free_port(struct domain * + return -ENOSPC; + } + ++/* ++ * Check whether a port is still marked free, and if so update the domain ++ * counter accordingly. To be used on function exit paths. ++ */ ++static void check_free_port(struct domain *d, evtchn_port_t port) ++{ ++ if ( port_is_valid(d, port) && ++ evtchn_from_port(d, port)->state == ECS_FREE ) ++ write_atomic(&d->active_evtchns, d->active_evtchns - 1); ++} ++ + void evtchn_free(struct domain *d, struct evtchn *chn) + { + /* Clear pending event to avoid unexpected behavior on re-bind. */ + evtchn_port_clear_pending(d, chn); + ++ if ( consumer_is_xen(chn) ) ++ write_atomic(&d->xen_evtchns, d->xen_evtchns - 1); ++ write_atomic(&d->active_evtchns, d->active_evtchns - 1); ++ + /* Reset binding to vcpu0 when the channel is freed. */ + chn->state = ECS_FREE; + chn->notify_vcpu_id = 0; +@@ -258,6 +275,7 @@ static long evtchn_alloc_unbound(evtchn_ + alloc->port = port; + + out: ++ check_free_port(d, port); + spin_unlock(&d->event_lock); + rcu_unlock_domain(d); + +@@ -351,6 +369,7 @@ static long evtchn_bind_interdomain(evtc + bind->local_port = lport; + + out: ++ check_free_port(ld, lport); + spin_unlock(&ld->event_lock); + if ( ld != rd ) + spin_unlock(&rd->event_lock); +@@ -488,7 +507,7 @@ static long evtchn_bind_pirq(evtchn_bind + struct domain *d = current->domain; + struct vcpu *v = d->vcpu[0]; + struct pirq *info; +- int port, pirq = bind->pirq; ++ int port = 0, pirq = bind->pirq; + long rc; + + if ( (pirq < 0) || (pirq >= d->nr_pirqs) ) +@@ -536,6 +555,7 @@ static long evtchn_bind_pirq(evtchn_bind + arch_evtchn_bind_pirq(d, pirq); + + out: ++ check_free_port(d, port); + spin_unlock(&d->event_lock); + + return rc; +@@ -1011,10 +1031,10 @@ int evtchn_unmask(unsigned int port) + return 0; + } + +- + int evtchn_reset(struct domain *d) + { + unsigned int i; ++ int rc = 0; + + if ( d != current->domain && !d->controller_pause_count ) + return -EINVAL; +@@ -1024,7 +1044,9 @@ int evtchn_reset(struct domain *d) + + spin_lock(&d->event_lock); + +- if ( d->evtchn_fifo ) ++ if ( d->active_evtchns > d->xen_evtchns ) ++ rc = -EAGAIN; ++ else if ( d->evtchn_fifo ) + { + /* Switching back to 2-level ABI. */ + evtchn_fifo_destroy(d); +@@ -1033,7 +1055,7 @@ int evtchn_reset(struct domain *d) + + spin_unlock(&d->event_lock); + +- return 0; ++ return rc; + } + + static long evtchn_set_priority(const struct evtchn_set_priority *set_priority) +@@ -1219,10 +1241,9 @@ int alloc_unbound_xen_event_channel( + + spin_lock(&ld->event_lock); + +- rc = get_free_port(ld); ++ port = rc = get_free_port(ld); + if ( rc < 0 ) + goto out; +- port = rc; + chn = evtchn_from_port(ld, port); + + rc = xsm_evtchn_unbound(XSM_TARGET, ld, chn, remote_domid); +@@ -1238,7 +1259,10 @@ int alloc_unbound_xen_event_channel( + + spin_unlock(&chn->lock); + ++ write_atomic(&ld->xen_evtchns, ld->xen_evtchns + 1); ++ + out: ++ check_free_port(ld, port); + spin_unlock(&ld->event_lock); + + return rc < 0 ? rc : port; +@@ -1314,6 +1338,7 @@ int evtchn_init(struct domain *d, unsign + return -EINVAL; + } + evtchn_from_port(d, 0)->state = ECS_RESERVED; ++ write_atomic(&d->active_evtchns, 0); + + #if MAX_VIRT_CPUS > BITS_PER_LONG + d->poll_mask = xzalloc_array(unsigned long, BITS_TO_LONGS(d->max_vcpus)); +@@ -1340,6 +1365,8 @@ void evtchn_destroy(struct domain *d) + for ( i = 0; port_is_valid(d, i); i++ ) + evtchn_close(d, i, 0); + ++ ASSERT(!d->active_evtchns); ++ + clear_global_virq_handlers(d); + + evtchn_fifo_destroy(d); +--- a/xen/include/xen/sched.h ++++ b/xen/include/xen/sched.h +@@ -361,6 +361,16 @@ struct domain + struct evtchn **evtchn_group[NR_EVTCHN_GROUPS]; /* all other buckets */ + unsigned int max_evtchn_port; /* max permitted port number */ + unsigned int valid_evtchns; /* number of allocated event channels */ ++ /* ++ * Number of in-use event channels. Writers should use write_atomic(). ++ * Readers need to use read_atomic() only when not holding event_lock. ++ */ ++ unsigned int active_evtchns; ++ /* ++ * Number of event channels used internally by Xen (not subject to ++ * EVTCHNOP_reset). Read/write access like for active_evtchns. ++ */ ++ unsigned int xen_evtchns; + spinlock_t event_lock; + const struct evtchn_port_ops *evtchn_port_ops; + struct evtchn_fifo_domain *evtchn_fifo; diff --git a/system/xen/xsa/xsa343-2.patch b/system/xen/xsa/xsa343-2.patch new file mode 100644 index 0000000000..b8eb4998f1 --- /dev/null +++ b/system/xen/xsa/xsa343-2.patch @@ -0,0 +1,295 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: evtchn: convert per-channel lock to be IRQ-safe + +... in order for send_guest_{global,vcpu}_virq() to be able to make use +of it. + +This is part of XSA-343. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Acked-by: Julien Grall <jgrall@amazon.com> +--- +v6: New. +--- +TBD: This is the "dumb" conversion variant. In a couple of cases the + slightly simpler spin_{,un}lock_irq() could apparently be used. + +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -248,6 +248,7 @@ static long evtchn_alloc_unbound(evtchn_ + int port; + domid_t dom = alloc->dom; + long rc; ++ unsigned long flags; + + d = rcu_lock_domain_by_any_id(dom); + if ( d == NULL ) +@@ -263,14 +264,14 @@ static long evtchn_alloc_unbound(evtchn_ + if ( rc ) + goto out; + +- spin_lock(&chn->lock); ++ spin_lock_irqsave(&chn->lock, flags); + + chn->state = ECS_UNBOUND; + if ( (chn->u.unbound.remote_domid = alloc->remote_dom) == DOMID_SELF ) + chn->u.unbound.remote_domid = current->domain->domain_id; + evtchn_port_init(d, chn); + +- spin_unlock(&chn->lock); ++ spin_unlock_irqrestore(&chn->lock, flags); + + alloc->port = port; + +@@ -283,26 +284,32 @@ static long evtchn_alloc_unbound(evtchn_ + } + + +-static void double_evtchn_lock(struct evtchn *lchn, struct evtchn *rchn) ++static unsigned long double_evtchn_lock(struct evtchn *lchn, ++ struct evtchn *rchn) + { +- if ( lchn < rchn ) ++ unsigned long flags; ++ ++ if ( lchn <= rchn ) + { +- spin_lock(&lchn->lock); +- spin_lock(&rchn->lock); ++ spin_lock_irqsave(&lchn->lock, flags); ++ if ( lchn != rchn ) ++ spin_lock(&rchn->lock); + } + else + { +- if ( lchn != rchn ) +- spin_lock(&rchn->lock); ++ spin_lock_irqsave(&rchn->lock, flags); + spin_lock(&lchn->lock); + } ++ ++ return flags; + } + +-static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn) ++static void double_evtchn_unlock(struct evtchn *lchn, struct evtchn *rchn, ++ unsigned long flags) + { +- spin_unlock(&lchn->lock); + if ( lchn != rchn ) +- spin_unlock(&rchn->lock); ++ spin_unlock(&lchn->lock); ++ spin_unlock_irqrestore(&rchn->lock, flags); + } + + static long evtchn_bind_interdomain(evtchn_bind_interdomain_t *bind) +@@ -312,6 +319,7 @@ static long evtchn_bind_interdomain(evtc + int lport, rport = bind->remote_port; + domid_t rdom = bind->remote_dom; + long rc; ++ unsigned long flags; + + if ( rdom == DOMID_SELF ) + rdom = current->domain->domain_id; +@@ -347,7 +355,7 @@ static long evtchn_bind_interdomain(evtc + if ( rc ) + goto out; + +- double_evtchn_lock(lchn, rchn); ++ flags = double_evtchn_lock(lchn, rchn); + + lchn->u.interdomain.remote_dom = rd; + lchn->u.interdomain.remote_port = rport; +@@ -364,7 +372,7 @@ static long evtchn_bind_interdomain(evtc + */ + evtchn_port_set_pending(ld, lchn->notify_vcpu_id, lchn); + +- double_evtchn_unlock(lchn, rchn); ++ double_evtchn_unlock(lchn, rchn, flags); + + bind->local_port = lport; + +@@ -387,6 +395,7 @@ int evtchn_bind_virq(evtchn_bind_virq_t + struct domain *d = current->domain; + int virq = bind->virq, vcpu = bind->vcpu; + int rc = 0; ++ unsigned long flags; + + if ( (virq < 0) || (virq >= ARRAY_SIZE(v->virq_to_evtchn)) ) + return -EINVAL; +@@ -424,14 +433,14 @@ int evtchn_bind_virq(evtchn_bind_virq_t + + chn = evtchn_from_port(d, port); + +- spin_lock(&chn->lock); ++ spin_lock_irqsave(&chn->lock, flags); + + chn->state = ECS_VIRQ; + chn->notify_vcpu_id = vcpu; + chn->u.virq = virq; + evtchn_port_init(d, chn); + +- spin_unlock(&chn->lock); ++ spin_unlock_irqrestore(&chn->lock, flags); + + v->virq_to_evtchn[virq] = bind->port = port; + +@@ -448,6 +457,7 @@ static long evtchn_bind_ipi(evtchn_bind_ + struct domain *d = current->domain; + int port, vcpu = bind->vcpu; + long rc = 0; ++ unsigned long flags; + + if ( domain_vcpu(d, vcpu) == NULL ) + return -ENOENT; +@@ -459,13 +469,13 @@ static long evtchn_bind_ipi(evtchn_bind_ + + chn = evtchn_from_port(d, port); + +- spin_lock(&chn->lock); ++ spin_lock_irqsave(&chn->lock, flags); + + chn->state = ECS_IPI; + chn->notify_vcpu_id = vcpu; + evtchn_port_init(d, chn); + +- spin_unlock(&chn->lock); ++ spin_unlock_irqrestore(&chn->lock, flags); + + bind->port = port; + +@@ -509,6 +519,7 @@ static long evtchn_bind_pirq(evtchn_bind + struct pirq *info; + int port = 0, pirq = bind->pirq; + long rc; ++ unsigned long flags; + + if ( (pirq < 0) || (pirq >= d->nr_pirqs) ) + return -EINVAL; +@@ -541,14 +552,14 @@ static long evtchn_bind_pirq(evtchn_bind + goto out; + } + +- spin_lock(&chn->lock); ++ spin_lock_irqsave(&chn->lock, flags); + + chn->state = ECS_PIRQ; + chn->u.pirq.irq = pirq; + link_pirq_port(port, chn, v); + evtchn_port_init(d, chn); + +- spin_unlock(&chn->lock); ++ spin_unlock_irqrestore(&chn->lock, flags); + + bind->port = port; + +@@ -569,6 +580,7 @@ int evtchn_close(struct domain *d1, int + struct evtchn *chn1, *chn2; + int port2; + long rc = 0; ++ unsigned long flags; + + again: + spin_lock(&d1->event_lock); +@@ -668,14 +680,14 @@ int evtchn_close(struct domain *d1, int + BUG_ON(chn2->state != ECS_INTERDOMAIN); + BUG_ON(chn2->u.interdomain.remote_dom != d1); + +- double_evtchn_lock(chn1, chn2); ++ flags = double_evtchn_lock(chn1, chn2); + + evtchn_free(d1, chn1); + + chn2->state = ECS_UNBOUND; + chn2->u.unbound.remote_domid = d1->domain_id; + +- double_evtchn_unlock(chn1, chn2); ++ double_evtchn_unlock(chn1, chn2, flags); + + goto out; + +@@ -683,9 +695,9 @@ int evtchn_close(struct domain *d1, int + BUG(); + } + +- spin_lock(&chn1->lock); ++ spin_lock_irqsave(&chn1->lock, flags); + evtchn_free(d1, chn1); +- spin_unlock(&chn1->lock); ++ spin_unlock_irqrestore(&chn1->lock, flags); + + out: + if ( d2 != NULL ) +@@ -705,13 +717,14 @@ int evtchn_send(struct domain *ld, unsig + struct evtchn *lchn, *rchn; + struct domain *rd; + int rport, ret = 0; ++ unsigned long flags; + + if ( !port_is_valid(ld, lport) ) + return -EINVAL; + + lchn = evtchn_from_port(ld, lport); + +- spin_lock(&lchn->lock); ++ spin_lock_irqsave(&lchn->lock, flags); + + /* Guest cannot send via a Xen-attached event channel. */ + if ( unlikely(consumer_is_xen(lchn)) ) +@@ -746,7 +759,7 @@ int evtchn_send(struct domain *ld, unsig + } + + out: +- spin_unlock(&lchn->lock); ++ spin_unlock_irqrestore(&lchn->lock, flags); + + return ret; + } +@@ -1238,6 +1251,7 @@ int alloc_unbound_xen_event_channel( + { + struct evtchn *chn; + int port, rc; ++ unsigned long flags; + + spin_lock(&ld->event_lock); + +@@ -1250,14 +1264,14 @@ int alloc_unbound_xen_event_channel( + if ( rc ) + goto out; + +- spin_lock(&chn->lock); ++ spin_lock_irqsave(&chn->lock, flags); + + chn->state = ECS_UNBOUND; + chn->xen_consumer = get_xen_consumer(notification_fn); + chn->notify_vcpu_id = lvcpu; + chn->u.unbound.remote_domid = remote_domid; + +- spin_unlock(&chn->lock); ++ spin_unlock_irqrestore(&chn->lock, flags); + + write_atomic(&ld->xen_evtchns, ld->xen_evtchns + 1); + +@@ -1280,11 +1294,12 @@ void notify_via_xen_event_channel(struct + { + struct evtchn *lchn, *rchn; + struct domain *rd; ++ unsigned long flags; + + ASSERT(port_is_valid(ld, lport)); + lchn = evtchn_from_port(ld, lport); + +- spin_lock(&lchn->lock); ++ spin_lock_irqsave(&lchn->lock, flags); + + if ( likely(lchn->state == ECS_INTERDOMAIN) ) + { +@@ -1294,7 +1309,7 @@ void notify_via_xen_event_channel(struct + evtchn_port_set_pending(rd, rchn->notify_vcpu_id, rchn); + } + +- spin_unlock(&lchn->lock); ++ spin_unlock_irqrestore(&lchn->lock, flags); + } + + void evtchn_check_pollers(struct domain *d, unsigned int port) diff --git a/system/xen/xsa/xsa343-3.patch b/system/xen/xsa/xsa343-3.patch new file mode 100644 index 0000000000..e513e308eb --- /dev/null +++ b/system/xen/xsa/xsa343-3.patch @@ -0,0 +1,392 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: evtchn: address races with evtchn_reset() + +Neither d->evtchn_port_ops nor max_evtchns(d) may be used in an entirely +lock-less manner, as both may change by a racing evtchn_reset(). In the +common case, at least one of the domain's event lock or the per-channel +lock needs to be held. In the specific case of the inter-domain sending +by evtchn_send() and notify_via_xen_event_channel() holding the other +side's per-channel lock is sufficient, as the channel can't change state +without both per-channel locks held. Without such a channel changing +state, evtchn_reset() can't complete successfully. + +Lock-free accesses continue to be permitted for the shim (calling some +otherwise internal event channel functions), as this happens while the +domain is in effectively single-threaded mode. Special care also needs +taking for the shim's marking of in-use ports as ECS_RESERVED (allowing +use of such ports in the shim case is okay because switching into and +hence also out of FIFO mode is impossihble there). + +As a side effect, certain operations on Xen bound event channels which +were mistakenly permitted so far (e.g. unmask or poll) will be refused +now. + +This is part of XSA-343. + +Reported-by: Julien Grall <jgrall@amazon.com> +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Acked-by: Julien Grall <jgrall@amazon.com> +--- +v9: Add arch_evtchn_is_special() to fix PV shim. +v8: Add BUILD_BUG_ON() in evtchn_usable(). +v7: Add locking related comment ahead of struct evtchn_port_ops. +v6: New. +--- +TBD: I've been considering to move some of the wrappers from xen/event.h + into event_channel.c (or even drop them altogether), when they + require external locking (e.g. evtchn_port_init() or + evtchn_port_set_priority()). Does anyone have a strong opinion + either way? + +--- a/xen/arch/x86/irq.c ++++ b/xen/arch/x86/irq.c +@@ -2488,14 +2488,24 @@ static void dump_irqs(unsigned char key) + + for ( i = 0; i < action->nr_guests; ) + { ++ struct evtchn *evtchn; ++ unsigned int pending = 2, masked = 2; ++ + d = action->guest[i++]; + pirq = domain_irq_to_pirq(d, irq); + info = pirq_info(d, pirq); ++ evtchn = evtchn_from_port(d, info->evtchn); ++ local_irq_disable(); ++ if ( spin_trylock(&evtchn->lock) ) ++ { ++ pending = evtchn_is_pending(d, evtchn); ++ masked = evtchn_is_masked(d, evtchn); ++ spin_unlock(&evtchn->lock); ++ } ++ local_irq_enable(); + printk("d%d:%3d(%c%c%c)%c", +- d->domain_id, pirq, +- evtchn_port_is_pending(d, info->evtchn) ? 'P' : '-', +- evtchn_port_is_masked(d, info->evtchn) ? 'M' : '-', +- info->masked ? 'M' : '-', ++ d->domain_id, pirq, "-P?"[pending], ++ "-M?"[masked], info->masked ? 'M' : '-', + i < action->nr_guests ? ',' : '\n'); + } + } +--- a/xen/arch/x86/pv/shim.c ++++ b/xen/arch/x86/pv/shim.c +@@ -660,8 +660,11 @@ void pv_shim_inject_evtchn(unsigned int + if ( port_is_valid(guest, port) ) + { + struct evtchn *chn = evtchn_from_port(guest, port); ++ unsigned long flags; + ++ spin_lock_irqsave(&chn->lock, flags); + evtchn_port_set_pending(guest, chn->notify_vcpu_id, chn); ++ spin_unlock_irqrestore(&chn->lock, flags); + } + } + +--- a/xen/common/event_2l.c ++++ b/xen/common/event_2l.c +@@ -63,8 +63,10 @@ static void evtchn_2l_unmask(struct doma + } + } + +-static bool evtchn_2l_is_pending(const struct domain *d, evtchn_port_t port) ++static bool evtchn_2l_is_pending(const struct domain *d, ++ const struct evtchn *evtchn) + { ++ evtchn_port_t port = evtchn->port; + unsigned int max_ports = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d); + + ASSERT(port < max_ports); +@@ -72,8 +74,10 @@ static bool evtchn_2l_is_pending(const s + guest_test_bit(d, port, &shared_info(d, evtchn_pending))); + } + +-static bool evtchn_2l_is_masked(const struct domain *d, evtchn_port_t port) ++static bool evtchn_2l_is_masked(const struct domain *d, ++ const struct evtchn *evtchn) + { ++ evtchn_port_t port = evtchn->port; + unsigned int max_ports = BITS_PER_EVTCHN_WORD(d) * BITS_PER_EVTCHN_WORD(d); + + ASSERT(port < max_ports); +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -156,8 +156,9 @@ int evtchn_allocate_port(struct domain * + + if ( port_is_valid(d, port) ) + { +- if ( evtchn_from_port(d, port)->state != ECS_FREE || +- evtchn_port_is_busy(d, port) ) ++ const struct evtchn *chn = evtchn_from_port(d, port); ++ ++ if ( chn->state != ECS_FREE || evtchn_is_busy(d, chn) ) + return -EBUSY; + } + else +@@ -774,6 +775,7 @@ void send_guest_vcpu_virq(struct vcpu *v + unsigned long flags; + int port; + struct domain *d; ++ struct evtchn *chn; + + ASSERT(!virq_is_global(virq)); + +@@ -784,7 +786,10 @@ void send_guest_vcpu_virq(struct vcpu *v + goto out; + + d = v->domain; +- evtchn_port_set_pending(d, v->vcpu_id, evtchn_from_port(d, port)); ++ chn = evtchn_from_port(d, port); ++ spin_lock(&chn->lock); ++ evtchn_port_set_pending(d, v->vcpu_id, chn); ++ spin_unlock(&chn->lock); + + out: + spin_unlock_irqrestore(&v->virq_lock, flags); +@@ -813,7 +818,9 @@ void send_guest_global_virq(struct domai + goto out; + + chn = evtchn_from_port(d, port); ++ spin_lock(&chn->lock); + evtchn_port_set_pending(d, chn->notify_vcpu_id, chn); ++ spin_unlock(&chn->lock); + + out: + spin_unlock_irqrestore(&v->virq_lock, flags); +@@ -823,6 +830,7 @@ void send_guest_pirq(struct domain *d, c + { + int port; + struct evtchn *chn; ++ unsigned long flags; + + /* + * PV guests: It should not be possible to race with __evtchn_close(). The +@@ -837,7 +845,9 @@ void send_guest_pirq(struct domain *d, c + } + + chn = evtchn_from_port(d, port); ++ spin_lock_irqsave(&chn->lock, flags); + evtchn_port_set_pending(d, chn->notify_vcpu_id, chn); ++ spin_unlock_irqrestore(&chn->lock, flags); + } + + static struct domain *global_virq_handlers[NR_VIRQS] __read_mostly; +@@ -1034,12 +1044,15 @@ int evtchn_unmask(unsigned int port) + { + struct domain *d = current->domain; + struct evtchn *evtchn; ++ unsigned long flags; + + if ( unlikely(!port_is_valid(d, port)) ) + return -EINVAL; + + evtchn = evtchn_from_port(d, port); ++ spin_lock_irqsave(&evtchn->lock, flags); + evtchn_port_unmask(d, evtchn); ++ spin_unlock_irqrestore(&evtchn->lock, flags); + + return 0; + } +@@ -1449,8 +1462,8 @@ static void domain_dump_evtchn_info(stru + + printk(" %4u [%d/%d/", + port, +- evtchn_port_is_pending(d, port), +- evtchn_port_is_masked(d, port)); ++ evtchn_is_pending(d, chn), ++ evtchn_is_masked(d, chn)); + evtchn_port_print_state(d, chn); + printk("]: s=%d n=%d x=%d", + chn->state, chn->notify_vcpu_id, chn->xen_consumer); +--- a/xen/common/event_fifo.c ++++ b/xen/common/event_fifo.c +@@ -296,23 +296,26 @@ static void evtchn_fifo_unmask(struct do + evtchn_fifo_set_pending(v, evtchn); + } + +-static bool evtchn_fifo_is_pending(const struct domain *d, evtchn_port_t port) ++static bool evtchn_fifo_is_pending(const struct domain *d, ++ const struct evtchn *evtchn) + { +- const event_word_t *word = evtchn_fifo_word_from_port(d, port); ++ const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port); + + return word && guest_test_bit(d, EVTCHN_FIFO_PENDING, word); + } + +-static bool_t evtchn_fifo_is_masked(const struct domain *d, evtchn_port_t port) ++static bool_t evtchn_fifo_is_masked(const struct domain *d, ++ const struct evtchn *evtchn) + { +- const event_word_t *word = evtchn_fifo_word_from_port(d, port); ++ const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port); + + return !word || guest_test_bit(d, EVTCHN_FIFO_MASKED, word); + } + +-static bool_t evtchn_fifo_is_busy(const struct domain *d, evtchn_port_t port) ++static bool_t evtchn_fifo_is_busy(const struct domain *d, ++ const struct evtchn *evtchn) + { +- const event_word_t *word = evtchn_fifo_word_from_port(d, port); ++ const event_word_t *word = evtchn_fifo_word_from_port(d, evtchn->port); + + return word && guest_test_bit(d, EVTCHN_FIFO_LINKED, word); + } +--- a/xen/include/asm-x86/event.h ++++ b/xen/include/asm-x86/event.h +@@ -47,4 +47,10 @@ static inline bool arch_virq_is_global(u + return true; + } + ++#ifdef CONFIG_PV_SHIM ++# include <asm/pv/shim.h> ++# define arch_evtchn_is_special(chn) \ ++ (pv_shim && (chn)->port && (chn)->state == ECS_RESERVED) ++#endif ++ + #endif +--- a/xen/include/xen/event.h ++++ b/xen/include/xen/event.h +@@ -133,6 +133,24 @@ static inline struct evtchn *evtchn_from + return bucket_from_port(d, p) + (p % EVTCHNS_PER_BUCKET); + } + ++/* ++ * "usable" as in "by a guest", i.e. Xen consumed channels are assumed to be ++ * taken care of separately where used for Xen's internal purposes. ++ */ ++static bool evtchn_usable(const struct evtchn *evtchn) ++{ ++ if ( evtchn->xen_consumer ) ++ return false; ++ ++#ifdef arch_evtchn_is_special ++ if ( arch_evtchn_is_special(evtchn) ) ++ return true; ++#endif ++ ++ BUILD_BUG_ON(ECS_FREE > ECS_RESERVED); ++ return evtchn->state > ECS_RESERVED; ++} ++ + /* Wait on a Xen-attached event channel. */ + #define wait_on_xen_event_channel(port, condition) \ + do { \ +@@ -165,19 +183,24 @@ int evtchn_reset(struct domain *d); + + /* + * Low-level event channel port ops. ++ * ++ * All hooks have to be called with a lock held which prevents the channel ++ * from changing state. This may be the domain event lock, the per-channel ++ * lock, or in the case of sending interdomain events also the other side's ++ * per-channel lock. Exceptions apply in certain cases for the PV shim. + */ + struct evtchn_port_ops { + void (*init)(struct domain *d, struct evtchn *evtchn); + void (*set_pending)(struct vcpu *v, struct evtchn *evtchn); + void (*clear_pending)(struct domain *d, struct evtchn *evtchn); + void (*unmask)(struct domain *d, struct evtchn *evtchn); +- bool (*is_pending)(const struct domain *d, evtchn_port_t port); +- bool (*is_masked)(const struct domain *d, evtchn_port_t port); ++ bool (*is_pending)(const struct domain *d, const struct evtchn *evtchn); ++ bool (*is_masked)(const struct domain *d, const struct evtchn *evtchn); + /* + * Is the port unavailable because it's still being cleaned up + * after being closed? + */ +- bool (*is_busy)(const struct domain *d, evtchn_port_t port); ++ bool (*is_busy)(const struct domain *d, const struct evtchn *evtchn); + int (*set_priority)(struct domain *d, struct evtchn *evtchn, + unsigned int priority); + void (*print_state)(struct domain *d, const struct evtchn *evtchn); +@@ -193,38 +216,67 @@ static inline void evtchn_port_set_pendi + unsigned int vcpu_id, + struct evtchn *evtchn) + { +- d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn); ++ if ( evtchn_usable(evtchn) ) ++ d->evtchn_port_ops->set_pending(d->vcpu[vcpu_id], evtchn); + } + + static inline void evtchn_port_clear_pending(struct domain *d, + struct evtchn *evtchn) + { +- d->evtchn_port_ops->clear_pending(d, evtchn); ++ if ( evtchn_usable(evtchn) ) ++ d->evtchn_port_ops->clear_pending(d, evtchn); + } + + static inline void evtchn_port_unmask(struct domain *d, + struct evtchn *evtchn) + { +- d->evtchn_port_ops->unmask(d, evtchn); ++ if ( evtchn_usable(evtchn) ) ++ d->evtchn_port_ops->unmask(d, evtchn); + } + +-static inline bool evtchn_port_is_pending(const struct domain *d, +- evtchn_port_t port) ++static inline bool evtchn_is_pending(const struct domain *d, ++ const struct evtchn *evtchn) + { +- return d->evtchn_port_ops->is_pending(d, port); ++ return evtchn_usable(evtchn) && d->evtchn_port_ops->is_pending(d, evtchn); + } + +-static inline bool evtchn_port_is_masked(const struct domain *d, +- evtchn_port_t port) ++static inline bool evtchn_port_is_pending(struct domain *d, evtchn_port_t port) + { +- return d->evtchn_port_ops->is_masked(d, port); ++ struct evtchn *evtchn = evtchn_from_port(d, port); ++ bool rc; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&evtchn->lock, flags); ++ rc = evtchn_is_pending(d, evtchn); ++ spin_unlock_irqrestore(&evtchn->lock, flags); ++ ++ return rc; ++} ++ ++static inline bool evtchn_is_masked(const struct domain *d, ++ const struct evtchn *evtchn) ++{ ++ return !evtchn_usable(evtchn) || d->evtchn_port_ops->is_masked(d, evtchn); ++} ++ ++static inline bool evtchn_port_is_masked(struct domain *d, evtchn_port_t port) ++{ ++ struct evtchn *evtchn = evtchn_from_port(d, port); ++ bool rc; ++ unsigned long flags; ++ ++ spin_lock_irqsave(&evtchn->lock, flags); ++ rc = evtchn_is_masked(d, evtchn); ++ spin_unlock_irqrestore(&evtchn->lock, flags); ++ ++ return rc; + } + +-static inline bool evtchn_port_is_busy(const struct domain *d, +- evtchn_port_t port) ++static inline bool evtchn_is_busy(const struct domain *d, ++ const struct evtchn *evtchn) + { + return d->evtchn_port_ops->is_busy && +- d->evtchn_port_ops->is_busy(d, port); ++ d->evtchn_port_ops->is_busy(d, evtchn); + } + + static inline int evtchn_port_set_priority(struct domain *d, +@@ -233,6 +285,8 @@ static inline int evtchn_port_set_priori + { + if ( !d->evtchn_port_ops->set_priority ) + return -ENOSYS; ++ if ( !evtchn_usable(evtchn) ) ++ return -EACCES; + return d->evtchn_port_ops->set_priority(d, evtchn, priority); + } + diff --git a/system/xen/xsa/xsa344-4.13-1.patch b/system/xen/xsa/xsa344-4.13-1.patch new file mode 100644 index 0000000000..d8e9b3f43f --- /dev/null +++ b/system/xen/xsa/xsa344-4.13-1.patch @@ -0,0 +1,130 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: evtchn: arrange for preemption in evtchn_destroy() + +Especially closing of fully established interdomain channels can take +quite some time, due to the locking involved. Therefore we shouldn't +assume we can clean up still active ports all in one go. Besides adding +the necessary preemption check, also avoid pointlessly starting from +(or now really ending at) 0; 1 is the lowest numbered port which may +need closing. + +Since we're now reducing ->valid_evtchns, free_xen_event_channel(), +and (at least to be on the safe side) notify_via_xen_event_channel() +need to cope with attempts to close / unbind from / send through already +closed (and no longer valid, as per port_is_valid()) ports. + +This is part of XSA-344. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Acked-by: Julien Grall <jgrall@amazon.com> +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> + +--- a/xen/common/domain.c ++++ b/xen/common/domain.c +@@ -770,12 +770,14 @@ int domain_kill(struct domain *d) + return domain_kill(d); + d->is_dying = DOMDYING_dying; + argo_destroy(d); +- evtchn_destroy(d); + gnttab_release_mappings(d); + vnuma_destroy(d->vnuma); + domain_set_outstanding_pages(d, 0); + /* fallthrough */ + case DOMDYING_dying: ++ rc = evtchn_destroy(d); ++ if ( rc ) ++ break; + rc = domain_relinquish_resources(d); + if ( rc != 0 ) + break; +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -1297,7 +1297,16 @@ int alloc_unbound_xen_event_channel( + + void free_xen_event_channel(struct domain *d, int port) + { +- BUG_ON(!port_is_valid(d, port)); ++ if ( !port_is_valid(d, port) ) ++ { ++ /* ++ * Make sure ->is_dying is read /after/ ->valid_evtchns, pairing ++ * with the spin_barrier() and BUG_ON() in evtchn_destroy(). ++ */ ++ smp_rmb(); ++ BUG_ON(!d->is_dying); ++ return; ++ } + + evtchn_close(d, port, 0); + } +@@ -1309,7 +1318,17 @@ void notify_via_xen_event_channel(struct + struct domain *rd; + unsigned long flags; + +- ASSERT(port_is_valid(ld, lport)); ++ if ( !port_is_valid(ld, lport) ) ++ { ++ /* ++ * Make sure ->is_dying is read /after/ ->valid_evtchns, pairing ++ * with the spin_barrier() and BUG_ON() in evtchn_destroy(). ++ */ ++ smp_rmb(); ++ ASSERT(ld->is_dying); ++ return; ++ } ++ + lchn = evtchn_from_port(ld, lport); + + spin_lock_irqsave(&lchn->lock, flags); +@@ -1380,8 +1399,7 @@ int evtchn_init(struct domain *d, unsign + return 0; + } + +- +-void evtchn_destroy(struct domain *d) ++int evtchn_destroy(struct domain *d) + { + unsigned int i; + +@@ -1390,14 +1408,29 @@ void evtchn_destroy(struct domain *d) + spin_barrier(&d->event_lock); + + /* Close all existing event channels. */ +- for ( i = 0; port_is_valid(d, i); i++ ) ++ for ( i = d->valid_evtchns; --i; ) ++ { + evtchn_close(d, i, 0); + ++ /* ++ * Avoid preempting when called from domain_create()'s error path, ++ * and don't check too often (choice of frequency is arbitrary). ++ */ ++ if ( i && !(i & 0x3f) && d->is_dying != DOMDYING_dead && ++ hypercall_preempt_check() ) ++ { ++ write_atomic(&d->valid_evtchns, i); ++ return -ERESTART; ++ } ++ } ++ + ASSERT(!d->active_evtchns); + + clear_global_virq_handlers(d); + + evtchn_fifo_destroy(d); ++ ++ return 0; + } + + +--- a/xen/include/xen/sched.h ++++ b/xen/include/xen/sched.h +@@ -136,7 +136,7 @@ struct evtchn + } __attribute__((aligned(64))); + + int evtchn_init(struct domain *d, unsigned int max_port); +-void evtchn_destroy(struct domain *d); /* from domain_kill */ ++int evtchn_destroy(struct domain *d); /* from domain_kill */ + void evtchn_destroy_final(struct domain *d); /* from complete_domain_destroy */ + + struct waitqueue_vcpu; diff --git a/system/xen/xsa/xsa344-4.13-2.patch b/system/xen/xsa/xsa344-4.13-2.patch new file mode 100644 index 0000000000..3f0339498f --- /dev/null +++ b/system/xen/xsa/xsa344-4.13-2.patch @@ -0,0 +1,203 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: evtchn: arrange for preemption in evtchn_reset() + +Like for evtchn_destroy() looping over all possible event channels to +close them can take a significant amount of time. Unlike done there, we +can't alter domain properties (i.e. d->valid_evtchns) here. Borrow, in a +lightweight form, the paging domctl continuation concept, redirecting +the continuations to different sub-ops. Just like there this is to be +able to allow for predictable overall results of the involved sub-ops: +Racing requests should either complete or be refused. + +Note that a domain can't interfere with an already started (by a remote +domain) reset, due to being paused. It can prevent a remote reset from +happening by leaving a reset unfinished, but that's only going to affect +itself. + +This is part of XSA-344. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Acked-by: Julien Grall <jgrall@amazon.com> +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> + +--- a/xen/common/domain.c ++++ b/xen/common/domain.c +@@ -1214,7 +1214,7 @@ void domain_unpause_except_self(struct d + domain_unpause(d); + } + +-int domain_soft_reset(struct domain *d) ++int domain_soft_reset(struct domain *d, bool resuming) + { + struct vcpu *v; + int rc; +@@ -1228,7 +1228,7 @@ int domain_soft_reset(struct domain *d) + } + spin_unlock(&d->shutdown_lock); + +- rc = evtchn_reset(d); ++ rc = evtchn_reset(d, resuming); + if ( rc ) + return rc; + +--- a/xen/common/domctl.c ++++ b/xen/common/domctl.c +@@ -572,12 +572,22 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xe + } + + case XEN_DOMCTL_soft_reset: ++ case XEN_DOMCTL_soft_reset_cont: + if ( d == current->domain ) /* no domain_pause() */ + { + ret = -EINVAL; + break; + } +- ret = domain_soft_reset(d); ++ ret = domain_soft_reset(d, op->cmd == XEN_DOMCTL_soft_reset_cont); ++ if ( ret == -ERESTART ) ++ { ++ op->cmd = XEN_DOMCTL_soft_reset_cont; ++ if ( !__copy_field_to_guest(u_domctl, op, cmd) ) ++ ret = hypercall_create_continuation(__HYPERVISOR_domctl, ++ "h", u_domctl); ++ else ++ ret = -EFAULT; ++ } + break; + + case XEN_DOMCTL_destroydomain: +--- a/xen/common/event_channel.c ++++ b/xen/common/event_channel.c +@@ -1057,7 +1057,7 @@ int evtchn_unmask(unsigned int port) + return 0; + } + +-int evtchn_reset(struct domain *d) ++int evtchn_reset(struct domain *d, bool resuming) + { + unsigned int i; + int rc = 0; +@@ -1065,11 +1065,40 @@ int evtchn_reset(struct domain *d) + if ( d != current->domain && !d->controller_pause_count ) + return -EINVAL; + +- for ( i = 0; port_is_valid(d, i); i++ ) ++ spin_lock(&d->event_lock); ++ ++ /* ++ * If we are resuming, then start where we stopped. Otherwise, check ++ * that a reset operation is not already in progress, and if none is, ++ * record that this is now the case. ++ */ ++ i = resuming ? d->next_evtchn : !d->next_evtchn; ++ if ( i > d->next_evtchn ) ++ d->next_evtchn = i; ++ ++ spin_unlock(&d->event_lock); ++ ++ if ( !i ) ++ return -EBUSY; ++ ++ for ( ; port_is_valid(d, i); i++ ) ++ { + evtchn_close(d, i, 1); + ++ /* NB: Choice of frequency is arbitrary. */ ++ if ( !(i & 0x3f) && hypercall_preempt_check() ) ++ { ++ spin_lock(&d->event_lock); ++ d->next_evtchn = i; ++ spin_unlock(&d->event_lock); ++ return -ERESTART; ++ } ++ } ++ + spin_lock(&d->event_lock); + ++ d->next_evtchn = 0; ++ + if ( d->active_evtchns > d->xen_evtchns ) + rc = -EAGAIN; + else if ( d->evtchn_fifo ) +@@ -1204,7 +1233,8 @@ long do_event_channel_op(int cmd, XEN_GU + break; + } + +- case EVTCHNOP_reset: { ++ case EVTCHNOP_reset: ++ case EVTCHNOP_reset_cont: { + struct evtchn_reset reset; + struct domain *d; + +@@ -1217,9 +1247,13 @@ long do_event_channel_op(int cmd, XEN_GU + + rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d); + if ( !rc ) +- rc = evtchn_reset(d); ++ rc = evtchn_reset(d, cmd == EVTCHNOP_reset_cont); + + rcu_unlock_domain(d); ++ ++ if ( rc == -ERESTART ) ++ rc = hypercall_create_continuation(__HYPERVISOR_event_channel_op, ++ "ih", EVTCHNOP_reset_cont, arg); + break; + } + +--- a/xen/include/public/domctl.h ++++ b/xen/include/public/domctl.h +@@ -1152,7 +1152,10 @@ struct xen_domctl { + #define XEN_DOMCTL_iomem_permission 20 + #define XEN_DOMCTL_ioport_permission 21 + #define XEN_DOMCTL_hypercall_init 22 +-#define XEN_DOMCTL_arch_setup 23 /* Obsolete IA64 only */ ++#ifdef __XEN__ ++/* #define XEN_DOMCTL_arch_setup 23 Obsolete IA64 only */ ++#define XEN_DOMCTL_soft_reset_cont 23 ++#endif + #define XEN_DOMCTL_settimeoffset 24 + #define XEN_DOMCTL_getvcpuaffinity 25 + #define XEN_DOMCTL_real_mode_area 26 /* Obsolete PPC only */ +--- a/xen/include/public/event_channel.h ++++ b/xen/include/public/event_channel.h +@@ -74,6 +74,9 @@ + #define EVTCHNOP_init_control 11 + #define EVTCHNOP_expand_array 12 + #define EVTCHNOP_set_priority 13 ++#ifdef __XEN__ ++#define EVTCHNOP_reset_cont 14 ++#endif + /* ` } */ + + typedef uint32_t evtchn_port_t; +--- a/xen/include/xen/event.h ++++ b/xen/include/xen/event.h +@@ -171,7 +171,7 @@ void evtchn_check_pollers(struct domain + void evtchn_2l_init(struct domain *d); + + /* Close all event channels and reset to 2-level ABI. */ +-int evtchn_reset(struct domain *d); ++int evtchn_reset(struct domain *d, bool resuming); + + /* + * Low-level event channel port ops. +--- a/xen/include/xen/sched.h ++++ b/xen/include/xen/sched.h +@@ -394,6 +394,8 @@ struct domain + * EVTCHNOP_reset). Read/write access like for active_evtchns. + */ + unsigned int xen_evtchns; ++ /* Port to resume from in evtchn_reset(), when in a continuation. */ ++ unsigned int next_evtchn; + spinlock_t event_lock; + const struct evtchn_port_ops *evtchn_port_ops; + struct evtchn_fifo_domain *evtchn_fifo; +@@ -663,7 +665,7 @@ int domain_shutdown(struct domain *d, u8 + void domain_resume(struct domain *d); + void domain_pause_for_debugger(void); + +-int domain_soft_reset(struct domain *d); ++int domain_soft_reset(struct domain *d, bool resuming); + + int vcpu_start_shutdown_deferral(struct vcpu *v); + void vcpu_end_shutdown_deferral(struct vcpu *v); diff --git a/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch b/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch new file mode 100644 index 0000000000..d325385a56 --- /dev/null +++ b/system/xen/xsa/xsa345-0001-x86-mm-Refactor-map_pages_to_xen-to-have-only-a-sing.patch @@ -0,0 +1,94 @@ +From b3e0d4e37b7902533a463812374947d4d6d2e463 Mon Sep 17 00:00:00 2001 +From: Wei Liu <wei.liu2@citrix.com> +Date: Sat, 11 Jan 2020 21:57:41 +0000 +Subject: [PATCH 1/3] x86/mm: Refactor map_pages_to_xen to have only a single + exit path + +We will soon need to perform clean-ups before returning. + +No functional change. + +This is part of XSA-345. + +Reported-by: Hongyan Xia <hongyxia@amazon.com> +Signed-off-by: Wei Liu <wei.liu2@citrix.com> +Signed-off-by: Hongyan Xia <hongyxia@amazon.com> +Signed-off-by: George Dunlap <george.dunlap@citrix.com> +Acked-by: Jan Beulich <jbeulich@suse.com> +--- + xen/arch/x86/mm.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c +index 30dffb68e8..133a393875 100644 +--- a/xen/arch/x86/mm.c ++++ b/xen/arch/x86/mm.c +@@ -5187,6 +5187,7 @@ int map_pages_to_xen( + l2_pgentry_t *pl2e, ol2e; + l1_pgentry_t *pl1e, ol1e; + unsigned int i; ++ int rc = -ENOMEM; + + #define flush_flags(oldf) do { \ + unsigned int o_ = (oldf); \ +@@ -5207,7 +5208,8 @@ int map_pages_to_xen( + l3_pgentry_t ol3e, *pl3e = virt_to_xen_l3e(virt); + + if ( !pl3e ) +- return -ENOMEM; ++ goto out; ++ + ol3e = *pl3e; + + if ( cpu_has_page1gb && +@@ -5295,7 +5297,7 @@ int map_pages_to_xen( + + pl2e = alloc_xen_pagetable(); + if ( pl2e == NULL ) +- return -ENOMEM; ++ goto out; + + for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ ) + l2e_write(pl2e + i, +@@ -5324,7 +5326,7 @@ int map_pages_to_xen( + + pl2e = virt_to_xen_l2e(virt); + if ( !pl2e ) +- return -ENOMEM; ++ goto out; + + if ( ((((virt >> PAGE_SHIFT) | mfn_x(mfn)) & + ((1u << PAGETABLE_ORDER) - 1)) == 0) && +@@ -5367,7 +5369,7 @@ int map_pages_to_xen( + { + pl1e = virt_to_xen_l1e(virt); + if ( pl1e == NULL ) +- return -ENOMEM; ++ goto out; + } + else if ( l2e_get_flags(*pl2e) & _PAGE_PSE ) + { +@@ -5394,7 +5396,7 @@ int map_pages_to_xen( + + pl1e = alloc_xen_pagetable(); + if ( pl1e == NULL ) +- return -ENOMEM; ++ goto out; + + for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) + l1e_write(&pl1e[i], +@@ -5538,7 +5540,10 @@ int map_pages_to_xen( + + #undef flush_flags + +- return 0; ++ rc = 0; ++ ++ out: ++ return rc; + } + + int populate_pt_range(unsigned long virt, unsigned long nr_mfns) +-- +2.25.1 + diff --git a/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch b/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch new file mode 100644 index 0000000000..836bed681a --- /dev/null +++ b/system/xen/xsa/xsa345-0002-x86-mm-Refactor-modify_xen_mappings-to-have-one-exit.patch @@ -0,0 +1,68 @@ +From 9f6f35b833d295acaaa2d8ff8cf309bf688cfd50 Mon Sep 17 00:00:00 2001 +From: Wei Liu <wei.liu2@citrix.com> +Date: Sat, 11 Jan 2020 21:57:42 +0000 +Subject: [PATCH 2/3] x86/mm: Refactor modify_xen_mappings to have one exit + path + +We will soon need to perform clean-ups before returning. + +No functional change. + +This is part of XSA-345. + +Reported-by: Hongyan Xia <hongyxia@amazon.com> +Signed-off-by: Wei Liu <wei.liu2@citrix.com> +Signed-off-by: Hongyan Xia <hongyxia@amazon.com> +Signed-off-by: George Dunlap <george.dunlap@citrix.com> +Acked-by: Jan Beulich <jbeulich@suse.com> +--- + xen/arch/x86/mm.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c +index 133a393875..af726d3274 100644 +--- a/xen/arch/x86/mm.c ++++ b/xen/arch/x86/mm.c +@@ -5570,6 +5570,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) + l1_pgentry_t *pl1e; + unsigned int i; + unsigned long v = s; ++ int rc = -ENOMEM; + + /* Set of valid PTE bits which may be altered. */ + #define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT) +@@ -5611,7 +5612,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) + /* PAGE1GB: shatter the superpage and fall through. */ + pl2e = alloc_xen_pagetable(); + if ( !pl2e ) +- return -ENOMEM; ++ goto out; ++ + for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ ) + l2e_write(pl2e + i, + l2e_from_pfn(l3e_get_pfn(*pl3e) + +@@ -5666,7 +5668,8 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) + /* PSE: shatter the superpage and try again. */ + pl1e = alloc_xen_pagetable(); + if ( !pl1e ) +- return -ENOMEM; ++ goto out; ++ + for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) + l1e_write(&pl1e[i], + l1e_from_pfn(l2e_get_pfn(*pl2e) + i, +@@ -5795,7 +5798,10 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) + flush_area(NULL, FLUSH_TLB_GLOBAL); + + #undef FLAGS_MASK +- return 0; ++ rc = 0; ++ ++ out: ++ return rc; + } + + #undef flush_area +-- +2.25.1 + diff --git a/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch b/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch new file mode 100644 index 0000000000..db407416b9 --- /dev/null +++ b/system/xen/xsa/xsa345-0003-x86-mm-Prevent-some-races-in-hypervisor-mapping-upda.patch @@ -0,0 +1,249 @@ +From 0ff9a8453dc47cd47eee9659d5916afb5094e871 Mon Sep 17 00:00:00 2001 +From: Hongyan Xia <hongyxia@amazon.com> +Date: Sat, 11 Jan 2020 21:57:43 +0000 +Subject: [PATCH 3/3] x86/mm: Prevent some races in hypervisor mapping updates + +map_pages_to_xen will attempt to coalesce mappings into 2MiB and 1GiB +superpages if possible, to maximize TLB efficiency. This means both +replacing superpage entries with smaller entries, and replacing +smaller entries with superpages. + +Unfortunately, while some potential races are handled correctly, +others are not. These include: + +1. When one processor modifies a sub-superpage mapping while another +processor replaces the entire range with a superpage. + +Take the following example: + +Suppose L3[N] points to L2. And suppose we have two processors, A and +B. + +* A walks the pagetables, get a pointer to L2. +* B replaces L3[N] with a 1GiB mapping. +* B Frees L2 +* A writes L2[M] # + +This is race exacerbated by the fact that virt_to_xen_l[21]e doesn't +handle higher-level superpages properly: If you call virt_xen_to_l2e +on a virtual address within an L3 superpage, you'll either hit a BUG() +(most likely), or get a pointer into the middle of a data page; same +with virt_xen_to_l1 on a virtual address within either an L3 or L2 +superpage. + +So take the following example: + +* A reads pl3e and discovers it to point to an L2. +* B replaces L3[N] with a 1GiB mapping +* A calls virt_to_xen_l2e() and hits the BUG_ON() # + +2. When two processors simultaneously try to replace a sub-superpage +mapping with a superpage mapping. + +Take the following example: + +Suppose L3[N] points to L2. And suppose we have two processors, A and B, +both trying to replace L3[N] with a superpage. + +* A walks the pagetables, get a pointer to pl3e, and takes a copy ol3e pointing to L2. +* B walks the pagetables, gets a pointre to pl3e, and takes a copy ol3e pointing to L2. +* A writes the new value into L3[N] +* B writes the new value into L3[N] +* A recursively frees all the L1's under L2, then frees L2 +* B recursively double-frees all the L1's under L2, then double-frees L2 # + +Fix this by grabbing a lock for the entirety of the mapping update +operation. + +Rather than grabbing map_pgdir_lock for the entire operation, however, +repurpose the PGT_locked bit from L3's page->type_info as a lock. +This means that rather than locking the entire address space, we +"only" lock a single 512GiB chunk of hypervisor address space at a +time. + +There was a proposal for a lock-and-reverify approach, where we walk +the pagetables to the point where we decide what to do; then grab the +map_pgdir_lock, re-verify the information we collected without the +lock, and finally make the change (starting over again if anything had +changed). Without being able to guarantee that the L2 table wasn't +freed, however, that means every read would need to be considered +potentially unsafe. Thinking carefully about that is probably +something that wants to be done on public, not under time pressure. + +This is part of XSA-345. + +Reported-by: Hongyan Xia <hongyxia@amazon.com> +Signed-off-by: Hongyan Xia <hongyxia@amazon.com> +Signed-off-by: George Dunlap <george.dunlap@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +--- + xen/arch/x86/mm.c | 92 +++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 89 insertions(+), 3 deletions(-) + +diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c +index af726d3274..d6a0761f43 100644 +--- a/xen/arch/x86/mm.c ++++ b/xen/arch/x86/mm.c +@@ -2167,6 +2167,50 @@ void page_unlock(struct page_info *page) + current_locked_page_set(NULL); + } + ++/* ++ * L3 table locks: ++ * ++ * Used for serialization in map_pages_to_xen() and modify_xen_mappings(). ++ * ++ * For Xen PT pages, the page->u.inuse.type_info is unused and it is safe to ++ * reuse the PGT_locked flag. This lock is taken only when we move down to L3 ++ * tables and below, since L4 (and above, for 5-level paging) is still globally ++ * protected by map_pgdir_lock. ++ * ++ * PV MMU update hypercalls call map_pages_to_xen while holding a page's page_lock(). ++ * This has two implications: ++ * - We cannot reuse reuse current_locked_page_* for debugging ++ * - To avoid the chance of deadlock, even for different pages, we ++ * must never grab page_lock() after grabbing l3t_lock(). This ++ * includes any page_lock()-based locks, such as ++ * mem_sharing_page_lock(). ++ * ++ * Also note that we grab the map_pgdir_lock while holding the ++ * l3t_lock(), so to avoid deadlock we must avoid grabbing them in ++ * reverse order. ++ */ ++static void l3t_lock(struct page_info *page) ++{ ++ unsigned long x, nx; ++ ++ do { ++ while ( (x = page->u.inuse.type_info) & PGT_locked ) ++ cpu_relax(); ++ nx = x | PGT_locked; ++ } while ( cmpxchg(&page->u.inuse.type_info, x, nx) != x ); ++} ++ ++static void l3t_unlock(struct page_info *page) ++{ ++ unsigned long x, nx, y = page->u.inuse.type_info; ++ ++ do { ++ x = y; ++ BUG_ON(!(x & PGT_locked)); ++ nx = x & ~PGT_locked; ++ } while ( (y = cmpxchg(&page->u.inuse.type_info, x, nx)) != x ); ++} ++ + #ifdef CONFIG_PV + /* + * PTE flags that a guest may change without re-validating the PTE. +@@ -5177,6 +5221,23 @@ l1_pgentry_t *virt_to_xen_l1e(unsigned long v) + flush_area_local((const void *)v, f) : \ + flush_area_all((const void *)v, f)) + ++#define L3T_INIT(page) (page) = ZERO_BLOCK_PTR ++ ++#define L3T_LOCK(page) \ ++ do { \ ++ if ( locking ) \ ++ l3t_lock(page); \ ++ } while ( false ) ++ ++#define L3T_UNLOCK(page) \ ++ do { \ ++ if ( locking && (page) != ZERO_BLOCK_PTR ) \ ++ { \ ++ l3t_unlock(page); \ ++ (page) = ZERO_BLOCK_PTR; \ ++ } \ ++ } while ( false ) ++ + int map_pages_to_xen( + unsigned long virt, + mfn_t mfn, +@@ -5188,6 +5249,7 @@ int map_pages_to_xen( + l1_pgentry_t *pl1e, ol1e; + unsigned int i; + int rc = -ENOMEM; ++ struct page_info *current_l3page; + + #define flush_flags(oldf) do { \ + unsigned int o_ = (oldf); \ +@@ -5203,13 +5265,20 @@ int map_pages_to_xen( + } \ + } while (0) + ++ L3T_INIT(current_l3page); ++ + while ( nr_mfns != 0 ) + { +- l3_pgentry_t ol3e, *pl3e = virt_to_xen_l3e(virt); ++ l3_pgentry_t *pl3e, ol3e; + ++ L3T_UNLOCK(current_l3page); ++ ++ pl3e = virt_to_xen_l3e(virt); + if ( !pl3e ) + goto out; + ++ current_l3page = virt_to_page(pl3e); ++ L3T_LOCK(current_l3page); + ol3e = *pl3e; + + if ( cpu_has_page1gb && +@@ -5543,6 +5612,7 @@ int map_pages_to_xen( + rc = 0; + + out: ++ L3T_UNLOCK(current_l3page); + return rc; + } + +@@ -5571,6 +5641,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) + unsigned int i; + unsigned long v = s; + int rc = -ENOMEM; ++ struct page_info *current_l3page; + + /* Set of valid PTE bits which may be altered. */ + #define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT) +@@ -5579,11 +5650,22 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) + ASSERT(IS_ALIGNED(s, PAGE_SIZE)); + ASSERT(IS_ALIGNED(e, PAGE_SIZE)); + ++ L3T_INIT(current_l3page); ++ + while ( v < e ) + { +- l3_pgentry_t *pl3e = virt_to_xen_l3e(v); ++ l3_pgentry_t *pl3e; ++ ++ L3T_UNLOCK(current_l3page); + +- if ( !pl3e || !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) ++ pl3e = virt_to_xen_l3e(v); ++ if ( !pl3e ) ++ goto out; ++ ++ current_l3page = virt_to_page(pl3e); ++ L3T_LOCK(current_l3page); ++ ++ if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) ) + { + /* Confirm the caller isn't trying to create new mappings. */ + ASSERT(!(nf & _PAGE_PRESENT)); +@@ -5801,9 +5883,13 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) + rc = 0; + + out: ++ L3T_UNLOCK(current_l3page); + return rc; + } + ++#undef L3T_LOCK ++#undef L3T_UNLOCK ++ + #undef flush_area + + int destroy_xen_mappings(unsigned long s, unsigned long e) +-- +2.25.1 + diff --git a/system/xen/xsa/xsa346-4.13-1.patch b/system/xen/xsa/xsa346-4.13-1.patch new file mode 100644 index 0000000000..a32e658e80 --- /dev/null +++ b/system/xen/xsa/xsa346-4.13-1.patch @@ -0,0 +1,50 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: IOMMU: suppress "iommu_dont_flush_iotlb" when about to free a page + +Deferring flushes to a single, wide range one - as is done when +handling XENMAPSPACE_gmfn_range - is okay only as long as +pages don't get freed ahead of the eventual flush. While the only +function setting the flag (xenmem_add_to_physmap()) suggests by its name +that it's only mapping new entries, in reality the way +xenmem_add_to_physmap_one() works means an unmap would happen not only +for the page being moved (but not freed) but, if the destination GFN is +populated, also for the page being displaced from that GFN. Collapsing +the two flushes for this GFN into just one (end even more so deferring +it to a batched invocation) is not correct. + +This is part of XSA-346. + +Fixes: cf95b2a9fd5a ("iommu: Introduce per cpu flag (iommu_dont_flush_iotlb) to avoid unnecessary iotlb... ") +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Paul Durrant <paul@xen.org> +Acked-by: Julien Grall <jgrall@amazon.com> + +--- a/xen/common/memory.c ++++ b/xen/common/memory.c +@@ -292,6 +292,7 @@ int guest_remove_page(struct domain *d, + p2m_type_t p2mt; + #endif + mfn_t mfn; ++ bool *dont_flush_p, dont_flush; + int rc; + + #ifdef CONFIG_X86 +@@ -378,8 +379,18 @@ int guest_remove_page(struct domain *d, + return -ENXIO; + } + ++ /* ++ * Since we're likely to free the page below, we need to suspend ++ * xenmem_add_to_physmap()'s suppressing of IOMMU TLB flushes. ++ */ ++ dont_flush_p = &this_cpu(iommu_dont_flush_iotlb); ++ dont_flush = *dont_flush_p; ++ *dont_flush_p = false; ++ + rc = guest_physmap_remove_page(d, _gfn(gmfn), mfn, 0); + ++ *dont_flush_p = dont_flush; ++ + /* + * With the lack of an IOMMU on some platforms, domains with DMA-capable + * device must retrieve the same pfn when the hypercall populate_physmap diff --git a/system/xen/xsa/xsa346-4.13-2.patch b/system/xen/xsa/xsa346-4.13-2.patch new file mode 100644 index 0000000000..6371b5c3db --- /dev/null +++ b/system/xen/xsa/xsa346-4.13-2.patch @@ -0,0 +1,204 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: IOMMU: hold page ref until after deferred TLB flush + +When moving around a page via XENMAPSPACE_gmfn_range, deferring the TLB +flush for the "from" GFN range requires that the page remains allocated +to the guest until the TLB flush has actually occurred. Otherwise a +parallel hypercall to remove the page would only flush the TLB for the +GFN it has been moved to, but not the one is was mapped at originally. + +This is part of XSA-346. + +Fixes: cf95b2a9fd5a ("iommu: Introduce per cpu flag (iommu_dont_flush_iotlb) to avoid unnecessary iotlb... ") +Reported-by: Julien Grall <jgrall@amazon.com> +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Acked-by: Julien Grall <jgrall@amazon.com> + +--- a/xen/arch/arm/mm.c ++++ b/xen/arch/arm/mm.c +@@ -1407,7 +1407,7 @@ void share_xen_page_with_guest(struct pa + int xenmem_add_to_physmap_one( + struct domain *d, + unsigned int space, +- union xen_add_to_physmap_batch_extra extra, ++ union add_to_physmap_extra extra, + unsigned long idx, + gfn_t gfn) + { +@@ -1480,10 +1480,6 @@ int xenmem_add_to_physmap_one( + break; + } + case XENMAPSPACE_dev_mmio: +- /* extra should be 0. Reserved for future use. */ +- if ( extra.res0 ) +- return -EOPNOTSUPP; +- + rc = map_dev_mmio_region(d, gfn, 1, _mfn(idx)); + return rc; + +--- a/xen/arch/x86/mm.c ++++ b/xen/arch/x86/mm.c +@@ -4617,7 +4617,7 @@ static int handle_iomem_range(unsigned l + int xenmem_add_to_physmap_one( + struct domain *d, + unsigned int space, +- union xen_add_to_physmap_batch_extra extra, ++ union add_to_physmap_extra extra, + unsigned long idx, + gfn_t gpfn) + { +@@ -4701,9 +4701,20 @@ int xenmem_add_to_physmap_one( + rc = guest_physmap_add_page(d, gpfn, mfn, PAGE_ORDER_4K); + + put_both: +- /* In the XENMAPSPACE_gmfn case, we took a ref of the gfn at the top. */ ++ /* ++ * In the XENMAPSPACE_gmfn case, we took a ref of the gfn at the top. ++ * We also may need to transfer ownership of the page reference to our ++ * caller. ++ */ + if ( space == XENMAPSPACE_gmfn ) ++ { + put_gfn(d, gfn); ++ if ( !rc && extra.ppage ) ++ { ++ *extra.ppage = page; ++ page = NULL; ++ } ++ } + + if ( page ) + put_page(page); +--- a/xen/common/memory.c ++++ b/xen/common/memory.c +@@ -814,13 +814,12 @@ int xenmem_add_to_physmap(struct domain + { + unsigned int done = 0; + long rc = 0; +- union xen_add_to_physmap_batch_extra extra; ++ union add_to_physmap_extra extra = {}; ++ struct page_info *pages[16]; + + ASSERT(paging_mode_translate(d)); + +- if ( xatp->space != XENMAPSPACE_gmfn_foreign ) +- extra.res0 = 0; +- else ++ if ( xatp->space == XENMAPSPACE_gmfn_foreign ) + extra.foreign_domid = DOMID_INVALID; + + if ( xatp->space != XENMAPSPACE_gmfn_range ) +@@ -835,7 +834,10 @@ int xenmem_add_to_physmap(struct domain + xatp->size -= start; + + if ( is_iommu_enabled(d) ) ++ { + this_cpu(iommu_dont_flush_iotlb) = 1; ++ extra.ppage = &pages[0]; ++ } + + while ( xatp->size > done ) + { +@@ -847,8 +849,12 @@ int xenmem_add_to_physmap(struct domain + xatp->idx++; + xatp->gpfn++; + ++ if ( extra.ppage ) ++ ++extra.ppage; ++ + /* Check for continuation if it's not the last iteration. */ +- if ( xatp->size > ++done && hypercall_preempt_check() ) ++ if ( (++done > ARRAY_SIZE(pages) && extra.ppage) || ++ (xatp->size > done && hypercall_preempt_check()) ) + { + rc = start + done; + break; +@@ -858,6 +864,7 @@ int xenmem_add_to_physmap(struct domain + if ( is_iommu_enabled(d) ) + { + int ret; ++ unsigned int i; + + this_cpu(iommu_dont_flush_iotlb) = 0; + +@@ -866,6 +873,15 @@ int xenmem_add_to_physmap(struct domain + if ( unlikely(ret) && rc >= 0 ) + rc = ret; + ++ /* ++ * Now that the IOMMU TLB flush was done for the original GFN, drop ++ * the page references. The 2nd flush below is fine to make later, as ++ * whoever removes the page again from its new GFN will have to do ++ * another flush anyway. ++ */ ++ for ( i = 0; i < done; ++i ) ++ put_page(pages[i]); ++ + ret = iommu_iotlb_flush(d, _dfn(xatp->gpfn - done), done, + IOMMU_FLUSHF_added | IOMMU_FLUSHF_modified); + if ( unlikely(ret) && rc >= 0 ) +@@ -879,6 +895,8 @@ static int xenmem_add_to_physmap_batch(s + struct xen_add_to_physmap_batch *xatpb, + unsigned int extent) + { ++ union add_to_physmap_extra extra = {}; ++ + if ( unlikely(xatpb->size < extent) ) + return -EILSEQ; + +@@ -890,6 +908,19 @@ static int xenmem_add_to_physmap_batch(s + !guest_handle_subrange_okay(xatpb->errs, extent, xatpb->size - 1) ) + return -EFAULT; + ++ switch ( xatpb->space ) ++ { ++ case XENMAPSPACE_dev_mmio: ++ /* res0 is reserved for future use. */ ++ if ( xatpb->u.res0 ) ++ return -EOPNOTSUPP; ++ break; ++ ++ case XENMAPSPACE_gmfn_foreign: ++ extra.foreign_domid = xatpb->u.foreign_domid; ++ break; ++ } ++ + while ( xatpb->size > extent ) + { + xen_ulong_t idx; +@@ -902,8 +933,7 @@ static int xenmem_add_to_physmap_batch(s + extent, 1)) ) + return -EFAULT; + +- rc = xenmem_add_to_physmap_one(d, xatpb->space, +- xatpb->u, ++ rc = xenmem_add_to_physmap_one(d, xatpb->space, extra, + idx, _gfn(gpfn)); + + if ( unlikely(__copy_to_guest_offset(xatpb->errs, extent, &rc, 1)) ) +--- a/xen/include/xen/mm.h ++++ b/xen/include/xen/mm.h +@@ -588,8 +588,22 @@ void scrub_one_page(struct page_info *); + &(d)->xenpage_list : &(d)->page_list) + #endif + ++union add_to_physmap_extra { ++ /* ++ * XENMAPSPACE_gmfn: When deferring TLB flushes, a page reference needs ++ * to be kept until after the flush, so the page can't get removed from ++ * the domain (and re-used for another purpose) beforehand. By passing ++ * non-NULL, the caller of xenmem_add_to_physmap_one() indicates it wants ++ * to have ownership of such a reference transferred in the success case. ++ */ ++ struct page_info **ppage; ++ ++ /* XENMAPSPACE_gmfn_foreign */ ++ domid_t foreign_domid; ++}; ++ + int xenmem_add_to_physmap_one(struct domain *d, unsigned int space, +- union xen_add_to_physmap_batch_extra extra, ++ union add_to_physmap_extra extra, + unsigned long idx, gfn_t gfn); + + int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp, diff --git a/system/xen/xsa/xsa347-4.13-1.patch b/system/xen/xsa/xsa347-4.13-1.patch new file mode 100644 index 0000000000..e9f31a151f --- /dev/null +++ b/system/xen/xsa/xsa347-4.13-1.patch @@ -0,0 +1,149 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: AMD/IOMMU: convert amd_iommu_pte from struct to union + +This is to add a "raw" counterpart to the bitfield equivalent. Take the +opportunity and + - convert fields to bool / unsigned int, + - drop the naming of the reserved field, + - shorten the names of the ignored ones. + +This is part of XSA-347. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Paul Durrant <paul@xen.org> + +--- a/xen/drivers/passthrough/amd/iommu_map.c ++++ b/xen/drivers/passthrough/amd/iommu_map.c +@@ -38,7 +38,7 @@ static unsigned int pfn_to_pde_idx(unsig + static unsigned int clear_iommu_pte_present(unsigned long l1_mfn, + unsigned long dfn) + { +- struct amd_iommu_pte *table, *pte; ++ union amd_iommu_pte *table, *pte; + unsigned int flush_flags; + + table = map_domain_page(_mfn(l1_mfn)); +@@ -52,7 +52,7 @@ static unsigned int clear_iommu_pte_pres + return flush_flags; + } + +-static unsigned int set_iommu_pde_present(struct amd_iommu_pte *pte, ++static unsigned int set_iommu_pde_present(union amd_iommu_pte *pte, + unsigned long next_mfn, + unsigned int next_level, bool iw, + bool ir) +@@ -87,7 +87,7 @@ static unsigned int set_iommu_pte_presen + int pde_level, + bool iw, bool ir) + { +- struct amd_iommu_pte *table, *pde; ++ union amd_iommu_pte *table, *pde; + unsigned int flush_flags; + + table = map_domain_page(_mfn(pt_mfn)); +@@ -178,7 +178,7 @@ void iommu_dte_set_guest_cr3(struct amd_ + static int iommu_pde_from_dfn(struct domain *d, unsigned long dfn, + unsigned long pt_mfn[], bool map) + { +- struct amd_iommu_pte *pde, *next_table_vaddr; ++ union amd_iommu_pte *pde, *next_table_vaddr; + unsigned long next_table_mfn; + unsigned int level; + struct page_info *table; +@@ -458,7 +458,7 @@ int __init amd_iommu_quarantine_init(str + unsigned long end_gfn = + 1ul << (DEFAULT_DOMAIN_ADDRESS_WIDTH - PAGE_SHIFT); + unsigned int level = amd_iommu_get_paging_mode(end_gfn); +- struct amd_iommu_pte *table; ++ union amd_iommu_pte *table; + + if ( hd->arch.root_table ) + { +@@ -489,7 +489,7 @@ int __init amd_iommu_quarantine_init(str + + for ( i = 0; i < PTE_PER_TABLE_SIZE; i++ ) + { +- struct amd_iommu_pte *pde = &table[i]; ++ union amd_iommu_pte *pde = &table[i]; + + /* + * PDEs are essentially a subset of PTEs, so this function +--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c ++++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c +@@ -390,7 +390,7 @@ static void deallocate_next_page_table(s + + static void deallocate_page_table(struct page_info *pg) + { +- struct amd_iommu_pte *table_vaddr; ++ union amd_iommu_pte *table_vaddr; + unsigned int index, level = PFN_ORDER(pg); + + PFN_ORDER(pg) = 0; +@@ -405,7 +405,7 @@ static void deallocate_page_table(struct + + for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ ) + { +- struct amd_iommu_pte *pde = &table_vaddr[index]; ++ union amd_iommu_pte *pde = &table_vaddr[index]; + + if ( pde->mfn && pde->next_level && pde->pr ) + { +@@ -557,7 +557,7 @@ static void amd_dump_p2m_table_level(str + paddr_t gpa, int indent) + { + paddr_t address; +- struct amd_iommu_pte *table_vaddr; ++ const union amd_iommu_pte *table_vaddr; + int index; + + if ( level < 1 ) +@@ -573,7 +573,7 @@ static void amd_dump_p2m_table_level(str + + for ( index = 0; index < PTE_PER_TABLE_SIZE; index++ ) + { +- struct amd_iommu_pte *pde = &table_vaddr[index]; ++ const union amd_iommu_pte *pde = &table_vaddr[index]; + + if ( !(index % 2) ) + process_pending_softirqs(); +--- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h ++++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +@@ -465,20 +465,23 @@ union amd_iommu_x2apic_control { + #define IOMMU_PAGE_TABLE_U32_PER_ENTRY (IOMMU_PAGE_TABLE_ENTRY_SIZE / 4) + #define IOMMU_PAGE_TABLE_ALIGNMENT 4096 + +-struct amd_iommu_pte { +- uint64_t pr:1; +- uint64_t ignored0:4; +- uint64_t a:1; +- uint64_t d:1; +- uint64_t ignored1:2; +- uint64_t next_level:3; +- uint64_t mfn:40; +- uint64_t reserved:7; +- uint64_t u:1; +- uint64_t fc:1; +- uint64_t ir:1; +- uint64_t iw:1; +- uint64_t ignored2:1; ++union amd_iommu_pte { ++ uint64_t raw; ++ struct { ++ bool pr:1; ++ unsigned int ign0:4; ++ bool a:1; ++ bool d:1; ++ unsigned int ign1:2; ++ unsigned int next_level:3; ++ uint64_t mfn:40; ++ unsigned int :7; ++ bool u:1; ++ bool fc:1; ++ bool ir:1; ++ bool iw:1; ++ unsigned int ign2:1; ++ }; + }; + + /* Paging modes */ diff --git a/system/xen/xsa/xsa347-4.13-2.patch b/system/xen/xsa/xsa347-4.13-2.patch new file mode 100644 index 0000000000..fbe7461636 --- /dev/null +++ b/system/xen/xsa/xsa347-4.13-2.patch @@ -0,0 +1,72 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: AMD/IOMMU: update live PTEs atomically + +Updating a live PTE bitfield by bitfield risks the compiler re-ordering +the individual updates as well as splitting individual updates into +multiple memory writes. Construct the new entry fully in a local +variable, do the check to determine the flushing needs on the thus +established new entry, and then write the new entry by a single insn. + +Similarly using memset() to clear a PTE is unsafe, as the order of +writes the function does is, at least in principle, undefined. + +This is part of XSA-347. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Paul Durrant <paul@xen.org> + +--- a/xen/drivers/passthrough/amd/iommu_map.c ++++ b/xen/drivers/passthrough/amd/iommu_map.c +@@ -45,7 +45,7 @@ static unsigned int clear_iommu_pte_pres + pte = &table[pfn_to_pde_idx(dfn, 1)]; + + flush_flags = pte->pr ? IOMMU_FLUSHF_modified : 0; +- memset(pte, 0, sizeof(*pte)); ++ write_atomic(&pte->raw, 0); + + unmap_domain_page(table); + +@@ -57,26 +57,30 @@ static unsigned int set_iommu_pde_presen + unsigned int next_level, bool iw, + bool ir) + { ++ union amd_iommu_pte new = {}, old; + unsigned int flush_flags = IOMMU_FLUSHF_added; + +- if ( pte->pr && +- (pte->mfn != next_mfn || +- pte->iw != iw || +- pte->ir != ir || +- pte->next_level != next_level) ) +- flush_flags |= IOMMU_FLUSHF_modified; +- + /* + * FC bit should be enabled in PTE, this helps to solve potential + * issues with ATS devices + */ +- pte->fc = !next_level; ++ new.fc = !next_level; ++ ++ new.mfn = next_mfn; ++ new.iw = iw; ++ new.ir = ir; ++ new.next_level = next_level; ++ new.pr = true; ++ ++ old.raw = read_atomic(&pte->raw); ++ old.ign0 = 0; ++ old.ign1 = 0; ++ old.ign2 = 0; ++ ++ if ( old.pr && old.raw != new.raw ) ++ flush_flags |= IOMMU_FLUSHF_modified; + +- pte->mfn = next_mfn; +- pte->iw = iw; +- pte->ir = ir; +- pte->next_level = next_level; +- pte->pr = 1; ++ write_atomic(&pte->raw, new.raw); + + return flush_flags; + } diff --git a/system/xen/xsa/xsa347-4.13-3.patch b/system/xen/xsa/xsa347-4.13-3.patch new file mode 100644 index 0000000000..90c8e66020 --- /dev/null +++ b/system/xen/xsa/xsa347-4.13-3.patch @@ -0,0 +1,59 @@ +From: Jan Beulich <jbeulich@suse.com> +Subject: AMD/IOMMU: ensure suitable ordering of DTE modifications + +DMA and interrupt translation should be enabled only after other +applicable DTE fields have been written. Similarly when disabling +translation or when moving a device between domains, translation should +first be disabled, before other entry fields get modified. Note however +that the "moving" aspect doesn't apply to the interrupt remapping side, +as domain specifics are maintained in the IRTEs here, not the DTE. We +also never disable interrupt remapping once it got enabled for a device +(the respective argument passed is always the immutable iommu_intremap). + +This is part of XSA-347. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Paul Durrant <paul@xen.org> + +--- a/xen/drivers/passthrough/amd/iommu_map.c ++++ b/xen/drivers/passthrough/amd/iommu_map.c +@@ -107,11 +107,18 @@ void amd_iommu_set_root_page_table(struc + uint64_t root_ptr, uint16_t domain_id, + uint8_t paging_mode, bool valid) + { ++ if ( valid || dte->v ) ++ { ++ dte->tv = false; ++ dte->v = true; ++ smp_wmb(); ++ } + dte->domain_id = domain_id; + dte->pt_root = paddr_to_pfn(root_ptr); + dte->iw = true; + dte->ir = true; + dte->paging_mode = paging_mode; ++ smp_wmb(); + dte->tv = true; + dte->v = valid; + } +@@ -134,6 +141,7 @@ void amd_iommu_set_intremap_table( + } + + dte->ig = false; /* unmapped interrupts result in i/o page faults */ ++ smp_wmb(); + dte->iv = valid; + } + +--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c ++++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c +@@ -120,7 +120,10 @@ static void amd_iommu_setup_domain_devic + /* Undo what amd_iommu_disable_domain_device() may have done. */ + ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id]; + if ( dte->it_root ) ++ { + dte->int_ctl = IOMMU_DEV_TABLE_INT_CONTROL_TRANSLATED; ++ smp_wmb(); ++ } + dte->iv = iommu_intremap; + dte->ex = ivrs_dev->dte_allow_exclusion; + dte->sys_mgt = MASK_EXTR(ivrs_dev->device_flags, ACPI_IVHD_SYSTEM_MGMT); diff --git a/system/xidel/README b/system/xidel/README new file mode 100644 index 0000000000..34602c26d4 --- /dev/null +++ b/system/xidel/README @@ -0,0 +1,28 @@ +xidel (tool to extract data from HTML/XML/JSON files or pages) + +Xidel is a command line tool to query data from HTML/XML web pages, +JSON-APIs and local files. It implements interpreters for XPath 2, +XPath 3, XQuery 1, XQuery 3, JSONiq, CSS selectors and custom pattern +matching. + +XPath and CSS selectors are the most efficient way to select certain +elements from XML/HTML documents. JSONiq (with custom extensions) +is an easy way to select data from JSON. XQuery is a Turing-complete +superset of XPath and allows arbitrary data transformations and the +creation of new documents. + +Pattern matching is for XML/HTML documents what regular expressions +are for plaintext, i.e. pattern matching behaves like a regular +expression over the space of tags, instead over the space of +characters. + +Xidel implements a kind of internal pipes to pipe HTTP requests from +one query to the next, so there is no need to distinguish selecting +links and downloading the data referenced by them. Therefore arbitrary +complex queries going over arbitrary many pages can be executed with a +single call of Xidel. + +Xidel is a powerful and complex tool, with a steep learning +curve. For examples, see the man page xidel(1), and also +/usr/doc/xidel-$VERSION/examples/. The full documentation is available +via "xidel --usage | less". diff --git a/system/xidel/slack-desc b/system/xidel/slack-desc new file mode 100644 index 0000000000..0b969a8317 --- /dev/null +++ b/system/xidel/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------------------------------------------------------| +xidel: xidel (tool to extract data from HTML/XML/JSON files or pages) +xidel: +xidel: Xidel is a command line tool to query data from HTML/XML web pages, +xidel: JSON-APIs and local files. It implements interpreters for XPath 2, +xidel: XPath 3, XQuery 1, XQuery 3, JSONiq, CSS selectors and custom pattern +xidel: matching. +xidel: +xidel: +xidel: +xidel: +xidel: diff --git a/system/xidel/xidel.SlackBuild b/system/xidel/xidel.SlackBuild new file mode 100644 index 0000000000..a13c4c6979 --- /dev/null +++ b/system/xidel/xidel.SlackBuild @@ -0,0 +1,62 @@ +#!/bin/sh + +# Slackware build script for xidel + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=xidel +VERSION=${VERSION:-0.9.8} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +# No CFLAGS (Pascal, not C), no need for LIBDIRSUFFIX. Upstream +# uses fpc's -O3 option, for whatever that's worth. + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION-src +tar xvf $CWD/$PRGNAM-$VERSION.src.tar.gz +cd $PRGNAM-$VERSION-src +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 {} \+ + +# Fairly weird build process, but simple enough. -s means strip. Tests +# require internet access, so disabled by default. +[ "${TESTS:-no}" = "yes" ] && T="-t" + +cd programs/internet/$PRGNAM +./build.sh -s $T +mkdir -p $PKG/usr/bin +cp -a $PRGNAM $PKG/usr/bin + +mkdir -p $PKG/usr/man/man1 +gzip -9c < meta/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README* COPYING changelog examples $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:-tgz} diff --git a/system/xidel/xidel.info b/system/xidel/xidel.info new file mode 100644 index 0000000000..b07650eb41 --- /dev/null +++ b/system/xidel/xidel.info @@ -0,0 +1,10 @@ +PRGNAM="xidel" +VERSION="0.9.8" +HOMEPAGE="http://videlibri.sourceforge.net/xidel.html" +DOWNLOAD="https://github.com/benibela/xidel/releases/download/Xidel_0.9.8/xidel-0.9.8.src.tar.gz" +MD5SUM="bd82db9878784d2621b37baca914b777" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="fpc" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/system/xldconfig/README b/system/xldconfig/README new file mode 100644 index 0000000000..d15fd43542 --- /dev/null +++ b/system/xldconfig/README @@ -0,0 +1,4 @@ +Xldconfig is a tool suplying ldconfig on non native architectures. +It makes symlinks by the same way as the ldconfig do. It does not +create or recreate the cache /etc/ld.so.cache. +It is useful for cross arch system installations. diff --git a/system/xldconfig/slack-desc b/system/xldconfig/slack-desc new file mode 100644 index 0000000000..43b0e5f8d2 --- /dev/null +++ b/system/xldconfig/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------------------------------------------------------| +xldconfig: xldconfig (cross arch ldconfig) +xldconfig: +xldconfig: Xldconfig is a tool suplying ldconfig on non native architectures. +xldconfig: It makes symlinks by the same way as the ldconfig do. It does not +xldconfig: create or recreate the cache /etc/ld.so.cache. +xldconfig: It is usefuf for cross arch system installations. +xldconfig: +xldconfig: +xldconfig: +xldconfig: +xldconfig: diff --git a/system/xldconfig/xldconfig.SlackBuild b/system/xldconfig/xldconfig.SlackBuild new file mode 100644 index 0000000000..519b8c7747 --- /dev/null +++ b/system/xldconfig/xldconfig.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for xldconfig + +# Copyright 2019 Jan F. Chadima <jfch@jagda.eu> +# 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. + + +PRGNAM=xldconfig +VERSION=${VERSION:-0.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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.tgz +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 {} \; + +if [ -r /usr/include/libelf.h ] ; then + LIBELF=-DHAVE_LIBELF_H +elif [ -r /usr/include/libelf/libelf.h ] ; then + LIBELF= +else + echo "Cannot find libelf.h" + false +fi + +CFLAGS="$SLKCFLAGS $LIBELF" \ +make +mkdir -p "$PKG"/usr/sbin +make install 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 + +mkdir -p "$PKG"/usr/man/man8 +help2man -N ./xldconfig > "$PKG"/usr/man/man8/xldconfig.8 + +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 \ + LICENSE \ + $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:-tgz} diff --git a/system/xldconfig/xldconfig.info b/system/xldconfig/xldconfig.info new file mode 100644 index 0000000000..3524de9603 --- /dev/null +++ b/system/xldconfig/xldconfig.info @@ -0,0 +1,10 @@ +PRGNAM="xldconfig" +VERSION="0.7" +HOMEPAGE="https://www.jagda.eu/linux/xldxonfig" +DOWNLOAD="https://www.jagda.eu/linux/xldxonfig/xldconfig-0.7.tgz" +MD5SUM="49693d184e56714c4fb474a99bb2e3ba" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jan F. Chadima" +EMAIL="jfch@jagda.eu" diff --git a/system/xonsh/README b/system/xonsh/README index aa87fb0a5e..8c0180ed05 100644 --- a/system/xonsh/README +++ b/system/xonsh/README @@ -3,7 +3,7 @@ and command prompt. The language is a superset of Python 3.4 with additional shell primitives. xonsh (pronounced conch) is meant for the daily use of experts and novices alike. -Optional dependencies: setproctitle, Pygments, prompt_toolkit +Optional dependencies: setproctitle, Pygments, prompt_toolkiti, python-distro NOTE: Please install python3 first before installing all other requirements. diff --git a/system/xonsh/xonsh.SlackBuild b/system/xonsh/xonsh.SlackBuild index 29a4f88557..eb1ac14701 100644 --- a/system/xonsh/xonsh.SlackBuild +++ b/system/xonsh/xonsh.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xonsh -# Copyright 2016-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xonsh -VERSION=${VERSION:-0.6.9} +VERSION=${VERSION:-0.9.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/xonsh/xonsh.info b/system/xonsh/xonsh.info index aceeb40169..b600316ccb 100644 --- a/system/xonsh/xonsh.info +++ b/system/xonsh/xonsh.info @@ -1,10 +1,10 @@ PRGNAM="xonsh" -VERSION="0.6.9" +VERSION="0.9.12" HOMEPAGE="https://xon.sh/" -DOWNLOAD="https://files.pythonhosted.org/packages/2e/ca/3e4400c30bb86d98f734e18207436c534b2bca93b7562396c89a0fee2ce9/xonsh-0.6.9.tar.gz" -MD5SUM="de8d2e8eed546f2cc7ef4c2f831e93f5" +DOWNLOAD="https://files.pythonhosted.org/packages/7c/be/a6269ae0440f3b860e727e4faf066f179937611bad3331616ba7dd863996/xonsh-0.9.12.tar.gz" +MD5SUM="6cfa0915bb4b7f775049378d9b65f6b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3 python-distro" +REQUIRES="python3" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/system/xorgxrdp/README b/system/xorgxrdp/README new file mode 100644 index 0000000000..ebd375e8cc --- /dev/null +++ b/system/xorgxrdp/README @@ -0,0 +1,8 @@ +** xorgxrdp ** is a collection of modules to be used with a pre-existing X.Org +install to make the X server act like X11rdp. Unlike X11rdp, you don't have to +recompile the whole X Window System. Instead, additional modules are installed to +a location where the existing Xorg installation would pick them. + +xorgxrdp is to be used together with xrdp and X.Org Server. +It is pretty useless using xorgxrdp alone. +xrdp needs to be installed before xorgxrdp. diff --git a/system/xorgxrdp/doinst.sh b/system/xorgxrdp/doinst.sh new file mode 100644 index 0000000000..0795323810 --- /dev/null +++ b/system/xorgxrdp/doinst.sh @@ -0,0 +1,14 @@ +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... +} + +config etc/X11/xrdp/xorg.conf.new diff --git a/system/xorgxrdp/slack-desc b/system/xorgxrdp/slack-desc new file mode 100644 index 0000000000..1f61e59055 --- /dev/null +++ b/system/xorgxrdp/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------------------------------------------------------| +xorgxrdp: xorgxrdp (support files for xrdp) +xorgxrdp: +xorgxrdp: xrdp is a Remote Desktop Server for Linux +xorgxrdp: +xorgxrdp: xorgxrdp is a collection of modules to be used with a +xorgxrdp: pre-existing X.Org install to make the X server act like X11rdp. +xorgxrdp: Unlike X11rdp, you don't have to recompile the whole X Window +xorgxrdp: System. Instead, additional modules are installed to a location +xorgxrdp: where the existing Xorg installation would pick them. +xorgxrdp: +xorgxrdp: xorgxrdp: Homepage: http://www.xrdp.org/ diff --git a/system/xorgxrdp/xorgxrdp.SlackBuild b/system/xorgxrdp/xorgxrdp.SlackBuild new file mode 100644 index 0000000000..273efbc7d8 --- /dev/null +++ b/system/xorgxrdp/xorgxrdp.SlackBuild @@ -0,0 +1,86 @@ +#!/bin/sh + +# Slackware build script for xorgxrdp +# Inspired by Phillip Warner <pc_warner@yahoo.com> +# Written by David Allen <david.a58@optusnet.com.au> + +PRGNAM=xorgxrdp +VERSION=${VERSION:-0.2.12} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 {} \; + +# uses autoreconf now +autoreconf -vfi + +CFLAGS="$SLKCFLAGS" \ +CPPFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux \ + --disable-static + +make +make install DESTDIR=$PKG + +find $PKG | xargs 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 +cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +# Let's not clobber existing config +mv etc/X11/xrdp/xorg.conf etc/X11/xrdp/xorg.conf.new + +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/xorgxrdp/xorgxrdp.info b/system/xorgxrdp/xorgxrdp.info new file mode 100644 index 0000000000..daa7989344 --- /dev/null +++ b/system/xorgxrdp/xorgxrdp.info @@ -0,0 +1,10 @@ +PRGNAM="xorgxrdp" +VERSION="0.2.12" +HOMEPAGE="http://www.xrdp.org/" +DOWNLOAD="https://github.com/neutrinolabs/xorgxrdp/archive/v0.2.12/xorgxrdp-0.2.12.tar.gz" +MD5SUM="40bdedde9e33395f3703fa9507a109fb" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="xrdp" +MAINTAINER="Phillip Warner" +EMAIL="pc_warner@yahoo.com" diff --git a/system/xrdp/README b/system/xrdp/README index dbefe66f47..e127d9d09a 100644 --- a/system/xrdp/README +++ b/system/xrdp/README @@ -1,47 +1,64 @@ -Xrdp provides a fully functional Linux terminal server, capable of accepting -connections from rdesktop and Microsoft's own terminal server/remote desktop -clients. Xrdp uses Xvnc or X11rdp (which are installed separately) to manage -the X session. This means a RDP client can connect to a VNC server on the -xrdp server machine in addition to the RDP server. Xrdp can also act as a -bridging server, allowing RDP clients to connect to other RDP or VNC servers +Xrdp provides a fully functional Linux terminal server, capable of accepting +connections from rdesktop and Microsoft's own terminal server/remote desktop +clients. Xrdp uses Xvnc or xorgxrdp (which are installed separately) to manage +the X session. This means a RDP client can connect to a VNC server on the +xrdp server machine in addition to the RDP server. Xrdp can also act as a +bridging server, allowing RDP clients to connect to other RDP or VNC servers through the xrdp server. -Xvnc is included with tightvnc (in Slackware /extra). -X11rdp can be compiled and installed by following the directions in the -thread at http://tinyurl.com/2ufoz2 (link to LinuxQuestions.org). +Xvnc is included with tigervnc (in Slackware /extra). +xorgxrdp can be compiled and installed after installing xrdp. -By default, this script will make xrdp without PAM support since PAM is not +By default, this script will make xrdp without PAM support since PAM is not installed in Slackware by default. The script supports building with PAM, but it is completely untested by us. If you want to enable PAM, run the script as follows: USE_PAM=YES ./xrdp.SlackBuild -After installing xrdp there are some configuration files in /etc/xrdp that +By default, this script will make xrdp without GVFS support, as it can cause +a problem if a session is unexpectedly terminated leaving an orphan GVFS +mount. (This can be corrected by logging into the server hosting xrdp and +running 'fusermount -uz ~/thinclient_drives'). +If you want to use drive redirection and shared clipboard support, +run the script as follows: + USE_GVFS=YES ./xrdp.SlackBuild + +After installing xrdp there are some configuration files in /etc/xrdp that can be modified: ** sesman.ini ** -sesman.ini has some useful options to take note of such as the ability to +sesman.ini has some useful options to take note of such as the ability to allow xrdp use by only a certain group and to specify the log location. -*NOTE:* The default log location is now /var/log/xrdp-sesman.log. +*NOTE:* The default log location is now /var/log/xrdp-sesman.log, and +the logs are rotated according to /etc/logrotate.d/xrdp-sesman added +by the script. ** xrdp.ini ** -xrdp.ini should be modified so that you have the options you want at the -server login screen. For instance, if you want xrdp's default options to be -like those of a Windows RDP server then change xrdp.ini so that the default -set of options under [xrdp1] corresponds to sesman-X11rdp. Similarly, you -might want to change the options (eg. port number) for VNC (listed as -"console" by default). The man page for xrdp.ini has more details on the -file. +xrdp.ini should be modified so that you have the options you want. +For instance, the server login screen can be customised. +The default protocol settings is 'ssl_protocols=TLSv1.2, TLSv1.3'. +OpenSSL 1.0.2 in Slackware 14.2 does not support TLSv1.3, which can +cause a harmless debug message. +The remote desktop client in Windows XP requires TLSv1 to connect. +When released, Windows 7 did not support TLSv1.2, but an official update +was released. +The man page for xrdp.ini has more details on the file. +*NOTE:* The default log location is now /var/log/xrdp.log, and +the logs are rotated according to /etc/logrotate.d/xrdp added +by the script. ** xrdp-xinitrc ** -xrdp-xinitrc by default tries to load one of several DE/WMs in order to -start a X11rdp session. Change this as desired to load a specific DE/WM. -A similar script can be executed on a per-user basis by creating an -executable script at ~/.xrdp-xinitrc. A utility program, xrdp-xwmconfig, -is included to allow you to use your xinit scripts during X11rdp sessions. -It works just like xwmconfig, so run it as root to set the global default, -or run it as a normal user to set only the default for that user. See the -sesman.ini man page for details about defining different names or locations -for the X11rdp startup scripts. - -FreeRDP is an optional dependency. +xrdp-xinitrc by default tries to load one of several DE/WMs in order to +start a X11rdp session. Change this as desired to load a specific DE/WM. +A similar script can be executed on a per-user basis by creating an +executable script at ~/.xrdp-xinitrc. A utility program, xrdp-xwmconfig, +is included to allow you to use your xinit scripts during sessions. +It works just like xwmconfig, so run it as root to set the global default, +or run it as a normal user to set only the default for that user. See the +sesman.ini man page for details about defining different names or locations +for the startup scripts. + +If using xorgxrdp, you will likely need a /etc/X11/Xwrapper.config wrapper +script containing a line: + allowed_users = anybody +(See 'man Xwrapper.config' for details) diff --git a/system/xrdp/doinst.sh b/system/xrdp/doinst.sh index f2aaf8f5b1..5e27a33eb6 100644 --- a/system/xrdp/doinst.sh +++ b/system/xrdp/doinst.sh @@ -11,19 +11,39 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} +# Keep same perms on rc.xrdp.new: +if [ -e etc/rc.d/rc.xrdp ]; then + cp -a etc/rc.d/rc.xrdp etc/rc.d/rc.xrdp.new.incoming + cat etc/rc.d/rc.xrdp.new > etc/rc.d/rc.xrdp.new.incoming + mv etc/rc.d/rc.xrdp.new.incoming etc/rc.d/rc.xrdp.new +fi +config etc/rc.d/rc.xrdp.new config etc/xrdp/xrdp-xinitrc.new +config etc/xrdp/reconnectwm.sh.new config etc/xrdp/rsakeys.ini.new config etc/xrdp/sesman.ini.new config etc/xrdp/xrdp.ini.new -preserve_perms etc/rc.d/rc.xrdp.new +config etc/xrdp/xrdp_keyboard.ini.new +config etc/xrdp/km-00000406.ini.new +config etc/xrdp/km-00000407.ini.new +config etc/xrdp/km-00000409.ini.new +config etc/xrdp/km-0000040a.ini.new +config etc/xrdp/km-0000040b.ini.new +config etc/xrdp/km-0000040c.ini.new +config etc/xrdp/km-00000410.ini.new +config etc/xrdp/km-00000411.ini.new +config etc/xrdp/km-00000412.ini.new +config etc/xrdp/km-00000414.ini.new +config etc/xrdp/km-00000415.ini.new +config etc/xrdp/km-00000416.ini.new +config etc/xrdp/km-00000419.ini.new +config etc/xrdp/km-0000041d.ini.new +config etc/xrdp/km-00000807.ini.new +config etc/xrdp/km-00000809.ini.new +config etc/xrdp/km-0000080a.ini.new +config etc/xrdp/km-0000080c.ini.new +config etc/xrdp/km-00000813.ini.new +config etc/xrdp/km-00000816.ini.new +config etc/xrdp/km-0000100c.ini.new +config etc/xrdp/km-00010409.ini.new diff --git a/system/xrdp/rc.xrdp b/system/xrdp/rc.xrdp new file mode 100644 index 0000000000..d68ac6ac95 --- /dev/null +++ b/system/xrdp/rc.xrdp @@ -0,0 +1,153 @@ +#!/bin/sh +# xrdp control script +# Written : 1-13-2006 - Mark Balliet - posicat@pobox.com +# maintaned by Jay Sorg +# chkconfig: 2345 11 89 +# description: starts xrdp + +### BEGIN INIT INFO +# Provides: xrdp +# Required-Start: +# Required-Stop: +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start and stop xrdp +# Description: starts xrdp +### END INIT INFO + +SBINDIR=/usr/sbin +LOG=/dev/null +CFGDIR=/etc/xrdp + +if ! test -x $SBINDIR/xrdp +then + echo "xrdp is not executable" + exit 0 +fi +if ! test -x $SBINDIR/xrdp-sesman +then + echo "xrdp-sesman is not executable" + exit 0 +fi +if ! test -x $CFGDIR/xrdp-xinitrc +then + echo "xrdp-xinitrc is not executable" + exit 0 +fi + +xrdp_start() +{ + echo -n "Starting: xrdp and sesman . . " + $SBINDIR/xrdp >> $LOG + $SBINDIR/xrdp-sesman >> $LOG + echo "." + sleep 1 + return 0; +} + +xrdp_stop() +{ + echo -n "Stopping: xrdp and sesman . . " + $SBINDIR/xrdp-sesman --kill >> $LOG + $SBINDIR/xrdp --kill >> $LOG + echo "." + return 0; +} + +is_xrdp_running() +{ + ps u --noheading -C xrdp | grep -q -i xrdp + if test $? -eq 0 + then + return 1; + else + return 0; + fi +} + +is_sesman_running() +{ + ps u --noheading -C xrdp-sesman | grep -q -i xrdp-sesman + if test $? -eq 0 + then + return 1; + else + return 0; + fi +} + +check_up() +{ + # Cleanup : If sesman isn't running, but the pid exists, erase it. + is_sesman_running + if test $? -eq 0 + then + if test -e /var/run/xrdp-sesman.pid + then + rm /var/run/xrdp-sesman.pid + fi + fi + # Cleanup : If xrdp isn't running, but the pid exists, erase it. + is_xrdp_running + if test $? -eq 0 + then + if test -e /var/run/xrdp.pid + then + rm /var/run/xrdp.pid + fi + fi + return 0; +} + +case "$1" in + start) + check_up + is_xrdp_running + if ! test $? -eq 0 + then + echo "xrdp is already loaded" + exit 1 + fi + is_sesman_running + if ! test $? -eq 0 + then + echo "sesman is already loaded" + exit 1 + fi + xrdp_start + ;; + stop) + check_up + is_xrdp_running + if test $? -eq 0 + then + echo "xrdp is not loaded." + fi + is_sesman_running + if test $? -eq 0 + then + echo "sesman is not loaded." + fi + xrdp_stop + ;; + force-reload|restart) + check_up + echo "Restarting xrdp ..." + xrdp_stop + is_xrdp_running + while ! test $? -eq 0 + do + check_up + sleep 1 + is_xrdp_running + done + xrdp_start + ;; + *) + echo "Usage: xrdp.sh {start|stop|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/system/xrdp/slack-desc b/system/xrdp/slack-desc index 5ba7b8ab8f..ed9364f6a9 100644 --- a/system/xrdp/slack-desc +++ b/system/xrdp/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| xrdp: xrdp (Remote Desktop Server for Linux) xrdp: -xrdp: Xrdp provides a fully functional Linux terminal server, capable of -xrdp: accepting connections from rdesktop and Microsoft's own terminal -xrdp: server and/or remote desktop clients. +xrdp: xrdp provides a graphical login to remote machines using Microsoft +xrdp: Remote Desktop Protocol (RDP). xrdp accepts connections from a +xrdp: variety of RDP clients: FreeRDP, rdesktop, NeutrinoRDP and Microsoft +xrdp: Remote Desktop Client (for Windows, Mac OS, iOS and Android). xrdp: -xrdp: Xrdp uses Xvnc or X11rdp (installed separately) to manage the -xrdp: X session. +xrdp: RDP transport is encrypted using TLS by default. xrdp: -xrdp: Homepage: http://xrdp.sourceforge.net/ +xrdp: Homepage: http://www.xrdp.org/ xrdp: diff --git a/system/xrdp/xrdp b/system/xrdp/xrdp new file mode 100644 index 0000000000..32b6aca2cd --- /dev/null +++ b/system/xrdp/xrdp @@ -0,0 +1,11 @@ +/var/log/xrdp.log { + # create 644 root root + daily + # compress + # rotate 7 + missingok + # postrotate + # /bin/kill -HUP `cat /var/run/xrdp.pid 2>/dev/null` 2> /dev/null || true + # endscript +} + diff --git a/system/xrdp/xrdp-sesman b/system/xrdp/xrdp-sesman new file mode 100644 index 0000000000..8b2984f8f5 --- /dev/null +++ b/system/xrdp/xrdp-sesman @@ -0,0 +1,11 @@ +/var/log/xrdp-sesman.log { + # create 644 root root + daily + # compress + # rotate 7 + missingok + postrotate + /bin/kill -HUP `cat /var/run/xrdp-sesman.pid 2>/dev/null` 2> /dev/null || true + endscript +} + diff --git a/system/xrdp/xrdp.SlackBuild b/system/xrdp/xrdp.SlackBuild index d5ff39cc11..520cda33c9 100644 --- a/system/xrdp/xrdp.SlackBuild +++ b/system/xrdp/xrdp.SlackBuild @@ -2,9 +2,10 @@ # Slackware build script for xrdp # Written by Phillip Warner <pc_warner@yahoo.com> +# Amended by David Allen <david.a58@optusnet.com.au> PRGNAM=xrdp -VERSION=${VERSION:-0.9.4} +VERSION=${VERSION:-0.9.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -25,6 +26,10 @@ OUTPUT=${OUTPUT:-/tmp} # then run this script as: "USE_PAM=YES ./xrdp.SlackBuild" USE_PAM=${USE_PAM:-NO} +# If you want drive redirection and shared clipboard support, +# then run this script as: "USE_GVFS=YES ./xrdp.SlackBuild" +USE_GVFS=${USE_GVFS:-NO} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -63,9 +68,12 @@ else NOPAM_OPT="" fi -# Optional config options if built with FreeRDP: -# --enable-freerdp Build freerdp module (default: no) -# --enable-freerdp1 Build freerdp1 module (default: no) +if [ "$USE_GVFS" = "NO" ]; then + NOGVFS_OPT="--disable-fuse" +else + NOGVFS_OPT="--enable-fuse" +fi + CFLAGS="$SLKCFLAGS" \ CPPFLAGS="$SLKCFLAGS" \ ./configure \ @@ -78,16 +86,21 @@ CPPFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux \ --disable-painter \ --disable-rfxcodec \ + --disable-static \ + $NOGVFS_OPT \ $NOPAM_OPT -# Fix path in what will become the init script -sed -i "s/SBINDIR=\/usr\/local\/sbin/SBINDIR=\/usr\/sbin/" instfiles/xrdp.sh - -# Change xinit script name to xrdp-xinitrc -sed -i "s/startwm.sh/xrdp-xinitrc/" instfiles/xrdp.sh - -# Build fails if a copy of config.{c,h} is not in sesman/tools/ -cp -v sesman/config.{c,h} sesman/tools/ +## Use sed rather than patch as line locations change between versions +# Change LogLevel to INFO instead of DEBUG +sed -i "s/LogLevel=DEBUG/LogLevel=INFO/" xrdp/xrdp.ini +sed -i "s/SyslogLevel=DEBUG/SyslogLevel=INFO/" xrdp/xrdp.ini +sed -i "s/LogLevel=DEBUG/LogLevel=INFO/" sesman/sesman.ini +sed -i "s/SyslogLevel=DEBUG/SyslogLevel=INFO/" sesman/sesman.ini +# Disable Root logins by default +sed -i "s/AllowRootLogin=true/AllowRootLogin=false/" sesman/sesman.ini +# Set default RDP session xinit script to /etc/xrdp/xrdp-xinitrc +sed -i "s/UserWindowManager=startwm.sh/UserWindowManager=.xrdp-xinitrc/" sesman/sesman.ini +sed -i "s/DefaultWindowManager=startwm.sh/DefaultWindowManager=xrdp-xinitrc/" sesman/sesman.ini make make install DESTDIR=$PKG @@ -95,24 +108,35 @@ make install DESTDIR=$PKG # Make sure log directory is there mkdir -p $PKG/var/log -# Let's make the xrdp_control.sh script the init script -mkdir -p $PKG/etc/rc.d -mv $PKG/etc/$PRGNAM/xrdp.sh $PKG/etc/rc.d/rc.$PRGNAM.new - # Change startwm.sh name for more consistency with previous SlackBuild # and corresponding user file name mv $PKG/etc/$PRGNAM/startwm.sh $PKG/etc/$PRGNAM/xrdp-xinitrc.new +# Install the xrdp-xwmconfig utility +install -D -m 0755 -o root -g root $CWD/xrdp-xwmconfig \ + $PKG/usr/bin/xrdp-xwmconfig + # Let's not clobber existing configs ( cd $PKG/etc/$PRGNAM mv rsakeys.ini rsakeys.ini.new mv sesman.ini sesman.ini.new mv xrdp.ini xrdp.ini.new + mv xrdp_keyboard.ini xrdp_keyboard.ini.new + mv reconnectwm.sh reconnectwm.sh.new + rename ini ini.new km-????????.ini ) -# Install the xrdp-xwmconfig utility -install -D -m 0755 $CWD/xrdp-xwmconfig \ - $PKG/usr/bin/xrdp-xwmconfig +# Used to make the init script from instfiles/xrdp.sh, +# but it was removed from xrdp-0.9.12, +# so it is included in the SlackBuild files +install -D -m 0755 -o root -g root $CWD/rc.xrdp \ + $PKG/etc/rc.d/rc.xrdp.new + +# Install logrotate scripts +install -D -m 0644 -o root -g root $CWD/xrdp \ + $PKG/etc/logrotate.d/xrdp.new +install -D -m 0644 -o root -g root $CWD/xrdp-sesman \ + $PKG/etc/logrotate.d/xrdp-sesman.new find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -121,7 +145,6 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING design.txt install.txt README.md faq-*.txt $PKG/usr/doc/$PRGNAM-$VERSION - # Keep a backup copy of startwm.sh in the docs cat sesman/startwm.sh > $PKG/usr/doc/$PRGNAM-$VERSION/startwm.sh-example cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/xrdp/xrdp.info b/system/xrdp/xrdp.info index b35d21b43b..c65f289043 100644 --- a/system/xrdp/xrdp.info +++ b/system/xrdp/xrdp.info @@ -1,8 +1,8 @@ PRGNAM="xrdp" -VERSION="0.9.4" -HOMEPAGE="http://xrdp.sourceforge.net/" -DOWNLOAD="https://github.com/neutrinolabs/xrdp/archive/v0.9.4/xrdp-0.9.4.tar.gz" -MD5SUM="d6e5b1b3222716feda18e620a590c9e5" +VERSION="0.9.12" +HOMEPAGE="http://www.xrdp.org/" +DOWNLOAD="https://github.com/neutrinolabs/xrdp/releases/download/v0.9.12/xrdp-0.9.12.tar.gz" +MD5SUM="cf6507a8d3f44408bead7bdcdfb9f742" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/xvfb-run/README b/system/xvfb-run/README new file mode 100644 index 0000000000..aafb4f39bc --- /dev/null +++ b/system/xvfb-run/README @@ -0,0 +1 @@ +Run a command in a virtual X server environment. diff --git a/system/xvfb-run/slack-desc b/system/xvfb-run/slack-desc new file mode 100644 index 0000000000..e871d8c5f0 --- /dev/null +++ b/system/xvfb-run/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------------------------------------------------------| +xvfb-run: xvfb-run (Run a command in a virtual X server environment) +xvfb-run: +xvfb-run: xvfb-run is a script using virtual framebufer X server +xvfb-run: to run X programs from command line. +xvfb-run: +xvfb-run: +xvfb-run: +xvfb-run: +xvfb-run: +xvfb-run: +xvfb-run: diff --git a/system/xvfb-run/xvfb-run.SlackBuild b/system/xvfb-run/xvfb-run.SlackBuild new file mode 100644 index 0000000000..9f1c3a092d --- /dev/null +++ b/system/xvfb-run/xvfb-run.SlackBuild @@ -0,0 +1,60 @@ +#!/bin/sh + +# Slackware build script for xvfb-run + +# Copyright 2020 Jan F, Chadima <jfch.jagda.eu> +# 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. + +PRGNAM=xvfb-run +VERSION=${VERSION:-1.19.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $PRGNAM-$VERSION +cd $PRGNAM-$VERSION +ar x $CWD/xvfb_$VERSION-*.deb +cd $PKG +tar xvf $TMP/$PRGNAM-$VERSION/data.tar.xz + +rm -f usr/bin/Xvfb +mv usr/share/* usr +rmdir usr/share +rm -f usr/doc/xvfb/changelog* +mv usr/doc/xvfb usr/doc/xvfb-bin-$VERSION +rm -f usr/man/man1/Xvfb.1.gz +mkdir install + +cat $CWD/slack-desc > install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/xvfb-run/xvfb-run.info b/system/xvfb-run/xvfb-run.info new file mode 100644 index 0000000000..7ad63a27c7 --- /dev/null +++ b/system/xvfb-run/xvfb-run.info @@ -0,0 +1,10 @@ +PRGNAM="xvfb-run" +VERSION="1.19.2" +HOMEPAGE="https://packages.gentoo.org/packages/x11-misc/xvfb-run" +DOWNLOAD="http://ftp.us.debian.org/debian/pool/main/x/xorg-server/xvfb_1.19.2-1+deb9u5_i386.deb" +MD5SUM="4b467ff96d94ad07b5550d052466449c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jan F. Chadima" +EMAIL="jfch@jagda.eu" diff --git a/system/yaft/README b/system/yaft/README new file mode 100644 index 0000000000..751cd4f635 --- /dev/null +++ b/system/yaft/README @@ -0,0 +1,23 @@ +Yet another framebuffer terminal (aka "yaft") is simple terminal emulator for minimalist, +living without X. +This software is being developed to replace Linux console for personal use. + +Features: + +* various framebuffer types (8/15/16/24/32bpp) +* compatible with vt102 and Linux console (detail) +* UTF-8 encoding and UCS2 glyphs +* 256 colors (same as xterm) +* wallpaper +* DRCS (DECDLD/DRCSMMv1) (experimental) +* sixel (experimental) + +OPTIONS + +If you need active Background Draw (always draw even if vt is not active): + + BACKGROUND_DRAW=yes sh yaft.SlackBuild + + +!!! NOTE !!! +sbo-patches/background-draw.patch : For activate the BACKGROUND DRAW option diff --git a/system/yaft/sbo-patches/background-drawm.patch b/system/yaft/sbo-patches/background-drawm.patch new file mode 100644 index 0000000000..0ffeb7cf9f --- /dev/null +++ b/system/yaft/sbo-patches/background-drawm.patch @@ -0,0 +1,11 @@ +--- conf.h 2020-09-12 15:40:06.962795268 -0300 ++++ b/conf.h 2020-09-12 15:54:57.712812014 -0300 +@@ -14,7 +14,7 @@ + VERBOSE = false, /* write dump of input to stdout, debug message to stderr */ + TABSTOP = 8, /* hardware tabstop */ + LAZY_DRAW = true, /* don't draw when input data size is larger than BUFSIZE */ +- BACKGROUND_DRAW = false, /* always draw even if vt is not active */ ++ BACKGROUND_DRAW = true, /* always draw even if vt is not active */ + VT_CONTROL = true, /* handle vt switching */ + FORCE_TEXT_MODE = false, /* force KD_TEXT mode (not use KD_GRAPHICS mode) */ + SUBSTITUTE_HALF = 0x0020, /* used for missing glyph(single width): U+0020 (SPACE) */ diff --git a/system/yaft/slack-desc b/system/yaft/slack-desc new file mode 100644 index 0000000000..5d312533f1 --- /dev/null +++ b/system/yaft/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 ':'. + + |-----handy-ruler------------------------------------------------------| +yaft: yaft (Yet another framebuffer terminal) +yaft: +yaft: Simple terminal emulator for minimalist. Living without X. +yaft: +yaft: +yaft: +yaft: +yaft: +yaft: +yaft: https://github.com/uobikiemukot/yaft +yaft: diff --git a/system/yaft/yaft.SlackBuild b/system/yaft/yaft.SlackBuild new file mode 100644 index 0000000000..bc1dd40caa --- /dev/null +++ b/system/yaft/yaft.SlackBuild @@ -0,0 +1,74 @@ +#!/bin/sh +# Slackware build script for abella +# Copyright 2020 Jefferson Rocha <jeffersoncarneiro@slackjeff.com.br> +# 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. + +PRGNAM=yaft +VERSION=${VERSION:-0.2.9} +UNPACK=${UNPACK:-v} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 {} \; + +# Enable Backgroun Draw! +BACKGROUND_DRAW=${BACKGROUND_DRAW:-no} +[ "$BACKGROUND_DRAW" = 'yes' ] && patch -p1 <${CWD}/sbo-patches/background-drawm.patch + +# Var MANDIR not work. +sed -i 's|$(DESTDIR)/usr/share/man|$(DESTDIR)/usr/man|' makefile + +# Generate bin and install +make PREFIX=/usr + +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 + +# Send original Docs and archives +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog LICENSE $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:-tgz} diff --git a/system/yaft/yaft.info b/system/yaft/yaft.info new file mode 100644 index 0000000000..7e02516027 --- /dev/null +++ b/system/yaft/yaft.info @@ -0,0 +1,10 @@ +PRGNAM="yaft" +VERSION="0.2.9" +HOMEPAGE="https://github.com/uobikiemukot/yaft" +DOWNLOAD="https://github.com/uobikiemukot/yaft/archive/v0.2.9/yaft-0.2.9.tar.gz" +MD5SUM="ddcbe929c51c453b01e3d18579b0860a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jefferson Rocha" +EMAIL="jeffersoncarneiro@slackjeff.com.br" diff --git a/system/yash/doinst.sh b/system/yash/doinst.sh new file mode 100644 index 0000000000..0c3b7b70e9 --- /dev/null +++ b/system/yash/doinst.sh @@ -0,0 +1,8 @@ +if [ ! -r etc/shells ]; then + touch etc/shells + chmod 644 etc/shells +fi + +if ! grep -q /bin/yash etc/shells ; then + printf %s\\n /bin/yash >> etc/shells +fi diff --git a/system/yash/yash.SlackBuild b/system/yash/yash.SlackBuild index dd65ca9faf..5a93ecb8d4 100644 --- a/system/yash/yash.SlackBuild +++ b/system/yash/yash.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for yash # Copyright 2015-2018 Leonard Schmidt <lems@gmx.net> -# Copyright 2018 Hunter Sezen <orbea@fredslev.dk> +# Copyright 2018-2020 Hunter Sezen <orbea@riseup.net> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yash -VERSION=${VERSION:-2.48} +VERSION=${VERSION:-2.51} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,10 +77,12 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man make +# make test is problematic on 14.2 +#make test make install DESTDIR=$PKG mkdir -p $PKG/usr/bin -( cd $PKG/usr/bin ; ln -sf /bin/yash yash ) +ln -sf /bin/$PRGNAM $PKG/usr/bin/$PRGNAM 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 @@ -94,6 +96,7 @@ 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:-tgz} diff --git a/system/yash/yash.info b/system/yash/yash.info index d48a6b4a1e..1267972a88 100644 --- a/system/yash/yash.info +++ b/system/yash/yash.info @@ -1,10 +1,10 @@ PRGNAM="yash" -VERSION="2.48" +VERSION="2.51" HOMEPAGE="https://yash.osdn.jp/index.html.en" -DOWNLOAD="https://osdn.net/dl/yash/yash-2.48.tar.xz" -MD5SUM="aabcbbdd4048dec486f3a4cea5dee2a2" +DOWNLOAD="https://osdn.net/dl/yash/yash-2.51.tar.xz" +MD5SUM="91d0c0fa548c9c9a081893f515b4f049" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Hunter Sezen" -EMAIL="orbea@fredslev.dk" +EMAIL="orbea@riseup.net" diff --git a/system/zfs-auto-snapshot/README b/system/zfs-auto-snapshot/README new file mode 100644 index 0000000000..5db41321bf --- /dev/null +++ b/system/zfs-auto-snapshot/README @@ -0,0 +1,7 @@ +An alternative implementation of the zfs-auto-snapshot service for Linux +that is compatible with zfs-linux and zfs-fuse. + +Automatically create, rotate, and destroy periodic ZFS snapshots. This is +the utility that creates the @zfs-auto-snap_frequent, @zfs-auto-snap_hourly, +@zfs-auto-snap_daily, @zfs-auto-snap_weekly, and @zfs-auto-snap_monthly +snapshots if it is installed. diff --git a/system/zfs-auto-snapshot/slack-desc b/system/zfs-auto-snapshot/slack-desc new file mode 100644 index 0000000000..381ccb658b --- /dev/null +++ b/system/zfs-auto-snapshot/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------------------------------------------------------| +zfs-auto-snapshot: zfs-auto-snapshot (ZFS Snapshot) +zfs-auto-snapshot: +zfs-auto-snapshot: An alternative implementation of the zfs-auto-snapshot service for +zfs-auto-snapshot: Linux that is compatible with zfs-linux and zfs-fuse. +zfs-auto-snapshot: +zfs-auto-snapshot: Automatically create, rotate, and destroy periodic ZFS snapshots. +zfs-auto-snapshot: This is the utility that creates the @zfs-auto-snap_frequent, +zfs-auto-snapshot: @zfs-auto-snap_hourly, @zfs-auto-snap_daily, @zfs-auto-snap_weekly, +zfs-auto-snapshot: and @zfs-auto-snap_monthly snapshots if it is installed. +zfs-auto-snapshot: +zfs-auto-snapshot: diff --git a/system/zfs-auto-snapshot/zfs-auto-snapshot.SlackBuild b/system/zfs-auto-snapshot/zfs-auto-snapshot.SlackBuild new file mode 100644 index 0000000000..3f2f796b58 --- /dev/null +++ b/system/zfs-auto-snapshot/zfs-auto-snapshot.SlackBuild @@ -0,0 +1,91 @@ +#!/bin/sh + +# Slackware build script for zfs-auto-snapshot + +# Copyright 2019 Oleg A. Deordiev <admin@ifconfig.com.ua> +# 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. + +PRGNAM=zfs-auto-snapshot +VERSION=${VERSION:-1.2.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +USRDIR=/usr + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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-upstream-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-upstream-$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 {} \; + +make install DESTDIR=$PKG PREFIX=$USRDIR + +mv $PKG/usr/share/man $PKG/usr/man +rmdir $PKG/usr/share + +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 +cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README +cat $CWD/slack-desc > $PKG/usr/doc/$PRGNAM-$VERSION/slack-desc.txt +cat $CWD/$PRGNAM.info > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.info +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:-tgz} diff --git a/system/zfs-auto-snapshot/zfs-auto-snapshot.info b/system/zfs-auto-snapshot/zfs-auto-snapshot.info new file mode 100644 index 0000000000..8b3d54f4b3 --- /dev/null +++ b/system/zfs-auto-snapshot/zfs-auto-snapshot.info @@ -0,0 +1,10 @@ +PRGNAM="zfs-auto-snapshot" +VERSION="1.2.4" +HOMEPAGE="https://github.com/zfsonlinux/zfs-auto-snapshot" +DOWNLOAD="https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4/zfs-auto-snapshot-1.2.4.tar.gz" +MD5SUM="6c71731b441e1e0f8da385df583460d5" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Oleg A. Deordiev" +EMAIL="admin@ifconfig.com.ua" diff --git a/system/zfs-on-linux/README b/system/zfs-on-linux/README index 2351b37ceb..fe11a0407f 100644 --- a/system/zfs-on-linux/README +++ b/system/zfs-on-linux/README @@ -2,14 +2,14 @@ ZFS is a modern filesystem originally developed for SOLARIS. It provides many functionalities such as snapshots, data compression, data recovery, filesystem (snapshot) sending/reveiving, and more. -For more information about ZFS on linux, visit http://zfsonlinux.org +For more information about ZFS on Linux, please visit +https://zfsonlinux.org. NOTE: You'll need the kernel source code to be able to compile this. This package is kernel dependent, so you'll need to recompile it for every new kernel you choose to run. -If you're building this for a kernel that isn't currently running, -you'll need to pass what that kernel's 'uname -r' output will be -to the KERN variable when running the build script, e.g. KERN=4.14.9 +Please use KERN environment variable if target kernel version differs +from that's of the build machine, e.g. `export KERN=5.4.51`. -NOTE: you should run this on x86_64 systems. +NOTE: you should run ZFS on 64-bit systems. diff --git a/system/zfs-on-linux/slack-desc b/system/zfs-on-linux/slack-desc index 79067fae94..cb6c12ed88 100644 --- a/system/zfs-on-linux/slack-desc +++ b/system/zfs-on-linux/slack-desc @@ -12,8 +12,8 @@ zfs-on-linux: ZFS is a combined file system and logical volume manager designed zfs-on-linux: Sun Microsystems for Solaris. It features protection against data zfs-on-linux: corruption, support for high storage capacities, efficient data zfs-on-linux: compression, snapshots, copy-on-write clones, continuous integrity -zfs-on-linux: checking and automatic repair, ability to send/receive filesystems -zfs-on-linux: (snapshots) over e.g. SSH, and many, many more. -zfs-on-linux: This package requires spl-solaris. +zfs-on-linux: checking and automatic repair, native encryption, block-level data +zfs-on-linux: deduplication, ability to serialize filesystems (snapshots) +zfs-on-linux: e.g. to send/receive them over SSH, and many, many more. zfs-on-linux: zfs-on-linux: Homepage: https://zfsonlinux.org diff --git a/system/zfs-on-linux/zfs-on-linux.SlackBuild b/system/zfs-on-linux/zfs-on-linux.SlackBuild index 1b64542d87..48027407a7 100644 --- a/system/zfs-on-linux/zfs-on-linux.SlackBuild +++ b/system/zfs-on-linux/zfs-on-linux.SlackBuild @@ -2,6 +2,7 @@ # Slackware build script for zfs-on-linux +# Copyright 2021 Markus Reichelt <slackbuilds@mareichelt.de>, Germany # Copyright 2017 Marcin Szychowski <szycha@gmail.com>, Poland # Copyright 2016 Kevin Paulus <goarilla@gmail.com>, Belgium # Copyright 2013-2014 Petr Hejl - Czech Republic @@ -28,8 +29,8 @@ PRGNAM=zfs-on-linux SRCNAM=zfs -VERSION=${VERSION:-0.7.12} -BUILD=${BUILD:-1} +VERSION=${VERSION:-0.8.6} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} KERN=${KERN:-"$(uname -r)"} @@ -100,6 +101,8 @@ env -u ARCH make install DESTDIR=$PKG # no such thing here rm -fr $PKG/usr/lib/dracut +# no use to keep header files; the Module.symvers file would need the correct path anyway. +rm -r $PKG/usr/src mkdir -p $PKG/etc/rc.d/init.d rm -fr $PKG/etc/init.d @@ -113,7 +116,7 @@ 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 AUTHORS COPYRIGHT DISCLAIMER OPENSOLARIS.LICENSE README.markdown \ +cp -a AUTHORS COPYRIGHT LICENSE META README.md NEWS NOTICE CODE_OF_CONDUCT.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/zfs-on-linux/zfs-on-linux.info b/system/zfs-on-linux/zfs-on-linux.info index 2db39b7cec..ac5850c145 100644 --- a/system/zfs-on-linux/zfs-on-linux.info +++ b/system/zfs-on-linux/zfs-on-linux.info @@ -1,10 +1,10 @@ PRGNAM="zfs-on-linux" -VERSION="0.7.12" +VERSION="0.8.6" HOMEPAGE="https://zfsonlinux.org" -DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/zfs-0.7.12.tar.gz" -MD5SUM="384c4bc1cc47c9c3f630e3232227f601" +DOWNLOAD="https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.6/zfs-0.8.6.tar.gz" +MD5SUM="e3ca8d66af6e2d7a214e92bf6c733082" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="spl-solaris" -MAINTAINER="Marcin Szychowski" -EMAIL="szycha@gmail.com" +REQUIRES="" +MAINTAINER="Markus Reichelt" +EMAIL="slackbuilds@mareichelt.de" diff --git a/system/znapzend/README b/system/znapzend/README new file mode 100644 index 0000000000..89a0ee889a --- /dev/null +++ b/system/znapzend/README @@ -0,0 +1,10 @@ +ZnapZend is a ZFS centric backup tool to create snapshots and send + them to backup locations. It relies on the ZFS tools snapshot, + send and receive to do its work. It has the built-in ability to + manage both local snapshots as well as remote copies by thinning + them out as time progresses. + +The ZnapZend configuration is stored as properties in the ZFS + filesystem itself. + +Does not require zfs but is mostly useless without it. diff --git a/system/znapzend/slack-desc b/system/znapzend/slack-desc new file mode 100644 index 0000000000..4eca1f6027 --- /dev/null +++ b/system/znapzend/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 ':'. + + |-----handy-ruler------------------------------------------------------| +znapzend: znapzend (zfs backup helper tool) +znapzend: +znapzend: ZnapZend is a ZFS centric backup tool to create snapshots and send +znapzend: them to backup locations. It relies on the ZFS tools snapshot, send +znapzend: and receive to do its work. It has the built-in ability to manage +znapzend: both local snapshots as well as remote copies by thinning them out +znapzend: as time progresses. +znapzend: +znapzend: https://github.com/oetiker/znapzend +znapzend: +znapzend: diff --git a/system/znapzend/znapzend.SlackBuild b/system/znapzend/znapzend.SlackBuild new file mode 100644 index 0000000000..7875648231 --- /dev/null +++ b/system/znapzend/znapzend.SlackBuild @@ -0,0 +1,103 @@ +#!/bin/sh -e + +# Slackware build script for znapzend + +# revision 2019/10/08 - spookydonut + +# Copyright 2019 spookydonut +# 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. + +PRGNAM=znapzend +VERSION=${VERSION:-0.19.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +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 + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +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" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install 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 + +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 AUTHORS CHANGES COPYRIGHT LICENSE README VERSION $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; + +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:-tgz} diff --git a/system/znapzend/znapzend.info b/system/znapzend/znapzend.info new file mode 100644 index 0000000000..d5f555c555 --- /dev/null +++ b/system/znapzend/znapzend.info @@ -0,0 +1,10 @@ +PRGNAM="znapzend" +VERSION="0.19.1" +HOMEPAGE="https://www.znapzend.org/" +DOWNLOAD="https://github.com/oetiker/znapzend/releases/download/v0.19.1/znapzend-0.19.1.tar.gz" +MD5SUM="65337c4de882972970b7c44bc40ecb3a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="spookydonut" +EMAIL="sbo@spooksoftware.com" diff --git a/system/zsh-completions/zsh-completions.SlackBuild b/system/zsh-completions/zsh-completions.SlackBuild index 7f65c27b70..3f7d830057 100644 --- a/system/zsh-completions/zsh-completions.SlackBuild +++ b/system/zsh-completions/zsh-completions.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for the zsh-completions. # -# Copyright 2018-2019 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2018-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zsh-completions -VERSION=${VERSION:-0.30.0} +VERSION=${VERSION:-0.32.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/zsh-completions/zsh-completions.info b/system/zsh-completions/zsh-completions.info index e569186730..b33d141a83 100644 --- a/system/zsh-completions/zsh-completions.info +++ b/system/zsh-completions/zsh-completions.info @@ -1,8 +1,8 @@ PRGNAM="zsh-completions" -VERSION="0.30.0" +VERSION="0.32.0" HOMEPAGE="https://github.com/zsh-users/zsh-completions" -DOWNLOAD="https://github.com/zsh-users/zsh-completions/archive/0.30.0/zsh-completions-0.30.0.tar.gz" -MD5SUM="4912279ffd06076d8fedfa18b44989d6" +DOWNLOAD="https://github.com/zsh-users/zsh-completions/archive/0.32.0/zsh-completions-0.32.0.tar.gz" +MD5SUM="6dd2963013700d6024cf3e292cc1110c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild index ed79ce63c0..e7f8830af0 100644 --- a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild +++ b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for the zsh-syntax-highlighting. # -# Copyright 2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2018-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zsh-syntax-highlighting -VERSION=${VERSION:-20181101} +VERSION=${VERSION:-0.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,16 +54,14 @@ else LIBDIRSUFFIX="" fi -SRCVER=${SRCVER:-e900ad8bad53501689afcb050456400d7a8466e5} - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVER -tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz -cd $PRGNAM-$SRCVER +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 \ diff --git a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info index 4f7b58ef4a..74c7ba4fe5 100644 --- a/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info +++ b/system/zsh-syntax-highlighting/zsh-syntax-highlighting.info @@ -1,8 +1,8 @@ PRGNAM="zsh-syntax-highlighting" -VERSION="20181101" +VERSION="0.7.1" HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting" -DOWNLOAD="https://github.com/zsh-users/zsh-syntax-highlighting/archive/e900ad8bad53501689afcb050456400d7a8466e5/zsh-syntax-highlighting-e900ad8bad53501689afcb050456400d7a8466e5.tar.gz" -MD5SUM="d4ef3fa7e33e83f0e969270488d45f3c" +DOWNLOAD="https://github.com/zsh-users/zsh-syntax-highlighting/archive/0.7.1/zsh-syntax-highlighting-0.7.1.tar.gz" +MD5SUM="a271f8f290c4173eb056d7f2d6229eb1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/zstd/slack-desc b/system/zstd/slack-desc index 77578cc136..215674d549 100644 --- a/system/zstd/slack-desc +++ b/system/zstd/slack-desc @@ -1,19 +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 +# 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------------------------------------------------------| -zstd: zstd (fast lossless compression) -zstd: -zstd: Zstd, short for Zstandard, is a fast lossless compression algorithm, -zstd: targeting real-time compression scenarios at zlib-level and better -zstd: compression ratios. -zstd: -zstd: Homepage: http://facebook.github.io/zstd/ -zstd: +zstd: zstd (real-time compression algorithm) zstd: +zstd: Zstandard, or zstd for short, is a real-time compression algorithm +zstd: providing high compression ratios. It offers a very wide range of +zstd: compression/speed trade-off, while being backed by a very fast +zstd: decoder. It also offers a special mode for small data, called +zstd: dictionary compression, and can create dictionaries from any sample +zstd: set. zstd: +zstd: Homepage: http://zstd.net/ zstd: diff --git a/system/zstd/zstd.SlackBuild b/system/zstd/zstd.SlackBuild index b00f9d9ef9..297b0b92f5 100644 --- a/system/zstd/zstd.SlackBuild +++ b/system/zstd/zstd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for zstd -# Copyright 2016, Zhu Qun-Ying +# Copyright 2016-2019, Zhu Qun-Ying # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zstd -VERSION=${VERSION:-1.3.8} +VERSION=${VERSION:-1.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,6 +62,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,15 +70,33 @@ 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 {} \; -make CFLAGS="$SLKCFLAGS" DESTDIR=$PKG PREFIX=/usr LIBDIR=/usr/lib$LIBDIRSUFFIX mandir=/usr/man/ install -make -C contrib/pzstd DESTDIR=$PKG PREFIX=/usr install +# Compile it: +make CFLAGS="$SLKCFLAGS" +make CFLAGS="$SLKCFLAGS" -C contrib/pzstd + +# Install it: +make \ + prefix=/usr \ + libdir=/usr/lib${LIBDIRSUFFIX} \ + mandir=/usr/man \ + DESTDIR=$PKG \ + install +install -Dm755 contrib/pzstd/pzstd $PKG/usr/bin/pzstd + +# Don't ship static library: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a + +# zstdmt as the same as zstd, so just make a symlink: +( cd $PKG/usr/bin + ln -sf zstd zstdmt +) 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/pzstd -cp -a doc/* CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION -cp contrib/pzstd/README.md $PKG/usr/doc/$PRGNAM-$VERSION/pzstd +cp -a CONTRIBUTING* COPYING* LICENSE README* doc $PKG/usr/doc/$PRGNAM-$VERSION +cp contrib/pzstd/README.md $PKG/usr/doc/$PRGNAM-$VERSION/pzstd-README.md cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz b/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz Binary files differnew file mode 100644 index 0000000000..3e5d5d7c32 --- /dev/null +++ b/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz diff --git a/system/zstd/zstd.info b/system/zstd/zstd.info index 510c871bc3..5f404b9774 100644 --- a/system/zstd/zstd.info +++ b/system/zstd/zstd.info @@ -1,8 +1,8 @@ PRGNAM="zstd" -VERSION="1.3.8" +VERSION="1.4.4" HOMEPAGE="http://facebook.github.io/zstd/" -DOWNLOAD="https://github.com/facebook/zstd/releases/download/v1.3.8/zstd-1.3.8.tar.gz" -MD5SUM="c261c29f896eb97946c225295485156b" +DOWNLOAD="https://github.com/facebook/zstd/releases/download/v1.4.4/zstd-1.4.4.tar.gz" +MD5SUM="487f7ee1562dee7c1c8adf85e2a63df9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/zuluCrypt/zuluCrypt.SlackBuild b/system/zuluCrypt/zuluCrypt.SlackBuild index 831f62f9ee..7628512bfe 100644 --- a/system/zuluCrypt/zuluCrypt.SlackBuild +++ b/system/zuluCrypt/zuluCrypt.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for zuluCrypt. # -# Copyright 2015-2018 Edinaldo P. Silva, Rio de Janeiro, Brazil. +# Copyright 2015-2020 Edinaldo P. Silva, Rio de Janeiro, Brazil. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zuluCrypt -VERSION=${VERSION:-5.4.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.7.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/system/zuluCrypt/zuluCrypt.info b/system/zuluCrypt/zuluCrypt.info index 3385eee61f..013b62b239 100644 --- a/system/zuluCrypt/zuluCrypt.info +++ b/system/zuluCrypt/zuluCrypt.info @@ -1,10 +1,10 @@ PRGNAM="zuluCrypt" -VERSION="5.4.0" +VERSION="5.7.0" HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/" -DOWNLOAD="https://github.com/mhogomchungu/zuluCrypt/archive/5.4.0/zuluCrypt-5.4.0.tar.gz" -MD5SUM="a4590777692f522594ab438690a6cdf2" +DOWNLOAD="https://github.com/mhogomchungu/zuluCrypt/archive/5.7.0/zuluCrypt-5.7.0.tar.gz" +MD5SUM="cc388dc0eefee86e40b19f8e42ce280e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5 libpwquality zuluplay" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" |
