diff options
Diffstat (limited to 'network')
1057 files changed, 14907 insertions, 22837 deletions
diff --git a/network/2ping/2ping.SlackBuild b/network/2ping/2ping.SlackBuild index 263ffa123b..1e52bff087 100644 --- a/network/2ping/2ping.SlackBuild +++ b/network/2ping/2ping.SlackBuild @@ -6,13 +6,16 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20200805 bkw: update for v4.5. +# 20191130 bkw: update for v4.3. + # 20180821 bkw: # - update for v4.2. # - document optional deps in README. # - include wireshark stuff in package. PRGNAM=2ping -VERSION=${VERSION:-4.2} +VERSION=${VERSION:-4.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/2ping/2ping.info b/network/2ping/2ping.info index 2cc7f5188f..dd25f12962 100644 --- a/network/2ping/2ping.info +++ b/network/2ping/2ping.info @@ -1,8 +1,8 @@ PRGNAM="2ping" -VERSION="4.2" +VERSION="4.5" HOMEPAGE="https://www.finnie.org/software/2ping/" -DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.2/2ping-4.2.tar.gz" -MD5SUM="5be6bdc3a35c1592133642ea80c0e63e" +DOWNLOAD="https://github.com/rfinnie/2ping/archive/v4.5/2ping-4.5.tar.gz" +MD5SUM="acfb9d8e40cfae72bf1767347528ae4b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/network/3proxy/3proxy.info b/network/3proxy/3proxy.info index 90b875179b..2de1849234 100644 --- a/network/3proxy/3proxy.info +++ b/network/3proxy/3proxy.info @@ -1,7 +1,7 @@ PRGNAM="3proxy" VERSION="0.8.13" HOMEPAGE="https://3proxy.ru/" -DOWNLOAD="https://github.com/z3APA3A/3proxy/archive/0.8.13.tar.gz" +DOWNLOAD="https://github.com/z3APA3A/3proxy/archive/0.8.13/3proxy-0.8.13.tar.gz" MD5SUM="d9420c56f05fb78bf9043dd8a30c6a1c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/AdGuardHome/AdGuardHome.SlackBuild b/network/AdGuardHome/AdGuardHome.SlackBuild index c4da27a559..85e19365bc 100644 --- a/network/AdGuardHome/AdGuardHome.SlackBuild +++ b/network/AdGuardHome/AdGuardHome.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for AdGuardHome -# Copyright 2019, Alexander Verbovetsky, Moscow, Russia +# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,14 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=AdGuardHome -VERSION=${VERSION:-0.99.2} +VERSION=${VERSION:-0.105.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 @@ -40,16 +39,13 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SUFFIX="linux_386" -elif [ "$ARCH" = "x86_64" ]; then - SUFFIX="linux_amd64" -elif [ "$ARCH" = "arm" ]; then - SUFFIX="linux_arm" -else - echo "$ARCH is not supported." >&2 - exit 1 -fi +case "$ARCH" in + i?86) SUFFIX="linux_386" ;; + x86_64) SUFFIX="linux_amd64" ;; + *) echo "$ARCH is not supported." >&2 + exit 1 + ;; +esac set -e diff --git a/network/AdGuardHome/AdGuardHome.info b/network/AdGuardHome/AdGuardHome.info index 0b0d6426c7..b254d22293 100644 --- a/network/AdGuardHome/AdGuardHome.info +++ b/network/AdGuardHome/AdGuardHome.info @@ -1,10 +1,10 @@ PRGNAM="AdGuardHome" -VERSION="0.99.2" +VERSION="0.105.2" HOMEPAGE="https://adguard.com/adguard-home.html" -DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.99.2/AdGuardHome_linux_386.tar.gz" -MD5SUM="8842f102b2e1e8d1427fde0d4ddee1c6" -DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.99.2/AdGuardHome_linux_amd64.tar.gz" -MD5SUM_x86_64="2bb95c83990175464d8062a0246527d5" +DOWNLOAD="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.105.2/AdGuardHome_linux_386.tar.gz" +MD5SUM="257243522f370491c4c3515270dbf5f1" +DOWNLOAD_x86_64="https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.105.2/AdGuardHome_linux_amd64.tar.gz" +MD5SUM_x86_64="e7e99dda4cbe67e8f65545440805b4e2" REQUIRES="" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/network/Electrum/Electrum.SlackBuild b/network/Electrum/Electrum.SlackBuild index d5895bfdab..7b9877ac08 100644 --- a/network/Electrum/Electrum.SlackBuild +++ b/network/Electrum/Electrum.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Electrum # Copyright 2014-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> -# Copyright 2019 nomnombtc <nomnombtc@arcor.de> +# Copyright 2019-2021 nomnombtc <nomnombtc@arcor.de> # 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=Electrum -VERSION=${VERSION:-3.3.8} +VERSION=${VERSION:-4.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/Electrum/Electrum.info b/network/Electrum/Electrum.info index 1ebeeb30c9..c11549a938 100644 --- a/network/Electrum/Electrum.info +++ b/network/Electrum/Electrum.info @@ -1,10 +1,10 @@ PRGNAM="Electrum" -VERSION="3.3.8" +VERSION="4.1.1" HOMEPAGE="https://electrum.org/" -DOWNLOAD="https://download.electrum.org/3.3.8/Electrum-3.3.8.tar.gz" -MD5SUM="66a1d04927f7cf7bb44a254d8791de96" +DOWNLOAD="https://download.electrum.org/4.1.1/Electrum-4.1.1.tar.gz" +MD5SUM="e15a6260cdb4af85d324ce9cb68bec35" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-PyQt5 ecdsa python-qrcode protobuf3 python-jsonrpclib dnspython pyaes secp256k1 python3-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX python-chardet" +REQUIRES="python3-PyQt5 protobuf3 cryptography dnspython secp256k1 python-certifi python3-six python3-aiohttp python3-aiohttp-socks python3-aiorpcX-legacy python-qrcode python-chardet python-bitstring QDarkStyle" MAINTAINER="nomnombtc" EMAIL="nomnombtc@arcor.de" diff --git a/network/tramp/tramp.SlackBuild b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild index d5801b0d1d..faf559b5e1 100644 --- a/network/tramp/tramp.SlackBuild +++ b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for tramp v.2.2.7 for Emacs +# Slackware build script for NetworkManager-fortisslvpn -# Copyright 2013 Renato MARTINI - renato.martini AT gmail.com +# Copyright 2020 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=tramp -VERSION=${VERSION:-2.2.7} +PRGNAM=NetworkManager-fortisslvpn +VERSION=${VERSION:-1.2.10} 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 +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" @@ -54,20 +54,22 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvzf $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 {} \; + \( -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" \ @@ -76,9 +78,11 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --infodir=/usr/info \ - --build=$ARCH-slackware-linux \ - --with-contrib + --mandir=/usr/man \ + --without-gnome \ + --without-libnm-glib \ + --disable-static \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG @@ -86,12 +90,9 @@ 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 -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/tramp - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ChangeLog README CONTRIBUTORS INSTALL \ + AUTHORS COPYING ChangeLog NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info new file mode 100644 index 0000000000..d7472771fe --- /dev/null +++ b/network/NetworkManager-fortisslvpn/NetworkManager-fortisslvpn.info @@ -0,0 +1,10 @@ +PRGNAM="NetworkManager-fortisslvpn" +VERSION="1.2.10" +HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn" +DOWNLOAD="https://github.com/GNOME/NetworkManager-fortisslvpn/archive/1.2.10/NetworkManager-fortisslvpn-1.2.10.tar.gz" +MD5SUM="5a484064654e2428067674e4d9382ec0" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="openfortivpn" +MAINTAINER="Gerardo Zamudio" +EMAIL="gerado.zamudio@linux.com" diff --git a/network/NetworkManager-fortisslvpn/README b/network/NetworkManager-fortisslvpn/README new file mode 100644 index 0000000000..7740068ef6 --- /dev/null +++ b/network/NetworkManager-fortisslvpn/README @@ -0,0 +1 @@ +Fortinet SSLVPN support for NetworkManager diff --git a/network/prosody-mod-smacks-offline/slack-desc b/network/NetworkManager-fortisslvpn/slack-desc index 7c5b5c877a..9b57abc7e3 100644 --- a/network/prosody-mod-smacks-offline/slack-desc +++ b/network/NetworkManager-fortisslvpn/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -prosody-mod-smacks-offline: prosody-mod-smacks-offline (XEP-0198: Stream Management) -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: -prosody-mod-smacks-offline: https://modules.prosody.im/mod_smacks_offline.html -prosody-mod-smacks-offline: +NetworkManager-fortisslvpn: NetworkManager-fortisslvpn (NetworkManager SSLVPN) +NetworkManager-fortisslvpn: +NetworkManager-fortisslvpn: Fortinet SSLVPN support for NetworkManager +NetworkManager-fortisslvpn: +NetworkManager-fortisslvpn: This requires the openfortivpn client installed, version 1.10 or newer +NetworkManager-fortisslvpn: +NetworkManager-fortisslvpn: +NetworkManager-fortisslvpn: +NetworkManager-fortisslvpn: +NetworkManager-fortisslvpn: +NetworkManager-fortisslvpn: diff --git a/network/NetworkManager-l2tp/slack-desc b/network/NetworkManager-l2tp/slack-desc index 2c2faf1cf1..2911978127 100644 --- a/network/NetworkManager-l2tp/slack-desc +++ b/network/NetworkManager-l2tp/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------------------------------------------------------| -network-manager-l2tp: network-manager-l2tp (VPN Plugin for NM) -network-manager-l2tp: -network-manager-l2tp: NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later -network-manager-l2tp: which provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec) -network-manager-l2tp: connections. For L2TP support, it uses xl2tpd -network-manager-l2tp: ( https://www.xelerance.com/software/xl2tpd/ ) -network-manager-l2tp: -network-manager-l2tp: https://github.com/nm-l2tp/network-manager-l2tp -network-manager-l2tp: -network-manager-l2tp: -network-manager-l2tp: + |-----handy-ruler------------------------------------------------------| +NetworkManager-l2tp: NetworkManager-l2tp (VPN Plugin for NM) +NetworkManager-l2tp: +NetworkManager-l2tp: NetworkManager-l2tp is a VPN plugin for NetworkManager 1.2 and later +NetworkManager-l2tp: which provides support for L2TP and L2TP/IPsec (i.e. L2TP over IPsec) +NetworkManager-l2tp: connections. For L2TP support, it uses xl2tpd +NetworkManager-l2tp: ( https://www.xelerance.com/software/xl2tpd/ ) +NetworkManager-l2tp: +NetworkManager-l2tp: https://github.com/nm-l2tp/network-manager-l2tp +NetworkManager-l2tp: +NetworkManager-l2tp: +NetworkManager-l2tp: diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild index 1f169d2a0d..325758ed3b 100644 --- a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild +++ b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-pptp -VERSION=${VERSION:-1.2.4} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.2.8} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Find the version number for pppd, used to specify the plugin directory: +PPPD=$(echo /usr/lib${LIBDIRSUFFIX}/pppd/?.?.? | rev | cut -f 1 -d / | rev) + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -78,7 +81,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/2.4.5 \ + --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \ + --without-gnome \ --build=$ARCH-slackware-linux make diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.info b/network/NetworkManager-pptp/NetworkManager-pptp.info index 0efbfaf33d..a02a65fe28 100644 --- a/network/NetworkManager-pptp/NetworkManager-pptp.info +++ b/network/NetworkManager-pptp/NetworkManager-pptp.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-pptp" -VERSION="1.2.4" +VERSION="1.2.8" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.4.tar.xz" -MD5SUM="a05b36c92870e2e248c0c75b2c7ef577" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz" +MD5SUM="305e31d6aac41813d735f27891fce6d8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pptp" diff --git a/network/NetworkManager-ssh/README b/network/NetworkManager-ssh/README index 732f2f49fb..abf83415e2 100644 --- a/network/NetworkManager-ssh/README +++ b/network/NetworkManager-ssh/README @@ -1,5 +1,6 @@ NetworkManager-ssh (SSH VPN support for NetworkManager) -You will need to add the following line to /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf: +You will need to add the following line to +/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf: <allow send_destination="org.freedesktop.NetworkManager.ssh"/> diff --git a/network/Pafy/Pafy.SlackBuild b/network/Pafy/Pafy.SlackBuild index 29539c73ba..7ae6997bc0 100644 --- a/network/Pafy/Pafy.SlackBuild +++ b/network/Pafy/Pafy.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Pafy -# 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 @@ -22,9 +22,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200119 bkw: +# Dimitris: this is B. Watson (yalhcru@gmail.com). I can't reach you +# by email and you don't use IRC, so I'm "texting" you via this +# comment. Pafy fails to build unless youtube-dl is installed, so +# I added it to REQUIRES as a hard dep. + PRGNAM=Pafy SRCNAM=${PRGNAM,} -VERSION=${VERSION:-0.5.4} +VERSION=${VERSION:-0.5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/Pafy/Pafy.info b/network/Pafy/Pafy.info index 406ab35285..774982c1fc 100644 --- a/network/Pafy/Pafy.info +++ b/network/Pafy/Pafy.info @@ -1,10 +1,10 @@ PRGNAM="Pafy" -VERSION="0.5.4" +VERSION="0.5.5" HOMEPAGE="https://github.com/mps-youtube/pafy" -DOWNLOAD="https://pypi.python.org/packages/41/cb/ec840c79942fb0788982963b61a361ecd10e4e58ad3dcaef4f0e809ce2fe/pafy-0.5.4.tar.gz" -MD5SUM="092930504c7e4fcea30b7446fa1878c7" +DOWNLOAD="https://files.pythonhosted.org/packages/7e/02/b70f4d2ad64bbc7d2a00018c6545d9b9039208553358534e73e6dd5bbaf6/pafy-0.5.5.tar.gz" +MD5SUM="01430bb4876aec3b648b2f52c5ee7bd6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="youtube-dl" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/network/Pafy/README b/network/Pafy/README index e583af6bff..a9b7098d28 100644 --- a/network/Pafy/README +++ b/network/Pafy/README @@ -15,5 +15,3 @@ Python API for YouTube - Download videos and retrieve metadata from YouTube. - Download video only (no audio) in m4v format. - Retreive playlists and playlist metadata. - Works with Python 2.6+ and 3.3+. - -Optional dependency: youtube-dl diff --git a/network/Quaternion/Quaternion.SlackBuild b/network/Quaternion/Quaternion.SlackBuild new file mode 100644 index 0000000000..a43bdc3ebc --- /dev/null +++ b/network/Quaternion/Quaternion.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/sh + +# Slackware build script for Quaternion + +# Copyright 2020 Charles Daniels, United States +# 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=Quaternion +VERSION=${VERSION:-0.0.9.4e} +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 {} \; + +# -DUSE_INTREE_LIBQMC=0 to use the installed version of libQuotient, rather +# than building in a submodule. This is preferred both because the relase +# tarball will not include libQuotient, and to avoid multiple installations. + +# -DUSE_KEYCHAIN=0 to disable support for qt5keychain. I could not get this to +# work even with the qtkeychain package from slackbuilds.org. YMMV. + +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 .. \ + -DUSE_INTREE_LIBQMC=0 \ + -DUSE_KEYCHAIN=0 + 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 \ + BUILDING.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/network/Quaternion/Quaternion.info b/network/Quaternion/Quaternion.info new file mode 100644 index 0000000000..69eb62ee78 --- /dev/null +++ b/network/Quaternion/Quaternion.info @@ -0,0 +1,10 @@ +PRGNAM="Quaternion" +VERSION="0.0.9.4e" +HOMEPAGE="https://github.com/quotient-im/Quaternion" +DOWNLOAD="https://github.com/quotient-im/Quaternion/archive/0.0.9.4e/Quaternion-0.0.9.4e.tar.gz" +MD5SUM="e489f331b49f18e0554b60070e61b7c9" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="qt5 libQuotient" +MAINTAINER="Charles Daniels" +EMAIL="charles@cdaniels.net" diff --git a/network/Quaternion/README b/network/Quaternion/README new file mode 100644 index 0000000000..49c048fa48 --- /dev/null +++ b/network/Quaternion/README @@ -0,0 +1,12 @@ +Quaternion is a cross-platform desktop IM client for the Matrix +protocol. + +SlackBuild notes: + +* -DUSE_KEYCHAIN=0 is set - I was not able to get Quaternion to use the + version of qtkeychain from slackbuilds.org. YMMV. + +* -DUSE_INTREE_LIBQMC=0 is set to use the system copy of libQuotient. + Using the in-tree version requires the sources to be fetched + recursively via git, since it's a submodule. You probably don't want + to change this. diff --git a/network/waterfox/doinst.sh b/network/Quaternion/doinst.sh index 9a8ded3c60..9a8ded3c60 100644 --- a/network/waterfox/doinst.sh +++ b/network/Quaternion/doinst.sh diff --git a/network/Quaternion/slack-desc b/network/Quaternion/slack-desc new file mode 100644 index 0000000000..b8c7bdb2bd --- /dev/null +++ b/network/Quaternion/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------------------------------------------------------| +Quaternion: Quaternion (A Qt5-based IM client for Matrix) +Quaternion: +Quaternion: Quaternion is a cross-platform desktop IM client for the Matrix +Quaternion: protocol. +Quaternion: +Quaternion: Homepage: https://github.com/quotient-im/Quaternion +Quaternion: +Quaternion: +Quaternion: +Quaternion: +Quaternion: diff --git a/network/QuiteRSS/QuiteRSS.SlackBuild b/network/QuiteRSS/QuiteRSS.SlackBuild index 25db6d35bc..5c5b72efbe 100644 --- a/network/QuiteRSS/QuiteRSS.SlackBuild +++ b/network/QuiteRSS/QuiteRSS.SlackBuild @@ -3,9 +3,10 @@ # Slackware build script for QuiteRSS # Written by Andrey Maraev <andrew.maraev60@yandex.ru> +# Maintained by Spycrowsoft as of 2020-10-18 PRGNAM=QuiteRSS -VERSION=${VERSION:-0.18.9} +VERSION=${VERSION:-0.19.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/QuiteRSS/QuiteRSS.info b/network/QuiteRSS/QuiteRSS.info index da08dbe69c..f37df41ce7 100644 --- a/network/QuiteRSS/QuiteRSS.info +++ b/network/QuiteRSS/QuiteRSS.info @@ -1,10 +1,10 @@ PRGNAM="QuiteRSS" -VERSION="0.18.9" +VERSION="0.19.4" HOMEPAGE="http://quiterss.org/en/node" -DOWNLOAD="https://quiterss.org/files/0.18.9/QuiteRSS-0.18.9-src.tar.gz" -MD5SUM="6a1d7b3ad8842d8c9cd745a8076726c2" +DOWNLOAD="https://quiterss.org/files/0.19.4_/QuiteRSS-0.19.4-src.tar.gz" +MD5SUM="96a25a33904dadba2daa3ea5c92d4388" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Reedych" -EMAIL="reedych@ya.ru" +MAINTAINER="Spycrowsoft" +EMAIL="spycrowsoft [ at ] gmail [ dot ] com" diff --git a/network/RSSOwl/README b/network/RSSOwl/README deleted file mode 100644 index d203b265b5..0000000000 --- a/network/RSSOwl/README +++ /dev/null @@ -1,5 +0,0 @@ -RSSOwl (eclipse based RSS reader) A News Reader for Everyone. RSSOwl lets -you gather, organize, update, and store information from any compliant -source in a convenient, easy to use interface, save selected information in -various formats for offline viewing and sharing, and much more. RSSOwl is -open source, licensed under the terms of the Eclipse Public License. diff --git a/network/RSSOwl/RSSOwl.desktop b/network/RSSOwl/RSSOwl.desktop deleted file mode 100644 index 6de5a6267e..0000000000 --- a/network/RSSOwl/RSSOwl.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Exec=RSSOwl -Icon=RSSOwl -Type=Application -Categories=Network; -Name=RSSOwl -GenericName=RSS News Reader -MimeType=application/rss+xml; -X-KDE-StartupNotify=true - diff --git a/network/RSSOwl/RSSOwl.info b/network/RSSOwl/RSSOwl.info deleted file mode 100644 index a34f2b4f5d..0000000000 --- a/network/RSSOwl/RSSOwl.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="RSSOwl" -VERSION="2.2.1" -HOMEPAGE="http://www.rssowl.org/" -DOWNLOAD="http://downloads.sourceforge.net/rssowl/rssowl-2.2.1.linux.x86.zip" -MD5SUM="7295bbce792dc921ac89781ac717e6f6" -DOWNLOAD_x86_64="http://downloads.sourceforge.net/rssowl/rssowl-2.2.1.linux.x86_64.zip" -MD5SUM_x86_64="7751803db518b267b0dca121c1532747" -REQUIRES="jdk" -MAINTAINER="Erik Hanson" -EMAIL="erik@slackbuilds.org" diff --git a/network/RSSOwl/doinst.sh b/network/RSSOwl/doinst.sh deleted file mode 100644 index 24e4bc11e0..0000000000 --- a/network/RSSOwl/doinst.sh +++ /dev/null @@ -1,4 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null -fi - diff --git a/network/RTL8192/README b/network/RTL8192/README new file mode 100644 index 0000000000..57af2d7643 --- /dev/null +++ b/network/RTL8192/README @@ -0,0 +1,26 @@ +The RTL8192 package includes the kernel module '8192eu', +which contains a TP-Link-provided kernel driver known to +support the Realtek 8192 chipset, and possibly others. + +Slackware kernel-source package needs to be installed for build to work, +and module will need to be re-built after a kernel upgrade. + +To build for a kernel other than the one currently running, +pass KVER variable when invoking SlackBuild script. E.g., + + KVER=4.4.14 ./RTL8192.SlackBuild + +This driver is advertised to work with the following TP-Link USB wifi +adapters: TL-WN821N V6/TL-WN822N V5/TL-WN823N V3. The driver has +also been tested (both i386 & x86_64) to work for the TL-WN823N V2. +Other brands of USB devices utilizing the Realtek 8192 chip may work, +as well. + +From the website: + + Published Date: 2018-05-08 + Operating System: Linux (kernel 2.6.24 ~ 4.9.60) + + For TL-WN821N V6/TL-WN822N V5/TL-WN823N V3. + This is a beta version; unknown bugs may still exist. + The formal version is coming soon. diff --git a/network/RTL8192/RTL8192.SlackBuild b/network/RTL8192/RTL8192.SlackBuild new file mode 100644 index 0000000000..f54f57b1c8 --- /dev/null +++ b/network/RTL8192/RTL8192.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh +# +# Slackware build script for RTL8192 wifi USB driver. +# +# Copyright 2020 by Jay, Seattle, WA. +# 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=RTL8192 +VERSION=${VERSION:-5.2.19.1} +BUILD=${BUILD:-25633} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i386 ;; + arm64*) ARCH=arm64 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +else + # 32-bit PC build fails if ARCH != i386 + case "$ARCH" in + i?86) export ARCH=i386 ;; + esac +fi + +# Caveat emptor +case "$ARCH" in + i386) ;; + x86_64) ;; + *) echo -e "\nBuild for $ARCH is untested!!" + echo -e "Press Ctrl-C within ten seconds to abort," + echo -e "or press ENTER to continue at your own risk.\n" + read -t 10 PLACEHOLDER ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} +KVER=${KVER:-$( uname -r )} + +set -e + +rm -rf $PKG +rm -rf $TMP/$PRGNAM +mkdir -p $PKG $OUTPUT $TMP/$PRGNAM +# Nested zip files +unzip $CWD/TP-Link_Driver_Linux_series8_beta.zip -d $TMP/$PRGNAM +cd $TMP/$PRGNAM +unzip rtl8192EU_WiFi_linux_v5.2.19.1_25633.20171222_COEX20171113-0047.zip +cd rtl8192EU_WiFi_linux_v5.2.19.1_25633.20171222_COEX20171113-0047 + +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/lib/modules/$KVER/kernel/drivers/net/wireless/ +sed -i 's/install -p -m 644 $(MODULE_NAME).ko $(MODDESTDIR)/install -p -m 644 $(MODULE_NAME).ko $(DESTDIR)$(MODDESTDIR)/' Makefile +sed -i "s/\/sbin\/depmod -a \${KVER}//" Makefile +sed -i "s/KVER.*:=/KVER ?=/" Makefile + +make +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $TMP/$PRGNAM/readme_beta.txt > $PKG/usr/doc/$PRGNAM-$VERSION/readme_beta.txt +cp $TMP/$PRGNAM/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION/ + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat << EOF > $PKG/install/doinst.sh +# A good idea whenever kernel modules are added or changed: +if [ -x sbin/depmod ]; then + chroot . /sbin/depmod -a 1> /dev/null 2> /dev/null +fi +EOF + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$KVER-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/RTL8192/RTL8192.info b/network/RTL8192/RTL8192.info new file mode 100644 index 0000000000..ee8ff7cfe1 --- /dev/null +++ b/network/RTL8192/RTL8192.info @@ -0,0 +1,10 @@ +PRGNAM="RTL8192" +VERSION="5.2.19.1" +HOMEPAGE="https://www.tp-link.com/ca/support/download/tl-wn823n/" +DOWNLOAD="https://static.tp-link.com/2018/201805/20180514/TP-Link_Driver_Linux_series8_beta.zip" +MD5SUM="e2c4dbb26f2a4d3eaa6f52328b6e6010" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jay" +EMAIL="ld.jay@protonmail.com" diff --git a/network/hipchat/slack-desc b/network/RTL8192/slack-desc index 256dad5682..62257426a3 100644 --- a/network/hipchat/slack-desc +++ b/network/RTL8192/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -hipchat: hipchat (private group messaging) -hipchat: -hipchat: HipChat is a private group messaging service with support for video -hipchat: chat, group screen sharing, and file sharing. -hipchat: -hipchat: This script repackages the Debian package provided by Atlassian. -hipchat: -hipchat: Note that only a 64 bit version is available. For an old 32 bit -hipchat: version of HipChat, see the hipchat2 SlackBuild. -hipchat: -hipchat: +RTL8192: RTL8192 (Realtek RTL8192 chip Driver) +RTL8192: +RTL8192: Specifically for TP-Link adapters: +RTL8192: TL-WN821N V6/TL-WN822N V5/TL-WN823N V3. +RTL8192: Also verified working on TL-WN823N V2. +RTL8192: +RTL8192: May also work on other brands using the RTL8192. +RTL8192: +RTL8192: For more information, see: +RTL8192: https://www.tp-link.com/ca/support/download/tl-wn823n/ +RTL8192: diff --git a/network/Signal-Desktop/README b/network/Signal-Desktop/README deleted file mode 100644 index 738d21f711..0000000000 --- a/network/Signal-Desktop/README +++ /dev/null @@ -1,13 +0,0 @@ -Signal Desktop is a chrome packaged app that links with your -Signal Android or Signal iOS app. - -Signal is an encrypted instant messaging and voice calling -application for Android and iOS. It uses the Internet to -send one-to-one and group messages, which can include images -and video messages, and make one-to-one voice calls. - -Please be sure to run the SlackBuild with a real root shell -using 'su -l'. If the build fails with an access error, remove -the npm cache: - - rm -rf ~/.npm/ diff --git a/network/Signal-Desktop/Signal-Desktop.desktop b/network/Signal-Desktop/Signal-Desktop.desktop deleted file mode 100644 index 5274855218..0000000000 --- a/network/Signal-Desktop/Signal-Desktop.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Signal Desktop -Comment=Signal Private Messenger for the Desktop -Exec=/usr/bin/signal -StartupWMClass=Signal-Desktop -Icon=Signal-Desktop -Terminal=false -Type=Application -Categories=Network; diff --git a/network/Signal-Desktop/Signal-Desktop.info b/network/Signal-Desktop/Signal-Desktop.info deleted file mode 100644 index d0366d1b40..0000000000 --- a/network/Signal-Desktop/Signal-Desktop.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="Signal-Desktop" -VERSION="0.42.2" -HOMEPAGE="https://github.com/WhisperSystems/Signal-Desktop" -DOWNLOAD="https://github.com/WhisperSystems/Signal-Desktop/archive/v0.42.2/Signal-Desktop-0.42.2.tar.gz" -MD5SUM="97a093a38f7b8d837e40fbc0e84e3585" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="nodejs nwjs rubygem-sass" -MAINTAINER="Rodrigo Gimenez" -EMAIL="estrod[at]zoho[dot]com" diff --git a/network/Signal-Desktop/expirejs.patch b/network/Signal-Desktop/expirejs.patch deleted file mode 100644 index 02f2ffc2dc..0000000000 --- a/network/Signal-Desktop/expirejs.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -bur Signal-Desktop-0.42.2/Gruntfile.js Signal-Desktop-0.42.2-fix/Gruntfile.js ---- Signal-Desktop-0.42.2/Gruntfile.js 2017-03-30 19:12:25.000000000 -0300 -+++ Signal-Desktop-0.42.2-fix/Gruntfile.js 2017-04-01 08:58:49.662938344 -0300 -@@ -127,9 +127,10 @@ - /textsecure-service-staging.whispersystems.org/g, - 'textsecure-service-ca.whispersystems.org'); - } else if (srcpath.match('expire.js')) { -- var gitinfo = grunt.config.get('gitinfo'); -- var commited = gitinfo.local.branch.current.lastCommitTime; -- var time = Date.parse(commited) + 1000 * 60 * 60 * 24 * 90; -+ //var gitinfo = grunt.config.get('gitinfo'); -+ //var commited = gitinfo.local.branch.current.lastCommitTime; -+ //var time = Date.parse(commited) + 1000 * 60 * 60 * 24 * 90; -+ var time = NaN; - return content.replace( - /var BUILD_EXPIRATION = 0/, - "var BUILD_EXPIRATION = " + time diff --git a/network/Signal-Desktop/slack-desc b/network/Signal-Desktop/slack-desc deleted file mode 100644 index ee7eca4ab6..0000000000 --- a/network/Signal-Desktop/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------------------------------------------------------| -Signal-Desktop: Signal-Desktop (Signal Private Messenger for the Desktop) -Signal-Desktop: -Signal-Desktop: Signal is an encrypted instant messaging and voice calling -Signal-Desktop: application for Android and iOS. It uses the Internet to send -Signal-Desktop: one-to-one and group messages, which can include images and -Signal-Desktop: video messages, and make one-to-one voice calls. -Signal-Desktop: -Signal-Desktop: -Signal-Desktop: -Signal-Desktop: -Signal-Desktop: diff --git a/network/SoulseekQt/SoulseekQt.SlackBuild b/network/SoulseekQt/SoulseekQt.SlackBuild index 39cfe7fd17..98fbdad991 100644 --- a/network/SoulseekQt/SoulseekQt.SlackBuild +++ b/network/SoulseekQt/SoulseekQt.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for SoulseekQt -# Copyright 2016-2018 Dominik Drobek <dominik.drobek (at) o2.pl> +# Copyright 2016-2018, 2020 Dominik Drobek <dominik.drobek (at) o2.pl> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -62,11 +62,10 @@ tar xvf $CWD/$PRGNAM-$FVER-$TGZARCH.tgz -C $TMP/$PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . -mkdir -p $PKG/opt/$PRGNAM -mkdir -p $PKG/usr/{bin,share/{applications,pixmaps}} -install -m 755 $PRGNAM-$FVER-$TGZARCH $PKG/opt/$PRGNAM/$PRGNAM -install -m 644 $CWD/SoulseekQt.png $PKG/usr/share/pixmaps -install -m 644 $CWD/SoulseekQt.desktop $PKG/usr/share/applications +install -D -m 755 $PRGNAM-$FVER-$TGZARCH $PKG/opt/$PRGNAM/$PRGNAM +install -D -m 644 $CWD/$PRGNAM.png -t $PKG/usr/share/pixmaps/ +install -D -m 644 $CWD/$PRGNAM.desktop -t $PKG/usr/share/applications/ +mkdir -p $PKG/usr/bin ln -sf ../../opt/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/network/SoulseekQt/SoulseekQt.info b/network/SoulseekQt/SoulseekQt.info index 09de463657..2e54873c6c 100644 --- a/network/SoulseekQt/SoulseekQt.info +++ b/network/SoulseekQt/SoulseekQt.info @@ -1,9 +1,9 @@ PRGNAM="SoulseekQt" VERSION="20160117" HOMEPAGE="https://www.slsknet.org/" -DOWNLOAD="https://www.dropbox.com/s/kebk1b5ib1m3xxw/SoulseekQt-2016-1-17-32bit.tgz" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/SoulseekQt-2016-1-17-32bit.tgz" MD5SUM="906d99b15ed02d0d66981fffeeea1218" -DOWNLOAD_x86_64="https://www.dropbox.com/s/7qh902qv2sxyp6p/SoulseekQt-2016-1-17-64bit.tgz" +DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/SoulseekQt-2016-1-17-64bit.tgz" MD5SUM_x86_64="c843e748a129e4ad9461280aeb2b957a" REQUIRES="" MAINTAINER="Dominik Drobek" diff --git a/network/SpiderOakONE/SpiderOakONE.SlackBuild b/network/SpiderOakONE/SpiderOakONE.SlackBuild index d26c38d6a0..01fe307a85 100644 --- a/network/SpiderOakONE/SpiderOakONE.SlackBuild +++ b/network/SpiderOakONE/SpiderOakONE.SlackBuild @@ -54,5 +54,8 @@ mv $PKG/usr/share/doc/SpiderOakONE/* $PKG/usr/doc/$PRGNAM-$VERSION rm -rf $PKG/usr/share/doc/ 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/network/TeamSpeak3/TeamSpeak3.SlackBuild b/network/TeamSpeak3/TeamSpeak3.SlackBuild index 041342a7fe..c6921a424e 100644 --- a/network/TeamSpeak3/TeamSpeak3.SlackBuild +++ b/network/TeamSpeak3/TeamSpeak3.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=TeamSpeak3 -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.5.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/TeamSpeak3/TeamSpeak3.info b/network/TeamSpeak3/TeamSpeak3.info index e9d10a15bc..f6d5be52f0 100644 --- a/network/TeamSpeak3/TeamSpeak3.info +++ b/network/TeamSpeak3/TeamSpeak3.info @@ -1,10 +1,10 @@ PRGNAM="TeamSpeak3" -VERSION="3.3.2" +VERSION="3.5.6" HOMEPAGE="https://www.teamspeak.com/en/" -DOWNLOAD="https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_x86-3.3.2.run" -MD5SUM="b26c2c9db335c7c15e45a162766312c2" -DOWNLOAD_x86_64="https://files.teamspeak-services.com/releases/client/3.3.2/TeamSpeak3-Client-linux_amd64-3.3.2.run" -MD5SUM_x86_64="0ef269a11d72edeef110b5196c8e0d01" -REQUIRES="" +DOWNLOAD="https://files.teamspeak-services.com/releases/client/3.5.6/TeamSpeak3-Client-linux_x86-3.5.6.run" +MD5SUM="8b667d366c0e257ae58c4688de5a923f" +DOWNLOAD_x86_64="https://files.teamspeak-services.com/releases/client/3.5.6/TeamSpeak3-Client-linux_amd64-3.5.6.run" +MD5SUM_x86_64="15d6e255515f37cc514dcf4f0f7cf23d" +REQUIRES="libxkbcommon" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/network/UDR/README b/network/UDR/README index 653b521e76..044eca08fa 100644 --- a/network/UDR/README +++ b/network/UDR/README @@ -11,7 +11,7 @@ then places the connection between the rsync client and server. To use UDR, prefix the current rsync command used to transfer data with 'udr', for example: -udr rsync -avz /home/user/dir/ user@example.com:/home/user/dir +udr rsync -av /home/user/dir/ user@example.com:/home/user/dir Any rsync options can be used. diff --git a/network/UDR/UDR.SlackBuild b/network/UDR/UDR.SlackBuild index ecaecb07e6..064ca4b6ea 100644 --- a/network/UDR/UDR.SlackBuild +++ b/network/UDR/UDR.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for UDR -# Copyright 2017, 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,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=UDR -VERSION=${VERSION:-0.9.4} +VERSION=${VERSION:-0.9.4_774f2e7} +GITVERSION=${GITVERSION:-774f2e76c58feeb09dc5401fdff4207602b6f088} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG/usr/bin $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$GITVERSION +tar xvf $CWD/$GITVERSION.tar.gz +cd $PRGNAM-$GITVERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/network/UDR/UDR.info b/network/UDR/UDR.info index 61c04c6341..772b79909a 100644 --- a/network/UDR/UDR.info +++ b/network/UDR/UDR.info @@ -1,8 +1,8 @@ PRGNAM="UDR" -VERSION="0.9.4" -HOMEPAGE="https://github.com/LabAdvComp/UDR" -DOWNLOAD="https://github.com/LabAdvComp/UDR/archive/v0.9.4/UDR-0.9.4.tar.gz" -MD5SUM="74a7ebd384156be0fc3d9a08890e098b" +VERSION="0.9.4_774f2e7" +HOMEPAGE="https://github.com/martinetd/UDR" +DOWNLOAD="https://github.com/martinetd/UDR/archive/774f2e7/774f2e76c58feeb09dc5401fdff4207602b6f088.tar.gz" +MD5SUM="a046d266b95d113d3cecc8ff505c562f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/UDR/slack-desc b/network/UDR/slack-desc index d665c18bf2..98a3ccf65a 100644 --- a/network/UDR/slack-desc +++ b/network/UDR/slack-desc @@ -12,7 +12,7 @@ UDR: UDR is a wrapper around rsync that enables rsync to use UDT protocol UDR: and thus improves throughput of large data transfers over long UDR: distances. UDR: -UDR: HOMEPAGE: https://github.com/LabAdvComp/UDR +UDR: HOMEPAGE: https://github.com/martinetd/UDR UDR: UDR: UDR: diff --git a/network/WhatWeb/slack-desc b/network/WhatWeb/slack-desc index c36fad238d..9bb9eb5a5a 100644 --- a/network/WhatWeb/slack-desc +++ b/network/WhatWeb/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| WhatWeb: WhatWeb (Next generation web scanner) WhatWeb: -WhatWeb: WhatWeb recognises web technologies including content management +WhatWeb: WhatWeb recognises web technologies including content management WhatWeb: systems (CMS), blogging platforms, statistic/analytics packages, WhatWeb: javascript ibraries, web servers, and embedded devices. -WhatWeb: -WhatWeb: WhatWeb: -WhatWeb: -WhatWeb: +WhatWeb: +WhatWeb: +WhatWeb: +WhatWeb: WhatWeb: diff --git a/network/WireGuard/README b/network/WireGuard/README deleted file mode 100644 index 9f532f1d7e..0000000000 --- a/network/WireGuard/README +++ /dev/null @@ -1,12 +0,0 @@ -WireGuard is a VPN that uses state-of-the-art cryptography. It is -designed as a general purpose VPN for running on embedded interfaces -and super computers alike, fit for many different circumstances. - -WireGuard is not yet complete. You should not rely on this code. It has -not undergone proper degrees of security auditing and the protocol is -still subject to change. - -Optional Dependency - -openresolv is an optional runtime dependency -- you need it if you want -to use to use wg-quick's DNS option. diff --git a/network/WireGuard/WireGuard.info b/network/WireGuard/WireGuard.info deleted file mode 100644 index bc89830609..0000000000 --- a/network/WireGuard/WireGuard.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="WireGuard" -VERSION="0.0.20181119" -HOMEPAGE="https://www.wireguard.com/" -DOWNLOAD="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20181119.tar.xz" -MD5SUM="d1bafdc59a2bed867879b737c17b66b3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Spencer" -EMAIL="baildon.research@googlemail.com" diff --git a/network/XD/README b/network/XD/README new file mode 100644 index 0000000000..530e0c7d26 --- /dev/null +++ b/network/XD/README @@ -0,0 +1,13 @@ +XD - I2P BitTorrent Client written in GO + +Features: + + - i2p only, no chances of cross network contamination, + aka no way to leak IP. + - works with i2pd and Java I2P using the SAM api + - Magnet URIs + +Build options: + + - To enable Lokinet, pass "LOKINET=1" to the script. + - To disable the web-ui, pass "no-webui" to the script. diff --git a/network/XD/XD.SlackBuild b/network/XD/XD.SlackBuild new file mode 100644 index 0000000000..89018797d3 --- /dev/null +++ b/network/XD/XD.SlackBuild @@ -0,0 +1,87 @@ +#!/bin/sh + +# Slackbuild for XD + +# Written by shelldweller <shelldweller@beauxbead.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=XD +VERSION=${VERSION:-0.3.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/v$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=$PKG/usr + +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 CODE_OF_CONDUCT.md LICENSE README.md docs/ \ + $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/network/XD/XD.info b/network/XD/XD.info new file mode 100644 index 0000000000..373a095c1d --- /dev/null +++ b/network/XD/XD.info @@ -0,0 +1,10 @@ +PRGNAM="XD" +VERSION="0.3.4" +HOMEPAGE="https://github.com/majestrate/XD" +DOWNLOAD="https://github.com/majestrate/XD/archive/v0.3.4.tar.gz" +MD5SUM="e68c243f875de6e791ef27b5564f1bb6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="google-go-lang" +MAINTAINER="shelldweller" +EMAIL="shelldweller@beauxbead.com" diff --git a/network/XD/slack-desc b/network/XD/slack-desc new file mode 100644 index 0000000000..6e4eece61e --- /dev/null +++ b/network/XD/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------------------------------------------------------| +XD: XD (I2P BitTorrent Client written in GO) +XD: +XD: Features: +XD: +XD: - i2p only, no chances of cross network contamination, +XD: aka no way to leak IP. +XD: +XD: - works with i2pd and Java I2P using the SAM api +XD: +XD: - Magnet URIs +XD: diff --git a/network/acme.sh/README b/network/acme.sh/README index 374de32be7..44518a476a 100644 --- a/network/acme.sh/README +++ b/network/acme.sh/README @@ -1,15 +1,24 @@ An ACME Shell script - - An ACME protocol client written purely in Shell (Unix shell) language. + - An ACME protocol client written purely in Shell (Unix shell) + language. - Full ACME protocol implementation. - Support ACME v1 and ACME v2 - Support ACME v2 wildcard certs - - Simple, powerful and very easy to use. You only need 3 minutes to learn it. + - Simple, powerful and very easy to use. You only need 3 minutes to + learn it. - Bash, dash and sh compatible. - Simplest shell script for Let's Encrypt free certificate client. - - Purely written in Shell with no dependencies on python or the official Let's Encrypt client. - - Just one script to issue, renew and install your certificates automatically. + - Purely written in Shell with no dependencies on python or the + official Let's Encrypt client. + - Just one script to issue, renew and install your certificates + automatically. - DOES NOT require root/sudoer access. - Docker friendly - IPv6 support - Cron job notifications for renewal or error etc. + + Optional dependencies: + +* socat - to standalone mode + diff --git a/network/acme.sh/acme.sh.SlackBuild b/network/acme.sh/acme.sh.SlackBuild index 6bda0b9979..554aa6df98 100644 --- a/network/acme.sh/acme.sh.SlackBuild +++ b/network/acme.sh/acme.sh.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/bash +#!/bin/sh # # Slackware build script for acme.sh # -# Copyright 2019 Corrado Franco (https://conraid.net) +# Copyright 2019-2021 Corrado Franco (https://corradofranco.it) # All rights reserved. # # This program is free software: you can redistribute it and/or modify @@ -26,12 +26,10 @@ # Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds PRGNAM=acme.sh -VERSION=${VERSION:-2.8.3} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.8.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -DOCFILES="*.md" - CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -39,14 +37,6 @@ OUTPUT=${OUTPUT:-/tmp} ARCH=noarch -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME:-""}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD.txz " - exit 0 -fi - set -eu rm -rf $PKG diff --git a/network/acme.sh/acme.sh.info b/network/acme.sh/acme.sh.info index 287255ce35..2e4561fcd0 100644 --- a/network/acme.sh/acme.sh.info +++ b/network/acme.sh/acme.sh.info @@ -1,8 +1,8 @@ PRGNAM="acme.sh" -VERSION="2.8.3" +VERSION="2.8.8" HOMEPAGE="https://acme.sh/" -DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/2.8.3/acme.sh-2.8.3.tar.gz" -MD5SUM="f1faea62db62cf36040926be6b169c2f" +DOWNLOAD="https://github.com/Neilpang/acme.sh/archive/2.8.8/acme.sh-2.8.8.tar.gz" +MD5SUM="92260273122eed14607db4f1306cd25a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/aircrack-ng/aircrack-ng.SlackBuild b/network/aircrack-ng/aircrack-ng.SlackBuild index 375650b2d9..6ab6259982 100644 --- a/network/aircrack-ng/aircrack-ng.SlackBuild +++ b/network/aircrack-ng/aircrack-ng.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for aircrack-ng # Originally written by Yalla-One <yallaone@gmail.com> -# Copyright 2018, 2019 Dominik Drobek <dominik.drobek (at) o2.pl> +# Copyright 2018-2020 Dominik Drobek <dominik.drobek (at) o2.pl> # 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=aircrack-ng -VERSION=${VERSION:-1.5.2} +VERSION=${VERSION:-1.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -102,16 +102,10 @@ 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 ChangeLog INSTALLING LICENSE* README VERSION \ + AUTHORS ChangeLog INSTALLING LICENSE* README* SECURITY.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# experimental tools seem to ignore docdir option -if [ "$AIRCRACK_EXPERIMENTAL" != "no" ]; then - mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION - rm -r $PKG/usr/share -fi - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/aircrack-ng/aircrack-ng.info b/network/aircrack-ng/aircrack-ng.info index 49a1280369..25e6a6adbc 100644 --- a/network/aircrack-ng/aircrack-ng.info +++ b/network/aircrack-ng/aircrack-ng.info @@ -1,8 +1,8 @@ PRGNAM="aircrack-ng" -VERSION="1.5.2" +VERSION="1.6" HOMEPAGE="https://www.aircrack-ng.org" -DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.5.2.tar.gz" -MD5SUM="2648c192d206e953c67dca64967d2982" +DOWNLOAD="https://download.aircrack-ng.org/aircrack-ng-1.6.tar.gz" +MD5SUM="22ddc85549b51ed0da0931d01ef215e5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/anydesk/anydesk.SlackBuild b/network/anydesk/anydesk.SlackBuild index febc41c4b2..dff8b6f1b5 100644 --- a/network/anydesk/anydesk.SlackBuild +++ b/network/anydesk/anydesk.SlackBuild @@ -23,16 +23,17 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=anydesk -VERSION=${VERSION:-5.4.1} +VERSION=${VERSION:-6.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 + ARCH=$( uname -m ) +fi + +if [ "$ARCH" != "x86_64" ]; then + echo "Package for $ARCH architecture is not available." + exit 1 fi CWD=$(pwd) @@ -42,15 +43,6 @@ OUTPUT=${OUTPUT:-/tmp} set -e -if [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - BITS="amd64" -else - echo "Package for $(uname -m) architecture is not available." - exit 1 -fi - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -71,7 +63,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh mkdir -p $PKG/etc/rc.d/ -cp $CWD/rc.anydesk $PKG/etc/rc.d/rc.anydesk +cat $CWD/rc.anydesk > $PKG/etc/rc.d/rc.anydesk.new cd $PKG /sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/anydesk/anydesk.info b/network/anydesk/anydesk.info index c919df3b7c..15a9deed47 100644 --- a/network/anydesk/anydesk.info +++ b/network/anydesk/anydesk.info @@ -1,10 +1,10 @@ PRGNAM="anydesk" -VERSION="5.4.1" +VERSION="6.1.0" HOMEPAGE="https://anydesk.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_5.4.1-1_x86_64.rpm" -MD5SUM_x86_64="b90b362069fcdf56e4a7837365b6ae37" +DOWNLOAD_x86_64="https://download.anydesk.com/linux/anydesk_6.1.0-1_x86_64.rpm" +MD5SUM_x86_64="34fcffc15185cdd658353b95c814d0f7" REQUIRES="gtkglext lsb-release" MAINTAINER="Reza Talebi" EMAIL="reza.talebi.73@outlook.com" diff --git a/network/anydesk/doinst.sh b/network/anydesk/doinst.sh index aea0f894eb..4a1462ff3a 100644 --- a/network/anydesk/doinst.sh +++ b/network/anydesk/doinst.sh @@ -1,3 +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 +} + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi @@ -11,3 +35,5 @@ 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 + +preserve_perms etc/rc.d/rc.anydesk.new diff --git a/network/aria2/aria2.SlackBuild b/network/aria2/aria2.SlackBuild index 7d39fc3466..0afb3a951e 100644 --- a/network/aria2/aria2.SlackBuild +++ b/network/aria2/aria2.SlackBuild @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=${PRGNAM:-aria2} +PRGNAM=aria2 VERSION=${VERSION:-1.35.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/arno-iptables-firewall/README b/network/arno-iptables-firewall/README index 57dc9d2018..23ad6f4255 100644 --- a/network/arno-iptables-firewall/README +++ b/network/arno-iptables-firewall/README @@ -1,32 +1,41 @@ arno-iptables-firewall is a front-end for iptables. Its configuration script will set up a secure and restrictive firewall by just asking a few questions. -This includes configuring internal networks for Internet access via NAT and +This includes configuring internal networks for Internet access via NAT, and potential network services like http or ssh. Moreover, it provides advanced additional features that can be enabled in the well documented configuration file. -NOTE - The setup script will *not* run automatically after your package was -installed. In order to run the script you have to issue the following command: +NOTE - The setup script will NOT run automatically after the package has been +installed. In order to run the script, the following command has to be issued: # arno-iptables-firewall-configure -To enable the startup of the firewall at boot-time you need to create a symlink -as follows (in order to disable it, either remove the symlink or "chmod -x" the -startup script): +In order to start the firewall automatically at boot-time, an "rc.firewall" +symlink to the startup script has to be created in /etc/rc.d/ and of course +the startup script itself should be executable: -# ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall -# chmod +x /etc/rc.d/rc.arno-iptables-firewall +# cd /etc/rc.d/ +# ln -sv rc.arno-iptables-firewall rc.firewall +# chmod +x rc.arno-iptables-firewall -You can also start the firewall manually with one of the following commands: +In order to disable startup of the firewall at boot time, remove the symlink or +the executable bit from the startup script: -# /etc/rc.d/rc.arno-iptables-firewall start +# rm /etc/rc.d/rc.firewall +# chmod -x /etc/rc.d/rc.arno-iptables-firewall + +The firewall can also be started manually with one of the following commands: # arno-iptables-firewall start +# /etc/rc.d/rc.arno-iptables-firewall start + +Please refer to the man page for more details. + IMPORTANT - A few security notes from the upstream author: 1) If possible make sure that the firewall is started before the (ADSL) Internet -connection is enabled. For a ppp-interface that doesn't exist yet you can use +connection is enabled. For a ppp-interface that doesn't exist yet, you can use the wildcard device called "ppp+" (but you can only use ppp+ if there aren't any other ppp interfaces). @@ -35,5 +44,5 @@ understand what they mean. Changing them anyway could have a big impact on the security of your machine. 3) A lot of people complain that their server stopped working after installing -the firewall. This is the *correct* behaviour for a firewall: blocking *all* +the firewall. This is the correct behaviour for a firewall: blocking all incoming traffic by default. Configure your OPEN_TCP (e.g.) accordingly. diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild index 3a93a44d14..07401eb02e 100644 --- a/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild +++ b/network/arno-iptables-firewall/arno-iptables-firewall.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for arno-iptables-firewall -# Copyright 2013-2015 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 @@ -27,8 +27,8 @@ PRGNAM=arno-iptables-firewall SRCNAM=aif -VERSION=${VERSION:-2.0.1e} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2.1.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -56,8 +56,8 @@ 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 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; PRGBIN=$PKG/usr/sbin PRGETC=$PKG/etc/$PRGNAM @@ -71,23 +71,25 @@ install -m 0755 -D ./configure.sh $PRGBIN/$PRGNAM-configure install -m 0755 ./bin/arno-fwfilter $PRGBIN/ install -m 0755 ./bin/$PRGNAM $PRGBIN/ -# Patch the configuration script. We need this in order to be able to -# run the script from outside the source directory as well. We're going -# to (1) change from relative to absolute the paths to the environment -# file and firewall executable; (2) rename and change the path to the -# startup script (this is for better consistency with Slackware's init -# system); (3) change the path to the unmodified copy of the config -# file, needed to check for existing custom setups. We will NOT create -# a Slackware-compliant /etc/rc.d/rc.firewall symlink to the startup -# script, as this should be done manually by the sysadmin. We won't -# create any SystemV-style symlinks either. (4) We will allow the script -# to be run correctly more than once, by removing previously set values -# if no value is entered: this is to prevent e.g. ports from remaining -# open, or internal interfaces from remaining enabled with NAT. Finally -# (5) we append the note, picked from the original installation script -# and slightly enhanced, that the user will see when configuration is -# done: this is to inform that an rc.firewall symlink has to be created -# in order to start up the firewall at boot-time in a proper way. +# Patch the configuration script. We need this to be able to run the +# script from outside the source directory as well. We're going to: +# +# 1) Change from relative to absolute the paths to the environment file +# and the firewall executable. +# 2) Rename and change the path to the startup script, for consistency with +# Slackware's init system. +# 3) Change the path to the unmodified copy of the config file, needed to +# check for already existing setups. +# 4) Allow the script to be run correctly more than once, by removing +# previously set values if no values are entered: this is to prevent, +# for example, ports from remaining open, or NAT from remaining enabled. +# 5) Append the note, copied from the original install script and adapted +# to the Slackware system, that users read when configuration is done: +# this is mainly to inform that the "rc.firewall" symlink has to be +# manually created in order to start up the firewall at boot-time. We +# will NOT create the symlink automatically, as this should be done by +# the system administrator. + patch $PRGBIN/$PRGNAM-configure < $CWD/files/patch-configuration-script.diff # Copy and compress man pages. @@ -110,7 +112,7 @@ done # expected by the configuration script for comparison purposes; create # link to plugin as in the original script. mkdir -p $PRGSHR -cp -a ./share/$PRGNAM/* $PRGSHR/ +cp -a ./share/$PRGNAM/{environment,plugins} $PRGSHR/ cp -a $PRGETC/firewall.conf.new $PRGSHR/firewall.conf.orig ln -sv /usr/share/$PRGNAM/plugins/traffic-accounting-show $PRGBIN/ diff --git a/network/arno-iptables-firewall/arno-iptables-firewall.info b/network/arno-iptables-firewall/arno-iptables-firewall.info index 1bd234e44e..1bc541c2c6 100644 --- a/network/arno-iptables-firewall/arno-iptables-firewall.info +++ b/network/arno-iptables-firewall/arno-iptables-firewall.info @@ -1,10 +1,10 @@ PRGNAM="arno-iptables-firewall" -VERSION="2.0.1e" +VERSION="2.1.0" HOMEPAGE="https://github.com/arno-iptables-firewall/aif" -DOWNLOAD="https://github.com/arno-iptables-firewall/aif/archive/2.0.1e.tar.gz" -MD5SUM="4981a336f55e2db90f594beedcaef47d" +DOWNLOAD="https://github.com/arno-iptables-firewall/aif/archive/2.1.0.tar.gz" +MD5SUM="8f890a80bb6e8d2d0681c9a822ae39de" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Philip Lacroix" -EMAIL="slackph at bluebottle dot com" +EMAIL="slackph at posteo dot de" diff --git a/network/arno-iptables-firewall/files/patch-configuration-file.diff b/network/arno-iptables-firewall/files/patch-configuration-file.diff index c530647a22..4be4f835ab 100644 --- a/network/arno-iptables-firewall/files/patch-configuration-file.diff +++ b/network/arno-iptables-firewall/files/patch-configuration-file.diff @@ -1,16 +1,8 @@ -233c233 -< IP4TABLES="/sbin/iptables" ---- -> IP4TABLES="/usr/sbin/iptables" -238c238 -< IP6TABLES="/sbin/ip6tables" ---- -> IP6TABLES="/usr/sbin/ip6tables" -242c242 +256c256 < ENV_FILE="/usr/local/share/arno-iptables-firewall/environment" --- > ENV_FILE="/usr/share/arno-iptables-firewall/environment" -246c246 +260c260 < PLUGIN_BIN_PATH="/usr/local/share/arno-iptables-firewall/plugins" --- > PLUGIN_BIN_PATH="/usr/share/arno-iptables-firewall/plugins" diff --git a/network/arno-iptables-firewall/files/patch-configuration-script.diff b/network/arno-iptables-firewall/files/patch-configuration-script.diff index dacac17330..800fb9157c 100644 --- a/network/arno-iptables-firewall/files/patch-configuration-script.diff +++ b/network/arno-iptables-firewall/files/patch-configuration-script.diff @@ -5,96 +5,145 @@ > if [ -f /usr/share/arno-iptables-firewall/environment ]; then > . /usr/share/arno-iptables-firewall/environment 36c36 -< printf "\033[40m\033[1;31mERROR: Could not read environment file ./share/arno-iptables-firewall/environment!\033[0m\n" >&2 +< printf "\033[40m\033[1;31mERROR: Could not read environment file ./share/arno-iptables-firewall/environment!\033[0m\n\n" >&2 --- -> printf "\033[40m\033[1;31mERROR: Could not read environment file /usr/share/arno-iptables-firewall/environment!\033[0m\n" >&2 -70a71,75 +> printf "\033[40m\033[1;31mERROR: Could not read environment file /usr/share/arno-iptables-firewall/environment!\033[0m\n\n" >&2 +76a77,81 > else > # If no value is entered, remove (unless commented) previously set -> # values: this is to prevent e.g. ports from remaining open, or -> # internal interfaces from remaining enabled with NAT. +> # values: this is to prevent, for example, ports from remaining open, +> # or internal interfaces from remaining enabled with NAT. > sed -i -e "s~^$2=.*$~$2=\"\"~" "$1" -85c90 +91c96 < # else --- > else -86a92,94 -> # This is needed in order to allow the function change_conf_var() +92a98,100 +> # This is needed to allow the function change_conf_var() > # to remove values for previously set open ports. > change_conf_var "$2" "$3" "" -216a225,231 +183,186c191,194 +< echo "Listing available interfaces:" +< echo "-----------------------------" +< list_interfaces; +< echo "-----------------------------" +--- +> # echo "Listing available interfaces:" +> # echo "-----------------------------" +> # list_interfaces; +> # echo "-----------------------------" +255a264,270 > else -> # Remove previously set values related to the internal interface, if -> # no internal interface is entered with this script. +> # Remove previously set values related to the internal interface, +> # if no internal interface is entered with this script. > change_conf_var "$FIREWALL_CONF" "INT_IF" "" > change_conf_var "$FIREWALL_CONF" "INTERNAL_NET" "" > change_conf_var "$FIREWALL_CONF" "INT_NET_BCAST_ADDRESS" "" > change_conf_var "$FIREWALL_CONF" "NAT" "0" -218c233 -< ---- -> -220,222c235,237 -< chmod 755 /etc/init.d/arno-iptables-firewall -< chown 0:0 "$FIREWALL_CONF" /etc/init.d/arno-iptables-firewall -< chmod 600 "$FIREWALL_CONF" +259,261c274,276 +< if [ -e /etc/init.d/arno-iptables-firewall ]; then +< chown 0:0 /etc/init.d/arno-iptables-firewall +< chmod 755 /etc/init.d/arno-iptables-firewall --- -> chmod 755 /etc/rc.d/rc.arno-iptables-firewall -> chown 0:0 "$FIREWALL_CONF" /etc/rc.d/rc.arno-iptables-firewall -> chmod 600 "$FIREWALL_CONF" -227c242 +> if [ -e /etc/rc.d/rc.arno-iptables-firewall ]; then +> chown 0:0 /etc/rc.d/rc.arno-iptables-firewall +> chmod 755 /etc/rc.d/rc.arno-iptables-firewall +271c286 < AIF_VERSION="$(grep "MY_VERSION=" ./bin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")" --- > AIF_VERSION="$(grep "MY_VERSION=" /usr/sbin/arno-iptables-firewall |sed -e "s/^MY_VERSION=\"//" -e "s/\"$//")" -235,251d249 +279,339c294 +< RC_PATH="/etc" +< # Check for Redhat/SUSE rc.d +< if [ -d "/etc/rc.d" ]; then +< RC_PATH="/etc/rc.d" +< fi +< < # Remove any symlinks in rc*.d out of the way -< rm -f /etc/rc*.d/*arno-iptables-firewall +< rm -f $RC_PATH/rc0.d/*arno-iptables-firewall +< rm -f $RC_PATH/rc1.d/*arno-iptables-firewall +< rm -f $RC_PATH/rc2.d/*arno-iptables-firewall +< rm -f $RC_PATH/rc3.d/*arno-iptables-firewall +< rm -f $RC_PATH/rc4.d/*arno-iptables-firewall +< rm -f $RC_PATH/rc5.d/*arno-iptables-firewall +< rm -f $RC_PATH/rc6.d/*arno-iptables-firewall +< rm -f $RC_PATH/rcS.d/*arno-iptables-firewall < -< if get_user_yn "Do you want to start the firewall at boot (via /etc/init.d/) (Y/N)?" "y"; then -< if [ -d /etc/rcS.d ]; then -< ln -sv /etc/init.d/arno-iptables-firewall /etc/rcS.d/S41arno-iptables-firewall +< if get_user_yn "Do you want to start the firewall at boot" "y"; then +< DONE=0 +< +< if check_command systemctl; then +< if systemctl enable arno-iptables-firewall; then +< echo "* Successfully enabled service with systemctl" +< DONE=1 +< fi +< elif check_command update-rc.d; then +< # Note: Currently update-rc.d doesn't seem to properly use the init script's LSB header, so specify explicitly +< if update-rc.d -f arno-iptables-firewall start 11 S . stop 10 0 6 .; then +< echo "* Successfully enabled service with update-rc.d" +< DONE=1 +< fi +< elif check_command chkconfig; then +< if chkconfig --add arno-iptables-firewall && chkconfig arno-iptables-firewall on; then +< echo "* Successfully enabled service with chkconfig" +< DONE=1 +< fi < else -< ln -sv /etc/init.d/arno-iptables-firewall /etc/rc2.d/S11arno-iptables-firewall +< if [ -d "$RC_PATH/rcS.d" ]; then +< if ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rcS.d/S11arno-iptables-firewall" && +< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc0.d/K10arno-iptables-firewall" && +< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc6.d/K10arno-iptables-firewall"; then +< echo "* Successfully enabled service through $RC_PATH/rcS.d/ symlink" +< DONE=1 +< fi +< elif [ -d "$RC_PATH/rc2.d" ]; then +< if ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc2.d/S09arno-iptables-firewall" && +< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc0.d/K91arno-iptables-firewall" && +< ln -sv /etc/init.d/arno-iptables-firewall "$RC_PATH/rc6.d/K91arno-iptables-firewall"; then +< echo "* Successfully enabled service through $RC_PATH/rc2.d/ symlink" +< DONE=1 +< fi +< else +< echo "WARNING: Unable to detect /rc2.d or /rcS.d directories. Skipping runlevel symlinks" >&2 +< fi < fi < -< # Check for insserv. Used for dependency based booting on eg. Debian -< INSSERV="$(find_command /sbin/insserv)" -< if [ -n "$INSSERV" ]; then -< "$INSSERV" arno-iptables-firewall +< if [ $DONE -eq 0 ]; then +< echo "ERROR: Unable to setup automatic start at boot. Please investigate" >&2 < fi < fi < -253c251 -< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "1" +< if [ -e /etc/init.d/arno-iptables-firewall ]; then +--- +> if [ -e /etc/rc.d/rc.arno-iptables-firewall ]; then +341c296 +< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "1" --- -> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "1" -255c253 -< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "0" +> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "1" +343c298 +< change_conf_var /etc/init.d/arno-iptables-firewall "VERBOSE" "0" --- -> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "0" -258c256 +> change_conf_var /etc/rc.d/rc.arno-iptables-firewall "VERBOSE" "0" +347c302 < if diff ./etc/arno-iptables-firewall/firewall.conf "$FIREWALL_CONF" >/dev/null; then --- > if diff /usr/share/arno-iptables-firewall/firewall.conf.orig "$FIREWALL_CONF" >/dev/null; then -274a273,291 +362a318,335 > echo "" > echo "-------------------------------------------------------------------------------" -> echo "** NOTE: 1) You can now (manually) (re)start the firewall by executing **" -> echo "** \"/etc/rc.d/rc.arno-iptables-firewall start\" or **" -> echo "** \"/etc/rc.d/rc.arno-iptables-firewall restart\" **" -> echo "** It is recommended however to first review the settings in **" -> echo "** /etc/arno-iptables-firewall/firewall.conf! **" +> echo "** NOTE: 1) After configuration, it is recommended to review the firewall **" +> echo "** settings in /etc/arno-iptables-firewall/firewall.conf **" > echo "** **" -> echo "** 2) In order to start the firewall automatically at boot-time, **" -> echo "** you will need to manually create in /etc/rc.d/ an appropriate **" -> echo "** symlink, named \"rc.firewall\", pointing to the startup script. **" -> echo "** To do that, issue the following command: **" +> echo "** 2) To manually start or restart the firewall, run: **" +> echo "** /etc/rc.d/rc.arno-iptables-firewall start **" +> echo "** or /etc/rc.d/rc.arno-iptables-firewall restart **" > echo "** **" -> echo "** ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall **" +> echo "** 3) To start the firewall automatically at boot-time, you need an **" +> echo "** appropriate symlink, \"rc.firewall\", pointing to the startup **" +> echo "** script. Issue the following commands to create the symlink: **" +> echo "** cd /etc/rc.d/ **" +> echo "** ln -sv rc.arno-iptables-firewall rc.firewall **" > echo "** **" -> echo "** Delete the link if you wish to disable firewall startup at boot- **" -> echo "** time, or \"chmod -x\" the startup script for the same result. **" +> echo "** 4) To disable startup at boot-time, simply delete the symlink, **" +> echo "** or remove the executable bit from the startup script. **" > echo "-------------------------------------------------------------------------------" -> echo "" -277d293 -< diff --git a/network/arno-iptables-firewall/files/patch-startup-script.diff b/network/arno-iptables-firewall/files/patch-startup-script.diff index c31514e260..5a005f25ec 100644 --- a/network/arno-iptables-firewall/files/patch-startup-script.diff +++ b/network/arno-iptables-firewall/files/patch-startup-script.diff @@ -1,12 +1,12 @@ 4c4 -< # description: init.d script for Arno's iptables firewall +< # description: init.d script for Arno's Iptables Firewall(AIF) --- -> # description: rc.d script for Arno's iptables firewall +> # description: rc.d script for Arno's Iptables Firewall(AIF) 7c7 < # Provides: arno-iptables-firewall --- > # Provides: rc.arno-iptables-firewall -15,21c15,23 +15,21c15,22 < ############################################################################################ < # You should put this script in eg. "/etc/init.d/" . # < # Furthermore make sure it's executable! -> "chmod 700" or "chmod +x" it # @@ -18,13 +18,12 @@ > ################################################################################ > # You should put this script in "/etc/rc.d/". # > # Furthermore make sure it's executable! -> "chmod 755" or "chmod +x" it. # -> # If you want to run it upon boot, either create an "rc.firewall" link to this # -> # script ("ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall") # -> # or edit the network system startup script "/etc/rc.d/rc.inet2", by renaming # -> # both occurrences of "rc.firewall" to match the name ot this script, that is, # -> # "rc.arno-iptables-firewall". # +> # If you want to run it upon boot, create an "rc.firewall" symlink to the # +> # rc.arno-iptables-firewall script: # +> # # +> # ln -sv /etc/rc.d/rc.arno-iptables-firewall /etc/rc.d/rc.firewall # > ################################################################################ -24c25 +24c26 < PROGRAM="/usr/local/sbin/arno-iptables-firewall" --- > PROGRAM="/usr/sbin/arno-iptables-firewall" diff --git a/network/arno-iptables-firewall/slack-desc b/network/arno-iptables-firewall/slack-desc index 6bf5e1aefe..f9350be435 100644 --- a/network/arno-iptables-firewall/slack-desc +++ b/network/arno-iptables-firewall/slack-desc @@ -11,7 +11,7 @@ arno-iptables-firewall: arno-iptables-firewall: arno-iptables-firewall is a front-end for iptables. Its configuration arno-iptables-firewall: script will set up a secure and restrictive firewall by just asking a arno-iptables-firewall: few questions. This includes the configuration of internal networks -arno-iptables-firewall: for Internet access via NAT and potential network services like http +arno-iptables-firewall: for Internet access via NAT, and potential network services like http arno-iptables-firewall: or ssh. Moreover, it provides advanced additional features that can be arno-iptables-firewall: enabled in the well documented configuration file. arno-iptables-firewall: diff --git a/network/arping/arping.SlackBuild b/network/arping/arping.SlackBuild index 2f212d53a0..245a3b2cbc 100644 --- a/network/arping/arping.SlackBuild +++ b/network/arping/arping.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for arping # Copyright 2010 Nilton Moura, Rio de Janeiro, RJ, Brasil +# Copyright 2020 Michael Edie, Tampa, FL, USA # 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=arping -VERSION=${VERSION:-2.13} +VERSION=${VERSION:-2.20} 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} -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" @@ -69,7 +70,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 {} \; -# We are renameing the installed files arping2 to aviod conflicts with +# We are renaming the installed files arping2 to aviod conflicts with # Slackware's iputils arping so lets fix the manpages and scan script. sed \ -e "s|\(arping\)|\12|g" \ diff --git a/network/arping/arping.info b/network/arping/arping.info index 3456f9af31..b2c4f1e781 100644 --- a/network/arping/arping.info +++ b/network/arping/arping.info @@ -1,10 +1,10 @@ PRGNAM="arping" -VERSION="2.13" +VERSION="2.20" HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -DOWNLOAD="http://www.habets.pp.se/synscan/files/arping-2.13.tar.gz" -MD5SUM="698e4a87d4ea6c8535b07b06d9ed503e" +DOWNLOAD="http://www.habets.pp.se/synscan/files/arping-2.20.tar.gz" +MD5SUM="132d2113e35f84dd85ed604074bc075a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libnet" -MAINTAINER="Nilton Moura" -EMAIL="nmoura@nmoura.eti.br" +MAINTAINER="Michael Edie" +EMAIL="michael@edie.io" diff --git a/network/asterisk/README.SBo b/network/asterisk/README.SBo index b5a5c4ed6e..0ef4f7bc94 100644 --- a/network/asterisk/README.SBo +++ b/network/asterisk/README.SBo @@ -17,7 +17,7 @@ need to install libpri, again before compiling Asterisk. Examples ======== -Be sure to see /usr/doc/asterisk-16.6.1/sample_confs/ after +Be sure to see /usr/doc/asterisk-16.15.0/sample_confs/ after installation for any additional configuration files you may need. Database Support @@ -27,7 +27,7 @@ want to install the alembic package. Since version 12.0 the database schemas that Asterisk uses are being captured in the form of python script files that use alembic to create/update database schemas. The asterisk package places these database scripts in the -/usr/doc/asterisk-16.6.1/ast-db-manage directory. +/usr/doc/asterisk-16.15.0/ast-db-manage directory. Build Flags =========== diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild index 002b077a1b..c918343a87 100644 --- a/network/asterisk/asterisk.SlackBuild +++ b/network/asterisk/asterisk.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2006, Alan Hicks, Lizella, GA # Copyright 2010, 2013, 2015 Mario Preksavec, Zagreb, Croatia -# Copyright 2018-2019 Chris Walker, Kempner, TX +# Copyright 2018-2020 Chris Walker, Kempner, TX # 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=asterisk -VERSION=${VERSION:-16.6.1} +VERSION=${VERSION:-16.15.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -139,6 +139,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --with-cap \ --with-download-cache=$CACHEDIR \ $CONFIGURE_OPTS \ --build=$ARCH-slackware-linux diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info index 80ea0b6088..00aca78b29 100644 --- a/network/asterisk/asterisk.info +++ b/network/asterisk/asterisk.info @@ -1,43 +1,43 @@ PRGNAM="asterisk" -VERSION="16.6.1" +VERSION="16.15.0" HOMEPAGE="https://www.asterisk.org" -DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.6.1.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz.sha1 \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \ - http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \ +DOWNLOAD="https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.15.0.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz.sha1 \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \ + https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \ https://raw.githubusercontent.com/asterisk/third-party/master/jansson/2.12/jansson-2.12.tar.bz2 \ - https://www.pjsip.org/release/2.9/pjproject-2.9.tar.bz2 \ + https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.10/pjproject-2.10.tar.bz2 \ http://ponce.cc/slackware/sources/repo/imap.tar.Z" -MD5SUM="b1b58d628a79d625895927ac5822d59a \ +MD5SUM="2f03204a38e8ed49e58474961d43f363 \ d90e24e30d707e2932cf419cfccff25a \ 3c071029c1ab648367666d1e384394bb \ e4a9ee348028fc0e47148f783e7f945b \ @@ -71,7 +71,7 @@ MD5SUM="b1b58d628a79d625895927ac5822d59a \ 8277e2c693fd056773b1c15e4d52077d \ 011fa4dc9fe35dc3d34ed557bb04263f \ 317dbaf90a9f85ea0ec7b12d080d173d \ - 66757078e7bd7cf316acb0425c2fdd6f \ + 4fffc49b461133f0a4143b05a22fb30e \ d9f7fd4e1d93ad9fca1df8717a79d1c5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/atftp/atftp.SlackBuild b/network/atftp/atftp.SlackBuild index 404ec9ba26..4ae86a9fb8 100644 --- a/network/atftp/atftp.SlackBuild +++ b/network/atftp/atftp.SlackBuild @@ -23,6 +23,9 @@ # Now maintained by B. Watson <yalhcru@gmail.com>. +# 20210223 bkw: update for v0.7.4. +# 20191129 bkw: update for v0.7.2. + # 20180629 bkw: # - Take over maintenance. # - Simplify script slightly. @@ -31,8 +34,8 @@ # the package since it overrides some of the info from upstream's docs. PRGNAM=atftp -VERSION=${VERSION:-0.7.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.7.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,11 +74,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 {} \+ CC="gcc -fgnu89-inline $SLKCFLAGS" \ ./configure \ diff --git a/network/atftp/atftp.info b/network/atftp/atftp.info index 07b1601db7..7de5174fa6 100644 --- a/network/atftp/atftp.info +++ b/network/atftp/atftp.info @@ -1,8 +1,8 @@ PRGNAM="atftp" -VERSION="0.7.1" +VERSION="0.7.4" HOMEPAGE="https://sourceforge.net/projects/atftp" -DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.7.1.tar.gz" -MD5SUM="367bf401965fbed04585b1229c2191a8" +DOWNLOAD="https://downloads.sourceforge.net/project/atftp/atftp-0.7.4.tar.gz" +MD5SUM="f15e2b89498106f68b798ad027a85e8d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/atheme/atheme.SlackBuild b/network/atheme/atheme.SlackBuild index e7fc813f59..b55ec0a29e 100644 --- a/network/atheme/atheme.SlackBuild +++ b/network/atheme/atheme.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for atheme -# 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/network/atheme/atheme.info b/network/atheme/atheme.info index 17611c035d..977bc5630c 100644 --- a/network/atheme/atheme.info +++ b/network/atheme/atheme.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/network/avahi/avahi-discover.1 b/network/avahi/avahi-discover.1 new file mode 100644 index 0000000000..085ff1354e --- /dev/null +++ b/network/avahi/avahi-discover.1 @@ -0,0 +1,16 @@ +.TH avahi-discover 1 User Manuals +.SH NAME +avahi-discover \- Browse for mDNS/DNS-SD services using the Avahi daemon +.SH SYNOPSIS +\fBavahi-discover +\f1 +.SH DESCRIPTION +Show a real-time graphical browse list for mDNS/DNS-SD network services running on the local LAN using the Avahi daemon. +.SH OPTIONS +avahi-discover takes no command line arguments at the moment. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-daemon(8)\f1, \fBavahi-browse(1)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index 0593618738..b2b984d3b3 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -2,11 +2,8 @@ # Slackware build script for avahi -# Written by David Somero <dsomero@hotmail.com> -# Derived from Slackware's Slackbuilds. -# -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2008-2012 David Somero (dsomero@hotmail.com) Athens, TN, USA +# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=avahi -VERSION=${VERSION:-0.7} -BUILD=${BUILD:-1} +VERSION=${VERSION:-0.8} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -96,8 +93,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Thanks to Robby Workman for this patch. patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch +patch -p1 --verbose < $CWD/ipv6_race_condition_fix.patch # thanks, LFS + +# Okay, I had to cheat a bit on the manual pages; there's a commit +# in git that will fix this, so I just built a git checkout, grabbed +# the built manual pages, and we'll drop them into place so the build +# will work for this released version... +cat $CWD/build-db > service-type-database/build-db +chmod 0755 service-type-database/build-db +cat $CWD/bssh.1 > man/bssh.1 +cat $CWD/avahi-discover.1 > man/avahi-discover.1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -108,23 +114,23 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --with-systemdsystemunitdir=no \ --enable-tests \ --disable-static \ --disable-monodoc \ --disable-autoipd \ + --enable-compat-libdns_sd \ --enable-python-dbus \ - --enable-pygtk\ --enable-glib \ --enable-dbus \ --enable-python \ --enable-gtk \ --enable-gtk3 \ - --enable-qt4 \ + --disable-qt5 \ + --disable-qt4 \ --disable-qt3 \ --enable-core-docs \ - --enable-compat-howl \ - --enable-compat-libdns_sd \ - --with-dbus-sys=/etc/dbus-1/system.d \ + --with-dbus-sys=/usr/share/dbus-1/system.d \ --with-avahi-user=avahi \ --with-avahi-group=avahi \ --with-avahi-priv-access-group=netdev \ @@ -137,10 +143,6 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -# howl and mdnsresponder compatability -(cd $PKG/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) -(cd $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -150,8 +152,6 @@ for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new -mv $PKG/etc/dbus-1/system.d/avahi-dbus.conf \ - $PKG/etc/dbus-1/system.d/avahi-dbus.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info index 7f842f50e1..ced5e61121 100644 --- a/network/avahi/avahi.info +++ b/network/avahi/avahi.info @@ -1,8 +1,8 @@ PRGNAM="avahi" -VERSION="0.7" +VERSION="0.8" HOMEPAGE="http://avahi.org/" -DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.7/avahi-0.7.tar.gz" -MD5SUM="d76c59d0882ac6c256d70a2a585362a6" +DOWNLOAD="https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz" +MD5SUM="229c6aa30674fc43c202b22c5f8c2be7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libdaemon" diff --git a/network/avahi/bssh.1 b/network/avahi/bssh.1 new file mode 100644 index 0000000000..913554eb30 --- /dev/null +++ b/network/avahi/bssh.1 @@ -0,0 +1,36 @@ +.TH bssh/bvnc/bshell 1 User Manuals +.SH NAME +bssh/bvnc/bshell \- Browse for SSH/VNC servers on the local network +.SH SYNOPSIS +\fBbssh + +bvnc + +bshell +\f1 +.SH DESCRIPTION +bssh/bvnc/bshell browses for SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made. + +If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown. +.SH OPTIONS +.TP +\fB-s | --ssh\f1 +Browse for SSH servers (and only SSH servers) regardless under which name the binary is called. +.TP +\fB-v | --vnc\f1 +Browse for VNC servers (and only VNC servers) regardless under which name the binary is called. +.TP +\fB-S | --shell\f1 +Browse for both VNC and SSH servers regardless under which name the binary is called. +.TP +\fB-d | --domain=\f1 \fIDOMAIN\f1 +Browse in the specified domain. If omitted bssh/bvnc/bshell will browse in the default browsing domain (usually .local) +.TP +\fB-h | --help\f1 +Show help. +.SH AUTHORS +The Avahi Developers <avahi (at) lists (dot) freedesktop (dot) org>; Avahi is available from \fBhttp://avahi.org/\f1 +.SH SEE ALSO +\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1 +.SH COMMENTS +This man page was written using \fBxml2man(1)\f1 by Oliver Kurth. diff --git a/network/avahi/build-db b/network/avahi/build-db new file mode 100644 index 0000000000..78ee892f60 --- /dev/null +++ b/network/avahi/build-db @@ -0,0 +1,49 @@ +#!/usr/bin/env python +# -*-python-*- +# This file is part of avahi. +# +# avahi 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 of the +# License, or (at your option) any later version. +# +# avahi 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 Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +try: + import anydbm as dbm +except ImportError: + import dbm + +import sys + +if len(sys.argv) > 1: + infn = sys.argv[1] +else: + infn = "service-types" + +if len(sys.argv) > 2: + outfn = sys.argv[2] +else: + outfn = infn + ".db" + +db = dbm.open(outfn, "n") + +for ln in open(infn, "r"): + ln = ln.strip(" \r\n\t") + + if ln == "" or ln.startswith("#"): + continue + + t, n = ln.split(":", 1) + + db[t.strip()] = n.strip() + +db.close() diff --git a/network/avahi/doinst.sh b/network/avahi/doinst.sh index d22f3fa394..9bf5bd8772 100644 --- a/network/avahi/doinst.sh +++ b/network/avahi/doinst.sh @@ -26,7 +26,6 @@ preserve_perms() { preserve_perms etc/rc.d/rc.avahidaemon.new preserve_perms etc/rc.d/rc.avahidnsconfd.new preserve_perms etc/avahi/avahi-daemon.conf.new -preserve_perms etc/dbus-1/system.d/avahi-dbus.conf.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/network/avahi/ipv6_race_condition_fix.patch b/network/avahi/ipv6_race_condition_fix.patch new file mode 100644 index 0000000000..3418b1a11c --- /dev/null +++ b/network/avahi/ipv6_race_condition_fix.patch @@ -0,0 +1,51 @@ +Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> +Date: 2020-10-19 +Initial Package Version: 0.8 +Upstream Status: PR, not applied +Origin: Upstream PR (github.com/lathiat/avahi/pull/309) +Description: Fixes a race condition when multiple NICs are in use + when IPv6 is enabled. This will exhibit behavior where + messages about withdrawing address records, registering + access records, and new hostname announcements are + spammed to the log every second. + +diff -Naurp avahi-0.8.orig/avahi-core/server.c avahi-0.8/avahi-core/server.c +--- avahi-0.8.orig/avahi-core/server.c 2020-02-16 21:41:24.939967558 -0600 ++++ avahi-0.8/avahi-core/server.c 2020-10-19 11:07:22.054861721 -0500 +@@ -193,7 +193,7 @@ static void withdraw_rrset(AvahiServer * + withdraw_entry(s, e); + } + +-static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) { ++static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i, int from_local_iface) { + AvahiEntry *e, *n; + int ours = 0, won = 0, lost = 0; + +@@ -210,7 +210,7 @@ static void incoming_probe(AvahiServer * + if (e->dead) + continue; + +- if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) { ++ if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0 || from_local_iface) { + ours = 1; + break; + } else { +@@ -639,7 +639,7 @@ static void handle_query_packet(AvahiSer + if (!avahi_key_is_pattern(record->key)) { + if (!from_local_iface) + reflect_probe(s, i, record); +- incoming_probe(s, record, i); ++ incoming_probe(s, record, i, from_local_iface); + } + + avahi_record_unref(record); +@@ -961,8 +961,7 @@ static void dispatch_packet(AvahiServer + return; + + /* We don't want to reflect local traffic, so we check if this packet is generated locally. */ +- if (s->config.enable_reflector) +- from_local_iface = originates_from_local_iface(s, iface, src_address, port); ++ from_local_iface = originates_from_local_iface(s, iface, src_address, port); + + if (avahi_dns_packet_check_valid_multicast(p) < 0) { + avahi_log_debug("Received invalid packet."); diff --git a/network/awscli/awscli.SlackBuild b/network/awscli/awscli.SlackBuild index c4320b7d7d..a9a7cd2b1e 100644 --- a/network/awscli/awscli.SlackBuild +++ b/network/awscli/awscli.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for awscli -# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-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=awscli -VERSION=${VERSION:-1.16.238} +VERSION=${VERSION:-1.18.141} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,14 +69,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 {} \; -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 LICENSE.txt PKG-INFO README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.txt PKG-INFO 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/network/awscli/awscli.info b/network/awscli/awscli.info index 69b50ae275..c6d98c2b64 100644 --- a/network/awscli/awscli.info +++ b/network/awscli/awscli.info @@ -1,10 +1,10 @@ PRGNAM="awscli" -VERSION="1.16.238" +VERSION="1.18.141" HOMEPAGE="https://aws.amazon.com/cli/" -DOWNLOAD="https://files.pythonhosted.org/packages/3e/f0/718b0e13a04148b47f984c1fa99cb43f69df6f8e561b80ba287411636296/awscli-1.16.238.tar.gz" -MD5SUM="3f37dad2ab5cd4456cff6a7d54f52eb2" +DOWNLOAD="https://files.pythonhosted.org/packages/f0/4b/24e8a4568dcc12c27391cfa48dd73afd159886e0ca3a4ec47e56d95678bf/awscli-1.18.141.tar.gz" +MD5SUM="eff481eb3ae06d5c22a7ad1729b3922e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="s3transfer colorama rsa PyYAML" +REQUIRES="s3transfer colorama python3-rsa python3-PyYAML" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/network/axel/README b/network/axel/README index a1f6e0a8e7..3368633451 100644 --- a/network/axel/README +++ b/network/axel/README @@ -1,7 +1,7 @@ Axel accelerates the HTTP/FTP downloading process by using multiple -connections for one file. It can use multiple mirrors for a download. Axel -has no dependencies and is lightweight, so it might be useful as a wget -clone on byte-critical systems. Axel is the perfect utility for those -connections to wherever you are downloading from that may have a limit -on ftp stream speeds, http sessions that burst and slow down, or servers -with a slow connection. +connections for one file. It can use multiple mirrors for a download. +Axel has no dependencies and is lightweight, so it might be useful as a +wget clone on byte-critical systems. Axel is the perfect utility for +those connections to wherever you are downloading from that may have a +limit on ftp stream speeds, http sessions that burst and slow down, or +servers with a slow connection. diff --git a/network/axel/axel.SlackBuild b/network/axel/axel.SlackBuild index d5f9413709..ada5d01ebe 100644 --- a/network/axel/axel.SlackBuild +++ b/network/axel/axel.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2008 Antonio Hernández Blas <hba.nihilismus@gmail.com> # Copyright 2011 Matthew "mfillpot" Fillpot -# Copyright 2018-2019 Jostein Berntsen <jbernts@broadpark.no> +# Copyright 2018-2021 Jostein Berntsen <jvbernts@online.no> # 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=axel -VERSION=${VERSION:-2.17.6} +VERSION=${VERSION:-2.17.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -84,7 +84,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 ABOUT-NLS AUTHORS CONTRIBUTING.md COPYING CREDITS INSTALL NEWS README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CONTRIBUTING.md COPYING INSTALL NEWS README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/axel/axel.info b/network/axel/axel.info index 0623c95408..994749100c 100644 --- a/network/axel/axel.info +++ b/network/axel/axel.info @@ -1,10 +1,10 @@ PRGNAM="axel" -VERSION="2.17.6" +VERSION="2.17.10" HOMEPAGE="https://github.com/axel-download-accelerator/axel" -DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.6/axel-2.17.6.tar.gz" -MD5SUM="9813dc599a1154275886c95ccd107b43" +DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.10/axel-2.17.10.tar.gz" +MD5SUM="de52af0d6ed13e476107b17a802a6a64" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jostein Berntsen" -EMAIL="jbernts@broadpark.no" +EMAIL="jvbernts@online.no" diff --git a/network/barrier/barrier.info b/network/barrier/barrier.info index 1382632fdb..554b4888c7 100644 --- a/network/barrier/barrier.info +++ b/network/barrier/barrier.info @@ -6,5 +6,5 @@ MD5SUM="8cc0d40bc7da7f7e33c8c063157084b5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avahi qt5" -MAINTAINER="Mrio Antunes" +MAINTAINER="Mário Antunes" EMAIL="mariolpantunes@gmail.com" diff --git a/network/basilisk-bin/basilisk-bin.SlackBuild b/network/basilisk-bin/basilisk-bin.SlackBuild index a30c712c8c..24b2e373fd 100644 --- a/network/basilisk-bin/basilisk-bin.SlackBuild +++ b/network/basilisk-bin/basilisk-bin.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=basilisk-bin SRCNAM=basilisk -VERSION=${VERSION:-2019.09.03} +VERSION=${VERSION:-2021.03.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,7 +53,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-latest.linux64.tar.bz2 +tar xvf $CWD/$SRCNAM-latest.linux64.tar.xz cd $SRCNAM chown -R root:root . find -L . \ diff --git a/network/basilisk-bin/basilisk-bin.info b/network/basilisk-bin/basilisk-bin.info index ead5cf5a63..1cf23772cb 100644 --- a/network/basilisk-bin/basilisk-bin.info +++ b/network/basilisk-bin/basilisk-bin.info @@ -1,10 +1,10 @@ PRGNAM="basilisk-bin" -VERSION="2019.09.03" +VERSION="2021.03.17" HOMEPAGE="https://www.basilisk-browser.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://us.basilisk-browser.org/release/basilisk-latest.linux64.tar.bz2" -MD5SUM_x86_64="c7106e3201d419da95f4508d80a5c3b0" +DOWNLOAD_x86_64="http://repo.khronosschoty.org/Slackware/basilisk/basilisk-bin/basilisk-latest.linux64.tar.xz" +MD5SUM_x86_64="5edda8852f40000a6a66848d2930c8a9" REQUIRES="" MAINTAINER="khronosschoty" EMAIL="khronosschoty@posteo.org" diff --git a/network/basilisk/README b/network/basilisk/README index 608efa0cc3..6093a0b8ef 100644 --- a/network/basilisk/README +++ b/network/basilisk/README @@ -13,8 +13,7 @@ Some build time options: will override the default and build with gtk2 instead of gtk3. -jack-audio-connection-kit is an optional dependency and, if detected, -automatically built. If this is undesirable you can blacklist jack, by -passing the variable: +jack is an optional dependency and, if detected, automatically built. If +this is undesirable you can blacklist jack, by passing the variable: BLACKLIST_JACK=yes ./basilisk.SlackBuild diff --git a/network/bitcoin/README b/network/bitcoin/README index 7075d3ee89..667e2935be 100644 --- a/network/bitcoin/README +++ b/network/bitcoin/README @@ -9,10 +9,10 @@ of a P2P network to check for double-spending. This Bitcoin client builds the backbone of the bitcoin network. It downloads, verifies and distributes the blockchain to other peers in the network. It uses lots of diskspace and bandwidth. -If you just want to send and receive Bitcoins you should look at -a light client like Electrum. +If you just want to send and receive Bitcoins you can also look +at a light client like Electrum. Please make sure to read the release notes first before upgrading: -https://bitcoincore.org/en/releases/0.18.1/ +https://bitcoincore.org/en/releases/0.21.0/ qrencode is an optional but strongly recommended dependency. diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild index 9f9353e4b4..658fc14a62 100644 --- a/network/bitcoin/bitcoin.SlackBuild +++ b/network/bitcoin/bitcoin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bitcoin -VERSION=${VERSION:-0.18.1} +VERSION=${VERSION:-0.21.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/bitcoin/bitcoin.info b/network/bitcoin/bitcoin.info index c06c153c13..c9df6a1ae7 100644 --- a/network/bitcoin/bitcoin.info +++ b/network/bitcoin/bitcoin.info @@ -1,8 +1,8 @@ PRGNAM="bitcoin" -VERSION="0.18.1" +VERSION="0.21.0" HOMEPAGE="https://bitcoincore.org" -DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.18.1/bitcoin-0.18.1.tar.gz" -MD5SUM="be159bfefb78018e331d0dd7c01ef415" +DOWNLOAD="https://bitcoincore.org/bin/bitcoin-core-0.21.0/bitcoin-0.21.0.tar.gz" +MD5SUM="a99c80d18243db0b8089882f9be1302a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="protobuf qt5" diff --git a/network/bluejeans/bluejeans.SlackBuild b/network/bluejeans/bluejeans.SlackBuild index 5544a07e03..d322989b32 100644 --- a/network/bluejeans/bluejeans.SlackBuild +++ b/network/bluejeans/bluejeans.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bluejeans -# Copyright 2019 Igor Alexandrov <igor.s.alexandrov@gmail.com> +# Copyright 2019-2021 Igor Alexandrov <igor.alexandrov@outlook.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=bluejeans -VERSION=${VERSION:-1.37.22} +VERSION=${VERSION:-2.21.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,25 +35,27 @@ if [ -z "$ARCH" ]; then esac fi +set -e + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +SRCNAM=BlueJeans +EXECNAM=bluejeans-v2 + if [ "$ARCH" != "x86_64" ]; then echo "$ARCH is not supported for $PRGNAM-$VERSION" - exit -1 + exit 1 fi -set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -rpm2cpio $CWD/$PRGNAM-$VERSION.$ARCH.rpm | cpio -idmv +rpm2cpio $CWD/${SRCNAM}_${VERSION}.rpm | cpio -idmv 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 \ @@ -63,21 +65,16 @@ find -L . \ find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -chmod 755 opt/bluejeans/bluejeans -patchelf --replace-needed libudev.so.0 libudev.so opt/bluejeans/bluejeans-bin - -mkdir -p usr/{bin,doc/$PRGNAM-$VERSION,share/{applications,icons}} +sed -i \ + 's#Categories=AudioVideo;#Categories=Network;# + s#^Exec=.*$#Exec=/usr/bin/bluejeans %U#' \ + usr/share/applications/bluejeans-v2.desktop -ln -s ../../opt/$PRGNAM/$PRGNAM usr/bin -ln -s ../../../opt/$PRGNAM/$PRGNAM.desktop usr/share/applications -ln -s ../../../opt/$PRGNAM/credits.html usr/doc/$PRGNAM-$VERSION -cat $CWD/slack-desc > $PKG/usr/doc/$PRGNAM-$VERSION/slack-desc +mkdir -p usr/{bin,doc/$PRGNAM-$VERSION} +ln -s ../../opt/$SRCNAM/$EXECNAM usr/bin/$PRGNAM +ln -s ../../../opt/$SRCNAM/LICENSE.electron.txt usr/doc/$PRGNAM-$VERSION +ln -s ../../../opt/$SRCNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -(cd opt/$PRGNAM/icons; find . -type d -exec mkdir -p ../../../usr/share/icons/{} \;) -for i in $(find opt/$PRGNAM/icons -type f); do - sd=$(echo $i | cut -d/ -f4-) - ln -s ../../$(echo $sd | sed 's:[^/][^/]*:..:g')/$i usr/share/icons/$sd -done mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/bluejeans/bluejeans.info b/network/bluejeans/bluejeans.info index ca91f442e1..a348be5d79 100644 --- a/network/bluejeans/bluejeans.info +++ b/network/bluejeans/bluejeans.info @@ -1,10 +1,10 @@ PRGNAM="bluejeans" -VERSION="1.37.22" +VERSION="2.21.3.2" HOMEPAGE="https://www.bluejeans.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop/linux/1.37/1.37.22/bluejeans-1.37.22.x86_64.rpm" -MD5SUM_x86_64="fa34e81272a0fc37ef03daa3ff881f15" -REQUIRES="patchelf" +DOWNLOAD_x86_64="https://swdl.bluejeans.com/desktop-app/linux/2.21.3/BlueJeans_2.21.3.2.rpm" +MD5SUM_x86_64="c4e7f7931d3e40ccf31a8fd2cd09c631" +REQUIRES="" MAINTAINER="Igor Alexandrov" -EMAIL="igor.s.alexandrov@gmail.com" +EMAIL="igor.alexandrov@outlook.com" diff --git a/network/bollux/README b/network/bollux/README new file mode 100644 index 0000000000..da116fcd80 --- /dev/null +++ b/network/bollux/README @@ -0,0 +1,14 @@ +bollux (bash Gemini client) + +bollux is a cli client for the new Gemini protocol implemented in +bash. + +CAPABILITIES + +- make requests +- receive files +- use dd to show a nice little download status +- use less to display text/* files +- link navigation +- man page +- configuration diff --git a/network/bollux/bollux.SlackBuild b/network/bollux/bollux.SlackBuild new file mode 100644 index 0000000000..62c42b3027 --- /dev/null +++ b/network/bollux/bollux.SlackBuild @@ -0,0 +1,95 @@ +#!/bin/sh +# +# Slackware build script for bollux. +# +# Copyright 2020 Matthew Graybosch +# 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=bollux +VERSION=${VERSION:-0.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 + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +rm -rf $TMP/$PRGNAM-$VERSION +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 {} \; + +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 + +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 + +DOCS="LICENSE README.md test.gmi" + +rm -rf $PKG/usr/share/doc + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/bollux/bollux.info b/network/bollux/bollux.info new file mode 100644 index 0000000000..e65279d0ea --- /dev/null +++ b/network/bollux/bollux.info @@ -0,0 +1,10 @@ +PRGNAM="bollux" +VERSION="0.2.2" +HOMEPAGE="https://git.sr.ht/~acdw/bollux" +DOWNLOAD="https://git.sr.ht/~acdw/bollux/archive/0.2.2.tar.gz" +MD5SUM="4ba00dc4f85b9766cfbab5969c7bc561" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matthew Graybosch" +EMAIL="contact@matthewgraybosch.com" diff --git a/network/weboob/slack-desc b/network/bollux/slack-desc index 2985003e0f..00731e0164 100644 --- a/network/weboob/slack-desc +++ b/network/bollux/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -weboob: weboob (applications to interact with websites) -weboob: -weboob: weboob (Web Out Of Browsers) provides several applications to -weboob: interact with a lot of websites. -weboob: -weboob: Homepage: http://symlink.me/projects/weboob -weboob: -weboob: -weboob: -weboob: -weboob: +bollux: bollux (bash Gemini client) +bollux: +bollux: bollux is a cli client for the new Gemini protocol +bollux: implemented in bash using basic shell tools. +bollux: +bollux: Home Page: https://git.sr.ht/~acdw/bollux +bollux: +bollux: +bollux: +bollux: +bollux: diff --git a/network/bombadillo/README b/network/bombadillo/README new file mode 100644 index 0000000000..0f0da2a237 --- /dev/null +++ b/network/bombadillo/README @@ -0,0 +1,21 @@ +Bombadillo is a non-web browser, designed for a growing list of +protocols operating outside of the web. + +Bombadillo is operated from your terminal, allowing you to browse +content, follow links, and engage in the non-web with ease. +The main features of Bombadillo are: + - Seamless browsing between multiple protocols, including Gopher, +Gemini, Finger, and your local file system + - Additional support for telnet and the web through third-party +applications - http/https connection support is opt-in, and is +configurable in a few different ways + - Privacy focused - does not store usage or browsing data, will only +store items you instruct it to (bookmarks, gemini certificates, +settings and downloaded files) + - Does not send/transmit anything to anyone that you do not instruct +it to + - Uses Vi/Vim-inspired keybindings and an easy command system + - Navigable history within a session (no storage of session data) + - Supports bookmarks + - Gemini Protocol support includes secure communication over TLS, +and uses a TOFU-style certificate system diff --git a/network/bombadillo/bombadillo.SlackBuild b/network/bombadillo/bombadillo.SlackBuild new file mode 100644 index 0000000000..dafdbcdadf --- /dev/null +++ b/network/bombadillo/bombadillo.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh +# +# Slackware build script for bombadillo. +# +# Copyright 2021 Ivan Rozhkov, Russian Federation. +# All rights reserved. +# +# Permission to use, copy, modify, and/or 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. + +PRGNAM=bombadillo +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 || tar xvf $CWD/$VERSION.tar.gz +cd $PRGNAM + +sed -i '/update-desktop-database/d' Makefile + +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 -j1 \ + DESTDIR=$PKG \ + PREFIX=/usr \ + MANDIR=/usr/man \ + 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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a \ + DEVELOPING.md \ + LICENSE \ + README.md \ + VERSION \ + $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/network/bombadillo/bombadillo.info b/network/bombadillo/bombadillo.info new file mode 100644 index 0000000000..9d374e9feb --- /dev/null +++ b/network/bombadillo/bombadillo.info @@ -0,0 +1,10 @@ +PRGNAM="bombadillo" +VERSION="2.3.3" +HOMEPAGE="https://bombadillo.colorfield.space/" +DOWNLOAD="https://tildegit.org/sloum/bombadillo/archive/2.3.3.tar.gz" +MD5SUM="a112fdd9f388c62d9a67e47b9f8108c3" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="google-go-lang" +MAINTAINER="Ivan Rozhkov" +EMAIL="ris@disroot.org" diff --git a/network/hipchat2/doinst.sh b/network/bombadillo/doinst.sh index 65c7e2eeb9..b3b5ad2b91 100644 --- a/network/hipchat2/doinst.sh +++ b/network/bombadillo/doinst.sh @@ -1,4 +1,4 @@ -if [ -x /usr/bin/update-desktop-database ]; then + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi @@ -6,4 +6,4 @@ 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 +fi
\ No newline at end of file diff --git a/network/bombadillo/slack-desc b/network/bombadillo/slack-desc new file mode 100644 index 0000000000..12569a03c1 --- /dev/null +++ b/network/bombadillo/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------------------------------------------------------| +bombadillo: bombadillo 2.3.3 (bombadillo non-web browser) +bombadillo: +bombadillo: bombadillo is a non-web browser for the terminal. It features a +bombadillo: full terminal user interface, vim-like keybindings, document +bombadillo: pager, configurable settings, and a robust command selection. +bombadillo: bombadillo supports the following protocols as first class +bombadillo: citizens: gopher, gemini, finger, and local (a user's file +bombadillo: system). Support for telnet, http and https is also available via +bombadillo: integration with third party applications. +bombadillo: +bombadillo: http://bombadillo.colorfield.space/ diff --git a/network/bottle/README b/network/bottle/README index f64ed2a768..65cf685e37 100644 --- a/network/bottle/README +++ b/network/bottle/README @@ -1,5 +1,3 @@ -bottle is a fast and simple micro-framework for small web applications. It -offers request dispatching (Routes) with url parameter support, templates, -a built-in HTTP Server and adapters for many third party WSGI/HTTP-server and -template engines - all in a single file and with no dependencies other than -the Python Standard Library. +bottle is a fast, simple and lightweight WSGI micro web-framework for +Python. It is distributed as a single file module and has no +dependencies other than the Python Standard Library. diff --git a/network/bottle/bottle.SlackBuild b/network/bottle/bottle.SlackBuild index ac59df529a..1a017dd319 100644 --- a/network/bottle/bottle.SlackBuild +++ b/network/bottle/bottle.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for bottle -# Copyright 2015-2017 Philip Lacroix <slackph at posteo dot de> +# Copyright 2015-2021 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=bottle -VERSION=${VERSION:-0.12.13} +VERSION=${VERSION:-0.12.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,8 +53,8 @@ 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 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 @@ -65,7 +65,7 @@ PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION # Install documentation. mkdir -p $PRGDOC -cp -a README.rst PKG-INFO $PRGDOC/ +cp -a AUTHORS README.rst LICENSE $PRGDOC/ cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/bottle/bottle.info b/network/bottle/bottle.info index 49e70de934..4c38928e34 100644 --- a/network/bottle/bottle.info +++ b/network/bottle/bottle.info @@ -1,8 +1,8 @@ PRGNAM="bottle" -VERSION="0.12.13" -HOMEPAGE="http://bottlepy.org/docs/dev/" -DOWNLOAD="https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c/bottle-0.12.13.tar.gz" -MD5SUM="d2fe1b48c1d49217e78bf326b1cad437" +VERSION="0.12.19" +HOMEPAGE="https://bottlepy.org/docs/dev/" +DOWNLOAD="https://github.com/bottlepy/bottle/archive/0.12.19/bottle-0.12.19.tar.gz" +MD5SUM="3c07bf37fdd43ab6fa3567b189b59ce7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/bozohttpd/bozohttpd.SlackBuild b/network/bozohttpd/bozohttpd.SlackBuild index efe8bdbadf..8e30554400 100644 --- a/network/bozohttpd/bozohttpd.SlackBuild +++ b/network/bozohttpd/bozohttpd.SlackBuild @@ -24,6 +24,9 @@ # Now maintained by B. Watson <yalhcru@gmail.com>. +# 20201102 bkw: Update for v20201014. +# 20191201 bkw: Update for v20190228. + # 20181203 bkw: # - Update for v20181125. # - Lua-5.1 (plain lua build) is no longer supported. Add a mess o' logic @@ -44,7 +47,7 @@ # - Simplify script a bit. PRGNAM=bozohttpd -VERSION=${VERSION:-20181125} +VERSION=${VERSION:-20201014} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/bozohttpd/bozohttpd.info b/network/bozohttpd/bozohttpd.info index 2d275dca86..5546582853 100644 --- a/network/bozohttpd/bozohttpd.info +++ b/network/bozohttpd/bozohttpd.info @@ -1,8 +1,8 @@ PRGNAM="bozohttpd" -VERSION="20181125" +VERSION="20201014" HOMEPAGE="http://www.eterna.com.au/bozohttpd/" -DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20181125.tar.bz2" -MD5SUM="e9ee8f82ebcf9ef9b293c6af32672082" +DOWNLOAD="http://www.eterna.com.au/bozohttpd/bozohttpd-20201014.tar.bz2" +MD5SUM="c93b63381e3a291d3be2c691396f8293" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/bozohttpd/defines.default b/network/bozohttpd/defines.default index ef1e392ea2..6f2a8e4a72 100644 --- a/network/bozohttpd/defines.default +++ b/network/bozohttpd/defines.default @@ -33,3 +33,6 @@ # SSL support (-z, -Z options). Uncomment to disable: # -DNO_SSL_SUPPORT + +# blocklist(8) support. This is BSD-specific (for now?), DON'T comment out: +-DNO_BLOCKLIST_SUPPORT diff --git a/network/brave-browser/README b/network/brave-browser/README index 45d71fb02a..206ae972ea 100644 --- a/network/brave-browser/README +++ b/network/brave-browser/README @@ -1,15 +1,11 @@ -Brave is on a mission to fix the Web by giving users a safer, faster, -and better browsing experience – while growing support for content -creators through a new attention-based ecosystem of rewards. +Brave is a free and open-source web browser developed by Brave +Software, Inc. based on the Chromium web browser. -Much more than a browser, Brave is a new way of thinking about how the -Web works. - -Brave is open source, and built by a team of privacy focused, -performance oriented pioneers of the Web, founded by the inventor -of Javascript and co-founder of Mozilla. +The browser blocks ads and website trackers, and provides a +way for users to send cryptocurrency contributions in the +form of Basic Attention Tokens to websites and content creators. Brave is 64-bit software. -This SlackBuild does not build Brave from source, it simply repackages +This SlackBuild does not build Brave from source, it repackages the binary. diff --git a/network/brave-browser/brave-browser.SlackBuild b/network/brave-browser/brave-browser.SlackBuild index ae3dbcfff2..0a6ef9d8be 100644 --- a/network/brave-browser/brave-browser.SlackBuild +++ b/network/brave-browser/brave-browser.SlackBuild @@ -2,6 +2,7 @@ # Slackware build script for brave-browser +# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com> # Copyright 2018-2019 Donald Cooley South Haven, Indiana USA # All rights reserved. # @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=brave-browser -VERSION=${VERSION:-0.68.142} +VERSION=${VERSION:-1.23.71} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,8 +78,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr # Place man page(s) where The Man likes 'em 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 +#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 diff --git a/network/brave-browser/brave-browser.info b/network/brave-browser/brave-browser.info index 4622018f10..9e010bca35 100644 --- a/network/brave-browser/brave-browser.info +++ b/network/brave-browser/brave-browser.info @@ -1,10 +1,10 @@ PRGNAM="brave-browser" -VERSION="0.68.142" +VERSION="1.23.71" HOMEPAGE="https://brave.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v0.68.142/brave-browser-0.68.142-1.x86_64.rpm" -MD5SUM_x86_64="ea8e9c61a3ccdf218ceb1a54e8a63426" -REQUIRES="" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" +DOWNLOAD_x86_64="https://github.com/brave/brave-browser/releases/download/v1.23.71/brave-browser-1.23.71-1.x86_64.rpm" +MD5SUM_x86_64="af87c4368633ba97a73d13cbfec95d40" +REQUIRES="libxkbcommon" +MAINTAINER="Andrew Payne" +EMAIL="phalange@komputermatrix.com" diff --git a/network/brave-browser/doinst.sh b/network/brave-browser/doinst.sh index 2675e13764..57c1cdfc42 100644 --- a/network/brave-browser/doinst.sh +++ b/network/brave-browser/doinst.sh @@ -1,5 +1,5 @@ if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi if [ -x /usr/bin/update-mime-database ]; then diff --git a/network/brave-browser/slack-desc b/network/brave-browser/slack-desc index fb3dc60d85..99dfa4edda 100644 --- a/network/brave-browser/slack-desc +++ b/network/brave-browser/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| brave-browser: brave-browser (a safer, faster, and better Web browsing experience) brave-browser: -brave-browser: Brave is on a mission to fix the Web by giving users a safer, faster, -brave-browser: and better browsing experience - while growing support for content -brave-browser: creators through a new attention-based ecosystem of rewards. -brave-browser: Much more than a browser, Brave is a new way of thinking about how -brave-browser: the Web works. -brave-browser: Brave is open source, and built by a team of privacy focused, -brave-browser: performance oriented pioneers of the Web, founded by the inventor of -brave-browser: Javascript and co-founder of Mozilla. +brave-browser: Brave is a free and open-source web browser developed by Brave +brave-browser: Software, Inc. based on the Chromium web browser. +brave-browser: brave-browser: https://brave-browser.com +brave-browser: +brave-browser: +brave-browser: +brave-browser: +brave-browser: diff --git a/network/broadcom-sta/broadcom-sta.SlackBuild b/network/broadcom-sta/broadcom-sta.SlackBuild index e533023942..e1258bdbad 100644 --- a/network/broadcom-sta/broadcom-sta.SlackBuild +++ b/network/broadcom-sta/broadcom-sta.SlackBuild @@ -85,7 +85,9 @@ patch -p2 < $CWD/patches/18-linux411.patch patch -p2 < $CWD/patches/19-linux412.patch patch -p2 < $CWD/patches/20-linux414.patch patch -p2 < $CWD/patches/21-linux415.patch +patch -p2 < $CWD/patches/22-linux56.patch patch -p1 < $CWD/patches/009-fix_mac_profile_discrepancy.patch +patch -p2 < $CWD/patches/23-get-rid-of-get_fs-set_fs-calls.patch # See https://lkml.org/lkml/2019/3/1/643 sed -i 's/get_ds()/KERNEL_DS/g' src/wl/sys/wl_iw.c diff --git a/network/broadcom-sta/broadcom-sta.info b/network/broadcom-sta/broadcom-sta.info index 4d85e3f60e..bb46a80e45 100644 --- a/network/broadcom-sta/broadcom-sta.info +++ b/network/broadcom-sta/broadcom-sta.info @@ -10,5 +10,5 @@ DOWNLOAD_x86_64="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/REA MD5SUM_x86_64="e3dab6d9dea12b6487ccf24d012e0350 \ 115903050c41d466161784d4c843f4f9" REQUIRES="" -MAINTAINER="Andreas Voegele" -EMAIL="andreas@andreasvoegele.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/network/broadcom-sta/patches/22-linux56.patch b/network/broadcom-sta/patches/22-linux56.patch new file mode 100644 index 0000000000..2a2bcad837 --- /dev/null +++ b/network/broadcom-sta/patches/22-linux56.patch @@ -0,0 +1,90 @@ +From dd057e40a167f4febb1a7c77dd32b7d36056952c Mon Sep 17 00:00:00 2001 +From: Herman van Hazendonk <github.com@herrie.org> +Date: Tue, 31 Mar 2020 17:09:55 +0200 +Subject: [PATCH] Add fixes for 5.6 kernel + +Use ioremap instead of ioremap_nocache and proc_ops instead of file_operations on Linux kernel 5.6 and above. + +Signed-off-by: Herman van Hazendonk <github.com@herrie.org> +--- + amd64/src/shared/linux_osl.c | 6 +++++- + amd64/src/wl/sys/wl_linux.c | 21 ++++++++++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/amd64/src/shared/linux_osl.c b/amd64/src/shared/linux_osl.c +index 6157d18..dcfc075 100644 +--- a/amd64/src/shared/linux_osl.c ++++ b/amd64/src/shared/linux_osl.c +@@ -942,7 +942,11 @@ osl_getcycles(void) + void * + osl_reg_map(uint32 pa, uint size) + { +- return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ return (ioremap((unsigned long)pa, (unsigned long)size)); ++ #else ++ return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + } + + void +diff --git a/amd64/src/wl/sys/wl_linux.c b/amd64/src/wl/sys/wl_linux.c +index 0d05100..6d9dd0d 100644 +--- a/amd64/src/wl/sys/wl_linux.c ++++ b/amd64/src/wl/sys/wl_linux.c +@@ -582,10 +582,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, + } + wl->bcm_bustype = bustype; + ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { ++ WL_ERROR(("wl%d: ioremap() failed\n", unit)); ++ goto fail; ++ } ++ #else + if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { + WL_ERROR(("wl%d: ioremap() failed\n", unit)); + goto fail; + } ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + + wl->bar1_addr = bar1_addr; + wl->bar1_size = bar1_size; +@@ -772,8 +779,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + bar1_size = pci_resource_len(pdev, 2); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), ++ bar1_size); ++ #else + bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), + bar1_size); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, + pdev->irq, bar1_addr, bar1_size); + +@@ -3335,12 +3347,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static const struct proc_ops wl_fops = { ++ .proc_read = wl_proc_read, ++ .proc_write = wl_proc_write, ++}; ++#else + static const struct file_operations wl_fops = { + .owner = THIS_MODULE, + .read = wl_proc_read, + .write = wl_proc_write, + }; +-#endif ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */ + + static int + wl_reg_proc_entry(wl_info_t *wl) +-- +2.17.1.windows.1 + diff --git a/network/broadcom-sta/patches/23-get-rid-of-get_fs-set_fs-calls.patch b/network/broadcom-sta/patches/23-get-rid-of-get_fs-set_fs-calls.patch new file mode 100644 index 0000000000..b7ba8cdbf5 --- /dev/null +++ b/network/broadcom-sta/patches/23-get-rid-of-get_fs-set_fs-calls.patch @@ -0,0 +1,207 @@ +From: Joan Bruguera <joanbrugueram@gmail.com> +Date: Sun, 13 Sep 2020 07:33:32 +0200 +Subject: Get rid of get_fs/set_fs calls in Broadcom WL driver. +Origin: https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290 + +Fixes linux-next where get_fs/set_fs is already removed for some architectures. + +NB: Some checks in wlc_ioctl_internal are likely superfluous, + but I'm not familiar enough with the driver to remove them with confidence. + +See also: https://lwn.net/Articles/722267/ + https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/arch/x86/include/asm/uaccess.h?h=next-20200911&id=47058bb54b57962b3958a936ddbc59355e4c5504 + https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/include/linux/uaccess.h?h=next-20200911&id=5e6e9852d6f76e01b2e6803c74258afa5b432bc5 + +Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com> +--- + amd64/src/wl/sys/wl_cfg80211_hybrid.c | 29 ++----------------------- + amd64/src/wl/sys/wl_iw.c | 25 ++-------------------- + amd64/src/wl/sys/wl_linux.c | 40 ++++++++++++++++++++++++++++++----- + amd64/src/wl/sys/wl_linux.h | 2 ++ + amd64/src/wl/sys/wlc_pub.h | 1 + + 5 files changed, 42 insertions(+), 55 deletions(-) + +diff --git a/amd64/src/wl/sys/wl_cfg80211_hybrid.c b/amd64/src/wl/sys/wl_cfg80211_hybrid.c +index 8e01841..111ec5a 100644 +--- a/amd64/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/amd64/src/wl/sys/wl_cfg80211_hybrid.c +@@ -41,6 +41,7 @@ + #include <wlioctl.h> + #include <proto/802.11.h> + #include <wl_cfg80211_hybrid.h> ++#include <wl_linux.h> + + #define EVENT_TYPE(e) dtoh32((e)->event_type) + #define EVENT_FLAGS(e) dtoh16((e)->flags) +@@ -442,30 +443,8 @@ + static s32 + wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + { +- struct ifreq ifr; +- struct wl_ioctl ioc; +- mm_segment_t fs; +- s32 err = 0; +- + BUG_ON(len < sizeof(int)); +- +- memset(&ioc, 0, sizeof(ioc)); +- ioc.cmd = cmd; +- ioc.buf = arg; +- ioc.len = len; +- strcpy(ifr.ifr_name, dev->name); +- ifr.ifr_data = (caddr_t)&ioc; +- +- fs = get_fs(); +- set_fs(get_ds()); +-#if defined(WL_USE_NETDEV_OPS) +- err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#else +- err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#endif +- set_fs(fs); +- +- return err; ++ return wlc_ioctl_internal(dev, cmd, arg, len); + } + + static s32 +diff --git a/amd64/src/wl/sys/wl_iw.c b/amd64/src/wl/sys/wl_iw.c +index c4c610b..e346b15 100644 +--- a/amd64/src/wl/sys/wl_iw.c ++++ b/amd64/src/wl/sys/wl_iw.c +@@ -37,6 +37,7 @@ typedef const struct si_pub si_t; + + #include <wl_dbg.h> + #include <wl_iw.h> ++#include <wl_linux.h> + + extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status, + uint32 reason, char* stringBuf, uint buflen); +@@ -103,29 +104,7 @@ dev_wlc_ioctl( + int len + ) + { +- struct ifreq ifr; +- wl_ioctl_t ioc; +- mm_segment_t fs; +- int ret; +- +- memset(&ioc, 0, sizeof(ioc)); +- ioc.cmd = cmd; +- ioc.buf = arg; +- ioc.len = len; +- +- strcpy(ifr.ifr_name, dev->name); +- ifr.ifr_data = (caddr_t) &ioc; +- +- fs = get_fs(); +- set_fs(get_ds()); +-#if defined(WL_USE_NETDEV_OPS) +- ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#else +- ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); +-#endif +- set_fs(fs); +- +- return ret; ++ return wlc_ioctl_internal(dev, cmd, arg, len); + } + + static int +diff --git a/amd64/src/wl/sys/wl_linux.c b/amd64/src/wl/sys/wl_linux.c +index 66069d4..cc01d2b 100644 +--- a/amd64/src/wl/sys/wl_linux.c ++++ b/amd64/src/wl/sys/wl_linux.c +@@ -1661,10 +1661,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) + goto done2; + } + +- if (segment_eq(get_fs(), KERNEL_DS)) +- buf = ioc.buf; +- +- else if (ioc.buf) { ++ if (ioc.buf) { + if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) { + bcmerror = BCME_NORESOURCE; + goto done2; +@@ -1681,7 +1678,7 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) + WL_UNLOCK(wl); + + done1: +- if (ioc.buf && (ioc.buf != buf)) { ++ if (ioc.buf) { + if (copy_to_user(ioc.buf, buf, ioc.len)) + bcmerror = BCME_BADADDR; + MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN)); +@@ -1694,6 +1691,39 @@ done2: + return (OSL_ERROR(bcmerror)); + } + ++int ++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len) ++{ ++ wl_info_t *wl; ++ wl_if_t *wlif; ++ int bcmerror; ++ ++ if (!dev) ++ return -ENETDOWN; ++ ++ wl = WL_INFO(dev); ++ wlif = WL_DEV_IF(dev); ++ if (wlif == NULL || wl == NULL || wl->dev == NULL) ++ return -ENETDOWN; ++ ++ bcmerror = 0; ++ ++ WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd)); ++ ++ WL_LOCK(wl); ++ if (!capable(CAP_NET_ADMIN)) { ++ bcmerror = BCME_EPERM; ++ } else { ++ bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif); ++ } ++ WL_UNLOCK(wl); ++ ++ ASSERT(VALID_BCMERROR(bcmerror)); ++ if (bcmerror != 0) ++ wl->pub->bcmerror = bcmerror; ++ return (OSL_ERROR(bcmerror)); ++} ++ + static struct net_device_stats* + wl_get_stats(struct net_device *dev) + { +diff --git a/amd64/src/wl/sys/wl_linux.h b/amd64/src/wl/sys/wl_linux.h +index 5b1048e..c8c1f41 100644 +--- a/amd64/src/wl/sys/wl_linux.h ++++ b/amd64/src/wl/sys/wl_linux.h +@@ -22,6 +22,7 @@ + #define _wl_linux_h_ + + #include <wlc_types.h> ++#include <wlc_pub.h> + + typedef struct wl_timer { + struct timer_list timer; +@@ -187,6 +188,7 @@ extern irqreturn_t wl_isr(int irq, void *dev_id, struct pt_regs *ptregs); + extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); + extern void wl_free(wl_info_t *wl); + extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); ++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len); + extern struct net_device * wl_netdev_get(wl_info_t *wl); + + #endif +diff --git a/amd64/src/wl/sys/wlc_pub.h b/amd64/src/wl/sys/wlc_pub.h +index 53a98b8..2b5a029 100644 +--- a/amd64/src/wl/sys/wlc_pub.h ++++ b/amd64/src/wl/sys/wlc_pub.h +@@ -24,6 +24,7 @@ + + #include <wlc_types.h> + #include <wlc_utils.h> ++#include <siutils.h> + #include "proto/802.11.h" + #include "proto/bcmevent.h" + diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild index e9eb39918c..15da628506 100644 --- a/network/bwm-ng/bwm-ng.SlackBuild +++ b/network/bwm-ng/bwm-ng.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for bwm-ng # Copyright 2010 Binh Nguyen <binhvng@gmail.com> -# Copyright 2014-2019 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 @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=bwm-ng -VERSION=${VERSION:-0.6.2} +VERSION=${VERSION:-0.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/bwm-ng/bwm-ng.info b/network/bwm-ng/bwm-ng.info index 404db9af38..358c1d48da 100644 --- a/network/bwm-ng/bwm-ng.info +++ b/network/bwm-ng/bwm-ng.info @@ -1,8 +1,8 @@ PRGNAM="bwm-ng" -VERSION="0.6.2" +VERSION="0.6.3" HOMEPAGE="https://github.com/vgropp/bwm-ng" -DOWNLOAD="https://github.com/vgropp/bwm-ng/archive/v0.6.2/bwm-ng-0.6.2.tar.gz" -MD5SUM="1973976d7c8e8eea6f0545576a9159e8" +DOWNLOAD="https://github.com/vgropp/bwm-ng/archive/v0.6.3/bwm-ng-0.6.3.tar.gz" +MD5SUM="eb343c2b806c5e9a40611fc39e907a3d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/c-toxcore/c-toxcore.SlackBuild b/network/c-toxcore/c-toxcore.SlackBuild index 566512987b..4a4e742069 100644 --- a/network/c-toxcore/c-toxcore.SlackBuild +++ b/network/c-toxcore/c-toxcore.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for c-toxcore -# Copyright 2015, 2016, 2017, 2018, 2019 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=c-toxcore -VERSION=${VERSION:-0.2.10} +VERSION=${VERSION:-0.2.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/c-toxcore/c-toxcore.info b/network/c-toxcore/c-toxcore.info index 9e0d8a9027..6344310375 100644 --- a/network/c-toxcore/c-toxcore.info +++ b/network/c-toxcore/c-toxcore.info @@ -1,8 +1,8 @@ PRGNAM="c-toxcore" -VERSION="0.2.10" +VERSION="0.2.12" HOMEPAGE="https://github.com/TokTok/c-toxcore" -DOWNLOAD="https://github.com/TokTok/c-toxcore/archive/v0.2.10/c-toxcore-0.2.10.tar.gz" -MD5SUM="862307b485238f0a33b9dd0b92e6a68c" +DOWNLOAD="https://github.com/TokTok/c-toxcore/archive/v0.2.12/c-toxcore-0.2.12.tar.gz" +MD5SUM="16033d63c6520cd023acddaabe84fb95" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% libsodium opus" diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info index ea23a977c6..a3526ecc64 100644 --- a/network/cherokee/cherokee.info +++ b/network/cherokee/cherokee.info @@ -6,5 +6,5 @@ MD5SUM="845ed7bdb3b038d277607a47288aaec1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Pablo Hernan Saro" -EMAIL="pablosaro@gmail.com" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/chrony/chrony.SlackBuild b/network/chrony/chrony.SlackBuild index 92e3c05de3..9c31e913e2 100644 --- a/network/chrony/chrony.SlackBuild +++ b/network/chrony/chrony.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=chrony -VERSION=${VERSION:-3.4} +VERSION=${VERSION:-3.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -96,7 +96,7 @@ make install DESTDIR=$PKG chown ${NTP_USER}:${NTP_GROUP} $PKG/var/lib/chrony install -D -m 0644 $CWD/chrony.conf $PKG/etc/chrony.conf.new install -D -m 0644 $CWD/rc.chrony $PKG/etc/rc.d/rc.chrony.new -sed -i "s%@NTP_USER@%${NTP_USER}%g" $PKG/etc/rc.d/rc.chrony.new +sed -i "s%^NTP_USER=@NTP_USER@%NTP_USER=${NTP_USER}%g" $PKG/etc/rc.d/rc.chrony.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 diff --git a/network/chrony/chrony.info b/network/chrony/chrony.info index 19b3264d15..fe031f7529 100644 --- a/network/chrony/chrony.info +++ b/network/chrony/chrony.info @@ -1,8 +1,8 @@ PRGNAM="chrony" -VERSION="3.4" +VERSION="3.5" HOMEPAGE="https://chrony.tuxfamily.org/" -DOWNLOAD="https://download.tuxfamily.org/chrony/chrony-3.4.tar.gz" -MD5SUM="7170e750469c198fc6784047d6f71144" +DOWNLOAD="https://download.tuxfamily.org/chrony/chrony-3.5.tar.gz" +MD5SUM="5f66338bc940a9b51eede8f391e7bed3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/chrony/rc.chrony b/network/chrony/rc.chrony index fc74d34ae2..fdff2facbd 100644 --- a/network/chrony/rc.chrony +++ b/network/chrony/rc.chrony @@ -1,13 +1,18 @@ #!/bin/sh +NTP_USER=@NTP_USER@ + +# place local customizations in /etc/default/chrony +[ -r /etc/default/chrony ] && . /etc/default/chrony + ################################################################################ chronyd_start() { ################################################################################ if [ -n "$(pidof chronyd)" ]; then echo "chronyd seems to be already running." else - echo "Starting chronyd: /usr/sbin/chronyd -u @NTP_USER@" - /usr/sbin/chronyd -u @NTP_USER@ + echo "Starting chronyd: /usr/sbin/chronyd -u $NTP_USER $CHRONYD_ARGS" + /usr/sbin/chronyd -u $NTP_USER $CHRONYD_ARGS fi } diff --git a/network/cicb/cicb.info b/network/cicb/cicb.info index cfcb0af283..53edd89248 100644 --- a/network/cicb/cicb.info +++ b/network/cicb/cicb.info @@ -1,7 +1,7 @@ PRGNAM="cicb" VERSION="5.2.0b1+git20170501" HOMEPAGE="https://github.com/hoche/cicb/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cicb-5.2.0b1+git20170501.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/cicb-5.2.0b1+git20170501.tar.xz" MD5SUM="ff3afbdad3f6744a154965b26c75db2e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/cicb/git2targz.sh b/network/cicb/git2targz.sh index c8cd99f76b..de4eaab723 100644 --- a/network/cicb/git2targz.sh +++ b/network/cicb/git2targz.sh @@ -46,7 +46,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz Update $PRGNAM.info with: VERSION="$VERSION" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz" MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )" Don't forget to upload the new source! diff --git a/network/ckermit/README b/network/ckermit/README index 67eadee43e..ceca6cc69a 100644 --- a/network/ckermit/README +++ b/network/ckermit/README @@ -19,9 +19,10 @@ C-Kermit includes: * Built-in scriptable FTP and HTTP clients plus an SSH interface * Configurability as an SSH Subsystem * Character-set translation in both file transfer and online sessions, - for Western- and Eastern-European languages, Cyrillic, Greek, Hebrew, - and Japanese, now including Unicode. + for Western- and Eastern-European languages, Cyrillic, Greek, + Hebrew, and Japanese, now including Unicode. * Ability to send numeric and alphanumeric pages. -This SlackBuild installs a default initialization file in the documentation -directory. However, an initialization file is rarely required with ckermit. +This SlackBuild installs a default initialization file in the +documentation directory. However, an initialization file is rarely +required with ckermit. diff --git a/network/ckermit/ckermit.SlackBuild b/network/ckermit/ckermit.SlackBuild index 8916e7d3fc..d62609d874 100644 --- a/network/ckermit/ckermit.SlackBuild +++ b/network/ckermit/ckermit.SlackBuild @@ -5,7 +5,7 @@ # Written by Andrew Rowland (darowland@ieee.org) PRGNAM=ckermit -VERSION=${VERSION:-9.0.302} +VERSION=${VERSION:-9.0.304.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,7 +43,14 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION -tar xvf $CWD/cku302.tar.gz -C $PRGNAM-$VERSION +FILE=$(sed -En '/^9\.0\.([0-9]+)\.([0-9]+)$/s//cku\1-dev\2.tar.gz/p'<<<$VERSION) +if [ -z "$FILE" ]; then + FILE=$(sed -En '/^9\.0\.([0-9]+)$/s//cku\1.tar.gz/p'<<<$VERSION) + if [ -z "$FILE" ]; then + FILE=x.tar.gz + fi +fi +tar xvf $CWD/$FILE -C $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -55,7 +62,7 @@ find -L . \ # Force the makefile to accept our custom cflags patch -p1 < $CWD/makefile-use-custom-cflags.diff -make linux OPT="$SLKCFLAGS" +make linux OPT="$SLKCFLAGS -D_IO_file_flags" mkdir -p $PKG/usr/bin cp -a wermit $PKG/usr/bin/kermit @@ -67,7 +74,8 @@ cp ckuker.nr $PKG/usr/man/man1/kermit.1 gzip -9 $PKG/usr/man/man1/kermit.1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING.TXT ockermit.ini *.txt $PKG/usr/doc/$PRGNAM-$VERSION +shopt -s nullglob +cp -a COPYING.TXT *.ini *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/ckermit.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/ckermit.SlackBuild mkdir -p $PKG/install diff --git a/network/ckermit/ckermit.info b/network/ckermit/ckermit.info index b4d7fe1de2..da4529215d 100644 --- a/network/ckermit/ckermit.info +++ b/network/ckermit/ckermit.info @@ -1,8 +1,8 @@ PRGNAM="ckermit" -VERSION="9.0.302" +VERSION="9.0.304.23" HOMEPAGE="http://www.kermitproject.org/ck90.html" -DOWNLOAD="ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz" -MD5SUM="eac4dbf18b45775e4cdee5a7c74762b0" +DOWNLOAD="ftp://ftp.kermitproject.org/kermit/test/tar/cku304-dev23.tar.gz" +MD5SUM="fd42607a8875409141bce3318f16ca4e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/clipgrab/clipgrab.SlackBuild b/network/clipgrab/clipgrab.SlackBuild index cb1fe284eb..3d54fe488f 100644 --- a/network/clipgrab/clipgrab.SlackBuild +++ b/network/clipgrab/clipgrab.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for clipgrab. # -# Copyright 2015-2019 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=clipgrab -VERSION=${VERSION:-3.8.5} +VERSION=${VERSION:-3.8.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/clipgrab/clipgrab.info b/network/clipgrab/clipgrab.info index 52659f49c5..072bf52c8a 100644 --- a/network/clipgrab/clipgrab.info +++ b/network/clipgrab/clipgrab.info @@ -1,10 +1,10 @@ PRGNAM="clipgrab" -VERSION="3.8.5" +VERSION="3.8.10" HOMEPAGE="http://clipgrab.org/" -DOWNLOAD="https://download.clipgrab.org/clipgrab-3.8.5.tar.gz" -MD5SUM="ec17f4041965cf5cab5d3f226e4df7a1" +DOWNLOAD="https://download.clipgrab.org/clipgrab-3.8.10.tar.gz" +MD5SUM="9b992e77d14fa22b079d3f64f4cf3451" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5 ffmpeg opus" +REQUIRES="pcre2 opus qt5 ffmpeg" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/network/cni-plugins/README b/network/cni-plugins/README index c87a41ecea..6d58b57dc6 100644 --- a/network/cni-plugins/README +++ b/network/cni-plugins/README @@ -1,6 +1,7 @@ CNI plugins -Some CNI network plugins, maintained by the containernetworking team. For more information, see the individual READMEs. +Some CNI network plugins, maintained by the containernetworking team. For +more information, see the individual READMEs. Read CONTRIBUTING for build and test instructions. Plugins supplied: @@ -9,7 +10,8 @@ Main: interface-creating bridge: Creates a bridge, adds the host and the container to it. ipvlan: Adds an ipvlan interface in the container. loopback: Set the state of loopback interface to up. - macvlan: Creates a new MAC address, forwards all traffic to that to the container. + macvlan: Creates a new MAC address, forwards all traffic to that to + the container. ptp: Creates a veth pair. vlan: Allocates a vlan device. host-device: Move an already-existing device into a container. @@ -21,18 +23,24 @@ Windows: windows specific IPAM: IP address allocation - dhcp: Runs a daemon on the host to make DHCP requests on behalf of the container + dhcp: Runs a daemon on the host to make DHCP requests on behalf of + the container host-local: Maintains a local database of allocated IPs - static: Allocate a static IPv4/IPv6 addresses to container and it's useful in debugging purpose. + static: Allocate a static IPv4/IPv6 addresses to container and it's + useful in debugging purpose. Meta: other plugins flannel: Generates an interface corresponding to a flannel config file tuning: Tweaks sysctl parameters of an existing interface - portmap: An iptables-based portmapping plugin. Maps ports from the host's address space to the container. - bandwidth: Allows bandwidth-limiting through use of traffic control tbf (ingress/egress). - sbr: A plugin that configures source based routing for an interface (from which it is chained). - firewall: A firewall plugin which uses iptables or firewalld to add rules to allow traffic to/from the container. + portmap: An iptables-based portmapping plugin. Maps ports from the + host's address space to the container. + bandwidth: Allows bandwidth-limiting through use of traffic control + tbf (ingress/egress). + sbr: A plugin that configures source based routing for an interface + (from which it is chained). + firewall: A firewall plugin which uses iptables or firewalld to add + rules to allow traffic to/from the container. Sample diff --git a/network/cni-plugins/slack-desc b/network/cni-plugins/slack-desc index 6a7714819c..ead6b93729 100644 --- a/network/cni-plugins/slack-desc +++ b/network/cni-plugins/slack-desc @@ -16,3 +16,4 @@ cni-plugins: cni-plugins: cni-plugins: cni-plugins: +cni-plugins: diff --git a/network/connman/connman.info b/network/connman/connman.info index ae7d3d5b18..035424a3b3 100644 --- a/network/connman/connman.info +++ b/network/connman/connman.info @@ -6,5 +6,5 @@ MD5SUM="d0c3071c1d8dec9cd17b760f862de2ad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Jason Graham" -EMAIL="jgraha8@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="<nobody@nowhere>" diff --git a/network/coturn/README b/network/coturn/README new file mode 100644 index 0000000000..b9e0253193 --- /dev/null +++ b/network/coturn/README @@ -0,0 +1,16 @@ +coturn (Free open source implementation of TURN and STUN Server) + +The TURN Server is a VoIP media traffic NAT traversal server +and gateway. It can be used as a general-purpose network +traffic TURN server and gateway, too. + +You need the 'turnserver' group and user to run this script, +for example: + + groupadd -g 366 turnserver + useradd -u 366 -g turnserver -d /var/lib/turn -s /bin/bash turnserver + +If you wish another group and username, you can set TURN_GROUP and +TURN_USER, for example: + + TURN_GROUP=mygroup TURN_USER=myuser ./coturn.SlackBuild diff --git a/network/qbittorrent-qt5/] b/network/coturn/coturn.SlackBuild index 7bd5a15890..5998ee5fc2 100644 --- a/network/qbittorrent-qt5/] +++ b/network/coturn/coturn.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for qbittorrent-qt5 +# Slackware build script for coturn -# Copyright 2009-2010 David Woodfall <dave@dawoodfall.net> +# Copyright 2020 Thomas Bourdon <thomas dot bourdon at halpanet dot org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +22,29 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=qbittorrent-qt5 -SRCNAM=qBittorrent -VERSION=${VERSION:-4.1.4} +# Special thanks to Thomas Morper for some configuration adjustments tips +# Modified by slackbuilds.org 2020-04-17 16:08:20 +0100 + +PRGNAM=coturn +VERSION=${VERSION:-4.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +TURN_USER=${TURN_USER:-turnserver} +TURN_GROUP=${TURN_GROUP:-turnserver} + +if ! grep -q ^$TURN_GROUP: /etc/group 2>/dev/null ; then + echo " Error: TURN group ($TURN_GROUP) doesn't exist." + echo " Try creating one with: groupadd -g 366 $TURN_GROUP" + exit 1 +fi + +if ! grep -q ^$TURN_USER: /etc/passwd 2>/dev/null ; then + echo " Error: TURN user ($TURN_USER) doesn't exist." + echo " Try creating one with: useradd -u 366 -g $TURN_GROUP -d /var/lib/turn -s /bin/bash $TURN_USER" + exit 1 +fi + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -42,17 +59,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="" + LIBDIRSUFFIX="" fi set -e @@ -60,9 +77,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-release-$VERSION -tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z* -cd $SRCNAM-release-$VERSION +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 \ @@ -70,8 +87,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 --verbose <$CWD/desktop-fix.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -79,45 +94,46 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux + --examplesdir=/usr/share/turnserver/examples \ + --disable-rpath \ + --build=$ARCH-slackware-linux || exit 1 make -make install INSTALL_ROOT=$PKG -make clean +make install DESTDIR=$PKG -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-gui \ - --build=$ARCH-slackware-linux +sed 's%/usr/local%/usr/share/turnserver/examples%' $PKG/etc/turnserver.conf.default > $PKG/etc/turnserver.conf.new +rm -f $PKG/etc/turnserver.conf.default -make -mv src/qbittorrent-nox $PKG/usr/bin +mkdir -p $PKG/etc/{rc.d,logrotate.d} +cat $CWD/rc.turnserver > $PKG/etc/rc.d/rc.turnserver.new +cat $CWD/logrotate.turnserver > $PKG/etc/logrotate.d/turnserver.new + +mkdir -p $PKG/var/log/turnserver +chown $TURN_USER:$TURN_GROUP $PKG/var/log/turnserver + +# Populating /etc/default/turnserver.new +mkdir -p $PKG/etc/default +cat << EOF > $PKG/etc/default/turnserver.new +TURN_USER=$TURN_USER +TURN_GROUP=$TURN_GROUP +TURN_PID_PATH=/var/run/turnserver +EOF + +rm -rf $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 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/rc.d -cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \ - $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog LICENSE* README* \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/{usr/doc,usr/share,usr/include,etc,var} -type f -exec chmod -x {} + + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/network/coturn/coturn.info b/network/coturn/coturn.info new file mode 100644 index 0000000000..28ecb38663 --- /dev/null +++ b/network/coturn/coturn.info @@ -0,0 +1,10 @@ +PRGNAM="coturn" +VERSION="4.5.2" +HOMEPAGE="https://github.com/coturn/coturn" +DOWNLOAD="https://github.com/coturn/coturn/archive/4.5.2/coturn-4.5.2.tar.gz" +MD5SUM="e58d9e14e0607f763945ff98585cb218" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Thomas Bourdon" +EMAIL="thomas dot bourdon at halpanet dot org" diff --git a/network/coturn/doinst.sh b/network/coturn/doinst.sh new file mode 100644 index 0000000000..e6ac736181 --- /dev/null +++ b/network/coturn/doinst.sh @@ -0,0 +1,28 @@ +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.turnserver.new +config etc/turnserver.conf.new +config etc/logrotate.d/turnserver.new +config etc/default/turnserver.new diff --git a/network/coturn/logrotate.turnserver b/network/coturn/logrotate.turnserver new file mode 100644 index 0000000000..063f3c86e1 --- /dev/null +++ b/network/coturn/logrotate.turnserver @@ -0,0 +1,11 @@ +/var/log/turn/turn*.log { + su turnserver turnserver + daily + rotate 7 + create 0644 turnserver turnserver + copytruncate + delaycompress + compress + notifempty + missingok +} diff --git a/network/coturn/rc.turnserver b/network/coturn/rc.turnserver new file mode 100644 index 0000000000..8e34917c60 --- /dev/null +++ b/network/coturn/rc.turnserver @@ -0,0 +1,43 @@ +#! /bin/sh + +CONFIG="/etc/turnserver.conf" +. /etc/default/turnserver + +coturn_start() { + if [ ! -d $TURN_PID_PATH ]; then + mkdir -p $TURN_PID_PATH + chown $TURN_USER:$TURN_GROUP $TURN_PID_PATH + fi + if [ -x /usr/bin/turnserver ]; then + echo "Starting turnserver daemon: /usr/bin/turnserver" + su -l -c "/usr/bin/turnserver -o -c $CONFIG --pidfile $TURN_PID_PATH/turnserver.pid" $TURN_USER + fi +} + +coturn_stop() { + echo "Stopping turnserver daemon: /usr/bin/turnserver" + kill $(cat $TURN_PID_PATH/turnserver.pid) + rm -f $TURN_PID_PATH/turnserver.pid +} + +coturn_restart() { + coturn_stop + sleep 1 + coturn_start +} + +case "$1" in +'start') + coturn_start + ;; +'stop') + coturn_stop + ;; +'restart') + coturn_restart + ;; +*) + echo "usage $0 start|stop|restart" +esac + +exit 0 diff --git a/network/RSSOwl/slack-desc b/network/coturn/slack-desc index ce1ed4d3db..6e4fe0b298 100644 --- a/network/RSSOwl/slack-desc +++ b/network/coturn/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -RSSOwl: RSSOwl (eclipse based RSS, Atom, and News reader) -RSSOwl: -RSSOwl: RSSOwl lets you gather, organize, update, and store information -RSSOwl: from any compliant source in a convenient, easy to use interface, -RSSOwl: save selected information in various formats for offline viewing -RSSOwl: and sharing, and much more. RSSOwl is open source, -RSSOwl: licensed under the terms of the Eclipse Public License. -RSSOwl: -RSSOwl: Homepage: http://www.rssowl.org/ -RSSOwl: -RSSOwl: +coturn: coturn (Free open source implementation of TURN and STUN Server) +coturn: +coturn: The TURN Server is a VoIP media traffic NAT traversal server and +coturn: gateway. It can be used as a general-purpose network traffic TURN +coturn: server and gateway, too. +coturn: +coturn: Homepage: https://github.com/coturn/coturn +coturn: +coturn: +coturn: +coturn: diff --git a/network/courier-unicode/courier-unicode.SlackBuild b/network/courier-unicode/courier-unicode.SlackBuild index 4137328358..f4bcf685f8 100644 --- a/network/courier-unicode/courier-unicode.SlackBuild +++ b/network/courier-unicode/courier-unicode.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for courier unicode # # Copyright 2015 - 2019 Derek Noonburg (derekn@foolabs.com) -# Copyright 2019 Andrew Strong, Blue Mountains, Australia. +# Copyright 2019 - 2021 Andrew Strong, Blue Mountains, Australia. # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -25,13 +25,13 @@ # ---------------------------------------------------------------------- PRGNAM=courier-unicode -VERSION=${VERSION:-2.1} +VERSION=${VERSION:-2.1.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 @@ -42,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" @@ -79,11 +79,15 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --disable-static \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -91,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 -a INSTALL COPYING AUTHORS README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/courier-unicode/courier-unicode.info b/network/courier-unicode/courier-unicode.info index 1840918e89..79b4f414de 100644 --- a/network/courier-unicode/courier-unicode.info +++ b/network/courier-unicode/courier-unicode.info @@ -1,8 +1,8 @@ PRGNAM="courier-unicode" -VERSION="2.1" +VERSION="2.1.2" HOMEPAGE="http://www.courier-mta.org/unicode/" -DOWNLOAD="https://download.sourceforge.net/courier/courier-unicode-2.1.tar.bz2" -MD5SUM="e2b4e8f16c51b2bc03ab16a5ff49832b" +DOWNLOAD="https://download.sourceforge.net/courier/courier-unicode-2.1.2.tar.bz2" +MD5SUM="f35eb33593aa81a8a15c7d40cf5fb9b5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/createrepo_c/README b/network/createrepo_c/README deleted file mode 100644 index b344f6e8f7..0000000000 --- a/network/createrepo_c/README +++ /dev/null @@ -1,9 +0,0 @@ -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. diff --git a/network/createrepo_c/createrepo_c.info b/network/createrepo_c/createrepo_c.info deleted file mode 100644 index 1b2b95bbbd..0000000000 --- a/network/createrepo_c/createrepo_c.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="createrepo_c" -VERSION="0.14.2" -HOMEPAGE="https://github.com/rpm-software-management/createrepo_c" -DOWNLOAD="https://github.com/rpm-software-management/createrepo_c/archive/0.14.2/createrepo_c-0.14.2.tar.gz" -MD5SUM="395d685e079cc2c52b19f6a2d461204a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Sergei Fedosoff" -EMAIL="eleksir@gmail.com" diff --git a/network/ctorrent/ctorrent.SlackBuild b/network/ctorrent/ctorrent.SlackBuild index 42ef7c1fac..9b1ece677d 100644 --- a/network/ctorrent/ctorrent.SlackBuild +++ b/network/ctorrent/ctorrent.SlackBuild @@ -86,9 +86,9 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$PKGVERSION || true -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -97,4 +97,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/ctorrent/ctorrent.info b/network/ctorrent/ctorrent.info index 473491d78e..e5ad101607 100644 --- a/network/ctorrent/ctorrent.info +++ b/network/ctorrent/ctorrent.info @@ -1,5 +1,5 @@ PRGNAM="ctorrent" -VERSION="dnh3.3.2" +VERSION="3.3.2" HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/" DOWNLOAD="http://downloads.sourceforge.net/dtorrent/3.3.2/ctorrent-dnh3.3.2.tar.gz" MD5SUM="59b23dd05ff70791cd6449effa7fc3b6" diff --git a/network/cyrus-imapd/README b/network/cyrus-imapd/README index fbb307120b..e3eb218a72 100644 --- a/network/cyrus-imapd/README +++ b/network/cyrus-imapd/README @@ -1,15 +1,16 @@ -The Cyrus IMAP (Internet Message Access Protocol) server provides access to -personal mail and system-wide bulletin boards through the IMAP protocol. -The Cyrus IMAP server is a scalable enterprise mail system designed for use -from small to large enterprise environments using standards-based -technologies. - -A full Cyrus IMAP implementation allows a seamless mail and bulletin board -environment to be set up across multiple servers. It differs from other IMAP -server implementations in that it is run on "sealed" servers, where users -are not normally permitted to log in. The mailbox database is stored in parts -of the filesystem that are private to the Cyrus IMAP system. All user access -to mail is through software using the IMAP, POP3, or KPOP protocols. +The Cyrus IMAP (Internet Message Access Protocol) server provides access +to personal mail and system-wide bulletin boards through the IMAP +protocol. The Cyrus IMAP server is a scalable enterprise mail system +designed for use from small to large enterprise environments using +standards-based technologies. + +A full Cyrus IMAP implementation allows a seamless mail and bulletin +board environment to be set up across multiple servers. It differs from +other IMAP server implementations in that it is run on "sealed" servers, +where users are not normally permitted to log in. The mailbox database +is stored in parts of the filesystem that are private to the Cyrus IMAP +system. All user access to mail is through software using the IMAP, +POP3, or KPOP protocols. The private mailbox database design gives the server large advantages in efficiency, scalability, and administratability. Multiple concurrent @@ -18,15 +19,16 @@ supports access control lists on mailboxes and storage quotas on mailbox hierarchies. Cyrus is a highly scalable enterprise mail system designed for use in -enterprise environments of various sizes using standards based technologies. -Cyrus technologies scale from independent use in email departments to a system -centrally managed in a large enterprise. +enterprise environments of various sizes using standards based +technologies. Cyrus technologies scale from independent use in email +departments to a system centrally managed in a large enterprise. For more information on how to install and run cyrus-imapd, see -README.SLACKWARE that came with this package (which is also installed +README.SLACKWARE that came with this package (which is also installed with the documentation). -Patches for autocreate and autosieve are no longer needed so they were removed. +Patches for autocreate and autosieve are no longer needed so they were +removed. Make sure to read the Upgrading to Cyrus IMAP 2.5.0 notes: https://cyrusimap.org/imap/release-notes/2.5/x/2.5.0.html @@ -36,4 +38,3 @@ Something like this will create them: # groupadd -g 238 cyrus # useradd -d /var/imap -s /bin/sh -u 238 -g 238 cyrus See http://slackbuilds.org/uid_gid.txt for uid/gid suggestions. - diff --git a/network/cyrus-imapd/cyrus-imapd.SlackBuild b/network/cyrus-imapd/cyrus-imapd.SlackBuild index 48e2c54e55..7a8a13e7ba 100644 --- a/network/cyrus-imapd/cyrus-imapd.SlackBuild +++ b/network/cyrus-imapd/cyrus-imapd.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cyrus-imapd -VERSION=${VERSION:-2.5.11} +VERSION=${VERSION:-3.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 @@ -40,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" @@ -124,7 +124,8 @@ rm -rf $PKG/usr/share install -D -m0755 -oroot -groot $CWD/rc.cyrus-imapd $PKG/etc/rc.d/rc.cyrus-imapd.new # Install sample configuration -install -D -m0640 -ocyrus -gcyrus master/conf/normal.conf $PKG/etc/cyrus.conf.new +install -D -m0640 -ocyrus -gcyrus doc/examples/cyrus_conf/normal.conf \ + $PKG/etc/cyrus.conf.new install -D -m0640 -ocyrus -gcyrus $CWD/imapd.conf $PKG/etc/imapd.conf.new find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ @@ -139,7 +140,9 @@ find $PKG -name perllocal.pod \ | xargs rm -f mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README doc/* master/conf tools/ $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING README.md doc/* tools/ \ + $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 diff --git a/network/cyrus-imapd/cyrus-imapd.info b/network/cyrus-imapd/cyrus-imapd.info index 99b2c68075..1443c6b041 100644 --- a/network/cyrus-imapd/cyrus-imapd.info +++ b/network/cyrus-imapd/cyrus-imapd.info @@ -1,10 +1,10 @@ PRGNAM="cyrus-imapd" -VERSION="2.5.11" +VERSION="3.2.4" HOMEPAGE="https://www.cyrusimap.org/" -DOWNLOAD="ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.5.11.tar.gz" -MD5SUM="674083444c36a786d9431b6612969224" +DOWNLOAD="https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.2.4/cyrus-imapd-3.2.4.tar.gz" +MD5SUM="e4a745ce615d6712e1b65bb13903807f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="jansson" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/network/darkhttpd/darkhttpd.SlackBuild b/network/darkhttpd/darkhttpd.SlackBuild index dd8716e14f..5e62b79500 100644 --- a/network/darkhttpd/darkhttpd.SlackBuild +++ b/network/darkhttpd/darkhttpd.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=darkhttpd -VERSION=${VERSION:-1.12} +VERSION=${VERSION:-1.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -80,7 +80,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Install license (from Arch Linux' PKGBUILD) diff --git a/network/darkhttpd/darkhttpd.info b/network/darkhttpd/darkhttpd.info index 40bb58a94f..bd984ea34c 100644 --- a/network/darkhttpd/darkhttpd.info +++ b/network/darkhttpd/darkhttpd.info @@ -1,8 +1,8 @@ PRGNAM="darkhttpd" -VERSION="1.12" +VERSION="1.13" HOMEPAGE="https://unix4lyfe.org/darkhttpd/" -DOWNLOAD="https://unix4lyfe.org/darkhttpd/darkhttpd-1.12.tar.bz2" -MD5SUM="d0d483a92f7af8f1c667d9e23e754280" +DOWNLOAD="https://github.com/emikulic/darkhttpd/archive/v1.13/darkhttpd-1.13.tar.gz" +MD5SUM="365fea0d3eac7d51094dfed746ed8ed8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/davmail/davmail.SlackBuild b/network/davmail/davmail.SlackBuild index 8166e5c38d..1d4deb3c53 100644 --- a/network/davmail/davmail.SlackBuild +++ b/network/davmail/davmail.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for DavMail -# Copyright (c) 2015-2018 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> +# Copyright (c) 2015-2022 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ # Updated by Alfredo Tomasini <alto.tom@gmail.com> to support .zip releases PRGNAM=davmail -VERSION=${VERSION:-4.9.0} +VERSION=${VERSION:-5.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ARCH=noarch diff --git a/network/davmail/davmail.info b/network/davmail/davmail.info index 5961fd4929..e21dc8593a 100644 --- a/network/davmail/davmail.info +++ b/network/davmail/davmail.info @@ -1,8 +1,8 @@ PRGNAM="davmail" -VERSION="4.9.0" +VERSION="5.5.1" HOMEPAGE="http://davmail.sourceforge.net" -DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/4.9.0/davmail-4.9.0-2652.zip" -MD5SUM="0d907e0dac83cfe834d2260f6624a2f2" +DOWNLOAD="https://sourceforge.net/projects/davmail/files/davmail/5.5.1/davmail-5.5.1-3299.zip" +MD5SUM="ae194c3571e107081164913a001d6f27" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/network/davmail/davmail.sh b/network/davmail/davmail.sh index 117fb8188a..4a2f245f6f 100644 --- a/network/davmail/davmail.sh +++ b/network/davmail/davmail.sh @@ -1,4 +1,15 @@ #!/bin/sh + BASE=/usr/share/davmail -for i in $BASE/lib/*; do export CLASSPATH=$CLASSPATH:$i; done -exec java -Xmx512M -Dsun.net.inetaddr.ttl=60 -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1 + +if [ -n "$JAVA_HOME" ]; then + JAVA_CMD="$JAVA_HOME/bin/java" +else + JAVA_CMD="$(which java)" +fi + +for i in $BASE/lib/*; do + export CLASSPATH=$CLASSPATH:$i; +done + +exec $JAVA_CMD -Xmx512M -Dsun.net.inetaddr.ttl=60 -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1 diff --git a/network/ddclient/README b/network/ddclient/README index d99ecf45b5..192fbed378 100644 --- a/network/ddclient/README +++ b/network/ddclient/README @@ -1,9 +1,15 @@ DDclient is a small but full featured Perl client used to update dynamic -DNS entries for accounts on Dynamic DNS Network Services free DNS service. -It has the capability to update more than only dyndns and it can fetch your -WAN-ipaddress in a few different ways. +DNS entries for accounts on Dynamic DNS Network Services free DNS +service. It has the capability to update more than only dyndns and it +can fetch your WAN-ipaddress in a few different ways. Supported features include: operating as a daemon, manual and automatic updates, static and dynamic updates, optimized updates for multiple addresses, MX, wildcards, abuse avoidance, retrying failed updates, and sending update status to syslog and through e-mail. + +Optional dependencies: + perl-IO-Socket-SSL perl library for ssl-support (recommended) + perl-JSON-PP perl library for JSON support + perl-IO-Socket-INET6 perl library for ipv6-support + diff --git a/network/ddclient/ddclient.SlackBuild b/network/ddclient/ddclient.SlackBuild index 101e66205d..ac6d3a1692 100644 --- a/network/ddclient/ddclient.SlackBuild +++ b/network/ddclient/ddclient.SlackBuild @@ -26,8 +26,8 @@ # Revision date 2011/08/14 PRGNAM=ddclient -VERSION=${VERSION:-3.8.3} -BUILD=${BUILD:-1} +VERSION=${VERSION:-3.9.1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} ARCH=noarch # it's only a perl script @@ -43,7 +43,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 . \ diff --git a/network/ddclient/ddclient.info b/network/ddclient/ddclient.info index 765f8a7588..81bf76dec3 100644 --- a/network/ddclient/ddclient.info +++ b/network/ddclient/ddclient.info @@ -1,10 +1,10 @@ PRGNAM="ddclient" -VERSION="3.8.3" -HOMEPAGE="http://ddclient.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/ddclient/ddclient-3.8.3.tar.bz2" -MD5SUM="3b426ae52d509e463b42eeb08fb89e0b" +VERSION="3.9.1" +HOMEPAGE="https://github.com/ddclient/ddclient/" +DOWNLOAD="https://github.com/ddclient/ddclient/archive/v3.9.1/ddclient-3.9.1.tar.gz" +MD5SUM="8497033052649ebe6f714338c7be4cda" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-IO-Socket-SSL" +REQUIRES="perl-IO-Socket-SSL perl-Data-Validate-IP" MAINTAINER="Richard Narron" EMAIL="richard@aaazen.com" diff --git a/network/ddclient/rc.ddclient b/network/ddclient/rc.ddclient index cb88a8dd26..daac891d53 100644 --- a/network/ddclient/rc.ddclient +++ b/network/ddclient/rc.ddclient @@ -10,26 +10,28 @@ case "$1" in start) echo -n "Starting ddclient: " +# ddclient -verbose ddclient echo ;; stop) echo -n "Shutting down ddclient: " #kill $( ps -aef | grep ddclient | grep sleeping | awk '{print$2}' ) - kill -9 $( cat /var/run/ddclient.pid ) + pkill ddclient echo ;; restart) - $0 stop - $0 start + sh $0 stop + sh $0 start ;; status) - pids=$( ps -aef | grep ddclient | grep sleeping | awk '{print$2}' ) + pids=$(pgrep ddclient) if test "$pids" then for p in $pids do echo "ddclient (pid $p) is running." + ps up $p done else echo "ddclient is stopped." diff --git a/network/deluge/deluge.SlackBuild b/network/deluge/deluge.SlackBuild index 6417289318..23b2f1a6a3 100644 --- a/network/deluge/deluge.SlackBuild +++ b/network/deluge/deluge.SlackBuild @@ -3,6 +3,8 @@ # Slackware build script for deluge. # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it> +# Copyright 2019 Logan Rathbone <poprocks@gmail.com> +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +23,11 @@ # 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=deluge -VERSION=${VERSION:-1.3.15} -BUILD=${BUILD:-1} +VERSION=${VERSION:-2.0.3} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -40,7 +43,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="LICENSE ChangeLog* README" +DOCS="AUTHORS LICENSE CHANGELOG.md README.md" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -58,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.xz cd $PRGNAM-$VERSION chown -R root:root . diff --git a/network/deluge/deluge.info b/network/deluge/deluge.info index 05c7ae9933..0263717aa8 100644 --- a/network/deluge/deluge.info +++ b/network/deluge/deluge.info @@ -1,10 +1,10 @@ PRGNAM="deluge" -VERSION="1.3.15" +VERSION="2.0.3" HOMEPAGE="https://www.deluge-torrent.org/" -DOWNLOAD="http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2" -MD5SUM="96cdc53cd184df0052e8394d087e2723" +DOWNLOAD="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-2.0.3.tar.xz" +MD5SUM="fbe784ebed006cd93c9a50f7c0530051" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="Mako libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg" -MAINTAINER="Gerardo Zamduio" -EMAIL="gerardo.zamudio@linux.com" +REQUIRES="Mako MarkupSafe libtorrent-rasterbar pyOpenSSL python-chardet python-twisted pyxdg rencode service_identity setproctitle wheel" +MAINTAINER="Logan Rathbone" +EMAIL="poprocks@gmail.com" diff --git a/network/discord/discord.SlackBuild b/network/discord/discord.SlackBuild index 4ee91e3373..4796f2f539 100644 --- a/network/discord/discord.SlackBuild +++ b/network/discord/discord.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for discord # -# Copyright 2016-2019 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> +# Copyright 2016-2021 Jeremy Hansen <jebrhansen+SBo -at- 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=discord -VERSION=${VERSION:-0.0.9} +VERSION=${VERSION:-0.0.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,7 +58,7 @@ set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $PKG -ar p $CWD/${PRGNAM}-${VERSION}.deb data.tar.xz | unxz | tar xv +ar p $CWD/${PRGNAM}-${VERSION}.deb data.tar.gz | tar zxv chown -R root:root . find -L . \ diff --git a/network/discord/discord.info b/network/discord/discord.info index fa3d37ad50..1dbd59a296 100644 --- a/network/discord/discord.info +++ b/network/discord/discord.info @@ -1,10 +1,10 @@ PRGNAM="discord" -VERSION="0.0.9" +VERSION="0.0.14" HOMEPAGE="https://discordapp.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.deb" -MD5SUM_x86_64="2f6f5eb899f2815fbd26dddea0d2d316" +DOWNLOAD_x86_64="https://dl.discordapp.net/apps/linux/0.0.14/discord-0.0.14.deb" +MD5SUM_x86_64="e1122775041faf5a06b75ee0ccc40ae2" REQUIRES="libc++" MAINTAINER="Jeremy Hansen" EMAIL="jebrhansen+SBo@gmail.com" diff --git a/network/dissenter-browser/README b/network/dissenter-browser/README deleted file mode 100644 index e475ecd0fc..0000000000 --- a/network/dissenter-browser/README +++ /dev/null @@ -1,9 +0,0 @@ -The free speech web browser. - -Browse faster by blocking ads and trackers that violate your privacy -and cost you time and money. - -Dissenter is 64-bit software. - -This SlackBuild does not build Dissenter from source, it simply repackages -the binary. diff --git a/network/dissenter-browser/dissenter-browser.info b/network/dissenter-browser/dissenter-browser.info deleted file mode 100644 index d56384b6fe..0000000000 --- a/network/dissenter-browser/dissenter-browser.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dissenter-browser" -VERSION="0.66.99" -HOMEPAGE="https://dissenter.com" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://dissenter.com/dist/browser/0.66.99/dissenter-browser-0.66.99-1.x86_64.rpm" -MD5SUM_x86_64="e283dadf430ed9d3da90ac8a82822f64" -REQUIRES="" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" diff --git a/network/dissenter-browser/doinst.sh b/network/dissenter-browser/doinst.sh deleted file mode 100644 index f1e78d65ce..0000000000 --- a/network/dissenter-browser/doinst.sh +++ /dev/null @@ -1,7 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -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/network/dma/README b/network/dma/README new file mode 100644 index 0000000000..66108f5935 --- /dev/null +++ b/network/dma/README @@ -0,0 +1,4 @@ +dma is a small Mail Transport Agent (MTA), designed for home and office use. +It accepts mails from locally installed Mail User Agents (MUA) and delivers +the mails either locally or to a remote destination. +Remote delivery includes several features like TLS/SSL support and SMTP authentication. diff --git a/network/dma/dma.SlackBuild b/network/dma/dma.SlackBuild new file mode 100644 index 0000000000..e6766f6b8d --- /dev/null +++ b/network/dma/dma.SlackBuild @@ -0,0 +1,91 @@ +#!/bin/sh + +# Slackware build script for dma +# 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=dma +VERSION=${VERSION:-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 +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 "s|share/man|/man|g" Makefile +sed -i "s|/lib|/lib${LIBDIRSUFFIX}|g" Makefile + +make +make install sendmail-link mailq-link install-spool-dirs install-etc 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 + +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 INSTALL LICENSE README.markdown TODO VERSION \ + $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/network/dma/dma.info b/network/dma/dma.info new file mode 100644 index 0000000000..e5e9785815 --- /dev/null +++ b/network/dma/dma.info @@ -0,0 +1,10 @@ +PRGNAM="dma" +VERSION="0.13" +HOMEPAGE="https://github.com/corecode/dma/" +DOWNLOAD="https://github.com/corecode/dma/archive/v0.13/dma-0.13.tar.gz" +MD5SUM="8bf824b065295a594f399c8b96663673" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Pierre-Philipp Braun" +EMAIL="pbraun@nethence.com" diff --git a/network/dma/slack-desc b/network/dma/slack-desc new file mode 100644 index 0000000000..9df4761ac6 --- /dev/null +++ b/network/dma/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------------------------------------------------------| +dma: dma (DragonFlyBSD Mail Agent) +dma: +dma: dma is a small Mail Transport Agent (MTA), designed for home and +dma: office use. It accepts mails from locally installed Mail User Agents +dma: (MUA) and delivers the mails either locally or to a remote +dma: destination. Remote delivery includes several features like TLS/SSL +dma: support and SMTP authentication. +dma: +dma: +dma: +dma: diff --git a/network/dmitry/dmitry.SlackBuild b/network/dmitry/dmitry.SlackBuild index d2965cbad6..bca6380c53 100644 --- a/network/dmitry/dmitry.SlackBuild +++ b/network/dmitry/dmitry.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=dmitry SRCNAM=DMitry VERSION=${VERSION:-1.3a} BUILD=${BUILD:-1} -TAG=${TAG:-_Sbo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/network/dmitry/slack-desc b/network/dmitry/slack-desc index 39f5f3b3ac..e714c85e53 100644 --- a/network/dmitry/slack-desc +++ b/network/dmitry/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| dmitry: dmitry (Deepmagic Information Gathering Tool) dmitry: -dmitry: DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux -dmitry: Command Line Application coded in C. DMitry has the ability to gather -dmitry: as much information as possible about a host. Base functionality is -dmitry: able to gather possible subdomains, email addresses, uptime +dmitry: DMitry (Deepmagic Information Gathering Tool) is a UNIX/(GNU)Linux +dmitry: Command Line Application coded in C. DMitry has the ability to gather +dmitry: as much information as possible about a host. Base functionality is +dmitry: able to gather possible subdomains, email addresses, uptime dmitry: information, tcp port scan, whois lookups, and more. dmitry: dmitry: -dmitry: +dmitry: dmitry: diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild index 52f8059230..01a89c316e 100644 --- a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild +++ b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild @@ -27,7 +27,7 @@ # significantly improved the value of this script! PRGNAM=dnscrypt-proxy -VERSION=${VERSION:-2.0.25} +VERSION=${VERSION:-2.0.42} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,7 +67,7 @@ mkdir -p $PRGNAM-$VERSION/src/$DOMAIN/$ORG cd $PRGNAM-$VERSION/src/$DOMAIN/$ORG tar xvf $CWD/$PRGNAM-$VERSION.tar.gz mv $PRGNAM-$VERSION $PRGNAM -cd $PRGNAM +cd $TMP/$PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -79,6 +79,8 @@ export GOPATH="$TMP/$PRGNAM-$VERSION" go install -a -x ./... +cd $TMP/$PRGNAM-$VERSION/src/$DOMAIN/$ORG/$PRGNAM + mkdir -p $PKG/usr/sbin install -m 755 "$TMP/$PRGNAM-$VERSION/bin/${PRGNAM}" $PKG/usr/sbin/${PRGNAM} diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.info b/network/dnscrypt-proxy/dnscrypt-proxy.info index add495f8cd..99c27a29ac 100644 --- a/network/dnscrypt-proxy/dnscrypt-proxy.info +++ b/network/dnscrypt-proxy/dnscrypt-proxy.info @@ -1,8 +1,8 @@ PRGNAM="dnscrypt-proxy" -VERSION="2.0.25" +VERSION="2.0.42" HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy" -DOWNLOAD="https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.25/dnscrypt-proxy-2.0.25.tar.gz" -MD5SUM="1c92cedfc8d4ea7dc21b1abd5e93478c" +DOWNLOAD="https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.42/dnscrypt-proxy-2.0.42.tar.gz" +MD5SUM="9892c5d281b57c5f315d2f95cd6c33d8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.toml b/network/dnscrypt-proxy/dnscrypt-proxy.toml index 5b4e99a89d..0da38f8272 100644 --- a/network/dnscrypt-proxy/dnscrypt-proxy.toml +++ b/network/dnscrypt-proxy/dnscrypt-proxy.toml @@ -21,19 +21,22 @@ ## Servers from the "public-resolvers" source (see down below) can ## be viewed here: https://dnscrypt.info/public-servers ## -## If this line is commented, all registered servers matching the require_* filters -## will be used. +## The proxy will automatically pick working servers from this list. +## Note that the require_* filters do NOT apply when using this setting. +## +## By default, this list is empty and all registered servers matching the +## require_* filters will be used instead. ## -## The proxy will automatically pick the fastest, working servers from the list. ## Remove the leading # first to enable this; lines starting with # are ignored. # server_names = ['scaleway-fr', 'google', 'yandex', 'cloudflare'] ## List of local addresses and ports to listen to. Can be IPv4 and/or IPv6. -## Note: When using systemd socket activation, choose an empty set (i.e. [] ). +## Example with both IPv4 and IPv6: +## listen_addresses = ['127.0.0.1:53', '[::1]:53'] -listen_addresses = ['127.0.0.1:53', '[::1]:53'] +listen_addresses = ['127.0.0.1:53'] ## Maximum number of simultaneous client connections to accept @@ -93,18 +96,21 @@ force_tcp = false ## Uncomment the following line to route all TCP connections to a local Tor node ## Tor doesn't support UDP, so set `force_tcp` to `true` as well. -# proxy = "socks5://127.0.0.1:9050" +# proxy = 'socks5://127.0.0.1:9050' ## HTTP/HTTPS proxy ## Only for DoH servers -# http_proxy = "http://127.0.0.1:8888" +# http_proxy = 'http://127.0.0.1:8888' -## How long a DNS query will wait for a response, in milliseconds +## How long a DNS query will wait for a response, in milliseconds. +## If you have a network with *a lot* of latency, you may need to +## increase this. Startup may be slower if you do so. +## Don't increase it too much. 10000 is the highest reasonable value. -timeout = 2500 +timeout = 5000 ## Keepalive for HTTP (HTTPS, HTTP/2) queries, in seconds @@ -112,11 +118,12 @@ timeout = 2500 keepalive = 30 -## Use the REFUSED return code for blocked responses -## Setting this to `false` means that some responses will be lies. -## Unfortunately, `false` appears to be required for Android 8+ +## Response for blocked queries. Options are `refused`, `hinfo` (default) or +## an IP response. To give an IP response, use the format `a:<IPv4>,aaaa:<IPv6>`. +## Using the `hinfo` option means that some responses will be lies. +## Unfortunately, the `hinfo` option appears to be required for Android 8+ -refused_code_in_responses = false +# blocked_query_response = 'refused' ## Load-balancing strategy: 'p2' (default), 'ph', 'first' or 'random' @@ -167,6 +174,8 @@ cert_refresh_delay = 240 ## 49195 = TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 ## 52392 = TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 ## 52393 = TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 +## 4865 = TLS_AES_128_GCM_SHA256 +## 4867 = TLS_CHACHA20_POLY1305_SHA256 ## ## On non-Intel CPUs such as MIPS routers and ARM systems (Android, Raspberry Pi...), ## the following suite improves performance. @@ -178,34 +187,35 @@ cert_refresh_delay = 240 # tls_cipher_suite = [52392, 49199] -## Fallback resolver -## This is a normal, non-encrypted DNS resolver, that will be only used +## Fallback resolvers +## These are normal, non-encrypted DNS resolvers, that will be only used ## for one-shot queries when retrieving the initial resolvers list, and ## only if the system DNS configuration doesn't work. -## No user application queries will ever be leaked through this resolver, -## and it will not be used after IP addresses of resolvers URLs have been found. -## It will never be used if lists have already been cached, and if stamps +## No user application queries will ever be leaked through these resolvers, +## and they will not be used after IP addresses of resolvers URLs have been found. +## They will never be used if lists have already been cached, and if stamps ## don't include host names without IP addresses. -## It will not be used if the configured system DNS works. -## A resolver supporting DNSSEC is recommended. This may become mandatory. +## They will not be used if the configured system DNS works. +## Resolvers supporting DNSSEC are recommended. ## ## People in China may need to use 114.114.114.114:53 here. ## Other popular options include 8.8.8.8 and 1.1.1.1. +## +## If more than one resolver is specified, they will be tried in sequence. -fallback_resolver = '9.9.9.9:53' +fallback_resolvers = ['9.9.9.9:53', '8.8.8.8:53'] -## Never let dnscrypt-proxy try to use the system DNS settings; -## unconditionally use the fallback resolver. +## Always use the fallback resolver before the system DNS settings. -ignore_system_dns = false +ignore_system_dns = true ## Maximum time (in seconds) to wait for network connectivity before ## initializing the proxy. ## Useful if the proxy is automatically started at boot, and network ## connectivity is not guaranteed to be immediately available. -## Use 0 to not test for connectivity at all, +## Use 0 to not test for connectivity at all (not recommended), ## and -1 to wait as much as possible. netprobe_timeout = 60 @@ -219,7 +229,7 @@ netprobe_timeout = 60 ## On other operating systems, the connection will be initialized ## but nothing will be sent at all. -netprobe_address = "9.9.9.9:53" +netprobe_address = '9.9.9.9:53' ## Offline mode - Do not use any remote encrypted servers. @@ -229,9 +239,19 @@ netprobe_address = "9.9.9.9:53" # offline_mode = false +## Additional data to attach to outgoing queries. +## These strings will be added as TXT records to queries. +## Do not use, except on servers explicitly asking for extra data +## to be present. +## encrypted-dns-server can be configured to use this for access control +## in the [access_control] section + +# query_meta = ["key1:value1", "key2:value2", "token:MySecretToken"] + + ## Automatic log files rotation -# Maximum log files size in MB +# Maximum log files size in MB - Set to 0 for unlimited. log_files_max_size = 10 # How long to keep backup files, in days @@ -246,23 +266,42 @@ log_files_max_backups = 1 # Filters # ######################### +## Note: if you are using dnsmasq, disable the `dnssec` option in dnsmasq if you +## configure dnscrypt-proxy to do any kind of filtering (including the filters +## below and blacklists). +## You can still choose resolvers that do DNSSEC validation. + + ## Immediately respond to IPv6-related queries with an empty response ## This makes things faster when there is no IPv6 connectivity, but can ## also cause reliability issues with some stub resolvers. -## Do not enable if you added a validating resolver such as dnsmasq in front -## of the proxy. block_ipv6 = false +## Immediately respond to A and AAAA queries for host names without a domain name + +block_unqualified = true + + +## Immediately respond to queries for local zones instead of leaking them to +## upstream resolvers (always causing errors or timeouts). + +block_undelegated = true + + +## TTL for synthetic responses sent when a request has been blocked (due to +## IPv6 or blacklists). + +reject_ttl = 600 + + ################################################################################## # Route queries for specific domains to a dedicated set of servers # ################################################################################## -## Example map entries (one entry per line): -## example.com 9.9.9.9 -## example.net 9.9.9.9,8.8.8.8,1.1.1.1 +## See the `example-forwarding-rules.txt` file for an example # forwarding_rules = 'forwarding-rules.txt' @@ -276,12 +315,13 @@ block_ipv6 = false ## In addition to acting as a HOSTS file, it can also return the IP address ## of a different name. It will also do CNAME flattening. ## -## Example map entries (one entry per line) -## example.com 10.1.1.1 -## www.google.com forcesafesearch.google.com +## See the `example-cloaking-rules.txt` file for an example # cloaking_rules = 'cloaking-rules.txt' +## TTL used when serving entries in cloaking-rules.txt + +# cloak_ttl = 600 ########################### @@ -295,12 +335,12 @@ cache = true ## Cache size -cache_size = 512 +cache_size = 4096 ## Minimum TTL for cached entries -cache_min_ttl = 600 +cache_min_ttl = 2400 ## Maximum TTL for cached entries @@ -319,6 +359,37 @@ cache_neg_max_ttl = 600 +################################## +# Local DoH server # +################################## + +[local_doh] + +## dnscrypt-proxy can act as a local DoH server. By doing so, web browsers +## requiring a direct connection to a DoH server in order to enable some +## features will enable these, without bypassing your DNS proxy. + +## Addresses that the local DoH server should listen to + +# listen_addresses = ['127.0.0.1:3000'] + + +## Path of the DoH URL. This is not a file, but the part after the hostname +## in the URL. By convention, `/dns-query` is frequently chosen. +## For each `listen_address` the complete URL to access the server will be: +## `https://<listen_address><path>` (ex: `https://127.0.0.1/dns-query`) + +# path = "/dns-query" + + +## Certificate file and key - Note that the certificate has to be trusted. +## See the documentation (wiki) for more information. + +# cert_file = "localhost.pem" +# cert_key_file = "localhost.pem" + + + ############################### # Query logging # ############################### @@ -327,7 +398,8 @@ cache_neg_max_ttl = 600 [query_log] - ## Path to the query log file (absolute, or relative to the same directory as the executable file) + ## Path to the query log file (absolute, or relative to the same directory as the config file) + ## On non-Windows systems, can be /dev/stdout to log to the standard output (also set log_files_max_size to 0) # file = 'query.log' @@ -353,7 +425,7 @@ cache_neg_max_ttl = 600 [nx_log] - ## Path to the query log file (absolute, or relative to the same directory as the executable file) + ## Path to the query log file (absolute, or relative to the same directory as the config file) # file = 'nx.log' @@ -383,7 +455,7 @@ cache_neg_max_ttl = 600 [blacklist] - ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file) + ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file) # blacklist_file = 'blacklist.txt' @@ -411,7 +483,7 @@ cache_neg_max_ttl = 600 [ip_blacklist] - ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file) + ## Path to the file of blocking rules (absolute, or relative to the same directory as the config file) # blacklist_file = 'ip-blacklist.txt' @@ -439,7 +511,7 @@ cache_neg_max_ttl = 600 [whitelist] - ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the executable file) + ## Path to the file of whitelisting rules (absolute, or relative to the same directory as the config file) # whitelist_file = 'whitelist.txt' @@ -465,8 +537,7 @@ cache_neg_max_ttl = 600 ## ## For example, the following rule in a blacklist file: ## *.youtube.* @time-to-sleep -## would block access to YouTube only during the days, and period of the days -## define by the 'time-to-sleep' schedule. +## would block access to YouTube during the times defined by the 'time-to-sleep' schedule. ## ## {after='21:00', before= '7:00'} matches 0:00-7:00 and 21:00-0:00 ## {after= '9:00', before='18:00'} matches 9:00-18:00 @@ -507,7 +578,7 @@ cache_neg_max_ttl = 600 ## must include the prefixes. ## ## If the `urls` property is missing, cache files and valid signatures -## must be already present; This doesn't prevent these cache files from +## must already be present. This doesn't prevent these cache files from ## expiring after `refresh_delay` hours. [sources] @@ -518,17 +589,24 @@ cache_neg_max_ttl = 600 urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'] cache_file = 'public-resolvers.md' minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + prefix = '' + + ## Anonymized DNS relays + + [sources.'relays'] + urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md'] + cache_file = 'relays.md' + minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' refresh_delay = 72 prefix = '' ## Quad9 over DNSCrypt - https://quad9.net/ # [sources.quad9-resolvers] - # urls = ["https://www.quad9.net/quad9-resolvers.md"] - # minisign_key = "RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN" - # cache_file = "quad9-resolvers.md" - # refresh_delay = 72 - # prefix = "quad9-" + # urls = ['https://www.quad9.net/quad9-resolvers.md'] + # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN' + # cache_file = 'quad9-resolvers.md' + # prefix = 'quad9-' ## Another example source, with resolvers censoring some websites not appropriate for children ## This is a subset of the `public-resolvers` list, so enabling both is useless @@ -540,10 +618,87 @@ cache_neg_max_ttl = 600 +######################################### +# Servers with known bugs # +######################################### + +[broken_implementations] + +# Cisco servers currently cannot handle queries larger than 1472 bytes, and don't +# truncate reponses larger than questions as expected by the DNSCrypt protocol. +# This prevents large responses from being received over UDP and over relays. +# +# The `dnsdist` server software drops client queries larger than 1500 bytes. +# They are aware of it and are working on a fix. +# +# The list below enables workarounds to make non-relayed usage more reliable +# until the servers are fixed. + +fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familyshield-ipv6', 'quad9-dnscrypt-ip4-filter-alt', 'quad9-dnscrypt-ip4-filter-pri', 'quad9-dnscrypt-ip4-nofilter-alt', 'quad9-dnscrypt-ip4-nofilter-pri', 'quad9-dnscrypt-ip6-filter-alt', 'quad9-dnscrypt-ip6-filter-pri', 'quad9-dnscrypt-ip6-nofilter-alt', 'quad9-dnscrypt-ip6-nofilter-pri', 'cleanbrowsing-adult', 'cleanbrowsing-family-ipv6', 'cleanbrowsing-family', 'cleanbrowsing-security'] + + + + +################################ +# TLS Client Authentication # +################################ + +# This is only useful if you are operating your own, private DoH server(s). +# (for DNSCrypt, see the `query_meta` feature instead) + +[tls_client_auth] + +# creds = [ +# { server_name='myserver', client_cert='client.crt', client_key='client.key' } +# ] + + + +################################ +# Anonymized DNS # +################################ + +[anonymized_dns] + +## Routes are indirect ways to reach DNSCrypt servers. +## +## A route maps a server name ("server_name") to one or more relays that will be +## used to connect to that server. +## +## A relay can be specified as a DNS Stamp (either a relay stamp, or a +## DNSCrypt stamp), an IP:port, a hostname:port, or a server name. +## +## The following example routes "example-server-1" via `anon-example-1` or `anon-example-2`, +## and "example-server-2" via the relay whose relay DNS stamp +## is "sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM". +## +## !!! THESE ARE JUST EXAMPLES !!! +## +## Review the list of available relays from the "relays.md" file, and, for each +## server you want to use, define the relays you want connections to go through. +## +## Carefully choose relays and servers so that they are run by different entities. +## +## "server_name" can also be set to "*" to define a default route, but this is not +## recommended. If you do so, keep "server_names" short and distinct from relays. + +# routes = [ +# { server_name='example-server-1', via=['anon-example-1', 'anon-example-2'] }, +# { server_name='example-server-2', via=['sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM'] } +# ] + + +# skip resolvers incompatible with anonymization instead of using them directly + +skip_incompatible = false + + + + ## Optional, local, static list of additional servers ## Mostly useful for testing your own servers. [static] - # [static.'google'] - # stamp = 'sdns://AgUAAAAAAAAAAAAOZG5zLmdvb2dsZS5jb20NL2V4cGVyaW1lbnRhbA' + # [static.'myserver'] + # stamp = 'sdns:AQcAAAAAAAAAAAAQMi5kbnNjcnlwdC1jZXJ0Lg' diff --git a/network/dokuwiki/README b/network/dokuwiki/README index afddebc299..08789293b8 100644 --- a/network/dokuwiki/README +++ b/network/dokuwiki/README @@ -7,9 +7,8 @@ useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki. -Note: -You must add this line in your httpd.conf to enable dokuwiki: -Include /etc/httpd/extra/httpd-dokuwiki.conf - If your default directory is not /var/www/htdocs please edit to your default directory. + +TEST Dokuwiki, Run in your favorite browser: +http://127.0.0.1/dokuwiki/ diff --git a/network/dokuwiki/doinst.sh b/network/dokuwiki/doinst.sh index 14d06020bc..57a1536f08 100644 --- a/network/dokuwiki/doinst.sh +++ b/network/dokuwiki/doinst.sh @@ -1,5 +1,7 @@ +# Remove comment sed -i "s:#Include /etc/httpd/mod_php.conf:Include /etc/httpd/mod_php.conf:g" etc/httpd/httpd.conf + +# If not exist line, send... grep -q -e 'Dokuwiki' etc/httpd/httpd.conf || cat >> etc/httpd/httpd.conf <<'EOF' -# Dokuwiki Include /etc/httpd/extra/httpd-dokuwiki.conf EOF diff --git a/network/dokuwiki/dokuwiki.SlackBuild b/network/dokuwiki/dokuwiki.SlackBuild index be04cf0dd2..9f7823b228 100644 --- a/network/dokuwiki/dokuwiki.SlackBuild +++ b/network/dokuwiki/dokuwiki.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for dokuwiki -# Copyright 2016 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy -# All rights reserved. +# Slackware build script for dokuwiki +# +# Copyright 2016-2019 Giorgio Peron <giorgio.peron@gmail.com>, Belluno, Italy +# Copyright 2019-2021 Jefferson Rocha <root@slackjeff.com.br>, Curitiba, Brazil # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -21,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=${PRGNAM:-dokuwiki} -VERSION=${VERSION:-20180422b} +PRGNAM=dokuwiki +VERSION=${VERSION:-20200729} UNPACK=${UNPACK:-stable} -SRCVERSION=${SRCVERSION:-2018-04-22b} +SRCVERSION=${SRCVERSION:-2020-07-29} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -44,11 +45,12 @@ cd $TMP rm -rf $PRGNAM-$SRCVERSION tar xvzf $CWD/$PRGNAM-$SRCVERSION.tgz -mkdir -p $PKG/var/www/$PRGNAM -mv $TMP/$PRGNAM-$SRCVERSION/* $PKG/var/www/$PRGNAM/ -chown -R apache:apache $PKG/var/www/$PRGNAM/ +mkdir -p $PKG/var/www/htdocs/$PRGNAM +mv $TMP/$PRGNAM-$SRCVERSION/* $PKG/var/www/htdocs/$PRGNAM/ +chown -R apache:apache $PKG/var/www/htdocs/$PRGNAM/ mkdir -p $PKG/etc/httpd/extra +# Create in extra dokuwiki.conf cat > $PKG/etc/httpd/extra/httpd-dokuwiki.conf <<'EOF' Alias /dokuwiki /var/www/htdocs/dokuwiki <Directory /var/www/htdocs/dokuwiki/> @@ -66,6 +68,8 @@ Alias /dokuwiki /var/www/htdocs/dokuwiki EOF mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +# Move all docs +mv $PKG/var/www/htdocs/${PRGNAM}/{COPYING,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/network/dokuwiki/dokuwiki.info b/network/dokuwiki/dokuwiki.info index 399ca8b8e2..ff5714ca14 100644 --- a/network/dokuwiki/dokuwiki.info +++ b/network/dokuwiki/dokuwiki.info @@ -1,8 +1,8 @@ PRGNAM="dokuwiki" -VERSION="20180422b" +VERSION="20200729" HOMEPAGE="https://www.dokuwiki.org/dokuwiki" DOWNLOAD="https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" -MD5SUM="605944ec47cd5f822456c54c124df255" +MD5SUM="8867b6a5d71ecb5203402fe5e8fa18c9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/dothost/README b/network/dothost/README index dfce38298e..92be91a80f 100644 --- a/network/dothost/README +++ b/network/dothost/README @@ -4,12 +4,16 @@ Perl module also available at slackbuilds.org Example: -dothost www.iana.org | graph-easy --as boxart +dothost www.iana.org | graph-easy --as ascii - ┌──────────────────┐ - ∨ │ -┌────────────┐ ┏━━━━━━━━━━━━━━┓ ┌───────────────────┐ -│ 192.0.32.8 │ ──> ┃ www.iana.org ┃ ──> │ 2620:0:2d0:200::8 │ -└────────────┘ ┗━━━━━━━━━━━━━━┛ └───────────────────┘ - ∧ │ - └────────────────────┘ + +-------------------------+ + v | + ##################### +------------+ + +> # www.iana.org # --> | 192.0.32.8 | + | ##################### +------------+ + | | + | | + | v + | +-------------------+ + +- | 2620:0:2d0:200::8 | + +-------------------+ diff --git a/network/dothost/dothost.SlackBuild b/network/dothost/dothost.SlackBuild index 7f5fc755a4..fdd763df5e 100644 --- a/network/dothost/dothost.SlackBuild +++ b/network/dothost/dothost.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for dothost -# Copyright 2018 Donald Cooley South Haven, Indiana USA +# Copyright 2018-2020 Donald Cooley South Haven, Indiana 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=dothost -VERSION=${VERSION:-0.1} +VERSION=${VERSION:-0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,17 +55,20 @@ 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 {} \; -# Install dothost binary in /opt -mkdir -p $PKG/opt/dothost -cp dothost $PKG/opt/dothost/dothost +# Install to /usr instead of /usr/local +sed -i 's_/usr/local_/usr_' Makefile -# Link dothost binary to /usr/bin -mkdir -p $PKG/usr/bin -ln -s /opt/dothost/dothost $PKG/usr/bin/dothost +# Install man pages into /usr/man instead of /usr/share/man +sed -i 's_/share/man_/man_' Makefile + +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 +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/dothost/dothost.info b/network/dothost/dothost.info index 52d08d53cb..d4cfa2b9b9 100644 --- a/network/dothost/dothost.info +++ b/network/dothost/dothost.info @@ -1,8 +1,8 @@ PRGNAM="dothost" -VERSION="0.1" -HOMEPAGE="http://jwilk.net/software/dothost" -DOWNLOAD="https://github.com/jwilk/dothost/releases/download/0.1/dothost-0.1.tar.gz" -MD5SUM="4c1aa7632ede8a65d6037a5b3b922179" +VERSION="0.2" +HOMEPAGE="https://jwilk.net/software/dothost" +DOWNLOAD="https://github.com/jwilk/dothost/releases/download/0.2/dothost-0.2.tar.gz" +MD5SUM="2f95fb6cd01458b9e848b4fdbe9aba79" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="graph-easy" diff --git a/network/dothost/slack-desc b/network/dothost/slack-desc index 9793dfb5b0..69fa54c838 100644 --- a/network/dothost/slack-desc +++ b/network/dothost/slack-desc @@ -14,6 +14,6 @@ dothost: graph-easy Perl module also available at slackbuilds.org dothost: dothost: dothost: -dothost: http://jwilk.net/software/dothost +dothost: https://jwilk.net/software/dothost dothost: dothost: diff --git a/network/driftnet/README b/network/driftnet/README index 03ebbda903..3774915a48 100644 --- a/network/driftnet/README +++ b/network/driftnet/README @@ -7,3 +7,11 @@ Original project: http://www.ex-parrot.com/~chris/driftnet/ This is an updated version available from GitHub, which includes several patches for use on newer systems. + +HTTP websockets display +----------------------- + +Disabled by default. + +This feature requires libwebsockets as a dependency and remove this +build flag: --disable-http-display diff --git a/network/driftnet/driftnet.SlackBuild b/network/driftnet/driftnet.SlackBuild index d9999b0e3b..7b75ac248f 100644 --- a/network/driftnet/driftnet.SlackBuild +++ b/network/driftnet/driftnet.SlackBuild @@ -2,7 +2,7 @@ # Slackbuild build script for driftnet # Copyright 2010, JK Wood <joshuakwood@gmail.com> -# Copyright 2017-2018 Brenton Earl <brent@exitstatuosne.com> +# Copyright 2017-2018, 2020 Brenton Earl <brent@exitstatuosne.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=driftnet -VERSION=${VERSION:-1.2.0} +VERSION=${VERSION:-1.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -87,6 +87,9 @@ 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 COPYING INSTALL CREDITS README.md Changelog TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/driftnet/driftnet.info b/network/driftnet/driftnet.info index 0a4f69fa15..a7d40d2e0e 100644 --- a/network/driftnet/driftnet.info +++ b/network/driftnet/driftnet.info @@ -1,8 +1,8 @@ PRGNAM="driftnet" -VERSION="1.2.0" +VERSION="1.3.0" HOMEPAGE="https://github.com/deiv/driftnet" -DOWNLOAD="https://github.com/deiv/driftnet/archive/v1.2.0/driftnet-1.2.0.tar.gz" -MD5SUM="86fda7573a2c17ba02059e63e0f097b8" +DOWNLOAD="https://github.com/deiv/driftnet/archive/v1.3.0/driftnet-1.3.0.tar.gz" +MD5SUM="60e8955771e028cab44ecd6b2800f326" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/dropbear/README b/network/dropbear/README index bae1c188d1..5da4e54160 100644 --- a/network/dropbear/README +++ b/network/dropbear/README @@ -6,13 +6,13 @@ distributed under a MIT-style license. Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers. -Please note the Dropbear distribution includes a standalone version of -OpenSSH's scp program. This slackbuild will build this by default, thus -creating a package which conflicts with OpenSSH's scp binary. Installing this -package will overwrite this file with a symbolic link to the dropbearmulti -binary, so a backup of /usr/bin/scp will be made if it exists. After -uninstalling dropbear, you can restore the backup with 'mv -/usr/bin/scp.openssh /usr/bin/scp'. +Please note the Dropbear distribution includes a standalone +version of OpenSSH's scp program. This slackbuild will build this +by default, thus creating a package which conflicts with OpenSSH's +scp binary. Installing this package will overwrite this file with a +symbolic link to the dropbearmulti binary, so a backup of /usr/bin/scp +will be made if it exists. After uninstalling dropbear, you can +restore the backup with 'mv /usr/bin/scp.openssh /usr/bin/scp'. If you do not want to build the scp binary, use: diff --git a/network/dropbear/dropbear.SlackBuild b/network/dropbear/dropbear.SlackBuild index e9bd3d6105..309fcbb935 100644 --- a/network/dropbear/dropbear.SlackBuild +++ b/network/dropbear/dropbear.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2007-2008, Piter Punk, So Paulo, Brazil -# Copyright 2017-2019, Andrew Clemons, Wellington New Zealand +# Copyright 2007-2008, Piter Punk, São Paulo, Brazil +# Copyright 2017-2020, Andrew Clemons, Wellington New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dropbear -VERSION=${VERSION:-2019.78} +VERSION=${VERSION:-2020.81} +SRCVERSION="DROPBEAR_$VERSION" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,9 +59,9 @@ 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-$SRCVERSION +tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz +cd $PRGNAM-$SRCVERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,6 +69,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +autoreconf -if + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/dropbear/dropbear.info b/network/dropbear/dropbear.info index 0ad1eaba52..95c96f952b 100644 --- a/network/dropbear/dropbear.info +++ b/network/dropbear/dropbear.info @@ -1,8 +1,8 @@ PRGNAM="dropbear" -VERSION="2019.78" -HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" -DOWNLOAD="https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2" -MD5SUM="a972c85ed678ad0fdcb7844e1294fb54" +VERSION="2020.81" +HOMEPAGE="https://github.com/mkj/dropbear" +DOWNLOAD="https://github.com/mkj/dropbear/archive/DROPBEAR_2020.81/dropbear-DROPBEAR_2020.81.tar.gz" +MD5SUM="31761dde389e765b5f77deda4a0fd027" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/dropbear/slack-desc b/network/dropbear/slack-desc index 837032b6bc..f2e888a128 100644 --- a/network/dropbear/slack-desc +++ b/network/dropbear/slack-desc @@ -14,6 +14,6 @@ dropbear: distributed under a MIT-style license. Dropbear is particularly dropbear: useful for "embedded"-type Linux (or other Unix) systems, such as dropbear: wireless routers. dropbear: -dropbear: +dropbear: https://github.com/mkj/dropbear dropbear: dropbear: diff --git a/network/dropbox/dropbox.SlackBuild b/network/dropbox/dropbox.SlackBuild index 5a076f44f4..3451428e14 100644 --- a/network/dropbox/dropbox.SlackBuild +++ b/network/dropbox/dropbox.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for dropbox # Copyright 2017 cmyster amit.ugol@gmail.com -# Copyright 2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2019-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ # Source for x86_64: https://www.dropbox.com/download?plat=lnx.x86_64 PRGNAM=dropbox -VERSION=${VERSION:-85.4.155} +VERSION=${VERSION:-118.4.460} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/dropbox/dropbox.info b/network/dropbox/dropbox.info index e79aee3875..84974b4983 100644 --- a/network/dropbox/dropbox.info +++ b/network/dropbox/dropbox.info @@ -1,10 +1,10 @@ PRGNAM="dropbox" -VERSION="85.4.155" +VERSION="118.4.460" HOMEPAGE="https://www.dropbox.com" -DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-85.4.155.tar.gz" -MD5SUM="3b69411fc86c140331aa3866f201f48f" -DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-85.4.155.tar.gz" -MD5SUM_x86_64="83b0175cdaa5e93cb4ac879d7d919d6c" +DOWNLOAD="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-118.4.460.tar.gz" +MD5SUM="1075e8b7ac5f97e205105eca615ac05f" +DOWNLOAD_x86_64="https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-118.4.460.tar.gz" +MD5SUM_x86_64="e2d2423fe1c52bde5ee85a20930a9dc2" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/easyrsa/easyrsa.SlackBuild b/network/easyrsa/easyrsa.SlackBuild index ffb18d7c19..88449facc1 100644 --- a/network/easyrsa/easyrsa.SlackBuild +++ b/network/easyrsa/easyrsa.SlackBuild @@ -22,7 +22,7 @@ PRGNAM=easyrsa SRCNAM=EasyRSA -VERSION=${VERSION:-3.0.4} +VERSION=${VERSION:-3.0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/easyrsa/easyrsa.info b/network/easyrsa/easyrsa.info index fafb548f82..ca4545365a 100644 --- a/network/easyrsa/easyrsa.info +++ b/network/easyrsa/easyrsa.info @@ -1,8 +1,8 @@ PRGNAM="easyrsa" -VERSION="3.0.4" +VERSION="3.0.7" HOMEPAGE="https://github.com/OpenVPN/easy-rsa" -DOWNLOAD="https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.4/EasyRSA-3.0.4.tgz" -MD5SUM="d163f0681b4b2067f107badeb9151629" +DOWNLOAD="https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.7/EasyRSA-3.0.7.tgz" +MD5SUM="e9ae0a705831354193ed23b2c6da9944" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/efax/README b/network/efax/README new file mode 100644 index 0000000000..ee8fe6c3ef --- /dev/null +++ b/network/efax/README @@ -0,0 +1,25 @@ +efax is a small ANSI C/POSIX program that sends and receives faxes +using any fax modem (Class 1, 2 or 2.0).* + +efax is smaller and easier to install than HylaFAX or mgetty+sendfax. +As one user put it "EFAX is a nice simple program for single user systems." + +The "fax" command, a shell script, lets you send, receive, view and print faxes. +In larger systems, faxes can be sent by printing to a "fax" printer and received +faxes can be e-mailed as MIME attachments to an administrator for distribution. +efax can also pass incoming data calls to a getty program. + +The efax package includes "efix," a program to convert between various image file formats. +To fax Postscript files you will need Ghostscript. +To view faxes you can use any program tha displays PGM files. +efix can also convert received files to Postscript or HP Laserjet formats for printing. + +This program has only a command-line interface. +If you need a GUI-based fax solution, install efax-gtk instead. + +*Any hardware-based fax modem, that is. If you have a "software modem," a so-called "Linmodem," +then you'll instead need to download the alpha version of efax and modify this SlackBuild script +accordingly. + +The alpha release can be found here: +https://www.cce.com/efax/download/efax-0.9a-001114.tar.gz diff --git a/network/efax/efax.SlackBuild b/network/efax/efax.SlackBuild new file mode 100644 index 0000000000..3b7fe8a8f2 --- /dev/null +++ b/network/efax/efax.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/sh +# +# Slackware build script for efax. +# +# Copyright 2020 by Jay, Seattle, WA. +# 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=efax +SRCNAM=efax-0.9 +VERSION=${VERSION:-0.9} +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 + +# Caveat emptor +case "$ARCH" in + i?86) ;; + x86_64) ;; + *) echo -e "\nBuild for $ARCH is untested!!" + echo -e "Press Ctrl-C within ten seconds to abort," + echo -e "or press ENTER to continue at your own risk.\n" + read -t 10 PLACEHOLDER ;; +esac + +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" = "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 +tar xvf $CWD/$SRCNAM.tar.gz +cd $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 {} \; + + +sed -i "11s/CFLAGS=/CFLAGS=$SLKCFLAGS/" Makefile +sed -i "20i\ +BINDIR=$PKG\/usr\/bin" Makefile +sed -i "21i\ +MANDIR=$PKG\/usr\/man" Makefile + +mkdir -p $PKG/usr/bin $PKG/usr/man/man1 +make all +make install + +# Compress man pages +gzip -9 $PKG/usr/man/*/* + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $TMP/$SRCNAM/README > $PKG/usr/doc/$PRGNAM-$VERSION/README +cat $TMP/$SRCNAM/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/network/efax/efax.info b/network/efax/efax.info new file mode 100644 index 0000000000..2d0c9717bc --- /dev/null +++ b/network/efax/efax.info @@ -0,0 +1,10 @@ +PRGNAM="efax" +VERSION="0.9" +HOMEPAGE="https://www.cce.com/efax/" +DOWNLOAD="ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/efax-0.9.tar.gz" +MD5SUM="23bd3767f87c455c58ccae7f88bce725" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jay" +EMAIL="ld.jay@protonmail.com"
\ No newline at end of file diff --git a/network/efax/slack-desc b/network/efax/slack-desc new file mode 100644 index 0000000000..46f3d01791 --- /dev/null +++ b/network/efax/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------------------------------------------------------| +efax: efax (send/receive fax) +efax: +efax: It can be used to send and receive faxes with a fax modem and to +efax: view, print, and manage faxes received. It can automatically e-mail +efax: a received fax to a designated user and automatically print a +efax: received fax. +efax: +efax: This is the command-line version. +efax: For a GUI version, install efax-gtk instead. +efax: +efax: diff --git a/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild index c56634c92e..d22a4ee14d 100644 --- a/network/ekiga/ekiga.SlackBuild +++ b/network/ekiga/ekiga.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2008-2009 Mauro Giachero # All rights reserved. -# Copyright 2011 Davd Woodfall <dave@dawoodfall.net> +# Copyright 2011 Davd Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/ekiga/ekiga.info b/network/ekiga/ekiga.info index 793e412d5e..fee0dc4a63 100644 --- a/network/ekiga/ekiga.info +++ b/network/ekiga/ekiga.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opal ptlib" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/network/elemental-ircd/elemental-ircd.SlackBuild b/network/elemental-ircd/elemental-ircd.SlackBuild index 5e6346f61c..e7c57c198f 100644 --- a/network/elemental-ircd/elemental-ircd.SlackBuild +++ b/network/elemental-ircd/elemental-ircd.SlackBuild @@ -132,7 +132,6 @@ mkdir -p $PKG/etc/$PRGNAM sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/" \ $CWD/slackware.conf > $PKG/etc/$PRGNAM/slackware.conf -# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc sed -e "s/@UNAME@/$IRCD_UNAME/" \ diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild index 48769d4771..93cee7bfac 100644 --- a/network/elinks/elinks.SlackBuild +++ b/network/elinks/elinks.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for elinks -# Copyright 2014 David Woodfall <dave@dawoodfall.net> +# Copyright 2014 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PRGNAM=elinks VERSION=${VERSION:-git20131231} -BUILD=${BUILD:-10} +BUILD=${BUILD:-13} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -41,20 +41,20 @@ OUTPUT=${OUTPUT:-/tmp} # Added -fno-strict-aliasing -Wno-pointer-sign for a much more peaceful build if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-g0 -O0 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" + SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" LIBDIRSUFFIX="" elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-g0 -O0 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-g0 -O0 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-g0 -O0 -fPIC -fno-strict-aliasing -Wno-pointer-sign" + SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing -Wno-pointer-sign" SLKLDFLAGS="-m64" LIBDIRSUFFIX="64" else - SLKCFLAGS="-go -O0" + SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi diff --git a/network/elinks/elinks.info b/network/elinks/elinks.info index d6e1a90a23..17553cf0cf 100644 --- a/network/elinks/elinks.info +++ b/network/elinks/elinks.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/network/elinks/patches/0001-gopher_html_links.patch b/network/elinks/patches/0001-gopher_html_links.patch index c9ab73856d..38a2dd0b10 100644 --- a/network/elinks/patches/0001-gopher_html_links.patch +++ b/network/elinks/patches/0001-gopher_html_links.patch @@ -1,21 +1,18 @@ ################################################################ -# There is a problem that html links that contain URL:htpp://... -# aren't being followed. This fixes that issue and also chtml. -# Normally those kind of links go to a redirect page that the -# server generates, which then sends you on your way. -# dave@dawoodfall.net +# Fix for HTML links that contain URL:http:// +# dave@slackbuilds.org ############################################################### diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c --- a/src/protocol/gopher/gopher.c 2013-12-18 15:38:57.000000000 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-11-15 23:10:19.758394411 +0000 ++++ b/src/protocol/gopher/gopher.c 2020-01-08 05:34:02.300498220 +0000 @@ -277,6 +277,10 @@ struct string command; enum gopher_entity entity = DEFAULT_GOPHER_ENTITY; unsigned char *selector = conn->uri->data; -+ unsigned char *URI = "hURI%3"; -+ unsigned char *URL = "hURL%3"; -+ unsigned char *CURI = "HURI%3"; -+ unsigned char *CURL = "HURL%3"; ++ unsigned char const* URI = "hURI%3"; ++ unsigned char const* URL = "hURL%3"; ++ unsigned char const* CURI = "HURI%3"; ++ unsigned char const* CURL = "HURL%3"; int selectorlen = conn->uri->datalen; struct gopher_entity_info *entity_info; size_t size; @@ -25,13 +22,13 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c + if(strstr(selector, URL) != NULL || strstr(selector, URI) != NULL) { + entity = GOPHER_HTML; -+ *selector++; ++ selector++; + selectorlen--; + } + + if(strstr(selector, CURL) != NULL || strstr(selector, CURI) != NULL) { + entity = GOPHER_CHTML; -+ *selector++; ++ selector++; + selectorlen--; + } + diff --git a/network/elinks/patches/0002-gopher_index_queries.patch b/network/elinks/patches/0002-gopher_index_queries.patch index ab970f60f7..662fd13a7f 100644 --- a/network/elinks/patches/0002-gopher_index_queries.patch +++ b/network/elinks/patches/0002-gopher_index_queries.patch @@ -1,77 +1,53 @@ ####################################################################### -# elinks by default generates its own search query form when it sees -# a type 7 index entity. The problem is that it didn't read the -# served results page and instead generated another search page after -# you had entered the first. This patch fixes that and in my tests it -# seems to work so far. -# dave@dawoodfall.net +# Fix for type 7 entities. +# dave@slackbuilds.org ####################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-11-24 19:12:52.495714437 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-11-30 12:56:38.872336516 +0000 -@@ -43,6 +43,34 @@ - #include "util/memory.h" - #include "util/string.h" +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-13 22:35:13.663935305 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:16:00.053003768 +0000 +@@ -197,7 +197,7 @@ + command->length = strlen(command->source); + } -+#ifdef HAVE_FCNTL_H -+#include <fcntl.h> /* OS/2 needs this after sys/types.h */ -+#endif -+ -+/* To enable logging for debugging purposes. */ -+#if 0 -+ -+#define LOGFILE "/tmp/log" -+ -+static void -+debug_log(unsigned char *data, int NL) -+{ -+ int fd = open(LOGFILE, O_WRONLY | O_APPEND | O_CREAT, 0622); -+ -+ if (fd == -1) return; -+ -+ set_bin(fd); -+ write(fd, data, strlen(data)); -+ if (NL) -+ write(fd, "\n", 1); -+ close(fd); -+} -+#undef LOGFILE -+ -+#else -+#define debug_log(data, len) -+#endif -+ - struct module gopher_protocol_module = struct_module( - /* name: */ N_("Gopher"), - /* options: */ NULL, -@@ -219,23 +247,31 @@ +-static struct connection_state init_gopher_index_cache_entry(struct connection *conn); ++/* static struct connection_state init_gopher_index_cache_entry(struct connection *conn); */ + + static struct connection_state + add_gopher_command(struct connection *conn, struct string *command, +@@ -205,7 +205,7 @@ + unsigned char *selector, int selectorlen) + { + unsigned char *query; +- int querylen; ++ int querylen = 0; + + if (!init_string(command)) + return connection_state(S_OUT_OF_MEM); +@@ -218,13 +218,14 @@ + /* Exclude '?' */ if (query) selectorlen -= 1; query = NULL; - querylen = 0; +- querylen = 0; - } else { - query += 1; + } else if (entity == GOPHER_INDEX) { -+ /* fix query size to not include the seach= part */ ++ /* fix query size to not include the search= part */ + query += 8; querylen = selector + selectorlen - query; /* Exclude '?' */ - selectorlen -= querylen + 1; -+ /* fix selector length to fit with query */ +- if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) { ++ /* fix selector length to fit with query */ + selectorlen -= querylen + 8; - if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) { ++ if (querylen >= 7 && !c_strncasecmp(query, "submit=", 7)) { query += 7; querylen -= 7; } -+ debug_log("selector:", 1); -+ debug_log(selector, 1); -+ debug_log("query:", 1); -+ debug_log(query, 1); - } - +@@ -233,9 +234,11 @@ switch (entity) { case GOPHER_INDEX: /* No search required? */ -+ /* Don't display the form page */ ++ /* Don't display the form page */ if (!query) { done_string(command); - return init_gopher_index_cache_entry(conn); @@ -80,41 +56,58 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c } add_uri_decoded(command, selector, selectorlen, 0); -@@ -343,6 +379,10 @@ - gopher->entity = entity_info; - gopher->commandlen = command.length; - -+debug_log("439 gopher->entity:", 1); -+debug_log(gopher->entity, 1); -+debug_log("437 command.source:", 1); -+debug_log(command.source, 1); - memcpy(gopher->command, command.source, command.length); - done_string(&command); - -@@ -377,7 +417,7 @@ +@@ -371,13 +374,14 @@ + add_gopher_search_field(struct string *buffer, const unsigned char *text, + const unsigned char *addr) + { ++ /* Not *every* query is a search! */ + add_format_to_string(buffer, + "<form action=\"%s\">" + "<table>" "<td> </td>" "<td>%s:</td>" - "<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>" +- "<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>" - "<td><input type=submit value=\"Search\"></td>" ++ "<td><input maxlength=\"256\" name=\"submit\" value=\"\"></td>" + "<td><input type=submit value=\"Submit\"></td>" "</table>" "</form>", addr, text); -@@ -726,7 +766,8 @@ - /* Now read the data from the socket */ - switch (gopher->entity->type) { - case GOPHER_DIRECTORY: -- case GOPHER_INDEX: -+/* Don't do directory list for cgi output (7) -+ case GOPHER_INDEX: */ - state = read_gopher_directory_data(conn, rb); - break; +@@ -662,6 +666,7 @@ + } + + /* Display a Gopher Index document. */ ++/* Use the page that the gopher site sends us + static struct connection_state + init_gopher_index_cache_entry(struct connection *conn) + { +@@ -674,9 +679,9 @@ + + where = get_uri_string(conn->uri, URI_PUBLIC); + +- /* TODO: Use different function when using UTF-8 ++ TODO: Use different function when using UTF-8 + * in terminal (decode_uri_for_display replaces +- * bytes of UTF-8 characters width '*'). */ ++ * bytes of UTF-8 characters width '*'). * + if (where) decode_uri_for_display(where); + + add_format_to_string(&buffer, +@@ -695,7 +700,7 @@ + + mem_free_if(where); + +- /* FIXME: I think this needs a form or something */ ++ * FIXME: I think this needs a form or something * -@@ -738,6 +779,7 @@ - state = connection_state(S_GOPHER_CSO_ERROR); - break; + add_fragment(conn->cached, conn->from, buffer.source, buffer.length); + conn->from += buffer.length; +@@ -707,7 +712,7 @@ + ? connection_state(S_OK) + : connection_state(S_OUT_OF_MEM); + } +- ++*/ -+ case GOPHER_INDEX: - case GOPHER_SOUND: - case GOPHER_PLUS_SOUND: - case GOPHER_PLUS_MOVIE: + static void + read_gopher_response_data(struct socket *socket, struct read_buffer *rb) diff --git a/network/elinks/patches/0003-gopher_directory_links.patch b/network/elinks/patches/0003-gopher_directory_links.patch index dc80ef3728..15a89fac2f 100644 --- a/network/elinks/patches/0003-gopher_directory_links.patch +++ b/network/elinks/patches/0003-gopher_directory_links.patch @@ -1,42 +1,22 @@ ####################################################################### -# elinks does not follow links to directories on other servers -# properly. This adds a '/' before the '1' at the start of a link and -# removes any trailing 1. -# dave@dawoodfall.net +# Fix remote directory links. +# dave@slackbuilds.org ####################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-17 01:54:27.941645180 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-12-17 21:52:05.072454433 +0000 -@@ -317,6 +317,9 @@ - unsigned char *URL = "hURL%3"; - unsigned char *CURI = "HURI%3"; - unsigned char *CURL = "HURL%3"; -+ unsigned char *DIR = "1"; -+ unsigned char *SLASHDIR = "/1"; -+ unsigned char *SLASHPOS; - int selectorlen = conn->uri->datalen; - struct gopher_entity_info *entity_info; - size_t size; -@@ -354,6 +357,26 @@ +diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-13 23:22:18.918292198 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:21:00.631960039 +0000 +@@ -321,6 +321,18 @@ selectorlen++; } -+ if (entity_info->type == '1') -+ { -+ if (strstr(selector, DIR) == selector) -+ { -+ *selector++; ++ if (entity_info->type == '1') { ++ if (strchr(selector, '1') == (char *) selector) { ++ selector++; + selectorlen--; + } -+ else -+ { -+ SLASHPOS = strstr(selector, SLASHDIR); -+ if (SLASHPOS != NULL) -+ { -+ if (strlen(SLASHPOS) == 2) -+ { -+ selectorlen--; -+ } ++ else { ++ if ((char *) selector == "/1") { ++ selectorlen--; + } + } + } @@ -44,18 +24,3 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c state = add_gopher_command(conn, &command, entity, selector, selectorlen); if (!is_in_state(state, S_CONN)) return state; -@@ -379,10 +402,10 @@ - gopher->entity = entity_info; - gopher->commandlen = command.length; - --debug_log("439 gopher->entity:", 1); --debug_log(gopher->entity, 1); --debug_log("437 command.source:", 1); --debug_log(command.source, 1); -+ debug_log("439 gopher->entity: ", 0); -+ debug_log(gopher->entity, 1); -+ debug_log("437 command.source: ", 0); -+ debug_log(command.source, 1); - memcpy(gopher->command, command.source, command.length); - done_string(&command); - diff --git a/network/elinks/patches/0004-ssl_cert_verify.patch b/network/elinks/patches/0004-ssl_cert_verify.patch index 4629da564a..3b56e1ae40 100644 --- a/network/elinks/patches/0004-ssl_cert_verify.patch +++ b/network/elinks/patches/0004-ssl_cert_verify.patch @@ -1,10 +1,8 @@ ############################################################################## -# elinks does not verify ssl host names with openssl -# This is a modifed version of the patch here that fixes that issue: +# Verify SSL host names with OpenSSL. +# Turn on verification by default. # http://lists.linuxfromscratch.org/pipermail/elinks-dev/2015-June/002099.html -# This patch turns on verification by default, and differentiates -# between host verification fail and normal SSL errors. -# dave@dawoodfall.net +# dave@slackbuilds.org ############################################################################## --- a/configure.in 2017-12-21 15:58:12.470247050 +0000 +++ b/configure.in 2017-12-21 16:10:27.406938487 +0000 @@ -75,7 +73,7 @@ diff -Naur a/src/network/ssl/socket.c b/src/network/ssl/socket.c default: socket->no_tls = !socket->no_tls; - socket->ops->retry(socket, connection_state(S_SSL_ERROR)); -+ if (SSL_VERIFY_FAIL_IF_NO_PEER_CERT != NULL) ++ if (SSL_VERIFY_FAIL_IF_NO_PEER_CERT) + socket->ops->retry(socket, connection_state(S_SSL_CERTFAIL)); + else + socket->ops->retry(socket, connection_state(S_SSL_ERROR)); diff --git a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch b/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch index f93b0d5431..b255fb4f98 100644 --- a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch +++ b/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch @@ -1,12 +1,13 @@ ##################################################################### -# Some fixes for having line feeds in text without a carriage return. +# Fix line feeds without carriage returns. # Make sure that only lines with tabs are treated as links. # Support links that don't begin with a '/'. +# dave@slackbuilds.org ##################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-28 15:08:54.310546900 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-12-28 20:26:00.635193897 +0000 -@@ -326,7 +326,7 @@ +diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:19:39.956296190 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 03:20:05.295045232 +0000 +@@ -290,7 +290,7 @@ /* Get entity type, and selector string. */ /* Pick up gopher_entity */ @@ -15,73 +16,41 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c entity = *selector++; selectorlen--; } -@@ -357,8 +357,7 @@ - selectorlen++; +@@ -333,6 +333,18 @@ + } } -- if (entity_info->type == '1') -- { + if (entity_info->type == '1') { - if (strstr(selector, DIR) == selector) - { - *selector++; -@@ -402,9 +401,9 @@ - gopher->entity = entity_info; - gopher->commandlen = command.length; - -- debug_log("439 gopher->entity: ", 0); -+ debug_log("404 gopher->entity: ", 0); - debug_log(gopher->entity, 1); -- debug_log("437 command.source: ", 0); -+ debug_log("406 command.source: ", 0); - debug_log(command.source, 1); - memcpy(gopher->command, command.source, command.length); - done_string(&command); -@@ -486,6 +485,7 @@ - unsigned char *host = NULL; - unsigned char *port = NULL; - enum gopher_entity entity = *name++; -+ int link = 0; - - if (!entity) { - add_char_to_string(buffer, '\n'); -@@ -495,6 +495,7 @@ - if (*name) { - selector = strchr(name, ASCII_TAB); - if (selector) { -+ link = 1; - /* Terminate name */ - *selector++ = '\0'; - -@@ -565,7 +566,7 @@ - switch (entity) { - case GOPHER_WWW: - /* Gopher pointer to W3 */ -- if (selector) { -+ if (selector && link == 1) { - add_gopher_link(buffer, name, selector); - break; - } -@@ -617,7 +618,8 @@ ++ if (strchr(selector, '1') == (char *) selector) { ++ selector++; ++ selectorlen--; ++ } ++ else { ++ if ((char *) selector == "/1") { ++ selectorlen--; ++ } ++ } ++ } ++ + state = add_gopher_command(conn, &command, entity, selector, selectorlen); + if (!is_in_state(state, S_CONN)) + return state; +@@ -570,7 +582,8 @@ } else if (address.length > 0 && strlcmp(address.source, address.length - 1, - "gopher://error.host:1/", -1)) { + "gopher://error.host:1/", -1) -+ && link == 1) { ++ && selector) { add_gopher_link(buffer, name, address.source); } else { -@@ -639,6 +641,12 @@ +@@ -590,7 +603,7 @@ + get_gopher_line_end(unsigned char *data, int datalen) + { for (; datalen > 1; data++, datalen--) - if (data[0] == ASCII_CR && data[1] == ASCII_LF) +- if (data[0] == ASCII_CR && data[1] == ASCII_LF) ++ if (data[0] == ASCII_CR || data[0] == ASCII_LF) return data + 2; -+ else -+ if(data[0] == ASCII_CR) -+ return data + 2; -+ else -+ if(data[0] == ASCII_LF) -+ return data + 2; return NULL; - } diff --git a/network/elinks/patches/0006-gopher-indexes_nocr.patch b/network/elinks/patches/0006-gopher-indexes_nocr.patch new file mode 100644 index 0000000000..9e4a441db6 --- /dev/null +++ b/network/elinks/patches/0006-gopher-indexes_nocr.patch @@ -0,0 +1,19 @@ +####################################################################### +# Fix index listings with only LF and no CRs. +# dave@slackbuilds.org +####################################################################### +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 06:42:11.030536586 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:42:26.710000886 +0000 +@@ -757,6 +757,11 @@ + switch (gopher->entity->type) { + case GOPHER_DIRECTORY: + case GOPHER_INDEX: ++ /* Lines with no carriage returns */ ++ if (strchr(rb->data, ASCII_CR) == NULL) { ++ strncat(rb->data, "\r\n", 2); ++ rb->length += 3; ++ } + state = read_gopher_directory_data(conn, rb); + break; + diff --git a/network/elinks/patches/0006-indexes_nocr.patch b/network/elinks/patches/0006-indexes_nocr.patch deleted file mode 100644 index 5c68cee8ca..0000000000 --- a/network/elinks/patches/0006-indexes_nocr.patch +++ /dev/null @@ -1,62 +0,0 @@ -####################################################################### -# Fixes index listings with only LF and no CRs. -# dave@dawoodfall.net -####################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-29 17:14:24.247093626 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-12-29 17:12:08.496272595 +0000 -@@ -638,15 +638,16 @@ - static unsigned char * - get_gopher_line_end(unsigned char *data, int datalen) - { -- for (; datalen > 1; data++, datalen--) -- if (data[0] == ASCII_CR && data[1] == ASCII_LF) -+ for (; datalen > 1; data++, datalen--) { -+ if (data[0] == ASCII_CR && data[1] == ASCII_LF) - return data + 2; - else - if(data[0] == ASCII_CR) -- return data + 2; -- else -- if(data[0] == ASCII_LF) -- return data + 2; -+ return data + 1; -+ else -+ if(data[0] == ASCII_LF) -+ return data + 1; -+ } - - return NULL; - } -@@ -796,9 +797,21 @@ - - /* Now read the data from the socket */ - switch (gopher->entity->type) { -+ case GOPHER_INDEX: -+ /* Lines with no carriage returns */ -+ if (strchr(rb->data, ASCII_CR) == NULL) { -+ unsigned char *tmp; -+ tmp = malloc(rb->length + 3); -+ memcpy(tmp, "i", 1); -+ memcpy(tmp+1, rb->data, rb->length); -+ tmp[rb->length]= '\r'; -+ tmp[rb->length+1]= '\n'; -+ rb->length+=3; -+ memcpy(rb->data, tmp, rb->length); -+ free(tmp); -+ } -+ - case GOPHER_DIRECTORY: --/* Don't do directory list for cgi output (7) -- case GOPHER_INDEX: */ - state = read_gopher_directory_data(conn, rb); - break; - -@@ -810,7 +823,6 @@ - state = connection_state(S_GOPHER_CSO_ERROR); - break; - -- case GOPHER_INDEX: - case GOPHER_SOUND: - case GOPHER_PLUS_SOUND: - case GOPHER_PLUS_MOVIE: diff --git a/network/elinks/patches/0007-gopher-move_null.patch b/network/elinks/patches/0007-gopher-move_null.patch new file mode 100644 index 0000000000..8f259e55cf --- /dev/null +++ b/network/elinks/patches/0007-gopher-move_null.patch @@ -0,0 +1,16 @@ +################################################################### +# Move the null terminator one char forwards. +# dave@slackbuilds.org +################################################################### +diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:24:11.259323801 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 03:24:49.452454019 +0000 +@@ -615,7 +615,7 @@ + assert(line < end); + + /* Just to be safe NUL terminate the line */ +- end[-2] = 0; ++ end[-1] = 0; + + return line[0] == '.' && !line[1] ? NULL : line; + } diff --git a/network/elinks/patches/0007-move_null.patch b/network/elinks/patches/0007-move_null.patch deleted file mode 100644 index 9d8037cc37..0000000000 --- a/network/elinks/patches/0007-move_null.patch +++ /dev/null @@ -1,16 +0,0 @@ -################################################################### -# Move the added null terminator one char forwards -# dave@dawoodfall.net -################################################################### -diff --exclude .git -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-29 17:15:39.521209968 +0000 -+++ b/src/protocol/gopher/gopher.c 2018-01-17 05:46:45.660258482 +0000 -@@ -658,7 +658,7 @@ - assert(line < end); - - /* Just to be safe NUL terminate the line */ -- end[-2] = 0; -+ end[-1] = 0; - - return line[0] == '.' && !line[1] ? NULL : line; - } diff --git a/network/elinks/patches/0008-gopher-html-entities.patch b/network/elinks/patches/0008-gopher-html-entities.patch new file mode 100644 index 0000000000..750d1a49de --- /dev/null +++ b/network/elinks/patches/0008-gopher-html-entities.patch @@ -0,0 +1,47 @@ +################################################################### +# Encode < > to HTML. +################################################################### +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:26:41.791778387 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:19:56.964025440 +0000 +@@ -620,6 +620,25 @@ + return line[0] == '.' && !line[1] ? NULL : line; + } + ++/* substring replacement */ ++static void ++str_replace(char * in_string, char * s_string, char * r_string) ++{ ++ /* max == replace all characters */ ++ char temp[strlen(in_string) * (strlen(r_string) - strlen(s_string)) + 1]; ++ char * pos; ++ ++ if (!(pos = strstr(in_string, s_string))) ++ return; ++ ++ strncpy(temp, in_string, pos - in_string); ++ temp[pos - in_string] = 0; ++ sprintf(temp + (pos - in_string), "%s%s", r_string, pos + 1); ++ in_string[0] = 0; ++ strcpy(in_string, temp); ++ return str_replace(in_string, s_string, r_string); ++} ++ + /* Parse a Gopher Menu document */ + static struct connection_state + read_gopher_directory_data(struct connection *conn, struct read_buffer *rb) +@@ -639,6 +658,14 @@ + return connection_state(S_OUT_OF_MEM); + } + ++ /* Lines with characters that need to be converted to html */ ++ if (strstr(rb->data, "<")) { ++ str_replace(rb->data, "<", "<"); ++ } ++ if (strstr(rb->data, ">")) { ++ str_replace(rb->data, ">", ">"); ++ } ++ + while ((end = get_gopher_line_end(rb->data, rb->length))) { + unsigned char *line = check_gopher_last_line(rb->data, end); + diff --git a/network/emailrelay/emailrelay.SlackBuild b/network/emailrelay/emailrelay.SlackBuild index b0cc841be3..5c577864bc 100644 --- a/network/emailrelay/emailrelay.SlackBuild +++ b/network/emailrelay/emailrelay.SlackBuild @@ -2,8 +2,7 @@ # Slackware build script for emailrelay -# Copyright 2011,2013 Andrew Clemons, Wellington, New Zealand -# Copyright 2016-2018 Andrew Clemons, Wellington, New Zealand +# Copyright 2011,2013,2016-2021 Andrew Clemons, Wellington, New Zealand # 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=emailrelay -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/emailrelay/emailrelay.info b/network/emailrelay/emailrelay.info index 2a4e5a7a24..597b1b8132 100644 --- a/network/emailrelay/emailrelay.info +++ b/network/emailrelay/emailrelay.info @@ -1,8 +1,8 @@ PRGNAM="emailrelay" -VERSION="2.0.1" -HOMEPAGE="https://emailrelay.sourceforge.net/" -DOWNLOAD="https://sourceforge.net/projects/emailrelay/files/emailrelay/2.0.1/emailrelay-2.0.1-src.tar.gz" -MD5SUM="eb9d59ad77f3b98184fa4efd76e37c47" +VERSION="2.2" +HOMEPAGE="http://emailrelay.sourceforge.net/" +DOWNLOAD="https://sourceforge.net/projects/emailrelay/files/emailrelay/2.2/emailrelay-2.2-src.tar.gz" +MD5SUM="0cc919a5e688244e78ac0dabd11d60b5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/emailrelay/slack-desc b/network/emailrelay/slack-desc index 8f22802191..79b64ebefe 100644 --- a/network/emailrelay/slack-desc +++ b/network/emailrelay/slack-desc @@ -16,4 +16,4 @@ emailrelay: through. When running as a store-and-forward MTA incoming messages emailrelay: are stored in a local spool directory, and then forwarded to the emailrelay: next SMTP server on request. emailrelay: -emailrelay: +emailrelay: http://emailrelay.sourceforge.net/ diff --git a/network/enet/enet.SlackBuild b/network/enet/enet.SlackBuild index 2a933a0a9c..fb36c673b5 100644 --- a/network/enet/enet.SlackBuild +++ b/network/enet/enet.SlackBuild @@ -2,16 +2,37 @@ # Slackware build script for enet -# Written by otzy_007 (oz@oprod.net) +# Copyright 2021 S. S. Bolokanar, Bulgaria <sbolokanov@abv.bg> +# С. С. Болоканаръ, България +# 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. + +# Originally written by: otzy_007 (oz@oprod.net) 2010 PRGNAM=enet -VERSION=${VERSION:-1.3.12} +VERSION=${VERSION:-1.3.17} 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 @@ -22,8 +43,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/network/enet/enet.info b/network/enet/enet.info index d6aa8ddcb6..1eba7183ea 100644 --- a/network/enet/enet.info +++ b/network/enet/enet.info @@ -1,10 +1,10 @@ PRGNAM="enet" -VERSION="1.3.12" -HOMEPAGE="http://enet.bespin.org/index.html" -DOWNLOAD="http://enet.bespin.org/download/enet-1.3.12.tar.gz" -MD5SUM="2b581600a589553c1e7684ad663f27a8" +VERSION="1.3.17" +HOMEPAGE="http://enet.bespin.org" +DOWNLOAD="http://enet.bespin.org/download/enet-1.3.17.tar.gz" +MD5SUM="c8e96051c5a60afa9f3052d02b2cbe19" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="otzy_007" -EMAIL="oz@oprod.net" +MAINTAINER="S. S. Bolokanar" +EMAIL="sbolokanov@abv.bg" diff --git a/network/enet/slack-desc b/network/enet/slack-desc index 8e9c473393..b3adcd3730 100644 --- a/network/enet/slack-desc +++ b/network/enet/slack-desc @@ -13,7 +13,7 @@ enet: simple and robust network communication layer on top of UDP enet: (User Datagram Protocol). The primary feature it provides enet: is optional reliable, in-order delivery of packets. enet: -enet: Homepage: http://enet.bespin.org/index.html +enet: Homepage: http://enet.bespin.org enet: enet: enet: diff --git a/network/etherape/etherape.SlackBuild b/network/etherape/etherape.SlackBuild index 4a121bcf59..8e6f7312f2 100644 --- a/network/etherape/etherape.SlackBuild +++ b/network/etherape/etherape.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2011-2013 Chris Abela, Malta # Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org -# Copyright 2017-2018 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 @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=etherape -VERSION=${VERSION:-0.9.18} +VERSION=${VERSION:-0.9.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -93,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 ABOUT-NLS AUTHORS COPYING ChangeLog FAQ INSTALL NEWS OVERVIEW README* TODO \ +cp -a ABOUT-NLS AUTHORS COPYING ChangeLog FAQ NEWS OVERVIEW README* TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/etherape/etherape.info b/network/etherape/etherape.info index 97fba9b12c..9ae95c8d03 100644 --- a/network/etherape/etherape.info +++ b/network/etherape/etherape.info @@ -1,8 +1,8 @@ PRGNAM="etherape" -VERSION="0.9.18" +VERSION="0.9.19" HOMEPAGE="http://etherape.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.18.tar.gz" -MD5SUM="6d6a6c03e03e2d6aae3a59cd42752ac1" +DOWNLOAD="http://downloads.sourceforge.net/etherape/etherape-0.9.19.tar.gz" +MD5SUM="eaf0326ddef2a50fdaae369aee53be2a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="goocanvas2 c-ares" diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild index 6b4d4de738..d331932033 100644 --- a/network/ettercap/ettercap.SlackBuild +++ b/network/ettercap/ettercap.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ettercap -VERSION=${VERSION:-0.8.3} +VERSION=${VERSION:-0.8.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/ettercap/ettercap.info b/network/ettercap/ettercap.info index dae0424458..5fdfb8eaef 100644 --- a/network/ettercap/ettercap.info +++ b/network/ettercap/ettercap.info @@ -1,8 +1,8 @@ PRGNAM="ettercap" -VERSION="0.8.3" +VERSION="0.8.3.1" HOMEPAGE="https://ettercap.github.io/ettercap/" -DOWNLOAD="https://github.com/Ettercap/ettercap/releases/download/v0.8.3/ettercap-0.8.3.tar.gz" -MD5SUM="6b27d329a509e65fef9044c95a2dde35" +DOWNLOAD="https://github.com/Ettercap/ettercap/releases/download/v0.8.3.1/ettercap-0.8.3.1.tar.gz" +MD5SUM="aec144118be53679f906843ff3054ee0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libnet" diff --git a/network/exim/README.SBo b/network/exim/README.SBo index d2da77c32b..b72f41afb4 100644 --- a/network/exim/README.SBo +++ b/network/exim/README.SBo @@ -15,6 +15,7 @@ The database lookups will not be built by default, but you can enable them easily by passing the directives on the command line when calling this script, e.g. + LOOKUP_JSON=yes \ LOOKUP_LDAP=yes \ LOOKUP_MYSQL=yes \ LOOKUP_PGSQL=yes \ @@ -22,8 +23,9 @@ this script, e.g. LOOKUP_SQLITE=yes \ sh exim.SlackBuild -For including the Redis and PostgreSQL lookups you'll need the "hiredis" -resp. "postgresql" packages, both available from SlackBuilds.org. +For including the JSON, PostgreSQL and Redis lookups you'll need the +"jansson", "hiredis" and "postgresql" packages respectively, all available +from SlackBuilds.org. WARNING: this package is intended as a drop-in replacement for Sendmail. As a result, there are some inevitable filename conflicts between diff --git a/network/exim/exim.Makefile b/network/exim/exim.Makefile index db91d5526e..5691e422f5 100644 --- a/network/exim/exim.Makefile +++ b/network/exim/exim.Makefile @@ -12,11 +12,12 @@ # Exim distribution directory before running the "make" command. # Things that depend on the operating system have default settings in -# OS/Makefile-Default, but these are overridden for some OS by files called -# called OS/Makefile-<osname>. You can further override these by creating files -# called Local/Makefile-<osname>, where "<osname>" stands for the name of your -# operating system - look at the names in the OS directory to see which names -# are recognized. +# OS/Makefile-Default, but these are overridden for some OS by files +# called OS/Makefile-<osname>. You can further override these settings by +# creating files Local/Makefile-<osname>, and Local/Makefile-<build>. +# The suffix "<osname>" stands for the name of your operating system - look +# at the names in the OS directory to see which names are recognized, +# and "<build>" is the content of the environment variable "build". # However, if you are building Exim for a single OS only, you don't need to # worry about setting up Local/Makefile-<osname>. Any build-time configuration @@ -178,6 +179,105 @@ SPOOL_DIRECTORY=/var/spool/exim ############################################################################### +# TLS # +############################################################################### +# Exim is built by default to support the SMTP STARTTLS command, which implements +# Transport Layer Security using SSL (Secure Sockets Layer). This requires you +# must install the OpenSSL library package or the GnuTLS library. Exim contains +# no cryptographic code of its own. + +# If you are running Exim as a (TLS) server, just building it with TLS support +# is all you need to do, as tls_advertise_hosts is set to '*' by +# default. But you are advised to create a suiteable certificate, and tell +# Exim about it by means of the tls_certificate and tls_privatekey run +# time options, otherwise Exim will create a self signed certificate on +# the fly. If you are running Exim only as a (TLS) client, building it with +# TLS support is all you need to do. +# +# If you are using pkg-config then you should not need to worry where +# the libraries and headers are installed, as the pkg-config .pc +# specification should include all -L/-I information necessary. +# Enabling the USE_*_PC options should be sufficient. If not using +# pkg-config, then you have to specify the libraries, and you mmight +# need to specify the locations too. + +# Uncomment the following lines if you want +# to build Exim without any TLS support (either OpenSSL or GnuTLS): +# DISABLE_TLS=yes +# Unless you do this, you must define one of USE_OPENSSL or USE_GNUTLS +# below. + +# If you are buliding with TLS, the library configuration must be done: + +# Uncomment this if you are using OpenSSL +USE_OPENSSL=yes +# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not +# and an optional location. +USE_OPENSSL_PC=openssl +# TLS_LIBS=-lssl -lcrypto +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto + +# Uncomment this if you are using GnuTLS +# USE_GNUTLS=yes +# Uncomment one of these settings if you are using GnuTLS; pkg-config vs not +# and an optional location. If you disable SUPPORT_DANE below, you +# can remove the gnutls-dane references here. Earlier versions of GnuTLS +# required libtasn1 and libgrypt also; add if needed. +# USE_GNUTLS_PC=gnutls gnutls-dane +# TLS_LIBS=-lgnutls -lgnutls-dane +# TLS_LIBS=-L/usr/local/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane + +# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's +# build process will require libgcrypt-config to exist in your $PATH. A +# version that old is likely to become unsupported by Exim in 2017. + +# The security fix we provide with the gnutls_allow_auto_pkcs11 option +# (4.82 PP/09) introduces a compatibility regression. The symbol is +# not available if GnuTLS is build without p11-kit (--without-p11-kit +# configure option). In this case use AVOID_GNUTLS_PKCS11=yes when +# building Exim. +# AVOID_GNUTLS_PKCS11=yes + +# If you are running Exim as a server, note that just building it with TLS +# support is not all you need to do. You also need to set up a suitable +# certificate, and tell Exim about it by means of the tls_certificate +# and tls_privatekey run time options. You also need to set tls_advertise_hosts +# to specify the hosts to which Exim advertises TLS support. On the other hand, +# if you are running Exim only as a client, building it with TLS support +# is all you need to do. + +# If you are using pkg-config then you should not need to worry where the +# libraries and headers are installed, as the pkg-config .pc specification +# should include all -L/-I information necessary. If not using pkg-config +# then you might need to specify the locations too. + +# Additional libraries and include files are required for both OpenSSL and +# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed +# with all your other libraries. If they are in a special directory, you may +# need something like + +# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto + +# or + +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt -lgnutls-dane +# If not using DANE under GnuTLS we can lose one library +# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt + +# TLS_LIBS is included only on the command for linking Exim itself, not on any +# auxiliary programs. If the include files are not in a standard place, you can +# set TLS_INCLUDE to specify where they are, for example: + +# TLS_INCLUDE=-I/usr/local/openssl/include/ +# or +# TLS_INCLUDE=-I/opt/gnu/include + +# You don't need to set TLS_INCLUDE if the relevant directories are already +# specified in INCLUDE. + + + +############################################################################### # THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # ############################################################################### @@ -309,6 +409,8 @@ LOOKUP_DNSDB=yes LOOKUP_CDB=yes LOOKUP_DSEARCH=yes # LOOKUP_IBASE=yes +# LOOKUP_JSON=yes +LOOKUP_JSON_PC=jansson # LOOKUP_LDAP=yes # LOOKUP_MYSQL=yes # LOOKUP_MYSQL_PC=mariadb @@ -332,6 +434,9 @@ LOOKUP_SQLITE_PC=sqlite3 # LOOKUP_NWILDLSEARCH=yes +# Some platforms may need this for LOOKUP_NIS: +# LIBS += -lnsl + #------------------------------------------------------------------------------ # If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate # which LDAP library you have. Unfortunately, though most of their functions @@ -366,9 +471,11 @@ PCRE_CONFIG=yes #------------------------------------------------------------------------------ -# Uncomment the following line to add DANE support +# Comment out the following line to remove DANE support # Note: Enabling this unconditionally overrides DISABLE_DNSSEC -# For DANE under GnuTLS we need an additional library. See TLS_LIBS below. +# forces you to have SUPPORT_TLS enabled (the default). For DANE under +# GnuTLS we need an additional library. See TLS_LIBS or USE_GNUTLS_PC +# below. SUPPORT_DANE=yes #------------------------------------------------------------------------------ @@ -378,7 +485,7 @@ SUPPORT_DANE=yes # don't need to set LOOKUP_INCLUDE if the relevant directories are already # specified in INCLUDE. The settings below are just examples; -lpq is for # PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite, -lhiredis -# is for Redis. +# is for Redis, -ljansson for JSON. # # You do not need to use this for any lookup information added via pkg-config. @@ -396,10 +503,11 @@ LOOKUP_INCLUDE+=-I/usr/include/mysql LOOKUP_LIBS+=-L/usr/lib$(LIBDIRSUFFIX)/mysql -lmysqlclient endif + #------------------------------------------------------------------------------ # Compiling the Exim monitor: If you want to compile the Exim monitor, a # program that requires an X11 display, then EXIM_MONITOR should be set to the -# value "eximon.bin". Comment out this setting to disable compilation of the +# value "eximon.bin". De-comment this setting to enable compilation of the # monitor. The locations of various X11 directories for libraries and include # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. @@ -470,6 +578,11 @@ DISABLE_MAL_MKS=yes # DISABLE_EVENT=yes +# Uncomment this line to include support for early pipelining, per +# https://datatracker.ietf.org/doc/draft-harris-early-pipe/ +# SUPPORT_PIPE_CONNECT=yes + + #------------------------------------------------------------------------------ # Compiling Exim with experimental features. These are documented in # experimental-spec.txt. "Experimental" means that the way these features are @@ -490,12 +603,18 @@ DISABLE_MAL_MKS=yes # CFLAGS += -I/usr/local/include # LDFLAGS += -lsrs_alt +# Uncomment the following lines to add SRS (Sender rewriting scheme) support +# using only native facilities. +# EXPERIMENTAL_SRS_NATIVE=yes + # Uncomment the following line to add DMARC checking capability, implemented # using libopendmarc libraries. You must have SPF and DKIM support enabled also. -# EXPERIMENTAL_DMARC=yes -# DMARC_TLD_FILE= /etc/exim/opendmarc.tlds +# SUPPORT_DMARC=yes # CFLAGS += -I/usr/local/include # LDFLAGS += -lopendmarc +# Uncomment the following if you need to change the default. You can +# override it at runtime (main config option dmarc_tld_file) +# DMARC_TLD_FILE=/etc/exim/opendmarc.tlds # Uncomment the following line to add ARC (Authenticated Received Chain) # support. You must have SPF and DKIM support enabled also. @@ -523,10 +642,11 @@ DISABLE_MAL_MKS=yes # Uncomment the following line to add queuefile transport support # EXPERIMENTAL_QUEUEFILE=yes -# Uncomment the following to add REQUIRETLS support. -# You must also have SUPPORT_TLS enabled. -# Ref: https://datatracker.ietf.org/doc/draft-fenton-smtp-require-tls -# EXPERIMENTAL_REQUIRETLS=yes +# Uncomment the following line to include support for TLS Resumption +# EXPERIMENTAL_TLS_RESUME=yes + +# Uncomment the following to include the fast-ramp two-phase-queue-run support +# EXPERIMENTAL_QUEUE_RAMP=yes ############################################################################### # THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # @@ -655,6 +775,7 @@ FIXED_NEVER_USERS=root AUTH_CRAM_MD5=yes AUTH_CYRUS_SASL=yes AUTH_DOVECOT=yes +AUTH_EXTERNAL=yes # AUTH_GSASL=yes # AUTH_GSASL_PC=libgsasl # AUTH_HEIMDAL_GSSAPI=yes @@ -668,7 +789,6 @@ AUTH_TLS=yes # requires multiple pkg-config files to work with Exim, so the second example # above is needed. - #------------------------------------------------------------------------------ # If you specified AUTH_CYRUS_SASL above, you should ensure that you have the # Cyrus SASL library installed before trying to build Exim, and you probably @@ -680,6 +800,9 @@ AUTH_LIBS=-lsasl2 # AUTH_LIBS=-lgsasl # AUTH_LIBS=-lgssapi -lheimntlm -lkrb5 -lhx509 -lcom_err -lhcrypto -lasn1 -lwind -lroken -lcrypt +# If using AUTH_GSASL with SCRAM methods, you should also be defining +# SUPPORT_I18N to get standards-conformant support of utf8 normalization. + #------------------------------------------------------------------------------ # When Exim is decoding MIME "words" in header lines, most commonly for use @@ -768,75 +891,6 @@ HEADERS_CHARSET="ISO-8859-1" #------------------------------------------------------------------------------ -# Exim can be built to support the SMTP STARTTLS command, which implements -# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you -# must install the OpenSSL library package or the GnuTLS library. Exim contains -# no cryptographic code of its own. Uncomment the following lines if you want -# to build Exim with TLS support. If you don't know what this is all about, -# leave these settings commented out. - -# This setting is required for any TLS support (either OpenSSL or GnuTLS) -SUPPORT_TLS=yes - -# Uncomment one of these settings if you are using OpenSSL; pkg-config vs not -USE_OPENSSL_PC=openssl -# TLS_LIBS=-lssl -lcrypto - -# Uncomment the first and either the second or the third of these if you -# are using GnuTLS. If you have pkg-config, then the second, else the third. -# USE_GNUTLS=yes -# USE_GNUTLS_PC=gnutls -# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt - -# If using GnuTLS older than 2.10 and using pkg-config then note that Exim's -# build process will require libgcrypt-config to exist in your $PATH. A -# version that old is likely to become unsupported by Exim in 2017. - -# The security fix we provide with the gnutls_allow_auto_pkcs11 option -# (4.82 PP/09) introduces a compatibility regression. The symbol is -# not available if GnuTLS is build without p11-kit (--without-p11-kit -# configure option). In this case use AVOID_GNUTLS_PKCS11=yes when -# building Exim. -# AVOID_GNUTLS_PKCS11=yes - -# If you are running Exim as a server, note that just building it with TLS -# support is not all you need to do. You also need to set up a suitable -# certificate, and tell Exim about it by means of the tls_certificate -# and tls_privatekey run time options. You also need to set tls_advertise_hosts -# to specify the hosts to which Exim advertises TLS support. On the other hand, -# if you are running Exim only as a client, building it with TLS support -# is all you need to do. - -# If you are using pkg-config then you should not need to worry where the -# libraries and headers are installed, as the pkg-config .pc specification -# should include all -L/-I information necessary. If not using pkg-config -# then you might need to specify the locations too. - -# Additional libraries and include files are required for both OpenSSL and -# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed -# with all your other libraries. If they are in a special directory, you may -# need something like - -# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -# or -# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt - -# For DANE under GnuTLS we need an additional library. -# TLS_LIBS += -lgnutls-dane - -# TLS_LIBS is included only on the command for linking Exim itself, not on any -# auxiliary programs. If the include files are not in a standard place, you can -# set TLS_INCLUDE to specify where they are, for example: - -# TLS_INCLUDE=-I/usr/local/openssl/include/ -# or -# TLS_INCLUDE=-I/opt/gnu/include - -# You don't need to set TLS_INCLUDE if the relevant directories are already -# specified in INCLUDE. - - -#------------------------------------------------------------------------------ # The default distribution of Exim contains only the plain text form of the # documentation. Other forms are available separately. If you want to install # the documentation in "info" format, first fetch the Texinfo documentation @@ -1450,4 +1504,8 @@ PID_FILE_PATH=/var/run/exim.pid # ENABLE_DISABLE_FSYNC=yes +#------------------------------------------------------------------------------ +# For development, add this to include code to time various stages and report. +# CFLAGS += -DMEASURE_TIMING + # End of EDITME for Exim 4. diff --git a/network/exim/exim.SlackBuild b/network/exim/exim.SlackBuild index 9e5204563f..a9c26a8899 100644 --- a/network/exim/exim.SlackBuild +++ b/network/exim/exim.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Exim -# Copyright 2012-2019 Thomas Morper, Augsburg, Germany +# Copyright 2012-2020 Thomas Morper, Augsburg, 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=exim -VERSION=${VERSION:-4.92.3} +VERSION=${VERSION:-4.94} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -128,5 +128,8 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Adjust version info for release candidates. +VERSION=${VERSION/-/_} + cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/exim/exim.info b/network/exim/exim.info index 1d6c1be9cd..0aaea452ce 100644 --- a/network/exim/exim.info +++ b/network/exim/exim.info @@ -1,8 +1,8 @@ PRGNAM="exim" -VERSION="4.92.3" +VERSION="4.94" HOMEPAGE="https://www.exim.org/" -DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.92.3.tar.xz" -MD5SUM="9be05c609af824ce19666e31d910cefd" +DOWNLOAD="https://ftp.exim.org/pub/exim/exim4/exim-4.94.tar.xz" +MD5SUM="4d4bfd56e2e9f25ceab23f623ed2f84a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" diff --git a/network/fdns/README b/network/fdns/README new file mode 100644 index 0000000000..7fd34b88c5 --- /dev/null +++ b/network/fdns/README @@ -0,0 +1,12 @@ +FDNS + +FDNS was designed to run as a local DoH proxy on a Linux desktop, +or as a server for a small network. Lean and mean, it protects the +computers against some of the most common cyber threats, all while +improving the privacy and the system performance. + +FDNS is written in C and licensed under GPLv3. The number one job +is privacy. We use only DoH services from non-logging providers, +while preferring small operators such as open-source enthusiasts +and privacy-oriented non-profit organizations. + diff --git a/network/fdns/fdns.SlackBuild b/network/fdns/fdns.SlackBuild new file mode 100644 index 0000000000..e15d2deab2 --- /dev/null +++ b/network/fdns/fdns.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for fdns + +# +# Copyright 2020 Andreo F. Rissardo <andreotec@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=fdns +VERSION=${VERSION:-0.9.62} +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 {} \; + +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|lib/fdns|lib${LIBDIRSUFFIX}/fdns|" Makefile +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 + +cp $TMP/$PRGNAM-$VERSION/{COPYING,README,RELNOTES} $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/network/fdns/fdns.info b/network/fdns/fdns.info new file mode 100644 index 0000000000..648a2f4700 --- /dev/null +++ b/network/fdns/fdns.info @@ -0,0 +1,10 @@ +PRGNAM="fdns" +VERSION="0.9.62" +HOMEPAGE="https://firejaildns.wordpress.com/" +DOWNLOAD="https://github.com/netblue30/fdns/releases/download/v0.9.62/fdns-0.9.62.tar.xz" +MD5SUM="54024101181e84174c164853ca086b48" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libseccomp" +MAINTAINER="Andreo F. Rissardo" +EMAIL="andreotec@gmail.com" diff --git a/network/fdns/slack-desc b/network/fdns/slack-desc new file mode 100644 index 0000000000..8b7421c005 --- /dev/null +++ b/network/fdns/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------------------------------------------------------| +fdns: fdns (Firejail DNS-over-HTTPS Proxy Server) +fdns: +fdns: FDNS was designed to run as a local DoH proxy on a Linux desktop, +fdns: or as a server for a small network. Lean and mean, it protects the +fdns: computers against some of the most common cyber threats, all while +fdns: improving the privacy and the system performance. FDNS is written in +fdns: C and licensed under GPLv3. The number one job is privacy. The number +fdns: one job is privacy. +fdns: +fdns: https://firejaildns.wordpress.com +fdns: diff --git a/network/felinks/README b/network/felinks/README new file mode 100644 index 0000000000..5a878fde58 --- /dev/null +++ b/network/felinks/README @@ -0,0 +1,72 @@ +Felinks is a maintained and up-to-date fork of ELinks, an advanced web +browser. + +ELinks is an advanced and well-established feature-rich text mode web +(HTTP/FTP/..) browser. ELinks can render both frames and tables, is +highly customizable and can be extended via scripts. It is very portable +and runs on a variety of platforms. The ELinks official website is +available at http://elinks.cz + +NOTE: Felinks will conflict with Elinks, so currently only one can be +installed at a time. + +There are a number of options that can be used to add support for +other protocols etc. To enable or disable an option use the following +method: + + MOUSE=no ./elinks.SlackBuild +or + MOUSE=no sh elinks.SlackBuild + +Multiple options can be combined. + +Category Description Default Value + +System: + +FASTMEM Direct use of system alloc no +CGI Local CGI support no +COMBINING Unicode combining characters no (experimental) +UTF8 UTF-8 support yes +IPV6 IPv6 support yes +HTMLHL HTML highlighting using DOM engine no +LZMA LZMA encoding support no +TRE REGEX SEARCH SUPPORT yes +BROTLI BROTLI COMPRESSION yes +DEBUG Debug support (disables fastmem) no +XTERM Xterm support (Enables X11) no +X11 X11 support no + +UI: + +MOUSE Mouse support yes +GPM GPM (mouse) support yes +EXMODE Exmode (ex/vi CLI) no + +Colours: + +COLS88 88 Colours no +COLS256 256 Colours no +COLSTRUE True Colours no + +Scripting: + +GUILE no +PERL no +PYTHON (python3 required) no +LUA yes + +Protocols: + +BITTORRENT no +DATA yes +FSP no +FTP yes +FINGER no +GOPHER no +NNTP no +SMB no + +OPTIONAL: + +python3 for python support (still experimental). diff --git a/network/felinks/felinks.SlackBuild b/network/felinks/felinks.SlackBuild new file mode 100644 index 0000000000..b03f8422b8 --- /dev/null +++ b/network/felinks/felinks.SlackBuild @@ -0,0 +1,200 @@ +#!/bin/sh + +# Slackware build script for felinks +# Copyright 2014 David Woodfall <dave@dawoodfall.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=felinks +VERSION=${VERSION:-08da1d8} +COMMIT=${COMMIT:-08da1d87eb74e082ca7aae8c81d2518a4415f3a7} +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} + +# Added -fno-strict-aliasing -Wno-pointer-sign for a much more peaceful build +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fno-strict-aliasing -Wno-pointer-sign" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC -fno-strict-aliasing -Wno-pointer-sign" + # fix for multilib + SLKLDFLAGS="-m64" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$COMMIT +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z +cd $PRGNAM-$COMMIT +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 {} \; + +for patch in $CWD/patches/*; do + printf "\n%s\n" "Applying Patch $( basename $patch )" + patch --verbose -p1 < $patch +done + +## System +[ "${FASTMEM:-no}" = "yes" ] && fastmem="--enable-fastmem" +[ "${DEBUG:-no}" = "yes" ] && debug="--enable-debug --disable-fastmem" +[ "$DEBUG" = "yes" ] && SLKCFLAGS="-ggdb $SLKCFLAGS" +[ "${CGI:-no}" = "yes" ] && cgi="--enable-cgi" +[ "${COMBINING:-no}" = "yes" ] && combining="--enable-combining" +[ "${UTF8:-yes}" = "no" ] && utf8="--disable-utf-8" +[ "${IPV6:-yes}" = "no" ] && ipv6="--disable-ipv6" +[ "${HTMLHL:-no}" = "yes" ] && htmlhl="--enable-html-highlight" +[ "${LZMA:-no}" = "yes" ] && lzma="--with-lzma" +[ "${TRE:-no}" = "no" ] && tre="--without-tre" +[ "${BROTLI:-no}" = "no" ] && brotli="--without-brotli" +[ "${LIBDOM:-no}" = "yes" ] && libdom="--with-libdom" +[ "${XTERM:-no}" = "no" ] && xterm="--without-xterm" +[ "$XTERM" = "yes" ] && X11="yes" +[ "${X11:-no}" = "no" ] && x11="--without-x" + +# UI +[ "${MOUSE:-yes}" = "no" ] && mouse="--disable-mouse" +[ "${GPM:-yes}" = "no" ] && gpm="--without-gpm" +[ "${EXMODE:-no}" = "yes" ] && exmode="--enable-exmode" + +# Colours +[ "${COLS88:-no}" = "yes" ] && cols88="--enable-88-colors" +[ "${COLS256:-no}" = "yes" ] && cols256="--enable-256-colors" +[ "${COLSTRUE:-no}" = "yes" ] && colstrue="--enable-true-colors" + +# Scripting +[ "${GUILE:-no}" = "yes" ] && guile="--with-guile" +[ "${PERL:-no}" = "yes" ] && perl="--with-perl" +[ "${PYTHON:-no}" = "yes" ] && python="--with-python" +[ "${LUA:-yes}" = "no" ] && lua="--without-lua" +[ "${ECMA:-yes}" = "no" ] && ecma="--disable-sm-scripting" + +# Protocols +[ "${BITTORRENT:-no}" = "yes" ] && bittorrent="--enable-bittorrent" +[ "${DATA:-yes}" = "no" ] && data="--disable-data" +[ "${FSP:-no}" = "yes" ] && fsp="--enable-fsp" +[ "${FTP:-yes}" = "no" ] && ftp="--disable-ftp" +[ "${FINGER:-no}" = "yes" ] && finger="--enable-finger" +[ "${GOPHER:-no}" = "yes" ] && gopher="--enable-gopher" +[ "${NNTP:-no}" = "yes" ] && nntp="--enable-nntp" +[ "${SMB:-no}" = "yes" ] && smb="--enable-smb" + +./autogen.sh +CFLAGS="$SLKCFLAGS -L/usr/lib$LIBDIRSUFFIX" \ +LDFLAGS="$SLKLDFLAGS" \ + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + $fastmem \ + $debug \ + $cgi \ + $combining \ + $utf8 \ + $ipv6 \ + $htmlhl \ + $lzma \ + $tre \ + $brotli \ + $libdom \ + $xterm \ + $x11 \ + $mouse \ + $gpm \ + $exmode \ + $cols88 \ + $cols256 \ + $colstrue \ + $guile \ + $perl \ + $python \ + $lua \ + $ecma \ + $bittorrent \ + $data \ + $fsp \ + $ftp \ + $finger \ + $gopher \ + $nntp \ + $smb \ + --build=$ARCH-slackware-linux + + make + make install DESTDIR=$PKG + +# Don't clobber the one supplied by glibc-i18n. +rm -f $PKG/usr/share/locale/locale.alias + +if [ "$DEBUG" = "no" ]; then + 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 +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/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS BUGS COPYING NEWS README SITES THANKS TODO \ + ChangeLog doc/*txt contrib \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# Remove any .git remnants +find $PKG -name ".git*" -exec rm -vrf {} \; + +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/network/felinks/felinks.info b/network/felinks/felinks.info new file mode 100644 index 0000000000..4d5bf48d14 --- /dev/null +++ b/network/felinks/felinks.info @@ -0,0 +1,10 @@ +PRGNAM="felinks" +VERSION="08da1d8" +HOMEPAGE="https://github.com/rkd77/felinks" +DOWNLOAD="https://github.com/rkd77/felinks/archive/08da1d87eb74e082ca7aae8c81d2518a4415f3a7/felinks-08da1d8.tar.gz" +MD5SUM="bc6b107e131dbfc0d17566b4f3d6429d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/network/felinks/patches/0001-gopher_html_links.patch b/network/felinks/patches/0001-gopher_html_links.patch new file mode 100644 index 0000000000..38a2dd0b10 --- /dev/null +++ b/network/felinks/patches/0001-gopher_html_links.patch @@ -0,0 +1,37 @@ +################################################################ +# Fix for HTML links that contain URL:http:// +# dave@slackbuilds.org +############################################################### +diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c +--- a/src/protocol/gopher/gopher.c 2013-12-18 15:38:57.000000000 +0000 ++++ b/src/protocol/gopher/gopher.c 2020-01-08 05:34:02.300498220 +0000 +@@ -277,6 +277,10 @@ + struct string command; + enum gopher_entity entity = DEFAULT_GOPHER_ENTITY; + unsigned char *selector = conn->uri->data; ++ unsigned char const* URI = "hURI%3"; ++ unsigned char const* URL = "hURL%3"; ++ unsigned char const* CURI = "HURI%3"; ++ unsigned char const* CURL = "HURL%3"; + int selectorlen = conn->uri->datalen; + struct gopher_entity_info *entity_info; + size_t size; +@@ -288,6 +292,18 @@ + selectorlen--; + } + ++ if(strstr(selector, URL) != NULL || strstr(selector, URI) != NULL) { ++ entity = GOPHER_HTML; ++ selector++; ++ selectorlen--; ++ } ++ ++ if(strstr(selector, CURL) != NULL || strstr(selector, CURI) != NULL) { ++ entity = GOPHER_CHTML; ++ selector++; ++ selectorlen--; ++ } ++ + /* This is probably a hack. It serves as a work around when no entity is + * available in the Gopher URI. Instead of segfaulting later the content + * will be served as application/octet-stream. However, it could diff --git a/network/felinks/patches/0002-gopher_index_queries.patch b/network/felinks/patches/0002-gopher_index_queries.patch new file mode 100644 index 0000000000..662fd13a7f --- /dev/null +++ b/network/felinks/patches/0002-gopher_index_queries.patch @@ -0,0 +1,113 @@ +####################################################################### +# Fix for type 7 entities. +# dave@slackbuilds.org +####################################################################### +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-13 22:35:13.663935305 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:16:00.053003768 +0000 +@@ -197,7 +197,7 @@ + command->length = strlen(command->source); + } + +-static struct connection_state init_gopher_index_cache_entry(struct connection *conn); ++/* static struct connection_state init_gopher_index_cache_entry(struct connection *conn); */ + + static struct connection_state + add_gopher_command(struct connection *conn, struct string *command, +@@ -205,7 +205,7 @@ + unsigned char *selector, int selectorlen) + { + unsigned char *query; +- int querylen; ++ int querylen = 0; + + if (!init_string(command)) + return connection_state(S_OUT_OF_MEM); +@@ -218,13 +218,14 @@ + /* Exclude '?' */ + if (query) selectorlen -= 1; + query = NULL; +- querylen = 0; +- } else { +- query += 1; ++ } else if (entity == GOPHER_INDEX) { ++ /* fix query size to not include the search= part */ ++ query += 8; + querylen = selector + selectorlen - query; + /* Exclude '?' */ +- selectorlen -= querylen + 1; +- if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) { ++ /* fix selector length to fit with query */ ++ selectorlen -= querylen + 8; ++ if (querylen >= 7 && !c_strncasecmp(query, "submit=", 7)) { + query += 7; + querylen -= 7; + } +@@ -233,9 +234,11 @@ + switch (entity) { + case GOPHER_INDEX: + /* No search required? */ ++ /* Don't display the form page */ + if (!query) { + done_string(command); +- return init_gopher_index_cache_entry(conn); ++ add_uri_decoded(command, selector, selectorlen, 0); ++ break; + } + + add_uri_decoded(command, selector, selectorlen, 0); +@@ -371,13 +374,14 @@ + add_gopher_search_field(struct string *buffer, const unsigned char *text, + const unsigned char *addr) + { ++ /* Not *every* query is a search! */ + add_format_to_string(buffer, + "<form action=\"%s\">" + "<table>" + "<td> </td>" + "<td>%s:</td>" +- "<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>" +- "<td><input type=submit value=\"Search\"></td>" ++ "<td><input maxlength=\"256\" name=\"submit\" value=\"\"></td>" ++ "<td><input type=submit value=\"Submit\"></td>" + "</table>" + "</form>", + addr, text); +@@ -662,6 +666,7 @@ + } + + /* Display a Gopher Index document. */ ++/* Use the page that the gopher site sends us + static struct connection_state + init_gopher_index_cache_entry(struct connection *conn) + { +@@ -674,9 +679,9 @@ + + where = get_uri_string(conn->uri, URI_PUBLIC); + +- /* TODO: Use different function when using UTF-8 ++ TODO: Use different function when using UTF-8 + * in terminal (decode_uri_for_display replaces +- * bytes of UTF-8 characters width '*'). */ ++ * bytes of UTF-8 characters width '*'). * + if (where) decode_uri_for_display(where); + + add_format_to_string(&buffer, +@@ -695,7 +700,7 @@ + + mem_free_if(where); + +- /* FIXME: I think this needs a form or something */ ++ * FIXME: I think this needs a form or something * + + add_fragment(conn->cached, conn->from, buffer.source, buffer.length); + conn->from += buffer.length; +@@ -707,7 +712,7 @@ + ? connection_state(S_OK) + : connection_state(S_OUT_OF_MEM); + } +- ++*/ + + static void + read_gopher_response_data(struct socket *socket, struct read_buffer *rb) diff --git a/network/felinks/patches/0003-gopher_directory_links.patch b/network/felinks/patches/0003-gopher_directory_links.patch new file mode 100644 index 0000000000..15a89fac2f --- /dev/null +++ b/network/felinks/patches/0003-gopher_directory_links.patch @@ -0,0 +1,26 @@ +####################################################################### +# Fix remote directory links. +# dave@slackbuilds.org +####################################################################### +diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-13 23:22:18.918292198 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:21:00.631960039 +0000 +@@ -321,6 +321,18 @@ + selectorlen++; + } + ++ if (entity_info->type == '1') { ++ if (strchr(selector, '1') == (char *) selector) { ++ selector++; ++ selectorlen--; ++ } ++ else { ++ if ((char *) selector == "/1") { ++ selectorlen--; ++ } ++ } ++ } ++ + state = add_gopher_command(conn, &command, entity, selector, selectorlen); + if (!is_in_state(state, S_CONN)) + return state; diff --git a/network/felinks/patches/0005-gopher_newlines_tabs_entity-2.patch b/network/felinks/patches/0005-gopher_newlines_tabs_entity-2.patch new file mode 100644 index 0000000000..2885a67e76 --- /dev/null +++ b/network/felinks/patches/0005-gopher_newlines_tabs_entity-2.patch @@ -0,0 +1,50 @@ +diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c +--- a/src/protocol/gopher/gopher.c 2020-01-31 16:50:36.000000000 +0000 ++++ b/src/protocol/gopher/gopher.c 2020-05-14 06:21:44.523952135 +0000 +@@ -283,7 +283,7 @@ + + /* Get entity type, and selector string. */ + /* Pick up gopher_entity */ +- if (selectorlen > 1 && selector[1] == '/') { ++ if (selectorlen > 1) { + entity = *selector++; + selectorlen--; + } +@@ -308,6 +308,18 @@ + selectorlen--; + } + ++ if (entity_info->type == '1') { ++ if (strchr(selector, '1') == (char *) selector) { ++ selector++; ++ selectorlen--; ++ } ++ else { ++ if ((char *) selector == "/1") { ++ selectorlen--; ++ } ++ } ++ } ++ + state = add_gopher_command(conn, &command, entity, selector, selectorlen); + if (!is_in_state(state, S_CONN)) + return state; +@@ -548,7 +560,8 @@ + + } else if (address.length > 0 + && strlcmp(address.source, address.length - 1, +- "gopher://error.host:1/", -1)) { ++ "gopher://error.host:1/", -1) ++ && selector) { + add_gopher_link(buffer, name, address.source); + + } else { +@@ -571,7 +584,7 @@ + if (data[0] == ASCII_CR && data[1] == ASCII_LF) + return data + 2; + +- if (data[0] == ASCII_LF) ++ if (data[0] == ASCII_CR || data[0] == ASCII_LF) + return data + 1; + } + diff --git a/network/felinks/patches/0006-gopher-indexes_nocr.patch b/network/felinks/patches/0006-gopher-indexes_nocr.patch new file mode 100644 index 0000000000..9e4a441db6 --- /dev/null +++ b/network/felinks/patches/0006-gopher-indexes_nocr.patch @@ -0,0 +1,19 @@ +####################################################################### +# Fix index listings with only LF and no CRs. +# dave@slackbuilds.org +####################################################################### +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 06:42:11.030536586 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:42:26.710000886 +0000 +@@ -757,6 +757,11 @@ + switch (gopher->entity->type) { + case GOPHER_DIRECTORY: + case GOPHER_INDEX: ++ /* Lines with no carriage returns */ ++ if (strchr(rb->data, ASCII_CR) == NULL) { ++ strncat(rb->data, "\r\n", 2); ++ rb->length += 3; ++ } + state = read_gopher_directory_data(conn, rb); + break; + diff --git a/network/felinks/patches/0008-gopher-html-entities.patch b/network/felinks/patches/0008-gopher-html-entities.patch new file mode 100644 index 0000000000..750d1a49de --- /dev/null +++ b/network/felinks/patches/0008-gopher-html-entities.patch @@ -0,0 +1,47 @@ +################################################################### +# Encode < > to HTML. +################################################################### +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:26:41.791778387 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:19:56.964025440 +0000 +@@ -620,6 +620,25 @@ + return line[0] == '.' && !line[1] ? NULL : line; + } + ++/* substring replacement */ ++static void ++str_replace(char * in_string, char * s_string, char * r_string) ++{ ++ /* max == replace all characters */ ++ char temp[strlen(in_string) * (strlen(r_string) - strlen(s_string)) + 1]; ++ char * pos; ++ ++ if (!(pos = strstr(in_string, s_string))) ++ return; ++ ++ strncpy(temp, in_string, pos - in_string); ++ temp[pos - in_string] = 0; ++ sprintf(temp + (pos - in_string), "%s%s", r_string, pos + 1); ++ in_string[0] = 0; ++ strcpy(in_string, temp); ++ return str_replace(in_string, s_string, r_string); ++} ++ + /* Parse a Gopher Menu document */ + static struct connection_state + read_gopher_directory_data(struct connection *conn, struct read_buffer *rb) +@@ -639,6 +658,14 @@ + return connection_state(S_OUT_OF_MEM); + } + ++ /* Lines with characters that need to be converted to html */ ++ if (strstr(rb->data, "<")) { ++ str_replace(rb->data, "<", "<"); ++ } ++ if (strstr(rb->data, ">")) { ++ str_replace(rb->data, ">", ">"); ++ } ++ + while ((end = get_gopher_line_end(rb->data, rb->length))) { + unsigned char *line = check_gopher_last_line(rb->data, end); + diff --git a/network/felinks/slack-desc b/network/felinks/slack-desc new file mode 100644 index 0000000000..1a0bba4cc9 --- /dev/null +++ b/network/felinks/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------------------------------------------------------| +felinks: felinks (A fork of Elinks, the web browser) +felinks: +felinks: Felinks is a maintained and up-to-date fork of ELinks, an advanced +felinks: web browser. +felinks: +felinks: https://github.com/rkd77/felinks +felinks: +felinks: +felinks: +felinks: +felinks: diff --git a/network/ferm/README b/network/ferm/README index bd52bca78e..33d44d4a48 100644 --- a/network/ferm/README +++ b/network/ferm/README @@ -1,4 +1,5 @@ -ferm is a tool to maintain complex firewalls, without having the trouble to -rewrite the complex rules over and over again. -ferm allows the entire firewall rule set to be stored in a separate file, and -to be loaded with one command. +ferm is a tool to maintain complex firewalls, without having the trouble +to rewrite the complex rules over and over again. + +ferm allows the entire firewall rule set to be stored in a separate +file, and to be loaded with one command. diff --git a/network/ferm/README.SLACKWARE b/network/ferm/README.SLACKWARE new file mode 100644 index 0000000000..611596f48c --- /dev/null +++ b/network/ferm/README.SLACKWARE @@ -0,0 +1,22 @@ +Ferm comes with a systemd unit file that can be used to run ferm on a predefined +configuration file (/etc/ferm.conf) at boot to automatically setup the firewall. + +A simple rc.d script is being provided with this package that mimics what the +unit file does. If you want to automatically run ferm at boot and stop it at +shutdown, make sure you create the /etc/ferm.conf file and: + +chmod 0755 /etc/rc.d/rc.ferm +cat >> /etc/rc.d/rc.local <<EOF +if [ -x /etc/rc.d/rc.ferm ] +then + /etc/rc.d/rc.ferm start +fi + +EOF +cat >> /etc/rc.d/rc.local_shutdown <<EOF +if [ -x /etc/rc.d/rc.ferm ] +then + /etc/rc.d/rc.ferm stop +fi + +EOF diff --git a/network/ferm/doinst.sh b/network/ferm/doinst.sh new file mode 100644 index 0000000000..fe5a0c79e3 --- /dev/null +++ b/network/ferm/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.ferm.new diff --git a/network/ferm/ferm.SlackBuild b/network/ferm/ferm.SlackBuild index f2d4479129..813ffa4513 100644 --- a/network/ferm/ferm.SlackBuild +++ b/network/ferm/ferm.SlackBuild @@ -2,34 +2,29 @@ # Slackware build script for ferm -# Copyright (c) 2011 Alan Alberghini <414N@slacky.it> +# Copyright (c) 2021 Alan Alberghini <414N@slacky.it> # All rights reserved. # -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# 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. -# ----------------------------------------------------------------------------- +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. # -# Build history: -# -# 1 - Initial release. +# 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=ferm -VERSION=${VERSION:-2.4.1} +VERSION=${VERSION:-2.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -50,13 +45,18 @@ 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 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 {} \; make install PREFIX=$PKG/usr MANDIR=$PKG/usr/man/man1 DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION +# Remove systemd specifics +rm -r $PKG/usr/lib/systemd + +install -Dm0644 $CWD/rc.ferm $PKG/etc/rc.d/rc.ferm.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 @@ -64,6 +64,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/network/ferm/ferm.info b/network/ferm/ferm.info index ae1e0e8c6e..877d205f36 100644 --- a/network/ferm/ferm.info +++ b/network/ferm/ferm.info @@ -1,10 +1,10 @@ PRGNAM="ferm" -VERSION="2.4.1" +VERSION="2.5.1" HOMEPAGE="http://ferm.foo-projects.org/" -DOWNLOAD="http://ferm.foo-projects.org/download/2.4/ferm-2.4.1.tar.xz" -MD5SUM="4d359bc809887bcf401eef7e76012e5c" +DOWNLOAD="http://ferm.foo-projects.org/download/2.5/ferm-2.5.1.tar.xz" +MD5SUM="6d14d9e5e672885bc6f2fceafbf2942f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="perl-net-dns" MAINTAINER="Alan Alberghini" EMAIL="414N@slacky.it" diff --git a/network/ferm/rc.ferm b/network/ferm/rc.ferm new file mode 100644 index 0000000000..838a775ca5 --- /dev/null +++ b/network/ferm/rc.ferm @@ -0,0 +1,77 @@ +#!/bin/sh +# +# /etc/rc.d/rc.ferm +# +# To make ferm automatically apply rules at boot, make this +# file executable: chmod 755 /etc/rc.d/rc.ferm + +CONFIG_FILE=/etc/ferm.conf +RUN_FILE=/var/run/ferm.run +FERM=/usr/sbin/ferm + +set -eE + +log_err() +{ + >&2 echo "$1" +} + +check_cfg() +{ + if [ ! -e "$CONFIG_FILE" ] + then + log_err "required config file $CONFIG_FILE missing!" + return 1 + fi +} +service_start() +{ + if [ ! -e "$RUN_FILE" ] + then + "$FERM" "$CONFIG_FILE" + else + log_err "ferm rules seem to have been already been applied ($RUN_FILE present). Aborting" + return 1 + fi + +} + +service_stop() +{ + if [ -e "$RUN_FILE" ] + then + "$FERM" -F "$CONFIG_FILE" + else + log_err "Could not find $RUN_FILE to assess if ferm was service_started. Aborting" + return 1 + fi +} + + +case "$1" in + 'start') + if service_start + then + touch "$RUN_FILE" + else + log_err "Error starting service" + exit 1 + fi + ;; + 'stop') + if service_stop + then + rm -f "$RUN_FILE" + else + log_err "Error stopping service" + exit 1 + fi + ;; + 'restart') + service_stop && service_start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac + diff --git a/network/ferm/slack-desc b/network/ferm/slack-desc index 355186a152..b7c2e0210d 100644 --- a/network/ferm/slack-desc +++ b/network/ferm/slack-desc @@ -1,12 +1,12 @@ # 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------------------------------------------------------| -ferm: ferm (for Easy Rule Making) +ferm: ferm (For Easy Rule Making) ferm: ferm: ferm is a tool to maintain complex firewalls, without having the ferm: trouble to rewrite the complex rules over and over again. ferm allows diff --git a/network/firewalld/README b/network/firewalld/README index 75d957740a..1821f7afae 100644 --- a/network/firewalld/README +++ b/network/firewalld/README @@ -1,6 +1,8 @@ -firewalld provides a dynamically managed firewall with support for +Firewalld provides a dynamically managed firewall with support for network or firewall zones to define the trust level of network connections or interfaces. It has support for IPv4, IPv6 firewall settings and for ethernet bridges and a separation of runtime and permanent configuration options. It also provides an interface for services or applications to add ip*tables and ebtables rules directly. + +Please read the README.SLACKWARE file for additional information. diff --git a/network/firewalld/README.SLACKWARE b/network/firewalld/README.SLACKWARE new file mode 100644 index 0000000000..a5a7404a61 --- /dev/null +++ b/network/firewalld/README.SLACKWARE @@ -0,0 +1,20 @@ +The package provided by the upstream project already includes +/etc/init.d/firewalld which will get executed on boot by +/etc/rc.d/rc.sysvinit. So technically, you don't have to +use the custom rc.firewalld. I have provided a patch that +changes /etc/sysconfig/ to /etc/default in order to source +any custom arguments. + +Otherwise, feel free to chmod -x /etc/init.d/firewalld +and chmod +x /etc/rc.d/rc.firewalld then add it to your +/etc/rc.d/rc.local like so: + +if [ -x /etc/rc.d/rc.firewalld ]; then + /etc/rc.d/rc.firewalld start +fi + +and the following to /etc/rc.d/rc.local_shutdown: + +if [ -x /etc/rc.d/rc.firewalld ]; then + /etc/rc.d/rc.firewalld stop +fi diff --git a/network/firewalld/doinst.sh b/network/firewalld/doinst.sh index 9f4fb5fbe4..592ffcdaef 100644 --- a/network/firewalld/doinst.sh +++ b/network/firewalld/doinst.sh @@ -26,7 +26,8 @@ config etc/dbus-1/system.d/FirewallD.conf.new config etc/firewall/applet.conf.new config etc/firewalld/firewalld.conf.new config etc/default/firewalld.new -preserve_perms etc/rc.d/rc.FireWallD.new +preserve_perms etc/rc.d/rc.firewalld.new +preserve_perms etc/rc.d/init.d/firewalld.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/network/firewalld/firewalld.SlackBuild b/network/firewalld/firewalld.SlackBuild index ad54c23725..b244425797 100644 --- a/network/firewalld/firewalld.SlackBuild +++ b/network/firewalld/firewalld.SlackBuild @@ -21,10 +21,18 @@ # 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. +# +# ChangeLog +# +# Thu Mar 19 12:19:48 UTC 2020 +# +# * Added patch to change the source file from /etc/sysconfig to /etc/default +# in the provided /etc/init.d/firewalld file. +# PRGNAM=firewalld VERSION=${VERSION:-0.5.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +77,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 {} \; +# Let's patch the init.d script to use /etc/default instead of +# /etc/sysconfig to source arguments. +patch -p1 < $CWD/init.patch + ./autogen.sh CFLAGS="$SLKCFLAGS" \ @@ -95,8 +107,9 @@ mv $PKG/etc/sysconfig/firewalld $PKG/etc/sysconfig/firewalld.new mv $PKG/etc/sysconfig $PKG/etc/default mkdir -p $PKG/etc/rc.d -cat $CWD/rc.FireWallD > $PKG/etc/rc.d/rc.FireWallD.new +cat $CWD/rc.firewalld > $PKG/etc/rc.d/rc.firewalld.new +# We don't need systemd here. rm -rf $PKG/usr/lib/systemd find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -115,5 +128,8 @@ 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/network/firewalld/init.patch b/network/firewalld/init.patch new file mode 100644 index 0000000000..675dee356f --- /dev/null +++ b/network/firewalld/init.patch @@ -0,0 +1,11 @@ +--- firewalld-0.5.1/config/firewalld.init 2020-03-19 08:05:08.660103937 -0400 ++++ firewalld-0.5.1-new/config/firewalld.init 2020-03-19 08:10:25.695336773 -0400 +@@ -29,7 +29,7 @@ + prog="firewalld" + #config="/etc/firewalld/firewalld.conf" + +-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog ++[ -e /etc/default/$prog ] && . /etc/default/$prog + + lockfile=/var/lock/subsys/$prog + diff --git a/network/firewalld/rc.firewalld b/network/firewalld/rc.firewalld new file mode 100644 index 0000000000..aa0d91b3dc --- /dev/null +++ b/network/firewalld/rc.firewalld @@ -0,0 +1,56 @@ +#!/bin/sh +# Start/stop/restart firewalld. + +# Start firewalld: +firewalld_start() { + [ -r /etc/default/firewalld ] && source /etc/default/firewalld + echo -n "Starting FireWallD daemon: /usr/sbin/firewalld " + /usr/sbin/firewalld $FIREWALLD_ARGS + echo +} + +# Stop firewalld: +firewalld_stop() { + echo -n "Stopping FireWallD daemon..." + if [ -r /var/run/firewalld.pid ]; then + kill -HUP $(cat /var/run/firewalld.pid) + rm -f /var/run/firewalld.pid + else + killall -HUP -q firewalld + fi + echo +} + +# Restart firewalld: +firewalld_restart() { + firewalld_stop + sleep 1 + firewalld_start +} + +# Check if firewalld is running +firewalld_status() { + if [ -e /var/run/firewalld.pid ]; then + echo "firewalld is running as pid $(cat /var/run/firewalld.pid)." + else + echo "firewalld is stopped." + exit 1 + fi +} + +case "$1" in +'start') + firewalld_start + ;; +'stop') + firewalld_stop + ;; +'restart') + firewalld_restart + ;; +'status') + firewalld_status + ;; +*) + echo "usage $0 start|stop|restart|status" +esac diff --git a/network/flexget/flexget.SlackBuild b/network/flexget/flexget.SlackBuild index 631bff5375..59f3ccabad 100644 --- a/network/flexget/flexget.SlackBuild +++ b/network/flexget/flexget.SlackBuild @@ -26,12 +26,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SRCNAM=FlexGet -PRGNAM=${SRCNAM,,} +PRGNAM=flexget VERSION=${VERSION:-2.11.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCNAM=FlexGet + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM diff --git a/network/fping/README b/network/fping/README index f989e116d1..1fa2dc57cb 100644 --- a/network/fping/README +++ b/network/fping/README @@ -1,4 +1,7 @@ -fping is a ping(1) like program which uses the Internet Control Message -Protocol (ICMP) echo request to determine if a host is up. fping is -different from ping in that you can specify any number of hosts on the -command line, or specify a file containing the lists of hosts to ping. +fping (send ICMP ECHO_REQUEST packets to network hosts) + +fping is a program to send ICMP echo probes to network hosts, similar to ping, +but much better performing when pinging multiple hosts. + +NOTE: Old fping and fping6 packages are no longer needed, and should probably +be removed before installing this one. diff --git a/network/fping/fping.SlackBuild b/network/fping/fping.SlackBuild index e3d137350e..070a4beda9 100644 --- a/network/fping/fping.SlackBuild +++ b/network/fping/fping.SlackBuild @@ -1,37 +1,35 @@ #!/bin/sh # Slackware build script for fping -# Copyright (c) 2008, Written by Mark Walling <mark@markwalling.org> +# Copyright 2015, 2016, 2020 Mario Preksavec, Zagreb, Croatia # 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=fping -VERSION=${VERSION:-2.4b2_to} +VERSION=${VERSION:-5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i586 ;; + i?86) ARCH=i486 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -62,14 +60,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xzvf $CWD/$PRGNAM.tar.gz +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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -78,20 +76,24 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-ipv4 \ + --enable-ipv6 \ + --build=$ARCH-slackware-linux + 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 -( 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 README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md COPYING INSTALL README.md doc/README.1992 \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/fping/fping.info b/network/fping/fping.info index 9807786c93..883aa40729 100644 --- a/network/fping/fping.info +++ b/network/fping/fping.info @@ -1,10 +1,10 @@ PRGNAM="fping" -VERSION="2.4b2_to" -HOMEPAGE="http://fping.sourceforge.net/" -DOWNLOAD="http://fping.sourceforge.net/download/fping.tar.gz" -MD5SUM="d5e8be59e307cef76bc479e1684df705" +VERSION="5.0" +HOMEPAGE="http://fping.org/" +DOWNLOAD="http://fping.org/dist/fping-5.0.tar.gz" +MD5SUM="6af4c39bf012af75f93983d0efa242b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Mark Walling" -EMAIL="mark@markwalling.org" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/network/fping/slack-desc b/network/fping/slack-desc index 4a4d21fbb6..4fb3962c17 100644 --- a/network/fping/slack-desc +++ b/network/fping/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fping: fping (a ping like program to send ICMP echo requests) +fping: fping (send ICMP ECHO_REQUEST packets to network hosts) +fping: +fping: fping is a program to send ICMP echo probes to network hosts, similar +fping: to ping, but much better performing when pinging multiple hosts. +fping: +fping: Homepage: http://fping.org/ +fping: fping: -fping: fping is a ping(1) like program which uses the Internet Control -fping: Message Protocol (ICMP) echo request to determine if a host is up. -fping: fping is different from ping in that you can specify any number of -fping: hosts on the command line, or specify a file containing the lists of -fping: hosts to ping. fping: -fping: http://fping.sourceforge.net/ fping: fping: diff --git a/network/fping3/README b/network/fping3/README deleted file mode 100644 index 8370986017..0000000000 --- a/network/fping3/README +++ /dev/null @@ -1,7 +0,0 @@ -fping3 (send ICMP ECHO_REQUEST packets to network hosts) - -fping is a program to send ICMP echo probes to network hosts, similar to ping, -but much better performing when pinging multiple hosts. - -NOTE: Old fping and fping6 packages are no longer needed, and should probably -be removed before installing this one. diff --git a/network/fping3/fping3.info b/network/fping3/fping3.info deleted file mode 100644 index 6f597a3c17..0000000000 --- a/network/fping3/fping3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fping3" -VERSION="3.13" -HOMEPAGE="http://fping.org/" -DOWNLOAD="http://fping.org/dist/fping-3.13.tar.gz" -MD5SUM="a39134baca6bc6ced56191cb51fb0dc2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Mario Preksavec" -EMAIL="mario at slackware dot hr" diff --git a/network/fping6/README b/network/fping6/README deleted file mode 100644 index f989e116d1..0000000000 --- a/network/fping6/README +++ /dev/null @@ -1,4 +0,0 @@ -fping is a ping(1) like program which uses the Internet Control Message -Protocol (ICMP) echo request to determine if a host is up. fping is -different from ping in that you can specify any number of hosts on the -command line, or specify a file containing the lists of hosts to ping. diff --git a/network/fping6/README.SLACKWARE b/network/fping6/README.SLACKWARE deleted file mode 100644 index b6e36445f0..0000000000 --- a/network/fping6/README.SLACKWARE +++ /dev/null @@ -1,6 +0,0 @@ -The download link points to Debian server, as the package on the original site -actually is missing IPv6 support - while it claims to be version 2.4b2_to-ipv6, -it's actually 2.4b2_to. -Additionally, patches from Debian are applied to make IPv6 compile time flag, -introduce source IP support, improve manpage and other things. -To avoid conflicts with standard fping, this version is installed as fping6. diff --git a/network/fping6/fping.8.diff b/network/fping6/fping.8.diff deleted file mode 100644 index 87b479152b..0000000000 --- a/network/fping6/fping.8.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- fping-2.4b2-to-ipv6.orig/fping.8 -+++ fping-2.4b2-to-ipv6/fping.8 -@@ -1,4 +1,4 @@ --.TH fping l
-+.TH fping 8
- .SH NAME
- fping \- send ICMP ECHO_REQUEST packets to network hosts
- .SH SYNOPSIS
-@@ -12,9 +12,9 @@ -
-
- .B fping
--is a
--.MS ping 8
--like program which uses the Internet Control
-+is a program like
-+.B ping(8)
-+which uses the Internet Control
- Message Protocol (ICMP) echo request to determine if a target host is
- responding.
- .B fping
-@@ -37,8 +37,7 @@ - ).
- .PP
- Unlike
--.B ping
--,
-+.B ping,
- .B fping
- is meant to be used in scripts, so its output is designed to be
- easy to parse.
-@@ -130,12 +129,16 @@ - a target will be made, not including the first try.
- .IP \fB-s\fR 5
- Print cumulative statistics upon exit.
-+.IP \fB-S\fIaddr\fR 5
-+Set source address.
- .IP \fB-t\fIn\fR 5
- Initial target timeout in milliseconds (default 500). In the default
- mode, this is the amount of time that
- .B fping
- waits for a response to its first request. Successive timeouts are
- multiplied by the backoff factor.
-+.IP \fB-T\fIn\fR 5
-+Select timeout in seconds (default 10).
- .IP \fB-u\fR 5
- Show targets that are unreachable.
- .IP \fB-v\fR 5
-@@ -152,7 +155,7 @@ - example none the less.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- require 'open2.pl';
-
- $MAILTO = "root";
-@@ -178,7 +181,7 @@ - that are currently reachable.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $hosts_to_backup = `cat /etc/hosts.backup | fping -a`;
-
diff --git a/network/fping6/fping.c.diff b/network/fping6/fping.c.diff deleted file mode 100644 index ae51175477..0000000000 --- a/network/fping6/fping.c.diff +++ /dev/null @@ -1,421 +0,0 @@ ---- fping-2.4b2-to-ipv6.orig/fping.c -+++ fping-2.4b2-to-ipv6/fping.c -@@ -24,7 +24,7 @@ - * - * Original author: Roland Schemers <schemers@stanford.edu> - * IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl> -- * -+ * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de) - * - * - * RCS header information no longer used. It has been moved to the -@@ -42,7 +42,6 @@ - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ --#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */ - - #ifndef _NO_PROTO - #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \ -@@ -101,13 +100,8 @@ - #endif - #include <netinet/in_systm.h> - --/* Linux has bizarre ip.h and ip_icmp.h */ --#if defined( __linux__ ) --#include "linux.h" --#else - #include <netinet/ip.h> - #include <netinet/ip_icmp.h> --#endif /* defined(__linux__) */ - - #include <arpa/inet.h> - #include <netdb.h> -@@ -150,7 +144,11 @@ - #define MIN_PING_DATA sizeof( PING_DATA ) - #define MAX_IP_PACKET 65536 /* (theoretical) max IP packet size */ - #define SIZE_IP_HDR 20 -+#ifndef IPV6 - #define SIZE_ICMP_HDR ICMP_MINLEN /* from ip_icmp.h */ -+#else -+#define SIZE_ICMP_HDR sizeof(FPING_ICMPHDR) -+#endif - #define MAX_PING_DATA ( MAX_IP_PACKET - SIZE_IP_HDR - SIZE_ICMP_HDR ) - - /* sized so as to be like traditional ping */ -@@ -283,6 +281,12 @@ - u_int count = 1; - u_int trials; - u_int report_interval = 0; -+int src_addr_present = 0; -+#ifndef IPV6 -+struct in_addr src_addr; -+#else -+struct in6_addr src_addr; -+#endif - - /* global stats */ - long max_reply = 0; -@@ -292,6 +296,7 @@ - int max_hostname_len = 0; - int num_jobs = 0; /* number of hosts still to do */ - int num_hosts; /* total number of hosts */ -+int max_seq_sent = 0; /* maximum sequence number sent so far */ - int num_alive = 0, /* total number alive */ - num_unreachable = 0, /* total number unreachable */ - num_noaddress = 0; /* total number of addresses not found */ -@@ -408,6 +413,11 @@ - struct protoent *proto; - char *buf; - uid_t uid; -+#ifndef IPV6 -+ struct sockaddr_in sa; -+#else -+ struct sockaddr_in6 sa; -+#endif - /* check if we are root */ - - if( geteuid() ) -@@ -439,7 +449,7 @@ - - #ifdef IPV6 - /* -- * let the kerel pass extension headers of incoming packets, -+ * let the kernel pass extension headers of incoming packets, - * for privileged socket options - */ - #ifdef IPV6_RECVHOPOPTS -@@ -474,6 +484,35 @@ - sizeof(opton))) - err(1, "setsockopt(IPV6_RTHDR)"); - #endif -+#ifndef USE_SIN6_SCOPE_ID -+#ifdef IPV6_RECVPKTINFO -+ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opton, -+ sizeof(opton))) -+ err(1, "setsockopt(IPV6_RECVPKTINFO)"); -+#else /* old adv. API */ -+ if (setsockopt(s, IPPROTO_IPV6, IPV6_PKTINFO, &opton, -+ sizeof(opton))) -+ err(1, "setsockopt(IPV6_PKTINFO)"); -+#endif -+#endif /* USE_SIN6_SCOPE_ID */ -+#ifdef IPV6_RECVHOPLIMIT -+ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opton, -+ sizeof(opton))) -+ err(1, "setsockopt(IPV6_RECVHOPLIMIT)"); -+#else /* old adv. API */ -+ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPLIMIT, &opton, -+ sizeof(opton))) -+ err(1, "setsockopt(IPV6_HOPLIMIT)"); -+#endif -+#ifdef IPV6_CHECKSUM -+#ifndef SOL_RAW -+#define SOL_RAW IPPROTO_IPV6 -+#endif -+ opton = 2; -+ if (setsockopt(s, SOL_RAW, IPV6_CHECKSUM, &opton, -+ sizeof(opton))) -+ err(1, "setsockopt(SOL_RAW,IPV6_CHECKSUM)"); -+#endif - #endif - - if( ( uid = getuid() ) ) -@@ -491,7 +530,7 @@ - - /* get command line options */ - -- while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:" ) ) != EOF ) -+ while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:S:I:T:" ) ) != EOF ) - { - switch( c ) - { -@@ -502,7 +541,7 @@ - break; - - case 'r': -- if( !( retry = ( u_int )atoi( optarg ) ) ) -+ if( ( retry = ( u_int )atoi( optarg ) ) < 0 ) - usage(); - - break; -@@ -639,6 +678,27 @@ - generate_flag = 1; - break; - -+ case 'S': -+#ifndef IPV6 -+ if( ! inet_pton( AF_INET, optarg, &src_addr ) ) -+#else -+ if( ! inet_pton( AF_INET6, optarg, &src_addr ) ) -+#endif -+ usage(); -+ src_addr_present = 1; -+ break; -+ -+ case 'I': -+ if (setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, optarg, -+ strlen(optarg))) -+ err(1, "setsockopt(AF_INET, SO_BINDTODEVICE)"); -+ break; -+ -+ case 'T': -+ if ( ! ( select_time = ( u_int )atoi( optarg ) * 100 ) ) -+ usage(); -+ break; -+ - default: - usage(); - break; -@@ -821,7 +881,7 @@ - errno_crash_and_burn( "fopen" ); - - -- while( fgets( line, 132, ping_file ) ) -+ while( fgets( line, sizeof(line), ping_file ) ) - { - if( sscanf( line, "%s", host ) != 1 ) - continue; -@@ -962,6 +1022,22 @@ - if( !num_hosts ) - exit( 2 ); - -+ /* set the source address */ -+ -+ if( src_addr_present ) -+ { -+ memset( &sa, 0, sizeof( sa ) ); -+#ifndef IPV6 -+ sa.sin_family = AF_INET; -+ sa.sin_addr = src_addr; -+#else -+ sa.sin6_family = AF_INET6; -+ sa.sin6_addr = src_addr; -+#endif -+ if ( bind( s, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 ) -+ errno_crash_and_burn( "cannot bind source address" ); -+ } -+ - /* allocate array to hold outstanding ping requests */ - - table = ( HOST_ENTRY** )malloc( sizeof( HOST_ENTRY* ) * num_hosts ); -@@ -1112,7 +1188,7 @@ - /* but allow time for the last one to come in */ - if( count_flag ) - { -- if( ( cursor->num_sent >= count ) && ( ht > cursor->timeout ) ) -+ if( ( cursor->num_sent >= count ) && ( cursor->num_recv >= count || ht > cursor->timeout ) ) - { - remove_job( cursor ); - continue; -@@ -1153,6 +1229,7 @@ - - finish(); - -+ return 0; - } /* main() */ - - -@@ -1382,15 +1459,15 @@ - if( h->num_recv_i <= h->num_sent_i ) - { - fprintf( stderr, " xmt/rcv/%%loss = %d/%d/%d%%", -- h->num_sent_i, h->num_recv_i, -- ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i ); -+ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? -+ ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i : 0 ); - - }/* IF */ - else - { - fprintf( stderr, " xmt/rcv/%%return = %d/%d/%d%%", -- h->num_sent_i, h->num_recv_i, -- ( ( h->num_recv_i * 100 ) / h->num_sent_i ) ); -+ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ? -+ ( ( h->num_recv_i * 100 ) / h->num_sent_i ) : 0 ); - - }/* ELSE */ - -@@ -1504,12 +1581,15 @@ - icp = ( FPING_ICMPHDR* )buffer; - - gettimeofday( &h->last_send_time, &tz ); -+ int myseq = h->num_sent * num_hosts + h->i; -+ max_seq_sent = myseq > max_seq_sent ? myseq : max_seq_sent; -+ - #ifndef IPV6 - icp->icmp_type = ICMP_ECHO; - icp->icmp_code = 0; - icp->icmp_cksum = 0; -- icp->icmp_seq = h->i; -- icp->icmp_id = ident; -+ icp->icmp_seq = htons(myseq); -+ icp->icmp_id = htons(ident); - - pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR ); - pdp->ping_ts = h->last_send_time; -@@ -1519,8 +1599,8 @@ - #else - icp->icmp6_type = ICMP6_ECHO_REQUEST; - icp->icmp6_code = 0; -- icp->icmp6_seq = h->i; -- icp->icmp6_id = ident; -+ icp->icmp6_seq = htons(myseq); -+ icp->icmp6_id = htons(ident); - - pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR ); - pdp->ping_ts = h->last_send_time; -@@ -1667,25 +1747,25 @@ - }/* IF */ - - #ifndef IPV6 -- if( icp->icmp_id != ident ) -+ if( ntohs(icp->icmp_id) != ident ) - #else -- if( icp->icmp6_id != ident ) -+ if( ntohs(icp->icmp6_id) != ident ) - #endif - return 1; /* packet received, but not the one we are looking for! */ - - num_pingreceived++; - - #ifndef IPV6 -- if( icp->icmp_seq >= ( n_short )num_hosts ) -+ if( ntohs(icp->icmp_seq) > max_seq_sent ) - #else -- if( icp->icmp6_seq >= ( n_short )num_hosts ) -+ if( ntohs(icp->icmp6_seq) > max_seq_sent ) - #endif - return( 1 ); /* packet received, don't worry about it anymore */ - - #ifndef IPV6 -- n = icp->icmp_seq; -+ n = ntohs(icp->icmp_seq) % num_hosts; - #else -- n = icp->icmp6_seq; -+ n = ntohs(icp->icmp6_seq) % num_hosts; - #endif - h = table[n]; - -@@ -1824,6 +1904,7 @@ - - }/* IF */ - -+ fflush( stdout ); - return num_jobs; - - } /* wait_for_reply() */ -@@ -1875,11 +1956,11 @@ - sent_icmp = ( struct icmp* )( c + 28 ); - - if( ( sent_icmp->icmp_type == ICMP_ECHO ) && -- ( sent_icmp->icmp_id == ident ) && -- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) -+ ( ntohs(sent_icmp->icmp_id) == ident ) && -+ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) ) - { - /* this is a response to a ping we sent */ -- h = table[sent_icmp->icmp_seq]; -+ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts]; - - if( p->icmp_code > ICMP_UNREACH_MAXTYPE ) - { -@@ -1888,11 +1969,11 @@ - - #else - if( ( sent_icmp->icmp6_type == ICMP_ECHO ) && -- ( sent_icmp->icmp6_id == ident ) && -- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) ) -+ ( ntohs(sent_icmp->icmp6_id) == ident ) && -+ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) ) - { - /* this is a response to a ping we sent */ -- h = table[sent_icmp->icmp6_seq]; -+ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts]; - - if( p->icmp6_code > ICMP_UNREACH_MAXTYPE ) - { -@@ -1930,24 +2011,24 @@ - case ICMP_PARAMPROB: - sent_icmp = ( FPING_ICMPHDR* )( c + 28 ); - #ifndef IPV6 -- if( ( sent_icmp->icmp_type = ICMP_ECHO ) && -- ( sent_icmp->icmp_id = ident ) && -- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) ) -+ if( ( sent_icmp->icmp_type == ICMP_ECHO ) && -+ ( ntohs(sent_icmp->icmp_id) == ident ) && -+ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) ) - { - /* this is a response to a ping we sent */ -- h = table[sent_icmp->icmp_seq]; -+ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts]; - fprintf( stderr, "%s from %s for ICMP Echo sent to %s", - icmp_type_str[p->icmp_type], inet_ntoa( addr->sin_addr ), h->host ); - - if( inet_addr( h->host ) == -1 ) - fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) ); - #else -- if( ( sent_icmp->icmp6_type = ICMP_ECHO ) && -- ( sent_icmp->icmp6_id = ident ) && -- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) ) -+ if( ( sent_icmp->icmp6_type == ICMP_ECHO ) && -+ ( ntohs(sent_icmp->icmp6_id) == ident ) && -+ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) ) - { - /* this is a response to a ping we sent */ -- h = table[sent_icmp->icmp6_seq]; -+ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts]; - fprintf( stderr, "%s from %s for ICMP Echo sent to %s", - icmp_type_str[p->icmp6_type], addr_ascii, h->host ); - -@@ -2165,20 +2246,33 @@ - struct addrinfo *res, hints; - int ret_ga; - char *hostname; -+ size_t len; - - /* getaddrinfo */ - bzero(&hints, sizeof(struct addrinfo)); -- hints.ai_flags = AI_CANONNAME; -+ hints.ai_flags = name_flag ? AI_CANONNAME : 0; - hints.ai_family = AF_INET6; - hints.ai_socktype = SOCK_RAW; - hints.ai_protocol = IPPROTO_ICMPV6; - - ret_ga = getaddrinfo(name, NULL, &hints, &res); -- if (ret_ga) errx(1, "%s", gai_strerror(ret_ga)); -+ if (ret_ga) { -+ if(!quiet_flag) -+ warnx("%s", gai_strerror(ret_ga)); -+ num_noaddress++; -+ return; -+ } - if (res->ai_canonname) hostname = res->ai_canonname; - else hostname = name; -- if (!res->ai_addr) errx(1, "getaddrinfo failed"); -- (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/ -+ if (!res->ai_addr) { -+ if(!quiet_flag) -+ warnx("getaddrinfo failed"); -+ num_noaddress++; -+ return; -+ } -+ len = res->ai_addrlen; -+ if (len > sizeof(FPING_SOCKADDR)) len = sizeof(FPING_SOCKADDR); -+ (void)memcpy(&dst, res->ai_addr, len); - add_addr(name, name, &dst); - #endif - } /* add_name() */ -@@ -2730,9 +2824,11 @@ - fprintf( stderr, " (in looping and counting modes, default %d)\n", perhost_interval / 100 ); - fprintf( stderr, " -q quiet (don't show per-target/per-ping results)\n" ); - fprintf( stderr, " -Q n same as -q, but show summary every n seconds\n" ); -- fprintf( stderr, " -r n number of retries (default %d)\n", retry ); -+ fprintf( stderr, " -r n number of retries (default %d)\n", DEFAULT_RETRY ); - fprintf( stderr, " -s print final stats\n" ); -+ fprintf( stderr, " -S addr set source address\n" ); - fprintf( stderr, " -t n individual target initial timeout (in millisec) (default %d)\n", timeout / 100 ); -+ fprintf( stderr, " -T n set select timeout (default %d)\n", select_time / 100 ); - fprintf( stderr, " -u show targets that are unreachable\n" ); - fprintf( stderr, " -v show version\n" ); - fprintf( stderr, " targets list of targets to check (if no -f specified)\n" ); diff --git a/network/fping6/fping6.SlackBuild b/network/fping6/fping6.SlackBuild deleted file mode 100644 index f2e9061579..0000000000 --- a/network/fping6/fping6.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh - -# Slackware build script for fping with IPv6 and source IP setting -# support -# Copyright (c) 2008, Written by Mark Walling <mark@markwalling.org> -# IPv6 modifications by Richlv - -# 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=fping6 -VERSION=${VERSION:-2.4b2_to_ipv6} -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} - -PRGNAM_ARCHIVE=fping -VERSION_ARCHIVE=2.4b2-to-ipv6 -VERSION_SOURCE=2.4b2_to-ipv6 - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686 -DIPV6=1" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686 -DIPV6=1" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC -DIPV6=1" - 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_ARCHIVE}_$VERSION_ARCHIVE.orig.tar.gz -cd ${PRGNAM_ARCHIVE}-$VERSION_SOURCE -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch < $CWD/fping.c.diff -patch < $CWD/fping.8.diff - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man - -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 - -mv $PKG/usr/man/man8/$PRGNAM_ARCHIVE.8 $PKG/usr/man/man8/$PRGNAM.8 -mv $PKG/usr/sbin/$PRGNAM_ARCHIVE $PKG/usr/sbin/$PRGNAM - -( 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 -) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING ChangeLog 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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/fping6/fping6.info b/network/fping6/fping6.info deleted file mode 100644 index d517d71fd5..0000000000 --- a/network/fping6/fping6.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fping6" -VERSION="2.4b2_to_ipv6" -HOMEPAGE="http://fping.sourceforge.net/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/fping_2.4b2-to-ipv6.orig.tar.gz" -MD5SUM="3ad516765514249a40d3c5b6caab812a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Richlv" -EMAIL="richlv@nakts.net" diff --git a/network/fping6/slack-desc b/network/fping6/slack-desc deleted file mode 100644 index 16acb60ac1..0000000000 --- a/network/fping6/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------------------------------------------------------| -fping6: fping6 (a ping like program to send ICMP echo requests to IPv6 hosts) -fping6: -fping6: fping6 is a ping(1) like program which uses the Internet Control -fping6: Message Protocol (ICMP) echo request to determine if a host is up. -fping6: fping6 is different from ping in that you can specify any number of -fping6: hosts on the command line, or specify a file containing the lists of -fping6: hosts to ping. -fping6: This version of fping is compiled with IPv6 support, and additional -fping6: changes from Debian patch (including source address support). -fping6: http://fping.sourceforge.net/ -fping6: http://packages.debian.org/sid/fping diff --git a/network/franz/README b/network/franz/README new file mode 100644 index 0000000000..63bc085c60 --- /dev/null +++ b/network/franz/README @@ -0,0 +1,5 @@ +Franz is your messaging app for WhatsApp, Facebook Messenger, Slack, +Telegram and many many more. + +You need to sign up for Franz account before you can use this +application. diff --git a/network/franz/doinst.sh b/network/franz/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/network/franz/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/network/weboob/weboob.SlackBuild b/network/franz/franz.SlackBuild index 7652566c9d..87bd08bc6a 100644 --- a/network/weboob/weboob.SlackBuild +++ b/network/franz/franz.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for weboob +# Slackware build script for franz -# Copyright (C) 2011, Brice Lopez <brice@lopez.banh-bao.fr> +# Copyright 2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,15 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=weboob -VERSION=${VERSION:-0.a} +PRGNAM=franz +VERSION=${VERSION:-5.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; + i?86) ARCH=i586 ;; *) ARCH=$( uname -m ) ;; esac fi @@ -40,38 +39,35 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "x86_64" ]; then + SRCARCH="amd64" +else + echo "This system is unsupported. Aborting." + exit 1 +fi + +# No flags/configure needed as it is just a binary repackaging. +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 +cd $PKG +ar p $CWD/${PRGNAM}_${VERSION}_${SRCARCH}.deb data.tar.xz | tar xJv +cd $PKG chown -R root:root . +find . -type d -exec chmod 0755 {} \; 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 {} \; - -PYTHONPATH=$PKG/usr -sed -i -e "s|share/man|man|g" setup.py -python 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 - -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 + \( -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 INSTALL MANIFEST.in README 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 +cat $CWD/doinst.sh > $PWD/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/franz/franz.info b/network/franz/franz.info new file mode 100644 index 0000000000..584c56006f --- /dev/null +++ b/network/franz/franz.info @@ -0,0 +1,10 @@ +PRGNAM="franz" +VERSION="5.6.1" +HOMEPAGE="https://meetfranz.com/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/meetfranz/franz/releases/download/v5.6.1/franz_5.6.1_amd64.deb" +MD5SUM_x86_64="53ce256b971f169f7c593c67ee54ed68" +REQUIRES="" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/network/franz/slack-desc b/network/franz/slack-desc new file mode 100644 index 0000000000..a42a23a70a --- /dev/null +++ b/network/franz/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------------------------------------------------------| +franz: franz (Messaging App Unification) +franz: +franz: Franz is your messaging app for WhatsApp, Facebook Messenger, Slack, +franz: Telegram and many many more. +franz: +franz: +franz: +franz: +franz: Project: https://meetfranz.com/ +franz: +franz: diff --git a/network/freedownloadmanager/README b/network/freedownloadmanager/README new file mode 100644 index 0000000000..65baf561f3 --- /dev/null +++ b/network/freedownloadmanager/README @@ -0,0 +1,4 @@ +It's a cross-platform powerful modern download accelerator and +organizer for Windows, macOS, Android, and Linux. Compatible with +the most popular browsers Google Chrome, Mozilla Firefox, +Microsoft Edge, Internet Explorer and Safari. diff --git a/network/mkvserver_mk2/doinst.sh b/network/freedownloadmanager/doinst.sh index aea0f894eb..aea0f894eb 100644 --- a/network/mkvserver_mk2/doinst.sh +++ b/network/freedownloadmanager/doinst.sh diff --git a/network/freedownloadmanager/freedownloadmanager.SlackBuild b/network/freedownloadmanager/freedownloadmanager.SlackBuild new file mode 100644 index 0000000000..fda006fa50 --- /dev/null +++ b/network/freedownloadmanager/freedownloadmanager.SlackBuild @@ -0,0 +1,86 @@ +#!/bin/sh + +# Slackware build script for freedownloadmanager + +# Copyright 2020 Andre Fernando, 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=freedownloadmanager +VERSION=${VERSION:-6.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 +mkdir -p $PRGNAM +cd $PRGNAM +ar -x $CWD/${PRGNAM}.deb +tar xvf data.tar.xz -C $PKG +cd $PKG +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 $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 +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/network/freedownloadmanager/freedownloadmanager.info b/network/freedownloadmanager/freedownloadmanager.info new file mode 100644 index 0000000000..7ae13cb7bc --- /dev/null +++ b/network/freedownloadmanager/freedownloadmanager.info @@ -0,0 +1,10 @@ +PRGNAM="freedownloadmanager" +VERSION="6.9" +HOMEPAGE="https://www.freedownloadmanager.org" +DOWNLOAD="https://dn3.freedownloadmanager.org/6/latest/freedownloadmanager.deb" +MD5SUM="8d2696f79480eb70770171921c2c4ab5" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Andre Fernando" +EMAIL="ando344@gmail.com" diff --git a/network/freedownloadmanager/slack-desc b/network/freedownloadmanager/slack-desc new file mode 100644 index 0000000000..e38cb2fecb --- /dev/null +++ b/network/freedownloadmanager/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------------------------------------------------------| +freedownloadmanager: Free Download Manager (Powerful Download Accelerator and Organizer) +freedownloadmanager: +freedownloadmanager: It's a cross-platform powerful modern download accelerator and +freedownloadmanager: organizer for Windows, macOS, Android, and Linux. Compatible with +freedownloadmanager: the most popular browsers Google Chrome, Mozilla Firefox, +freedownloadmanager: Microsoft Edge, Internet Explorer and Safari. +freedownloadmanager: +freedownloadmanager: Homepage: https://www.freedownloadmanager.org +freedownloadmanager: +freedownloadmanager: +freedownloadmanager: diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild index 18f1a4bc4f..3b9edaa061 100644 --- a/network/freerdp/freerdp.SlackBuild +++ b/network/freerdp/freerdp.SlackBuild @@ -6,7 +6,7 @@ # Copyright 2010,2012 Niels Horn, Rio de Janeiro, RJ, Brazil # Copyright 2015 Mario Preksavec <mario@slackware.hr> # Copyright 2015-2018 Philip van der Hoeven, Almere, The Netherlands -# Copyright 2019 Tim Danforth, USA +# Copyright 2019-2020 Tim Danforth, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,12 +28,11 @@ PRGNAM=freerdp -VERSION=${VERSION:-2.0.0_rc4} -SRCVER=$(echo $VERSION | tr _ -) +VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -DIRNAME=FreeRDP-$SRCVER +DIRNAME=FreeRDP-$VERSION if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -108,7 +107,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 ChangeLog LICENSE README $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 diff --git a/network/freerdp/freerdp.info b/network/freerdp/freerdp.info index 1ce1cd6bdd..8d652ec32a 100644 --- a/network/freerdp/freerdp.info +++ b/network/freerdp/freerdp.info @@ -1,8 +1,8 @@ PRGNAM="freerdp" -VERSION="2.0.0_rc4" -HOMEPAGE="http://www.freerdp.com" -DOWNLOAD="https://github.com/FreeRDP/FreeRDP/archive/2.0.0-rc4/FreeRDP-2.0.0-rc4.tar.gz" -MD5SUM="bbf6f3566037b0e3de7d8dc637066682" +VERSION="2.0.0" +HOMEPAGE="https://www.freerdp.com" +DOWNLOAD="https://github.com/FreeRDP/FreeRDP/archive/2.0.0/FreeRDP-2.0.0.tar.gz" +MD5SUM="9ac36ebc219a9877965eedc9263ee59c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg" diff --git a/network/freerdp/slack-desc b/network/freerdp/slack-desc index 5a5436edbe..7900777963 100644 --- a/network/freerdp/slack-desc +++ b/network/freerdp/slack-desc @@ -11,7 +11,7 @@ freerdp: freerdp: FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), freerdp: released under the Apache license. freerdp: -freerdp: Homepage: http://www.freerdp.com +freerdp: Homepage: https://www.freerdp.com freerdp: freerdp: freerdp: diff --git a/network/frr/frr.SlackBuild b/network/frr/frr.SlackBuild index 701fd9696a..c25bdfa0c4 100644 --- a/network/frr/frr.SlackBuild +++ b/network/frr/frr.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for frr -# Copyright 2018 Thibaut Notteboom, Paris, FRANCE +# Copyright 2018-2020 Thibaut Notteboom, Paris, FRANCE # 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=frr -VERSION=${VERSION:-6.0} +VERSION=${VERSION:-7.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -110,6 +110,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-fpm \ --enable-vtysh \ --enable-watchfrr \ + --enable-doc \ + --enable-doc-html \ --disable-systemd \ --disable-static \ --without-libpam \ @@ -120,21 +122,13 @@ make install-strip DESTDIR=$PKG install -d -m 750 -o frr -g frr $PKG/etc/frr $PKG/var/log/frr $PKG/var/run/frr -install -D -m 640 -o frr -g frr redhat/daemons $PKG/etc/frr/daemons.new +install -D -m 640 -o frr -g frr tools/etc/frr/daemons $PKG/etc/frr/daemons.new install -D -m 640 -o frr -g frrvty tools/etc/frr/vtysh.conf $PKG/etc/frr/vtysh.conf.new -install -D -m 644 redhat/frr.init $PKG/etc/rc.d/rc.frr.new +install -D -m 644 $PKG/usr/sbin/frrinit.sh $PKG/etc/rc.d/rc.frr.new install -D -m 644 redhat/frr.logrotate $PKG/etc/logrotate.d/frr.new -install -D -m 644 bgpd/BGP4-MIB.txt $PKG/usr/share/snmp/mibs/BGP4-MIB.txt -install -D -m 644 eigrpd/EIGRP-MIB.txt $PKG/usr/share/snmp/mibs/EIGRP-MIB.txt -install -D -m 644 ospf6d/OSPFv3-MIB.txt $PKG/usr/share/snmp/mibs/OSPFv3-MIB.txt -install -D -m 644 ospfd/OSPF-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-MIB.txt -install -D -m 644 ospfd/OSPF-TRAP-MIB.txt $PKG/usr/share/snmp/mibs/OSPF-TRAP-MIB.txt -install -D -m 644 ripd/RIPv2-MIB.txt $PKG/usr/share/snmp/mibs/RIPv2-MIB.txt - -# Fix paths -sed -i 's|usr/lib/frr|usr/sbin|g' $PKG/etc/rc.d/rc.frr.new $PKG/etc/frr/daemons.new +sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|g' $PKG/usr/sbin/{frr-reload.py,generate_support_bundle.py} # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la @@ -148,7 +142,7 @@ gzip -9 $PKG/usr/info/*.info* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README* \ + COPYING* README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/frr/frr.info b/network/frr/frr.info index d653abc141..4cd3dd396a 100644 --- a/network/frr/frr.info +++ b/network/frr/frr.info @@ -1,10 +1,10 @@ PRGNAM="frr" -VERSION="6.0" +VERSION="7.3.1" HOMEPAGE="https://frrouting.org/" -DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-6.0/frr-frr-6.0.tar.gz" -MD5SUM="f7584302a8837194021b82ae646d5e2d" +DOWNLOAD="https://github.com/FRRouting/frr/archive/frr-7.3.1/frr-frr-7.3.1.tar.gz" +MD5SUM="87eeee8a5ca731054e0264d6a23c9940" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="perl-xml-libxml c-ares ipaddr-py Sphinx rtrlib" +REQUIRES="perl-xml-libxml c-ares ipaddr-py Sphinx rtrlib libyang" MAINTAINER="Thibaut Notteboom" EMAIL="thibaut.notteboom@gmail.com" diff --git a/network/fwknop/fwknop.info b/network/fwknop/fwknop.info index 0446408d1f..e745237ec8 100644 --- a/network/fwknop/fwknop.info +++ b/network/fwknop/fwknop.info @@ -6,5 +6,5 @@ MD5SUM="f195bd31e7dc7df2e9b0c35cd80655b7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Eric B. Pratt" -EMAIL="eric.b.pratt@gmail.com" +MAINTAINER="Sergey Poznyakoff" +EMAIL="gray@gnu.org" diff --git a/network/gajim/gajim.info b/network/gajim/gajim.info index 5cbd0123c2..1a8146f1d7 100644 --- a/network/gajim/gajim.info +++ b/network/gajim/gajim.info @@ -1,7 +1,7 @@ PRGNAM="gajim" VERSION="0.16.9" HOMEPAGE="http://www.gajim.org" -DOWNLOAD="https://gajim.org/downloads/0.16/gajim-0.16.9.tar.bz2" +DOWNLOAD="https://gajim.org/downloads/0.x/0.16/gajim-0.16.9.tar.bz2" MD5SUM="87684533b7d6a9611fe28a9b7fca296d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/geomyidae/geomyidae.SlackBuild b/network/geomyidae/geomyidae.SlackBuild index 2db6aaeebc..9e933c58f8 100644 --- a/network/geomyidae/geomyidae.SlackBuild +++ b/network/geomyidae/geomyidae.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for geomyidae -# 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/network/geomyidae/geomyidae.info b/network/geomyidae/geomyidae.info index 68dc8ffdc6..ae69121696 100644 --- a/network/geomyidae/geomyidae.info +++ b/network/geomyidae/geomyidae.info @@ -1,10 +1,10 @@ PRGNAM="geomyidae" VERSION="v0.34" -HOMEPAGE="gopher://bitreich.org/1/scm/geomyidae/log.gph" +HOMEPAGE="http://r-36.net/scm/geomyidae/log.html" DOWNLOAD="ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz" MD5SUM="75c4e5864afc184514372b0a5922242d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +EMAIL="dave@slackbuilds.org" diff --git a/network/glewlwyd/glewlwyd.SlackBuild b/network/glewlwyd/glewlwyd.SlackBuild index c4a2d3d9e3..9977a3c7d0 100644 --- a/network/glewlwyd/glewlwyd.SlackBuild +++ b/network/glewlwyd/glewlwyd.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=glewlwyd -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-2.5.2} SRCVER=$(tr _ - <<< ${VERSION}) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -87,7 +87,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/var/cache/glewlwyd/ mv $PKG/etc/glewlwyd/glewlwyd.conf $PKG/etc/glewlwyd/glewlwyd.conf.sample if [ ! -z "$LIBDIRSUFFIX" ]; then - sed -i 's#/usr/lib/glewlwyd/#/usr/lib${LIBDIRSUFFIX}/glewlwyd/#g' $PKG/etc/glewlwyd/glewlwyd.conf.sample + sed -i 's#/usr/lib.*/glewlwyd/#/usr/lib'${LIBDIRSUFFIX}'/glewlwyd/#g' $PKG/etc/glewlwyd/glewlwyd.conf.sample fi mkdir -p $PKG/etc/rc.d/ diff --git a/network/glewlwyd/glewlwyd.info b/network/glewlwyd/glewlwyd.info index 2f35fc58af..06c12b5965 100644 --- a/network/glewlwyd/glewlwyd.info +++ b/network/glewlwyd/glewlwyd.info @@ -1,10 +1,10 @@ PRGNAM="glewlwyd" -VERSION="2.0.0" +VERSION="2.5.2" HOMEPAGE="https://github.com/babelouest/glewlwyd" -DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.0.0/glewlwyd-2.0.0.tar.gz" -MD5SUM="5f27b3ef16efdf0d9f509848622a034a" +DOWNLOAD="https://github.com/babelouest/glewlwyd/archive/v2.5.2/glewlwyd-2.5.2.tar.gz" +MD5SUM="fa6d6f99894aae2b0e16a36e9322f4a8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libconfig libjwt oath-toolkit libcbor hoel" +REQUIRES="libconfig oath-toolkit libcbor hoel iddawc" MAINTAINER="Yth - Arnaud" EMAIL="yth@ythogtha.org" diff --git a/network/glusterfs/glusterfs.info b/network/glusterfs/glusterfs.info index cb4905c8b1..ccd7764471 100644 --- a/network/glusterfs/glusterfs.info +++ b/network/glusterfs/glusterfs.info @@ -1,7 +1,7 @@ PRGNAM="glusterfs" VERSION="4.1.0" HOMEPAGE="https://www.gluster.org/" -DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/4.1/4.1.0/glusterfs-4.1.0.tar.gz" +DOWNLOAD="https://download.gluster.org/pub/gluster/glusterfs/01.old-releases/4.1/4.1.0/glusterfs-4.1.0.tar.gz" MD5SUM="2b9cd00fb6a1eff2f84489b7883303b7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/gnirehtet-bin/README b/network/gnirehtet-bin/README new file mode 100644 index 0000000000..5d0faab424 --- /dev/null +++ b/network/gnirehtet-bin/README @@ -0,0 +1,44 @@ +gnirehtet is a tool that provides reverse tethering for Android + +This is a repackage of the 64 bit binary supplied by upstream, +the version written in Rust. + +gnirehtet requires adb as runtime dependency. adb is part of the +package android-tools on slackbuilds.org . adb must be in PATH, +so if it's not installed through the aforementioned package, +either alter PATH or drop it into the current working directory, +so gnirehtet finds it. + +gnirehtet requires the Android device to be switched to +Developer Mode and have the following options switched on +(tested on a Redmi 9C NFC phone): + +- USB debugging +- Install via USB +- USB debugging (Security settings) + +`gnirehtet install` requires gnirehtet.apk in current directory +(I am not sure about it?) +gnirehtet.apk is packaged into /usr/share/gnirehtet/. Copy or symlink it +from there into current directory +When running `gnirehtet install`, despite having the "Install via USB" +option enabled, if adb fails, just copy `gnirehtet.apk` to the phone +and install it directly from the phone + +gnirehtet-2.5 has two problems: + +1. Sometimes the client (the phone) randomly disconnects. gnirehtet +prints a log message to stdout, but keeps working. The simplest +(but sometimes inconvenient) fix is to restart gnirehtet on the +desktop. This is true for both `gnirehtet run` and `gnirehtet autorun` +commands. A workaround that automates the restart of gnirehtet in +such situations is described in comments here: + +https://github.com/Genymobile/gnirehtet/issues/352 + +2. When hitting the square soft key in Android to kill all apps that +run in background, gnirehtet gets killed too, the phone disconnects +from the server running the desktop and the problem is reduced to 1. +the workaround described there fixes 2. as well + +This binary was compiled on Aug 16, 2020. diff --git a/network/RSSOwl/RSSOwl.SlackBuild b/network/gnirehtet-bin/gnirehtet-bin.SlackBuild index e74ccf654a..d64b778c50 100644 --- a/network/RSSOwl/RSSOwl.SlackBuild +++ b/network/gnirehtet-bin/gnirehtet-bin.SlackBuild @@ -1,9 +1,7 @@ #!/bin/sh -# -# Slackware build script for RSSOwl -# -# Written by Vincent Batts, vbatts@hashbangbash.com -2009 -# Maintained by Erik Hanson, erik@slackbuilds.org 2010-2014 + +# Slackware build script for gnirehtet-bin +# Copyright 2021 toolonely <lonely_@tutanota.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,32 +21,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=RSSOwl -VERSION=${VERSION:-2.2.1} -BUILD=${BUILD:-1} +PRGNAM=gnirehtet-bin +BINNAM=gnirehtet +VERSION=${VERSION:-2.5} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; + *) ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" - SRC_ARCH="x86_64.zip" -elif [ "$ARCH" = "i486" ]; then - LIBDIRSUFFIX="" - SRC_ARCH="x86.zip" -else - printf "$ARCH is not supported...\n" +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" != "x86_64" ]; then + echo "$ARCH is not supported." exit 1 fi @@ -57,37 +50,25 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf rssowl -unzip $CWD/rssowl-$VERSION.linux.${SRC_ARCH} -cd rssowl +rm -rf $BINNAM-rust-linux64 +unzip $CWD/$BINNAM-rust-linux64-v$VERSION.zip +cd $BINNAM-rust-linux64 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 -ln -s /usr/lib${LIBDIRSUFFIX}/RSSOwl/RSSOwl $PKG/usr/bin/RSSOwl - -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM -cp -av * $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM - -sed -i 's,libhunspell-1.2.so.0,libhunspell-1.3.so.0,g' $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/xulrunner/libxul.so + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir -p $PKG/usr/share/pixmaps -cp -av icon.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm +install -D -m 0755 $BINNAM $PKG/usr/bin/$BINNAM -mkdir -p $PKG/usr/share/applications -cp -v $CWD/$PRGNAM.desktop $PKG/usr/share/applications/ +install -D -m 0644 $BINNAM.apk $PKG/usr/share/$BINNAM/$BINNAM.apk mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a about* $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/network/gnirehtet-bin/gnirehtet-bin.info b/network/gnirehtet-bin/gnirehtet-bin.info new file mode 100644 index 0000000000..4f36f3d041 --- /dev/null +++ b/network/gnirehtet-bin/gnirehtet-bin.info @@ -0,0 +1,10 @@ +PRGNAM="gnirehtet-bin" +VERSION="2.5" +HOMEPAGE="https://github.com/Genymobile/gnirehtet" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/Genymobile/gnirehtet/releases/download/v2.5/gnirehtet-rust-linux64-v2.5.zip" +MD5SUM_x86_64="48d29d23691d6a1daebca68573684d4a" +REQUIRES="" +MAINTAINER="toolonely" +EMAIL="lonely_@tutanota.com" diff --git a/network/gnirehtet-bin/slack-desc b/network/gnirehtet-bin/slack-desc new file mode 100644 index 0000000000..14df637cb7 --- /dev/null +++ b/network/gnirehtet-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------------------------------------------------------| +gnirehtet-bin: gnirehtet-bin (reverse tethering for Android) +gnirehtet-bin: +gnirehtet-bin: gnirehtet is a tool that provides reverse tethering for Android +gnirehtet-bin: +gnirehtet-bin: +gnirehtet-bin: This is a repackage of the 64 bit binary supplied by upstream, +gnirehtet-bin: the version written in Rust. +gnirehtet-bin: +gnirehtet-bin: https://github.com/Genymobile/gnirehtet +gnirehtet-bin: +gnirehtet-bin: diff --git a/network/gnome-bluetooth/slack-desc b/network/gnome-bluetooth/slack-desc index 23df9481b3..0d53772262 100644 --- a/network/gnome-bluetooth/slack-desc +++ b/network/gnome-bluetooth/slack-desc @@ -5,7 +5,7 @@ # 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------------------------------------------------------| gnome-bluetooth: gnome-bluetooth (GNOME Bluetooth support) gnome-bluetooth: gnome-bluetooth: Gnome-Bluetooth provides desktop level support for Bluetooth diff --git a/network/go-ipfs/go-ipfs.SlackBuild b/network/go-ipfs/go-ipfs.SlackBuild index 101c6a0286..a6cb5b60b0 100644 --- a/network/go-ipfs/go-ipfs.SlackBuild +++ b/network/go-ipfs/go-ipfs.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=go-ipfs -VERSION=${VERSION:-0.4.20} +VERSION=${VERSION:-0.4.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,7 @@ cp -a * \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo -rm $PKG/usr/doc/$PRGNAM-$VERSION/build-log +#rm $PKG/usr/doc/$PRGNAM-$VERSION/build-log || echo -ne '' # let's ignore minor error mv $PKG/usr/doc/$PRGNAM-$VERSION/ipfs $PKG/usr/bin/ diff --git a/network/go-ipfs/go-ipfs.info b/network/go-ipfs/go-ipfs.info index 43b1c3dc78..59e8cf71f6 100644 --- a/network/go-ipfs/go-ipfs.info +++ b/network/go-ipfs/go-ipfs.info @@ -1,10 +1,10 @@ PRGNAM="go-ipfs" -VERSION="0.4.20" -HOMEPAGE="https://ipfs.io/" -DOWNLOAD="https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-386.tar.gz" -MD5SUM="f2fe783324642d196ada103c0e7231cc" -DOWNLOAD_x86_64="https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-amd64.tar.gz" -MD5SUM_x86_64="ad860f09a92c69adee0b9691aea06749" +VERSION="0.4.23" +HOMEPAGE="https://dist.ipfs.io/#go-ipfs" +DOWNLOAD="https://dist.ipfs.io/go-ipfs/v0.4.23/go-ipfs_v0.4.23_linux-386.tar.gz" +MD5SUM="dd09c03a2254b8a5682efa02b4c38124" +DOWNLOAD_x86_64="https://dist.ipfs.io/go-ipfs/v0.4.23/go-ipfs_v0.4.23_linux-amd64.tar.gz" +MD5SUM_x86_64="357270a1a368a095e69728b2dcf7952c" REQUIRES="" MAINTAINER="Marcin Szychowski" EMAIL="szycha@gmail.com" diff --git a/network/gofiche/gofiche.SlackBuild b/network/gofiche/gofiche.SlackBuild index ea08181341..19e6c39080 100644 --- a/network/gofiche/gofiche.SlackBuild +++ b/network/gofiche/gofiche.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for gofiche -# Copyright 2017 Dave <dave@dawoodfall.net> +# Copyright 2017 Dave <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/gofiche/gofiche.info b/network/gofiche/gofiche.info index 1063c9262e..be0e5683f2 100644 --- a/network/gofiche/gofiche.info +++ b/network/gofiche/gofiche.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/network/googler/googler.SlackBuild b/network/googler/googler.SlackBuild index 1d6b6f05e7..cf64d6520a 100644 --- a/network/googler/googler.SlackBuild +++ b/network/googler/googler.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=googler -VERSION=${VERSION:-3.9} +VERSION=${VERSION:-4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/googler/googler.info b/network/googler/googler.info index 38316366d4..9ac4f9d2b9 100644 --- a/network/googler/googler.info +++ b/network/googler/googler.info @@ -1,8 +1,8 @@ PRGNAM="googler" -VERSION="3.9" +VERSION="4.0" HOMEPAGE="https://github.com/jarun/googler" -DOWNLOAD="https://github.com/jarun/googler/archive/v3.9/googler-3.9.tar.gz" -MD5SUM="cf9a8f3f141568bd9bde49e0412e8059" +DOWNLOAD="https://github.com/jarun/googler/archive/v4.0/googler-4.0.tar.gz" +MD5SUM="b12b11a70cde5bd8483114a96d99dbc5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/network/gophernicus/git2tarxz.sh b/network/gophernicus/git2tarxz.sh index e4937ba1c4..2da7118d54 100644 --- a/network/gophernicus/git2tarxz.sh +++ b/network/gophernicus/git2tarxz.sh @@ -46,7 +46,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz Update $PRGNAM.info with: VERSION="$VERSION" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz" MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )" Don't forget to upload the new source! diff --git a/network/gophernicus/gophernicus.info b/network/gophernicus/gophernicus.info index 8986cecfd3..a9f15b99e8 100644 --- a/network/gophernicus/gophernicus.info +++ b/network/gophernicus/gophernicus.info @@ -1,7 +1,7 @@ PRGNAM="gophernicus" VERSION="2.5v101" HOMEPAGE="https://github.com/kimholviala/gophernicus" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/gophernicus-2.5v101.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/gophernicus-2.5v101.tar.xz" MD5SUM="a95b9c71bf67581b66703d979e5e3789" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild index 222cf8102e..c4d09274d1 100644 --- a/network/grsync/grsync.SlackBuild +++ b/network/grsync/grsync.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for grsync -# Copyright 2013-2016 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 @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=grsync -VERSION=${VERSION:-1.2.6} +VERSION=${VERSION:-1.2.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/grsync/grsync.info b/network/grsync/grsync.info index 68d70b398f..56c19dc988 100644 --- a/network/grsync/grsync.info +++ b/network/grsync/grsync.info @@ -1,8 +1,8 @@ PRGNAM="grsync" -VERSION="1.2.6" +VERSION="1.2.8" HOMEPAGE="http://www.opbyte.it/grsync/" -DOWNLOAD="http://downloads.sf.net/grsync/grsync-1.2.6.tar.gz" -MD5SUM="eb2b39e68a04ea5b9c92bcb7d9401e80" +DOWNLOAD="http://downloads.sf.net/grsync/grsync-1.2.8.tar.gz" +MD5SUM="9531279242a36169847fb81f72ceb412" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/guacamole-client/guacamole-client.SlackBuild b/network/guacamole-client/guacamole-client.SlackBuild index 395599d0c1..204239c179 100644 --- a/network/guacamole-client/guacamole-client.SlackBuild +++ b/network/guacamole-client/guacamole-client.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for guacamole-client -# Copyright 2015-2017 Zhu Qun-Ying +# Copyright 2015-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=guacamole-client -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/guacamole-client/guacamole-client.info b/network/guacamole-client/guacamole-client.info index 80a5842106..225c2d5f65 100644 --- a/network/guacamole-client/guacamole-client.info +++ b/network/guacamole-client/guacamole-client.info @@ -1,8 +1,8 @@ PRGNAM="guacamole-client" -VERSION="1.0.0" +VERSION="1.1.0" HOMEPAGE="https://guacamole.apache.org" -DOWNLOAD="http://archive.apache.org/dist/guacamole/1.0.0/binary/guacamole-1.0.0.war" -MD5SUM="b190718b63e80442b0c3642e5bd4bca8" +DOWNLOAD="http://archive.apache.org/dist/guacamole/1.1.0/binary/guacamole-1.1.0.war" +MD5SUM="b41ad2663c424516241346863662fa4b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="apache-tomcat" diff --git a/network/guacamole-client/slack-desc b/network/guacamole-client/slack-desc index 64c6538b27..9185d176c7 100644 --- a/network/guacamole-client/slack-desc +++ b/network/guacamole-client/slack-desc @@ -5,7 +5,7 @@ # 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------------------------------------------------------| guacamole-client: guacamole-client (Guacamole client) guacamole-client: guacamole-client: guacamole-client contains all Java and JavaScript components diff --git a/network/guacamole-server/guacamole-server.SlackBuild b/network/guacamole-server/guacamole-server.SlackBuild index 4faaafa5c8..a2ce108c24 100644 --- a/network/guacamole-server/guacamole-server.SlackBuild +++ b/network/guacamole-server/guacamole-server.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for guacamole-server -# Copyright 2015-2019 Zhu Qun-Ying +# Copyright 2015-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=guacamole-server -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/guacamole-server/guacamole-server.info b/network/guacamole-server/guacamole-server.info index 09d9d5d678..e5fdc232a3 100644 --- a/network/guacamole-server/guacamole-server.info +++ b/network/guacamole-server/guacamole-server.info @@ -1,8 +1,8 @@ PRGNAM="guacamole-server" -VERSION="1.0.0" +VERSION="1.1.0" HOMEPAGE="http://guacamole.apache.org/" -DOWNLOAD="https://github.com/apache/guacamole-server/archive/1.0.0/guacamole-server-1.0.0.tar.gz" -MD5SUM="5081a0670bcd693dd4d5fea60ab5ca5d" +DOWNLOAD="https://github.com/apache/guacamole-server/archive/1.1.0/guacamole-server-1.1.0.tar.gz" +MD5SUM="089cdb864d5d0d196312eaee889a02cf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libtelnet freerdp" diff --git a/network/guacamole-server/slack-desc b/network/guacamole-server/slack-desc index 3d4e42ab20..40515ece9c 100644 --- a/network/guacamole-server/slack-desc +++ b/network/guacamole-server/slack-desc @@ -5,7 +5,7 @@ # 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------------------------------------------------------| guacamole-server: guacamole-server (Guacamole server) guacamole-server: guacamole-server: guacamole-server contains all the native, server-side diff --git a/network/haskell-network-multicast/README b/network/haskell-network-multicast/README new file mode 100644 index 0000000000..084ebb30da --- /dev/null +++ b/network/haskell-network-multicast/README @@ -0,0 +1,5 @@ +The Network.Multicast module is for sending UDP datagrams over multicast +(class D) addresses. + +Network.Multicast 0.2.0 is the last version compatible with Network < 2.7 that +doesn't require an explicit install of Network.BSD. diff --git a/network/haskell-network-multicast/doinst.sh b/network/haskell-network-multicast/doinst.sh new file mode 100644 index 0000000000..3268c238bf --- /dev/null +++ b/network/haskell-network-multicast/doinst.sh @@ -0,0 +1 @@ +chroot . /usr/bin/ghc-pkg recache diff --git a/network/haskell-network-multicast/haskell-network-multicast.SlackBuild b/network/haskell-network-multicast/haskell-network-multicast.SlackBuild new file mode 100644 index 0000000000..b392a0bf8c --- /dev/null +++ b/network/haskell-network-multicast/haskell-network-multicast.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/sh + +# Slackware build script for haskell-network-multicast + +# Copyright 2020 Jan-willem De Bleser, Pasadena, CA, 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=haskell-network-multicast +VERSION=${VERSION:-0.2.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM="$( echo $PRGNAM | cut -d- -f2- )" + +GHC_VERSION=$(ghc --numeric-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 $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 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +runghc Setup configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ + --enable-shared \ + --enable-library-profiling \ + --docdir=/usr/doc/$PRGNAM-$VERSION + +runghc Setup build +runghc Setup haddock +runghc Setup copy --destdir=$PKG +runghc Setup register --gen-pkg-config + +PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d +PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 ) +mkdir -p $PKG/$PKGCONFD +mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.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 \ + 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/network/haskell-network-multicast/haskell-network-multicast.info b/network/haskell-network-multicast/haskell-network-multicast.info new file mode 100644 index 0000000000..fb31fcfc10 --- /dev/null +++ b/network/haskell-network-multicast/haskell-network-multicast.info @@ -0,0 +1,10 @@ +PRGNAM="haskell-network-multicast" +VERSION="0.2.0" +HOMEPAGE="https://hackage.haskell.org/package/network-multicast" +DOWNLOAD="https://hackage.haskell.org/package/network-multicast-0.2.0/network-multicast-0.2.0.tar.gz" +MD5SUM="3d24c965c74baec05c3599489b1e4356" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="haskell-network" +MAINTAINER="Jan-willem De Bleser" +EMAIL="jw@thescrapyard.org" diff --git a/network/haskell-network-multicast/slack-desc b/network/haskell-network-multicast/slack-desc new file mode 100644 index 0000000000..62385865f5 --- /dev/null +++ b/network/haskell-network-multicast/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------------------------------------------------------| +haskell-network-multicast: haskell-network-multicast (multicast module) +haskell-network-multicast: +haskell-network-multicast: The Network.Multicast module is for sending UDP datagrams over +haskell-network-multicast: multicast (class D) addresses. +haskell-network-multicast: +haskell-network-multicast: +haskell-network-multicast: +haskell-network-multicast: +haskell-network-multicast: +haskell-network-multicast: https://hackage.haskell.org/package/network-multicast +haskell-network-multicast: diff --git a/network/hiawatha/README b/network/hiawatha/README index 6f6e655e59..094e670fb1 100644 --- a/network/hiawatha/README +++ b/network/hiawatha/README @@ -1,12 +1,12 @@ -Hiawatha (A secure and advanced Web server) +Hiawatha (A secure and advanced webserver) -Hiawatha is a Web server for Unix and has been built with security -in mind. This resulted in a highly secure Web server, in both code -and features. +Hiawatha is a web server for Unix and has been built with security in +mind. This resulted in a highly secure web server, in both code and +features. -Hiawatha supports many Web and HTTP features such as -CGI/FASTCGI, HTTP authentication, virtual host support, request -pipelining, keep alive connections, URL rewriting and many more. +Hiawatha supports many web and HTTP features such as CGI/FASTCGI, HTTP +authentication, virtual host support, request pipelining, keep alive +connections, URL rewriting and many more. Notes: @@ -21,9 +21,9 @@ Notes: * Hiawatha's daemon will listen on the network interface 127.0.0.1:80, and it can write temporary files inside - /var/db/hiawatha + /var/db/hiawatha - * The Web root directory is /var/hiawatha with index.html being + * The web root directory is /var/hiawatha with index.html being the default start file. Hiawatha's documentation can be found at the following URL: diff --git a/network/hiawatha/hiawatha.SlackBuild b/network/hiawatha/hiawatha.SlackBuild index b4315d65df..6e1e46a6b3 100644 --- a/network/hiawatha/hiawatha.SlackBuild +++ b/network/hiawatha/hiawatha.SlackBuild @@ -2,9 +2,8 @@ # Slackware build script for hiawatha -# Copyright 2018-2019 Donald Cooley South Haven, Indiana USA -# Copyright (c) 2009-2012, Antonio Hernández Blas <hba.nihilismus@gmail.com> -# Copyright (c) 2014, Antonio Hernández Blas <hba.nihilismus@gmail.com> +# Copyright 2018-2020 Donald Cooley South Haven, Indiana, USA +# Copyright (c) 2009-2012, 2014 Antonio Hernández Bls # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,7 +23,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=hiawatha -VERSION=${VERSION:-10.9} +VERSION=${VERSION:-10.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -87,11 +86,10 @@ cd build -DWORK_DIR=/var/db/$PRGNAM \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_CACHE=on \ - -DENABLE_IPV6=on \ -DENABLE_MONITOR=on \ -DENABLE_RPROXY=on \ - -DENABLE_TOMAHAWK=on \ -DENABLE_TLS=on \ + -DENABLE_TOMAHAWK=on \ -DENABLE_TOOLKIT=on \ -DENABLE_XSLT=on \ .. @@ -116,14 +114,16 @@ 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/extra +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ChangeLog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat extra/newroot > $PKG/usr/doc/$PRGNAM-$VERSION/extra/newroot - -mkdir -p $PKG/usr/share/$PRGNAM -tar -caf $PKG/usr/share/$PRGNAM/letsencrypt.tar.gz extra/letsencrypt/* +mkdir -p $PKG/usr/share/$PRGNAM/extra +cat extra/newroot > $PKG/usr/share/$PRGNAM/extra/newroot +tar -caf $PKG/usr/share/$PRGNAM/extra/letsencrypt.tar.gz extra/letsencrypt/* +cp -a extra/{*.xml,index.html,*.in,tls*} \ + $PKG/usr/share/$PRGNAM/extra/ +cp -a extra/nghttp2.tgz $PKG/usr/share/$PRGNAM/extra/ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/hiawatha/hiawatha.info b/network/hiawatha/hiawatha.info index a88fc79c20..8016841a33 100644 --- a/network/hiawatha/hiawatha.info +++ b/network/hiawatha/hiawatha.info @@ -1,8 +1,8 @@ PRGNAM="hiawatha" -VERSION="10.9" +VERSION="10.10" HOMEPAGE="https://www.hiawatha-webserver.org" -DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.9.tar.gz" -MD5SUM="83aa447f187c33968bee9dfac3011718" +DOWNLOAD="https://www.hiawatha-webserver.org/files/hiawatha-10.10.tar.gz" +MD5SUM="3bf2c12c7037ecc3dfdbec72e7a2f04f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/hiawatha/slack-desc b/network/hiawatha/slack-desc index 5a44668542..05db98aa46 100644 --- a/network/hiawatha/slack-desc +++ b/network/hiawatha/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -hiawatha: hiawatha (A secure and advanced Web server) +hiawatha: hiawatha (A secure and advanced web server) hiawatha: -hiawatha: Hiawatha is a Web server for Unix and has been built with security -hiawatha: in mind. This resulted in a highly secure Web server, in both code -hiawatha: and features. +hiawatha: Hiawatha is a web server for Unix and has been built with security in +hiawatha: mind. This resulted in a highly secure web server, in both code and +hiawatha: features. hiawatha: -hiawatha: Hiawatha supports many web and HTTP features such as -hiawatha: CGI/FastCGI, HTTP authentication, virtual host support, request -hiawatha: pipelining, keep alive connections, URL rewriting and many more. +hiawatha: Hiawatha supports many web and HTTP features such as CGI/FastCGI, +hiawatha: HTTP authentication, virtual host support, request pipelining, keep +hiawatha: alive connections, URL rewriting and many more. hiawatha: hiawatha: Homepage: https://www.hiawatha-webserver.org diff --git a/network/hipchat/README b/network/hipchat/README deleted file mode 100644 index 9c62cb30be..0000000000 --- a/network/hipchat/README +++ /dev/null @@ -1,7 +0,0 @@ -Hipchat is a private group messaging service with support for video -chat, group screen sharing, and file sharing. - -This script repackages the Debian package provided by Atlassian. - -Note that only a 64 bit version is available. For an old 32 bit version -of HipChat, see the hipchat2 SlackBuild. diff --git a/network/hipchat/hipchat.SlackBuild b/network/hipchat/hipchat.SlackBuild deleted file mode 100644 index bb7aa5056e..0000000000 --- a/network/hipchat/hipchat.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST -# Copyright 2009, 2010, 2011, 2012, 2013 Eric Hameleers, Eindhoven, Netherlands -# Slackware build script for hipchat -# Written by Lionel Young <lionelyoung@gmail.com> -# Based on http://slackbuilds.org/template.SlackBuild -# Maintained by Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org> 2014-2017 - -# Alan Dingeldein | Canyon Lake, TX | kd5zex@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=hipchat -VERSION=${VERSION:-4.29.4.1662} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM=HipChat4 - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i686 ;; - 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" != "x86_64" ]; then - echo "$ARCH is not supported!" - exit 1 -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $PKG -ar p $CWD/$SRCNAM-${VERSION}-Linux.deb data.tar.gz | tar xvz -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 {} \; - -# Create symlinks in /usr/bin -mkdir -p $PKG/usr/bin -ln -s /opt/hipchat/bin/hipchat $PKG/usr/bin/hipchat - -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/network/hipchat/hipchat.info b/network/hipchat/hipchat.info deleted file mode 100644 index 180571f5bf..0000000000 --- a/network/hipchat/hipchat.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="hipchat" -VERSION="4.29.4.1662" -HOMEPAGE="http://www.hipchat.com/#linux" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-4.29.4.1662-Linux.deb" -MD5SUM_x86_64="5e6731ba4a47f5c7281c18d9baf09eaa" -REQUIRES="" -MAINTAINER="Alan Dingeldein" -EMAIL="kd5zex@gmail.com" diff --git a/network/hipchat2/README b/network/hipchat2/README deleted file mode 100644 index 7fbf0e8b62..0000000000 --- a/network/hipchat2/README +++ /dev/null @@ -1,4 +0,0 @@ -Hipchat is a private group messaging service. - -This SlackBuild packages an old version of HipChat for 32-bit users. -64-bit users should use the 'hipchat' SlackBuild instead. diff --git a/network/hipchat2/hipchat2.info b/network/hipchat2/hipchat2.info deleted file mode 100644 index 212d709fef..0000000000 --- a/network/hipchat2/hipchat2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="hipchat2" -VERSION="2.2.1388" -HOMEPAGE="http://www.hipchat.com/linux" -DOWNLOAD="http://downloads.hipchat.com/linux/arch/i686/hipchat-2.2.1388-i686.pkg.tar.xz" -MD5SUM="f7fdc4df78071ecc8900a6f7109facd8" -DOWNLOAD_x86_64="http://downloads.hipchat.com/linux/arch/x86_64/hipchat-2.2.1388-x86_64.pkg.tar.xz" -MD5SUM_x86_64="b3c605ed18425ea680903d33a00ed0da" -REQUIRES="" -MAINTAINER="Alan Dingeldein" -EMAIL="kd5zex@gmail.com" diff --git a/network/hostapd/README b/network/hostapd/README index 24cfefe967..258a947ed8 100644 --- a/network/hostapd/README +++ b/network/hostapd/README @@ -1,7 +1,7 @@ hostapd - IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator -hostapd is a user space daemon for access point and authentication servers. -It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP -Authenticators, RADIUS client, EAP server, and RADIUS authentication server. -The current version supports Linux (Host AP, madwifi, Prism54 drivers) and -FreeBSD (net80211). +hostapd is a user space daemon for access point and authentication +servers. It implements IEEE 802.11 access point management, IEEE +802.1X/WPA/WPA2/EAP Authenticators, RADIUS client, EAP server, and +RADIUS authentication server. The current version supports Linux (Host +AP, madwifi, Prism54 drivers) and FreeBSD (net80211). diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild index 8dd14ed682..d9d8e6401a 100644 --- a/network/hostapd/hostapd.SlackBuild +++ b/network/hostapd/hostapd.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2008-2013 Murat D. Kadirov <banderols@gmail.com> # Copyright 2014-2016 LukenShiro, Italy -# Copyright 2018, 2019 Brenton Earl <brent@exitstatusone.com> +# Copyright 2018-2020 Brenton Earl <brent@exitstatusone.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,8 +27,8 @@ # Fixed doinst.sh by Mario Preksavec <mario@slackware.hr> PRGNAM=hostapd -VERSION=${VERSION:-2.7} -BUILD=${BUILD:-1} +VERSION=${VERSION:-2.9} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -80,6 +80,7 @@ for i in $CWD/patches/*.patch; do patch -p2 < "$i" done) +# Edit the defconfig to enable additional features cat $CWD/hostapd.defconfig > .config CFLAGS+="$SLKCFLAGS" make diff --git a/network/hostapd/hostapd.defconfig b/network/hostapd/hostapd.defconfig index 08005f26b4..e1bfff1f83 100644 --- a/network/hostapd/hostapd.defconfig +++ b/network/hostapd/hostapd.defconfig @@ -19,7 +19,7 @@ CONFIG_DRIVER_WIRED=y CONFIG_DRIVER_NL80211=y # QCA vendor extensions to nl80211 -#CONFIG_DRIVER_NL80211_QCA=y +CONFIG_DRIVER_NL80211_QCA=y # driver_nl80211.c requires libnl. If you are compiling it yourself # you may need to point hostapd to your version of libnl. @@ -97,7 +97,7 @@ CONFIG_EAP_PAX=y CONFIG_EAP_PSK=y # EAP-pwd for the integrated EAP server (secure authentication with a password) -#CONFIG_EAP_PWD=y +CONFIG_EAP_PWD=y # EAP-SAKE for the integrated EAP server CONFIG_EAP_SAKE=y @@ -142,13 +142,13 @@ CONFIG_PKCS12=y # RADIUS authentication server. This provides access to the integrated EAP # server from external hosts using RADIUS. -CONFIG_RADIUS_SERVER=y +#CONFIG_RADIUS_SERVER=y # Build IPv6 support for RADIUS operations CONFIG_IPV6=y # IEEE Std 802.11r-2008 (Fast BSS Transition) -CONFIG_IEEE80211R=y +#CONFIG_IEEE80211R=y # Use the hostapd's IEEE 802.11 authentication (ACL), but without # the IEEE 802.11 Management capability (e.g., FreeBSD/net80211) @@ -162,7 +162,7 @@ CONFIG_IEEE80211N=y #CONFIG_WNM=y # IEEE 802.11ac (Very High Throughput) support -CONFIG_IEEE80211AC=y +#CONFIG_IEEE80211AC=y # IEEE 802.11ax HE support # Note: This is experimental and work in progress. The definitions are still @@ -319,7 +319,7 @@ CONFIG_IEEE80211AC=y #CONFIG_HS20=y # Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file -CONFIG_SQLITE=y +#CONFIG_SQLITE=y # Enable Fast Session Transfer (FST) #CONFIG_FST=y @@ -390,7 +390,7 @@ CONFIG_ACS=y # parameter. See that parameter in hostapd.conf for more details. #CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1 -# custom configuration options +# Additional Options CONFIG_MESH=y CONFIG_SAE=y CONFIG_WPS2=y diff --git a/network/hostapd/hostapd.info b/network/hostapd/hostapd.info index c4e87e1a2d..120734259a 100644 --- a/network/hostapd/hostapd.info +++ b/network/hostapd/hostapd.info @@ -1,8 +1,8 @@ PRGNAM="hostapd" -VERSION="2.7" +VERSION="2.9" HOMEPAGE="https://w1.fi/hostapd/" -DOWNLOAD="https://w1.fi/releases/hostapd-2.7.tar.gz" -MD5SUM="8d3799f3a3c247cff47d41503698721b" +DOWNLOAD="https://w1.fi/releases/hostapd-2.9.tar.gz" +MD5SUM="f188fc53a495fe7af3b6d77d3c31dee8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch b/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch new file mode 100644 index 0000000000..1942bb3d55 --- /dev/null +++ b/network/hostapd/patches/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch @@ -0,0 +1,50 @@ +From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Tue, 8 Dec 2020 23:52:50 +0200 +Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request + +p2p_add_device() may remove the oldest entry if there is no room in the +peer table for a new peer. This would result in any pointer to that +removed entry becoming stale. A corner case with an invalid PD Request +frame could result in such a case ending up using (read+write) freed +memory. This could only by triggered when the peer table has reached its +maximum size and the PD Request frame is received from the P2P Device +Address of the oldest remaining entry and the frame has incorrect P2P +Device Address in the payload. + +Fix this by fetching the dev pointer again after having called +p2p_add_device() so that the stale pointer cannot be used. + +Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request") +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/p2p/p2p_pd.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c +index 3994ec03f86b..05fd593494ef 100644 +--- a/src/p2p/p2p_pd.c ++++ b/src/p2p/p2p_pd.c +@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, + goto out; + } + ++ dev = p2p_get_device(p2p, sa); + if (!dev) { +- dev = p2p_get_device(p2p, sa); +- if (!dev) { +- p2p_dbg(p2p, +- "Provision Discovery device not found " +- MACSTR, MAC2STR(sa)); +- goto out; +- } ++ p2p_dbg(p2p, ++ "Provision Discovery device not found " ++ MACSTR, MAC2STR(sa)); ++ goto out; + } + } else if (msg.wfd_subelems) { + wpabuf_free(dev->info.wfd_subelems); +-- +2.25.1 + diff --git a/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch b/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch new file mode 100644 index 0000000000..4657b55d85 --- /dev/null +++ b/network/hostapd/patches/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch @@ -0,0 +1,38 @@ +From 947272febe24a8f0ea828b5b2f35f13c3821901e Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Mon, 9 Nov 2020 11:43:12 +0200 +Subject: [PATCH] P2P: Fix copying of secondary device types for P2P group + client + +Parsing and copying of WPS secondary device types list was verifying +that the contents is not too long for the internal maximum in the case +of WPS messages, but similar validation was missing from the case of P2P +group information which encodes this information in a different +attribute. This could result in writing beyond the memory area assigned +for these entries and corrupting memory within an instance of struct +p2p_device. This could result in invalid operations and unexpected +behavior when trying to free pointers from that corrupted memory. + +Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27269 +Fixes: e57ae6e19edf ("P2P: Keep track of secondary device types for peers") +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/p2p/p2p.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c +index 74b7b52ae05c..5cbfc217fc1f 100644 +--- a/src/p2p/p2p.c ++++ b/src/p2p/p2p.c +@@ -453,6 +453,8 @@ static void p2p_copy_client_info(struct p2p_device *dev, + dev->info.config_methods = cli->config_methods; + os_memcpy(dev->info.pri_dev_type, cli->pri_dev_type, 8); + dev->info.wps_sec_dev_type_list_len = 8 * cli->num_sec_dev_types; ++ if (dev->info.wps_sec_dev_type_list_len > WPS_SEC_DEV_TYPE_MAX_LEN) ++ dev->info.wps_sec_dev_type_list_len = WPS_SEC_DEV_TYPE_MAX_LEN; + os_memcpy(dev->info.wps_sec_dev_type_list, cli->sec_dev_types, + dev->info.wps_sec_dev_type_list_len); + } +-- +2.25.1 + diff --git a/network/hostapd/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/network/hostapd/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch new file mode 100644 index 0000000000..0aa8a5ea1d --- /dev/null +++ b/network/hostapd/patches/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch @@ -0,0 +1,150 @@ +From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Wed, 3 Jun 2020 23:17:35 +0300 +Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to + other networks + +The UPnP Device Architecture 2.0 specification errata ("UDA errata +16-04-2020.docx") addresses a problem with notifications being allowed +to go out to other domains by disallowing such cases. Do such filtering +for the notification callback URLs to avoid undesired connections to +external networks based on subscriptions that any device in the local +network could request when WPS support for external registrars is +enabled (the upnp_iface parameter in hostapd configuration). + +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/wps/wps_er.c | 2 +- + src/wps/wps_upnp.c | 38 ++++++++++++++++++++++++++++++++++++-- + src/wps/wps_upnp_i.h | 3 ++- + 3 files changed, 39 insertions(+), 4 deletions(-) + +diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c +index 6bded14327f8..31d2e50e4cff 100644 +--- a/src/wps/wps_er.c ++++ b/src/wps/wps_er.c +@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter) + "with %s", filter); + } + if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text, +- er->mac_addr)) { ++ NULL, er->mac_addr)) { + wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " + "for %s. Does it have IP address?", er->ifname); + wps_er_deinit(er, NULL, NULL); +diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c +index 6e10e4bc0c3f..7d4b7439940e 100644 +--- a/src/wps/wps_upnp.c ++++ b/src/wps/wps_upnp.c +@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s) + } + + ++static int local_network_addr(struct upnp_wps_device_sm *sm, ++ struct sockaddr_in *addr) ++{ ++ return (addr->sin_addr.s_addr & sm->netmask.s_addr) == ++ (sm->ip_addr & sm->netmask.s_addr); ++} ++ ++ + /* subscr_addr_add_url -- add address(es) for one url to subscription */ + static void subscr_addr_add_url(struct subscription *s, const char *url, + size_t url_len) +@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, + + for (rp = result; rp; rp = rp->ai_next) { + struct subscr_addr *a; ++ struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr; + + /* Limit no. of address to avoid denial of service attack */ + if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) { +@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, + break; + } + ++ if (!local_network_addr(s->sm, addr)) { ++ wpa_printf(MSG_INFO, ++ "WPS UPnP: Ignore a delivery URL that points to another network %s", ++ inet_ntoa(addr->sin_addr)); ++ continue; ++ } ++ + a = os_zalloc(sizeof(*a) + alloc_len); + if (a == NULL) + break; +@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN]) + * @net_if: Selected network interface name + * @ip_addr: Buffer for returning IP address in network byte order + * @ip_addr_text: Buffer for returning a pointer to allocated IP address text ++ * @netmask: Buffer for returning netmask or %NULL if not needed + * @mac: Buffer for returning MAC address + * Returns: 0 on success, -1 on failure + */ + int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, +- u8 mac[ETH_ALEN]) ++ struct in_addr *netmask, u8 mac[ETH_ALEN]) + { + struct ifreq req; + int sock = -1; +@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, + in_addr.s_addr = *ip_addr; + os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr)); + ++ if (netmask) { ++ os_memset(&req, 0, sizeof(req)); ++ os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); ++ if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) { ++ wpa_printf(MSG_ERROR, ++ "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)", ++ errno, strerror(errno)); ++ goto fail; ++ } ++ addr = (struct sockaddr_in *) &req.ifr_netmask; ++ netmask->s_addr = addr->sin_addr.s_addr; ++ } ++ + #ifdef __linux__ + os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name)); + if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) { +@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if) + + /* Determine which IP and mac address we're using */ + if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text, +- sm->mac_addr)) { ++ &sm->netmask, sm->mac_addr)) { + wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address " + "for %s. Does it have IP address?", net_if); + goto fail; + } ++ wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr " ++ MACSTR, ++ sm->ip_addr_text, inet_ntoa(sm->netmask), ++ MAC2STR(sm->mac_addr)); + + /* Listen for incoming TCP connections so that others + * can fetch our "xml files" from us. +diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h +index e87a93232df1..6ead7b4e9a30 100644 +--- a/src/wps/wps_upnp_i.h ++++ b/src/wps/wps_upnp_i.h +@@ -128,6 +128,7 @@ struct upnp_wps_device_sm { + u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */ + char *ip_addr_text; /* IP address of network i.f. we use */ + unsigned ip_addr; /* IP address of network i.f. we use (host order) */ ++ struct in_addr netmask; + int multicast_sd; /* send multicast messages over this socket */ + int ssdp_sd; /* receive discovery UPD packets on socket */ + int ssdp_sd_registered; /* nonzero if we must unregister */ +@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm, + const u8 uuid[UUID_LEN]); + void subscr_addr_delete(struct subscr_addr *a); + int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text, +- u8 mac[ETH_ALEN]); ++ struct in_addr *netmask, u8 mac[ETH_ALEN]); + + /* wps_upnp_ssdp.c */ + void msearchreply_state_machine_stop(struct advertisement_state_machine *a); +-- +2.20.1 + diff --git a/network/hostapd/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/network/hostapd/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch new file mode 100644 index 0000000000..c7a449e0b5 --- /dev/null +++ b/network/hostapd/patches/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch @@ -0,0 +1,59 @@ +From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Wed, 3 Jun 2020 22:41:02 +0300 +Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL + path + +More than about 700 character URL ended up overflowing the wpabuf used +for building the event notification and this resulted in the wpabuf +buffer overflow checks terminating the hostapd process. Fix this by +allocating the buffer to be large enough to contain the full URL path. +However, since that around 700 character limit has been the practical +limit for more than ten years, start explicitly enforcing that as the +limit or the callback URLs since any longer ones had not worked before +and there is no need to enable them now either. + +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/wps/wps_upnp.c | 9 +++++++-- + src/wps/wps_upnp_event.c | 3 ++- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c +index 7d4b7439940e..ab685d52ecab 100644 +--- a/src/wps/wps_upnp.c ++++ b/src/wps/wps_upnp.c +@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url, + int rerr; + size_t host_len, path_len; + +- /* url MUST begin with http: */ +- if (url_len < 7 || os_strncasecmp(url, "http://", 7)) ++ /* URL MUST begin with HTTP scheme. In addition, limit the length of ++ * the URL to 700 characters which is around the limit that was ++ * implicitly enforced for more than 10 years due to a bug in ++ * generating the event messages. */ ++ if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) { ++ wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL"); + goto fail; ++ } + url += 7; + url_len -= 7; + +diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c +index d7e6edcc6503..08a23612f338 100644 +--- a/src/wps/wps_upnp_event.c ++++ b/src/wps/wps_upnp_event.c +@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e) + struct wpabuf *buf; + char *b; + +- buf = wpabuf_alloc(1000 + wpabuf_len(e->data)); ++ buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) + ++ wpabuf_len(e->data)); + if (buf == NULL) + return NULL; + wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path); +-- +2.20.1 + diff --git a/network/hostapd/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/network/hostapd/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch new file mode 100644 index 0000000000..9d0376043d --- /dev/null +++ b/network/hostapd/patches/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch @@ -0,0 +1,47 @@ +From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <jouni@codeaurora.org> +Date: Thu, 4 Jun 2020 21:24:04 +0300 +Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more + properly + +While it is appropriate to try to retransmit the event to another +callback URL on a failure to initiate the HTTP client connection, there +is no point in trying the exact same operation multiple times in a row. +Replve the event_retry() calls with event_addr_failure() for these cases +to avoid busy loops trying to repeat the same failing operation. + +These potential busy loops would go through eloop callbacks, so the +process is not completely stuck on handling them, but unnecessary CPU +would be used to process the continues retries that will keep failing +for the same reason. + +Signed-off-by: Jouni Malinen <jouni@codeaurora.org> +--- + src/wps/wps_upnp_event.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c +index 08a23612f338..c0d9e41d9a38 100644 +--- a/src/wps/wps_upnp_event.c ++++ b/src/wps/wps_upnp_event.c +@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s) + + buf = event_build_message(e); + if (buf == NULL) { +- event_retry(e, 0); ++ event_addr_failure(e); + return -1; + } + +@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s) + event_http_cb, e); + if (e->http_event == NULL) { + wpabuf_free(buf); +- event_retry(e, 0); ++ event_addr_failure(e); + return -1; + } + +-- +2.20.1 + diff --git a/network/httpie/httpie.SlackBuild b/network/httpie/httpie.SlackBuild index e3c4a04e65..78e0b1011a 100644 --- a/network/httpie/httpie.SlackBuild +++ b/network/httpie/httpie.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=httpie VERSION=${VERSION:-1.0.3} -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/network/hydra/README b/network/hydra/README index cb062e4de5..33ab88bb80 100644 --- a/network/hydra/README +++ b/network/hydra/README @@ -6,10 +6,11 @@ to give researchers and security consultants a way to demonstrate how easy it would be to gain unauthorized access to a remote system. THIS TOOL IS FOR LEGAL PURPOSES ONLY! -postgresql is an optional dependency, as is sap, but sap is not available -at SBo. +postgresql is an optional dependency, as is sap, but sap is not +available at SBo. -This SlackBuild includes an option to omit the GTK-based frontend xhydra. +This SlackBuild includes an option to omit the GTK-based frontend +xhydra. To omit xhydra, just pass XHYDRA=0 to the script: XHYDRA=0 sh hydra.SlackBuild diff --git a/network/hydra/hydra.SlackBuild b/network/hydra/hydra.SlackBuild index c2052738a0..7ee41979d8 100644 --- a/network/hydra/hydra.SlackBuild +++ b/network/hydra/hydra.SlackBuild @@ -4,7 +4,7 @@ # Updated by Kent Fritz <fritz.kent@gmail.com> PRGNAM=hydra -VERSION=${VERSION:-8.8} +VERSION=${VERSION:-9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,7 +61,6 @@ else MAKE_OPTS="XHYDRA_SUPPORT=" fi -echo CONFIG_OPTS is $CONFIG_OPTS ./configure $CONFIG_OPTS --prefix=$PKG/usr make OPTS="-I. $SLKCFLAGS" $MAKE_OPTS mkdir -p $PKG/usr/etc @@ -88,7 +87,7 @@ fi find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES LICENSE* README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES LICENSE* README.md $PKG/usr/doc/$PRGNAM-$VERSION if [ "$XHYDRA" = "1" ]; then mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/hydra-gtk cp -a hydra-gtk/COPYING hydra-gtk/INSTALL hydra-gtk/README \ diff --git a/network/hydra/hydra.info b/network/hydra/hydra.info index 4f6013d571..66f8d3e731 100644 --- a/network/hydra/hydra.info +++ b/network/hydra/hydra.info @@ -1,8 +1,8 @@ PRGNAM="hydra" -VERSION="8.8" +VERSION="9.1" HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" -DOWNLOAD="https://github.com/vanhauser-thc/thc-hydra/archive/v8.8/thc-hydra-8.8.tar.gz" -MD5SUM="56c5a4f478bc46d3e6fc54cc5caa9c4a" +DOWNLOAD="https://github.com/vanhauser-thc/thc-hydra/archive/v9.1/thc-hydra-9.1.tar.gz" +MD5SUM="7a2f54980ce44aff0cc047fb75751dba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/hylafax+/README b/network/hylafax+/README index 347202297b..3203b17bce 100644 --- a/network/hylafax+/README +++ b/network/hylafax+/README @@ -6,4 +6,4 @@ an outbound job from any other machine on the network. HylaFAX+ is a more feature rich fork of the HylaFAX project. -See /usr/doc/hylafax-7.0.0/README.SLACKWARE for configuration hints. +See /usr/doc/hylafax-7.0.2/README.SLACKWARE for configuration hints. diff --git a/network/hylafax+/hylafax+.SlackBuild b/network/hylafax+/hylafax+.SlackBuild index e35b925fbe..20fae73e6e 100644 --- a/network/hylafax+/hylafax+.SlackBuild +++ b/network/hylafax+/hylafax+.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for hylafax+ -# Copyright 2013-2019 Chris Walker Kempner, TX +# Copyright 2013-2020 Chris Walker Kempner, TX # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=hylafax+ SRCNAM=hylafax -VERSION=${VERSION:-7.0.0} +VERSION=${VERSION:-7.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/hylafax+/hylafax+.info b/network/hylafax+/hylafax+.info index 5647f3f419..fc8fd06607 100644 --- a/network/hylafax+/hylafax+.info +++ b/network/hylafax+/hylafax+.info @@ -1,8 +1,8 @@ PRGNAM="hylafax+" -VERSION="7.0.0" +VERSION="7.0.2" HOMEPAGE="http://hylafax.sourceforge.net" -DOWNLOAD="https://iweb.dl.sourceforge.net/project/hylafax/hylafax/hylafax-7.0.0.tar.gz" -MD5SUM="5e779c2099a80d886c38ad536d131706" +DOWNLOAD="http://prdownloads.sourceforge.net/hylafax/hylafax-7.0.2.tar.gz" +MD5SUM="b58793ab019aa1fe131557c14c35864e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/i2pd/README b/network/i2pd/README new file mode 100644 index 0000000000..512eb79c93 --- /dev/null +++ b/network/i2pd/README @@ -0,0 +1,13 @@ +i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client. + +I2P (Invisible Internet Protocol) is a universal anonymous network +layer. All communications over I2P are anonymous and end-to-end +encrypted, participants don't reveal their real IP addresses. + +I2P client is a software used for building and using anonymous I2P +networks. Such networks are commonly used for anonymous peer-to-peer +applications (filesharing, cryptocurrencies) and anonymous client-server +applications (websites, instant messengers, chat-servers). + +I2P allows people from all around the world to communicate and share +information without restrictions. diff --git a/network/i2pd/i2pd.SlackBuild b/network/i2pd/i2pd.SlackBuild new file mode 100644 index 0000000000..88d3563f2e --- /dev/null +++ b/network/i2pd/i2pd.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh + +# Slackbuild for i2pd + +# Written by shelldweller <shelldweller@beauxbead.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=i2pd +VERSION=${VERSION:-2.36.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 {} \; + +cd build +sed -i \ + "s,LIBRARY DESTINATION lib,LIBRARY DESTINATION lib${LIBDIRSUFFIX}," \ + CMakeLists.txt + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_STATIC=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -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 LICENSE README.md docs/ \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/doc -name "Makefile" -delete +find $PKG/usr/doc -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/network/i2pd/i2pd.info b/network/i2pd/i2pd.info new file mode 100644 index 0000000000..4aa9e18f1d --- /dev/null +++ b/network/i2pd/i2pd.info @@ -0,0 +1,10 @@ +PRGNAM="i2pd" +VERSION="2.36.0" +HOMEPAGE="http://i2pd.website/" +DOWNLOAD="https://github.com/PurpleI2P/i2pd/archive/2.36.0/i2pd-2.36.0.tar.gz" +MD5SUM="2117f8da160be6fe332184a4fb58aa20" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="shelldweller" +EMAIL="shelldweller@beauxbead.com" diff --git a/network/i2pd/slack-desc b/network/i2pd/slack-desc new file mode 100644 index 0000000000..7f7d653ce4 --- /dev/null +++ b/network/i2pd/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------------------------------------------------------| +i2pd: i2pd (I2P Daemon) +i2pd: +i2pd: A full-featured C++ implementation of an I2P client. +i2pd: +i2pd: An I2P client is software used for building and using anonymous I2P +i2pd: networks. Such networks are commonly used for anonymous peer-to-peer +i2pd: applications (filesharing, cryptocurrencies) and anonymous client- +i2pd: server applications (websites, instant messengers, chat-servers). +i2pd: +i2pd: I2P allows people from all around the world to communicate and share +i2pd: information without restrictions. diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild index ea94287ad8..5d53df4b7a 100644 --- a/network/icecat/icecat.SlackBuild +++ b/network/icecat/icecat.SlackBuild @@ -25,7 +25,7 @@ # <http://www.gnu.org/licenses/>. PRGNAM="icecat" -VERSION=${VERSION:-60.3.0} +VERSION=${VERSION:-60.7.0} RELEASEVER="$VERSION" RELEASEVERMAJ=$(echo $RELEASEVER | cut -f 1 -d .) BUILD=${BUILD:-1} diff --git a/network/icecat/icecat.info b/network/icecat/icecat.info index 082c1ce3a0..023563790d 100644 --- a/network/icecat/icecat.info +++ b/network/icecat/icecat.info @@ -1,10 +1,10 @@ PRGNAM="icecat" -VERSION="60.3.0" +VERSION="60.7.0" HOMEPAGE="http://www.gnu.org/software/gnuzilla/" -DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/60.3.0/icecat-60.3.0.en-US.gnulinux-i686.tar.bz2" -MD5SUM="53c5055ab130b0c2c5b8335558ae648c" -DOWNLOAD_x86_64="https://ftp.gnu.org/gnu/gnuzilla/60.3.0/icecat-60.3.0.en-US.gnulinux-x86_64.tar.bz2" -MD5SUM_x86_64="2f26b0c54f14fbc2437eb50c7289b4a2" +DOWNLOAD="https://ftp.gnu.org/gnu/gnuzilla/60.7.0/icecat-60.7.0.en-US.gnulinux-i686.tar.bz2" +MD5SUM="7d274e1d3db42886caf96b3389209230" +DOWNLOAD_x86_64="https://ftp.gnu.org/gnu/gnuzilla/60.7.0/icecat-60.7.0.en-US.gnulinux-x86_64.tar.bz2" +MD5SUM_x86_64="4ae5415871df868d651f12f478f479de" REQUIRES="" MAINTAINER="melikamp" EMAIL="melikamp@melikamp.net" diff --git a/network/icyque/README b/network/icyque/README new file mode 100644 index 0000000000..1bbf8c250b --- /dev/null +++ b/network/icyque/README @@ -0,0 +1,12 @@ +icyque + +ICQ WIM protocol for libpurple + +Setup + +If you're switching to IcyQue from the built-in ICQ plugin, you'll +need to restart Pidgin and then edit your existing account (or create a +new account) with the "ICQ (WIM)" protocol. + +If you only have a phone number, then enter that with a + at the +beginning and leave the password field blank. diff --git a/network/icyque/icyque.SlackBuild b/network/icyque/icyque.SlackBuild new file mode 100644 index 0000000000..84350557a0 --- /dev/null +++ b/network/icyque/icyque.SlackBuild @@ -0,0 +1,90 @@ +#!/bin/sh + +# Slackware build script for icyque + +# Copyright 2020, SlackBuilds.org, David Melik, Spokane, 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. + +PRGNAM=icyque +VERSION=${VERSION:-20200618_4fc08a0} +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 + +GITVER="$( echo $VERSION | cut -d_ -f2 )" + +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-$GITVER* +tar xvf $CWD/$PRGNAM-$GITVER*.tar.gz +cd $PRGNAM-$GITVER* +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 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 \ + 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/network/icyque/icyque.info b/network/icyque/icyque.info new file mode 100644 index 0000000000..30e1ba8a43 --- /dev/null +++ b/network/icyque/icyque.info @@ -0,0 +1,10 @@ +PRGNAM="icyque" +VERSION="20200618_4fc08a0" +HOMEPAGE="https://github.com/EionRobb/icyque/" +DOWNLOAD="https://github.com/EionRobb/icyque/archive/4fc08a09f2824bd039089fa54cbabf6be2221707/icyque-4fc08a09f2824bd039089fa54cbabf6be2221707.tar.gz" +MD5SUM="8d1cd5cc28b78d5f44615791f3994600" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="json-glib" +MAINTAINER="David Melik" +EMAIL="dchmelik@gmail.com" diff --git a/network/icyque/slack-desc b/network/icyque/slack-desc new file mode 100644 index 0000000000..d0937aee71 --- /dev/null +++ b/network/icyque/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------------------------------------------------------| +icyque: icyque (ICQ WIM protocol for libpurple) +icyque: +icyque: If you're switching to IcyQue from the built-in ICQ plugin, you'll +icyque: need to restart Pidgin and then edit your existing account (or create +icyque: a new account) with the "ICQ (WIM)" protocol. +icyque: +icyque: If you only have a phone number, then enter that with a + at the +icyque: beginning and leave the password field blank. +icyque: +icyque: https://github.com/EionRobb/icyque/ +icyque: diff --git a/network/igmpproxy/slack-desc b/network/igmpproxy/slack-desc index 0e588ca912..8d4e741d41 100644 --- a/network/igmpproxy/slack-desc +++ b/network/igmpproxy/slack-desc @@ -5,7 +5,7 @@ # 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------------------------------------------------------| igmpproxy: igmpproxy (IGMP multicast routing daemon) igmpproxy: igmpproxy: A simple multicast router that only uses the IGMP protocol. diff --git a/network/imapfilter/imapfilter.SlackBuild b/network/imapfilter/imapfilter.SlackBuild index 9f041d0d10..1355549594 100644 --- a/network/imapfilter/imapfilter.SlackBuild +++ b/network/imapfilter/imapfilter.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=imapfilter -VERSION=${VERSION:-2.6.14} +VERSION=${VERSION:-2.6.16} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/imapfilter/imapfilter.info b/network/imapfilter/imapfilter.info index 44108e1edf..97f96523b0 100644 --- a/network/imapfilter/imapfilter.info +++ b/network/imapfilter/imapfilter.info @@ -1,8 +1,8 @@ PRGNAM="imapfilter" -VERSION="2.6.14" +VERSION="2.6.16" HOMEPAGE="https://github.com/lefcha/imapfilter" -DOWNLOAD="https://github.com/lefcha/imapfilter/archive/v2.6.14/imapfilter-2.6.14.tar.gz" -MD5SUM="caffa67a40c8bc1e46e1852caa66bec9" +DOWNLOAD="https://github.com/lefcha/imapfilter/archive/v2.6.16/imapfilter-2.6.16.tar.gz" +MD5SUM="3cb100fd8171c893079f9a969fea6db8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lua" diff --git a/network/inadyn/doinst.sh b/network/inadyn/doinst.sh index 93170dac0d..9f785b0fb1 100644 --- a/network/inadyn/doinst.sh +++ b/network/inadyn/doinst.sh @@ -1,5 +1,3 @@ -#!/bin/sh - config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -24,4 +22,3 @@ preserve_perms() { } preserve_perms etc/rc.d/rc.inadyn.new - diff --git a/network/inadyn/inadyn.SlackBuild b/network/inadyn/inadyn.SlackBuild index 4f8f57afb5..e8ad58ec08 100644 --- a/network/inadyn/inadyn.SlackBuild +++ b/network/inadyn/inadyn.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=inadyn -VERSION=${VERSION:-2.3.1} +VERSION=${VERSION:-2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,13 +54,13 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvJf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,6 +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 {} \; +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -89,9 +90,14 @@ 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/etc/rc.d +cat $CWD/rc.inadyn > $PKG/etc/rc.d/rc.inadyn.new + +mkdir -p $PKG/var/cache/$PRGNAM + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS CONTRIBUTING.md \ + AUTHORS CONTRIBUTING.md debian/ \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -99,8 +105,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -mkdir -p $PKG/etc/rc.d -cat $CWD/rc.inadyn > $PKG/etc/rc.d/rc.inadyn.new - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/inadyn/inadyn.info b/network/inadyn/inadyn.info index 91ad52fd8e..df3d372e1d 100644 --- a/network/inadyn/inadyn.info +++ b/network/inadyn/inadyn.info @@ -1,10 +1,10 @@ PRGNAM="inadyn" -VERSION="2.3.1" +VERSION="2.5" HOMEPAGE="http://troglobit.com/projects/inadyn" -DOWNLOAD="ftp://ftp.troglobit.com/inadyn/inadyn-2.3.1.tar.xz" -MD5SUM="6a36f62bba5c9774bff25bf2be871bbb" +DOWNLOAD="https://github.com/troglobit/inadyn/archive/v2.5/inadyn-2.5.tar.gz" +MD5SUM="e06354b6a617c1eeca1e97c01f224bbb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Kenneth Chan" -EMAIL="kenneth.t.chan@gmail.com" REQUIRES="confuse" +MAINTAINER="kchan" +EMAIL="kenneth.t.chan@gmail.com" diff --git a/network/inadyn/rc.inadyn b/network/inadyn/rc.inadyn index 381ac1b904..96d5768136 100644 --- a/network/inadyn/rc.inadyn +++ b/network/inadyn/rc.inadyn @@ -12,22 +12,23 @@ if [ ! -f /etc/inadyn.conf ]; then fi PIDFILE=/var/run/inadyn.pid +SCRIPTNAME=$0 case "$1" in start) echo -n "Starting inadyn: /usr/sbin/inadyn" - /usr/sbin/inadyn + /usr/sbin/inadyn --pidfile $PIDFILE echo ;; stop) echo -n "Stopping inadyn... " kill $( ps ax | grep inadyn | grep Ss | awk '{print $1}' ) - #kill -9 $( cat $PIDFILE 2> /dev/null ) + rm -f $PIDFILE echo ;; restart) - $0 stop - $0 start + $SCRIPTNAME stop + $SCRIPTNAME start ;; status) pids=$( ps ax | grep inadyn | grep Ss | awk '{print $1}' ) diff --git a/network/inadyn/slack-desc b/network/inadyn/slack-desc index b504c62aa2..10d8a64f3b 100644 --- a/network/inadyn/slack-desc +++ b/network/inadyn/slack-desc @@ -8,11 +8,11 @@ |-----handy-ruler------------------------------------------------------| inadyn: inadyn (A Small and Simple DDNS Client) inadyn: -inadyn: In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS -inadyn: support. It is commonly available in many GNU/Linux distributions, -inadyn: used in off-the-shelf routers and Internet gateways to automate the -inadyn: task of keeping your DNS record up to date with any IP address -inadyn: changes from your ISP. It can also be used in installations with +inadyn: In-a-dyn is a small and simple Dynamic DNS, DDNS, client with HTTPS +inadyn: support. It is commonly available in many GNU/Linux distributions, +inadyn: used in off-the-shelf routers and Internet gateways to automate the +inadyn: task of keeping your DNS record up to date with any IP address +inadyn: changes from your ISP. It can also be used in installations with inadyn: redundant (backup) connections to the Internet. inadyn: inadyn: Homepage: http://troglobit.com/projects/inadyn diff --git a/network/insync/insync.SlackBuild b/network/insync/insync.SlackBuild index 42402ecbe2..99cc0a7d15 100644 --- a/network/insync/insync.SlackBuild +++ b/network/insync/insync.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for "insync". # Copyright 2013-2016 Marcel Saegebarth <marc@mos6581.de> -# Copyright 2019 Pedro R.M. Júnior <pedrormjunior@gmail.com> +# Copyright 2019,2020 Pedro R.M. Júnior <pedrormjunior@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ PRGNAM=insync DEBNAM=bionic -VERSION=${VERSION:-3.0.23.40579} +VERSION=${VERSION:-3.1.3.40790} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/insync/insync.info b/network/insync/insync.info index ade3ba74dd..e3694d0b99 100644 --- a/network/insync/insync.info +++ b/network/insync/insync.info @@ -1,10 +1,10 @@ PRGNAM="insync" -VERSION="3.0.23.40579" +VERSION="3.1.3.40790" HOMEPAGE="https://www.insynchq.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_3.0.23.40579-bionic_amd64.deb" -MD5SUM_x86_64="ba08f4d9a7a8b02f3744c68f4578f8c9" +DOWNLOAD_x86_64="http://s.insynchq.com/builds/insync_3.1.3.40790-bionic_amd64.deb" +MD5SUM_x86_64="132f416415b0983c4276462d29e15201" REQUIRES="" MAINTAINER="Pedro R.M. Júnior" EMAIL="pedrormjunior@gmail.com" diff --git a/network/ipscan/ipscan.SlackBuild b/network/ipscan/ipscan.SlackBuild index f43dad2291..9049345fa0 100644 --- a/network/ipscan/ipscan.SlackBuild +++ b/network/ipscan/ipscan.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for ipscan. # -# Copyright 2015-2019 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/network/ipscan/ipscan.info b/network/ipscan/ipscan.info index cc55d9adb6..619544ea6e 100644 --- a/network/ipscan/ipscan.info +++ b/network/ipscan/ipscan.info @@ -6,5 +6,5 @@ MD5SUM="d2610e9d01615e1eb86cd5df8895732f" DOWNLOAD_x86_64="https://github.com/angryip/ipscan/releases/download/3.6.2/ipscan-linux64-3.6.2.jar" MD5SUM_x86_64="35259a87425d5a11bd587f799031aace" REQUIRES="jdk" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/network/iptv-analyzer/iptv-analyzer.SlackBuild b/network/iptv-analyzer/iptv-analyzer.SlackBuild index faf516d683..9342b16821 100644 --- a/network/iptv-analyzer/iptv-analyzer.SlackBuild +++ b/network/iptv-analyzer/iptv-analyzer.SlackBuild @@ -120,7 +120,6 @@ 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 -# Remove perllocal.pod and other special files that don't need to be installed find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true # Remove empty directories diff --git a/network/ipv6calc/README b/network/ipv6calc/README index 66599f47b4..4d2658ce8c 100644 --- a/network/ipv6calc/README +++ b/network/ipv6calc/README @@ -11,6 +11,7 @@ support for these: IP2LOCATION=yes Enable IP2Location support (requires ip2location-c) GEOIP=yes Enable GeoIP support (requires GeoIP) + GEOIP2=yes Enable GeoIP2 support (requires libmaxminddb) EXTERNAL=yes Enable external db support where each build option is passed to the slackbuild. Example of diff --git a/network/ipv6calc/ipv6calc.SlackBuild b/network/ipv6calc/ipv6calc.SlackBuild index a9ea0bf1d5..31fe671993 100644 --- a/network/ipv6calc/ipv6calc.SlackBuild +++ b/network/ipv6calc/ipv6calc.SlackBuild @@ -4,7 +4,7 @@ # Copyright 2012, 2013 Chris Abela, Malta # Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org -# Copyright 2018 Jason Graham, MD <jgraha8@gmail.com> +# Copyright 2018-2019 Jason Graham, MD <jgraham@compukix.net> # 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=ipv6calc -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-2.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,10 +71,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 {} \; -unset ENABLE_IP2LOCATION -unset ENABLE_GEOIP -unset ENABLE_EXTERNAL -unset ENABLE_MOD_IPV6CALC +ENABLE_IP2LOCATION="--disable-ip2location" +ENABLE_GEOIP="--disable-geoip" +ENABLE_GEOIP2="--disable-geoip2" +ENABLE_EXTERNAL="--disable-external" +ENABLE_MOD_IPV6CALC="--disable-mod_ipv6calc" if [ "$IP2LOCATION" = "yes" ]; then ENABLE_IP2LOCATION="--enable-ip2location --with-ip2location-db=/usr/share/IP2Loc" @@ -84,6 +85,10 @@ if [ "$GEOIP" = "yes" ]; then ENABLE_GEOIP="--enable-geoip --with-geoip-db=/usr/share/GeoIP" fi +if [ "$GEOIP2" = "yes" ]; then + ENABLE_GEOIP2="--enable-mmdb --with-geoip-db=/usr/share/GeoIP" +fi + if [ "$EXTERNAL" = "yes" ]; then ENABLE_EXTERNAL="--enable-external" fi @@ -102,7 +107,9 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ - $ENABLE_IP2LOCATION $ENABLE_GEOIP $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC + --disable-dbip \ + --disable-dbip2 \ + $ENABLE_IP2LOCATION $ENABLE_GEOIP $ENABLE_GEOIP2 $ENABLE_EXTERNAL $ENABLE_MOD_IPV6CALC make make install DESTDIR=$PKG @@ -115,7 +122,9 @@ 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 \ - CHANGES COPYING CREDITS ChangeLog LICENSE README TODO USAGE VERSION \ + CHANGES COPYING CREDITS ChangeLog INSTALLING LICENSE README README.DBIP \ + README.DBIP2 README.External README.GeoIP README.GeoIP2 README.IP2Location \ + README.MaxMindDB TODO USAGE VERSION \ doc/ipv6calc.html \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -125,6 +134,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh if [ "$MOD_IPV6CALC" = "yes" ]; then + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc + cp -a \ + mod_ipv6calc/README.mod_ipv6calc $PKG/usr/doc/$PRGNAM-$VERSION/mod_ipv6calc # Move the ipv6calc.conf to the proper location mkdir -p $PKG/etc/httpd mv $PKG/etc/{httpd.d,httpd/extra} diff --git a/network/ipv6calc/ipv6calc.info b/network/ipv6calc/ipv6calc.info index 576e679891..8413547d34 100644 --- a/network/ipv6calc/ipv6calc.info +++ b/network/ipv6calc/ipv6calc.info @@ -1,10 +1,10 @@ PRGNAM="ipv6calc" -VERSION="1.0.0" +VERSION="2.2.0" HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html" -DOWNLOAD="ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/ipv6calc-1.0.0.tar.gz" -MD5SUM="6eed2e5b8ca07330e044d809ade3b565" +DOWNLOAD="https://github.com/pbiering/ipv6calc/archive/2.2.0/ipv6calc-2.2.0.tar.gz" +MD5SUM="828dad0901f04bbb60f70affaa857e20" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Jason Graham" -EMAIL="jgraha8@gmail.com" +EMAIL="jgraham@compukix.net" diff --git a/network/ipvsadm/ipvsadm-1.25-popt.patch b/network/ipvsadm/ipvsadm-1.25-popt.patch deleted file mode 100644 index 2826002843..0000000000 --- a/network/ipvsadm/ipvsadm-1.25-popt.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naupr ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile ---- ipvsadm-1.25.orig/Makefile 2008-09-23 18:14:46.000000000 +0200 -+++ ipvsadm-1.25/Makefile 2008-12-22 20:03:53.793372130 +0100 -@@ -62,14 +62,7 @@ RPMBUILD = $(shell \ - fi ) - - ifeq (,$(FORCE_GETOPT)) --LIB_SEARCH = /lib /usr/lib /usr/local/lib --POPT_LIB = $(shell for i in $(LIB_SEARCH); do \ -- if [ -f $$i/libpopt.a ]; then \ -- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \ -- echo "-lpopt"; \ -- fi; \ -- fi; \ --done) -+POPT_LIB = "-lpopt" - endif - - ifneq (,$(POPT_LIB)) diff --git a/network/ipvsadm/ipvsadm.SlackBuild b/network/ipvsadm/ipvsadm.SlackBuild index 6dfcb5dbd4..859dc91841 100644 --- a/network/ipvsadm/ipvsadm.SlackBuild +++ b/network/ipvsadm/ipvsadm.SlackBuild @@ -1,12 +1,12 @@ #!/bin/sh -# Slackware build script for source-highlight -# Written by luoyi (luoyi.ly@gmail.com) - -# Modified by the slackbuilds.org project +# Slackware build script for ipvsadm +# 2010 - Written by luoyi (luoyi.ly@gmail.com) +# 2010-2016 - Modified by the slackbuilds.org project +# 2020 - Modified by Marek Wodzinski <majek@w7i.pl> PRGNAM=ipvsadm -VERSION=${VERSION:-1.25} +VERSION=${VERSION:-1.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,7 +43,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 . \ @@ -52,9 +52,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# fix not detecting popt by default -patch -p1 -i $CWD/ipvsadm-1.25-popt.patch - # use SLKCFLAGS sed -i "s/-Wall/-Wall $SLKCFLAGS/" Makefile sed -i "s/-Wall/-Wall $SLKCFLAGS/" libipvs/Makefile @@ -72,8 +69,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + MAINTAINERS README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mv $PKG/etc/rc.d/init.d/ipvsadm $PKG/etc/rc.d/rc.ipvsadm +rmdir $PKG/etc/rc.d/init.d + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/ipvsadm/ipvsadm.info b/network/ipvsadm/ipvsadm.info index 33eb491f3d..13e862d990 100644 --- a/network/ipvsadm/ipvsadm.info +++ b/network/ipvsadm/ipvsadm.info @@ -1,10 +1,10 @@ PRGNAM="ipvsadm" -VERSION="1.25" +VERSION="1.31" HOMEPAGE="http://www.linuxvirtualserver.org/" -DOWNLOAD="http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-1.25.tar.gz" -MD5SUM="772a053f5fe888cd25784c5f55d31fc3" +DOWNLOAD="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.31.tar.xz" +MD5SUM="f6d1707c5baf684b58fd33682d67871f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="luoyi" -EMAIL="luoyi.ly@gmail.com" +MAINTAINER="Marek Wodzinski" +EMAIL="majek@w7i.pl" diff --git a/network/ipxnet/git2tarxz.sh b/network/ipxnet/git2tarxz.sh index 43de757147..b727ef3c88 100644 --- a/network/ipxnet/git2tarxz.sh +++ b/network/ipxnet/git2tarxz.sh @@ -35,7 +35,7 @@ Archive created: $PRGNAM-$VERSION.tar.xz Update $PRGNAM.info with: VERSION="$VERSION" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/$PRGNAM-$VERSION.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/$PRGNAM-$VERSION.tar.xz" MD5SUM="$( md5sum $PRGNAM-$VERSION.tar.xz | cut -d' ' -f1 )" Don't forget to upload the new source! diff --git a/network/ipxnet/ipxnet.info b/network/ipxnet/ipxnet.info index c17a1eaea5..755b99c2df 100644 --- a/network/ipxnet/ipxnet.info +++ b/network/ipxnet/ipxnet.info @@ -1,7 +1,7 @@ PRGNAM="ipxnet" VERSION="20120808.0dce97e" HOMEPAGE="https://github.com/intangir/ipxnet" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ipxnet-20120808.0dce97e.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/ipxnet-20120808.0dce97e.tar.xz" MD5SUM="a6bebe9513240e145285e4526ea3114c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/ircII/README b/network/ircII/README new file mode 100644 index 0000000000..330bfe39e2 --- /dev/null +++ b/network/ircII/README @@ -0,0 +1,14 @@ +ircII (IRC Client, Second Edition) + +ircII is a full screen, curses-based interface to Internet Relay +Chat. It gives full access to all of the normal IRC functions, plus a +variety of additional options. + +ircII is the oldest IRC client still maintained. + +By default, this SlackBuild sets the default IRC server to +"SSLIRC/chat.freenode.org:6697". This only applies with ircII is +run without a server argument on the command line. You can change +the default server by setting the DEFSRV environment variable to the +host:port (with optional SSLIRC/ prefix for a secure connection), or +compile without a default server with DEFSRV=none. diff --git a/network/ircII/ircII.SlackBuild b/network/ircII/ircII.SlackBuild new file mode 100644 index 0000000000..917a708aff --- /dev/null +++ b/network/ircII/ircII.SlackBuild @@ -0,0 +1,132 @@ +#!/bin/sh + +# Slackware build script for ircII + +# 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 nobody's already done a SlackBuild for this. +# Normally I prefer all-lowercase package names, but this just looks +# *wrong* as "ircii". + +PRGNAM=ircII +VERSION=${VERSION:-20190117_1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=${PRGNAM,,} +SRCVER=${VERSION%_*} +DEBVER=${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 + +DEFSRV="${DEFSRV:-SSLIRC/chat.freenode.org:6697}" +case "$DEFSRV" in + none|NONE) ;; + *:*) srvopt="--with-default-server=$DEFSRV" ;; + *) echo "$0: invalid DEFSRV, use host:port, SSLIRC/host:port, or 'none'" 1>&2 + exit 1 ;; +esac + +echo "=== DEFSRV='$DEFSRV', srvopt='$srvopt'" + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$SRCVER +tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz +cd $SRCNAM-$SRCVER +tar xvf $CWD/${SRCNAM}_$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 most of Debian's patches. +rm -f debian/patches/0004-absolute-path* +for i in $( cat debian/patches/series ); do + [ -e debian/patches/$i ] && patch -p1 < debian/patches/$i +done + +# fix warnings caused by missing includes. +sed -i -e '1i#include <curses.h>' \ + -e '1i#include <term.h>' \ + source/term.c + +# do not compile with termcap. there's no --disable-termcap or similar, +# have to do surgery. +sed -i -e '/AC_CHECK_LIB(termcap/s,termcap,ncurses,g' \ + -e 's,termcap\.h ,,' \ + configure.in +autoreconf -ifv + +# is there a disadvantage to enabling emacs meta keys? +CFLAGS="$SLKCFLAGS -Wl,-s" \ +CXXFLAGS="$SLKCFLAGS -Wl,-s" \ +./configure \ + $srvopt \ + --with-emacs-meta-keys \ + --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 doesn't create this dir, and doesn't respect DESTDIR +# for the man dir. +mkdir -p $PKG/usr/man/man1 +make install DESTDIR=$PKG mandir=$PKG/usr/man/man1 + +# package called ircII, so let's have an ircII executable. +ln -s irc-$VERSION $PKG/usr/bin/$PRGNAM + +rm -f $PKG/usr/man/man1/irc.1 +gzip -9 $PKG/usr/man/man1/*.1 +ln -s ircII.1.gz $PKG/usr/man/man1/irc.1.gz + +# Debian includes some extra man pages +for i in debian/*.1; do + gzip -9c < $i > $PKG/usr/man/man1/$( basename $i ).gz +done + +rm -f doc/*.1 doc/*.spec* +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a ChangeLog NEWS README doc/* contrib $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/network/ircII/ircII.info b/network/ircII/ircII.info new file mode 100644 index 0000000000..241b6c6e91 --- /dev/null +++ b/network/ircII/ircII.info @@ -0,0 +1,12 @@ +PRGNAM="ircII" +VERSION="20190117_1" +HOMEPAGE="http://www.eterna.com.au/ircii/" +DOWNLOAD="http://ircii.warped.com/ircii-20190117.tar.gz \ + http://deb.debian.org/debian/pool/main/i/ircii/ircii_20190117-1.debian.tar.xz" +MD5SUM="f0ca9ade8aa068acddbe15b215c0b22a \ + 6d077f10fb7133141d9e6bcba4ad0314" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/ircII/slack-desc b/network/ircII/slack-desc new file mode 100644 index 0000000000..7086e8cd94 --- /dev/null +++ b/network/ircII/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------------------------------------------------------| +ircII: ircII (IRC Client, Second Edition) +ircII: +ircII: ircII is a full screen, curses-based interface to Internet Relay +ircII: Chat. It gives full access to all of the normal IRC functions, plus a +ircII: variety of additional options. +ircII: +ircII: ircII is the oldest IRC client still maintained. +ircII: +ircII: +ircII: +ircII: diff --git a/network/ircd-hybrid/ircd-hybrid.SlackBuild b/network/ircd-hybrid/ircd-hybrid.SlackBuild index cb3489ffe6..0c2a6bb871 100644 --- a/network/ircd-hybrid/ircd-hybrid.SlackBuild +++ b/network/ircd-hybrid/ircd-hybrid.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ircd-hybrid -# Copyright 2018 Ebben Aries <e@dscp.org> +# Copyright 2018-2020 Ebben Aries <slackbuilds@dscp.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=ircd-hybrid BINNAM=ircd -VERSION=${VERSION:-8.2.26} +VERSION=${VERSION:-8.2.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -90,7 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-openssl \ + --with-tls=gnutls \ --build=$ARCH-slackware-linux make diff --git a/network/ircd-hybrid/ircd-hybrid.info b/network/ircd-hybrid/ircd-hybrid.info index aa664624aa..adbe79db3d 100644 --- a/network/ircd-hybrid/ircd-hybrid.info +++ b/network/ircd-hybrid/ircd-hybrid.info @@ -1,10 +1,10 @@ PRGNAM="ircd-hybrid" -VERSION="8.2.26" +VERSION="8.2.36" HOMEPAGE="http://www.ircd-hybrid.org/" -DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.26/ircd-hybrid-8.2.26.tar.gz" -MD5SUM="286ec595fa258cfd39bb95d54e98e79a" +DOWNLOAD="https://github.com/ircd-hybrid/ircd-hybrid/archive/8.2.36/ircd-hybrid-8.2.36.tar.gz" +MD5SUM="38e4448f05a66468b3fa96a6c682cf79" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Ebben Aries" -EMAIL="e@dscp.org" +EMAIL="slackbuilds@dscp.org" diff --git a/network/isync/README.SLACKWARE b/network/isync/README.SLACKWARE index 4fcc0a630e..fd78538da7 100644 --- a/network/isync/README.SLACKWARE +++ b/network/isync/README.SLACKWARE @@ -4,24 +4,24 @@ After installation, create $HOME/.mbsyncrc. This file contains information about your email stores and channels. An example configuration, between a remote IMAP server and a local Maildir: - MaildirStore local - Path ~/Maildir/ + MaildirStore local + Path ~/Maildir/ - IMAPAccount My-IMAP-server - Host mail.myisp.foo - Port 143 - User myuser - #Pass mypass -- if not supplied, mbsync will prompt at runtime + IMAPAccount My-IMAP-server + Host mail.myisp.foo + Port 143 + User myuser + #Pass mypass -- if not supplied, mbsync will prompt at runtime - IMAPStore My-IMAP-store - Account My-IMAP-Server + IMAPStore My-IMAP-store + Account My-IMAP-Server - Channel My-Channel - Master :My-IMAP-store: - Slave :local: - Patterns % !Trash # Synchronize all at this level except Trash - Sync All - Create Both - Expunge Both + Channel My-Channel + Master :My-IMAP-store: + Slave :local: + Patterns % !Trash # Synchronize all at this level except Trash + Sync All + Create Both + Expunge Both See mbsync(1) for additional explanation and options. diff --git a/network/isync/isync.SlackBuild b/network/isync/isync.SlackBuild index 0ee56baa2e..3b7657ddfe 100644 --- a/network/isync/isync.SlackBuild +++ b/network/isync/isync.SlackBuild @@ -29,7 +29,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=isync -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.3.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,7 +47,7 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,7 +60,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/isync/isync.info b/network/isync/isync.info index b7fbbc45ab..22a2f558bb 100644 --- a/network/isync/isync.info +++ b/network/isync/isync.info @@ -1,8 +1,8 @@ PRGNAM="isync" -VERSION="1.3.0" +VERSION="1.3.3" HOMEPAGE="http://isync.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.3.0.tar.gz" -MD5SUM="f64e8723ebbb081bc15510586bfa1f8f" +DOWNLOAD="http://downloads.sourceforge.net/isync/isync-1.3.3.tar.gz" +MD5SUM="5e29a2da627492fe4311c4b9630ba643" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/keepalived/README b/network/keepalived/README index 5e28a766a0..bf9df21cd2 100644 --- a/network/keepalived/README +++ b/network/keepalived/README @@ -13,3 +13,5 @@ this server entrie from the LVS topology. In addition keepalived implements an independent VRRPv2 stack to handle director failover. So in short keepalived is a userspace daemon for LVS cluster nodes healthchecks and LVS directors failover. + +WARNING: nftables and libipset support are disabled for Slackware 14.2 diff --git a/network/keepalived/doinst.sh b/network/keepalived/doinst.sh index 7062d561a6..4c107ecd23 100644 --- a/network/keepalived/doinst.sh +++ b/network/keepalived/doinst.sh @@ -17,7 +17,7 @@ if [ -e etc/rc.d/rc.keepalived ]; then mv etc/rc.d/rc.keepalived.new.incoming etc/rc.d/rc.keepalived.new fi -config etc/keepalived/keepalived.new +config etc/default/keepalived.new config etc/keepalived/keepalived.conf.new config etc/rc.d/rc.keepalived.new diff --git a/network/keepalived/keepalived.SlackBuild b/network/keepalived/keepalived.SlackBuild index ba30febaa0..c23734e1aa 100644 --- a/network/keepalived/keepalived.SlackBuild +++ b/network/keepalived/keepalived.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for keepalived # Copyright 2010,2011 Nilton Moura, Rio de Janeiro, RJ, Brasil +# Copyright 2020 Marek Wodzinski <majek@w7i.pl> # 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=keepalived -VERSION=${VERSION:-1.2.19} +VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,6 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-kernel-dir=/usr \ + --disable-nftables \ + --disable-libipset \ --build=$ARCH-slackware-linux make @@ -90,15 +93,19 @@ 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 \ - AUTHOR ChangeLog CONTRIBUTORS COPYING INSTALL README TODO VERSION \ + AUTHOR ChangeLog CONTRIBUTORS COPYING INSTALL README README.md TODO doc/NOTE_vrrp_vmac.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cp -a $PKG/etc/rc.d/init.d/keepalived $PKG/usr/doc/$PRGNAM-$VERSION/init.keepalived -mv $PKG/etc/sysconfig/keepalived $PKG/etc/keepalived/keepalived.new +mkdir -p $PKG/usr/share/snmp/mibs +cp -a \ + doc/KEEPALIVED-MIB.txt doc/VRRP-MIB.txt doc/VRRPv3-MIB.txt \ + $PKG/usr/share/snmp/mibs + +mkdir -p $PKG/etc/default +mv $PKG/etc/sysconfig/keepalived $PKG/etc/default/keepalived.new mv $PKG/etc/keepalived/keepalived.conf $PKG/etc/keepalived/keepalived.conf.new -install -m755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new -rm $PKG/etc/rc.d/init.d/keepalived +install -m755 -D $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new rmdir $PKG/etc/sysconfig mkdir -p $PKG/install diff --git a/network/keepalived/keepalived.info b/network/keepalived/keepalived.info index 46b10d9d4d..3677d84db9 100644 --- a/network/keepalived/keepalived.info +++ b/network/keepalived/keepalived.info @@ -1,10 +1,10 @@ PRGNAM="keepalived" -VERSION="1.2.19" -HOMEPAGE="http://www.keepalived.org/" -DOWNLOAD="http://www.keepalived.org/software/keepalived-1.2.19.tar.gz" -MD5SUM="5c98b06639dd50a6bff76901b53febb6" +VERSION="2.2.2" +HOMEPAGE="https://www.keepalived.org/" +DOWNLOAD="https://www.keepalived.org/software/keepalived-2.2.2.tar.gz" +MD5SUM="2e86bade4a7a48cfac7d35a6c9643d46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Nilton Moura" -EMAIL="nmoura@nmoura.eti.br" +MAINTAINER="Marek Wodzinski" +EMAIL="majek@w7i.pl" diff --git a/network/keepalived/rc.keepalived b/network/keepalived/rc.keepalived index 8e214e651a..fc063fa1fe 100644 --- a/network/keepalived/rc.keepalived +++ b/network/keepalived/rc.keepalived @@ -3,48 +3,31 @@ # Startup script for the Keepalived daemon # # This is the modified version from the original for the -# Slackware. The only thing that differs from the original -# is the path of the Source configuration file. Before was -# /etc/sysconfig and now is /etc/keepalived, and the header -# for the update-rc.d of Debian was removed. -# -# The original file was copied to -# /usr/doc/keepalived-1.2.2/init.keepalived +# Slackware. # -# This version was modified by Nilton Moura, the author of -# the SlackBuild Script for keepalived. - -# Source function library -. /etc/rc.d/init.d/functions +# This version was modified in 2010 by Nilton Moura, +# the original author of the SlackBuild Script for keepalived. +# +# Sript simplified, removed dependency of optional sysvinit-functions +# package and moved daemon options to /etc/default +# in 2020 by Marek Wodzinski <majek@w7i.pl> # Source configuration file (we set KEEPALIVED_OPTIONS there) -. /etc/keepalived/keepalived - -RETVAL=0 - -prog="keepalived" +. /etc/default/keepalived start() { - echo -n $"Starting $prog: " - daemon keepalived ${KEEPALIVED_OPTIONS} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog + echo "Starting keepalived" + /usr/sbin/keepalived ${KEEPALIVED_OPTIONS} } stop() { - echo -n $"Stopping $prog: " - killproc keepalived - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog + echo "Stopping keepalived " + pkill -TERM keepalived 1>/dev/null 2>/dev/null } reload() { - echo -n $"Reloading $prog: " - killproc keepalived -1 - RETVAL=$? - echo + echo "Reloading keepalived" + pkill -1 keepalived } # See how we were called. @@ -62,18 +45,7 @@ case "$1" in stop start ;; - condrestart) - if [ -f /var/lock/subsys/$prog ]; then - stop - start - fi - ;; - status) - status keepalived - ;; *) - echo "Usage: $0 {start|stop|reload|restart|condrestart|status}" + echo "Usage: $0 {start|stop|reload|restart}" exit 1 esac - -exit $RETVAL diff --git a/network/konversation/konversation.SlackBuild b/network/konversation/konversation.SlackBuild index 3300a2b817..7a93fff79f 100644 --- a/network/konversation/konversation.SlackBuild +++ b/network/konversation/konversation.SlackBuild @@ -3,6 +3,7 @@ # SlackBuild script for konversation # Copyright 2007-2014 Michiel van Wessem, Leicester, United Kingdom +# Copyright 2020 Gregory Tourte <artourter@gmail.com> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=konversation -VERSION=${VERSION:-1.5} +VERSION=${VERSION:-1.5.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -83,8 +84,8 @@ mkdir -p build -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release .. - make VERBOSE=1 - make install VERBOSE=1 DESTDIR=$PKG + make + make install DESTDIR=$PKG ) || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/network/konversation/konversation.info b/network/konversation/konversation.info index 7c1aba386c..5e4faf679e 100644 --- a/network/konversation/konversation.info +++ b/network/konversation/konversation.info @@ -1,10 +1,10 @@ PRGNAM="konversation" -VERSION="1.5" +VERSION="1.5.1" HOMEPAGE="https://konversation.kde.org" -DOWNLOAD="https://download.kde.org/stable/konversation/1.5/src/konversation-1.5.tar.xz" -MD5SUM="c65c97012854f334d87b3a8df32b38f1" +DOWNLOAD="https://download.kde.org/stable/konversation/1.5.1/src/konversation-1.5.1.tar.xz" +MD5SUM="66731bbfa34e36bd3f7b723c63a492e7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Michiel van Wessem" -EMAIL="michiel@slackbuilds.org" +MAINTAINER="ArTourter" +EMAIL="artourter@gmail.com" diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild index 2b36a56c7f..4f1fb3c106 100644 --- a/network/krb5/krb5.SlackBuild +++ b/network/krb5/krb5.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for krb5 # Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA -# 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 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=krb5 -VERSION=${VERSION:-1.17} +VERSION=${VERSION:-1.19.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,6 +79,11 @@ CPPFLAGS+=" -I/usr/include/et" \ --enable-dns-for-realm \ --with-ldap \ --with-system-et \ + --with-system-ss \ + --enable-pkinit \ + --with-tls-impl=openssl \ + --with-system-verto=no \ + --with-prng-alg=os \ --build=$ARCH-slackware-linux make @@ -93,6 +98,7 @@ cat $CWD/rc.krb5kdc > $PKG/etc/rc.d/rc.krb5kdc.new cat $CWD/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new rm -rf $PKG/usr/man/cat{1,5,8} +rm -f $PKG/usr/man/man5/.*.5 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/network/krb5/krb5.info b/network/krb5/krb5.info index d522a28c5d..ec91e88bd1 100644 --- a/network/krb5/krb5.info +++ b/network/krb5/krb5.info @@ -1,8 +1,8 @@ PRGNAM="krb5" -VERSION="1.17" +VERSION="1.19.1" HOMEPAGE="http://web.mit.edu/kerberos/" -DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.17/krb5-1.17.tar.gz" -MD5SUM="3b729d89eb441150e146780c4138481b" +DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.1.tar.gz" +MD5SUM="81257292f8243f735654d4fd5d1fef6a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/kubectl/README b/network/kubectl/README new file mode 100644 index 0000000000..d5226f1078 --- /dev/null +++ b/network/kubectl/README @@ -0,0 +1,2 @@ +Kubectl is a command line interface for running commands against +Kubernetes clusters. diff --git a/network/kubectl/kubectl.SlackBuild b/network/kubectl/kubectl.SlackBuild new file mode 100644 index 0000000000..cc2d2f67fb --- /dev/null +++ b/network/kubectl/kubectl.SlackBuild @@ -0,0 +1,86 @@ +#!/bin/sh + +# Slackware build script for kubectl + +# Copyright 2019 Dimitris Zlatanidis Orestiada, Greece +# 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=kubectl +VERSION=${VERSION:-1.17.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 +mkdir $PRGNAM-$VERSION +cp $CWD/$PRGNAM $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 +install -D -m755 $PRGNAM $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 +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/network/kubectl/kubectl.info b/network/kubectl/kubectl.info new file mode 100644 index 0000000000..68fbffd7e0 --- /dev/null +++ b/network/kubectl/kubectl.info @@ -0,0 +1,10 @@ +PRGNAM="kubectl" +VERSION="1.17.0" +HOMEPAGE="https://kubernetes.io/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl" +MD5SUM_x86_64="ab919f8c715aa0954cccce0701cbcb0c" +REQUIRES="" +MAINTAINER="Dimitris Zlatanidis" +EMAIL="d.zlatanidis@gmail.com" diff --git a/network/kubectl/slack-desc b/network/kubectl/slack-desc new file mode 100644 index 0000000000..3caff3f8d2 --- /dev/null +++ b/network/kubectl/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------------------------------------------------------| +kubectl: kubectl (Kubectl is a command line interface) +kubectl: +kubectl: Kubectl is a command line interface for running commands against +kubectl: Kubernetes clusters. +kubectl: +kubectl: Homepage: https://kubernetes.io/ +kubectl: +kubectl: +kubectl: +kubectl: +kubectl: diff --git a/network/libcapi20/libcapi20.info b/network/libcapi20/libcapi20.info index 734a181501..9a4a3e1279 100644 --- a/network/libcapi20/libcapi20.info +++ b/network/libcapi20/libcapi20.info @@ -6,5 +6,5 @@ MD5SUM="0074d8ecdf96b474a7dada1e8f12bb9f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="slacksam" +MAINTAINER="Marek Srejma" EMAIL="sam_web@yahoo.de" diff --git a/network/libiscsi/libiscsi.SlackBuild b/network/libiscsi/libiscsi.SlackBuild index 6eeebf5a36..1ed646dbd6 100644 --- a/network/libiscsi/libiscsi.SlackBuild +++ b/network/libiscsi/libiscsi.SlackBuild @@ -23,12 +23,15 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# 2021-02-19: +# updated to 1.19.0 +# # 2019-04-07: # initial release # PRGNAM=libiscsi -VERSION=${VERSION:-1.18.0} +VERSION=${VERSION:-1.19.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,6 +77,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 {} \; +./autogen.sh + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/libiscsi/libiscsi.info b/network/libiscsi/libiscsi.info index 870e32c21c..201ebd21f7 100644 --- a/network/libiscsi/libiscsi.info +++ b/network/libiscsi/libiscsi.info @@ -1,8 +1,8 @@ PRGNAM="libiscsi" -VERSION="1.18.0" +VERSION="1.19.0" HOMEPAGE="https://github.com/sahlberg/libiscsi" -DOWNLOAD="https://sites.google.com/site/libiscsitarballs/libiscsitarballs/libiscsi-1.18.0.tar.gz" -MD5SUM="eff8b0a9a116624d41edc4104054f77d" +DOWNLOAD="https://github.com/sahlberg/libiscsi/archive/1.19.0/libiscsi-1.19.0.tar.gz" +MD5SUM="fe0c0c7b677f3b6fbe535e758838ccf2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/libmaxminddb/libmaxminddb.SlackBuild b/network/libmaxminddb/libmaxminddb.SlackBuild index a6dfdbedd9..31e433988b 100644 --- a/network/libmaxminddb/libmaxminddb.SlackBuild +++ b/network/libmaxminddb/libmaxminddb.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libmaxminddb -VERSION=${VERSION:-1.0.2} +VERSION=${VERSION:-1.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/libmaxminddb/libmaxminddb.info b/network/libmaxminddb/libmaxminddb.info index 86f8881111..5413d8f186 100644 --- a/network/libmaxminddb/libmaxminddb.info +++ b/network/libmaxminddb/libmaxminddb.info @@ -1,8 +1,8 @@ PRGNAM="libmaxminddb" -VERSION="1.0.2" +VERSION="1.4.2" HOMEPAGE="https://dev.maxmind.com/geoip/geoip2/web-services/" -DOWNLOAD="https://github.com/maxmind/libmaxminddb/releases/download/1.0.2/libmaxminddb-1.0.2.tar.gz" -MD5SUM="2b6985305c0bbf74d08431e333c03ffb" +DOWNLOAD="https://github.com/maxmind/libmaxminddb/releases/download/1.4.2/libmaxminddb-1.4.2.tar.gz" +MD5SUM="ca92781b655e0cea2efbe37a07ddb2bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/libteam/README b/network/libteam/README new file mode 100644 index 0000000000..a577a1e415 --- /dev/null +++ b/network/libteam/README @@ -0,0 +1,7 @@ +libteam - Library for controlling team network device + +The purpose of the Team softdev Linux driver is to provide a mechanism +to team multiple NICs (ports) into one logical one (teamdev) at L2 +layer. The process is called "channel bonding", "Ethernet bonding", +"channel teaming", "link aggregation", etc. This is already implemented +in the Linux kernel by the bonding driver. diff --git a/network/fping3/fping3.SlackBuild b/network/libteam/libteam.SlackBuild index 06fe8076bc..cabaa3be15 100644 --- a/network/fping3/fping3.SlackBuild +++ b/network/libteam/libteam.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for fping3 +# Slackware build script for libteam -# Copyright 2015, 2016 Mario Preksavec, Zagreb, Croatia +# Copyright 2021 Ebben Aries <slackbuilds@dscp.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,15 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=fping3 -SRCNAM=fping -VERSION=${VERSION:-3.13} +PRGNAM=libteam +VERSION=${VERSION:-1.31} 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 +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" @@ -61,8 +60,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$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 \ @@ -72,15 +71,16 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +./autogen.sh + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --enable-static=no \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-ipv4 \ - --enable-ipv6 \ --build=$ARCH-slackware-linux make @@ -93,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 COPYING ChangeLog INSTALL README doc/README.1992 $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING HOWTO.BASICS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/libteam/libteam.info b/network/libteam/libteam.info new file mode 100644 index 0000000000..446c311776 --- /dev/null +++ b/network/libteam/libteam.info @@ -0,0 +1,10 @@ +PRGNAM="libteam" +VERSION="1.31" +HOMEPAGE="http://libteam.org/" +DOWNLOAD="https://github.com/jpirko/libteam/archive/v1.31/libteam-1.31.tar.gz" +MD5SUM="3290ee003707684d84d1ff2bdaeda059" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libdaemon jansson" +MAINTAINER="Ebben Aries" +EMAIL="slackbuilds@dscp.org" diff --git a/network/libteam/slack-desc b/network/libteam/slack-desc new file mode 100644 index 0000000000..b199f7944b --- /dev/null +++ b/network/libteam/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------------------------------------------------------| +libteam: libteam (Library for controlling team network device) +libteam: +libteam: The purpose of the Team softdev Linux driver is to provide a +libteam: mechanism to team multiple NICs (ports) into one logical one (teamdev) +libteam: at L2 layer. The process is called "channel bonding", "Ethernet +libteam: bonding", "channel teaming", "link aggregation", etc. This is already +libteam: implemented in the Linux kernel by the bonding driver. +libteam: +libteam: +libteam: Homepage: http://libteam.org/ +libteam: diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild index 2896415dfc..7c48640ad5 100644 --- a/network/lighttpd/lighttpd.SlackBuild +++ b/network/lighttpd/lighttpd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for lighttpd # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad> -# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lighttpd -VERSION=${VERSION:-1.4.54} +VERSION=${VERSION:-1.4.58} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info index b720dc87b4..49924d8729 100644 --- a/network/lighttpd/lighttpd.info +++ b/network/lighttpd/lighttpd.info @@ -1,8 +1,8 @@ PRGNAM="lighttpd" -VERSION="1.4.54" +VERSION="1.4.58" HOMEPAGE="http://www.lighttpd.net/" -DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.54.tar.xz" -MD5SUM="7abc776243c811e9872f73ab38b7f8b5" +DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.58.tar.xz" +MD5SUM="8d12a31bd3fdd7eab85cf9a6d2cfa92e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/limnoria/limnoria.SlackBuild b/network/limnoria/limnoria.SlackBuild index 68f860865f..a7ef4fa870 100644 --- a/network/limnoria/limnoria.SlackBuild +++ b/network/limnoria/limnoria.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for limnoria -# Copyright 2013 David Woodfall <dave@dawoodfall.net> +# Copyright 2013 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/limnoria/limnoria.info b/network/limnoria/limnoria.info index 0aebefca3a..a0fcfdfd26 100644 --- a/network/limnoria/limnoria.info +++ b/network/limnoria/limnoria.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +EMAIL="dave@slackbuilds.org" diff --git a/network/linksys-tftp/README b/network/linksys-tftp/README new file mode 100644 index 0000000000..d2132b7f01 --- /dev/null +++ b/network/linksys-tftp/README @@ -0,0 +1,19 @@ +Linksys-tftp is a BSD tftp client for the non-standard tftp +authentication process used by some Linksys routers. + +These routers include the BEFW11, WRT54G and WRT54GL + +They all need a password for the tftp firmware file transfer to work. + +For example to upgrade a Linksys WRT54G router at 192.168.1.1 with +tomato firmware, WRT54G_WRT54GL.bin, where the password is admin + +$linksys-wrt 192.168.1.1 +linksys-tftp>verbose +linksys-tftp>binary +linksys-tftp>blocksize 512 +linksys-tftp>rexmt 1 +linksys-tftp>timeout 30 +linksys-tftp>trace +linksys-tftp>put WRT54G_WRT54GL.bin admin +linksys-tftp>quit diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch new file mode 100644 index 0000000000..b374e808ec --- /dev/null +++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-Makefile.patch @@ -0,0 +1,28 @@ +Fix LDFLAGS (bug http://bugs.gentoo.org/336956 ) and +CFLAGS (bug http://bugs.gentoo.org/240894 ) by +Michael Weber <xmw@gentoo.org> + +--- linksys-tftp-1.2.1/Makefile ++++ linksys-tftp-1.2.1/Makefile +@@ -19,18 +19,18 @@ + # We override /usr/include/arpa/tftp.h with our own because + # we want tu_block to be unsigned short, not short as on most platforms + # +-CFLAGS= -I. -O2 -Dsin=sin_x ++CFLAGS += -I. -Dsin=sin_x + #DEBUG + # CFLAGS= -I. -Wall -ggdb -Dsin=sin_x + SRCS= main.c tftp.c tftpsubs.c + OBJS= main.o tftp.o tftpsubs.o + DOBJS= tftpsubs.o +-CC= gcc ++CC?= gcc + + all: linksys-tftp + + linksys-tftp: ${OBJS} +- ${CC} -o $@ ${CFLAGS} ${OBJS} ++ ${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} + + clean: + rm -f ${OBJS} ${DOBJS} *core linksys-tftp diff --git a/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch b/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch new file mode 100644 index 0000000000..9944f3c059 --- /dev/null +++ b/network/linksys-tftp/linksys-tftp-1.2.1-r1-header.patch @@ -0,0 +1,52 @@ +--- linksys-tftp-1.2.1/main.c ++++ linksys-tftp-1.2.1/main.c +@@ -40,6 +40,10 @@ + #include <setjmp.h> + #include <ctype.h> + #include <netdb.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++#include <sys/sendfile.h> + + #define TIMEOUT 5 /* secs between rexmt's */ + +@@ -110,7 +112,7 @@ + char *index(); + char *rindex(); + +-main(argc, argv) ++int main(argc, argv) + char *argv[]; + { + struct sockaddr_in sin; +--- a/tftp.c ++++ b/tftp.c +@@ -36,8 +36,8 @@ + #include <stdio.h> + #include <errno.h> + #include <setjmp.h> +- +-extern int errno; ++#include <string.h> ++#include <unistd.h> + + extern struct sockaddr_in sin; /* filled in by main */ + extern int f; /* the opened socket */ +@@ -69,16 +69,6 @@ void timer(int sig) + longjmp(timeoutbuf, 1); + } + +-strnlen(s, n) +- char *s; +- int n; +-{ +- int i = 0; +- +- while (n-- > 0 && *s++) i++; +- return(i); +-} +- + /* + * Parse an OACK package and set blocksize accordingly + */ diff --git a/network/linksys-tftp/linksys-tftp.SlackBuild b/network/linksys-tftp/linksys-tftp.SlackBuild new file mode 100644 index 0000000000..2803fcdc1a --- /dev/null +++ b/network/linksys-tftp/linksys-tftp.SlackBuild @@ -0,0 +1,78 @@ +#!/bin/sh + +# Slackware build script for linksys-tftp + +# Copyright 2019 Richard Narron, California +# 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=linksys-tftp +VERSION=${VERSION:-1.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} + +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 {} \; + +# patches thanks to Gentoo +(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-Makefile.patch) | patch -b -p1 +(echo " " && cat $CWD/linksys-tftp-1.2.1-r1-header.patch) | patch -b -p1 + +make + +install -D -m755 -t $PKG/usr/bin/ linksys-tftp + +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 $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $CWD/README $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware +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/network/linksys-tftp/linksys-tftp.info b/network/linksys-tftp/linksys-tftp.info new file mode 100644 index 0000000000..1e2c9be8ff --- /dev/null +++ b/network/linksys-tftp/linksys-tftp.info @@ -0,0 +1,10 @@ +PRGNAM="linksys-tftp" +VERSION="1.2.1" +HOMEPAGE="https://www.redsand.net/solutions/linksys_tftp.html" +DOWNLOAD="https://www.redsand.net/solutions/linksys-tftp-1.2.1.tar.gz" +MD5SUM="f536f778dcbcb4a65838042ca0a2a454" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Richard Narron" +EMAIL="richard@aaazen.com" diff --git a/network/createrepo_c/slack-desc b/network/linksys-tftp/slack-desc index 7621984882..52b24ab204 100644 --- a/network/createrepo_c/slack-desc +++ b/network/linksys-tftp/slack-desc @@ -6,14 +6,14 @@ # 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: +linksys-tftp: linksys-tftp (tftp client for Linksys routers requiring a password) +linksys-tftp: +linksys-tftp: This is a BSD tftp client for Linksys routers that need a password +linksys-tftp: for tftp firmware installation such as the BEFW11, WRT54G and WRT54GL +linksys-tftp: +linksys-tftp: +linksys-tftp: +linksys-tftp: +linksys-tftp: +linksys-tftp: +linksys-tftp: diff --git a/network/lldpd/lldpd.SlackBuild b/network/lldpd/lldpd.SlackBuild index 6d76bd5ad1..25306b6af0 100644 --- a/network/lldpd/lldpd.SlackBuild +++ b/network/lldpd/lldpd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lldpd -# Copyright 2017-2019 Thibaut Notteboom, Paris, FRANCE +# Copyright 2017-2021 Thibaut Notteboom, Paris, FRANCE # 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=lldpd -VERSION=${VERSION:-1.0.4} +VERSION=${VERSION:-1.0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/lldpd/lldpd.info b/network/lldpd/lldpd.info index b93d5c753d..0999957e77 100644 --- a/network/lldpd/lldpd.info +++ b/network/lldpd/lldpd.info @@ -1,8 +1,8 @@ PRGNAM="lldpd" -VERSION="1.0.4" +VERSION="1.0.7" HOMEPAGE="https://vincentbernat.github.io/lldpd/" -DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.4.tar.gz" -MD5SUM="33e8d58623f99184e4e709cbbfe45db3" +DOWNLOAD="https://media.luffy.cx/files/lldpd/lldpd-1.0.7.tar.gz" +MD5SUM="509aa1675dafff5017bbcc22850e35a8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/lldpd/rc.lldpd b/network/lldpd/rc.lldpd index 023173b6c1..40d75680da 100644 --- a/network/lldpd/rc.lldpd +++ b/network/lldpd/rc.lldpd @@ -10,7 +10,7 @@ lldpd_stop() { killall lldpd } -restart() { +lldpd_restart() { lldpd_stop sleep 1 lldpd_start diff --git a/network/luakit/luakit.SlackBuild b/network/luakit/luakit.SlackBuild index 7a0981a59b..20fea6d96d 100644 --- a/network/luakit/luakit.SlackBuild +++ b/network/luakit/luakit.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for luakit # Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv -# Update 2018-06-30 by Marek Srejma <sam_web@yahoo.de> +# Update 2018-06-30 and 2020-10-26 by Marek Srejma <sam_web@yahoo.de> # 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=luakit -VERSION=${VERSION:-2.0} +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} LUAJIT=${LUAJIT:-0} # 0 or 1 @@ -45,10 +45,13 @@ OUTPUT=${OUTPUT:-/tmp} if egrep -qo "^i[2-6]86$" <<<"$ARCH"; then SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -56,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-debian-$VERSION -tar xvf $CWD/$PRGNAM-debian-$VERSION.tar.gz -cd $PRGNAM-debian-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -66,25 +69,22 @@ 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 -e 's#(PREFIX)/lib/luakit#(LIBDIR)#g' -i Makefile + _CFLAGS=`grep CFLAGS config.mk | sed -e "s/CFLAGS\s*+=//g" | tr "\n" " "` -make \ +make install \ + CFLAGS="$_CFLAGS $SLKCFLAGS" \ PREFIX=/usr \ + LIBDIR=/usr/lib$LIBDIRSUFFIX/$PRGNAM \ MANPREFIX=/usr/man \ DOCDIR=/usr/doc/$PRGNAM-$VERSION \ DEVELOPMENT_PATHS=0 \ - CFLAGS="$_CFLAGS $SLKCFLAGS" \ LUA_BIN_NAME=lua \ LUA_PKG_NAME=lua \ USE_LUAJIT=$LUAJIT \ - CC=$CC - -make install \ - DESTDIR=$PKG \ - PREFIX=/usr \ - MANPREFIX=$PKG/usr/man \ - DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION \ - LUA_BIN_NAME=lua \ - LUA_PKG_NAME=lua + CC=$CC \ + VERSION=$VERSION \ + 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 diff --git a/network/luakit/luakit.info b/network/luakit/luakit.info index 2b0eabac90..2f3150278d 100644 --- a/network/luakit/luakit.info +++ b/network/luakit/luakit.info @@ -1,8 +1,8 @@ PRGNAM="luakit" -VERSION="2.0" +VERSION="2.2.1" HOMEPAGE="https://github.com/luakit/luakit" -DOWNLOAD="https://github.com/luakit/luakit/archive/debian/2.0/luakit-debian-2.0.tar.gz" -MD5SUM="2f5ab83a7835db482220b2279351e23c" +DOWNLOAD="https://github.com/luakit/luakit/archive/2.2.1/luakit-2.2.1.tar.gz" +MD5SUM="c9f32f06b54fae18e567fb330250bb36" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webkit2gtk lua-filesystem" diff --git a/network/lxi-tools/lxi-gui.desktop b/network/lxi-tools/lxi-gui.desktop index fb17ad31d9..c5e75f843f 100644 --- a/network/lxi-tools/lxi-gui.desktop +++ b/network/lxi-tools/lxi-gui.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.18 +Version=1.0 Name=LXI-GUI Comment=LAN eXtensions for Instrumentation GUI Exec=lxi-gui diff --git a/network/macchanger/README b/network/macchanger/README index 404318fe12..72b3a2b9cc 100644 --- a/network/macchanger/README +++ b/network/macchanger/README @@ -1,10 +1,10 @@ -GNU MAC Changer is a utility for viewing and manipulating -the MAC address of network interfaces +GNU MAC Changer is a utility for viewing and manipulating +MAC addresses of network interfaces. Features: --Set specific MAC address of a network interface --Set the MAC randomly --Set a MAC of another vendor --Set another MAC of the same vendor --Set a MAC of the same kind (eg: wireless card) --Display a vendor MAC list (today, 6800 items) to choose from + - set specific MAC address of a network interface + - set the MAC randomly + - set a MAC of another vendor + - set another MAC of the same vendor + - set a MAC of the same kind (eg: wireless card) + - display a vendor MAC list to choose from diff --git a/network/macchanger/macchanger.SlackBuild b/network/macchanger/macchanger.SlackBuild index 1cb5f3bea5..9beaa20889 100644 --- a/network/macchanger/macchanger.SlackBuild +++ b/network/macchanger/macchanger.SlackBuild @@ -1,15 +1,30 @@ #!/bin/sh -################################################################### # Slackware build script for macchanger + +# Copyright 2007, 2010 Kevin Myers <jwblack AT cox DOT net> +# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl> +# All rights reserved. # -# Written by Kevin Myers jwblack AT cox DOT net 09-02-2007 +# 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=macchanger -VERSION=${VERSION:-1.5.0} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -26,8 +41,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING INSTALL NEWS README ChangeLog" - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -42,43 +55,47 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux \ - || exit 1 + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux -make || exit 1 -make install DESTDIR=$PKG || exit 1 +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 -( 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 rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING NEWS README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/macchanger/macchanger.info b/network/macchanger/macchanger.info index fcc02d0362..133c385776 100644 --- a/network/macchanger/macchanger.info +++ b/network/macchanger/macchanger.info @@ -1,10 +1,10 @@ PRGNAM="macchanger" -VERSION="1.5.0" +VERSION="1.7.0" HOMEPAGE="https://github.com/alobbs/macchanger" -DOWNLOAD="ftp://ftp.gnu.org/gnu/macchanger/macchanger-1.5.0.tar.gz" -MD5SUM="79b7cdaeca3d8ebafa764c4b0dd03ab7" +DOWNLOAD="https://github.com/alobbs/macchanger/releases/download/1.7.0/macchanger-1.7.0.tar.gz" +MD5SUM="ca56f16142914337391dac91603eb332" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Kevin Myers" -EMAIL="jwblack@cox.net" +MAINTAINER="Dominik Drobek" +EMAIL="dominik.drobek (at) o2.pl" diff --git a/network/macchanger/slack-desc b/network/macchanger/slack-desc index 8a0a2cb30e..55a95fa54c 100644 --- a/network/macchanger/slack-desc +++ b/network/macchanger/slack-desc @@ -6,10 +6,10 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -macchanger: macchanger (utility for viewing/manipulating the MAC address) +macchanger: macchanger (utility for viewing and manipulating MAC addresses) macchanger: -macchanger: This is a GNU/Linux Utility for viewing/manipulating the MAC -macchanger: address of network interfaces. +macchanger: This is a GNU/Linux utility for viewing and manipulating MAC +macchanger: addresses of network interfaces. macchanger: macchanger: Homepage: https://github.com/alobbs/macchanger macchanger: diff --git a/network/maildrop/maildrop.SlackBuild b/network/maildrop/maildrop.SlackBuild index 641d9ba7c1..7f4d08ce48 100644 --- a/network/maildrop/maildrop.SlackBuild +++ b/network/maildrop/maildrop.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for maildrop # # Copyright 2010 - 2019 Šime Ramov <s@ramov.com> -# Copyright 2019 Andrew Strong, Blue Mountains, Australia. +# Copyright 2019 - 2021 Andrew Strong, Blue Mountains, Australia. # # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that @@ -25,13 +25,13 @@ # ---------------------------------------------------------------------- PRGNAM=maildrop -VERSION=${VERSION:-3.0.0} +VERSION=${VERSION:-3.0.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 @@ -42,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" @@ -67,21 +67,28 @@ 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" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --datadir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --enable-dovecotauth \ + --with-devel \ --build=$ARCH-slackware-linux make -make install-strip DESTDIR=$PKG +make install DESTDIR=$PKG + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -94,7 +101,7 @@ mv $PKG/usr/share/doc/$PRGNAM/html $PKG/usr/doc/$PRGNAM-$VERSION rm -rf $PKG/usr/share cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README UPGRADE \ + AUTHORS COPYING* ChangeLog INSTALL README README.dovecotauth UPGRADE \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/maildrop/maildrop.info b/network/maildrop/maildrop.info index 94693cdd1d..5becdd4664 100644 --- a/network/maildrop/maildrop.info +++ b/network/maildrop/maildrop.info @@ -1,8 +1,8 @@ PRGNAM="maildrop" -VERSION="3.0.0" +VERSION="3.0.1" HOMEPAGE="http://www.courier-mta.org/maildrop/" -DOWNLOAD="https://download.sourceforge.net/courier/maildrop-3.0.0.tar.bz2" -MD5SUM="410569d4829549429a99df7511ea3a46" +DOWNLOAD="https://download.sourceforge.net/courier/maildrop-3.0.1.tar.bz2" +MD5SUM="28f6a5dfa6da4110719240696d528299" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="courier-unicode" diff --git a/network/mailspring/README b/network/mailspring/README new file mode 100644 index 0000000000..1a4975dd51 --- /dev/null +++ b/network/mailspring/README @@ -0,0 +1,9 @@ +Mailspring (A beautiful, fast and maintained fork of Nylas Mail) + +Mailspring is a new version of Nylas Mail maintained by one of the +original authors. It's faster, leaner, and shipping today! It replaces +the JavaScript sync code in Nylas Mail with a new C++ sync engine based +on Mailcore2. It uses roughly half the RAM and CPU of Nylas Mail and +idles with almost zero "CPU Wakes", which translates to great battery +life. It also has an entirely revamped composer and other great new +features. diff --git a/network/mailspring/doinst.sh b/network/mailspring/doinst.sh new file mode 100644 index 0000000000..7b676c401a --- /dev/null +++ b/network/mailspring/doinst.sh @@ -0,0 +1,6 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications +fi +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -q usr/share/icons/hicolor +fi diff --git a/network/mailspring/mailspring.SlackBuild b/network/mailspring/mailspring.SlackBuild new file mode 100644 index 0000000000..aec0a99204 --- /dev/null +++ b/network/mailspring/mailspring.SlackBuild @@ -0,0 +1,83 @@ +#!/bin/sh + +# Slackware build script for mailspring +# +# 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=mailspring +VERSION=${VERSION:-1.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 + echo "This package is currently only available for 64bit." + exit 1 +elif [ "$ARCH" = "x86_64" ]; then + DEBARCH="amd64" + LIBDIRSUFFIX="64" +else + echo "Package for $(uname -m) architecture is not available." + exit 1 +fi + +set -eu + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/${PRGNAM}-${VERSION}-${DEBARCH}.deb data.tar.xz | tar -Jxv + +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 $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 +mv $PKG/usr/share/doc/${PRGNAM}/copyright $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# Don't need these: +rm -rf $PKG/usr/share/doc $PKG/usr/share/lintian + +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/network/mailspring/mailspring.info b/network/mailspring/mailspring.info new file mode 100644 index 0000000000..18c30c3d30 --- /dev/null +++ b/network/mailspring/mailspring.info @@ -0,0 +1,10 @@ +PRGNAM="mailspring" +VERSION="1.7.8" +HOMEPAGE="https://getmailspring.com/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/Foundry376/Mailspring/releases/download/1.7.8/mailspring-1.7.8-amd64.deb" +MD5SUM_x86_64="cba72626be223808f4d1f734fc62b1a5" +REQUIRES="" +MAINTAINER="Muhammad Mahendra Subrata" +EMAIL="mumahendras3@gmail.com" diff --git a/network/mailspring/slack-desc b/network/mailspring/slack-desc new file mode 100644 index 0000000000..c5017d9e33 --- /dev/null +++ b/network/mailspring/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------------------------------------------------------| +mailspring: mailspring (a beautiful, fast and maintained fork of Nylas Mail) +mailspring: +mailspring: Mailspring is a new version of Nylas Mail maintained by one of the +mailspring: original authors. It's faster, leaner, and shipping today! It replaces +mailspring: the JavaScript sync code in Nylas Mail with a new C++ sync engine +mailspring: based on Mailcore2. It uses roughly half the RAM and CPU of Nylas Mail +mailspring: and idles with almost zero "CPU Wakes", which translates to great +mailspring: battery life. It also has an entirely revamped composer and other +mailspring: great new features. +mailspring: +mailspring: Homepage: https://getmailspring.com/ diff --git a/network/mattermost-desktop/doinst.sh b/network/mattermost-desktop/doinst.sh index 5fb28930db..65c7e2eeb9 100644 --- a/network/mattermost-desktop/doinst.sh +++ b/network/mattermost-desktop/doinst.sh @@ -1,3 +1,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/network/mattermost-desktop/mattermost-desktop.SlackBuild b/network/mattermost-desktop/mattermost-desktop.SlackBuild index e2ff2ccd79..c43c06f88f 100644 --- a/network/mattermost-desktop/mattermost-desktop.SlackBuild +++ b/network/mattermost-desktop/mattermost-desktop.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mattermost-desktop -# Copyright 2018, 2019 Dominik Drobek <dominik.drobek (at) o2.pl> +# Copyright 2018-2020 Dominik Drobek <dominik.drobek (at) o2.pl> # 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=mattermost-desktop -VERSION=${VERSION:-4.2.3} +VERSION=${VERSION:-4.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,15 +67,14 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; mkdir -p $PKG/opt/$PRGNAM -cp -a locales/ resources/ *.bin *.dat *.pak *.so $PRGNAM $PKG/opt/$PRGNAM - -mkdir -p $PKG/usr/share/{applications,pixmaps} -install -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications -install -m 644 icon.svg $PKG/usr/share/pixmaps/$PRGNAM.svg +cp -a locales/ resources/ swiftshader/ *.bin *.dat *.pak *.so chrome-sandbox $PRGNAM $PKG/opt/$PRGNAM mkdir -p $PKG/usr/bin ln -sf ../../opt/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM +install -D -m 644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop +install -D -m 644 icon.svg $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ LICENSE* NOTICE.txt README.md \ diff --git a/network/mattermost-desktop/mattermost-desktop.info b/network/mattermost-desktop/mattermost-desktop.info index 2e9a4a84ff..c22f9dac1c 100644 --- a/network/mattermost-desktop/mattermost-desktop.info +++ b/network/mattermost-desktop/mattermost-desktop.info @@ -1,10 +1,10 @@ PRGNAM="mattermost-desktop" -VERSION="4.2.3" +VERSION="4.6.1" HOMEPAGE="https://mattermost.com" -DOWNLOAD="https://releases.mattermost.com/desktop/4.2.3/mattermost-desktop-4.2.3-linux-ia32.tar.gz" -MD5SUM="0eb974abd7226d91fdd83ea5de6b91a5" -DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.2.3/mattermost-desktop-4.2.3-linux-x64.tar.gz" -MD5SUM_x86_64="713c01b8359a4fbd7c6a98e93c73dec8" +DOWNLOAD="https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-ia32.tar.gz" +MD5SUM="5f6541178b31eb4eb337e0d60ece1072" +DOWNLOAD_x86_64="https://releases.mattermost.com/desktop/4.6.1/mattermost-desktop-4.6.1-linux-x64.tar.gz" +MD5SUM_x86_64="48b6cae957745ee92ab5d90b6c21c12c" REQUIRES="" MAINTAINER="Dominik Drobek" EMAIL="dominik.drobek (at) o2.pl" diff --git a/network/megatools/megatools.SlackBuild b/network/megatools/megatools.SlackBuild index a8ecc2bac3..5145d414d3 100644 --- a/network/megatools/megatools.SlackBuild +++ b/network/megatools/megatools.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for megatools -# Copyright 2014-2018 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=megatools -VERSION=${VERSION:-1.10.2} +VERSION=${VERSION:-1.10.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/megatools/megatools.info b/network/megatools/megatools.info index 9482d6a966..29028d7511 100644 --- a/network/megatools/megatools.info +++ b/network/megatools/megatools.info @@ -1,8 +1,8 @@ PRGNAM="megatools" -VERSION="1.10.2" +VERSION="1.10.3" HOMEPAGE="https://megatools.megous.com/" -DOWNLOAD="https://megatools.megous.com/builds/megatools-1.10.2.tar.gz" -MD5SUM="b9c7e18b4daf48867d7c669a674744b0" +DOWNLOAD="https://megatools.megous.com/builds/megatools-1.10.3.tar.gz" +MD5SUM="e5f85f5f5d4fe844a6090a2816eabcae" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/metasploit/metasploit.info b/network/metasploit/metasploit.info index e7eac77a3e..ff80e873c2 100644 --- a/network/metasploit/metasploit.info +++ b/network/metasploit/metasploit.info @@ -6,5 +6,5 @@ MD5SUM="9d4abba0e05bb972ba805e6e0e63cea0" DOWNLOAD_x86_64="http://downloads.metasploit.com/data/releases/archive/metasploit-4.7.0-linux-x64-installer.run" MD5SUM_x86_64="b36d8c7282f91e8bcb0138f2feb702cf" REQUIRES="" -MAINTAINER="Andrea Villa" -EMAIL="andreakarimodm@gmail.com" +MAINTAINER="Dionysis Ntreou" +EMAIL="yakizarns1@gmail.com" diff --git a/network/milter-greylist/milter-greylist.SlackBuild b/network/milter-greylist/milter-greylist.SlackBuild index a440fe5877..cbf2e45175 100644 --- a/network/milter-greylist/milter-greylist.SlackBuild +++ b/network/milter-greylist/milter-greylist.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for milter-greylist -# Copyright 2014 David Woodfall <dave@dawoodfall.net> +# Copyright 2014 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/milter-greylist/milter-greylist.info b/network/milter-greylist/milter-greylist.info index 825943d46d..60f5f88d50 100644 --- a/network/milter-greylist/milter-greylist.info +++ b/network/milter-greylist/milter-greylist.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/network/milter-greylist/rc.milter-greylist.new b/network/milter-greylist/rc.milter-greylist.new index 5f4ce88cb4..8a7c5a74dd 100644 --- a/network/milter-greylist/rc.milter-greylist.new +++ b/network/milter-greylist/rc.milter-greylist.new @@ -2,7 +2,7 @@ # # Slackware init script for milter-greylist -# Copyright 2018 Dave Woodfall <dave@tty1.uk> +# Copyright 2018 Dave Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/mkvserver_mk2/mkvserver_mk2.SlackBuild b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild index d039faca4a..95cdb40b57 100644 --- a/network/mkvserver_mk2/mkvserver_mk2.SlackBuild +++ b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild @@ -22,9 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified by slackbuilds.org + PRGNAM=mkvserver_mk2 -SRCNAM=a6f18126bd5a35b77f47e2fc32ffc221d0937aeb -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-20201203_c62abc3} +COMMIT=${COMMIT:-c62abc30f4cca6147ddc732570b30fcb4bee30ec} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,16 +44,16 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11" + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC -std=c++11" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2 -std=c++11" + SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -60,10 +62,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$SRCNAM.tar.gz -mv $PRGNAM-$SRCNAM $PRGNAM-$VERSION -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$COMMIT +tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz +#mv $PRGNAM-$COMMIT $PRGNAM-$VERSION +cd $PRGNAM-$COMMIT chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -71,20 +73,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 {} \; - make VERBOSE=1 - mkdir -p $PKG/usr/bin/ - install -m755 server $PKG/usr/bin/mkvserver_mk2 +# Use slackware CFLAGS +sed -i "s,\$(LAV_CFLAGS),$SLKCFLAGS &,g" Makefile -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 +export PKG_CONFIG_PATH="/usr/lib$LIBDIRSUFFIX/ffmpeg4/pkgconfig:$PKG_CONFIG_PATH" +make VERBOSE=1 +install --strip -D -m0755 server $PKG/usr/bin/mkvserver mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Readme.md $PKG/usr/doc/$PRGNAM-$VERSION +cp 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/network/mkvserver_mk2/mkvserver_mk2.info b/network/mkvserver_mk2/mkvserver_mk2.info index 7b90539939..17d266d7d0 100644 --- a/network/mkvserver_mk2/mkvserver_mk2.info +++ b/network/mkvserver_mk2/mkvserver_mk2.info @@ -1,10 +1,10 @@ PRGNAM="mkvserver_mk2" -VERSION="1.0" +VERSION="20201203_c62abc3" HOMEPAGE="https://github.com/klaxa/mkvserver_mk2" -DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/a6f18126bd5a35b77f47e2fc32ffc221d0937aeb/mkvserver_mk2-a6f18126bd5a35b77f47e2fc32ffc221d0937aeb.tar.gz" -MD5SUM="87e513b3b0e85a18471bdffaf972661b" +DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/c62abc30f4cca6147ddc732570b30fcb4bee30ec/mkvserver_mk2-c62abc30f4cca6147ddc732570b30fcb4bee30ec.tar.gz" +MD5SUM="f49feb40138a9c47bb4ccea3a695499d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="ffmpeg4" MAINTAINER="Fernando Lopez Jr." EMAIL="fernando.lopezjr@gmail.com" diff --git a/network/mkvserver_mk2/slack-desc b/network/mkvserver_mk2/slack-desc index 21af6d26fe..471c6200ff 100644 --- a/network/mkvserver_mk2/slack-desc +++ b/network/mkvserver_mk2/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| mkvserver_mk2: mkvserver_mk2 (Matroska Server Mk2) mkvserver_mk2: -mkvserver_mk2: Matroska Server Mk2 project is the result of years of thinking, try- -mkvserver_mk2: ing and finally succeeding. -mkvserver_mk2: -mkvserver_mk2: This software makes it possible to stream (almost) anything remuxed -mkvserver_mk2: as matroska live in real-time over http to multiple clients. +mkvserver_mk2: Stream (almost) anything remuxed as matroska live in real-time over +mkvserver_mk2: http to multiple clients. +mkvserver_mk2: +mkvserver_mk2: https://github.com/klaxa/mkvserver_mk2 +mkvserver_mk2: +mkvserver_mk2: +mkvserver_mk2: mkvserver_mk2: -mkvserver_mk2: This is probably also one of the first real world usages of FFmpeg's -mkvserver_mk2: http server component (which I wrote as part of GSoC 2015). mkvserver_mk2: diff --git a/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild b/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild index 8f5278cc66..a2bc3001ea 100644 --- a/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild +++ b/network/mod_auth_gssapi/mod_auth_gssapi.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mod_auth_gssapi -# Copyright 2019 Thibaut Notteboom, Paris, FRANCE +# Copyright 2019-2020 Thibaut Notteboom, Paris, FRANCE # 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=mod_auth_gssapi -VERSION=${VERSION:-1.6.1} +VERSION=${VERSION:-1.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/mod_auth_gssapi/mod_auth_gssapi.info b/network/mod_auth_gssapi/mod_auth_gssapi.info index 91dbfd5c8e..95d27049f9 100644 --- a/network/mod_auth_gssapi/mod_auth_gssapi.info +++ b/network/mod_auth_gssapi/mod_auth_gssapi.info @@ -1,8 +1,8 @@ PRGNAM="mod_auth_gssapi" -VERSION="1.6.1" +VERSION="1.6.3" HOMEPAGE="https://github.com/modauthgssapi/mod_auth_gssapi" -DOWNLOAD="https://github.com/modauthgssapi/mod_auth_gssapi/releases/download/v1.6.1/mod_auth_gssapi-1.6.1.tar.gz" -MD5SUM="a8d03852287fac4dbef9b50dc15b71de" +DOWNLOAD="https://github.com/modauthgssapi/mod_auth_gssapi/releases/download/v1.6.3/mod_auth_gssapi-1.6.3.tar.gz" +MD5SUM="6656e33db1ce457515c9c6a5b819830e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="krb5" diff --git a/network/modemu2k/README.Slackware b/network/modemu2k/README.Slackware index 3c2d162234..dc8babebfa 100644 --- a/network/modemu2k/README.Slackware +++ b/network/modemu2k/README.Slackware @@ -1,4 +1,4 @@ -modemu2k v0.0.5 +modemu2k v0.0.6 ------------------- modemu2k is a fork of modemu, originally developed by Toru Egashira @@ -83,6 +83,7 @@ Note: while in the program if backspace doesn't work, use CTRL+H. You could also connect to a BBS. For some telnet addresses, see: * <<Prism BBS<http://filegate.net/> + * The Rusty Mailbox (telnet to trmb.ca, port 2030) * Synchronet BBS List<http://www.synchro.net/sbbslist.html> To quit modemu2k, just quit the comm program. diff --git a/network/modemu2k/modemu2k.SlackBuild b/network/modemu2k/modemu2k.SlackBuild index 162da50b3d..21cc423d93 100644 --- a/network/modemu2k/modemu2k.SlackBuild +++ b/network/modemu2k/modemu2k.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for modemu2k # -# Copyright 2019 / Andy Alt / United States +# Copyright 2019-2020 / 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=modemu2k -VERSION=${VERSION:-0.0.5} +VERSION=${VERSION:-0.0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/modemu2k/modemu2k.info b/network/modemu2k/modemu2k.info index 3732d2995a..239e0e39dc 100644 --- a/network/modemu2k/modemu2k.info +++ b/network/modemu2k/modemu2k.info @@ -1,8 +1,8 @@ PRGNAM="modemu2k" -VERSION="0.0.5" +VERSION="0.0.6" HOMEPAGE="https://github.com/theimpossibleastronaut/modemu2k" -DOWNLOAD="https://github.com/theimpossibleastronaut/modemu2k/releases/download/v0.0.5/modemu2k-0.0.5.tar.gz" -MD5SUM="14c2cf318765508e37b1fcfd173b9f83" +DOWNLOAD="https://github.com/theimpossibleastronaut/modemu2k/releases/download/v0.0.6/modemu2k-0.0.6.tar.gz" +MD5SUM="a6a45ab9ad9d0fa5a2af229368fd05c0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/mosaic-ck/mosaic-ck.info b/network/mosaic-ck/mosaic-ck.info index 88f42e0114..8289604f2b 100644 --- a/network/mosaic-ck/mosaic-ck.info +++ b/network/mosaic-ck/mosaic-ck.info @@ -1,7 +1,7 @@ PRGNAM="mosaic-ck" VERSION="2.7ck9" HOMEPAGE="http://www.floodgap.com/retrotech/machten/mosaic/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/mosaic27ck9.tar.gz" +DOWNLOAD="https://slackware.uk/~urchlay/src/mosaic27ck9.tar.gz" MD5SUM="a412ea475bb5059182ee9642c95368cc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild index 4f5fe7ce09..ac040947a9 100644 --- a/network/mosh/mosh.SlackBuild +++ b/network/mosh/mosh.SlackBuild @@ -2,16 +2,17 @@ # Slackware build script for mosh -# Written by ruario <sbo@ruari.com> +# Written by ruario +# Maintained by Donald Cooley, South Haven, Indiana, USA PRGNAM=mosh -VERSION=${VERSION:-1.2.4} +VERSION=${VERSION:-1.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 @@ -22,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/network/mosh/mosh.info b/network/mosh/mosh.info index 911318a85f..73be381340 100644 --- a/network/mosh/mosh.info +++ b/network/mosh/mosh.info @@ -1,10 +1,10 @@ PRGNAM="mosh" -VERSION="1.2.4" +VERSION="1.3.2" HOMEPAGE="http://mosh.mit.edu/" -DOWNLOAD="http://mosh.mit.edu/mosh-1.2.4.tar.gz" -MD5SUM="c2d918f4d91fdc32546e2e089f9281b2" +DOWNLOAD="http://mosh.mit.edu/mosh-1.3.2.tar.gz" +MD5SUM="5122f4d2b973ab7c38dcdac8c35cb61e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-IO-Tty protobuf" -MAINTAINER="Ruari Oedegaard" -EMAIL="sbo@ruari.com" +MAINTAINER="Donald Cooley" +EMAIL="chytraeu@sdf.org" diff --git a/network/mumble/README b/network/mumble/README index 7fb924cb74..c653790f03 100644 --- a/network/mumble/README +++ b/network/mumble/README @@ -16,6 +16,11 @@ mumble-overlay script to use for compatability. Please note, you To build the overlay with 32-bit compatability: OVERLAY=yes COMPAT32=yes ./mumble.SlackBuild +Celt is no longer maintained, and dropped in is favor of opus. +Celt-0.7.0 bundled for optional backware compatibility. SBo's celt +is incompatible. If needed use: + CELT070=yes ./mumble.SlackBuild + Note: This does not build the mumble server (murmur). ***NOTE: text-to-speech is now an available option in mumble with diff --git a/network/mumble/bump_overlay_version.patch b/network/mumble/bump_overlay_version.patch new file mode 100644 index 0000000000..87bc372c42 --- /dev/null +++ b/network/mumble/bump_overlay_version.patch @@ -0,0 +1,23 @@ +From d9a2a0d9b8005e2e01729195b95f20e434ffdfe6 Mon Sep 17 00:00:00 2001 +From: Robert Adam <dev@robert-adam.de> +Date: Mon, 15 Mar 2021 08:22:10 +0100 +Subject: [PATCH] BUILD: Bumped overlay version to 1.3.4 as well + +Fixes #4857 +--- + overlay_gl/overlay_gl.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro +index 05ca8df082..0ea691b162 100644 +--- a/overlay_gl/overlay_gl.pro ++++ b/overlay_gl/overlay_gl.pro +@@ -10,7 +10,7 @@ include(../qmake/compiler.pri) + TEMPLATE = lib + CONFIG -= qt gui + CONFIG *= debug_and_release +-VERSION = 1.3.3 ++VERSION = 1.3.4 + SOURCES = overlay.c + + CONFIG(static) { diff --git a/network/mumble/libspeechd_header.patch b/network/mumble/libspeechd_header.patch deleted file mode 100644 index d398777a64..0000000000 --- a/network/mumble/libspeechd_header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp ---- mumble-1.2.16/src/mumble/TextToSpeech_unix.cpp 2016-05-05 07:56:03.000000000 -0700 -+++ mumble-1.2.16-new/src/mumble/TextToSpeech_unix.cpp 2016-05-15 21:58:16.605311547 -0700 -@@ -33,7 +33,7 @@ - #include "TextToSpeech.h" - - #ifdef USE_SPEECHD --#include <libspeechd.h> -+#include </usr/include/speech-dispatcher/libspeechd.h> - #endif - - #include "Global.h" diff --git a/network/mumble/mumble.SlackBuild b/network/mumble/mumble.SlackBuild index 9de8dc9468..7b98f57838 100644 --- a/network/mumble/mumble.SlackBuild +++ b/network/mumble/mumble.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for Mumble # Copyright 2011-2013 James Geboski <jgeboski@gmail.com> -# Copyright 2014-2015 Edward W. Koenig <kingbeowulf@gmail.com> +# Copyright 2014-2021 Edward W. Koenig <kingbeowulf@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,21 +23,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# New maintainer: Edward W. Koenig <kingbeowulf@gmail.com> PRGNAM=mumble -VERSION=${VERSION:-1.2.19} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} G15=${G15:-no} OVERLAY=${OVERLAY:-no} COMPAT32=${COMPAT32:-no} +NUMJOBS=${NUMJOBS:-1} SPEECHD=${SPEECHD:-no} +CELT070=${CELT070:-no} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -48,8 +49,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" @@ -62,19 +63,31 @@ else LIBDIRSUFFIX="" fi -BUILD_G15="" -BUILD_OVERLAY="" - if [ "$G15" = "no" ]; then BUILD_G15="CONFIG+=no-g15" +else + BUILD_G15="" fi if [ "$OVERLAY" = "no" ]; then BUILD_OVERLAY="CONFIG+=no-overlay" +else + BUILD_OVERLAY="" fi if [ "$SPEECHD" = "no" ]; then BUILD_SPEECHD="CONFIG+=no-speechd" +else + BUILD_SPEECHD="" +fi + +# Celt is no longer maintained, and dropped in +# favor of opus. Celt-0.7.0 is bundled for optional +# backware compatibility. SBo's celt is incompatible. +if [ "CELT070" = "no" ]; then + BUILD_CELT="CONFIG+=no-bundled-celt" +else + BUILD_CELT="CONFIG+=bundled-celt" fi set -e @@ -92,14 +105,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 {} \; -# Mumble won't find the speechd header without this -patch -p1 < $CWD/libspeechd_header.patch +# Bumped overlay version to 1.3.4 as well Fixes #4857 +patch -p1 < $CWD/bump_overlay_version.patch -qmake -recursive main.pro \ +qmake-qt5 -recursive main.pro \ QMAKE_CFLAGS+="$SLKCFLAGS" \ QMAKE_CXXFLAGS+="$SLKCFLAGS" \ DEFINES*="PLUGIN_PATH=/usr/lib${LIBDIRSUFFIX}/mumble" \ - CONFIG+=bundled-celt \ CONFIG+=no-server \ CONFIG+=no-bundled-opus \ CONFIG+=no-bundled-speex \ @@ -107,9 +119,11 @@ qmake -recursive main.pro \ CONFIG+=no-embed-qt-translations \ CONFIG+=no-ice \ CONFIG+=no-bonjour \ + CONFIG+=no-qt4-legacy-compat \ + $BUILD_CELT \ + $BUILD_SPEECHD \ $BUILD_G15 \ - $BUILD_OVERLAY \ - $BUILD_SPEECHD + $BUILD_OVERLAY make release @@ -118,32 +132,27 @@ mkdir -p \ $PKG/usr/lib${LIBDIRSUFFIX}/mumble \ $PKG/usr/man/man1 \ $PKG/usr/share/{applications,pixmaps} - -install -m 755 release/mumble $PKG/usr/bin - -# Mumble's bundled celt is needed: -# celt-0.7.0 is needed to keep compatibility with other clients -# celt-0.11.0 is needed as SBo's 0.11.3 is incompatible -cp -a release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble - -install -m 644 \ - man/mumble-overlay.1 \ - man/mumble.1 \ - $PKG/usr/man/man1 - + +install -m 644 man/mumble-overlay.1 $PKG/usr/man/man1 +install -m 644 man/mumble.1 $PKG/usr/man/man1 install -m 644 scripts/mumble.desktop $PKG/usr/share/applications install -m 644 icons/mumble.svg $PKG/usr/share/pixmaps -find release/plugins -type f -name *.so \ +install -m 755 release/mumble $PKG/usr/bin +if [ "$CELT070" = "yes" ]; then + install -m 755 release/libcelt0.so* $PKG/usr/lib${LIBDIRSUFFIX}/mumble +fi + +find release/plugins -type f -name "*.so" \ -exec install -m 755 {} $PKG/usr/lib${LIBDIRSUFFIX}/mumble \; # If the overlay was built, let's install the library for it -if [ -e release/libmumble.so.$VERSION ]; then +if [ "$OVERLAY" = "yes" ]; then install -m 755 release/libmumble.so.$VERSION $PKG/usr/lib${LIBDIRSUFFIX} install -m 755 scripts/mumble-overlay $PKG/usr/bin cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf libmumble.so.$VERSION libmumble.so.1.2 + ln -sf libmumble.so.$VERSION libmumble.so.1.3 ln -sf libmumble.so.$VERSION libmumble.so.1 ln -sf libmumble.so.$VERSION libmumble.so cd - @@ -156,11 +165,10 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then cd overlay_gl make clean - qmake \ + qmake-qt5 \ QMAKE_CFLAGS="-m32 -O2 -march=i486 -mtune=i686" \ QMAKE_CXXFLAGS="-m32 -O2 -march=i486 -mtune=i686" \ - QMAKE_LFLAGS="-m32" \ - overlay_gl.pro + QMAKE_LFLAGS="-m32" overlay_gl.pro make release DESTDIR_ADD=-32 cd - @@ -169,7 +177,7 @@ if [ "$COMPAT32" = "yes" -a "$OVERLAY" = "yes" -a "$ARCH" = "x86_64" ]; then install -m 755 release-32/libmumble.so.$VERSION $PKG/usr/lib cd $PKG/usr/lib - ln -sf libmumble.so.$VERSION libmumble.so.1.2 + ln -sf libmumble.so.$VERSION libmumble.so.1.3 ln -sf libmumble.so.$VERSION libmumble.so.1 ln -sf libmumble.so.$VERSION libmumble.so cd - @@ -182,7 +190,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 LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS INSTALL CHANGES LICENSE README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/mumble/mumble.info b/network/mumble/mumble.info index 3842253f5d..ce3a2cddea 100644 --- a/network/mumble/mumble.info +++ b/network/mumble/mumble.info @@ -1,10 +1,10 @@ PRGNAM="mumble" -VERSION="1.2.19" +VERSION="1.3.4" HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.19/mumble-1.2.19.tar.gz" -MD5SUM="d101068ed27ce119effdb3765a8cf8e4" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.4/mumble-1.3.4.tar.gz" +MD5SUM="d41ece1a4cefadfc1d04a16863514f98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="protobuf opus speex" +REQUIRES="opus speex protobuf3 qt5" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/network/munge/README b/network/munge/README index 3d3792de7a..7a6632501a 100644 --- a/network/munge/README +++ b/network/munge/README @@ -11,14 +11,14 @@ by a shared cryptographic key. Clients within this security realm can create and validate credentials without the use of root privileges, reserved ports, or platform-specific methods. -On most platforms, the munged daemon does not require root privileges to run. -If possible, you should run the daemon as a non-privileged user. +On most platforms, the munged daemon does not require root privileges to +run. If possible, you should run the daemon as a non-privileged user. This can be specified in the init script /etc/rc.d/rc.munge. # groupadd -g 310 munge # useradd -u 310 -d /var/lib/munge -s /bin/false -g munge munge -After installation a secret key file needs to be created. Follow instructions -from: +After installation a secret key file needs to be created. Follow +instructions from: https://github.com/dun/munge/wiki/Installation-Guide#creating-a-secret-key diff --git a/network/munge/munge.SlackBuild b/network/munge/munge.SlackBuild index 714c768926..e4cfeb6dc3 100644 --- a/network/munge/munge.SlackBuild +++ b/network/munge/munge.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Munge -# 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,12 +23,12 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=munge -VERSION=${VERSION:-0.5.13} +VERSION=${VERSION:-0.5.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} DOCS="AUTHORS COPYING COPYING.LESSER DISCLAIMER.LLNS DISCLAIMER.UC \ - HISTORY INSTALL JARGON META NEWS PLATFORMS QUICKSTART README README.MULTILIB" + HISTORY INSTALL JARGON KEYS NEWS PLATFORMS QUICKSTART README README.MULTILIB THANKS" if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/network/munge/munge.info b/network/munge/munge.info index acebdf893e..58e3aba957 100644 --- a/network/munge/munge.info +++ b/network/munge/munge.info @@ -1,8 +1,8 @@ PRGNAM="munge" -VERSION="0.5.13" +VERSION="0.5.14" HOMEPAGE="https://dun.github.io/munge/" -DOWNLOAD="https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz" -MD5SUM="9204f34aac7f0cc50880196f4a8f5f33" +DOWNLOAD="https://github.com/dun/munge/releases/download/munge-0.5.14/munge-0.5.14.tar.xz" +MD5SUM="e81db7faf729611e23d0552334dfc212" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/murmur/README b/network/murmur/README index bebdb01949..07923902c8 100644 --- a/network/murmur/README +++ b/network/murmur/README @@ -4,9 +4,6 @@ individual users. Each murmur process supports multiple virtual servers, each with their own user base and channel list. Administration of murmur is done through D-Bus. -NOTE: If you're upgrading from 1.1.4, the SlackBuild has changed: - /var/{lib,log,run}/mumble-server moved to /var/{lib,log,run}/murmur - This script requires the system to have a murmur user and group: # groupadd -g 261 murmur diff --git a/network/murmur/murmur.SlackBuild b/network/murmur/murmur.SlackBuild index 0ca99608da..7e90984094 100644 --- a/network/murmur/murmur.SlackBuild +++ b/network/murmur/murmur.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for murmur -# Copyright 2014, 2015 Edward W. Koenig <kingbeowulf@gmail.com> +# Copyright 2014-2019 Edward W. Koenig <kingbeowulf@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PRGNAM=murmur SRCNAM=mumble -VERSION=${VERSION:-1.2.19} +VERSION=${VERSION:-1.3.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -88,7 +88,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -qmake \ +qmake-qt5 \ -recursive \ main.pro \ QMAKE_CFLAGS+="$SLKCFLAGS" \ @@ -106,6 +106,7 @@ mkdir -p \ $PKG/usr/man/man1 \ $PKG/var/{lib,log,run}/$PRGNAM + install -m 644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new install -m 755 release/murmurd $PKG/usr/bin install -m 644 man/murmurd.1 $PKG/usr/man/man1 @@ -141,7 +142,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 \ - CHANGES INSTALL LICENSE README README.Linux \ + AUTHORS CHANGES INSTALL LICENSE README README.Linux \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/murmur/murmur.info b/network/murmur/murmur.info index eeeb72dadd..e76279a9b3 100644 --- a/network/murmur/murmur.info +++ b/network/murmur/murmur.info @@ -1,10 +1,10 @@ PRGNAM="murmur" -VERSION="1.2.19" -HOMEPAGE="https://github.com/mumble-voip/mumble/" -DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.2.19/mumble-1.2.19.tar.gz" -MD5SUM="d101068ed27ce119effdb3765a8cf8e4" +VERSION="1.3.4" +HOMEPAGE="https://wiki.mumble.info/wiki/Main_Page" +DOWNLOAD="https://github.com/mumble-voip/mumble/releases/download/1.3.4/mumble-1.3.4.tar.gz" +MD5SUM="d41ece1a4cefadfc1d04a16863514f98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="protobuf" +REQUIRES="protobuf3 qt5" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/network/mysecureshell/mysecureshell.info b/network/mysecureshell/mysecureshell.info index 7112264535..cef3380479 100644 --- a/network/mysecureshell/mysecureshell.info +++ b/network/mysecureshell/mysecureshell.info @@ -6,5 +6,5 @@ MD5SUM="f612d96c9ff3e99806c3c076acef0946" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="adaptr" -EMAIL="jeroen@adaptr.nl" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/nbd/nbd.SlackBuild b/network/nbd/nbd.SlackBuild index 189d9e3c39..ed344fb1ac 100644 --- a/network/nbd/nbd.SlackBuild +++ b/network/nbd/nbd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for NBD (Network Block Device) # Previously maintained by Stu Miller <slackbuilds@go4it2day.com> -# Maintained 2013-2019 by Christoph Willing, Brisbane Australia +# Maintained 2013-2021 by Christoph Willing, Brisbane Australia # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -32,7 +32,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nbd -VERSION=${VERSION:-3.20} +VERSION=${VERSION:-3.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/nbd/nbd.info b/network/nbd/nbd.info index 598c407e01..9d79ae552a 100644 --- a/network/nbd/nbd.info +++ b/network/nbd/nbd.info @@ -1,8 +1,8 @@ PRGNAM="nbd" -VERSION="3.20" +VERSION="3.21" HOMEPAGE="https://nbd.sourceforge.io/" -DOWNLOAD="https://downloads.sourceforge.net/nbd/nbd-3.20.tar.xz" -MD5SUM="910fe6c152f8c30ad8608388e6a4ce89" +DOWNLOAD="https://downloads.sourceforge.net/nbd/nbd-3.21.tar.xz" +MD5SUM="c51c4c500fe1ed84c3d5d5dd2ca71d23" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/nbtscan/nbtscan.SlackBuild b/network/nbtscan/nbtscan.SlackBuild index f16951335b..8d103e04c7 100644 --- a/network/nbtscan/nbtscan.SlackBuild +++ b/network/nbtscan/nbtscan.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for nbtscan -# Copyright 2013 - Fernando Giannasi - So Paulo - Brasil +# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/nbtscan/nbtscan.info b/network/nbtscan/nbtscan.info index 0762abefa4..7b7f1276e8 100644 --- a/network/nbtscan/nbtscan.info +++ b/network/nbtscan/nbtscan.info @@ -6,5 +6,5 @@ MD5SUM="ec21e504d27acb2a0f049c7421ace462" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Fernando Giannasi" -EMAIL="phoemur@gmail.com" +MAINTAINER="Michael Edie" +EMAIL="michael@sawbox.net" diff --git a/network/ncp/README b/network/ncp/README new file mode 100644 index 0000000000..21f741ce7d --- /dev/null +++ b/network/ncp/README @@ -0,0 +1,16 @@ +ncp (fast file copy tool for LANs) + +"ncp" is a utility for copying files in a LAN. It has absolutely no +security or integrity checking, no throttling, no features, except +one: you don't have to type the coordinates of your peer. + +Basically it works like this: + + 1. You and your buddy want to play Quake. + 2. Your buddy has a level that you don't have. + 3. He types "npush filename" and waits. npush sends out UDP + announcement packets proclaiming that someone wants to send + something. + 4. You type "npoll". npoll waits until it sees one of these packets. + 5. The files are copied with tar over a TCP socket, so permissions and + file dates (and if you are root, owners) are preserved. diff --git a/network/ncp/README.upstream b/network/ncp/README.upstream new file mode 100644 index 0000000000..d25d9b1c2d --- /dev/null +++ b/network/ncp/README.upstream @@ -0,0 +1,54 @@ + ncp - a fast file copy tool for LANs + +(Note: This is from 2000 and has not been touched since. I still use it on a +daily basis) + +Download it from http://dl.fefe.de/ncp-1.2.4.tar.bz2 [pgp sig]! The current +version is 1.2.4. Recent changes: switch to libowfat + +Good news: I got an email from Ripclaw from Rock Linux who told me that they are +going to integrate ncp. + +Please note that on recent IPv6 implementations, link-local addresses are not +valid without specifying an interface, so you can't npoll with a link-local +address on the command line. Standard npush/npoll now works with link-local +addresses, though. Due to Linux 2.4.0test brokenness, you currently can't npoll +from the same machine that runs npush. + +Since ncp is based on libdjb, it features full IPv6 support and the DNS resolver +is built in, i.e. no more security problems because of lame libc functions. + +I also provide a statically linked x86 Linux binary [sig] compressed with upx +which only weighs in at ~20k. I shrunk the binary with diet libc. + +npush will now use IPv6 and IPv4 multicast on the multicast groups +ff02::6e63:7030 (6e63:7030 == 'ncp0') and 224.110.99.112 (110.99.112 == 'ncp'). +If both methods fail, npush will resort to the broadcast packets used by +previous versions. You can force the broadcast method by passing "-b" to npush +so that previous npoll versions can see the announcements. + +"ncp" is a utility for copying files in a LAN. It has absolutely no security or +integrity checking, no throttling, no features, except one: you don't have to +type the coordinates of your peer. + +Please note that the DNS resolver does not use /etc/hosts (as that would not +work with IPv6 anyway), so you should have a properly configured DNS server. + +Basically it works like this: + 1. You and your buddy want to play Quake + 2. Your buddy has a level that you don't have + 3. He types npush filename and waits. npush sends out UDP announcement packets + proclaiming that someone wants to send something + 4. You type npoll. npoll waits until it sees one of these packets + 5. The files are copied with tar over a TCP socket, so permissions and file + dates (and if you are root, owners) are preserved. + +There are other usage modes. You can also use it like this: + + peer1$ ncp + peer2$ ncp peer1 file1 file2 file3 + +or like this: + + peer1$ npush file1 + peer2$ npoll peer1 diff --git a/network/ncp/ncp.SlackBuild b/network/ncp/ncp.SlackBuild new file mode 100644 index 0000000000..3163631086 --- /dev/null +++ b/network/ncp/ncp.SlackBuild @@ -0,0 +1,69 @@ +#!/bin/sh + +# Slackware build script for ncp + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=ncp +VERSION=${VERSION:-1.2.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" +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 . +chmod 644 * + +# We want symlinks, not hardlinks. +sed -i 's,ln -f,ln -s,' GNUmakefile + +# The libowfat detection stuff needs a little help... +make PREFIX=/usr CFLAGS="$SLKCFLAGS -Wl,-s -I/opt/diet/include/libowfat" +make install PREFIX=$PKG/usr +gzip $PKG/usr/man/man1/*.1 +ln -s npush.1.gz $PKG/usr/man/man1/npoll.1.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a NEWS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# Upstream doesn't include a README with the source, so here's the web page +# rendered as text (with links). +cat $CWD/README.upstream > $PKG/usr/doc/$PRGNAM-$VERSION/README + +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/network/ncp/ncp.info b/network/ncp/ncp.info new file mode 100644 index 0000000000..8da636b238 --- /dev/null +++ b/network/ncp/ncp.info @@ -0,0 +1,10 @@ +PRGNAM="ncp" +VERSION="1.2.4" +HOMEPAGE="http://www.fefe.de/ncp/" +DOWNLOAD="http://dl.fefe.de/ncp-1.2.4.tar.bz2" +MD5SUM="421c4855bd3148b7d0a4342942b4bf13" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libowfat" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/ncp/slack-desc b/network/ncp/slack-desc new file mode 100644 index 0000000000..4895444571 --- /dev/null +++ b/network/ncp/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------------------------------------------------------| +ncp: ncp (fast file copy tool for LANs) +ncp: +ncp: "ncp" is a utility for copying files in a LAN. It has absolutely no +ncp: security or integrity checking, no throttling, no features, except +ncp: one: you don't have to type the coordinates of your peer. +ncp: +ncp: +ncp: +ncp: +ncp: +ncp: diff --git a/network/neomutt/README b/network/neomutt/README index 6da5020cbc..44dbb59cb1 100644 --- a/network/neomutt/README +++ b/network/neomutt/README @@ -6,13 +6,14 @@ for selecting groups of messages. Optional dependencies: -* lua53 or lua52 - Powerful, fast, light-weight, embeddable scripting language * notmuch - fast mail indexer for maildir * kyotocabinet - straightforward implementation of DBM * libidn2 - GNU IDN Library version 2 +* lua53 - Powerful, fast, light-weight, embeddable scripting language + NOTE: this won't work if you have multiple versions of lua installed. This script builds neomutt without optional support -for notmuch, lua and kyotocabinet. +for idn2, notmuch, lua and kyotocabinet. You can be enabled with: -# USENOTMUCH=yes USELUA=yes USEKYOTO=yes USEIDN2:-yes ./neomutt.SlackBuild +# USENOTMUCH=yes USEKYOTO=yes USEIDN2=yes USELUA=yes ./neomutt.SlackBuild diff --git a/network/neomutt/doinst.sh b/network/neomutt/doinst.sh index 32e580cced..ab5c5595b5 100644 --- a/network/neomutt/doinst.sh +++ b/network/neomutt/doinst.sh @@ -14,3 +14,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 -t -f -q usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/network/neomutt/neomutt.SlackBuild b/network/neomutt/neomutt.SlackBuild index 67f0738f64..c0fc2c0cf3 100644 --- a/network/neomutt/neomutt.SlackBuild +++ b/network/neomutt/neomutt.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for neomutt # -# Copyright 2016-2018 Corrado Franco (http://conraid.net) +# Copyright 2016-2021 Corrado Franco (https://corradofranco.it) # All rights reserved. # # This program is free software: you can redistribute it and/or modify @@ -25,22 +25,20 @@ # # Latest version of this SlackBuild at https://github.com/conraid/SlackBuilds -set -eu - PRGNAM=neomutt -VERSION=${VERSION:-20180716} +VERSION=${VERSION:-20210205} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z ${ARCH:=""} ]; then case "$( uname -m )" in - i?86) ARCH=i686 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +cd $(dirname $0) ; CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -64,13 +62,14 @@ fi [ ${USENOTMUCH:-no} == 'yes' ] && NOTMUCH="--notmuch" || NOTMUCH="" [ ${USEIDN2:-no} == 'yes' ] && IDN2="--idn2 --disable-idn" || IDN2="" +set -eu + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$PRGNAM-$VERSION - +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -94,22 +93,26 @@ CXXFLAGS="$SLKCFLAGS" \ --gdbm \ --gpgme \ --locales-fix \ + --sqlite \ + --full-doc \ --host=$ARCH-slackware-linux \ --build=$ARCH-slackware-linux \ - $LUA $NOTMUCH $KYOTO $IDN2 + $NOTMUCH $KYOTO $IDN2 $LUA make make DESTDIR=$PKG install -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop +for i in 32 64 128 256; do + install -Dm644 contrib/logo/$PRGNAM-$i.png $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png +done + # Rename conf files mv $PKG/etc/$PRGNAM/neomuttrc $PKG/etc/$PRGNAM/neomuttrc.new @@ -120,8 +123,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -install -Dm644 $CWD/files/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop -install -Dm644 contrib/logo/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg - cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/neomutt/neomutt.info b/network/neomutt/neomutt.info index af4825ea8a..a0c239cdb8 100644 --- a/network/neomutt/neomutt.info +++ b/network/neomutt/neomutt.info @@ -1,8 +1,8 @@ PRGNAM="neomutt" -VERSION="20180716" +VERSION="20210205" HOMEPAGE="https://github.com/neomutt/neomutt" -DOWNLOAD="https://github.com/neomutt/neomutt/archive/neomutt-20180716.tar.gz" -MD5SUM="f628d1bcb31d36c926ed60f2105f742a" +DOWNLOAD="https://github.com/neomutt/neomutt/archive/20210205/neomutt-20210205.tar.gz" +MD5SUM="4d890c49634a71550292d128acab7f7a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/netcat-openbsd/README b/network/netcat-openbsd/README index 9431a830ae..09b5adca4e 100644 --- a/network/netcat-openbsd/README +++ b/network/netcat-openbsd/README @@ -1,16 +1,16 @@ -Netcat is a featured networking utility which reads and writes data across -network connections, using the TCP/IP protocol. +Netcat is a simple Unix utility which reads and writes data across +network connections, using the TCP or UDP protocol. -It is designed to be a reliable "back-end" tool that can be used directly -or easily driven by other programs and scripts. At the same time, it is a -feature-rich network debugging and exploration tool, since it can create -almost any kind of connection you would need and has several interesting -built-in capabilities. +It is designed to be a reliable "back-end" tool that can be used +directly or easily driven by other programs and scripts. At the same +time, it is a feature-rich network debugging and exploration tool, since +it can create almost any kind of connection you would need and has +several interesting built-in capabilities. -This package contains the OpenBSD rewrite of netcat, including support -for IPv6, proxies, and Unix sockets. The installed binary is named -"nc.openbsd" and the manpage is as well. +This package contains the OpenBSD rewrite of netcat, with Debian and +other patches, including support for IPv6, proxies, and Unix sockets. +The installed binary is named "nc.openbsd" and the manpage is as well. -BTW, this package conflicts with the netcat in slackware as it creates -a symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so +BTW, this package conflicts with the netcat in slackware as it creates a +symbolic link /usr/bin/nc (to let libvirt stuff work correctly), so remove netcat (nc) from your system before building/installing this. diff --git a/network/netcat-openbsd/netcat-openbsd.SlackBuild b/network/netcat-openbsd/netcat-openbsd.SlackBuild index c807a163db..c36b771854 100644 --- a/network/netcat-openbsd/netcat-openbsd.SlackBuild +++ b/network/netcat-openbsd/netcat-openbsd.SlackBuild @@ -2,6 +2,8 @@ # Slackware build script for netcat-openbsd # +# Copyright 2020 Duncan Roe, Melbourne, Australia +# Copyright 2020 Donald Cooley, South Haven, Indiana USA # Copyright 2010, 2014 Slax-Dude <jmfl {at} sapo [dot] pt> # All rights reserved. # @@ -23,15 +25,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=netcat-openbsd -VERSION=${VERSION:-1.105} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.217_1} +SRCVER=$(echo $VERSION | tr _ -) +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -DEBVER=7 - if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +43,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,9 +69,9 @@ 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 +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz +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 \) \ @@ -78,10 +79,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Apply Debian patches -for i in $CWD/patches/* ; do patch -p1 < $i ; done - -make CFLAGS="$SLKCFLAGS -DDEBIAN_VERSION=\"\\\"$DEBVER\\\"\"" +make CFLAGS="$SLKCFLAGS -DNETCAT_VERSION=\"\\\"$VERSION\\\"\"" mkdir -p $PKG/usr/bin/ $PKG/usr/man/man1/ install -s -m 0755 nc $PKG/usr/bin/nc.openbsd @@ -90,6 +88,7 @@ gzip -9c nc.1 > $PKG/usr/man/man1/nc.openbsd.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cp -a changelog copyright README* $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/netcat-openbsd/netcat-openbsd.info b/network/netcat-openbsd/netcat-openbsd.info index dc9b850460..9e6928ecd8 100644 --- a/network/netcat-openbsd/netcat-openbsd.info +++ b/network/netcat-openbsd/netcat-openbsd.info @@ -1,10 +1,10 @@ PRGNAM="netcat-openbsd" -VERSION="1.105" -HOMEPAGE="http://packages.debian.org/sid/netcat-openbsd" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/netcat-openbsd_1.105.orig.tar.gz" -MD5SUM="7e67b22f1ad41a1b7effbb59ff28fca1" +VERSION="1.217_1" +HOMEPAGE="https://github.com/duncan-roe/netcat-openbsd" +DOWNLOAD="https://github.com/duncan-roe/netcat-openbsd/archive/1.217-1/netcat-openbsd-1.217-1.tar.gz" +MD5SUM="8babccac46097ae5b746ffa00c01ac0f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% libbsd" -MAINTAINER="Slax-Dude" -EMAIL="jmfl@sapo.pt" +MAINTAINER="Duncan Roe" +EMAIL="duncan_roe@optusnet.com.au" diff --git a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch b/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch deleted file mode 100644 index 08567c7986..0000000000 --- a/network/netcat-openbsd/patches/0001-port-to-linux-with-libsd.patch +++ /dev/null @@ -1,475 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:59:31 +0800 -Subject: port to linux with libsd - ---- - Makefile | 17 ++++++++-- - nc.1 | 4 +-- - netcat.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- - socks.c | 46 +++++++++++++-------------- - 4 files changed, 130 insertions(+), 42 deletions(-) - -diff --git a/Makefile b/Makefile -index 150f829..96a6587 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,19 @@ --# $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ -+# $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ - - PROG= nc - SRCS= netcat.c atomicio.c socks.c - --.include <bsd.prog.mk> -+LIBS= `pkg-config --libs libbsd` -lresolv -+OBJS= $(SRCS:.c=.o) -+CFLAGS= -g -O2 -+LDFLAGS= -Wl,--no-add-needed -+ -+all: nc -+nc: $(OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o nc -+ -+$(OBJS): %.o: %.c -+ $(CC) $(CFLAGS) -c $< -o $@ -+ -+clean: -+ rm -f $(OBJS) nc -diff --git a/nc.1 b/nc.1 -index 75d1437..b7014a2 100644 ---- a/nc.1 -+++ b/nc.1 -@@ -146,9 +146,6 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present. - Specifies the source port - .Nm - should use, subject to privilege restrictions and availability. --It is an error to use this option in conjunction with the --.Fl l --option. - .It Fl r - Specifies that source and/or destination ports should be chosen randomly - instead of sequentially within a range or in the order that the system -@@ -170,6 +167,7 @@ Change IPv4 TOS value. - may be one of - .Ar critical , - .Ar inetcontrol , -+.Ar lowcost , - .Ar lowdelay , - .Ar netcontrol , - .Ar throughput , -diff --git a/netcat.c b/netcat.c -index cc4683a..9b2def2 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -42,6 +42,46 @@ - #include <netinet/ip.h> - #include <arpa/telnet.h> - -+#ifndef IPTOS_LOWDELAY -+# define IPTOS_LOWDELAY 0x10 -+# define IPTOS_THROUGHPUT 0x08 -+# define IPTOS_RELIABILITY 0x04 -+# define IPTOS_LOWCOST 0x02 -+# define IPTOS_MINCOST IPTOS_LOWCOST -+#endif /* IPTOS_LOWDELAY */ -+ -+# ifndef IPTOS_DSCP_AF11 -+# define IPTOS_DSCP_AF11 0x28 -+# define IPTOS_DSCP_AF12 0x30 -+# define IPTOS_DSCP_AF13 0x38 -+# define IPTOS_DSCP_AF21 0x48 -+# define IPTOS_DSCP_AF22 0x50 -+# define IPTOS_DSCP_AF23 0x58 -+# define IPTOS_DSCP_AF31 0x68 -+# define IPTOS_DSCP_AF32 0x70 -+# define IPTOS_DSCP_AF33 0x78 -+# define IPTOS_DSCP_AF41 0x88 -+# define IPTOS_DSCP_AF42 0x90 -+# define IPTOS_DSCP_AF43 0x98 -+# define IPTOS_DSCP_EF 0xb8 -+#endif /* IPTOS_DSCP_AF11 */ -+ -+#ifndef IPTOS_DSCP_CS0 -+# define IPTOS_DSCP_CS0 0x00 -+# define IPTOS_DSCP_CS1 0x20 -+# define IPTOS_DSCP_CS2 0x40 -+# define IPTOS_DSCP_CS3 0x60 -+# define IPTOS_DSCP_CS4 0x80 -+# define IPTOS_DSCP_CS5 0xa0 -+# define IPTOS_DSCP_CS6 0xc0 -+# define IPTOS_DSCP_CS7 0xe0 -+#endif /* IPTOS_DSCP_CS0 */ -+ -+#ifndef IPTOS_DSCP_EF -+# define IPTOS_DSCP_EF 0xb8 -+#endif /* IPTOS_DSCP_EF */ -+ -+ - #include <err.h> - #include <errno.h> - #include <netdb.h> -@@ -53,6 +93,8 @@ - #include <unistd.h> - #include <fcntl.h> - #include <limits.h> -+#include <bsd/stdlib.h> -+#include <bsd/string.h> - #include "atomicio.h" - - #ifndef SUN_LEN -@@ -118,7 +160,7 @@ main(int argc, char *argv[]) - struct servent *sv; - socklen_t len; - struct sockaddr_storage cliaddr; -- char *proxy; -+ char *proxy = NULL; - const char *errstr, *proxyhost = "", *proxyport = NULL; - struct addrinfo proxyhints; - char unix_dg_tmp_socket_buf[UNIX_DG_TMP_SOCKET_SIZE]; -@@ -164,7 +206,11 @@ main(int argc, char *argv[]) - errx(1, "interval %s: %s", errstr, optarg); - break; - case 'j': -+# if defined(SO_JUMBO) - jflag = 1; -+# else -+ errx(1, "no jumbo frame support available"); -+# endif - break; - case 'k': - kflag = 1; -@@ -194,10 +240,14 @@ main(int argc, char *argv[]) - uflag = 1; - break; - case 'V': -+# if defined(RT_TABLEID_MAX) - rtableid = (unsigned int)strtonum(optarg, 0, - RT_TABLEID_MAX, &errstr); - if (errstr) - errx(1, "rtable %s: %s", errstr, optarg); -+# else -+ errx(1, "no alternate routing table support available"); -+# endif - break; - case 'v': - vflag = 1; -@@ -232,7 +282,11 @@ main(int argc, char *argv[]) - errstr, optarg); - break; - case 'S': -+# if defined(TCP_MD5SIG) - Sflag = 1; -+# else -+ errx(1, "no TCP MD5 signature support available"); -+# endif - break; - case 'T': - errstr = NULL; -@@ -259,6 +313,15 @@ main(int argc, char *argv[]) - if (argv[0] && !argv[1] && family == AF_UNIX) { - host = argv[0]; - uport = NULL; -+ } else if (!argv[0] && lflag) { -+ if (sflag) -+ errx(1, "cannot use -s and -l"); -+ if (zflag) -+ errx(1, "cannot use -z and -l"); -+ if (pflag) -+ uport=pflag; -+ } else if (!lflag && kflag) { -+ errx(1, "cannot use -k without -l"); - } else if (argv[0] && !argv[1]) { - if (!lflag) - usage(1); -@@ -270,14 +333,7 @@ main(int argc, char *argv[]) - } else - usage(1); - -- if (lflag && sflag) -- errx(1, "cannot use -s and -l"); -- if (lflag && pflag) -- errx(1, "cannot use -p and -l"); -- if (lflag && zflag) -- errx(1, "cannot use -z and -l"); -- if (!lflag && kflag) -- errx(1, "must use -l with -k"); -+ - - /* Get name of temporary socket for unix datagram client */ - if ((family == AF_UNIX) && uflag && !lflag) { -@@ -286,8 +342,8 @@ main(int argc, char *argv[]) - } else { - strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX", - UNIX_DG_TMP_SOCKET_SIZE); -- if (mktemp(unix_dg_tmp_socket_buf) == NULL) -- err(1, "mktemp"); -+ if (mkstemp(unix_dg_tmp_socket_buf) == -1) -+ err(1, "mkstemp"); - unix_dg_tmp_socket = unix_dg_tmp_socket_buf; - } - } -@@ -563,18 +619,22 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - res0->ai_protocol)) < 0) - continue; - -+# if defined(RT_TABLEID_MAX) - if (rtableid) { - if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid, - sizeof(rtableid)) == -1) - err(1, "setsockopt SO_RTABLE"); - } -+# endif - - /* Bind to a local port or source address if specified. */ - if (sflag || pflag) { - struct addrinfo ahints, *ares; - -+# if defined (SO_BINDANY) - /* try SO_BINDANY, but don't insist */ - setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)); -+# endif - memset(&ahints, 0, sizeof(struct addrinfo)); - ahints.ai_family = res0->ai_family; - ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -@@ -674,15 +734,23 @@ local_listen(char *host, char *port, struct addrinfo hints) - res0->ai_protocol)) < 0) - continue; - -+# if defined(RT_TABLEID_MAX) - if (rtableid) { - if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid, - sizeof(rtableid)) == -1) - err(1, "setsockopt SO_RTABLE"); - } -+# endif -+ -+ ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x)); -+ if (ret == -1) -+ err(1, NULL); - -+# if defined(SO_REUSEPORT) - ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); - if (ret == -1) - err(1, NULL); -+# endif - - set_common_sockopts(s); - -@@ -886,21 +954,25 @@ set_common_sockopts(int s) - { - int x = 1; - -+# if defined(TCP_MD5SIG) - if (Sflag) { - if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, - &x, sizeof(x)) == -1) - err(1, NULL); - } -+# endif - if (Dflag) { - if (setsockopt(s, SOL_SOCKET, SO_DEBUG, - &x, sizeof(x)) == -1) - err(1, NULL); - } -+# if defined(SO_JUMBO) - if (jflag) { - if (setsockopt(s, SOL_SOCKET, SO_JUMBO, - &x, sizeof(x)) == -1) - err(1, NULL); - } -+# endif - if (Tflag != -1) { - if (setsockopt(s, IPPROTO_IP, IP_TOS, - &Tflag, sizeof(Tflag)) == -1) -@@ -949,6 +1021,7 @@ map_tos(char *s, int *val) - { "cs7", IPTOS_DSCP_CS7 }, - { "ef", IPTOS_DSCP_EF }, - { "inetcontrol", IPTOS_PREC_INTERNETCONTROL }, -+ { "lowcost", IPTOS_LOWCOST }, - { "lowdelay", IPTOS_LOWDELAY }, - { "netcontrol", IPTOS_PREC_NETCONTROL }, - { "reliability", IPTOS_RELIABILITY }, -@@ -969,6 +1042,9 @@ map_tos(char *s, int *val) - void - help(void) - { -+# if defined(DEBIAN_VERSION) -+ fprintf(stderr, "OpenBSD netcat (Debian patchlevel " DEBIAN_VERSION ")\n"); -+# endif - usage(0); - fprintf(stderr, "\tCommand Summary:\n\ - \t-4 Use IPv4\n\ -@@ -978,6 +1054,7 @@ help(void) - \t-h This help text\n\ - \t-I length TCP receive buffer length\n\ - \t-i secs\t Delay interval for lines sent, ports scanned\n\ -+ \t-j Use jumbo frame\n\ - \t-k Keep inbound sockets open for multiple connects\n\ - \t-l Listen mode, for inbound connects\n\ - \t-n Suppress name/port resolutions\n\ -@@ -998,15 +1075,15 @@ help(void) - \t-x addr[:port]\tSpecify proxy address and port\n\ - \t-z Zero-I/O mode [used for scanning]\n\ - Port numbers can be individual or ranges: lo-hi [inclusive]\n"); -- exit(1); -+ exit(0); - } - - void - usage(int ret) - { - fprintf(stderr, -- "usage: nc [-46DdhklnrStUuvz] [-I length] [-i interval] [-O length]\n" -- "\t [-P proxy_username] [-p source_port] [-s source] [-T ToS]\n" -+ "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n" -+ "\t [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n" - "\t [-V rtable] [-w timeout] [-X proxy_protocol]\n" - "\t [-x proxy_address[:port]] [destination] [port]\n"); - if (ret) -diff --git a/socks.c b/socks.c -index 71108d5..befd0a9 100644 ---- a/socks.c -+++ b/socks.c -@@ -38,7 +38,7 @@ - #include <string.h> - #include <unistd.h> - #include <resolv.h> --#include <readpassphrase.h> -+#include <bsd/readpassphrase.h> - #include "atomicio.h" - - #define SOCKS_PORT "1080" -@@ -167,11 +167,11 @@ socks_connect(const char *host, const char *port, - buf[2] = SOCKS_NOAUTH; - cnt = atomicio(vwrite, proxyfd, buf, 3); - if (cnt != 3) -- err(1, "write failed (%zu/3)", cnt); -+ err(1, "write failed (%zu/3)", (size_t)cnt); - - cnt = atomicio(read, proxyfd, buf, 2); - if (cnt != 2) -- err(1, "read failed (%zu/3)", cnt); -+ err(1, "read failed (%zu/3)", (size_t)cnt); - - if (buf[1] == SOCKS_NOMETHOD) - errx(1, "authentication method negotiation failed"); -@@ -220,23 +220,23 @@ socks_connect(const char *host, const char *port, - - cnt = atomicio(vwrite, proxyfd, buf, wlen); - if (cnt != wlen) -- err(1, "write failed (%zu/%zu)", cnt, wlen); -+ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); - - cnt = atomicio(read, proxyfd, buf, 4); - if (cnt != 4) -- err(1, "read failed (%zu/4)", cnt); -+ err(1, "read failed (%zu/4)", (size_t)cnt); - if (buf[1] != 0) - errx(1, "connection failed, SOCKS error %d", buf[1]); - switch (buf[3]) { - case SOCKS_IPV4: - cnt = atomicio(read, proxyfd, buf + 4, 6); - if (cnt != 6) -- err(1, "read failed (%d/6)", cnt); -+ err(1, "read failed (%lu/6)", (unsigned long)cnt); - break; - case SOCKS_IPV6: - cnt = atomicio(read, proxyfd, buf + 4, 18); - if (cnt != 18) -- err(1, "read failed (%d/18)", cnt); -+ err(1, "read failed (%lu/18)", (unsigned long)cnt); - break; - default: - errx(1, "connection failed, unsupported address type"); -@@ -256,11 +256,11 @@ socks_connect(const char *host, const char *port, - - cnt = atomicio(vwrite, proxyfd, buf, wlen); - if (cnt != wlen) -- err(1, "write failed (%zu/%zu)", cnt, wlen); -+ err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen); - - cnt = atomicio(read, proxyfd, buf, 8); - if (cnt != 8) -- err(1, "read failed (%zu/8)", cnt); -+ err(1, "read failed (%zu/8)", (size_t)cnt); - if (buf[1] != 90) - errx(1, "connection failed, SOCKS error %d", buf[1]); - } else if (socksv == -1) { -@@ -272,39 +272,39 @@ socks_connect(const char *host, const char *port, - - /* Try to be sane about numeric IPv6 addresses */ - if (strchr(host, ':') != NULL) { -- r = snprintf(buf, sizeof(buf), -+ r = snprintf((char*)buf, sizeof(buf), - "CONNECT [%s]:%d HTTP/1.0\r\n", - host, ntohs(serverport)); - } else { -- r = snprintf(buf, sizeof(buf), -+ r = snprintf((char*)buf, sizeof(buf), - "CONNECT %s:%d HTTP/1.0\r\n", - host, ntohs(serverport)); - } - if (r == -1 || (size_t)r >= sizeof(buf)) - errx(1, "hostname too long"); -- r = strlen(buf); -+ r = strlen((char*)buf); - - cnt = atomicio(vwrite, proxyfd, buf, r); - if (cnt != r) -- err(1, "write failed (%zu/%d)", cnt, r); -+ err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r); - - if (authretry > 1) { - char resp[1024]; - - proxypass = getproxypass(proxyuser, proxyhost); -- r = snprintf(buf, sizeof(buf), "%s:%s", -+ r = snprintf((char*)buf, sizeof(buf), "%s:%s", - proxyuser, proxypass); - if (r == -1 || (size_t)r >= sizeof(buf) || -- b64_ntop(buf, strlen(buf), resp, -+ b64_ntop(buf, strlen((char*)buf), resp, - sizeof(resp)) == -1) - errx(1, "Proxy username/password too long"); -- r = snprintf(buf, sizeof(buf), "Proxy-Authorization: " -+ r = snprintf((char*)buf, sizeof((char*)buf), "Proxy-Authorization: " - "Basic %s\r\n", resp); - if (r == -1 || (size_t)r >= sizeof(buf)) - errx(1, "Proxy auth response too long"); -- r = strlen(buf); -+ r = strlen((char*)buf); - if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r) -- err(1, "write failed (%zu/%d)", cnt, r); -+ err(1, "write failed (%zu/%d)", (size_t)cnt, r); - } - - /* Terminate headers */ -@@ -312,22 +312,22 @@ socks_connect(const char *host, const char *port, - err(1, "write failed (2/%d)", r); - - /* Read status reply */ -- proxy_read_line(proxyfd, buf, sizeof(buf)); -+ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); - if (proxyuser != NULL && -- strncmp(buf, "HTTP/1.0 407 ", 12) == 0) { -+ strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) { - if (authretry > 1) { - fprintf(stderr, "Proxy authentication " - "failed\n"); - } - close(proxyfd); - goto again; -- } else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 && -- strncmp(buf, "HTTP/1.1 200 ", 12) != 0) -+ } else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 && -+ strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0) - errx(1, "Proxy error: \"%s\"", buf); - - /* Headers continue until we hit an empty line */ - for (r = 0; r < HTTP_MAXHDRS; r++) { -- proxy_read_line(proxyfd, buf, sizeof(buf)); -+ proxy_read_line(proxyfd, (char*)buf, sizeof(buf)); - if (*buf == '\0') - break; - } --- diff --git a/network/netcat-openbsd/patches/0002-connect-timeout.patch b/network/netcat-openbsd/patches/0002-connect-timeout.patch deleted file mode 100644 index 30d1d550e1..0000000000 --- a/network/netcat-openbsd/patches/0002-connect-timeout.patch +++ /dev/null @@ -1,121 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 14:43:56 +0800 -Subject: connect timeout - ---- - netcat.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 75 insertions(+), 2 deletions(-) - -diff --git a/netcat.c b/netcat.c -index 9b2def2..f3cc8c1 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -106,6 +106,10 @@ - #define PORT_MAX_LEN 6 - #define UNIX_DG_TMP_SOCKET_SIZE 19 - -+#define CONNECTION_SUCCESS 0 -+#define CONNECTION_FAILED 1 -+#define CONNECTION_TIMEOUT 2 -+ - /* Command Line Options */ - int dflag; /* detached, no stdin */ - unsigned int iflag; /* Interval Flag */ -@@ -151,6 +155,9 @@ void set_common_sockopts(int); - int map_tos(char *, int *); - void usage(int); - -+static int connect_with_timeout(int fd, const struct sockaddr *sa, -+ socklen_t salen, int ctimeout); -+ - int - main(int argc, char *argv[]) - { -@@ -651,11 +658,14 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - - set_common_sockopts(s); - -- if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0) -+ if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) - break; -- else if (vflag) -+ else if (vflag && error == CONNECTION_FAILED) - warn("connect to %s port %s (%s) failed", host, port, - uflag ? "udp" : "tcp"); -+ else if (vflag && error == CONNECTION_TIMEOUT) -+ warn("connect to %s port %s (%s) timed out", host, port, -+ uflag ? "udp" : "tcp"); - - close(s); - s = -1; -@@ -703,6 +713,69 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen) - return (ret); - } - -+static int connect_with_timeout(int fd, const struct sockaddr *sa, -+ socklen_t salen, int ctimeout) -+{ -+ int err; -+ struct timeval tv, *tvp = NULL; -+ fd_set connect_fdset; -+ socklen_t len; -+ int orig_flags; -+ -+ orig_flags = fcntl(fd, F_GETFL, 0); -+ if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) { -+ warn("can't set O_NONBLOCK - timeout not available"); -+ if (connect(fd, sa, salen) == 0) -+ return CONNECTION_SUCCESS; -+ else -+ return CONNECTION_FAILED; -+ } -+ -+ /* set connect timeout */ -+ if (ctimeout > 0) { -+ tv.tv_sec = (time_t)ctimeout/1000; -+ tv.tv_usec = 0; -+ tvp = &tv; -+ } -+ -+ /* attempt the connection */ -+ err = connect(fd, sa, salen); -+ if (err != 0 && errno == EINPROGRESS) { -+ /* connection is proceeding -+ * it is complete (or failed) when select returns */ -+ -+ /* initialize connect_fdset */ -+ FD_ZERO(&connect_fdset); -+ FD_SET(fd, &connect_fdset); -+ -+ /* call select */ -+ do { -+ err = select(fd + 1, NULL, &connect_fdset, -+ NULL, tvp); -+ } while (err < 0 && errno == EINTR); -+ -+ /* select error */ -+ if (err < 0) -+ errx(1,"select error: %s", strerror(errno)); -+ /* we have reached a timeout */ -+ if (err == 0) -+ return CONNECTION_TIMEOUT; -+ /* select returned successfully, but we must test socket -+ * error for result */ -+ len = sizeof(err); -+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0) -+ errx(1, "getsockopt error: %s", strerror(errno)); -+ /* setup errno according to the result returned by -+ * getsockopt */ -+ if (err != 0) -+ errno = err; -+ } -+ -+ /* return aborted if an error occured, and valid otherwise */ -+ fcntl(fd, F_SETFL, orig_flags); -+ return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS; -+} -+ - /* - * local_listen() - * Returns a socket listening on a local port, binds to specified source --- diff --git a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch b/network/netcat-openbsd/patches/0003-get-sev-by-name.patch deleted file mode 100644 index 1d1cca8a46..0000000000 --- a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 14:45:08 +0800 -Subject: get sev by name - ---- - netcat.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/netcat.c b/netcat.c -index f3cc8c1..d912544 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -949,12 +949,19 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) - void - build_ports(char *p) - { -+ struct servent *sv; - const char *errstr; - char *n; - int hi, lo, cp; - int x = 0; - -- if ((n = strchr(p, '-')) != NULL) { -+ sv = getservbyname(p, uflag ? "udp" : "tcp"); -+ if (sv) { -+ portlist[0] = calloc(1, PORT_MAX_LEN); -+ if (portlist[0] == NULL) -+ err(1, NULL); -+ snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port)); -+ } else if ((n = strchr(p, '-')) != NULL) { - *n = '\0'; - n++; - --- diff --git a/network/netcat-openbsd/patches/0004-poll-hup.patch b/network/netcat-openbsd/patches/0004-poll-hup.patch deleted file mode 100644 index 14923cbfa2..0000000000 --- a/network/netcat-openbsd/patches/0004-poll-hup.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:08:33 +0800 -Subject: poll hup - ---- - netcat.c | 24 +++++++++++++++++------- - 1 file changed, 17 insertions(+), 7 deletions(-) - -diff --git a/netcat.c b/netcat.c -index d912544..fdaca44 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -884,9 +884,7 @@ readwrite(int nfd) - if ((n = read(nfd, buf, plen)) < 0) - return; - else if (n == 0) { -- shutdown(nfd, SHUT_RD); -- pfd[0].fd = -1; -- pfd[0].events = 0; -+ goto shutdown_rd; - } else { - if (tflag) - atelnet(nfd, buf, n); -@@ -894,18 +892,30 @@ readwrite(int nfd) - return; - } - } -+ else if (pfd[0].revents & POLLHUP) { -+ shutdown_rd: -+ shutdown(nfd, SHUT_RD); -+ pfd[0].fd = -1; -+ pfd[0].events = 0; -+ } - -- if (!dflag && pfd[1].revents & POLLIN) { -+ if (!dflag) { -+ if(pfd[1].revents & POLLIN) { - if ((n = read(wfd, buf, plen)) < 0) - return; - else if (n == 0) { -- shutdown(nfd, SHUT_WR); -- pfd[1].fd = -1; -- pfd[1].events = 0; -+ goto shutdown_wr; - } else { - if (atomicio(vwrite, nfd, buf, n) != n) - return; - } -+ } -+ else if (pfd[1].revents & POLLHUP) { -+ shutdown_wr: -+ shutdown(nfd, SHUT_WR); -+ pfd[1].fd = -1; -+ pfd[1].events = 0; -+ } - } - } - } --- diff --git a/network/netcat-openbsd/patches/0005-send-crlf.patch b/network/netcat-openbsd/patches/0005-send-crlf.patch deleted file mode 100644 index 1a5fc6eeb8..0000000000 --- a/network/netcat-openbsd/patches/0005-send-crlf.patch +++ /dev/null @@ -1,108 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 14:57:45 +0800 -Subject: send crlf - ---- - nc.1 | 6 ++++-- - netcat.c | 21 +++++++++++++++++---- - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/nc.1 b/nc.1 -index b7014a2..af44976 100644 ---- a/nc.1 -+++ b/nc.1 -@@ -34,7 +34,7 @@ - .Sh SYNOPSIS - .Nm nc - .Bk -words --.Op Fl 46DdhklnrStUuvz -+.Op Fl 46CDdhklnrStUuvz - .Op Fl I Ar length - .Op Fl i Ar interval - .Op Fl O Ar length -@@ -98,6 +98,8 @@ to use IPv4 addresses only. - Forces - .Nm - to use IPv6 addresses only. -+.It Fl C -+Send CRLF as line-ending. - .It Fl D - Enable debugging on the socket. - .It Fl d -@@ -355,7 +357,7 @@ More complicated examples can be built up when the user knows the format - of requests required by the server. - As another example, an email may be submitted to an SMTP server using: - .Bd -literal -offset indent --$ nc localhost 25 \*(Lt\*(Lt EOF -+$ nc [\-C] localhost 25 \*(Lt\*(Lt EOF - HELO host.example.com - MAIL FROM:\*(Ltuser@host.example.com\*(Gt - RCPT TO:\*(Ltuser2@host.example.com\*(Gt -diff --git a/netcat.c b/netcat.c -index fdaca44..4f4d2bf 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -111,6 +111,7 @@ - #define CONNECTION_TIMEOUT 2 - - /* Command Line Options */ -+int Cflag = 0; /* CRLF line-ending */ - int dflag; /* detached, no stdin */ - unsigned int iflag; /* Interval Flag */ - int jflag; /* use jumbo frames if we can */ -@@ -180,7 +181,7 @@ main(int argc, char *argv[]) - sv = NULL; - - while ((ch = getopt(argc, argv, -- "46DdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) { -+ "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) { - switch (ch) { - case '4': - family = AF_INET; -@@ -309,6 +310,9 @@ main(int argc, char *argv[]) - if (Tflag < 0 || Tflag > 255 || errstr || errno) - errx(1, "illegal tos value %s", optarg); - break; -+ case 'C': -+ Cflag = 1; -+ break; - default: - usage(1); - } -@@ -906,8 +910,16 @@ readwrite(int nfd) - else if (n == 0) { - goto shutdown_wr; - } else { -- if (atomicio(vwrite, nfd, buf, n) != n) -- return; -+ if ((Cflag) && (buf[n-1]=='\n')) { -+ if (atomicio(vwrite, nfd, buf, n-1) != (n-1)) -+ return; -+ if (atomicio(vwrite, nfd, "\r\n", 2) != 2) -+ return; -+ } -+ else { -+ if (atomicio(vwrite, nfd, buf, n) != n) -+ return; -+ } - } - } - else if (pfd[1].revents & POLLHUP) { -@@ -1139,6 +1151,7 @@ help(void) - fprintf(stderr, "\tCommand Summary:\n\ - \t-4 Use IPv4\n\ - \t-6 Use IPv6\n\ -+ \t-C Send CRLF as line-ending\n\ - \t-D Enable the debug socket option\n\ - \t-d Detach from stdin\n\ - \t-h This help text\n\ -@@ -1172,7 +1185,7 @@ void - usage(int ret) - { - fprintf(stderr, -- "usage: nc [-46DdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n" -+ "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n" - "\t [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n" - "\t [-V rtable] [-w timeout] [-X proxy_protocol]\n" - "\t [-x proxy_address[:port]] [destination] [port]\n"); --- diff --git a/network/netcat-openbsd/patches/0006-quit-timer.patch b/network/netcat-openbsd/patches/0006-quit-timer.patch deleted file mode 100644 index 40d6a2a3a5..0000000000 --- a/network/netcat-openbsd/patches/0006-quit-timer.patch +++ /dev/null @@ -1,133 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:16:04 +0800 -Subject: quit timer - ---- - nc.1 | 5 +++++ - netcat.c | 38 +++++++++++++++++++++++++++++++++----- - 2 files changed, 38 insertions(+), 5 deletions(-) - -diff --git a/nc.1 b/nc.1 -index af44976..0d92b74 100644 ---- a/nc.1 -+++ b/nc.1 -@@ -40,6 +40,7 @@ - .Op Fl O Ar length - .Op Fl P Ar proxy_username - .Op Fl p Ar source_port -+.Op Fl q Ar seconds - .Op Fl s Ar source - .Op Fl T Ar toskeyword - .Op Fl V Ar rtable -@@ -148,6 +149,10 @@ Proxy authentication is only supported for HTTP CONNECT proxies at present. - Specifies the source port - .Nm - should use, subject to privilege restrictions and availability. -+.It Fl q Ar seconds -+after EOF on stdin, wait the specified number of seconds and then quit. If -+.Ar seconds -+is negative, wait forever. - .It Fl r - Specifies that source and/or destination ports should be chosen randomly - instead of sequentially within a range or in the order that the system -diff --git a/netcat.c b/netcat.c -index 4f4d2bf..29ecf1a 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -86,6 +86,7 @@ - #include <errno.h> - #include <netdb.h> - #include <poll.h> -+#include <signal.h> - #include <stdarg.h> - #include <stdio.h> - #include <stdlib.h> -@@ -120,6 +121,7 @@ int lflag; /* Bind to local port */ - int nflag; /* Don't do name look up */ - char *Pflag; /* Proxy username */ - char *pflag; /* Localport flag */ -+int qflag = 0; /* Quit after some secs */ - int rflag; /* Random ports flag */ - char *sflag; /* Source Address */ - int tflag; /* Telnet Emulation */ -@@ -158,6 +160,7 @@ void usage(int); - - static int connect_with_timeout(int fd, const struct sockaddr *sa, - socklen_t salen, int ctimeout); -+static void quit(); - - int - main(int argc, char *argv[]) -@@ -181,7 +184,7 @@ main(int argc, char *argv[]) - sv = NULL; - - while ((ch = getopt(argc, argv, -- "46CDdhI:i:jklnO:P:p:rSs:tT:UuV:vw:X:x:z")) != -1) { -+ "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) { - switch (ch) { - case '4': - family = AF_INET; -@@ -235,6 +238,11 @@ main(int argc, char *argv[]) - case 'p': - pflag = optarg; - break; -+ case 'q': -+ qflag = strtonum(optarg, INT_MIN, INT_MAX, &errstr); -+ if (errstr) -+ errx(1, "quit timer %s: %s", errstr, optarg); -+ break; - case 'r': - rflag = 1; - break; -@@ -924,9 +932,18 @@ readwrite(int nfd) - } - else if (pfd[1].revents & POLLHUP) { - shutdown_wr: -+ /* if the user asked to exit on EOF, do it */ -+ if (qflag == 0) { - shutdown(nfd, SHUT_WR); -- pfd[1].fd = -1; -- pfd[1].events = 0; -+ close(wfd); -+ } -+ /* if user asked to die after a while, arrange for it */ -+ if (qflag > 0) { -+ signal(SIGALRM, quit); -+ alarm(qflag); -+ } -+ pfd[1].fd = -1; -+ pfd[1].events = 0; - } - } - } -@@ -1164,6 +1181,7 @@ help(void) - \t-O length TCP send buffer length\n\ - \t-P proxyuser\tUsername for proxy authentication\n\ - \t-p port\t Specify local port for remote connects\n\ -+ \t-q secs\t quit after EOF on stdin and delay of secs\n\ - \t-r Randomize remote ports\n\ - \t-S Enable the TCP MD5 signature option\n\ - \t-s addr\t Local source address\n\ -@@ -1186,9 +1204,19 @@ usage(int ret) - { - fprintf(stderr, - "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n" -- "\t [-P proxy_username] [-p source_port] [-s source] [-T toskeyword]\n" -- "\t [-V rtable] [-w timeout] [-X proxy_protocol]\n" -+ "\t [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n" -+ "\t [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n" - "\t [-x proxy_address[:port]] [destination] [port]\n"); - if (ret) - exit(1); - } -+ -+/* -+ * quit() -+ * handler for a "-q" timeout (exit 0 instead of 1) -+ */ -+static void quit() -+{ -+ /* XXX: should explicitly close fds here */ -+ exit(0); -+} --- diff --git a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch b/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch deleted file mode 100644 index c63775a495..0000000000 --- a/network/netcat-openbsd/patches/0007-udp-scan-timeout.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:29:37 +0800 -Subject: udp scan timeout - ---- - netcat.c | 25 ++++++++++++++++--------- - 1 file changed, 16 insertions(+), 9 deletions(-) - -diff --git a/netcat.c b/netcat.c -index 29ecf1a..baab909 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -111,6 +111,8 @@ - #define CONNECTION_FAILED 1 - #define CONNECTION_TIMEOUT 2 - -+#define UDP_SCAN_TIMEOUT 3 /* Seconds */ -+ - /* Command Line Options */ - int Cflag = 0; /* CRLF line-ending */ - int dflag; /* detached, no stdin */ -@@ -497,7 +499,7 @@ main(int argc, char *argv[]) - continue; - - ret = 0; -- if (vflag || zflag) { -+ if (vflag) { - /* For UDP, make sure we are connected. */ - if (uflag) { - if (udptest(s) == -1) { -@@ -1057,15 +1059,20 @@ build_ports(char *p) - int - udptest(int s) - { -- int i, ret; -- -- for (i = 0; i <= 3; i++) { -- if (write(s, "X", 1) == 1) -- ret = 1; -- else -- ret = -1; -+ int i, t; -+ -+ if ((write(s, "X", 1) != 1) || -+ ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED))) -+ return -1; -+ -+ /* Give the remote host some time to reply. */ -+ for (i = 0, t = (timeout == -1) ? UDP_SCAN_TIMEOUT : (timeout / 1000); -+ i < t; i++) { -+ sleep(1); -+ if ((write(s, "X", 1) != 1) && (errno == ECONNREFUSED)) -+ return -1; - } -- return (ret); -+ return 1; - } - - void --- diff --git a/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch b/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch deleted file mode 100644 index fa1cf991a0..0000000000 --- a/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:38:15 +0800 -Subject: verbose numeric port - ---- - netcat.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 55 insertions(+), 4 deletions(-) - -diff --git a/netcat.c b/netcat.c -index baab909..eb3453e 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -41,6 +41,7 @@ - #include <netinet/tcp.h> - #include <netinet/ip.h> - #include <arpa/telnet.h> -+#include <arpa/inet.h> - - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 -@@ -424,6 +425,18 @@ main(int argc, char *argv[]) - s = local_listen(host, uport, hints); - if (s < 0) - err(1, NULL); -+ -+ char* local; -+ if (family == AF_INET6 -+ local = "0.0.0.0"; -+ else if (family == AF_INET) -+ local = ":::"; -+ else -+ local = "unknown" -+ fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", -+ host ?: local, -+ family, -+ *uport); - /* - * For UDP, we will use recvfrom() initially - * to wait for a caller, then use the regular -@@ -432,16 +445,15 @@ main(int argc, char *argv[]) - if (uflag) { - int rv, plen; - char buf[16384]; -- struct sockaddr_storage z; - -- len = sizeof(z); -+ len = sizeof(cliaddr); - plen = jflag ? 16384 : 2048; - rv = recvfrom(s, buf, plen, MSG_PEEK, -- (struct sockaddr *)&z, &len); -+ (struct sockaddr *)&cliaddr, &len); - if (rv < 0) - err(1, "recvfrom"); - -- rv = connect(s, (struct sockaddr *)&z, len); -+ rv = connect(s, (struct sockaddr *)&cliaddr, len); - if (rv < 0) - err(1, "connect"); - -@@ -450,6 +462,45 @@ main(int argc, char *argv[]) - len = sizeof(cliaddr); - connfd = accept(s, (struct sockaddr *)&cliaddr, - &len); -+ if(vflag) { -+ /* Don't look up port if -n. */ -+ if (nflag) -+ sv = NULL; -+ else -+ sv = getservbyport(ntohs(atoi(uport)), -+ uflag ? "udp" : "tcp"); -+ -+ if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) { -+ char dst[INET_ADDRSTRLEN]; -+ inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN); -+ fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", -+ dst, -+ uport, -+ uflag ? "udp" : "tcp", -+ sv ? sv->s_name : "*", -+ ((struct sockaddr *)(&cliaddr))->sa_family, -+ ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -+ } -+ else if(((struct sockaddr *)&cliaddr)->sa_family == AF_INET6) { -+ char dst[INET6_ADDRSTRLEN]; -+ inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN); -+ fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", -+ dst, -+ uport, -+ uflag ? "udp" : "tcp", -+ sv ? sv->s_name : "*", -+ ((struct sockaddr *)&cliaddr)->sa_family, -+ ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port)); -+ } -+ else { -+ fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n", -+ uport, -+ uflag ? "udp" : "tcp", -+ sv ? sv->s_name : "*", -+ ((struct sockaddr *)(&cliaddr))->sa_family, -+ ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -+ } -+ } - readwrite(connfd); - close(connfd); - } --- diff --git a/network/netcat-openbsd/patches/0009-dccp-support.patch b/network/netcat-openbsd/patches/0009-dccp-support.patch deleted file mode 100644 index 3a81b4b5ce..0000000000 --- a/network/netcat-openbsd/patches/0009-dccp-support.patch +++ /dev/null @@ -1,304 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:56:51 +0800 -Subject: dccp support - ---- - nc.1 | 4 ++- - netcat.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ - 2 files changed, 93 insertions(+), 22 deletions(-) - -diff --git a/nc.1 b/nc.1 -index 0d92b74..60e3668 100644 ---- a/nc.1 -+++ b/nc.1 -@@ -34,7 +34,7 @@ - .Sh SYNOPSIS - .Nm nc - .Bk -words --.Op Fl 46CDdhklnrStUuvz -+.Op Fl 46CDdhklnrStUuvZz - .Op Fl I Ar length - .Op Fl i Ar interval - .Op Fl O Ar length -@@ -257,6 +257,8 @@ If - .Ar port - is not specified, the well-known port for the proxy protocol is used (1080 - for SOCKS, 3128 for HTTPS). -+.It Fl Z -+DCCP mode. - .It Fl z - Specifies that - .Nm -diff --git a/netcat.c b/netcat.c -index eb3453e..56cc15e 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -129,6 +129,7 @@ int rflag; /* Random ports flag */ - char *sflag; /* Source Address */ - int tflag; /* Telnet Emulation */ - int uflag; /* UDP - Default to TCP */ -+int dccpflag; /* DCCP - Default to TCP */ - int vflag; /* Verbosity */ - int xflag; /* Socks proxy */ - int zflag; /* Port Scan Flag */ -@@ -160,6 +161,7 @@ int unix_listen(char *); - void set_common_sockopts(int); - int map_tos(char *, int *); - void usage(int); -+char *proto_name(int uflag, int dccpflag); - - static int connect_with_timeout(int fd, const struct sockaddr *sa, - socklen_t salen, int ctimeout); -@@ -187,7 +189,7 @@ main(int argc, char *argv[]) - sv = NULL; - - while ((ch = getopt(argc, argv, -- "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) { -+ "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) { - switch (ch) { - case '4': - family = AF_INET; -@@ -258,6 +260,13 @@ main(int argc, char *argv[]) - case 'u': - uflag = 1; - break; -+ case 'Z': -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ dccpflag = 1; -+# else -+ errx(1, "no DCCP support available"); -+# endif -+ break; - case 'V': - # if defined(RT_TABLEID_MAX) - rtableid = (unsigned int)strtonum(optarg, 0, -@@ -333,6 +342,12 @@ main(int argc, char *argv[]) - - /* Cruft to make sure options are clean, and used properly. */ - if (argv[0] && !argv[1] && family == AF_UNIX) { -+ if (uflag) -+ errx(1, "cannot use -u and -U"); -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ if (dccpflag) -+ errx(1, "cannot use -Z and -U"); -+# endif - host = argv[0]; - uport = NULL; - } else if (!argv[0] && lflag) { -@@ -374,8 +389,20 @@ main(int argc, char *argv[]) - if (family != AF_UNIX) { - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = family; -- hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -- hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP; -+ if (uflag) { -+ hints.ai_socktype = SOCK_DGRAM; -+ hints.ai_protocol = IPPROTO_UDP; -+ } -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ else if (dccpflag) { -+ hints.ai_socktype = SOCK_DCCP; -+ hints.ai_protocol = IPPROTO_DCCP; -+ } -+# endif -+ else { -+ hints.ai_socktype = SOCK_STREAM; -+ hints.ai_protocol = IPPROTO_TCP; -+ } - if (nflag) - hints.ai_flags |= AI_NUMERICHOST; - } -@@ -383,7 +410,10 @@ main(int argc, char *argv[]) - if (xflag) { - if (uflag) - errx(1, "no proxy support for UDP mode"); -- -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ if (dccpflag) -+ errx(1, "no proxy support for DCCP mode"); -+# endif - if (lflag) - errx(1, "no proxy support for listen"); - -@@ -427,12 +457,12 @@ main(int argc, char *argv[]) - err(1, NULL); - - char* local; -- if (family == AF_INET6 -+ if (family == AF_INET6 ) - local = "0.0.0.0"; - else if (family == AF_INET) - local = ":::"; - else -- local = "unknown" -+ local = "unknown"; - fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", - host ?: local, - family, -@@ -463,12 +493,13 @@ main(int argc, char *argv[]) - connfd = accept(s, (struct sockaddr *)&cliaddr, - &len); - if(vflag) { -+ char *proto = proto_name(uflag, dccpflag); - /* Don't look up port if -n. */ - if (nflag) - sv = NULL; - else - sv = getservbyport(ntohs(atoi(uport)), -- uflag ? "udp" : "tcp"); -+ proto); - - if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) { - char dst[INET_ADDRSTRLEN]; -@@ -476,7 +507,7 @@ main(int argc, char *argv[]) - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, - uport, -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, - ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -@@ -487,7 +518,7 @@ main(int argc, char *argv[]) - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, - uport, -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)&cliaddr)->sa_family, - ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port)); -@@ -495,7 +526,7 @@ main(int argc, char *argv[]) - else { - fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n", - uport, -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, - ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -@@ -559,19 +590,20 @@ main(int argc, char *argv[]) - } - } - -+ char *proto = proto_name(uflag, dccpflag); - /* Don't look up port if -n. */ - if (nflag) - sv = NULL; - else { - sv = getservbyport( - ntohs(atoi(portlist[i])), -- uflag ? "udp" : "tcp"); -+ proto); - } - - fprintf(stderr, - "Connection to %s %s port [%s/%s] " - "succeeded!\n", host, portlist[i], -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*"); - } - if (!zflag) -@@ -671,6 +703,24 @@ unix_listen(char *path) - return (s); - } - -+char *proto_name(uflag, dccpflag) { -+ -+ char *proto = NULL; -+ if (uflag) { -+ proto = "udp"; -+ } -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ else if (dccpflag) { -+ proto = "dccp"; -+ } -+# endif -+ else { -+ proto = "tcp"; -+ } -+ -+ return proto; -+} -+ - /* - * remote_connect() - * Returns a socket connected to a remote host. Properly binds to a local -@@ -709,8 +759,21 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - # endif - memset(&ahints, 0, sizeof(struct addrinfo)); - ahints.ai_family = res0->ai_family; -- ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -- ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP; -+ if (uflag) { -+ ahints.ai_socktype = SOCK_DGRAM; -+ ahints.ai_protocol = IPPROTO_UDP; -+ -+ } -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ else if (dccpflag) { -+ hints.ai_socktype = SOCK_DCCP; -+ hints.ai_protocol = IPPROTO_DCCP; -+ } -+# endif -+ else { -+ ahints.ai_socktype = SOCK_STREAM; -+ ahints.ai_protocol = IPPROTO_TCP; -+ } - ahints.ai_flags = AI_PASSIVE; - if ((error = getaddrinfo(sflag, pflag, &ahints, &ares))) - errx(1, "getaddrinfo: %s", gai_strerror(error)); -@@ -722,15 +785,19 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - } - - set_common_sockopts(s); -+ char *proto = proto_name(uflag, dccpflag); - -- if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) -+ if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) { - break; -- else if (vflag && error == CONNECTION_FAILED) -+ } -+ else if (vflag && error == CONNECTION_FAILED) { - warn("connect to %s port %s (%s) failed", host, port, -- uflag ? "udp" : "tcp"); -- else if (vflag && error == CONNECTION_TIMEOUT) -+ proto); -+ } -+ else if (vflag && error == CONNECTION_TIMEOUT) { - warn("connect to %s port %s (%s) timed out", host, port, -- uflag ? "udp" : "tcp"); -+ proto); -+ } - - close(s); - s = -1; -@@ -1047,7 +1114,8 @@ build_ports(char *p) - int hi, lo, cp; - int x = 0; - -- sv = getservbyname(p, uflag ? "udp" : "tcp"); -+ char *proto = proto_name(uflag, dccpflag); -+ sv = getservbyname(p, proto); - if (sv) { - portlist[0] = calloc(1, PORT_MAX_LEN); - if (portlist[0] == NULL) -@@ -1252,6 +1320,7 @@ help(void) - \t-w secs\t Timeout for connects and final net reads\n\ - \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ - \t-x addr[:port]\tSpecify proxy address and port\n\ -+ \t-Z DCCP mode\n\ - \t-z Zero-I/O mode [used for scanning]\n\ - Port numbers can be individual or ranges: lo-hi [inclusive]\n"); - exit(0); -@@ -1261,7 +1330,7 @@ void - usage(int ret) - { - fprintf(stderr, -- "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n" -+ "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n" - "\t [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n" - "\t [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n" - "\t [-x proxy_address[:port]] [destination] [port]\n"); --- diff --git a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch b/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch deleted file mode 100644 index 0d3ea68b96..0000000000 --- a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Tue, 14 Feb 2012 23:02:00 +0800 -Subject: serialized handling multiple clients - ---- - netcat.c | 39 +++++++++++++++++++-------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) - -diff --git a/netcat.c b/netcat.c -index 56cc15e..bf9940f 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -447,26 +447,24 @@ main(int argc, char *argv[]) - s = unix_bind(host); - else - s = unix_listen(host); -- } -+ } else -+ s = local_listen(host, uport, hints); -+ if (s < 0) -+ err(1, NULL); -+ -+ char* local; -+ if (family == AF_INET6) -+ local = ":::"; -+ else -+ local = "0.0.0.0"; -+ fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", -+ host ?: local, -+ family, -+ *uport); - - /* Allow only one connection at a time, but stay alive. */ - for (;;) { -- if (family != AF_UNIX) -- s = local_listen(host, uport, hints); -- if (s < 0) -- err(1, NULL); - -- char* local; -- if (family == AF_INET6 ) -- local = "0.0.0.0"; -- else if (family == AF_INET) -- local = ":::"; -- else -- local = "unknown"; -- fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", -- host ?: local, -- family, -- *uport); - /* - * For UDP, we will use recvfrom() initially - * to wait for a caller, then use the regular -@@ -536,15 +534,16 @@ main(int argc, char *argv[]) - close(connfd); - } - -- if (family != AF_UNIX) -+ if (kflag) -+ continue; -+ if (family != AF_UNIX) { - close(s); -+ } - else if (uflag) { - if (connect(s, NULL, 0) < 0) - err(1, "connect"); - } -- -- if (!kflag) -- break; -+ break; - } - } else if (family == AF_UNIX) { - ret = 0; --- diff --git a/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch b/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch deleted file mode 100644 index 3ed0523cff..0000000000 --- a/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch +++ /dev/null @@ -1,457 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 19:06:52 +0800 -Subject: misc connection failures - ---- - nc.1 | 76 ++++++++++++++++++++++++++++++++++++--- - netcat.c | 119 ++++++++++++++++++++++++++++++++++++++++++-------------------- - 2 files changed, 153 insertions(+), 42 deletions(-) - -diff --git a/nc.1 b/nc.1 -index 60e3668..477cb1b 100644 ---- a/nc.1 -+++ b/nc.1 -@@ -34,7 +34,7 @@ - .Sh SYNOPSIS - .Nm nc - .Bk -words --.Op Fl 46CDdhklnrStUuvZz -+.Op Fl 46bCDdhklnrStUuvZz - .Op Fl I Ar length - .Op Fl i Ar interval - .Op Fl O Ar length -@@ -99,6 +99,8 @@ to use IPv4 addresses only. - Forces - .Nm - to use IPv6 addresses only. -+.It Fl b -+Allow broadcast. - .It Fl C - Send CRLF as line-ending. - .It Fl D -@@ -323,6 +325,54 @@ and which side is being used as a - The connection may be terminated using an - .Dv EOF - .Pq Sq ^D . -+.Pp -+There is no -+.Fl c -+or -+.Fl e -+option in this netcat, but you still can execute a command after connection -+being established by redirecting file descriptors. Be cautious here because -+opening a port and let anyone connected execute arbitrary command on your -+site is DANGEROUS. If you really need to do this, here is an example: -+.Pp -+On -+.Sq server -+side: -+.Pp -+.Dl $ rm -f /tmp/f; mkfifo /tmp/f -+.Dl $ cat /tmp/f | /bin/sh -i 2>&1 | nc -l 127.0.0.1 1234 > /tmp/f -+.Pp -+On -+.Sq client -+side: -+.Pp -+.Dl $ nc host.example.com 1234 -+.Dl $ (shell prompt from host.example.com) -+.Pp -+By doing this, you create a fifo at /tmp/f and make nc listen at port 1234 -+of address 127.0.0.1 on -+.Sq server -+side, when a -+.Sq client -+establishes a connection successfully to that port, /bin/sh gets executed -+on -+.Sq server -+side and the shell prompt is given to -+.Sq client -+side. -+.Pp -+When connection is terminated, -+.Nm -+quits as well. Use -+.Fl k -+if you want it keep listening, but if the command quits this option won't -+restart it or keep -+.Nm -+running. Also don't forget to remove the file descriptor once you don't need -+it anymore: -+.Pp -+.Dl $ rm -f /tmp/f -+.Pp - .Sh DATA TRANSFER - The example in the previous section can be expanded to build a - basic data transfer model. -@@ -382,15 +432,30 @@ The - flag can be used to tell - .Nm - to report open ports, --rather than initiate a connection. -+rather than initiate a connection. Usually it's useful to turn on verbose -+output to stderr by use this option in conjunction with -+.Fl v -+option. -+.Pp - For example: - .Bd -literal -offset indent --$ nc -z host.example.com 20-30 -+$ nc \-zv host.example.com 20-30 - Connection to host.example.com 22 port [tcp/ssh] succeeded! - Connection to host.example.com 25 port [tcp/smtp] succeeded! - .Ed - .Pp --The port range was specified to limit the search to ports 20 \- 30. -+The port range was specified to limit the search to ports 20 \- 30, and is -+scanned by increasing order. -+.Pp -+You can also specify a list of ports to scan, for example: -+.Bd -literal -offset indent -+$ nc \-zv host.example.com 80 20 22 -+nc: connect to host.example.com 80 (tcp) failed: Connection refused -+nc: connect to host.example.com 20 (tcp) failed: Connection refused -+Connection to host.example.com port [tcp/ssh] succeeded! -+.Ed -+.Pp -+The ports are scanned by the order you given. - .Pp - Alternatively, it might be useful to know which server software - is running, and which versions. -@@ -455,6 +520,9 @@ Original implementation by *Hobbit* - .br - Rewritten with IPv6 support by - .An Eric Jackson Aq ericj@monkey.org . -+.br -+Modified for Debian port by Aron Xu -+.Aq aron@debian.org . - .Sh CAVEATS - UDP port scans using the - .Fl uz -diff --git a/netcat.c b/netcat.c -index bf9940f..c938d11 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -88,6 +88,7 @@ - #include <netdb.h> - #include <poll.h> - #include <signal.h> -+#include <stddef.h> - #include <stdarg.h> - #include <stdio.h> - #include <stdlib.h> -@@ -115,6 +116,7 @@ - #define UDP_SCAN_TIMEOUT 3 /* Seconds */ - - /* Command Line Options */ -+int bflag; /* Allow Broadcast */ - int Cflag = 0; /* CRLF line-ending */ - int dflag; /* detached, no stdin */ - unsigned int iflag; /* Interval Flag */ -@@ -146,7 +148,7 @@ char *portlist[PORT_MAX+1]; - char *unix_dg_tmp_socket; - - void atelnet(int, unsigned char *, unsigned int); --void build_ports(char *); -+void build_ports(char **); - void help(void); - int local_listen(char *, char *, struct addrinfo); - void readwrite(int); -@@ -171,11 +173,14 @@ int - main(int argc, char *argv[]) - { - int ch, s, ret, socksv; -- char *host, *uport; -+ char *host, **uport; - struct addrinfo hints; - struct servent *sv; - socklen_t len; -- struct sockaddr_storage cliaddr; -+ union { -+ struct sockaddr_storage storage; -+ struct sockaddr_un forunix; -+ } cliaddr; - char *proxy = NULL; - const char *errstr, *proxyhost = "", *proxyport = NULL; - struct addrinfo proxyhints; -@@ -189,7 +194,7 @@ main(int argc, char *argv[]) - sv = NULL; - - while ((ch = getopt(argc, argv, -- "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) { -+ "46bCDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) { - switch (ch) { - case '4': - family = AF_INET; -@@ -197,6 +202,13 @@ main(int argc, char *argv[]) - case '6': - family = AF_INET6; - break; -+ case 'b': -+# if defined(SO_BROADCAST) -+ bflag = 1; -+# else -+ errx(1, "no broadcast frame support available"); -+# endif -+ break; - case 'U': - family = AF_UNIX; - break; -@@ -342,35 +354,40 @@ main(int argc, char *argv[]) - - /* Cruft to make sure options are clean, and used properly. */ - if (argv[0] && !argv[1] && family == AF_UNIX) { -- if (uflag) -- errx(1, "cannot use -u and -U"); - # if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) - if (dccpflag) - errx(1, "cannot use -Z and -U"); - # endif - host = argv[0]; - uport = NULL; -- } else if (!argv[0] && lflag) { -- if (sflag) -- errx(1, "cannot use -s and -l"); -- if (zflag) -- errx(1, "cannot use -z and -l"); -- if (pflag) -- uport=pflag; -- } else if (!lflag && kflag) { -- errx(1, "cannot use -k without -l"); -- } else if (argv[0] && !argv[1]) { -- if (!lflag) -- usage(1); -- uport = argv[0]; -+ } else if (argv[0] && !argv[1] && lflag) { -+ if (pflag) { -+ uport = &pflag; -+ host = argv[0]; -+ } else { -+ uport = argv; -+ host = NULL; -+ } -+ } else if (!argv[0] && lflag && pflag) { -+ uport = &pflag; - host = NULL; - } else if (argv[0] && argv[1]) { - host = argv[0]; -- uport = argv[1]; -+ uport = &argv[1]; - } else - usage(1); - -- -+ if (lflag) { -+ if (sflag) -+ errx(1, "cannot use -s and -l"); -+ if (zflag) -+ errx(1, "cannot use -z and -l"); -+ if (pflag) -+ /* This still does not work well because of getopt mess -+ errx(1, "cannot use -p and -l"); */ -+ uport = &pflag; -+ } else if (!lflag && kflag) -+ errx(1, "cannot use -k without -l"); - - /* Get name of temporary socket for unix datagram client */ - if ((family == AF_UNIX) && uflag && !lflag) { -@@ -448,7 +465,7 @@ main(int argc, char *argv[]) - else - s = unix_listen(host); - } else -- s = local_listen(host, uport, hints); -+ s = local_listen(host, *uport, hints); - if (s < 0) - err(1, NULL); - -@@ -457,7 +474,8 @@ main(int argc, char *argv[]) - local = ":::"; - else - local = "0.0.0.0"; -- fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", -+ if (vflag && (family != AF_UNIX)) -+ fprintf(stderr, "Listening on [%s] (family %d, port %s)\n", - host ?: local, - family, - *uport); -@@ -490,13 +508,17 @@ main(int argc, char *argv[]) - len = sizeof(cliaddr); - connfd = accept(s, (struct sockaddr *)&cliaddr, - &len); -- if(vflag) { -+ if(vflag && family == AF_UNIX) { -+ fprintf(stderr, "Connection from \"%.*s\" accepted\n", -+ (len - (int)offsetof(struct sockaddr_un, sun_path)), -+ ((struct sockaddr_un*)&cliaddr)->sun_path); -+ } else if(vflag) { - char *proto = proto_name(uflag, dccpflag); - /* Don't look up port if -n. */ - if (nflag) - sv = NULL; - else -- sv = getservbyport(ntohs(atoi(uport)), -+ sv = getservbyport(ntohs(atoi(*uport)), - proto); - - if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) { -@@ -504,7 +526,7 @@ main(int argc, char *argv[]) - inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN); - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, -- uport, -+ *uport, - proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, -@@ -515,7 +537,7 @@ main(int argc, char *argv[]) - inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN); - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, -- uport, -+ *uport, - proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)&cliaddr)->sa_family, -@@ -523,17 +545,21 @@ main(int argc, char *argv[]) - } - else { - fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n", -- uport, -+ *uport, - proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, - ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); - } - } -+ if(!kflag) -+ close(s); - readwrite(connfd); - close(connfd); - } - -+ if (vflag && kflag) -+ fprintf(stderr, "Connection closed, listening again.\n"); - if (kflag) - continue; - if (family != AF_UNIX) { -@@ -641,6 +667,8 @@ unix_bind(char *path) - return (-1); - } - -+ unlink(path); -+ - if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) { - close(s); - return (-1); -@@ -662,8 +690,10 @@ unix_connect(char *path) - if ((s = unix_bind(unix_dg_tmp_socket)) < 0) - return (-1); - } else { -- if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) -+ if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { -+ errx(1,"create unix socket failed"); - return (-1); -+ } - } - (void)fcntl(s, F_SETFD, 1); - -@@ -674,9 +704,11 @@ unix_connect(char *path) - sizeof(sun.sun_path)) { - close(s); - errno = ENAMETOOLONG; -+ warn("unix connect abandoned"); - return (-1); - } - if (connect(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) { -+ warn("unix connect failed"); - close(s); - return (-1); - } -@@ -1105,22 +1137,23 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) - * that we should try to connect to. - */ - void --build_ports(char *p) -+build_ports(char **p) - { - struct servent *sv; - const char *errstr; - char *n; - int hi, lo, cp; - int x = 0; -+ int i; - - char *proto = proto_name(uflag, dccpflag); -- sv = getservbyname(p, proto); -+ sv = getservbyname(*p, proto); - if (sv) { - portlist[0] = calloc(1, PORT_MAX_LEN); - if (portlist[0] == NULL) - err(1, NULL); - snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port)); -- } else if ((n = strchr(p, '-')) != NULL) { -+ } else if ((n = strchr(*p, '-')) != NULL) { - *n = '\0'; - n++; - -@@ -1128,9 +1161,9 @@ build_ports(char *p) - hi = strtonum(n, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, n); -- lo = strtonum(p, 1, PORT_MAX, &errstr); -+ lo = strtonum(*p, 1, PORT_MAX, &errstr); - if (errstr) -- errx(1, "port number %s: %s", errstr, p); -+ errx(1, "port number %s: %s", errstr, *p); - - if (lo > hi) { - cp = hi; -@@ -1160,10 +1193,12 @@ build_ports(char *p) - } - } - } else { -- hi = strtonum(p, 1, PORT_MAX, &errstr); -+ hi = strtonum(*p, 1, PORT_MAX, &errstr); - if (errstr) -- errx(1, "port number %s: %s", errstr, p); -- portlist[0] = strdup(p); -+ errx(1, "port number %s: %s", errstr, *p); -+ for (i=0;p[i];i++) { -+ portlist[i] = strdup(p[i]); -+ } - if (portlist[0] == NULL) - err(1, NULL); - } -@@ -1198,6 +1233,13 @@ set_common_sockopts(int s) - { - int x = 1; - -+# if defined(SO_BROADCAST) -+ if (bflag) { -+ if (setsockopt(s, IPPROTO_TCP, SO_BROADCAST, -+ &x, sizeof(x)) == -1) -+ err(1, NULL); -+ } -+# endif - # if defined(TCP_MD5SIG) - if (Sflag) { - if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, -@@ -1293,6 +1335,7 @@ help(void) - fprintf(stderr, "\tCommand Summary:\n\ - \t-4 Use IPv4\n\ - \t-6 Use IPv6\n\ -+ \t-b Allow broadcast\n\ - \t-C Send CRLF as line-ending\n\ - \t-D Enable the debug socket option\n\ - \t-d Detach from stdin\n\ -@@ -1329,7 +1372,7 @@ void - usage(int ret) - { - fprintf(stderr, -- "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n" -+ "usage: nc [-46bCDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n" - "\t [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n" - "\t [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n" - "\t [-x proxy_address[:port]] [destination] [port]\n"); --- diff --git a/network/netdiscover/netdiscover.SlackBuild b/network/netdiscover/netdiscover.SlackBuild index a9cbccaaf5..c589216ad8 100644 --- a/network/netdiscover/netdiscover.SlackBuild +++ b/network/netdiscover/netdiscover.SlackBuild @@ -19,8 +19,8 @@ PRGNAM=netdiscover -VERSION=${VERSION:-886319a} -COMMIT=${COMMIT:-886319af1758a1cb9cc1ec904ea46646572797c9} +VERSION=${VERSION:-053dda2} +COMMIT=${COMMIT:-053dda2f3a8cdb749f8100735d78af427aa417b0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/netdiscover/netdiscover.info b/network/netdiscover/netdiscover.info index c48e710ce2..11fb0aa74b 100644 --- a/network/netdiscover/netdiscover.info +++ b/network/netdiscover/netdiscover.info @@ -1,8 +1,8 @@ PRGNAM="netdiscover" -VERSION="886319a" +VERSION="053dda2" HOMEPAGE="https://github.com/alexxy/netdiscover/" -DOWNLOAD="https://github.com/alexxy/netdiscover/archive/886319a/netdiscover-886319af1758a1cb9cc1ec904ea46646572797c9.tar.gz" -MD5SUM="ae7f940fd699ccce7c0167f215a7e217" +DOWNLOAD="https://github.com/alexxy/netdiscover/archive/053dda2/netdiscover-053dda2f3a8cdb749f8100735d78af427aa417b0.tar.gz" +MD5SUM="949e75e011b41ad8cc9a6e36a13d93cd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/netsniff-ng/netsniff-ng.SlackBuild b/network/netsniff-ng/netsniff-ng.SlackBuild index 8905eb803d..9690f034ad 100644 --- a/network/netsniff-ng/netsniff-ng.SlackBuild +++ b/network/netsniff-ng/netsniff-ng.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for netsniff-ng -# Copyright 2013-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2013-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=netsniff-ng -VERSION=${VERSION:-0.6.6} +VERSION=${VERSION:-0.6.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/netsniff-ng/netsniff-ng.info b/network/netsniff-ng/netsniff-ng.info index 89247067ae..7db97b295c 100644 --- a/network/netsniff-ng/netsniff-ng.info +++ b/network/netsniff-ng/netsniff-ng.info @@ -1,8 +1,8 @@ PRGNAM="netsniff-ng" -VERSION="0.6.6" +VERSION="0.6.8" HOMEPAGE="http://netsniff-ng.org" -DOWNLOAD="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.6.tar.xz" -MD5SUM="513f85b6bf93d90c6c616cda4967181b" +DOWNLOAD="http://pub.netsniff-ng.org/netsniff-ng/netsniff-ng-0.6.8.tar.xz" +MD5SUM="477580690816dc7eacaaca444a6bdb55" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libcli libnet nacl liburcu GeoIP" diff --git a/network/newsboat/doinst.sh b/network/newsboat/doinst.sh new file mode 100644 index 0000000000..4110f5514d --- /dev/null +++ b/network/newsboat/doinst.sh @@ -0,0 +1,5 @@ +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/network/newsboat/newsboat.SlackBuild b/network/newsboat/newsboat.SlackBuild index ffdfc1a248..496474cb6f 100644 --- a/network/newsboat/newsboat.SlackBuild +++ b/network/newsboat/newsboat.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for newsboat # Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> -# Copyright 2019 Andrew Clemons, Wellington New Zealand +# Copyright 2019-2021 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=newsboat -VERSION=${VERSION:-2.17.1} +VERSION=${VERSION:-2.23} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -120,7 +120,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 ) @@ -158,6 +158,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/network/newsboat/newsboat.info b/network/newsboat/newsboat.info index e358a52c6f..5898ff4878 100644 --- a/network/newsboat/newsboat.info +++ b/network/newsboat/newsboat.info @@ -1,218 +1,216 @@ PRGNAM="newsboat" -VERSION="2.17.1" +VERSION="2.23" HOMEPAGE="https://www.newsboat.org/" -DOWNLOAD="https://newsboat.org/releases/2.17.1/newsboat-2.17.1.tar.xz \ - 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/argon2rs/argon2rs-0.2.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/arrayvec/arrayvec-0.4.10.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/autocfg/autocfg-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace-sys/backtrace-sys-0.1.28.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/backtrace/backtrace-0.3.13.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-set/bit-set-0.5.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/bit-vec/bit-vec-0.5.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/cc/cc-1.0.29.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/chrono/chrono-0.4.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/clap/clap-2.33.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/constant_time_eq/constant_time_eq-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.5.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/failure/failure-0.1.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/failure_derive/failure_derive-0.1.5.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-cprng/fuchsia-cprng-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-rs/gettext-rs-0.4.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-sys/gettext-sys-0.19.8.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/kernel32-sys/kernel32-sys-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/libc/libc-0.2.48.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/libz-sys/libz-sys-1.0.17.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/locale_config/locale_config-0.2.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/lock_api/lock_api-0.1.5.crate \ +DOWNLOAD="https://newsboat.org/releases/2.23/newsboat-2.23.tar.xz \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/addr2line/addr2line-0.14.0.crate \ + 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/arrayvec/arrayvec-0.5.2.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/backtrace/backtrace-0.3.55.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/bitvec/bitvec-0.19.4.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/byteorder/byteorder-1.3.4.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/codespan-reporting/codespan-reporting-0.9.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/curl-sys/curl-sys-0.4.41+curl-7.75.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cxx-build/cxx-build-0.5.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cxx/cxx-0.5.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cxxbridge-flags/cxxbridge-flags-0.5.10.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/cxxbridge-macro/cxxbridge-macro-0.5.10.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/funty/funty-1.1.0.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/getrandom/getrandom-0.2.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-rs/gettext-rs-0.6.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/gettext-sys/gettext-sys-0.21.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/gimli/gimli-0.23.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/lazy_static/lazy_static-1.4.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/lexical-core/lexical-core-0.7.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.90.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/link-cplusplus/link-cplusplus-1.0.4.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/locale_config/locale_config-0.3.0.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-2.1.3.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/natord/natord-1.0.9.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-4.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-traits/num-traits-0.2.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-0.1.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/openssl-sys/openssl-sys-0.9.46.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot/parking_lot-0.7.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/parking_lot_core/parking_lot_core-0.4.0.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/pkg-config/pkg-config-0.3.14.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/proc-macro2/proc-macro2-0.4.27.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/proptest/proptest-0.7.2.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.6.11.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/rand-0.5.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand/rand-0.6.5.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_chacha/rand_chacha-0.1.1.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.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_hc/rand_hc-0.1.0.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_isaac/rand_isaac-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_jitter/rand_jitter-0.1.3.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_os/rand_os-0.1.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_pcg/rand_pcg-0.1.1.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_xorshift/rand_xorshift-0.1.1.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.51.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.4.2.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.5.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.1.0.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/rustc-demangle/rustc-demangle-0.1.13.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/rusty-fork/rusty-fork-0.2.1.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/section_testing/section_testing-0.0.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/smallvec/smallvec-0.6.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-0.15.26.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/tempfile/tempfile-3.0.6.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/nom/nom-6.1.2.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/objc-foundation/objc-foundation-0.1.1.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/object/object-0.22.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/once_cell/once_cell-1.7.2.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/ppv-lite86/ppv-lite86-0.2.10.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/proptest/proptest-0.10.1.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-1.0.8.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/radium/radium-0.5.3.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/rand-0.8.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_chacha/rand_chacha-0.3.0.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_core/rand_core-0.6.2.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_hc/rand_hc-0.3.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rand_xorshift/rand_xorshift-0.2.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-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/rustc-demangle/rustc-demangle-0.1.18.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/rusty-fork/rusty-fork-0.3.0.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/scratch/scratch-1.0.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/section_testing/section_testing-0.0.5.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/static_assertions/static_assertions-1.1.0.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/syn/syn-1.0.55.crate \ + https://crates-io.s3-us-west-1.amazonaws.com/crates/tap/tap-1.0.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/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-0.3.6.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/time/time-0.1.42.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/ucd-util/ucd-util-0.1.3.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/tinyvec/tinyvec-1.1.0.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/unicode-bidi/unicode-bidi-0.3.4.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-normalization/unicode-normalization-0.1.8.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-segmentation/unicode-segmentation-1.2.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/url/url-1.7.2.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/vcpkg/vcpkg-0.2.6.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/void/void-1.0.2.crate \ - https://crates-io.s3-us-west-1.amazonaws.com/crates/wait-timeout/wait-timeout-0.1.5.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/unicode-normalization/unicode-normalization-0.1.16.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/url/url-2.2.1.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/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/wasi/wasi-0.10.0+wasi-snapshot-preview1.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.6.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/wyz/wyz-0.2.0.crate \ https://crates-io.s3-us-west-1.amazonaws.com/crates/xdg/xdg-2.2.0.crate" -MD5SUM="6e4583e2ef8bde871c92efaffd94726d \ - d26d000426208c255a95368923467618 \ - e1efb9a37395a38bd80ccfc911d4a6e8 \ - 46a048c0b8b765bcbdc131e166410510 \ - 59f345457ff5690527e5a9a863856a75 \ - b94bcb41f342404852b7d763700fb6fe \ - d38ff4b8e1d15e7488420ea9c428e8a2 \ - a5c5256b590620d2344a2e5dc5a79af9 \ - e9c5e38e5371071eb97de27e204dd3d6 \ - e5767560aad375059c975285c07022c0 \ - 027635e453eccbfd0a2b02a440e334a6 \ - 85ee799e11dc75b822045f440f00e62a \ - daa64e5a0e1b6d710877be51f27ccd3c \ - ed2b1c5fd000f926c2aedb0c3bd1d199 \ - 135f6d6306e50606f0475ada50c33ce2 \ - 1c8b50f8528dd37df7d984e0e4b61bd5 \ - 701334c674b3fc3ace74045e3a2fae50 \ - 25bf715a8e88aeca16633c33f9b6d932 \ - 701d24caea00efef86966950d11900da \ - 6d780ab18da07be9ed423e7edfbcfd7e \ - e8e663e88ee02ec47cfb984382cb62ae \ - b0fd8ad50f5e64c71f0daf8af79ca952 \ - 27260b46db6b9ac40318143d70a80ba3 \ - e5eadbf9c92867ed30b7d9e772e46f10 \ - 118f516871262287864157772d51ca12 \ - 89cabfcb37602a7b200b1a9cd660ee2e \ - 9d033cc2daa6924420a4a89e6705773f \ - 527a21498a2024a22701808bfc3eba54 \ - 330c760718d1130f318457fe4725b0dd \ - 7091a59caa55c94b0b088bf1814b85fd \ - 9b6701c1f22494454d9c6c87187c6b3a \ - 25c6e48abb18260fb7aedcb340cdd8d0 \ - ac6a4d0d3c5cd5718800d285c2da55c5 \ +MD5SUM="fe5761463f29b71da688ca8a80c77ecf \ + e1373077f219ed66a14857a718ed79e1 \ + c9d0c8f38c6686e47c29fe9b409c25c2 \ + 93850f8bf39e61dcf80ce49b5e0943d7 \ + c83252f91435a921e7e4434956010344 \ + c6443ec8d007c729ba5482008d0c864d \ + c0a1f5967a1581beff2565ffeee3fb7b \ + 8f8acc3c1caff2043085a0cc28a92757 \ + 45a867175c81501378699f80724393c0 \ + 6799c26a7eacaf8e58d3e45c6c5add89 \ + f353cf73f811990f1529b637065de949 \ + ea2d23ceb9f98853a7dffc6c02884464 \ + e502e6c6b0dca9c1ae2d99e92b26f645 \ + b3ebb5d4433417e998d982d46334a6f4 \ + 882dbbc613a93f64c3709b0a2bd0d6dc \ + 74634128440dbc3766bda76fdf0aaa05 \ + 1581b390d17f6e73a43ffc8a7b009e57 \ + bc79e0eb364df515a33755ac9a581cfd \ + 7f5a0fb65f15b9a7f4b92ead2005437f \ + 965d3dda0ed58748e6f0a615ebb70840 \ + 4444b73f52b93818d14d68b971b1b1a3 \ + 938ac35135c5cc2c735262d8698a0498 \ + c71702f6505787cd3b70c77a9cd26d93 \ + 7a992127d3bc3b08965068e628ebd36c \ + 8dab3b3ec00dc56cffde0b0c410d47b5 \ + e3225eb6ecda0f2c3d1d09c8450f7ef8 \ + 27091b1ee345635aa18fb8bfc51f5b1d \ + 704babd757a22f163230a36fa5474890 \ + 3002f779af7b5eeab4161354dc7c79d8 \ + c7050135ef75f62fcbd5313898ec7884 \ + 69bddbd44804ae43b7f81cb0403b500c \ + 8dc2849c66f31ecaec6a5ff699deb070 \ + 54ac4c56d9ec2800b8428020f24be67c \ + fba3b040a55c01be7376d3dd5c4d4920 \ + a5ca2def8bdf1deda1d2151bfb0f9800 \ + 1775405476046e602fdf8eb892cca057 \ + e5768043e447a7423f030c1394440502 \ + 7953eda62592968ef716363c206495ba \ + 6fa7c4b0da26b511570845e41527bc8f \ + 7c81e7a61ec172a229d6fdbc553e883d \ 7916dcd738a8fa6a2798754c20d6e146 \ - 853896d75f0103a9c61f933cb8f1f40a \ + fa3630e5867493e09296155763e4f4a0 \ + c291ac2f4465c030c058a7c1bc595783 \ 5a9b94ba54ea1f52f2a496ba982e3282 \ - 8a39d8bd95f15af0840d2049f0e78a37 \ - 92bcd45a654d9e24c86f3465c6387c47 \ - 4092ed5c67c6ff1c6a7bcf463bc40a53 \ - cbdebc326641fcab42bc92a113548740 \ - 758bb6105f13a925fad3d384af0ecc78 \ - 254017876c89feab72dd61d37a617653 \ - e0493a4c121cded246f611c435dce2b7 \ - f59fef46e6ebc8bfcca5bd8c05e23089 \ - 8a5fc6ba84f3ac8a7e43ecb99322866c \ - 87a9d36f5ebe5eae0c3e8d69d58752e1 \ - 4692e7114db87556e0edd3750cdef9ac \ - 44a4077593da78251dbe3152de73ccc5 \ - 4563373184ff931ec276dc1a659d52d2 \ - ed68fecc548f1bd3e6415764c21af10c \ - 9e99a37f8c37bb953732ef46ac2b12a1 \ - 936be8fb046f02bd6a336ffbbf02b3b3 \ - 793627c8c18012ad77cb3e81fa4c2195 \ - 3ab5a79607a4d260bf61cd99dc82ab05 \ - 8cab41822d03dfa674870315308fa392 \ - 7058895bdca83bbda052d66b087f902e \ - 28b1e6d15e1ba8cf3a2e953ce7fcd3de \ - 74b15f1928431937f14ed91fdc12b542 \ - 43ad2d3886f3b95564b5d46fb7e3ccec \ - 5ccf992fee1f4744f9d1aa9d45d5b5db \ - 3f5b37c228efbd014e7bb617f2abedf1 \ - 7826deb76941fc36c2391951bd65ba47 \ - c8d655d206cbe48b84a22544d6fc6d15 \ - 3056ab938614a0a76bd60dff8bb3b519 \ - f91e69d935946bdc258a0ed22dceeaad \ - 54a8acc2e193a77476d7517963cbfdc0 \ - de7bb5037caf6403d859c56b09fedcd2 \ - 90a40d2cf8b2d7c3d21a80f3af7693ad \ - d3652677415c9ed4cae3b602316ff8bd \ - 9f099c64e6db617887ba150c117baf13 \ - 09422dcb1cd6e3c30598296d2d3d4798 \ - cc9ba070db558012ede5e80022020e1b \ - 4d101ab24d14c54937c5f45ece8fad5f \ - 8f316480245db44925b8f70ab3e18559 \ - b492e0a70603c3903a44ec5cabd3ba21 \ - 500e5bb7d9b5a8882e2e961012391a58 \ - 82d23d1b89a2d4ccb381ba72f0b3f0db \ - 8b4d8c7b6e3a060d365bc1ad650929fa \ - 64111c20b69aa1532fb66b70c4660b55 \ - 7711037ca3fab7e50a9f732935d24e1d \ - 5b9db74833b5ff325b1b9aa7fe96d5f8 \ - d155c08de6c18bd55639ffed629894b9 \ - df95befa0dfecdf80b51ad30deb4d320 \ + 31afb592628dd2c4da5efbc649fd8066 \ + a8ec1126ef06244ac1e3773981a005f1 \ + c0e036fd990d0c9cae11b5876a5cb572 \ + aecd889de42c8168e1bc97a6f2720d8f \ + b4dcac855af5df71f3383d86c4a96b78 \ + fd9aa273ad560dedd00ddcf3dbe808ce \ + edb0836579d7124116fbb2d8eabb3e5b \ + 921832a39e8a8aac72dfd9ed02227a87 \ + f490982aceabdbd515348f63e638a782 \ + 448bc61aee07661464d98da7660e9a1d \ + a4ff7abd41c57dfd24bbd4b50edb848f \ + 0736e4f76f4f8f0a29563b0608ca3974 \ + 400f57adb8d5ab059a2df92c7e3b0268 \ + 3181dca31efe33cbed29a45d0ec67848 \ + ddd3199850a8a6a8db642923ed603a99 \ + b807d4f7a87f5fbdcc4ef008cca53a4c \ + 66d1cb32dce999907409f636f004b884 \ + e878596904877d1d7933d8f89a63dd49 \ + 0a80ed36a125ac3cdfa09f8707055873 \ + bacea6e63b5b0b7a55a8881b47d80f3a \ + a0f55fda89c0f97784edb18f4c253a49 \ + b5b168b1af99cbb8c0f5556ffe56f1e5 \ + b269356e8646f3184a0e8d52a58cee69 \ + 69e9436d5c9889a6fdf199dfc5c3d3fe \ + f81b88d1f8f9d0bc18849ad58b2f1b66 \ + 381ebb79fffdf657a666ee577323039e \ + 13373372c7ce2e894925d846625a7987 \ + 40d1ab8fd9b6e5e376b0839a9132abe1 \ + 0538d1da369f3e3f0412aa4d735c1b61 \ + b5926b0ac31b2bca1675c6eb1f936d0b \ + 13268e6ab4023043e6dd8e993ce8b88a \ + a69721c73263cd2040e1a5f120b03a6f \ + 8d2ed9bfda95009d8f61b5f575e91c13 \ + b13390ad50aa277e39e4d46f7ed3eb14 \ + c9defe80406280bcfce4ecf31c0200b3 \ + 83743b5ff7a15361f45fe0a2eb0b1575 \ + 54346edfb0ec58936fa2af45908969ac \ + 6e328718765f2352dd34f10215488fbb \ + ebdff467249aa3dca005a441dc824236 \ a8de006fe0c7e373c560dd51599287a8 \ - baaa166f66e90e94b76b7418afd5df90 \ - 3d311d2cedf2d3d7b11b32baf470b178 \ - d34a9f507f3ecf7d93c07deb74f1cd7c \ + a5dd75e77c7324f5c1d2d372c990d0a7 \ + c6c50e4feea5f4cc4e1fb3c7e88606a5 \ + 097e3652f1adda8e7e425a7f5c288e27 \ + 7bfcad253aff26bc26c5e3521f3ba891 \ f403bbb812ce1a2d9270d9159cf9e8d3 \ - 60eec117e8efaa29b898e43319da2b05 \ - 8861b627334c6ecbb355741162ea6022 \ - d7c493ca4f84a7d50b53646421a37487 \ - 5aaf04f9a94a6450e3e4963ddd62b92d \ - b390278bbea483da591b1bc026be5fa2 \ - 32f0ced8a8881d2c0572b879bf15b91e \ - 9c27232c12abb96c68e10e21f2012639 \ - e75c0721667b6bc86472ecf7b286d9fc \ - f48add3d6234e8b9829fa5364509f425 \ - 689203efc084fc0f1d1f74f5d354ae75 \ - 2c263ce21ea756b9a2cb626a36750efb \ - c900e7dbce808ff8ced375077b17a163 \ + 62fa1c42f9b351d9c411a4c86eacb707 \ + 4272c279b06b88f8b0ffce7109348e27 \ + a51c43692084979295641a7ffba4b297 \ + 871061b3dab2a322a13effd0a800b05f \ + e17e2583e10c6947982de78aeae42a5c \ + 8b01b016a9b6deebc1b43f296057efb5 \ + 6708629acf3d2ecb7404e43255d2df85 \ + a312b55a428f827a91097d1d8497b02b \ + 6e23e0eee42b1ba9ec61a6db7ec2dc08 \ db96b50050277bf05a3c68534bbb9586 \ + b9e37d5fc4ad28b612b78ad37816684d \ 09de9d01e7331ff3da11f58be8bef0df \ - b44489eb4799c4fabac3fceb48de54f7 \ - 40909511b3d0e2dba891f438715808d0 \ + 0498c4a11448bfc35dc7bb2caa64c753 \ + c533b4ecdd56b5830c4cc79a6cf6f9b4 \ 1628d3f26e3f952d8c43973ade1f2dad" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="stfl" +REQUIRES="stfl rubygem-asciidoctor" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/network/ngrok/README b/network/ngrok/README new file mode 100644 index 0000000000..13f022d63b --- /dev/null +++ b/network/ngrok/README @@ -0,0 +1,4 @@ +ngrok (Tunnel local servers to be reachable via the internet) + +ngrok allows you to expose TCP/TLS/HTTP servers running on your local machine +to the internet. Just tell ngrok what port your server is listening on. diff --git a/network/ngrok/ngrok.SlackBuild b/network/ngrok/ngrok.SlackBuild new file mode 100644 index 0000000000..b3f08c9ce0 --- /dev/null +++ b/network/ngrok/ngrok.SlackBuild @@ -0,0 +1,82 @@ +#!/bin/sh + +# Slackware build script for ngrok + +# 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=ngrok +VERSION=${VERSION:-2.3.37} +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 +unzip $CWD/${PRGNAM}-${VERSION}-linux-${BINARCH}.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/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/network/ngrok/ngrok.info b/network/ngrok/ngrok.info new file mode 100644 index 0000000000..5258614f8c --- /dev/null +++ b/network/ngrok/ngrok.info @@ -0,0 +1,10 @@ +PRGNAM="ngrok" +VERSION="2.3.37" +HOMEPAGE="https://ngrok.com" +DOWNLOAD="https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-2.3.37-linux-386.zip" +MD5SUM="2569c067239b3cd270f7032cd4e812fa" +DOWNLOAD_x86_64="https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-2.3.37-linux-amd64.zip" +MD5SUM_x86_64="a1ec825b2c854e3e1db7f70d44d46941" +REQUIRES="" +MAINTAINER="Ebben Aries" +EMAIL="slackbuilds@dscp.org" diff --git a/network/ngrok/slack-desc b/network/ngrok/slack-desc new file mode 100644 index 0000000000..b449849acf --- /dev/null +++ b/network/ngrok/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----------------------------------------------------------| +ngrok: ngrok (Tunnel local servers to be reachable via the internet) +ngrok: +ngrok: ngrok allows you to expose TCP/TLS/HTTP servers running on your local +ngrok: machine to the internet. Just tell ngrok what port your server is +ngrok: listening on. +ngrok: +ngrok: Home-Page: https://ngrok.com +ngrok: +ngrok: +ngrok: +ngrok: diff --git a/network/nicotine+/README b/network/nicotine+/README index 893f99ddb8..b1a132acdd 100644 --- a/network/nicotine+/README +++ b/network/nicotine+/README @@ -1,5 +1,6 @@ -Nicotine+ is a client for the SoulSeek filesharing network. It was -"forked" from Nicotine, Hyriand's Soulseek client, which in turn was -forked from the PySoulSeek project by Alexander Kanavin. +Nicotine+ is a graphical client for the Soulseek peer-to-peer file +sharing network. -Optional dependencies are GeoIP-Python and miniupnpc. +Nicotine+ aims to be a pleasant, Free and Open Source (FOSS) +alternative to the official Soulseek client, providing additional +functionality while keeping current with the Soulseek protocol. diff --git a/network/nicotine+/nicotine+.SlackBuild b/network/nicotine+/nicotine+.SlackBuild index 9313aebb91..4c00a14561 100644 --- a/network/nicotine+/nicotine+.SlackBuild +++ b/network/nicotine+/nicotine+.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=nicotine+ SRCNAM=nicotine-plus -VERSION=${VERSION:-1.4.1} +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,15 +59,14 @@ find -L . \ # Fix paths. sed -i 's|share/man|man|' setup.py -sed -i "s|share/doc/nicotine|doc/$PRGNAM-$VERSION|" \ - setup.py pynicotine/gtkgui/frame.py +sed -i "s|share/doc/nicotine|doc/$PRGNAM-$VERSION|" setup.py -python setup.py install --root=$PKG +python3 setup.py install --root=$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 -cp -a AUTHORS.md COPYING NEWS README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/nicotine+/nicotine+.info b/network/nicotine+/nicotine+.info index 5485d503bb..ee5df51c22 100644 --- a/network/nicotine+/nicotine+.info +++ b/network/nicotine+/nicotine+.info @@ -1,10 +1,10 @@ PRGNAM="nicotine+" -VERSION="1.4.1" -HOMEPAGE="http://nicotine-plus.org/" -DOWNLOAD="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1/nicotine-plus-1.4.1.tar.gz" -MD5SUM="43a6a38ba276dc2a13dce7fd66bdb467" +VERSION="3.0.0" +HOMEPAGE="https://nicotine-plus.org/" +DOWNLOAD="https://github.com/Nicotine-Plus/nicotine-plus/archive/3.0.0/nicotine-plus-3.0.0.tar.gz" +MD5SUM="51bea3cfd9df3fac7fe7631edc3b2f70" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="mutagen" -MAINTAINER="Audrius Kažukauskas" -EMAIL="audrius@neutrino.lt" +REQUIRES="pygobject3-python3" +MAINTAINER="Sasha Abbott" +EMAIL="sashaa@disroot.org" diff --git a/network/nicotine+/slack-desc b/network/nicotine+/slack-desc index d81df9e3d4..cd5c55343a 100644 --- a/network/nicotine+/slack-desc +++ b/network/nicotine+/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -nicotine+: nicotine+ (SoulSeek client written in Python) +nicotine+: nicotine+ (graphical client for Soulseek) nicotine+: -nicotine+: Nicotine+ is a SoulSeek client written in Python, based on the -nicotine+: PySoulSeek project by Alexander Kanavin. It features, among other -nicotine+: things, a completely rewritten graphical user interface which -nicotine+: uses the PyGTK-2 toolkit and a less strict user request policy. -nicotine+: Nicotine+ is a fork of Hyriand's original Nicotine Soulseek client. +nicotine+: Nicotine+ is a graphical client for the Soulseek peer-to-peer file +nicotine+: sharing network. nicotine+: -nicotine+: Homepage: http://nicotine-plus.org/ +nicotine+: Nicotine+ aims to be a pleasant, Free and Open Source (FOSS) +nicotine+: alternative to the official Soulseek client, providing additional +nicotine+: functionality while keeping current with the Soulseek protocol. nicotine+: +nicotine+: Homepage: https://nicotine-plus.org/ nicotine+: diff --git a/network/nordvpn/README b/network/nordvpn/README index 2f946e2f5e..8f0e00328c 100644 --- a/network/nordvpn/README +++ b/network/nordvpn/README @@ -1,5 +1,6 @@ -The NordVPN app for Linux protects your sensitive data with military-grade -encryption, so that whatever you do online stays secure and private. +The NordVPN app for Linux protects your sensitive data with +military-grade encryption, so that whatever you do online stays secure +and private. More than 5000 servers worldwide. No logs of your online activity. Secure up to 6 devices with a single account. Access online content securely, with no restrictions. @@ -14,3 +15,19 @@ The following can be used to start/stop NordVPN automatically: if [ -x /etc/rc.d/rc.nordvpn ]; then /etc/rc.d/rc.nordvpn stop fi + +NOTE: NordVPN has implemented NordLynx (WireGuard protocol) into the +app. It is still under heavy development. However if you want to try +it, you need to install these 2 optional dependencies: + +wireguard-linux-compat +wireguard-tools + +Then you can switch to NordLynx with the following command: +'nordvpn set technology NordLynx' + +And connect using: +'nordvpn c' + +You can always switch back to OpenVPN using this command: +'nordvpn set technology OpenVPN' diff --git a/network/nordvpn/nordvpn.SlackBuild b/network/nordvpn/nordvpn.SlackBuild index 7881d719ba..710a1e1935 100644 --- a/network/nordvpn/nordvpn.SlackBuild +++ b/network/nordvpn/nordvpn.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nordvpn -VERSION=${VERSION:-3.4.0} +VERSION=${VERSION:-3.8.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/nordvpn/nordvpn.info b/network/nordvpn/nordvpn.info index c57789947c..1943e15c83 100644 --- a/network/nordvpn/nordvpn.info +++ b/network/nordvpn/nordvpn.info @@ -1,10 +1,10 @@ PRGNAM="nordvpn" -VERSION="3.4.0" +VERSION="3.8.6" HOMEPAGE="https://www.nordvpn.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://repo.nordvpn.com/yum/nordvpn/centos/x86_64/Packages/n/nordvpn-3.4.0-1.x86_64.rpm" -MD5SUM_x86_64="472c858fdb0c88a8643140052f4e2f8a" +DOWNLOAD_x86_64="https://repo.nordvpn.com/yum/nordvpn/centos/x86_64/Packages/n/nordvpn-3.8.6-1.x86_64.rpm" +MD5SUM_x86_64="16b9f8b5ea5224e445427a4b1dbf4093" REQUIRES="" MAINTAINER="Reza Talebi" EMAIL="reza.talebi.73@outlook.com" diff --git a/network/nsd/nsd.SlackBuild b/network/nsd/nsd.SlackBuild index e1370d03a2..6deb8f862c 100644 --- a/network/nsd/nsd.SlackBuild +++ b/network/nsd/nsd.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for YADIFA, Authoritative DNS server +# Slackware build script for NSD, Authoritative DNS server -# Copyright (c) 2017, Sergey Fedosov <eleksir@gmail.com> +# Copyright (c) 2017-2020 Sergey Fedosov <eleksir@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PRGNAM=nsd USER=$PRGNAM GROUP=$PRGNAM -VERSION=${VERSION:-4.1.15} +VERSION=${VERSION:-4.3.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,7 +78,7 @@ cd "$TMP" rm -rf "$PRGNAM-$VERSION" tar xvf "$CWD/$PRGNAM-$VERSION.tar.gz" cd "$PRGNAM-$VERSION" -chown -R root:root . +#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 \ @@ -88,25 +88,25 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ ---prefix=/usr \ ---bindir=/usr/bin \ ---sbindir=/usr/sbin \ ---libexecdir=/usr/libexec \ ---sysconfdir=/etc \ ---localstatedir=/var \ ---libdir=/usr/lib \ ---enable-ratelimit \ ---enable-ratelimit-default-is-off \ ---with-nsd_conf_file="/etc/$PRGNAM/$PRGNAM.conf" \ ---with-configdir="/var/lib/$USER" \ ---with-logfile="/var/log/$PRGNAM/$PRGNAM.log" \ ---with-pidfile="/var/run/$PRGNAM/$PRGNAM.pid" \ ---with-dbfile="/var/lib/$USER/$PRGNAM.db" \ ---with-zonesdir="/var/lib/$USER/zones" \ ---with-xfrdfile="/var/lib/$USER/$PRGNAM.xfrd" \ ---with-zonelistfile="/var/lib/$USER/$PRGNAM.zones" \ ---with-xfrdir="/var/lib/$USER/xfrd" \ ---with-user=$USER + --prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/libexec \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib \ + --enable-ratelimit \ + --enable-ratelimit-default-is-off \ + --with-nsd_conf_file="/etc/$PRGNAM/$PRGNAM.conf" \ + --with-configdir="/var/lib/$USER" \ + --with-logfile="/var/log/$PRGNAM/$PRGNAM.log" \ + --with-pidfile="/var/run/$PRGNAM/$PRGNAM.pid" \ + --with-dbfile="/var/lib/$USER/$PRGNAM.db" \ + --with-zonesdir="/var/lib/$USER/zones" \ + --with-xfrdfile="/var/lib/$USER/$PRGNAM.xfrd" \ + --with-zonelistfile="/var/lib/$USER/$PRGNAM.zones" \ + --with-xfrdir="/var/lib/$USER/xfrd" \ + --with-user=$USER make make install DESTDIR="$PKG" @@ -115,18 +115,22 @@ find "$PKG" -print0 | xargs -0 file | grep -e "executable" -e "shared object" | | 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 {} \; +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" -install --mode=644 "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild" +# remove empty file +rm -rf "$PKG/etc/$PRGNAM/$PRGNAM.conf.sample" -mkdir -p "$PKG/install" -install --mode=644 "$CWD/slack-desc" "$PKG/install/slack-desc" -install --mode=644 "$CWD/doinst.sh" "$PKG/install/doinst.sh" +install -Dpm 0644 "$CWD/$PRGNAM.SlackBuild" "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild" +install -Dpm 0644 "$CWD/slack-desc" "$PKG/install/slack-desc" +install -Dpm 0644 "$CWD/doinst.sh" "$PKG/install/doinst.sh" +install -Dpm 0644 "$CWD/rc.$PRGNAM" "$PKG/etc/rc.d/rc.$PRGNAM.new" +install -Dpm 0644 "$CWD/$PRGNAM.conf" "$PKG/etc/$PRGNAM/${PRGNAM}.conf.new" +install -Dpm 0644 "$CWD/nsd.logrotate" "$PKG/etc/logrotate.d/nsd.new" +# add sample zone +install -Dpm 0644 "$CWD/localhost.zone" "$PKG/var/lib/$PRGNAM/zones/master/localhost.zone.new" -mkdir -p "$PKG/etc/rc.d" -install --mode=644 "$CWD/rc.$PRGNAM" "$PKG/etc/rc.d/rc.$PRGNAM.new" +chown -R $USER:$GROUP "$PKG/var/lib/$USER" mkdir -p "$PKG/var/run/$PRGNAM" chown $USER:$GROUP "$PKG/var/run/$PRGNAM" @@ -134,20 +138,5 @@ chown $USER:$GROUP "$PKG/var/run/$PRGNAM" mkdir -p "$PKG/var/log/$PRGNAM" chown $USER:$GROUP "$PKG/var/log/$PRGNAM" -chown -R $USER:$GROUP "$PKG/var/lib/$USER" - -mkdir -p "$PKG/etc/$PRGNAM" -install --mode=644 "$CWD/$PRGNAM.conf" "$PKG/etc/$PRGNAM/${PRGNAM}.conf.new" - -mkdir -p $PKG/etc/logrotate.d -install --mode=644 $CWD/nsd.logrotate $PKG/etc/logrotate.d/nsd.new - -# remove empty file -rm -rf "$PKG/etc/$PRGNAM/$PRGNAM.conf.sample" - -# add sample zone -mkdir -p "$PKG/var/lib/$USER/zones/master" -install --mode=644 "$CWD/localhost.zone" "$PKG/var/lib/$USER/zones/master/localhost.zone.new" - cd "$PKG" /sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-${VERSION}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}" diff --git a/network/nsd/nsd.info b/network/nsd/nsd.info index 5d43eb4c17..5d20217e0d 100644 --- a/network/nsd/nsd.info +++ b/network/nsd/nsd.info @@ -1,8 +1,8 @@ PRGNAM="nsd" -VERSION="4.1.15" -HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd/" -DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.15.tar.gz" -MD5SUM="8b13973ae94ea02bd205734af61f3329" +VERSION="4.3.3" +HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd/about/" +DOWNLOAD="https://www.nlnetlabs.nl/downloads/nsd/nsd-4.3.3.tar.gz" +MD5SUM="e80bd8845b4f3ba514fd255343c5097c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/nsd/slack-desc b/network/nsd/slack-desc index 2aec14873a..dc16e047ac 100644 --- a/network/nsd/slack-desc +++ b/network/nsd/slack-desc @@ -11,9 +11,9 @@ nsd: nsd: NSD is an authoritative only, high performance, simple and open nsd: source name server. nsd: +nsd: Website: https://www.nlnetlabs.nl/projects/nsd/about/ nsd: nsd: nsd: nsd: -nsd: Website: https://www.nlnetlabs.nl/projects/nsd/ nsd: diff --git a/network/nss-mdns/look-in-run-for-avahi-socket.patch b/network/nss-mdns/look-in-run-for-avahi-socket.patch deleted file mode 100644 index 4190ae87f6..0000000000 --- a/network/nss-mdns/look-in-run-for-avahi-socket.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur nss-mdns-0.10.orig/src/Makefile.am nss-mdns-0.10/src/Makefile.am ---- nss-mdns-0.10.orig/src/Makefile.am 2007-02-08 10:42:23.000000000 -0600 -+++ nss-mdns-0.10/src/Makefile.am 2019-08-28 23:24:49.690739951 -0500 -@@ -22,7 +22,7 @@ - AM_CFLAGS = \ - -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \ - -DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \ -- -DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\" -+ -DAVAHI_SOCKET=\"/run/avahi-daemon/socket\" - - #AM_CFLAGS += -DNDEBUG=1 -Os - -diff -Nur nss-mdns-0.10.orig/src/Makefile.in nss-mdns-0.10/src/Makefile.in ---- nss-mdns-0.10.orig/src/Makefile.in 2007-05-12 09:55:34.000000000 -0500 -+++ nss-mdns-0.10/src/Makefile.in 2019-08-28 23:24:39.273681707 -0500 -@@ -409,7 +409,7 @@ - # This cool debug trap works on i386/gcc only - AM_CFLAGS = -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \ - -DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \ -- -DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\" \ -+ -DAVAHI_SOCKET=\"/run/avahi-daemon/socket\" \ - '-DDEBUG_TRAP=__asm__("int $$3")' - AM_LDFLAGS = -avoid-version -module -export-dynamic - lib_LTLIBRARIES = $(am__append_1) $(am__append_2) diff --git a/network/nss-mdns/nss-mdns.SlackBuild b/network/nss-mdns/nss-mdns.SlackBuild index e3984e3cd1..42aeafa5f8 100644 --- a/network/nss-mdns/nss-mdns.SlackBuild +++ b/network/nss-mdns/nss-mdns.SlackBuild @@ -2,11 +2,11 @@ # Slackware build script for nss-mdns # Written by Menno Duursma <druiloor@zonnet.nl> -# Maintained by Robby Workman <rw@rlworkman.net> +# Maintained by Robby Workman <rworkman@slackbuilds.org> PRGNAM=nss-mdns -VERSION=${VERSION:-0.10} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.14.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,8 +51,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/look-in-run-for-avahi-socket.patch +#patch -p1 < $CWD/look-in-run-for-avahi-socket.patch +AVAHI_SOCKET="/run/avahi-daemon/socket" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -60,8 +61,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-legacy \ - --enable-avahi \ + --mandir=/usr/man \ --build=$ARCH-slackware-linux make @@ -74,9 +74,8 @@ mkdir -p $PKG/etc cat $CWD/mdns.allow > $PKG/etc/mdns.allow.new cat $CWD/nsswitch.conf-mdns > $PKG/etc/nsswitch.conf-mdns.new -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a [A-Z][A-Z]* $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION/html cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/nss-mdns/nss-mdns.info b/network/nss-mdns/nss-mdns.info index c4eaec54a6..db0d6deb38 100644 --- a/network/nss-mdns/nss-mdns.info +++ b/network/nss-mdns/nss-mdns.info @@ -1,8 +1,8 @@ PRGNAM="nss-mdns" -VERSION="0.10" -HOMEPAGE="http://0pointer.de/lennart/projects/nss-mdns/" -DOWNLOAD="http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz" -MD5SUM="03938f17646efbb50aa70ba5f99f51d7" +VERSION="0.14.1" +HOMEPAGE="https://github.com/lathiat/nss-mdns" +DOWNLOAD="https://github.com/lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz" +MD5SUM="39b7f6ccfa0605321c7ee6e78478b83b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avahi" diff --git a/network/nweb/README b/network/nweb/README new file mode 100644 index 0000000000..9f882d64d9 --- /dev/null +++ b/network/nweb/README @@ -0,0 +1,23 @@ +A tiny web server in C. + +nweb is a small and very safe mini web server nweb only servers out +file/web pages with extensions named below and only from the named +directory or its sub-directories. + +There is no fancy features = safe and secure. + +Example: nweb 8181 /home/nwebdir & + +Only Supports: gif jpg jpeg png ico zip gz tar htm html +Not Supported: URLs including "..", Java, Javascript, CGI +Not Supported: directories / /etc /bin /lib /tmp /usr /dev /sbin + +client.c: + +Also included is the source for a client. This client.c program is +designed to fake being a web browser. It sends the expected requests to +the web server over a network socket connection and displays the results +as text rather than graphically displaying the results. In the code you +will have to change the two lines as below to match your web server or +nweb server. See README.client for instructions. The client.c source +code can be found in the /usr/doc/nweb-<VERSION> directory. diff --git a/network/nweb/README.client b/network/nweb/README.client new file mode 100644 index 0000000000..1fd848e0bd --- /dev/null +++ b/network/nweb/README.client @@ -0,0 +1,64 @@ + client.c + +This client.c program is designed to fake being a web browser. It sends the +expected requests to the web server over a network socket connection and +displays the results as text rather than graphically displaying the results. In +the code you will have to change the two lines as below to match your web +server or nweb server. + +/* YOU WILL HAVE TO CHANGE THESE TWO LINES TO MATCH YOUR CONFIG / #define PORT + * 8181 / +Port number as an integer - web server default is 80 / #define IP_ADDRESS +"192.168.0.8" / IP Address as a string */ + +The default is to request the /index.html from the web server. If you want to +request another file then change the GET line as below: + +char *command = "GET /index.html HTTP/1.0 \r\n\r\n" ; + +To, for example: + +char *command = "GET /nigel.jpg HTTP/1.0 \r\n\r\n" ; + +Then compile the program with: cc client.c -o client + +I save the output in to a file as putting a non-test file like .jpg to the +terminal screen can cause chaos: client >output + +Then edit the output file: vi output + +In real life, the interaction of web browser and web server can be much more complex. + + 1. The web browser can tell the web server about its name, version and capabilities. + + 2. The web server can send complex file types line JavaScript or Java programs +or other active components. + + 3. They can maintain a longer connection over the socket for efficiency. + + 4. Below is an example of my Firefox brower requesting an index.html file. I +have added newline characters to make it readable - it is 1300 bytes long! I +have no idea what most of it is about. You will have to read the The World Wide +Web Consortium (W3C) at http://www.w3.org for all the details. + +GET /index.html HTTP/1.1Host: myserver.home.com:80User-Agent: Mozilla/5.0 (W indows; +U; Windows NT 5.1; en-GB; rv:1.9.2.28) Gecko/20120306 Firefox/3.6.28 (.NET CLR +3.5.30729)Ac cept: image/png,image/;q=0.8,/*;q=0.5Accept-Language: +en-gb,en;q=0.5Accept-Encoding: gzip,defla teAccept-Charset: ISO-8859-1,utf-8; +q=0.7,*;q=0.7Keep-Alive: 115Connection: keep-alive**Referer: +http://myserver.uk.home.com:8181/index.html**Cookie: +__utma=101107545.1790272076.1316019590.13289002 55.1328908680.164; +__utmz=101107545.1328566199.157.46.utmcsr=t.co|utmccn=(referral)|utmcmd=referral| u +tmcct=/iTJx4DO1; UnicaNIODID=ZBr8gm79vIG-XKeoGGb; W3SSO_ACCESS=abc.home.com; +ISP=70fdfc95 +d93011d783e4de784ea97766-70fdfc95d93011d783e4de784ea97766-f67749a8b899e8ceed7e940b8c4bf189; +Prof ile=2000121913394303111032836125|EN|866|866.BDF|en-GB; +_unam=693fb60-1337f162b72-11770d11-5; WLS intra_USERID=nigel@hotmail.com; +ipcInfo=cc%3Duk%3Blc%3Den%3Bac%3Dall; iwm1p=214617669; bprememberme=nigel@ +hotmail.com; EPSPROFILE=EE2355DFE16AE020BE6C62FCB6BF5602; +DWPERM=Xa.2/Xb.Xzso3-U35t8RWKvqBreGaQMgsP_RG +Fl1124oIt-L-OPJIdSautkBN0D4NUp9JLlpUqPqB6CWOo-pgrJwhxNvvSfPAajgetaA2MOYwHfQPXPTRG9zwOMMR57EHQtXhOy5Om +yzanyZthvVClm6uxvbwh0isEQ2Mm_9g2l7NjcA3RJdjuLaB3qlljOmyVuhDjBkgdNEb3PgYcCpbiu1FUzXrhPalhgsbAj7NBkaY88 +Yyg/Xc./Xd./Xf./Xg.1696801 + +I hope this has been instructive, thanks, Nigel Griffiths diff --git a/network/nweb/nweb.SlackBuild b/network/nweb/nweb.SlackBuild new file mode 100644 index 0000000000..cd2ac1d290 --- /dev/null +++ b/network/nweb/nweb.SlackBuild @@ -0,0 +1,89 @@ +#!/bin/sh + +# Slackware build script for nweb + +# Copyright 2021 Dave Woodfall <dave@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=nweb +COMMIT=${COMMIT:-867a6dd46298c882501f5c26d31ee821177542ab} +VERSION=${VERSION:-23_"$( printf %s $COMMIT | cut -c 1-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/usr/bin $OUTPUT +cd $TMP +rm -rf $PRGNAM-$COMMIT +tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz +cd $PRGNAM-$COMMIT +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 {} \; + +${CC:-gcc} $SLKCFLAGS nweb${VERSION:0:2}.c -o $PKG/usr/bin/nweb +strip --strip-unneeded $PKG/usr/bin/nweb + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{www-example,client} + +cp -a client.c $PKG/usr/doc/$PRGNAM-$VERSION/client +cp -a nigel.jpg favicon.ico nweb.log index.html \ + $PKG/usr/doc/$PRGNAM-$VERSION/www-example + +cp -a README.md $CWD/README.client $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/network/nweb/nweb.info b/network/nweb/nweb.info new file mode 100644 index 0000000000..1690b8b5b1 --- /dev/null +++ b/network/nweb/nweb.info @@ -0,0 +1,10 @@ +PRGNAM="nweb" +VERSION="23_867a6dd" +HOMEPAGE="https://github.com/ankushagarwal/nweb" +DOWNLOAD="https://github.com/ankushagarwal/nweb/archive/867a6dd46298c882501f5c26d31ee821177542ab/nweb-867a6dd46298c882501f5c26d31ee821177542ab.tar.gz" +MD5SUM="7570ab89a441f1b11f2ab099660b9daa" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Dave Woodfall" +EMAIL="dave@slackbuilds.org" diff --git a/network/nweb/slack-desc b/network/nweb/slack-desc new file mode 100644 index 0000000000..a271191935 --- /dev/null +++ b/network/nweb/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------------------------------------------------------| +nweb: nweb (A tiny web server in C) +nweb: +nweb: nweb is a small and very safe mini web server nweb only servers out +nweb: file/web pages with certain extensions and only from the named +nweb: directory or its sub-directories. +nweb: +nweb: There is no fancy features = safe and secure. +nweb: +nweb: Example: nweb 8181 /home/nwebdir & +nweb: +nweb: diff --git a/network/oinkmaster/oinkmaster.SlackBuild b/network/oinkmaster/oinkmaster.SlackBuild index c86dd69510..47fab12463 100644 --- a/network/oinkmaster/oinkmaster.SlackBuild +++ b/network/oinkmaster/oinkmaster.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for oinkmaster -# 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/network/oinkmaster/oinkmaster.info b/network/oinkmaster/oinkmaster.info index ba65512aeb..da176fd0c1 100644 --- a/network/oinkmaster/oinkmaster.info +++ b/network/oinkmaster/oinkmaster.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/network/onedrive/README b/network/onedrive/README index 29e3b9bc22..4d1699de4e 100644 --- a/network/onedrive/README +++ b/network/onedrive/README @@ -1,2 +1,19 @@ -A complete tool to interact with OneDrive on Linux. +A complete tool to interact with OneDrive on Linux. Built following the UNIX philosophy + +What's missing: while local changes are uploaded right away, remote +changes are delayed. + +After installing the package: +1) For configuration and Usage, see +/usr/doc/onedrive-$VERSION/docs/USAGE.md, +/usr/doc/onedrive-$VERSION/config and +man onedrive +2) For Docker support, see +/usr/doc/onedrive-$VERSION/docs/Docker.md +3) For Sharepoint group drive in Office 365 business or education, see +/usr/doc/onedrive-$VERSION/docs/Office365.md +4) If you encounter any bugs you can report them here on Github: +https://github.com/abraunegg/onedrive +(see /usr/doc/onedrive-$VERSION/README.md for more details how to do +this) diff --git a/network/onedrive/doinst.sh b/network/onedrive/doinst.sh new file mode 100644 index 0000000000..182d35ba3a --- /dev/null +++ b/network/onedrive/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/logrotate.d/onedrive.new + diff --git a/network/onedrive/onedrive.SlackBuild b/network/onedrive/onedrive.SlackBuild index 826ee27fed..42c308379a 100644 --- a/network/onedrive/onedrive.SlackBuild +++ b/network/onedrive/onedrive.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for onedrive -# Copyright 2019 Rob van Nues +# Copyright 2019-2020 Rob van Nues # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=onedrive -VERSION=${VERSION:-2.3.11} +VERSION=${VERSION:-2.4.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -89,6 +90,8 @@ 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/logrotate.d/onedrive $PKG/etc/logrotate.d/onedrive.new + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ README.md LICENSE CHANGELOG.md docs \ @@ -99,6 +102,7 @@ rm -r $PKG/usr/share 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/network/onedrive/onedrive.info b/network/onedrive/onedrive.info index af6729dbc3..06af605f99 100644 --- a/network/onedrive/onedrive.info +++ b/network/onedrive/onedrive.info @@ -1,8 +1,8 @@ PRGNAM="onedrive" -VERSION="2.3.11" +VERSION="2.4.7" HOMEPAGE="https://github.com/abraunegg/onedrive/releases" -DOWNLOAD="https://github.com/abraunegg/onedrive/archive/v2.3.11/onedrive-2.3.11.tar.gz" -MD5SUM="ed782c7ddb0f6473945a36d062bbf47b" +DOWNLOAD="https://github.com/abraunegg/onedrive/archive/v2.4.7/onedrive-2.4.7.tar.gz" +MD5SUM="27c48b19cae2b9f2fe66228feaa9c719" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="dmd" diff --git a/network/onedrive/slack-desc b/network/onedrive/slack-desc index 4eea71aed5..79770c29e1 100644 --- a/network/onedrive/slack-desc +++ b/network/onedrive/slack-desc @@ -5,11 +5,11 @@ # 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------------------------------------------------------| onedrive: onedrive (OneDrive Tool) onedrive: onedrive: A complete tool to interact with OneDrive on Linux. -onedrive: Built following the UNIX philosophy +onedrive: Built following the UNIX philosophy. onedrive: onedrive: https://github.com/abraunegg/onedrive onedrive: diff --git a/network/onioncat/README b/network/onioncat/README index f45fc75710..8de34eae3d 100644 --- a/network/onioncat/README +++ b/network/onioncat/README @@ -1,5 +1,7 @@ -onioncat creates a transparent IP layer on top of Tor's hidden services. -It trainsmits IP-based data transparently through the Tor network on a -location hidden basis. You can think of it as a point-to -multipoint VPN -between hidden services. +OnionCat creates a transparent IPv6 layer on top of Tor's hidden +services or I2P's tunnels. It transmits any kind of IP-based data +transparently through the Tor/I2P network on a location hidden basis. +You can think of it as a peer-to-peer VPN between hidden services. +Having Tor/I2P installed is not required for building. +The Tor/I2P installation does not have to be from SBo. diff --git a/network/onioncat/onioncat.SlackBuild b/network/onioncat/onioncat.SlackBuild index b9ae0507ea..03a618b06a 100644 --- a/network/onioncat/onioncat.SlackBuild +++ b/network/onioncat/onioncat.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for onioncat -# Copyright 2013-2019 Markus Reichelt, Aachen, DE +# Copyright 2013-2021 Markus Reichelt, Aachen, DE # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ # Now maintained by Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 PRGNAM=onioncat -VERSION=${VERSION:-0.2.8} +VERSION=${VERSION:-0.3.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -68,9 +68,9 @@ 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" \ CXXFLAGS="$SLKCFLAGS" \ @@ -86,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-handle-http \ --enable-packet-queue \ --enable-rtt \ + --disable-static \ --build=$ARCH-slackware-linux make diff --git a/network/onioncat/onioncat.info b/network/onioncat/onioncat.info index 9887a18521..ea846300c0 100644 --- a/network/onioncat/onioncat.info +++ b/network/onioncat/onioncat.info @@ -1,8 +1,8 @@ PRGNAM="onioncat" -VERSION="0.2.8" +VERSION="0.3.8" HOMEPAGE="https://www.cypherpunk.at/onioncat/" -DOWNLOAD="https://www.cypherpunk.at/ocat/download/Source/stable/onioncat-0.2.8.tar.gz" -MD5SUM="c4cd8a514c55471eee11719e1ff98b7c" +DOWNLOAD="https://www.cypherpunk.at/ocat/download/Source/0.3/onioncat-0.3.8.tar.gz" +MD5SUM="928e4bc2d2454d178d3ebddbf5a0436e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/onioncat/slack-desc b/network/onioncat/slack-desc index f61e2634b1..8d2f9d9fdc 100644 --- a/network/onioncat/slack-desc +++ b/network/onioncat/slack-desc @@ -13,7 +13,7 @@ onioncat: services. It trainsmits IP-based data transparently through the Tor onioncat: network on a location hidden basis. You can think of it as a point-to onioncat: -multipoint VPN between hidden services. onioncat: +onioncat: I2P is also supported. onioncat: onioncat: Website : https://www.cypherpunk.at/onioncat/ onioncat: -onioncat: diff --git a/network/onionshare/onionshare.SlackBuild b/network/onionshare/onionshare.SlackBuild index 75caaab646..9ad5bffabf 100644 --- a/network/onionshare/onionshare.SlackBuild +++ b/network/onionshare/onionshare.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=onionshare -VERSION=${VERSION:-2.1} +VERSION=${VERSION:-2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/onionshare/onionshare.info b/network/onionshare/onionshare.info index f54d6f8277..6218a2c976 100644 --- a/network/onionshare/onionshare.info +++ b/network/onionshare/onionshare.info @@ -1,10 +1,10 @@ PRGNAM="onionshare" -VERSION="2.1" +VERSION="2.2" HOMEPAGE="https://onionshare.org/" -DOWNLOAD="https://github.com/micahflee/onionshare/archive/v2.1/onionshare-2.1.tar.gz" -MD5SUM="f991eacdbae6f144e307409b47740f34" +DOWNLOAD="https://github.com/micahflee/onionshare/archive/v2.2/onionshare-2.2.tar.gz" +MD5SUM="3ff52742b7e6809b9646605e10b25562" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="tor python3-Flask stem python3-pycrypto PySocks python3-PyQt5 pysha3" +REQUIRES="tor stem python3-Flask python3-Flask-httpauth python3-pycrypto PySocks python3-PyQt5 pysha3" MAINTAINER="MDrights" EMAIL="psychi2009@gmail.com" diff --git a/network/openconnect/openconnect.SlackBuild b/network/openconnect/openconnect.SlackBuild index 423cf89792..505fb5f503 100644 --- a/network/openconnect/openconnect.SlackBuild +++ b/network/openconnect/openconnect.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openconnect -VERSION=${VERSION:-7.08} +VERSION=${VERSION:-8.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/openconnect/openconnect.info b/network/openconnect/openconnect.info index d2a600cc2b..474f8e9d00 100644 --- a/network/openconnect/openconnect.info +++ b/network/openconnect/openconnect.info @@ -1,10 +1,10 @@ PRGNAM="openconnect" -VERSION="7.08" -HOMEPAGE="http://www.infradead.org/openconnect.html" -DOWNLOAD="ftp://ftp.infradead.org/pub/openconnect/openconnect-7.08.tar.gz" -MD5SUM="ca2ca1f61b8515879b481dcf6ed4366b" +VERSION="8.10" +HOMEPAGE="https://www.infradead.org/openconnect/" +DOWNLOAD="ftp://ftp.infradead.org/pub/openconnect/openconnect-8.10.tar.gz" +MD5SUM="d772c3c68afae12252a5377a99352b97" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" +MAINTAINER="Marek Wodzinski" +EMAIL="majek@w7i.pl" diff --git a/network/openconnect/slack-desc b/network/openconnect/slack-desc index addc710418..03c8767563 100644 --- a/network/openconnect/slack-desc +++ b/network/openconnect/slack-desc @@ -12,8 +12,8 @@ openconnect: OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is openconnect: supported by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco openconnect: SR500, 870, 880, 1800, 2800, 3800, 7200 Series, and Cisco 7301 openconnect: Routers, and probably others. +openconnect: It supports also Juniper and GlobalProtect VPN protocols and +openconnect: have partial support for Pulse Connect Secure. openconnect: openconnect: This is released under the GNU Lesser Public License, version 2.1. openconnect: -openconnect: -openconnect: diff --git a/network/openfortivpn/openfortivpn.SlackBuild b/network/openfortivpn/openfortivpn.SlackBuild index b0dd518e5e..b4b3eb02bb 100644 --- a/network/openfortivpn/openfortivpn.SlackBuild +++ b/network/openfortivpn/openfortivpn.SlackBuild @@ -21,9 +21,12 @@ # 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. +# +# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico +# PRGNAM=openfortivpn -VERSION=${VERSION:-1.1.4} +VERSION=${VERSION:-1.16.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/openfortivpn/openfortivpn.info b/network/openfortivpn/openfortivpn.info index 3bae8f084d..f5af3f59fc 100644 --- a/network/openfortivpn/openfortivpn.info +++ b/network/openfortivpn/openfortivpn.info @@ -1,10 +1,10 @@ PRGNAM="openfortivpn" -VERSION="1.1.4" +VERSION="1.16.0" HOMEPAGE="https://github.com/adrienverge/openfortivpn" -DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.1.4/openfortivpn-1.1.4.zip" -MD5SUM="0c091f3306cadcd870b92925d241c011" +DOWNLOAD="https://github.com/adrienverge/openfortivpn/archive/v1.16.0/openfortivpn-1.16.0.zip" +MD5SUM="49da457d748059d455dec4c6dbff94fc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Antonio Taverna" -EMAIL="antonio.tvr@gmail.com" +MAINTAINER="Gerardo Zamudio" +EMAIL="gerardo.zamudio@linux.com" diff --git a/network/openresolv/openresolv.SlackBuild b/network/openresolv/openresolv.SlackBuild index 5e4735da16..b21a307c5f 100644 --- a/network/openresolv/openresolv.SlackBuild +++ b/network/openresolv/openresolv.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for openresolv # Copyright 2012-2013 synbq Bucharest -# Copyright 2017 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> +# Copyright 2017-2021 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> # 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=openresolv -VERSION=${VERSION:-3.9.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-3.12.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -96,7 +96,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 README $PKG/usr/doc/$PRGNAM-$VERSION +cp README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild if [ "${OPENVPN}" = "yes" ]; then diff --git a/network/openresolv/openresolv.info b/network/openresolv/openresolv.info index 44dc4e4482..3a5cdc223e 100644 --- a/network/openresolv/openresolv.info +++ b/network/openresolv/openresolv.info @@ -1,8 +1,8 @@ PRGNAM="openresolv" -VERSION="3.9.0" +VERSION="3.12.0" HOMEPAGE="https://roy.marples.name/projects/openresolv" -DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.9.0.tar.xz" -MD5SUM="177ad48b768d4d1bf37510f1af99dffe" +DOWNLOAD="https://roy.marples.name/downloads/openresolv/openresolv-3.12.0.tar.xz" +MD5SUM="595f8633c111c150b86825b027e0bbde" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/openresolv/update-resolv-conf b/network/openresolv/update-resolv-conf index 3c95f84531..a20260576e 100644 --- a/network/openresolv/update-resolv-conf +++ b/network/openresolv/update-resolv-conf @@ -45,7 +45,7 @@ up) R="${R}nameserver $NS " done - echo -n "$R" | /usr/sbin/resolvconf -a "${dev}.inet" + echo -n "$R" | /usr/sbin/resolvconf -x -a "${dev}.inet" ;; down) /usr/sbin/resolvconf -d "${dev}.inet" diff --git a/network/opensmtpd-extras/README b/network/opensmtpd-extras/README index d1bc1595ea..3ea2084472 100644 --- a/network/opensmtpd-extras/README +++ b/network/opensmtpd-extras/README @@ -1,11 +1,13 @@ -OpenSMTPD extras - backends for OpenSMTPD tables, schedulers, queues and filters +OpenSMTPD extras - backends for OpenSMTPD tables, schedulers, queues +and filters -Allows using different backends for OpenSMTPD tables, schedulers, queues and filters, -including SQLite, MySQL, PostgreSQL, LDAP... +Allows using different backends for OpenSMTPD tables, schedulers, queues +and filters, including SQLite, MySQL, PostgreSQL, LDAP... -Each backend can be activated or deactivated by setting the relevant env var to yes or no. -By default, Password, MySQL and SQLite table backends are built, since they are pretty straightforward to use, -and everything is available on a stock slackware installation. +Each backend can be activated or deactivated by setting the relevant env +var to yes or no. By default, Password, MySQL and SQLite table backends +are built, since they are pretty straightforward to use, and everything +is available on a stock Slackware installation. * Tables: TLDAP=no diff --git a/network/opensmtpd-extras/opensmtpd-extras.SlackBuild b/network/opensmtpd-extras/opensmtpd-extras.SlackBuild index 5bd451b169..abea59c70e 100644 --- a/network/opensmtpd-extras/opensmtpd-extras.SlackBuild +++ b/network/opensmtpd-extras/opensmtpd-extras.SlackBuild @@ -20,7 +20,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opensmtpd-extras -VERSION=${VERSION:-6.4.0} +SRCNAM=OpenSMTPD-extras +VERSION=${VERSION:-6.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -96,9 +97,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ diff --git a/network/opensmtpd-extras/opensmtpd-extras.info b/network/opensmtpd-extras/opensmtpd-extras.info index 67e0624fce..d4461b1b3f 100644 --- a/network/opensmtpd-extras/opensmtpd-extras.info +++ b/network/opensmtpd-extras/opensmtpd-extras.info @@ -1,8 +1,8 @@ PRGNAM="opensmtpd-extras" -VERSION="6.4.0" +VERSION="6.7.1" HOMEPAGE="https://www.opensmtpd.org/" -DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-extras-6.4.0.tar.gz" -MD5SUM="9fe974c25af3234cee59c2a9864043da" +DOWNLOAD="https://github.com/OpenSMTPD/OpenSMTPD-extras/archive/6.7.1/OpenSMTPD-extras-6.7.1.tar.gz" +MD5SUM="342d3f9eebaf4171df6378642136f075" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opensmtpd" diff --git a/network/opensmtpd/openbsd64-020-smtpd.patch b/network/opensmtpd/openbsd64-020-smtpd.patch index a1aa51607a..8ce7178da8 100644 --- a/network/opensmtpd/openbsd64-020-smtpd.patch +++ b/network/opensmtpd/openbsd64-020-smtpd.patch @@ -1,3 +1,7 @@ +OpenBSD 6.4 errata 020, August 2, 2019 + +smtpd can crash on excessively large input, causing a denial of service. + --- a/smtpd/smtp_session.c 3 Sep 2018 19:01:29 -0000 1.337 +++ b/smtpd/smtp_session.c 1 Aug 2019 21:18:53 -0000 @@ -1904,15 +1904,21 @@ smtp_reply(struct smtp_session *s, char diff --git a/network/opensmtpd/openbsd65-029-smptd-tls.patch b/network/opensmtpd/openbsd65-029-smptd-tls.patch new file mode 100644 index 0000000000..a2727decf8 --- /dev/null +++ b/network/opensmtpd/openbsd65-029-smptd-tls.patch @@ -0,0 +1,52 @@ +OpenBSD 6.5 errata 029, January 30, 2020: + +smtpd can crash on opportunistic TLS downgrade, causing a denial of service. + +--- usr.sbin/smtpd/mta_session.c 23 Dec 2018 16:37:53 -0000 1.115 ++++ usr.sbin/smtpd/mta_session.c 20 Jan 2020 10:36:58 -0000 +@@ -1292,40 +1292,20 @@ mta_io(struct io *io, int evt, void *arg + break; + + case IO_ERROR: ++ case IO_TLSERROR: + log_debug("debug: mta: %p: IO error: %s", s, io_error(io)); +- if (!s->ready) { +- mta_error(s, "IO Error: %s", io_error(io)); +- mta_connect(s); +- break; +- } +- else if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) { +- /* error in non-strict SSL negotiation, downgrade to plain */ +- if (s->flags & MTA_TLS) { +- log_info("smtp-out: Error on session %016"PRIx64 +- ": opportunistic TLS failed, " +- "downgrading to plain", s->id); +- s->flags &= ~MTA_TLS; +- s->flags |= MTA_DOWNGRADE_PLAIN; +- mta_connect(s); +- break; +- } +- } +- mta_error(s, "IO Error: %s", io_error(io)); +- mta_free(s); +- break; + +- case IO_TLSERROR: +- log_debug("debug: mta: %p: TLS IO error: %s", s, io_error(io)); +- if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) { ++ if (s->state == MTA_STARTTLS && s->use_smtp_tls) { + /* error in non-strict SSL negotiation, downgrade to plain */ +- log_info("smtp-out: TLS Error on session %016"PRIx64 +- ": TLS failed, " ++ log_info("smtp-out: Error on session %016"PRIx64 ++ ": opportunistic TLS failed, " + "downgrading to plain", s->id); + s->flags &= ~MTA_TLS; + s->flags |= MTA_DOWNGRADE_PLAIN; + mta_connect(s); + break; + } ++ + mta_error(s, "IO Error: %s", io_error(io)); + mta_free(s); + break; diff --git a/network/opensmtpd/openbsd65-031-smtpd-envelope.patch b/network/opensmtpd/openbsd65-031-smtpd-envelope.patch new file mode 100644 index 0000000000..cd59f1d6fa --- /dev/null +++ b/network/opensmtpd/openbsd65-031-smtpd-envelope.patch @@ -0,0 +1,199 @@ +OpenBSD 6.5 errata 031, February 24, 2020: + +An out of bounds read in smtpd allows an attacker to inject arbitrary +commands into the envelope file which are then executed as root. +Separately, missing privilege revocation in smtpctl allows arbitrary +commands to be run with the _smtpq group. + +--- a/smtpd/makemap.c.orig 2018-01-10 05:06:40.000000000 -0800 ++++ b/smtpd/makemap.c 2020-02-24 15:41:18.278340410 -0800 +@@ -105,8 +105,13 @@ makemap(int prog_mode, int argc, char *a + int ch, dbputs = 0, Uflag = 0; + DBTYPE dbtype = DB_HASH; + char *p; ++ gid_t gid; + int fd = -1; + ++ gid = getgid(); ++ if (setresgid(gid, gid, gid) == -1) ++ err(1, "setresgid"); ++ + log_init(1, LOG_MAIL); + + mode = prog_mode; +@@ -180,9 +185,9 @@ makemap(int prog_mode, int argc, char *a + errx(1, "database name too long"); + } + +- execlp("makemap", "makemap", "-d", argv[0], "-o", dbname, "-", +- (char *)NULL); +- err(1, "execlp"); ++ execl(PATH_MAKEMAP, "makemap", "-d", argv[0], "-o", dbname, ++ "-", (char *)NULL); ++ err(1, "execl"); + } + + if (mode == P_NEWALIASES) { +--- a/smtpd/mta_session.c.orig 2020-02-08 10:24:17.692029666 -0800 ++++ b/smtpd/mta_session.c 2020-02-24 15:46:46.121342818 -0800 +@@ -1214,7 +1214,7 @@ mta_io(struct io *io, int evt, void *arg + if (cont) { + if (s->replybuf[0] == '\0') + (void)strlcat(s->replybuf, line, sizeof s->replybuf); +- else { ++ else if (len > 4) { + line = line + 4; + if (isdigit((int)*line) && *(line + 1) == '.' && + isdigit((int)*line+2) && *(line + 3) == '.' && +@@ -1229,7 +1229,9 @@ mta_io(struct io *io, int evt, void *arg + /* last line of a reply, check if we're on a continuation to parse out status and ESC. + * if we overflow reply buffer or are not on continuation, log entire last line. + */ +- if (s->replybuf[0] != '\0') { ++ if (s->replybuf[0] == '\0') ++ (void)strlcat(s->replybuf, line, sizeof s->replybuf); ++ else if (len > 4) { + p = line + 4; + if (isdigit((int)*p) && *(p + 1) == '.' && + isdigit((int)*p+2) && *(p + 3) == '.' && +@@ -1238,8 +1240,6 @@ mta_io(struct io *io, int evt, void *arg + if (strlcat(s->replybuf, p, sizeof s->replybuf) >= sizeof s->replybuf) + (void)strlcpy(s->replybuf, line, sizeof s->replybuf); + } +- else +- (void)strlcpy(s->replybuf, line, sizeof s->replybuf); + + if (s->state == MTA_QUIT) { + log_info("%016"PRIx64" mta event=closed reason=quit messages=%zu", +--- a/smtpd/smtpctl.c.orig 2018-01-10 05:06:40.000000000 -0800 ++++ b/smtpd/smtpctl.c 2020-02-24 14:57:04.687320914 -0800 +@@ -1116,7 +1116,7 @@ sendmail_compat(int argc, char **argv) + */ + for (i = 1; i < argc; i++) + if (strncmp(argv[i], "-bi", 3) == 0) +- exit(makemap(P_NEWALIASES, argc, argv)); ++ exit(makemap(P_SENDMAIL, argc, argv)); + + if (!srv_connect()) + offlinefp = offline_file(); +--- a/smtpd/smtpd-defines.h.orig 2018-01-10 05:06:40.000000000 -0800 ++++ b/smtpd/smtpd-defines.h 2020-02-24 15:00:29.616322420 -0800 +@@ -46,6 +46,9 @@ + #ifndef PATH_SPOOL + #define PATH_SPOOL "/var/spool/smtpd" + #endif ++#ifndef PATH_MAKEUP ++#define PATH_MAKEMAP "/usr/sbin/makemap" ++#endif + + #define SUBADDRESSING_DELIMITER "+" + +--- a/smtpd/smtpd.c.orig 2018-01-10 05:06:40.000000000 -0800 ++++ b/smtpd/smtpd.c 2020-02-24 15:55:55.503346854 -0800 +@@ -109,9 +109,10 @@ static struct mproc *setup_peer(enum smt + static int imsg_wait(struct imsgbuf *, struct imsg *, int); + + static void offline_scan(int, short, void *); +-static int offline_add(char *); ++static int offline_add(char *, uid_t, gid_t); + static void offline_done(void); +-static int offline_enqueue(char *); ++static int offline_enqueue(char *, uid_t, gid_t); ++ + + static void purge_task(void); + static int parent_auth_user(const char *, const char *); +@@ -136,6 +137,8 @@ struct child { + + struct offline { + TAILQ_ENTRY(offline) entry; ++ uid_t uid; ++ gid_t gid; + char *path; + }; + +@@ -1409,7 +1412,8 @@ offline_scan(int fd, short ev, void *arg + continue; + } + +- if (offline_add(e->fts_name)) { ++ if (offline_add(e->fts_name, e->fts_statp->st_uid, ++ e->fts_statp->st_gid)) { + log_warnx("warn: smtpd: " + "could not add offline message %s", e->fts_name); + continue; +@@ -1429,7 +1433,7 @@ offline_scan(int fd, short ev, void *arg + } + + static int +-offline_enqueue(char *name) ++offline_enqueue(char *name, uid_t uid, gid_t gid) + { + char *path; + struct stat sb; +@@ -1491,6 +1495,18 @@ offline_enqueue(char *name) + _exit(1); + } + ++ if (sb.st_uid != uid) { ++ log_warnx("warn: smtpd: file %s has bad uid %d", ++ path, sb.st_uid); ++ _exit(1); ++ } ++ ++ if (sb.st_gid != gid) { ++ log_warnx("warn: smtpd: file %s has bad gid %d", ++ path, sb.st_gid); ++ _exit(1); ++ } ++ + pw = getpwuid(sb.st_uid); + if (pw == NULL) { + log_warnx("warn: smtpd: getpwuid for uid %d failed", +@@ -1547,17 +1563,19 @@ offline_enqueue(char *name) + } + + static int +-offline_add(char *path) ++offline_add(char *path, uid_t uid, gid_t gid) + { + struct offline *q; + + if (offline_running < OFFLINE_QUEUEMAX) + /* skip queue */ +- return offline_enqueue(path); ++ return offline_enqueue(path, uid, gid); + + q = malloc(sizeof(*q) + strlen(path) + 1); + if (q == NULL) + return (-1); ++ q->uid = uid; ++ q->gid = gid; + q->path = (char *)q + sizeof(*q); + memmove(q->path, path, strlen(path) + 1); + TAILQ_INSERT_TAIL(&offline_q, q, entry); +@@ -1576,7 +1594,8 @@ offline_done(void) + if ((q = TAILQ_FIRST(&offline_q)) == NULL) + break; /* all done */ + TAILQ_REMOVE(&offline_q, q, entry); +- offline_enqueue(q->path); ++ offline_enqueue(q->path, q->uid, q->gid); ++ + free(q); + } + } +--- a/smtpd/smtpd.h.orig 2018-01-10 05:06:40.000000000 -0800 ++++ b/smtpd/smtpd.h 2020-02-24 15:20:09.043331085 -0800 +@@ -128,8 +128,10 @@ + #define MTA_EXT_DSN 0x400 + + +-#define P_NEWALIASES 0 +-#define P_MAKEMAP 1 ++#define P_SENDMAIL 0 ++#define P_NEWALIASES 1 ++#define P_MAKEMAP 2 ++ + + struct userinfo { + char username[SMTPD_VUSERNAME_SIZE]; diff --git a/network/opensmtpd/openbsd66-019-smtpd-exec.patch b/network/opensmtpd/openbsd66-019-smtpd-exec.patch new file mode 100644 index 0000000000..93ce19dcb1 --- /dev/null +++ b/network/opensmtpd/openbsd66-019-smtpd-exec.patch @@ -0,0 +1,46 @@ +OpenBSD 6.6 errata 019, January 30, 2020: + +An incorrect check allows an attacker to trick mbox delivery into executing +arbitrary commands as root and lmtp delivery into executing arbitrary commands +as an unprivileged user. + +--- usr.sbin/smtpd/smtp_session.c 4 Oct 2019 08:34:29 -0000 1.415 ++++ usr.sbin/smtpd/smtp_session.c 26 Jan 2020 05:56:37 -0000 +@@ -2012,24 +2012,22 @@ smtp_mailaddr(struct mailaddr *maddr, ch + memmove(maddr->user, p, strlen(p) + 1); + } + +- if (!valid_localpart(maddr->user) || +- !valid_domainpart(maddr->domain)) { +- /* accept empty return-path in MAIL FROM, required for bounces */ +- if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0') +- return (1); ++ /* accept empty return-path in MAIL FROM, required for bounces */ ++ if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0') ++ return (1); + +- /* no user-part, reject */ +- if (maddr->user[0] == '\0') +- return (0); +- +- /* no domain, local user */ +- if (maddr->domain[0] == '\0') { +- (void)strlcpy(maddr->domain, domain, +- sizeof(maddr->domain)); +- return (1); +- } ++ /* no or invalid user-part, reject */ ++ if (maddr->user[0] == '\0' || !valid_localpart(maddr->user)) + return (0); ++ ++ /* no domain part, local user */ ++ if (maddr->domain[0] == '\0') { ++ (void)strlcpy(maddr->domain, domain, ++ sizeof(maddr->domain)); + } ++ ++ if (!valid_domainpart(maddr->domain)) ++ return (0); + + return (1); + } diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild index d2e54fba71..54a4f8e4cf 100644 --- a/network/opensmtpd/opensmtpd.SlackBuild +++ b/network/opensmtpd/opensmtpd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for opensmtpd # Copyright 2013-2014 Robby Workman, Northport, Alabama, USA -# Copyright 2015-2018 Richard Narron, California, USA +# Copyright 2015-2020 Richard Narron, California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PRGNAM=opensmtpd VERSION=${VERSION:-6.0.3p1} -BUILD=${BUILD:-4} +BUILD=${BUILD:-6} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -95,9 +95,18 @@ find -L . \ # fix reply buffer overflow cat $CWD/openbsd64-020-smtpd.patch | patch -p1 +# fix tls downgrade +cat $CWD/openbsd65-029-smptd-tls.patch | patch -p1 + +# fix exec +cat $CWD/openbsd66-019-smtpd-exec.patch | patch -p1 + # check null from crypt function cat $CWD/fix-crash-on-authentication.patch | patch -p1 +# fix smtpctl envelop +cat $CWD/openbsd65-031-smtpd-envelope.patch | patch -p1 + CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/openvswitch-utils/openvswitch-utils.SlackBuild b/network/openvswitch-utils/openvswitch-utils.SlackBuild index 14fe64a5bf..c20275a51a 100644 --- a/network/openvswitch-utils/openvswitch-utils.SlackBuild +++ b/network/openvswitch-utils/openvswitch-utils.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for openvswitch-utils -# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2018 Mario Preksavec, Zagreb, Croatia +# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 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=openvswitch-utils -VERSION=${VERSION:-2.5.6} +VERSION=${VERSION:-2.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -100,7 +100,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 *.md AUTHORS COPYING NEWS NOTICE $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.rst LICENSE NEWS NOTICE $CWD/README.SLACKWARE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/openvswitch-utils/openvswitch-utils.info b/network/openvswitch-utils/openvswitch-utils.info index b6c74887e9..fc6c13d9b2 100644 --- a/network/openvswitch-utils/openvswitch-utils.info +++ b/network/openvswitch-utils/openvswitch-utils.info @@ -1,10 +1,10 @@ PRGNAM="openvswitch-utils" -VERSION="2.5.6" +VERSION="2.14.0" HOMEPAGE="http://openvswitch.org/" -DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.5.6.tar.gz" -MD5SUM="4b27da13c7f0c76c56bdcfa76deb0e77" +DOWNLOAD="http://openvswitch.org/releases/openvswitch-2.14.0.tar.gz" +MD5SUM="92e464f962c5ebbac73c58ad799fa9d9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/network/opera-developer/README b/network/opera-developer/README index 71795a79e4..0d822148de 100644 --- a/network/opera-developer/README +++ b/network/opera-developer/README @@ -13,4 +13,4 @@ https://blogs.opera.com/desktop/2017/05/opera-developer-46-0-2590-0-update/ This suggests: pepperflash-plugin, ffmpeg, opera-developer-ffmpeg-codecs -Changelog: https://blogs.opera.com/desktop/changelog-for-66/#b3489.0 +Changelog: https://blogs.opera.com/desktop/changelog-for-76/#b3995.0 diff --git a/network/opera-developer/opera-developer.SlackBuild b/network/opera-developer/opera-developer.SlackBuild index 8a59e1e2f7..8b606f797a 100644 --- a/network/opera-developer/opera-developer.SlackBuild +++ b/network/opera-developer/opera-developer.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for opera-developer. # -# Copyright 2016-2019 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=opera-developer -VERSION=${VERSION:-66.0.3489.0} +VERSION=${VERSION:-76.0.3995.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,7 +67,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-${VERSION} -mkdir $PRGNAM-${VERSION} +mkdir -p $PRGNAM-${VERSION} ar p $CWD/${PRGNAM}_${VERSION}_${BITS}.deb data.tar.xz | xz -d | tar -xvf- \ --transform="s,/lib/.*-linux-gnu,/lib$LIBDIRSUFFIX," \ --exclude="./usr/share/lintian" --exclude="./usr/share/menu" -C $PRGNAM-${VERSION} diff --git a/network/opera-developer/opera-developer.info b/network/opera-developer/opera-developer.info index 6da0049806..1d56dcadf6 100644 --- a/network/opera-developer/opera-developer.info +++ b/network/opera-developer/opera-developer.info @@ -1,10 +1,10 @@ PRGNAM="opera-developer" -VERSION="66.0.3489.0" +VERSION="76.0.3995.0" HOMEPAGE="https://www.opera.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download1.operacdn.com/pub/opera-developer/66.0.3489.0/linux/opera-developer_66.0.3489.0_amd64.deb" -MD5SUM_x86_64="d1ae1e33aab2028955bc81ba59222951" +DOWNLOAD_x86_64="https://get.geo.opera.com/pub/opera-developer/76.0.3995.0/linux/opera-developer_76.0.3995.0_amd64.deb" +MD5SUM_x86_64="a9f66589cb2496129e0146f19173ed93" REQUIRES="" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/network/opera-developer/slack-desc b/network/opera-developer/slack-desc index 6615af0b28..810ab1f375 100644 --- a/network/opera-developer/slack-desc +++ b/network/opera-developer/slack-desc @@ -12,7 +12,7 @@ opera-developer: Opera is a graphical Web browser available on several platforms opera-developer: The desktop version runs on GNU/Linux and FreeBSD. Versions for opera-developer: Macintosh and Windows are also available. opera-developer: -opera-developer: Home page: https://www.opera.com/ +opera-developer: Homepage: https://www.opera.com/ opera-developer: opera-developer: opera-developer: diff --git a/network/opera/README b/network/opera/README index c1d90dcede..3c8a842e4a 100644 --- a/network/opera/README +++ b/network/opera/README @@ -13,4 +13,4 @@ https://blogs.opera.com/desktop/2017/05/opera-developer-46-0-2590-0-update/ This suggests: pepperflash-plugin, ffmpeg, opera-ffmpeg-codecs. -Changelog: https://blogs.opera.com/desktop/changelog-for-64/#b3417.83 +Changelog: https://blogs.opera.com/desktop/changelog-for-75/#b3969.93 diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild index c55c7311bb..07912428b8 100644 --- a/network/opera/opera.SlackBuild +++ b/network/opera/opera.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for opera. # -# Copyright 2016-2019 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=opera -VERSION=${VERSION:-64.0.3417.83} +VERSION=${VERSION:-75.0.3969.93} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/opera/opera.info b/network/opera/opera.info index 9c5384a37e..e75e83675f 100644 --- a/network/opera/opera.info +++ b/network/opera/opera.info @@ -1,10 +1,10 @@ PRGNAM="opera" -VERSION="64.0.3417.83" +VERSION="75.0.3969.93" HOMEPAGE="https://www.opera.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download3.operacdn.com/pub/opera/desktop/64.0.3417.83/linux/opera-stable_64.0.3417.83_amd64.deb" -MD5SUM_x86_64="bb01f119ecdf09a63d9bd63ae18335b9" +DOWNLOAD_x86_64="https://get.geo.opera.com/pub/opera/desktop/75.0.3969.93/linux/opera-stable_75.0.3969.93_amd64.deb" +MD5SUM_x86_64="a2fca02d23220fa2d4ffd52603530fc1" REQUIRES="" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/network/otter/otter.SlackBuild b/network/otter/otter.SlackBuild index 49ae35c95b..fc3fefa5c5 100644 --- a/network/otter/otter.SlackBuild +++ b/network/otter/otter.SlackBuild @@ -22,12 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SRCNAM=otter-browser -PRGNAM=$(echo $SRCNAM | cut -c1-5) +PRGNAM=otter VERSION=${VERSION:-1.0.01} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +SRCNAM=otter-browser + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; diff --git a/network/owncloud-client/owncloud-client.SlackBuild b/network/owncloud-client/owncloud-client.SlackBuild index 0ee0dd35aa..b5ab05a98d 100644 --- a/network/owncloud-client/owncloud-client.SlackBuild +++ b/network/owncloud-client/owncloud-client.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for owncloud-client # Copyright 2013-2018 Christopher Walker Kempner, TX +# Copyright 2020 Isaac Yu <isaacyu1@isaacyu1.com> # 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=owncloud-client -VERSION=${VERSION:-2.4.2} +VERSION=${VERSION:-2.5.4.11654} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/owncloud-client/owncloud-client.info b/network/owncloud-client/owncloud-client.info index 118f044e16..5b2da1d1b6 100644 --- a/network/owncloud-client/owncloud-client.info +++ b/network/owncloud-client/owncloud-client.info @@ -1,10 +1,10 @@ PRGNAM="owncloud-client" -VERSION="2.4.2" +VERSION="2.5.4.11654" HOMEPAGE="https://owncloud.org/" -DOWNLOAD="https://download.owncloud.com/desktop/stable/owncloudclient-2.4.2.tar.xz" -MD5SUM="0f1d03650888864ffb045162ef9de49d" +DOWNLOAD="https://download.owncloud.com/desktop/stable/owncloudclient-2.5.4.11654.tar.xz" +MD5SUM="cbc65677623df31956a4c4082a2c68a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5-webkit qtkeychain" -MAINTAINER="Christopher Walker" -EMAIL="kris240376@gmail.com" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu1@isaacyu1.com" diff --git a/network/pCloudDrive/README b/network/pCloudDrive/README new file mode 100644 index 0000000000..d685f34354 --- /dev/null +++ b/network/pCloudDrive/README @@ -0,0 +1,42 @@ +pCloudDrive (pCloud client and drive mounter) + +pCloud Drive allows you to use your files in the cloud as if they are +saved locally, but without taking hard disk space. + +pCloud is one of the most secure and easy-to-use cloud storage +services. It's based in Switzerland giving the best level of privacy. +Unlike Dropbox, pCloud gives 10 GB of free cloud storage. + +They have all the features you are familiar with like, download link sharing, +folder sharing, giving special permissions to people you share with, +setting passwords and expiration dates and even more. + +pCloud also put no restrictions on the uploading size so you can upload any type +of file regardless of its size. There is no upload or download limit either, +and you can enjoy very high speeds. + +Security is something for which pCloud is particularly famous. pCloud offers +top-level cloud encryption with its Crypto service designed to secure the most +sensitive information on any device of yours. All the data locked +by pCloud Crypto can only be unlocked by the unique key which the account owner +has, and no one else can even touch the secure data. + +pCloud features: + * File management tools available to search and filter the files and folders + * TLS/SSL encryption to securely transfer the data to pCloud servers + * Automatic sync of all the files and folders across desktop and +mobile devices for a seamless transition + * Zero-knowledge privacy + * Client-side encryption to keep the data secure in case your device gets lost + * Previous versions of data available with pCloud Rewind which keeps everything +for 30 days in case you remove anything accidentally + * App for Windows, macOS, Linux, iOS, and Android + +Finally, if we talk about the plans of pCloud, you have the freedom to choose +between two different storage types — 500 GB and 2 TB — with either the annual +or lifetime subscription. + +This script repackages AppImage. + +Download link is dynamic, so you will need to download app image manually in +your web browser. diff --git a/network/weboob/doinst.sh b/network/pCloudDrive/doinst.sh index 65c7e2eeb9..4a25de5e6f 100644 --- a/network/weboob/doinst.sh +++ b/network/pCloudDrive/doinst.sh @@ -7,3 +7,4 @@ 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/network/pCloudDrive/pCloudDrive.SlackBuild b/network/pCloudDrive/pCloudDrive.SlackBuild new file mode 100644 index 0000000000..ed286a3e18 --- /dev/null +++ b/network/pCloudDrive/pCloudDrive.SlackBuild @@ -0,0 +1,84 @@ +#!/bin/sh + +# Slackware build script for pCloudDrive + +# Copyright 2020 Igor Alexandrov <igor.alexandrov@outlook.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. + +# Modifid by slackbuilds.org + +PRGNAM=pCloudDrive +VERSION=${VERSION:-1.8.2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + ARCH=$(uname -m) +fi + +case "$ARCH" in + i?86) break ;; + x86_64) break ;; + *) + echo "$ARCH is not supported for $PRGNAM-$VERSION" + exit 1 + ;; +esac + +set -e + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +APPIMGNAM=pcloud + +rm -rf $PKG +mkdir -p $TMP $OUTPUT $PKG/{install,opt,usr/{bin,doc/$PRGNAM-$VERSION}} +cd $PKG/opt +chmod 755 $CWD/$APPIMGNAM +$CWD/$APPIMGNAM --appimage-extract +mv squashfs-root $PRGNAM +cd $PKG +mv $PKG/opt/$PRGNAM/usr/share $PKG/usr +rm -rf $PKG/opt/$PRGNAM/{usr,AppRun,pcloud.png,pcloud.desktop,resources/app/.vscode} +install -D -m 644 -t $PKG/usr/share/applications $CWD/pclouddrive.desktop + +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 {} \; -o \ + \( -perm 700 \) -exec chmod 755 {} \; + +find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +ln -s ../../opt/$PRGNAM/$APPIMGNAM usr/bin/$PRGNAM +ln -s ../../../opt/$PRGNAM/LICENSE.electron.txt usr/doc/$PRGNAM-$VERSION +ln -s ../../../opt/$PRGNAM/LICENSES.chromium.html usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/pCloudDrive/pCloudDrive.info b/network/pCloudDrive/pCloudDrive.info new file mode 100644 index 0000000000..9fcaac6eaa --- /dev/null +++ b/network/pCloudDrive/pCloudDrive.info @@ -0,0 +1,10 @@ +PRGNAM="pCloudDrive" +VERSION="1.8.2" +HOMEPAGE="https://www.pcloud.com" +DOWNLOAD="https://www.pcloud.com/how-to-install-pcloud-drive-linux.html?download=electron-32" +MD5SUM="f901d19762baa9f3c5fce9ed6c2b9fed" +DOWNLOAD_x86_64="https://www.pcloud.com/how-to-install-pcloud-drive-linux.html?download=electron-64" +MD5SUM_x86_64="62560154e26d5b848e7bc3e5c19cc649" +REQUIRES="" +MAINTAINER="Igor Alexandrov" +EMAIL="igor.alexandrov@outlook.com" diff --git a/network/pCloudDrive/pclouddrive.desktop b/network/pCloudDrive/pclouddrive.desktop new file mode 100644 index 0000000000..a7272366b5 --- /dev/null +++ b/network/pCloudDrive/pclouddrive.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=pCloudDrive +Comment=pCloud Drive Client +Type=Application +Exec="pCloudDrive" %U +Terminal=false +Icon=pcloud +Categories=Network; +StartupWMClass=pcloud diff --git a/network/pCloudDrive/slack-desc b/network/pCloudDrive/slack-desc new file mode 100644 index 0000000000..2e0d5dac14 --- /dev/null +++ b/network/pCloudDrive/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------------------------------------------------------| +pCloudDrive: pCloudDrive (pCloud client and drive mounter) +pCloudDrive: +pCloudDrive: pCloud Drive allows you to use your files in the cloud as if they are +pCloudDrive: saved locally, but without taking hard disk space. +pCloudDrive: +pCloudDrive: pCloud is one of the most secure and easy-to-use cloud storage +pCloudDrive: services. It's based in Switzerland giving the best level of privacy. +pCloudDrive: Unlike Dropbox, pCloud gives 10 GB of free cloud storage. +pCloudDrive: +pCloudDrive: https://www.pcloud.com/ +pCloudDrive: diff --git a/network/palemoon-bin/README b/network/palemoon-bin/README index ee331b0de8..3487167d82 100644 --- a/network/palemoon-bin/README +++ b/network/palemoon-bin/README @@ -11,3 +11,8 @@ dictionary by passing the USE_SYSTEM_SPELLCHECK=yes variable to the script. If you need to change the GUI language, please visit https://www.palemoon.org/langpacks.shtml and follow the installation instructions. + +NOTE: +32 bit packages have been discontinued; and 64 bit binaries are now released +in gtk2 and gtk3 variations. If you desire to use a gtk3 variation, pass the +variable GTK=gtk3 to the script. diff --git a/network/palemoon-bin/palemoon-bin.SlackBuild b/network/palemoon-bin/palemoon-bin.SlackBuild index c7f5c1523d..7a39dbda60 100644 --- a/network/palemoon-bin/palemoon-bin.SlackBuild +++ b/network/palemoon-bin/palemoon-bin.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=palemoon-bin SRCNAM=palemoon -VERSION=${VERSION:-28.7.2} +VERSION=${VERSION:-29.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,6 +43,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +GTK=${GTK:-gtk2} + # We don't need cflags since nothing is being compiled here. # We do need to check the architecture though and abort when it's not # supported. @@ -63,7 +65,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM -tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH.tar.bz2 +tar xvf $CWD/$SRCNAM-$VERSION.linux-$ARCH-$GTK.tar.xz cd $SRCNAM chown -R root:root . find -L . \ diff --git a/network/palemoon-bin/palemoon-bin.info b/network/palemoon-bin/palemoon-bin.info index 7180f788dc..db48f7cb3d 100644 --- a/network/palemoon-bin/palemoon-bin.info +++ b/network/palemoon-bin/palemoon-bin.info @@ -1,10 +1,10 @@ PRGNAM="palemoon-bin" -VERSION="28.7.2" +VERSION="29.1.1" HOMEPAGE="https://www.palemoon.org/" -DOWNLOAD="http://linux.palemoon.org/datastore/release/palemoon-28.7.2.linux-i686.tar.bz2" -MD5SUM="7269d1489005c00a9753ef653894b300" -DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-28.7.2.linux-x86_64.tar.bz2" -MD5SUM_x86_64="f77dbcb3b8b9f102c9f46532537832ce" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="http://linux.palemoon.org/datastore/release/palemoon-29.1.1.linux-x86_64-gtk2.tar.xz" +MD5SUM_x86_64="1a39e784adcd7891c391195fabcbb06a" REQUIRES="" MAINTAINER="khronosschoty" EMAIL="khronosschoty@posteo.org" diff --git a/network/palemoon/README b/network/palemoon/README index 72c8031fec..61cdab4bc1 100644 --- a/network/palemoon/README +++ b/network/palemoon/README @@ -11,40 +11,41 @@ This SlackBuild attempts to compile, build and package Pale Moon, Slackware style, in a manner that conforms to official Pale Moon Linux releases; while, at the same time, providing useful and easy ways to deviate if desired. This SlackBuild may conflict with the alternative -SlackBuild known, here at SBo, as "palemoon-bin"; which repackages binaries -offically released by the Pale Moon devs. +SlackBuild known, here at SBo, as "palemoon-bin"; which repackages +binaries offically released by the Pale Moon devs. ----------------------------------------------------------------------------- +------------------------------------------------------------------------ -See http://docs.slackware.com/howtos:software:palemoon for additional tips and -help resources. +See http://docs.slackware.com/howtos:software:palemoon for additional +tips and help resources. Using the Oxygen theme is known to cause Pale Moon to crash; if you are -experiencing crashes, and segfaults, make sure you are not using this theme; -or use Alienbob's patched oxygen-gtk2; which will fix this issue. -http://www.slackware.com/~alien/slackbuilds/oxygen-gtk2/build/ -See the help doc link above for other creative tips and workarounds. +experiencing crashes, and segfaults, make sure you are not using this +theme; or use Alienbob's patched oxygen-gtk2; which will fix this issue. +http://www.slackware.com/~alien/slackbuilds/oxygen-gtk2/build/ See the +help doc link above for other creative tips and workarounds. -A native fork of FireFox's developer tools exists as an external add-on or -internally. Pale Moon by default ships with the developer tools internally; -if this is undesirable, dev tools can be disabled by passing the script the -parameter: +A native fork of FireFox's developer tools exists as an external add-on +or internally. Pale Moon by default ships with the developer tools +internally; if this is undesirable, dev tools can be disabled by passing +the script the parameter: - DEVTOOLS=no ./palemoon.SlackBuild + DEVTOOLS=no ./palemoon.SlackBuild -Pale Moon's default is to build, ship, and use its own internal dictionary; -if desired, however, do USE_SYSTEM_HUNSPELL=yes ./palemoon.SlackBuild, to -use the Slackware system Hunspell instead. This assumes you have dictionaries -such as hunspell-en or hunspell-es installed in /usr/share/hunspell -- the -location that a few SlackBuilds at SBo install them. +Pale Moon's default is to build, ship, and use its own internal +dictionary; if desired, however, do USE_SYSTEM_HUNSPELL=yes +./palemoon.SlackBuild, to use the Slackware system Hunspell instead. +This assumes you have dictionaries such as hunspell-en or hunspell-es +installed in /usr/share/hunspell -- the location that a few SlackBuilds +at SBo install them. To remove the "AdNauseam" extension from the Pale Moon blocklist, do - ADNAUSEAM=unblock ./palemoon.SlackBuild + ADNAUSEAM=unblock ./palemoon.SlackBuild -If your processor doesn't support sse2 instructions or you get segfaults, -try looking in the SlackBuild for the OPTIMIZE build option (eventually -refer to the Pale Moon developers for help). +If your processor doesn't support sse2 instructions or you get +segfaults, try looking in the SlackBuild for the OPTIMIZE build option +(eventually refer to the Pale Moon developers for help). jack-audio-connection-kit is an optional dependency and, if detected, automatically built. If this is undesirable you can blacklist jack, by @@ -54,4 +55,4 @@ passing the variable: To enable debug information, pass the script the parameter - ENABLE_DEBUG=yes + ENABLE_DEBUG=yes diff --git a/network/palemoon/adNauseam-unblock.patch b/network/palemoon/adNauseam-unblock.patch deleted file mode 100644 index b1ff1b8bb4..0000000000 --- a/network/palemoon/adNauseam-unblock.patch +++ /dev/null @@ -1,16 +0,0 @@ -*** a/application/palemoon/app/blocklist.xml 2018-05-19 19:02:40.285091999 -0700 ---- b/application/palemoon/app/blocklist.xml 2018-05-19 19:32:36.468323646 -0700 -*************** -*** 2504,2514 **** - </versionRange> - <prefs></prefs> - </emItem> -- <emItem blockID="pm110" id="adnauseam@rednoise.org"> -- <versionRange minVersion="0" maxVersion="*" severity="2"> -- </versionRange> -- <prefs></prefs> -- </emItem> - <emItem blockID="pm111" id="customtoolbarsplus@srazzano.com"> - <versionRange minVersion="0" maxVersion="52.4.2" severity="3"> - </versionRange> ---- 2504,2509 ---- diff --git a/network/palemoon/glibc-2.30+.patch b/network/palemoon/glibc-2.30+.patch deleted file mode 100644 index b67945d12a..0000000000 --- a/network/palemoon/glibc-2.30+.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- tools/profiler/tasktracer/GeckoTaskTracer.cpp 2019-08-23 01:47:27.000000000 +0200 -+++ tools/profiler/tasktracer/GeckoTaskTracer.cpp 2019-08-29 18:02:44.541959971 +0200 -@@ -25,20 +25,14 @@ - #if defined(__GLIBC__) - #include <unistd.h> - #include <sys/syscall.h> --static inline pid_t gettid() --{ -- return (pid_t) syscall(SYS_gettid); --} -+#define gettid() static_cast<pid_t>(syscall(SYS_gettid)) - #elif defined(XP_MACOSX) - #include <unistd.h> - #include <sys/syscall.h> --static inline pid_t gettid() --{ -- return (pid_t) syscall(SYS_thread_selfid); --} -+#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid)) - #elif defined(LINUX) - #include <sys/types.h> --pid_t gettid(); -+#pid_t gettid(); - #endif - - // NS_ENSURE_TRUE_VOID() without the warning on the debug build. - - ---- js/src/jsnativestack.cpp 2019-08-29 17:45:10.000000000 +0200 -+++ js/src/jsnativestack.cpp 2019-08-29 17:53:58.382003265 +0200 -@@ -26,11 +26,7 @@ - # include <sys/syscall.h> - # include <sys/types.h> - # include <unistd.h> --static pid_t --gettid() --{ -- return syscall(__NR_gettid); --} -+# define gettid() static_cast<pid_t>(syscall(__NR_gettid)) - # endif - - #else diff --git a/network/palemoon/palemoon.SlackBuild b/network/palemoon/palemoon.SlackBuild index a1e88e072e..321f5f88d0 100644 --- a/network/palemoon/palemoon.SlackBuild +++ b/network/palemoon/palemoon.SlackBuild @@ -26,8 +26,10 @@ # Special thanks to Ponce PRGNAM=palemoon -VERSION=${VERSION:-28.7.2} -SRCNAM=${SRCNAM:-UXP-PM${VERSION}_Release} +VERSION=${VERSION:-29.1.1} +SRCNAM1=${SRCNAM1:-Pale-Moon-${VERSION}_Release} +SRCNAM2=${SRCNAM2:-pale-moon} +SRCNAM3=${SRCNAM3:-UXP-RELBASE_20210330} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,9 +80,9 @@ fi # master trunck of the Pale Moon github repository. BRANDING=${BRANDING:---enable-official-branding} if [ "$BRANDING" = "NewMoon" ]; then - BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unofficial" + BRANDING="--disable-official-branding --with-branding=palemoon/branding/unofficial" elif [ "$BRANDING" = "unstable" ]; then - BRANDING="--disable-official-branding --with-branding=application/palemoon/branding/unstable" + BRANDING="--disable-official-branding --with-branding=palemoon/branding/unstable" fi rm -rf $PKG $TMP/gold $TMP/$OBJ @@ -141,9 +143,10 @@ PATH=$TMP/autoconf-tmp/usr/bin:$PATH # Build Pale Moon cd $TMP -rm -rf $SRCNAM -tar -xvf $CWD/$SRCNAM.tar.gz -cd $SRCNAM +rm -rf $SRCNAM2 +tar -xvf $CWD/$SRCNAM1.tar.gz +cd $SRCNAM2 +tar -xvf $CWD/$SRCNAM3.tar.gz -C platform --strip-components 1 if [ "${ADNAUSEAM:-block}" = "unblock" ]; then patch -p1 < $CWD/adNauseam-unblock.patch @@ -165,7 +168,7 @@ find -L . \ # "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)" export LANG=C -export MOZCONFIG="$TMP/$SRCNAM/.mozconfig" +export MOZCONFIG="$TMP/$SRCNAM2/.mozconfig" export MOZILLA_OFFICIAL=1 export MOZ_MAKE_FLAGS=$MAKEFLAGS export CFLAGS="$SLKCFLAGS" @@ -217,7 +220,8 @@ echo "ac_add_options --disable-pulseaudio" >> .mozconfig; fi if pkg-config --exists jack && [ "${BLACKLIST_JACK:-no}" != "yes" ]; then echo "ac_add_options --enable-jack" >> .mozconfig; fi -python2 mach build +sed -i 's/.\/platform\/mach/"python2\ .\/platform\/mach"/g' mach +./mach build ## Clean up; and package Pale Moon. mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins @@ -256,7 +260,7 @@ cat $CWD/palemoon.desktop > $PKG/usr/share/applications/$PRGNAM.desktop mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - $TMP/$SRCNAM/LEGAL $TMP/$SRCNAM/LICENSE $TMP/$SRCNAM/README.md \ + $TMP/$SRCNAM2/platform/LEGAL $TMP/$SRCNAM2/LICENSE $TMP/$SRCNAM2/README.md $TMP/$SRCNAM2/AUTHORS \ $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/palemoon/palemoon.info b/network/palemoon/palemoon.info index 285ce4b76c..614b3b3b55 100644 --- a/network/palemoon/palemoon.info +++ b/network/palemoon/palemoon.info @@ -1,9 +1,11 @@ PRGNAM="palemoon" -VERSION="28.7.2" +VERSION="29.1.1" HOMEPAGE="http://www.palemoon.org/" -DOWNLOAD="https://github.com/MoonchildProductions/UXP/archive/PM28.7.2_Release/UXP-PM28.7.2_Release.tar.gz \ +DOWNLOAD="http://repo.khronosschoty.org/Slackware/Pale-Moon/source/Pale-Moon-29.1.1_Release.tar.gz + http://repo.khronosschoty.org/Slackware/Pale-Moon/source/UXP-RELBASE_20210330.tar.gz \ http://ponce.cc/slackware/sources/repo/autoconf-2.13.tar.xz" -MD5SUM="55feba81dc3a939bbca63ab9963a8edc \ +MD5SUM="f522cab929ec62382dc30391a590b039 \ + 535724b8fbb0d791cdf48f456969df9f \ f2994d302cf736e7e71974edfa51da3c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/persepolis/README b/network/persepolis/README index c4e5d5c42f..c58911f78a 100644 --- a/network/persepolis/README +++ b/network/persepolis/README @@ -11,5 +11,3 @@ Features: * Scheduling downloads * Download queuing * Finding and downloading video from Youtube, Vimeo, DailyMotion, etc. - -Important: you will need to build all the dependencies with python3 support. diff --git a/network/persepolis/persepolis.SlackBuild b/network/persepolis/persepolis.SlackBuild index d499b1c620..8d6e7fc440 100644 --- a/network/persepolis/persepolis.SlackBuild +++ b/network/persepolis/persepolis.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for persepolis -# 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 @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=persepolis -VERSION=${VERSION:-3.1.0} +VERSION=${VERSION:-3.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/persepolis/persepolis.info b/network/persepolis/persepolis.info index 073716b65b..d4a9470284 100644 --- a/network/persepolis/persepolis.info +++ b/network/persepolis/persepolis.info @@ -1,10 +1,10 @@ PRGNAM="persepolis" -VERSION="3.1.0" +VERSION="3.2.0" HOMEPAGE="https://persepolisdm.github.io" -DOWNLOAD="https://github.com/persepolisdm/persepolis/archive/3.1.0/persepolis-3.1.0.tar.gz" -MD5SUM="ade1aca47186df8a3521ac3d356c328d" +DOWNLOAD="https://github.com/persepolisdm/persepolis/archive/3.2.0/persepolis-3.2.0.tar.gz" +MD5SUM="9a3bf686da0385f78eadca457a9f43fe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-PyQt5 python-requests setproctitle psutil aria2 python-notify2 youtube-dl" +REQUIRES="python3-PyQt5 python-requests setproctitle psutil aria2 python-notify2 ffmpeg youtube-dl" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/network/pexip-infinity-connect/README b/network/pexip-infinity-connect/README new file mode 100644 index 0000000000..c97ca78f6a --- /dev/null +++ b/network/pexip-infinity-connect/README @@ -0,0 +1,7 @@ +pexip-infinity-connect (Video Communication Software) + +Pexip simplifies video communication across borders, businesses and +platforms. It empowers your organization with face-to-face +collaboration, no matter the location or technology. + +This SB script repackages archive to Slackware package diff --git a/network/Signal-Desktop/doinst.sh b/network/pexip-infinity-connect/doinst.sh index 65c7e2eeb9..65c7e2eeb9 100644 --- a/network/Signal-Desktop/doinst.sh +++ b/network/pexip-infinity-connect/doinst.sh diff --git a/network/dissenter-browser/dissenter-browser.SlackBuild b/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild index ed07f8557d..357a34a2d0 100644 --- a/network/dissenter-browser/dissenter-browser.SlackBuild +++ b/network/pexip-infinity-connect/pexip-infinity-connect.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for dissenter-browser +# Slackware build script for pexip-infinity-connect -# Copyright 2019 Donald Cooley South Haven, Indiana USA +# Copyright 2020 Igor Alexandrov <igor.alexandrov@outlook.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,69 +22,56 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=dissenter-browser -VERSION=${VERSION:-0.66.99} +PRGNAM=pexip-infinity-connect +SRCNAM=$(tar -tf $PRGNAM*.t?z | head -1) +VERSION=${VERSION:-$(echo $SRCNAM | cut -d '_' -f 2 | tr '-' '.')} 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 ) ;; + *) ARCH=$(uname -m) ;; esac fi +set -e + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Abort build if architecture is not 64-bit. if [ "$ARCH" != "x86_64" ]; then - echo "$ARCH is not supported." + echo "$ARCH is not supported for $PRGNAM-$VERSION" exit 1 fi -set -e - rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -mkdir -p $PRGNAM-$VERSION -cd $PRGNAM-$VERSION -rpm2cpio < $CWD/${PRGNAM}-${VERSION}-${BUILD}.${ARCH}.rpm | cpio -imdv +mkdir -p $TMP $OUTPUT $PKG/{install,opt,usr/{bin,doc/$PRGNAM-$VERSION}} +cd $PKG +tar -xvf $CWD/$PRGNAM*.t?z +mv $SRCNAM opt/$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 {} \; + \( -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 usr opt $PKG/ - -# Slackware doesn't ship a GNOME desktop so I don't see any reason for gnome-control-center -rm -rf $PKG/usr/share/gnome-control-center - -# Move icon into place -mkdir -p $PKG/usr/share/pixmaps -cp opt/gab/dissenter/*.xpm $PKG/usr/share/pixmaps/dissenter-browser.xpm - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ +find . -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -rm -rf $PKG/usr/lib +ln -s ../../opt/$PRGNAM/$PRGNAM usr/bin +install -m 644 -D $CWD/$PRGNAM.desktop -t usr/share/applications +install -m 644 -D $CWD/$PRGNAM.png -t usr/share/icons/hicolor/48x48/apps -# Place man page(s) where The Man likes 'em -mv $PKG/usr/share/man $PKG/usr/man - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +ln -s ../../../opt/$PRGNAM/LICENSE usr/doc/$PRGNAM-$VERSION +ln -s ../../../opt/$PRGNAM/LICENSES.chromium.html 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} +/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.desktop b/network/pexip-infinity-connect/pexip-infinity-connect.desktop new file mode 100644 index 0000000000..aa50e951d4 --- /dev/null +++ b/network/pexip-infinity-connect/pexip-infinity-connect.desktop @@ -0,0 +1,11 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Name=Pexip Infinity Connect +Exec=/opt/pexip-infinity-connect/pexip-infinity-connect %u +Terminal=false +Type=Application +Icon=pexip-infinity-connect +Categories=Network;Communication;Video +StartupNotify=true +StartupWMClass=pexip infinity connect +MimeType=x-scheme-handler/pexip-provision;x-scheme-handler/pexip-auth;x-scheme-handler/pexip diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.info b/network/pexip-infinity-connect/pexip-infinity-connect.info new file mode 100644 index 0000000000..b4b16b73e4 --- /dev/null +++ b/network/pexip-infinity-connect/pexip-infinity-connect.info @@ -0,0 +1,10 @@ +PRGNAM="pexip-infinity-connect" +VERSION="1.6.0.52922.63.120" +HOMEPAGE="https://www.pexip.com" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://dl.pexip.com/connect/nextgen/1.6/pexip-infinity-connect_1.6.0-52920.61.0_linux-x64.tgz" +MD5SUM_x86_64="04366b531afd0de6d3258f7c0aa8e08d" +REQUIRES="" +MAINTAINER="Igor Alexandrov" +EMAIL="igor.alexandrov@outlook.com" diff --git a/network/pexip-infinity-connect/pexip-infinity-connect.png b/network/pexip-infinity-connect/pexip-infinity-connect.png Binary files differnew file mode 100644 index 0000000000..de24120fbe --- /dev/null +++ b/network/pexip-infinity-connect/pexip-infinity-connect.png diff --git a/network/pexip-infinity-connect/slack-desc b/network/pexip-infinity-connect/slack-desc new file mode 100644 index 0000000000..bd32577094 --- /dev/null +++ b/network/pexip-infinity-connect/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------------------------------------------------------| +pexip-infinity-connect: pexip-infinity-connect (Video Communication Software) +pexip-infinity-connect: +pexip-infinity-connect: Pexip simplifies video communication across borders, businesses and +pexip-infinity-connect: platforms. It empowers your organization with face-to-face +pexip-infinity-connect: collaboration, no matter the location or technology. +pexip-infinity-connect: +pexip-infinity-connect: For more details: +pexip-infinity-connect: https://www.pexip.com/ +pexip-infinity-connect: +pexip-infinity-connect: +pexip-infinity-connect: diff --git a/network/pirate-get/pirate-get.SlackBuild b/network/pirate-get/pirate-get.SlackBuild index c268725027..e9f6928035 100644 --- a/network/pirate-get/pirate-get.SlackBuild +++ b/network/pirate-get/pirate-get.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pirate-get -# Copyright 2017-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2017-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=pirate-get -VERSION=${VERSION:-0.2.13} +VERSION=${VERSION:-0.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,7 +75,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/pirate-get/pirate-get.info b/network/pirate-get/pirate-get.info index d3a0f13b8e..df31f2a705 100644 --- a/network/pirate-get/pirate-get.info +++ b/network/pirate-get/pirate-get.info @@ -1,10 +1,10 @@ PRGNAM="pirate-get" -VERSION="0.2.13" +VERSION="0.4.0" HOMEPAGE="https://github.com/vikstrous/pirate-get" -DOWNLOAD="https://files.pythonhosted.org/packages/d2/2f/550e85816cadfb1f9073f5766a671da293894983c9d5a9b602ae99d82dbc/pirate-get-0.2.13.tar.gz" -MD5SUM="96fd112a8c96856abb4e9cb8bd440fbd" +DOWNLOAD="https://files.pythonhosted.org/packages/c3/e2/735e12e1d0aabcc20dd68cd809e3ed7ccd9e063f03a6edf4406bd520fd21/pirate-get-0.4.0.tar.gz" +MD5SUM="f1bd3e0d209586d076db3cc01e522158" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3 BeautifulSoup4 veryprettytable" +REQUIRES="python3 veryprettytable pyperclip" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/network/pmacct/slack-desc b/network/pmacct/slack-desc index ecd8584dae..90cd4b56cb 100644 --- a/network/pmacct/slack-desc +++ b/network/pmacct/slack-desc @@ -17,4 +17,3 @@ pmacct: pmacct: Each component works both as a standalone daemon and as a thread of pmacct: execution for correlation purposes (ie. enrich NetFlow with BGP pmacct: data). -pmacct: diff --git a/network/policyd2/policyd2.info b/network/policyd2/policyd2.info index f5680fd28b..4d32a1233f 100644 --- a/network/policyd2/policyd2.info +++ b/network/policyd2/policyd2.info @@ -1,7 +1,7 @@ PRGNAM="policyd2" VERSION="2.0.14" HOMEPAGE="http://www.policyd.org/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/cluebringer-v2.0.14.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/cluebringer-v2.0.14.tar.xz" MD5SUM="e75cd25a836b316846f5ad8bf09a69a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/postgrey/doinst.sh b/network/postgrey/doinst.sh index e935335cd0..5bf85c6667 100644 --- a/network/postgrey/doinst.sh +++ b/network/postgrey/doinst.sh @@ -21,5 +21,6 @@ preserve_perms() { config etc/postfix/postgrey_whitelist_clients.new config etc/postfix/postgrey_whitelist_recipients.new +config etc/postgrey.conf.new preserve_perms etc/rc.d/rc.postgrey.new diff --git a/network/postgrey/postgrey.SlackBuild b/network/postgrey/postgrey.SlackBuild index 71fa28387f..0c68baf620 100644 --- a/network/postgrey/postgrey.SlackBuild +++ b/network/postgrey/postgrey.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=postgrey -VERSION=${VERSION:-1.34} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.37} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -98,10 +98,13 @@ cp -a policy-test postgrey contrib/postgreyreport $PKG/usr/bin mkdir -p $PKG/etc/rc.d sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \ -e s/%POSTGREYGRP%/$POSTGREYGRP/g \ + $CWD/postgrey.conf > $PKG/etc/postgrey.conf.new +sed -e s/%POSTGREYUSR%/$POSTGREYUSR/g \ + -e s/%POSTGREYGRP%/$POSTGREYGRP/g \ $CWD/rc.postgrey > $PKG/etc/rc.d/rc.postgrey.new -mkdir -p $PKG/var/{lib,run}/postgrey -chown $POSTGREYUSR.$POSTGREYGRP $PKG/var/lib/postgrey $PKG/var/run/postgrey +mkdir -p $PKG/var/lib/postgrey +chown ${POSTGREYUSR}:${POSTGREYGRP} $PKG/var/lib/postgrey mkdir -p $PKG/etc/postfix cp -a postgrey_whitelist_clients $PKG/etc/postfix/postgrey_whitelist_clients.new diff --git a/network/postgrey/postgrey.conf b/network/postgrey/postgrey.conf new file mode 100644 index 0000000000..db34cb398c --- /dev/null +++ b/network/postgrey/postgrey.conf @@ -0,0 +1,10 @@ +# /etc/postgrey.conf +# +# This file will be sourced from /etc/rc.d/rc.postgrey +# +PORT=10025 +PIDFILE=/var/run/postgrey/postgrey.pid +USER=%POSTGREYUSR% +GROUP=%POSTGREYGRP% +HOST=mail.example.com + diff --git a/network/postgrey/postgrey.info b/network/postgrey/postgrey.info index 802b44f23a..140612fab0 100644 --- a/network/postgrey/postgrey.info +++ b/network/postgrey/postgrey.info @@ -1,8 +1,8 @@ PRGNAM="postgrey" -VERSION="1.34" +VERSION="1.37" HOMEPAGE="http://postgrey.schweikert.ch/" -DOWNLOAD="http://postgrey.schweikert.ch/pub/old/postgrey-1.34.tar.gz" -MD5SUM="f736a7be1094593f1a66cd13f32b39ef" +DOWNLOAD="http://postgrey.schweikert.ch/pub/postgrey-1.37.tar.gz" +MD5SUM="2ef30f42ad84f00caf41c49b593b8e2a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Net-Server perl-IO-Multiplex perl-BerkeleyDB perl-net-dns" diff --git a/network/postgrey/rc.postgrey b/network/postgrey/rc.postgrey index d763884bfa..5c33151085 100644 --- a/network/postgrey/rc.postgrey +++ b/network/postgrey/rc.postgrey @@ -1,17 +1,15 @@ #!/bin/bash -PORT=10025 -PIDFILE=/var/run/postgrey/postgrey.pid -USER=%POSTGREYUSR% -GROUP=%POSTGREYGRP% -HOST=mail.example.com +. /etc/postgrey.conf || exit 1 postgrey_start() { echo "Starting postgrey milter: /usr/bin/postgrey -d --inet=$PORT --pidfile=$PIDFILE --user=$USER --group=$GROUP --dbdir=/var/lib/postgrey --hostname=$HOST" - mkdir -p /var/run/postgrey + mkdir -p $(dirname $PIDFILE) + chown ${USER}:${GROUP} $(dirname $PIDFILE) + /usr/bin/postgrey -d \ --inet=$PORT \ - --pidfile=/var/run/postgrey/postgrey.pid \ + --pidfile=$PIDFILE \ --user=$USER --group=$GROUP \ --dbdir=/var/lib/postgrey \ --hostname=$HOST diff --git a/network/pptp/pptp.info b/network/pptp/pptp.info index ce3efc5d79..93fefabf34 100644 --- a/network/pptp/pptp.info +++ b/network/pptp/pptp.info @@ -6,5 +6,5 @@ MD5SUM="4efce9f263e2c3f38d79d9df222476de" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="AbortRetryFail" -EMAIL="abortretryfail@gmail.com" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/network/prettyping/README b/network/prettyping/README new file mode 100644 index 0000000000..c16bdf65fc --- /dev/null +++ b/network/prettyping/README @@ -0,0 +1,7 @@ +Prettyping is a wrapper around the standard ping tool with the +objective of making the output prettier, more colorful, more compact, +and easier to read. + +Prettyping runs the standard ping in the background and parses its +output, showing the ping responses in a graphical way at the terminal +(by using colors and Unicode characters). diff --git a/network/prettyping/prettyping.SlackBuild b/network/prettyping/prettyping.SlackBuild new file mode 100644 index 0000000000..4d73201f5b --- /dev/null +++ b/network/prettyping/prettyping.SlackBuild @@ -0,0 +1,63 @@ +#!/bin/sh + +# Slackware build script for prettyping + +# Copyright 2021 Thibaut Notteboom, Paris, FRANCE +# 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=prettyping +VERSION=${VERSION:-1.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 {} \; + +install -Dm755 prettyping $PKG/usr/bin/prettyping + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + 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/network/prettyping/prettyping.info b/network/prettyping/prettyping.info new file mode 100644 index 0000000000..7aeaf8c18e --- /dev/null +++ b/network/prettyping/prettyping.info @@ -0,0 +1,10 @@ +PRGNAM="prettyping" +VERSION="1.0.1" +HOMEPAGE="https://github.com/denilsonsa/prettyping" +DOWNLOAD="https://github.com/denilsonsa/prettyping/archive/v1.0.1/prettyping-1.0.1.tar.gz" +MD5SUM="264a496f40b13d81cb0dbb000b06a288" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Thibaut Notteboom" +EMAIL="thibaut.notteboom@gmail.com" diff --git a/network/prettyping/slack-desc b/network/prettyping/slack-desc new file mode 100644 index 0000000000..935ec3c74e --- /dev/null +++ b/network/prettyping/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------------------------------------------------------| +prettyping: prettyping (Ping wrapper making the output prettier, more colorful, +prettyping: more compact, and easier to read) +prettyping: +prettyping: Prettyping is a wrapper around the standard ping tool with the +prettyping: objective of making the output prettier, more colorful, more compact, +prettyping: and easier to read. +prettyping: +prettyping: Prettyping runs the standard ping in the background and parses its +prettyping: output, showing the ping responses in a graphical way at the terminal +prettyping: (by using colors and Unicode characters). +prettyping: diff --git a/network/privoxy/README b/network/privoxy/README index eb6d9f207a..3aed32d9a3 100644 --- a/network/privoxy/README +++ b/network/privoxy/README @@ -5,6 +5,8 @@ Privoxy has a flexible configuration and can be customized to suit individual needs and tastes. It has application for both stand-alone systems and multi-user networks. +brotli is an optional dependency. + Before executing the script, you will need to create a privoxy user and group. To do that, run the following commands: diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild index 576e2a5184..e3f72e6e05 100644 --- a/network/privoxy/privoxy.SlackBuild +++ b/network/privoxy/privoxy.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for privoxy # Copyright (c) 2007 alkos333 <me@alkos333.net> -# Copyright 2014-2019 Kyle Guinn <elyk03@gmail.com> +# Copyright 2014-2021 Kyle Guinn <elyk03@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=privoxy -VERSION=${VERSION:-3.0.28} +VERSION=${VERSION:-3.0.32} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -89,17 +89,14 @@ chmod -R u+w,go-w,a+rX-st . # Put the docs where we tell them to go. sed -i "/^DOC_DEST/s/= .*/= @docdir@/" GNUmakefile.in -# The Makefile checks if certain config files exist, and if so, adds a -# .new suffix. Turn this behavior off. We will do it below. -sed -i "s/\[ -s \"\$(CONF_DEST)\/\$\$i\" \]/false/" GNUmakefile.in - # rc.privoxy generation doesn't work well with $(DESTDIR). Help it along. sed -i "s/ \/etc\/rc.d\// \$(DESTDIR)\/etc\/rc.d\//g" GNUmakefile.in mkdir -p $PKG/etc/rc.d -autoheader -autoconf -CFLAGS="$SLKCFLAGS" \ +# Let AC_CHECK_LIB do the brotli autodetection, don't link to it if missing. +sed -i "/-lbrotlidec/d" configure.in + +autoreconf -vif ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -112,9 +109,14 @@ CFLAGS="$SLKCFLAGS" \ --with-docbook=no \ --with-user=$PRIVOXY_USER \ --with-group=$PRIVOXY_GROUP \ + --with-openssl \ + --with-brotli \ --enable-no-gifs \ --enable-compression \ - --enable-large-file-support + --enable-large-file-support \ + --enable-extended-statistics \ + --enable-pcre-host-patterns \ + CFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG diff --git a/network/privoxy/privoxy.info b/network/privoxy/privoxy.info index 07259d8c44..c8dafc6529 100644 --- a/network/privoxy/privoxy.info +++ b/network/privoxy/privoxy.info @@ -1,8 +1,8 @@ PRGNAM="privoxy" -VERSION="3.0.28" +VERSION="3.0.32" HOMEPAGE="https://www.privoxy.org/" -DOWNLOAD="https://sourceforge.net/projects/ijbswa/files/Sources/3.0.28%20%28stable%29/privoxy-3.0.28-stable-src.tar.gz" -MD5SUM="c7e8900d5aff33d9a5fc37ac28154f21" +DOWNLOAD="https://sourceforge.net/projects/ijbswa/files/Sources/3.0.32%20%28stable%29/privoxy-3.0.32-stable-src.tar.gz" +MD5SUM="3a0a8ebdf80e0a29154683e74cbf510b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild index af6b8e33f2..5cf4aaba7f 100644 --- a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild +++ b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.SlackBuild @@ -24,8 +24,8 @@ PRGNAM=prosody-mod-cloud-notify MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_') -VERSION=${VERSION:-hg3627} -REVISION=${REVISION:-9639c493f4b9} +VERSION=${VERSION:-hg4464} +REVISION=${REVISION:-ea820de69265} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info index fbe1d74933..4722fce5ec 100644 --- a/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info +++ b/network/prosody-mod-cloud-notify/prosody-mod-cloud-notify.info @@ -1,8 +1,8 @@ PRGNAM="prosody-mod-cloud-notify" -VERSION="hg3627" +VERSION="hg4464" HOMEPAGE="https://modules.prosody.im/mod_cloud_notify.html" -DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/9639c493f4b9.tar.gz" -MD5SUM="c52d0735637830b5621c60f448e4f7db" +DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/ea820de69265.tar.gz" +MD5SUM="5f97aa5a32954a6f4a2a33004b5b0214" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="prosody" diff --git a/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild b/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild index 92d7666b72..18fccb9ee2 100644 --- a/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild +++ b/network/prosody-mod-http-upload/prosody-mod-http-upload.SlackBuild @@ -24,8 +24,8 @@ PRGNAM=prosody-mod-http-upload MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_') -VERSION=${VERSION:-hg3713} -REVISION=${REVISION:-53fc4b612fb2} +VERSION=${VERSION:-hg4443} +REVISION=${REVISION:-0a56dc6c61af} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/prosody-mod-http-upload/prosody-mod-http-upload.info b/network/prosody-mod-http-upload/prosody-mod-http-upload.info index b3c89d9db0..77fc56625a 100644 --- a/network/prosody-mod-http-upload/prosody-mod-http-upload.info +++ b/network/prosody-mod-http-upload/prosody-mod-http-upload.info @@ -1,8 +1,8 @@ PRGNAM="prosody-mod-http-upload" -VERSION="hg3713" +VERSION="hg4443" HOMEPAGE="https://modules.prosody.im/mod_http_upload.html" -DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/53fc4b612fb2.tar.gz" -MD5SUM="5cd3f2ff9607383fc8ce710be4f0fbb8" +DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/0a56dc6c61af.tar.gz" +MD5SUM="3f35ff98e0b902f0585d8f158b7f4d91" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="prosody" diff --git a/network/prosody-mod-smacks-offline/README b/network/prosody-mod-smacks-offline/README deleted file mode 100644 index c0501f9b0d..0000000000 --- a/network/prosody-mod-smacks-offline/README +++ /dev/null @@ -1 +0,0 @@ -prosody-mod-smacks-offline (XEP-0198: Stream Management) diff --git a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info b/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info deleted file mode 100644 index 10d313ae0b..0000000000 --- a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="prosody-mod-smacks-offline" -VERSION="hg1731" -HOMEPAGE="https://modules.prosody.im/mod_smacks_offline.html" -DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/b912cb8e0b3c.tar.gz" -MD5SUM="baf3b6674cb42039de6813e4a7fa340f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="prosody" -MAINTAINER="Andrew Clemons" -EMAIL="andrew.clemons@gmail.com" diff --git a/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild b/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild index 7065be1e60..5947657221 100644 --- a/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild +++ b/network/prosody-mod-smacks/prosody-mod-smacks.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for prosody-mod-smacks -# 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 @@ -24,8 +24,8 @@ PRGNAM=prosody-mod-smacks MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_') -VERSION=${VERSION:-hg3646} -REVISION=${REVISION:-58047d6f2b89} +VERSION=${VERSION:-hg4463} +REVISION=${REVISION:-8b8246031a5e} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/prosody-mod-smacks/prosody-mod-smacks.info b/network/prosody-mod-smacks/prosody-mod-smacks.info index 43ba56f03c..8d91178a15 100644 --- a/network/prosody-mod-smacks/prosody-mod-smacks.info +++ b/network/prosody-mod-smacks/prosody-mod-smacks.info @@ -1,8 +1,8 @@ PRGNAM="prosody-mod-smacks" -VERSION="hg3646" +VERSION="hg4463" HOMEPAGE="https://modules.prosody.im/mod_smacks.html" -DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/58047d6f2b89.tar.gz" -MD5SUM="fa4e9d2f961448fb2d8df3b5ead14856" +DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/8b8246031a5e.tar.gz" +MD5SUM="7a1ca43b59c414174c807fc114a59b23" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="prosody" diff --git a/network/prosody-mod-smacks/slack-desc b/network/prosody-mod-smacks/slack-desc index 869daa56a4..f13467b579 100644 --- a/network/prosody-mod-smacks/slack-desc +++ b/network/prosody-mod-smacks/slack-desc @@ -11,7 +11,7 @@ prosody-mod-smacks: prosody-mod-smacks: When using XEP-0198 both the client and the server keep a queue of prosody-mod-smacks: the most recently sent stanzas - this is cleared when the other end prosody-mod-smacks: acknowledges they have received the stanzas. -prosody-mod-smacks: +prosody-mod-smacks: prosody-mod-smacks: prosody-mod-smacks: prosody-mod-smacks: diff --git a/network/prosody-mod-turncredentials/README b/network/prosody-mod-turncredentials/README new file mode 100644 index 0000000000..76b7974ff8 --- /dev/null +++ b/network/prosody-mod-turncredentials/README @@ -0,0 +1,3 @@ +prosody-mod-turncredentials (XEP-0215: impl for TURN credentials) + +This module provides an implementation for time-limited TURN credentials. diff --git a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild index dd8dc9398b..c36ac011e2 100644 --- a/network/prosody-mod-smacks-offline/prosody-mod-smacks-offline.SlackBuild +++ b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for prosody-mod-smacks-offline +# Slackware build script for prosody-mod-turncredentials -# Copyright 2017-2018 Andrew Clemons, Wellington, New Zealand +# Copyright 2020 Andrew Clemons, Wellington, New Zealand # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=prosody-mod-smacks-offline +PRGNAM=prosody-mod-turncredentials MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_') -VERSION=${VERSION:-hg1731} -REVISION=${REVISION:-b912cb8e0b3c} +VERSION=${VERSION:-hg4055} +REVISION=${REVISION:-cf1304ad2336} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,7 +57,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf prosody-modules-$REVISION +rm -rf Community-Modules-$REVISION tar xvf $CWD/Community-Modules-$REVISION.tar.gz || tar xvf $CWD/$REVISION.tar.gz cd Community-Modules-$REVISION chown -R root:root . @@ -67,10 +67,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 {} \; -mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/ -cp -a $MDLNAM $PKG/usr/lib$LIBDIRSUFFIX/prosody/modules/ +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/prosody/modules/ +cp -a $MDLNAM $PKG/usr/lib${LIBDIRSUFFIX}/prosody/modules/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv \ + $PKG/usr/lib${LIBDIRSUFFIX}/prosody/modules/$MDLNAM/README.markdown \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info new file mode 100644 index 0000000000..863aeb8bf3 --- /dev/null +++ b/network/prosody-mod-turncredentials/prosody-mod-turncredentials.info @@ -0,0 +1,10 @@ +PRGNAM="prosody-mod-turncredentials" +VERSION="hg4055" +HOMEPAGE="https://modules.prosody.im/mod_turncredentials.html" +DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/cf1304ad2336.tar.gz" +MD5SUM="65f21e5bde5186f0281d731aeadfcb3e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="prosody" +MAINTAINER="Andrew Clemons" +EMAIL="andrew.clemons@gmail.com" diff --git a/network/prosody-mod-turncredentials/slack-desc b/network/prosody-mod-turncredentials/slack-desc new file mode 100644 index 0000000000..a7169445c9 --- /dev/null +++ b/network/prosody-mod-turncredentials/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------------------------------------------------------| +prosody-mod-turncredentials: prosody-mod-turncredentials (XEP-0215: time-limited TURN credentials) +prosody-mod-turncredentials: +prosody-mod-turncredentials: This module provides an implementation for time-limited TURN +prosody-mod-turncredentials: credentials. +prosody-mod-turncredentials: +prosody-mod-turncredentials: +prosody-mod-turncredentials: +prosody-mod-turncredentials: +prosody-mod-turncredentials: +prosody-mod-turncredentials: https://modules.prosody.im/mod_turncredentials.html +prosody-mod-turncredentials: diff --git a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild index b1a9926823..5117c9a7ab 100644 --- a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild +++ b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.SlackBuild @@ -24,8 +24,8 @@ PRGNAM=prosody-mod-vcard-muc MDLNAM=$(echo $PRGNAM | sed 's/prosody-//' | tr '-' '_') -VERSION=${VERSION:-hg3656} -REVISION=${REVISION:-3e0f4d727825} +VERSION=${VERSION:-hg4300} +REVISION=${REVISION:-3f3b672b7616} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info index 0be790dda8..a290e700b1 100644 --- a/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info +++ b/network/prosody-mod-vcard-muc/prosody-mod-vcard-muc.info @@ -1,8 +1,8 @@ PRGNAM="prosody-mod-vcard-muc" -VERSION="hg3656" +VERSION="hg4300" HOMEPAGE="https://modules.prosody.im/mod_vcard_muc.html" -DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/3e0f4d727825.tar.gz" -MD5SUM="15abb1bdc5a4d8af11f4f0a3b80f5924" +DOWNLOAD="https://hg.prosody.im/prosody-modules/archive/3f3b672b7616.tar.gz" +MD5SUM="43354c6458cb9a6ff73c9574a148ec00" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="prosody" diff --git a/network/prosody-mod-vcard-muc/slack-desc b/network/prosody-mod-vcard-muc/slack-desc index 7e01bc537f..77f64aac91 100644 --- a/network/prosody-mod-vcard-muc/slack-desc +++ b/network/prosody-mod-vcard-muc/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -prosody-mod-vcard-muc: prosody-mod-vcard-muc prosody-mod-vcard-muc (vCard for MUC rooms) +prosody-mod-vcard-muc: prosody-mod-vcard-muc (vCard for MUC rooms) prosody-mod-vcard-muc: prosody-mod-vcard-muc: This module adds the ability to set vCard for MUC rooms. One of the prosody-mod-vcard-muc: most common use cases is to be able to define an avatar for your own diff --git a/network/prosody/prosody.SlackBuild b/network/prosody/prosody.SlackBuild index ba9d80435b..b06c8d3eef 100644 --- a/network/prosody/prosody.SlackBuild +++ b/network/prosody/prosody.SlackBuild @@ -25,7 +25,7 @@ # Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com> PRGNAM=prosody -VERSION=${VERSION:-0.11.3} +VERSION=${VERSION:-0.11.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/prosody/prosody.info b/network/prosody/prosody.info index 93f60043e6..fbf571bd7b 100644 --- a/network/prosody/prosody.info +++ b/network/prosody/prosody.info @@ -1,8 +1,8 @@ PRGNAM="prosody" -VERSION="0.11.3" +VERSION="0.11.8" HOMEPAGE="http://prosody.im/" -DOWNLOAD="https://prosody.im/downloads/source/prosody-0.11.3.tar.gz" -MD5SUM="2cf85cd8f7fc061916d97a169e850a0e" +DOWNLOAD="https://prosody.im/downloads/source/prosody-0.11.8.tar.gz" +MD5SUM="24cd3c1f7ab16a6b3726423d2fff802d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="luasec luasocket luaexpat lua-filesystem" diff --git a/network/protonmail-bridge/README b/network/protonmail-bridge/README new file mode 100644 index 0000000000..7865cc13d4 --- /dev/null +++ b/network/protonmail-bridge/README @@ -0,0 +1,13 @@ +The ProtonMail Bridge is an application for paid users that runs on your +computer in the background and seamlessly encrypts and decrypts your +mail as it enters and leaves your computer. It allows for full +integration of your ProtonMail account with any program that supports +IMAP and SMTP such as Microsoft Outlook, Mozilla Thunderbird and Apple +Mail. + +Once you've installed and adder your account(s) to the Bridge you will +need to configure your email client. The setup guide for Thunderbird +can be found here: https://protonmail.com/bridge/thunderbird + +This script repackages the Debian binary provided by Proton +Technologies. diff --git a/network/protonmail-bridge/doinst.sh b/network/protonmail-bridge/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/network/protonmail-bridge/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/network/protonmail-bridge/protonmail-bridge.SlackBuild b/network/protonmail-bridge/protonmail-bridge.SlackBuild new file mode 100644 index 0000000000..74e9b33a6d --- /dev/null +++ b/network/protonmail-bridge/protonmail-bridge.SlackBuild @@ -0,0 +1,80 @@ +#!/bin/sh + +# Slackware build script for protonmail-bridge + +# Copyright 2018-2021 Erich Ritz +# 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=protonmail-bridge +VERSION=${VERSION:-1.6.9} +DEBVERSION=${DEBVERSION:--1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# Upstream only has binary support for x86_64 at present. +if [ "$ARCH" = "x86_64" ]; then + DEBARCH="amd64" +else + echo "Sorry, the ProtonMail Bridge binary is currently available for x86_64 only." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/${PRGNAM}_${VERSION}${DEBVERSION}_$DEBARCH.deb data.tar.gz | tar xzv +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 {} \; + +mv $PKG/usr/lib $PKG/usr/lib64 +rm $PKG/usr/bin/protonmail-bridge +ln -s /usr/lib64/protonmail/bridge/proton-bridge-launcher $PKG/usr/bin/protonmail-bridge + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/protonmail/bridge/* $PKG/usr/doc/$PRGNAM-$VERSION/ +mv $PKG/usr/share/doc/protonmail-bridge/* $PKG/usr/doc/$PRGNAM-$VERSION/ +rm -rf $PKG/usr/share/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/network/protonmail-bridge/protonmail-bridge.info b/network/protonmail-bridge/protonmail-bridge.info new file mode 100644 index 0000000000..de81c95d28 --- /dev/null +++ b/network/protonmail-bridge/protonmail-bridge.info @@ -0,0 +1,10 @@ +PRGNAM="protonmail-bridge" +VERSION="1.6.9" +HOMEPAGE="https://protonmail.com/bridge/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://protonmail.com/download/bridge/protonmail-bridge_1.6.9-1_amd64.deb" +MD5SUM_x86_64="fac0cd06f786df4724076c8068c8961e" +REQUIRES="" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com" diff --git a/network/dissenter-browser/slack-desc b/network/protonmail-bridge/slack-desc index e2446ed6b2..1c57aa04ba 100644 --- a/network/dissenter-browser/slack-desc +++ b/network/protonmail-bridge/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -dissenter-browser: dissenter-browser (the free speech web browser) -dissenter-browser: -dissenter-browser: Browse faster by blocking ads and trackers that violate your privacy -dissenter-browser: and cost you time and money. -dissenter-browser: -dissenter-browser: -dissenter-browser: -dissenter-browser: -dissenter-browser: -dissenter-browser: https://dissenter.com -dissenter-browser: +protonmail-bridge: protonmail-bridge (ProtonMail Bridge) +protonmail-bridge: +protonmail-bridge: The Bridge is an application that runs on your computer in the +protonmail-bridge: background and seamlessly encrypts and decrypts your mail as it +protonmail-bridge: enters and leaves your computer. +protonmail-bridge: +protonmail-bridge: Proton Technologies AG (ProtonMail Bridge developers) +protonmail-bridge: <bridge@protonmail.ch> +protonmail-bridge: +protonmail-bridge: +protonmail-bridge: diff --git a/network/protonmail-import-export-app/README b/network/protonmail-import-export-app/README new file mode 100644 index 0000000000..cbb9a85e09 --- /dev/null +++ b/network/protonmail-import-export-app/README @@ -0,0 +1,11 @@ +The ProtonMail Import-Export app is an application for paid users that +imports emails to your ProtonMail inbox or makes offline backups. + +You can import messages from Gmail, Outlook, Yahoo, or any other email +provider that supports the IMAP protocol. Importing from local EML and +MBOX files is also supported. You can use the Import-Export app to +download important messages as MBOX or EML files so that you always have +a backup on your device. + +This script repackages the Debian binary provided by Proton +Technologies. diff --git a/network/protonmail-import-export-app/doinst.sh b/network/protonmail-import-export-app/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/network/protonmail-import-export-app/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/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild b/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild new file mode 100644 index 0000000000..c41c2d775d --- /dev/null +++ b/network/protonmail-import-export-app/protonmail-import-export-app.SlackBuild @@ -0,0 +1,80 @@ +#!/bin/sh + +# Slackware build script for protonmail-import-export-app + +# Copyright 2020-2021 Erich Ritz +# 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=protonmail-import-export-app +VERSION=${VERSION:-1.3.1} +DEBVERSION=${DEBVERSION:--1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +# Upstream only has binary support for x86_64 at present. +if [ "$ARCH" = "x86_64" ]; then + DEBARCH="amd64" +else + echo "Sorry, the ProtonMail Import-Export app binary is currently available for x86_64 only." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/${PRGNAM}_${VERSION}${DEBVERSION}_$DEBARCH.deb data.tar.gz | tar xzv +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 {} \; + +mv $PKG/usr/lib $PKG/usr/lib64 +rm $PKG/usr/bin/protonmail-import-export-app +ln -s /usr/lib64/protonmail/import-export/proton-ie-launcher $PKG/usr/bin/protonmail-import-export-app + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/protonmail/import-export/* $PKG/usr/doc/$PRGNAM-$VERSION/ +mv $PKG/usr/share/doc/protonmail-import-export-app/* $PKG/usr/doc/$PRGNAM-$VERSION/ +rm -rf $PKG/usr/share/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/network/protonmail-import-export-app/protonmail-import-export-app.info b/network/protonmail-import-export-app/protonmail-import-export-app.info new file mode 100644 index 0000000000..25b972e07f --- /dev/null +++ b/network/protonmail-import-export-app/protonmail-import-export-app.info @@ -0,0 +1,10 @@ +PRGNAM="protonmail-import-export-app" +VERSION="1.3.1" +HOMEPAGE="https://protonmail.com/import-export" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://protonmail.com/download/ie/protonmail-import-export-app_1.3.1-1_amd64.deb" +MD5SUM_x86_64="553affb4cb0ae3b1de25141eb4ff1077" +REQUIRES="" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com" diff --git a/network/protonmail-import-export-app/slack-desc b/network/protonmail-import-export-app/slack-desc new file mode 100644 index 0000000000..7c54b8366e --- /dev/null +++ b/network/protonmail-import-export-app/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------------------------------------------------------| +protonmail-import-export-app: protonmail-import-export-app (ProtonMail Import-Export app) +protonmail-import-export-app: +protonmail-import-export-app: The Import-Export app helps you to migrate your emails from local +protonmail-import-export-app: files or remote IMAP servers to ProtonMail or simply export emails to +protonmail-import-export-app: local folder. +protonmail-import-export-app: +protonmail-import-export-app: Proton Technologies AG (ProtonMail Bridge developers) +protonmail-import-export-app: <bridge@protonmail.ch> +protonmail-import-export-app: +protonmail-import-export-app: +protonmail-import-export-app: diff --git a/network/protonvpn-cli/README b/network/protonvpn-cli/README new file mode 100644 index 0000000000..fb79f036ca --- /dev/null +++ b/network/protonvpn-cli/README @@ -0,0 +1,26 @@ +protonvpn-cli is the official Linux command line tool for connecting to +the ProtonVPN. It is a full rewrite of the original bash protonvpn-cli +in Python, which adds more features and functionality with the purpose +of improving readability, speed, and reliability. + +Before using protonvpn-cli, it must be initialized. Run (as root) + + protonvpn init + +and follow the prompts on the screen. Your OpenVPN username and password +can be found at https://account.protonvpn.com/account. Note that both +free and paid accounts are supported. + +After protonvpn-cli is configured, run (as root) + + protonvpn connect -f + +to connect to ProtonVPN using the fastest available server. + +Before uninstalling, run + + protonvpn configure + +to purge the configuration files. + +All dependencies must be built with Python3 support. diff --git a/network/Signal-Desktop/Signal-Desktop.SlackBuild b/network/protonvpn-cli/protonvpn-cli.SlackBuild index 5682b12be7..151a4fbe30 100644 --- a/network/Signal-Desktop/Signal-Desktop.SlackBuild +++ b/network/protonvpn-cli/protonvpn-cli.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for Signal-Desktop +# Slackware build script for protonvpn-cli -# Copyright 2017 Rodrigo Gimenez <estrod[at]zoho[dot]com> +# Copyright 2019-2020 Erich Ritz, Scottsdale, Arizona, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=Signal-Desktop -VERSION=${VERSION:-0.42.2} +PRGNAM=protonvpn-cli +SRCNAM=linux-cli +VERSION=${VERSION:-2.2.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,6 +32,7 @@ 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 @@ -45,40 +47,26 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $TMP/$PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -patch -Np1 < $CWD/expirejs.patch -npm install -node_modules/grunt-cli/bin/grunt - -cd dist - -install -Ddm755 "$PKG/opt/$PRGNAM" -cp -r * "$PKG/opt/$PRGNAM" - -install -Ddm755 "$PKG/usr/bin" -echo -e "#!/bin/bash\n/usr/bin/nw /opt/$PRGNAM" > "$PKG/usr/bin/signal" -chmod +x "$PKG/usr/bin/signal" - -install -Ddm755 "$PKG/usr/share/applications" -cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop +python3 setup.py install --root=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS CHANGELOG.md LICENSE README.md USAGE.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 -for icon_size in 16 32 48 128 250 256; do - icon_dir="$PKG/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps" - install -d "$icon_dir" - install -m644 "../images/icon_${icon_size}.png" "$icon_dir/$PRGNAM.png" -done - -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/network/protonvpn-cli/protonvpn-cli.info b/network/protonvpn-cli/protonvpn-cli.info new file mode 100644 index 0000000000..f9f08743e5 --- /dev/null +++ b/network/protonvpn-cli/protonvpn-cli.info @@ -0,0 +1,10 @@ +PRGNAM="protonvpn-cli" +VERSION="2.2.6" +HOMEPAGE="https://protonvpn.com/support/linux-vpn-tool/" +DOWNLOAD="https://github.com/ProtonVPN/linux-cli/archive/v2.2.6/linux-cli-2.2.6.tar.gz" +MD5SUM="7163ee74df63e85359b62eace7f01bf4" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3 docopt python-requests python3-pythondialog Jinja2" +MAINTAINER="Erich Ritz" +EMAIL="erich.public@protonmail.com" diff --git a/network/protonvpn-cli/slack-desc b/network/protonvpn-cli/slack-desc new file mode 100644 index 0000000000..db0231542f --- /dev/null +++ b/network/protonvpn-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------------------------------------------------------| +protonvpn-cli: protonvpn-cli (ProtonVPN's Linux Command-Line Interface) +protonvpn-cli: +protonvpn-cli: Official Linux command line tool for connection to the ProtonVPN. It +protonvpn-cli: is a full rewrite of the original bash protonvpn-cli in Python, which +protonvpn-cli: adds more features and functionality with the purpose of improving +protonvpn-cli: readability, speed, and reliability. +protonvpn-cli: +protonvpn-cli: Homepage: https://protonvpn.com/support/linux-vpn-tool/ +protonvpn-cli: +protonvpn-cli: +protonvpn-cli: diff --git a/network/proxychains/proxychains.SlackBuild b/network/proxychains/proxychains.SlackBuild index 285c032375..c0719a5d2f 100644 --- a/network/proxychains/proxychains.SlackBuild +++ b/network/proxychains/proxychains.SlackBuild @@ -28,12 +28,12 @@ PRGNAM=proxychains SRCNAM=proxychains-ng VERSION=${VERSION:-4.14} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} 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" @@ -64,7 +64,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . find -L . \ diff --git a/network/proxychains/proxychains.info b/network/proxychains/proxychains.info index af5975ffd8..2f344a4236 100644 --- a/network/proxychains/proxychains.info +++ b/network/proxychains/proxychains.info @@ -1,10 +1,10 @@ PRGNAM="proxychains" VERSION="4.14" HOMEPAGE="https://github.com/rofl0r/proxychains-ng/" -DOWNLOAD="https://github.com/rofl0r/proxychains-ng/archive/v4.14.tar.gz" +DOWNLOAD="https://github.com/rofl0r/proxychains-ng/archive/v4.14/proxychains-ng-4.14.tar.gz" MD5SUM="3232630140fe39d53796775285bb6652" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +EMAIL="dave@slackbuilds.org" diff --git a/network/psi-plus/psi-plus.SlackBuild b/network/psi-plus/psi-plus.SlackBuild index 4f2af2f51b..3173557869 100644 --- a/network/psi-plus/psi-plus.SlackBuild +++ b/network/psi-plus/psi-plus.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for psi-plus # Copyright 2010-2017 Eugene Wissner, Dachau, Germany -# Modifications for psi-plus copyright 2018 Dave Woodfall <dave@dawoodfall.net> +# Modifications for psi-plus copyright 2018 Dave Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/psi-plus/psi-plus.info b/network/psi-plus/psi-plus.info index f4621b0b20..0c31126783 100644 --- a/network/psi-plus/psi-plus.info +++ b/network/psi-plus/psi-plus.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qca-qt5" MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +EMAIL="dave@slackbuilds.org" diff --git a/network/pulse-sms/README b/network/pulse-sms/README new file mode 100644 index 0000000000..92232b1ce9 --- /dev/null +++ b/network/pulse-sms/README @@ -0,0 +1,7 @@ +pulse-sms (SMS messaging for Desktop) + +All phones come with SMS, and anyone can use it. Pulse adds a powerful +web platform, so that you can stay on top of your conversations. + +This is a repackaging of the official binary .deb file +distributed by Klinker Apps. diff --git a/network/hipchat/doinst.sh b/network/pulse-sms/doinst.sh index 65c7e2eeb9..65c7e2eeb9 100644 --- a/network/hipchat/doinst.sh +++ b/network/pulse-sms/doinst.sh diff --git a/network/pulse-sms/pulse-sms.SlackBuild b/network/pulse-sms/pulse-sms.SlackBuild new file mode 100644 index 0000000000..081f3c2731 --- /dev/null +++ b/network/pulse-sms/pulse-sms.SlackBuild @@ -0,0 +1,74 @@ +#!/bin/sh + +# Slackware build script for Pulse SMS + +# Copyright 2020 Ebben Aries +# 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=pulse-sms +VERSION=${VERSION:-4.3.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ -z "$ARCH" ]; then + ARCH=$( uname -m ) +fi + +# Upstream only has binary support for x86_64 at present. +if [ "$ARCH" = "x86_64" ]; then + DEBARCH="amd64" +else + echo "Sorry, the Pulse SMS binary is currently available for x86_64 only." + exit 1 +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $PKG +ar p $CWD/${PRGNAM}-${VERSION}-$DEBARCH.deb data.tar.xz | tar xJv +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 {} \; + +# create soft link for launcher +mkdir -p $PKG/usr/bin +ln -sf /opt/Pulse\ SMS/$PRGNAM $PKG/usr/bin/$PRGNAM + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp $PKG/usr/share/doc/$PRGNAM/* $PKG/opt/Pulse\ SMS/LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share/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/network/pulse-sms/pulse-sms.info b/network/pulse-sms/pulse-sms.info new file mode 100644 index 0000000000..0d653dacb1 --- /dev/null +++ b/network/pulse-sms/pulse-sms.info @@ -0,0 +1,10 @@ +PRGNAM="pulse-sms" +VERSION="4.3.0" +HOMEPAGE="https://messenger.klinkerapps.com/overview/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/klinker-apps/pulse-sms-desktop/releases/download/v4.3.0/pulse-sms-4.3.0-amd64.deb" +MD5SUM_x86_64="5e73a41b6cde0dbc0ebbebb199e5db31" +REQUIRES="" +MAINTAINER="Ebben Aries" +EMAIL="e@dscp.org" diff --git a/network/pulse-sms/slack-desc b/network/pulse-sms/slack-desc new file mode 100644 index 0000000000..2e3f116432 --- /dev/null +++ b/network/pulse-sms/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------------------------------------------------------| +pulse-sms: pulse-sms (SMS messaging for Desktop) +pulse-sms: +pulse-sms: All phones come with SMS, and anyone can use it. Pulse adds a powerful +pulse-sms: web platform, so that you can stay on top of your conversations. +pulse-sms: +pulse-sms: This is a repackaging of the official binary .deb file +pulse-sms: distributed by Klinker Apps. +pulse-sms: +pulse-sms: Home-Page: https://messenger.klinkerapps.com/overview +pulse-sms: +pulse-sms: diff --git a/network/pure-ftpd/pure-ftpd.SlackBuild b/network/pure-ftpd/pure-ftpd.SlackBuild index 15f1133262..47bb7b65db 100644 --- a/network/pure-ftpd/pure-ftpd.SlackBuild +++ b/network/pure-ftpd/pure-ftpd.SlackBuild @@ -22,7 +22,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pure-ftpd -VERSION=${VERSION:-1.0.47} +VERSION=${VERSION:-1.0.49} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -105,7 +105,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 install -m 0644 \ - AUTHORS CONTACT COPYING ChangeLog FAQ HISTORY INSTALL NEWS README* THANKS pureftpd* \ + AUTHORS COPYING ChangeLog FAQ HISTORY INSTALL NEWS README* THANKS pureftpd* \ $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/pure-ftpd/pure-ftpd.info b/network/pure-ftpd/pure-ftpd.info index 709d6528aa..6fd77ce1e7 100644 --- a/network/pure-ftpd/pure-ftpd.info +++ b/network/pure-ftpd/pure-ftpd.info @@ -1,8 +1,8 @@ PRGNAM="pure-ftpd" -VERSION="1.0.47" +VERSION="1.0.49" HOMEPAGE="http://www.pureftpd.org/" -DOWNLOAD="https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.47.tar.gz" -MD5SUM="f000e519918682ee6b65090352177d4a" +DOWNLOAD="https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.gz" +MD5SUM="451879495ba61c1d7dcfca8dd231119f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/purple-facebook/purple-facebook.SlackBuild b/network/purple-facebook/purple-facebook.SlackBuild index 03bc1eb18a..3a43430335 100644 --- a/network/purple-facebook/purple-facebook.SlackBuild +++ b/network/purple-facebook/purple-facebook.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for purple-facebook # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com> -# 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 @@ -23,8 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=purple-facebook -VERSION=${VERSION:-0.9.5_9ff9acf9fa14} -SRCVERSION=${VERSION/_/-} +VERSION=${VERSION:-0.9.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRCVERSION -tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz -cd $PRGNAM-$SRCVERSION +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/network/purple-facebook/purple-facebook.info b/network/purple-facebook/purple-facebook.info index 42672ee61e..0e5921e0d7 100644 --- a/network/purple-facebook/purple-facebook.info +++ b/network/purple-facebook/purple-facebook.info @@ -1,10 +1,10 @@ PRGNAM="purple-facebook" -VERSION="0.9.5_9ff9acf9fa14" +VERSION="0.9.6" HOMEPAGE="https://github.com/dequis/purple-facebook" -DOWNLOAD="http://unrealize.co.uk/source/purple-facebook-0.9.5-9ff9acf9fa14.tar.gz" -MD5SUM="9122bd8de731a24b0011a93db62d809b" +DOWNLOAD="https://github.com/dequis/purple-facebook/releases/download/v0.9.6/purple-facebook-0.9.6.tar.gz" +MD5SUM="fe58b39f835fac3e7616c34364d869a9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="json-glib" MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" +EMAIL="dave@slackbuilds.org" diff --git a/network/purple-gowhatsapp/README b/network/purple-gowhatsapp/README new file mode 100644 index 0000000000..6a06bda984 --- /dev/null +++ b/network/purple-gowhatsapp/README @@ -0,0 +1,2 @@ +This package implements the WhatsApp Web API to provide a +clean interface for developers. diff --git a/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild b/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild new file mode 100644 index 0000000000..eaa0e2516c --- /dev/null +++ b/network/purple-gowhatsapp/purple-gowhatsapp.SlackBuild @@ -0,0 +1,67 @@ +#!/bin/sh + +# Slackware build script for purple-gowhatsapp + +# Copyright 2020 Alan Aversa U.S.A +# 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=purple-gowhatsapp +VERSION=${VERSION:-0.4.1} +LIBGOGIT=${LIBGOGIT:-gitb84fdd7} +GOWHATSGIT=${GOWHATSGIT:-git64cc8cf} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + x86_64) ARCH=x86_64 ;; + *) echo "Only x86_64 supported"; exit 1 ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir $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/lib64/pidgin +mv -v $CWD/'libgowhatsapp_'$VERSION'~'$LIBGOGIT'+gowhatsapp~'$GOWHATSGIT'_amd64_ubuntu18.04.so' $PKG/usr/lib64/pidgin/libgowhatsapp.so + +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/network/purple-gowhatsapp/purple-gowhatsapp.info b/network/purple-gowhatsapp/purple-gowhatsapp.info new file mode 100644 index 0000000000..32fc12d904 --- /dev/null +++ b/network/purple-gowhatsapp/purple-gowhatsapp.info @@ -0,0 +1,10 @@ +PRGNAM="purple-gowhatsapp" +VERSION="0.4.1" +HOMEPAGE="https://github.com/hoehermann/purple-gowhatsapp" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://buildbot.hehoe.de/purple-gowhatsapp/builds/libgowhatsapp_0.4.1~gitb84fdd7+gowhatsapp~git64cc8cf_amd64_ubuntu18.04.so" +MD5SUM_x86_64="a6072fffe693d1599573c9abd451b2cb" +REQUIRES="" +MAINTAINER="Alan Aversa" +EMAIL="alan.NOaversa@coSPAM.net (remove NO and SPAM)" diff --git a/network/purple-gowhatsapp/slack-desc b/network/purple-gowhatsapp/slack-desc new file mode 100644 index 0000000000..b027c2e789 --- /dev/null +++ b/network/purple-gowhatsapp/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------------------------------------------------------| +purple-gowhatsapp: purple-gowhatsapp (libpurple/Pidgin plugin for WhatsApp Web) +purple-gowhatsapp: +purple-gowhatsapp: * Receive text messages. +purple-gowhatsapp: * Sending text messages. +purple-gowhatsapp: * Download files from image, audio, media, and document messages. +purple-gowhatsapp: * Library installed in global plugins directory: /usr/lib64/pidgin/ +purple-gowhatsapp: * Under the hood: Reasonable callback mechanism thanks to Eiron Robb. +purple-gowhatsapp: * Fetch contacts from phone, keep track of time last seen, download of +purple-gowhatsapp: user profile pictures courtesy of Markus Gothe. +purple-gowhatsapp: +purple-gowhatsapp: purple-gowhatsapp is actively-maintained analogue of whatsapp-purple. diff --git a/network/purple-hangouts/purple-hangouts.info b/network/purple-hangouts/purple-hangouts.info index d49a7c8b5e..cd9ca2af63 100644 --- a/network/purple-hangouts/purple-hangouts.info +++ b/network/purple-hangouts/purple-hangouts.info @@ -1,5 +1,5 @@ PRGNAM="purple-hangouts" -VERSION="0.9.4" +VERSION="effc9b41df8c" HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts" DOWNLOAD="https://bitbucket.org/EionRobb/purple-hangouts/get/effc9b41df8c.zip" MD5SUM="35cc2a7bf8ae191c04d630783b0f6e55" diff --git a/network/purple-plugin-pack/purple-plugin-pack.SlackBuild b/network/purple-plugin-pack/purple-plugin-pack.SlackBuild index 87a94d921c..00b4eec7ca 100644 --- a/network/purple-plugin-pack/purple-plugin-pack.SlackBuild +++ b/network/purple-plugin-pack/purple-plugin-pack.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for purple-plugin-pack -# Copyright 2018 Dave Woodfall <dave@dawoodfall.net> +# Copyright 2018 Dave Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/purple-plugin-pack/purple-plugin-pack.info b/network/purple-plugin-pack/purple-plugin-pack.info index 71443bc90b..24e796a500 100644 --- a/network/purple-plugin-pack/purple-plugin-pack.info +++ b/network/purple-plugin-pack/purple-plugin-pack.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/network/putty/putty.SlackBuild b/network/putty/putty.SlackBuild index b315827692..7dd7874f0b 100644 --- a/network/putty/putty.SlackBuild +++ b/network/putty/putty.SlackBuild @@ -31,7 +31,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=putty -VERSION=${VERSION:-0.73} +VERSION=${VERSION:-0.74} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/putty/putty.info b/network/putty/putty.info index e75f21be83..eb828e591a 100644 --- a/network/putty/putty.info +++ b/network/putty/putty.info @@ -1,8 +1,8 @@ PRGNAM="putty" -VERSION="0.73" +VERSION="0.74" HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" -DOWNLOAD="https://the.earth.li/~sgtatham/putty/latest/putty-0.73.tar.gz" -MD5SUM="d4a1797763e11e6a77115d0d0368b566" +DOWNLOAD="https://the.earth.li/~sgtatham/putty/latest/putty-0.74.tar.gz" +MD5SUM="dbfa58f22a91b22b7489173e9dd09e30" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" diff --git a/network/pyNeighborhood/pyNeighborhood.SlackBuild b/network/pyNeighborhood/pyNeighborhood.SlackBuild index a4459259c3..d5f2d6dcc9 100644 --- a/network/pyNeighborhood/pyNeighborhood.SlackBuild +++ b/network/pyNeighborhood/pyNeighborhood.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for pyneighborhood -# 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/network/pyNeighborhood/pyNeighborhood.info b/network/pyNeighborhood/pyNeighborhood.info index fb3f0eae6b..fbe0d10677 100644 --- a/network/pyNeighborhood/pyNeighborhood.info +++ b/network/pyNeighborhood/pyNeighborhood.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/network/pyzor/pyzor.SlackBuild b/network/pyzor/pyzor.SlackBuild index d58444fd2d..9e8fb5ba9b 100644 --- a/network/pyzor/pyzor.SlackBuild +++ b/network/pyzor/pyzor.SlackBuild @@ -5,6 +5,8 @@ # Copyright 2009-2015 LukenShiro, Italy # All rights reserved. # +# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com> +# # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # diff --git a/network/pyzor/pyzor.info b/network/pyzor/pyzor.info index 7218bb1268..5049194ecb 100644 --- a/network/pyzor/pyzor.info +++ b/network/pyzor/pyzor.info @@ -6,5 +6,5 @@ MD5SUM="e77b1cd0afd3884e6f2aa585cb423b46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LukenShiro" -EMAIL="lukenshiro@ngi.it" +MAINTAINER="Gerardo Zamudio" +EMAIL="gerardo.zamudio@linux.com" diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild index 1fff74fa2d..aca498cc4f 100644 --- a/network/qTox/qTox.SlackBuild +++ b/network/qTox/qTox.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qTox -# Copyright 2015, 2016, 2017, 2018, 2019 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=qTox -VERSION=${VERSION:-20190928_85361393} +VERSION=${VERSION:-1.17.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/qTox/qTox.info b/network/qTox/qTox.info index c44ac3638b..fbff231bdc 100644 --- a/network/qTox/qTox.info +++ b/network/qTox/qTox.info @@ -1,8 +1,8 @@ PRGNAM="qTox" -VERSION="20190928_85361393" +VERSION="1.17.3" HOMEPAGE="https://github.com/qTox/qTox" -DOWNLOAD="http://mirror.slackware.hr/sources/qTox/qTox-20190928_85361393.tar.bz2" -MD5SUM="42563f12227ba9c5db289fb4043d3b6d" +DOWNLOAD="https://github.com/qTox/qTox/archive/v1.17.3/qTox-1.17.3.tar.gz" +MD5SUM="90a3a03d146ea9656909a4d8dd360c47" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="c-toxcore libfilteraudio qt5 ffmpeg qrencode libxkbcommon sqlcipher" diff --git a/network/qbittorrent-qt5/README b/network/qbittorrent-qt5/README deleted file mode 100644 index 367cfb49bc..0000000000 --- a/network/qbittorrent-qt5/README +++ /dev/null @@ -1,10 +0,0 @@ -qBittorrent is an easy to use, good looking, and featureful -but lightweight C++ / Qt5 Bittorrent Client. - -Note that from version 3.3.15 you will get a warning on startup that -qbittorrent has a new way of saving things. If you want to backup -your old config directory first, you will find it here: - -~/.config/qBittorrent - -You can return to an older version by swapping directories around. diff --git a/network/qbittorrent-qt5/doinst.sh b/network/qbittorrent-qt5/doinst.sh deleted file mode 100644 index d3350f3157..0000000000 --- a/network/qbittorrent-qt5/doinst.sh +++ /dev/null @@ -1,24 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/rc.d/rc.qbittorrent-nox.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 diff --git a/network/qbittorrent-qt5/qbittorrent-qt5.info b/network/qbittorrent-qt5/qbittorrent-qt5.info deleted file mode 100644 index d409152286..0000000000 --- a/network/qbittorrent-qt5/qbittorrent-qt5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qbittorrent-qt5" -VERSION="4.1.5" -HOMEPAGE="http://qbittorrent.sourceforge.net" -DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.1.5/qBittorrent-release-4.1.5.tar.gz" -MD5SUM="b85f16a333b8d110650f72bd53e20538" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libtorrent-rasterbar qt5" -MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" diff --git a/network/qbittorrent-qt5/rc.qbittorrent-nox.new b/network/qbittorrent-qt5/rc.qbittorrent-nox.new deleted file mode 100644 index aa916d8096..0000000000 --- a/network/qbittorrent-qt5/rc.qbittorrent-nox.new +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -# /etc/rc.d/rc.qbittorrent-nox -# Runs qbittorrent webui under user who started the script. -# Usage: /etc/rc.d/rc.qbittorrent-nox start <PORT>|stop|restart <PORT>|status -# Port defaults to 8080 if not provided. -# -# To run this script from rc.local you must run it as a non-root user. -# -# Example: -# /bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000" -# Program output is sent to /tmp/qbittorrent-nox-$USER - -# First some checks to see what's what. - -if [ "$USER" = "root" ] && [[ "$1" =~ start ]]; then - echo "Do not start the daemon as root." >/dev/stderr - exit 1 -fi - - -if [ -n "$2" ]; then - UIPORT="$2" -else - UIPORT="8080" -fi - -LOG="/tmp/qbittorrent-nox-$USER" -APP="/usr/bin/qbittorrent-nox" - -do_start() -{ - if [ -n "$(/bin/netstat -nta | awk '{print $4}' \ - | cut -d: -f2 | grep $UIPORT | grep 0.0.0.0)" ]; then - - echo "Port $UIPORT is already in use." >/dev/stderr - exit 1 - fi - - $APP --webui-port=$UIPORT 1>$LOG 2>&1 & -} - -do_stop() -{ - PID="$(pgrep -u $USER qbittorrent-nox)" - - if [ -n "$PID" ]; then - echo "Killing PID $PID" - kill $PID - else - echo "No process found." >/dev/stderr - fi -} - -do_status() -{ - echo "Local Address Foreign Address State PID/Program name" - /bin/netstat -pntl 2>&1 | grep qbittorrent-n \ - | awk '{print $4 " " $5 " " $6 " " $7}' -} - -case "$1" in - 'start') - do_start - ;; - - 'stop') - do_stop - ;; - 'restart') - do_stop - sleep 1 - do_start - ;; - 'status') - do_status - ;; - *) - echo "Usage: $0 {start <PORT>|stop|restart <PORT>|status}" - exit 1 - ;; -esac diff --git a/network/qbittorrent-qt5/slack-desc b/network/qbittorrent-qt5/slack-desc deleted file mode 100644 index 2214d59757..0000000000 --- a/network/qbittorrent-qt5/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------------------------------------------------------| -qbittorrent-qt5: qbittorrent-qt5 (a C++ / Qt5 Bittorrent Client) -qbittorrent-qt5: -qbittorrent-qt5: The qBittorrent project was created in March 2006 with the idea -qbittorrent-qt5: of developing a new Bittorrent client for Linux (and possibly -qbittorrent-qt5: other systems) that would be easy to use, good looking, and -qbittorrent-qt5: featureful but lightweight. -qbittorrent-qt5: qBittorrent is a Free Software released under the GNU GPL license. -qbittorrent-qt5: The author is Christophe Dumez, a French student in an engineer -qbittorrent-qt5: school (UTBM), in IT departement. -qbittorrent-qt5: -qbittorrent-qt5: Homepage: http://qbittorrent.sourceforge.net diff --git a/network/qbittorrent/README b/network/qbittorrent/README index 731c51c61f..d95396d99f 100644 --- a/network/qbittorrent/README +++ b/network/qbittorrent/README @@ -1,11 +1,14 @@ -qBittorrent is an easy to use, good looking, and featureful -but lightweight C++ / Qt4 Bittorrent Client. +qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses +libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg. + +It aims to be a good alternative to all other bittorrent clients out +there. qBittorrent is fast, stable, and provides unicode supports as +well as many features. Note that from version 3.3.15 you will get a warning on startup that -qbittorrent has a new way of saving things. If you want to backup -your old config directory first, you will find it here: +qbittorrent has a new way of saving things. If you want to backup your +old config directory first, you will find it here: ~/.config/qBittorrent -That way you can return to an older version by swapping directories -around. +You can return to an older version by swapping directories around. diff --git a/network/qbittorrent-qt5/README.SBo b/network/qbittorrent/README.SBo index 56683cfced..56683cfced 100644 --- a/network/qbittorrent-qt5/README.SBo +++ b/network/qbittorrent/README.SBo diff --git a/network/qbittorrent/README.nox b/network/qbittorrent/README.nox deleted file mode 100644 index 15193a85ab..0000000000 --- a/network/qbittorrent/README.nox +++ /dev/null @@ -1,17 +0,0 @@ -An rc init script is provided and has the following features: - -Runs qbittorrent-nox webui under user who started the script. - -Usage: -/etc/rc.d/rc.qbittorrent-nox start [PORT]|stop|restart [PORT]|status -Port defaults to 8080 if not provided. - -To run this script from rc.local you must run it as a non-root user. - -Example: -/bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000 - -Program output is sent to /tmp/qbittorrent-nox-$USER - -The status command can be run as root, in which case you should see -all process of qbittorrent-nox, otherwise you will just see $USER's. diff --git a/network/qbittorrent/qbittorrent.SlackBuild b/network/qbittorrent/qbittorrent.SlackBuild index 5584a8df0c..b3107b945f 100644 --- a/network/qbittorrent/qbittorrent.SlackBuild +++ b/network/qbittorrent/qbittorrent.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for qbittorrent -# Copyright 2009-2010 David Woodfall <dave@dawoodfall.net> +# Copyright 2019-2021 Donald Cooley South Haven, Indiana USA +# Copyright 2009-2010 David Woodfall <dave@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qbittorrent -SRCNAM=qBittorrent-release -VERSION=${VERSION:-3.3.16} +SRCNAM=qBittorrent +VERSION=${VERSION:-4.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,21 +61,27 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/release-$VERSION.tar.?z* -cd $SRCNAM-$VERSION +rm -rf $SRCNAM-release-$VERSION +tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z* +cd $SRCNAM-release-$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" \ +CXXFLAGS="$SLKCFLAGS -std=c++14" \ ./configure \ --prefix=/usr \ - --with-qt4 + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux make make install INSTALL_ROOT=$PKG @@ -84,17 +91,21 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --with-qt4 \ - --disable-gui + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-gui \ + --build=$ARCH-slackware-linux make mv src/qbittorrent-nox $PKG/usr/bin -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 - -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 @@ -103,8 +114,7 @@ cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \ - $CWD/README.nox \ - $PKG/usr/doc/$PRGNAM-$VERSION + $CWD/README.SBo $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/qbittorrent/qbittorrent.info b/network/qbittorrent/qbittorrent.info index 106024f321..2640449e50 100644 --- a/network/qbittorrent/qbittorrent.info +++ b/network/qbittorrent/qbittorrent.info @@ -1,10 +1,10 @@ PRGNAM="qbittorrent" -VERSION="3.3.16" +VERSION="4.3.1" HOMEPAGE="http://qbittorrent.sourceforge.net" -DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-3.3.16.tar.gz" -MD5SUM="28852012dbd3f3bbec400279935b88d1" +DOWNLOAD="https://github.com/qbittorrent/qBittorrent/archive/release-4.3.1/qBittorrent-release-4.3.1.tar.gz" +MD5SUM="4e72cfa5dc637b53ab86fdc0ebf97c9f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libtorrent-rasterbar" -MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +REQUIRES="libtorrent-rasterbar qt5" +MAINTAINER="Donald Cooley" +EMAIL="chytraeu@sdf.org" diff --git a/network/qbittorrent/rc.qbittorrent-nox.new b/network/qbittorrent/rc.qbittorrent-nox.new index 9b78744ba4..aa916d8096 100644 --- a/network/qbittorrent/rc.qbittorrent-nox.new +++ b/network/qbittorrent/rc.qbittorrent-nox.new @@ -8,12 +8,12 @@ # To run this script from rc.local you must run it as a non-root user. # # Example: -# /bin/su - david -c /etc/rc.d/rc.qbittorrent-nox start 9000 +# /bin/su - david -c "/etc/rc.d/rc.qbittorrent-nox start 9000" # Program output is sent to /tmp/qbittorrent-nox-$USER # First some checks to see what's what. -if [ "$USER" = "root" ] && [ "$1" = "start" ]; then +if [ "$USER" = "root" ] && [[ "$1" =~ start ]]; then echo "Do not start the daemon as root." >/dev/stderr exit 1 fi diff --git a/network/qbittorrent/slack-desc b/network/qbittorrent/slack-desc index 2a54c14312..1a83a98147 100644 --- a/network/qbittorrent/slack-desc +++ b/network/qbittorrent/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -qbittorrent: qbittorrent (a C++ / Qt4 Bittorrent Client) +qbittorrent: qbittorrent (a C++ / Qt5 Bittorrent Client) qbittorrent: -qbittorrent: The qBittorrent project was created in March 2006 with the idea -qbittorrent: of developing a new Bittorrent client for Linux (and possibly -qbittorrent: other systems) that would be easy to use, good looking, and -qbittorrent: featureful but lightweight. -qbittorrent: qBittorrent is a Free Software released under the GNU GPL license. -qbittorrent: The author is Christophe Dumez, a French student in an engineer -qbittorrent: school (UTBM), in IT departement. +qbittorrent: qBittorrent is a bittorrent client programmed in C++ / Qt5 that uses +qbittorrent: libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg. qbittorrent: -qbittorrent: Homepage: http://qbittorrent.sourceforge.net +qbittorrent: It aims to be a good alternative to all other bittorrent clients out +qbittorrent: there. qBittorrent is fast, stable, and provides unicode support as +qbittorrent: well as many features. +qbittorrent: +qbittorrent: +qbittorrent: Homepage: https://qbittorrent.sourceforge.net diff --git a/network/qtmib/README b/network/qtmib/README index 99453f2198..37f97e181a 100644 --- a/network/qtmib/README +++ b/network/qtmib/README @@ -1,8 +1,10 @@ -qtmib is an easy-to-use SNMP MIB Browser based on QT4 library. It is build as -a front-end for net-snmp, and it allows the user to query any SNMP-enabled -device. It implements SNMPv1 and SNMPv2c, and it is released under GPL v2 -license. +qtmib (graphical SNMP MIB Browser) -qtmib supports out of the box a large number of MIBs. We are currently -tracking netdisco MIB archive. You can also install private MIBs by dropping -them in ~/.config/qtmib/mibs directory. +qtmib is an easy-to-use SNMP MIB Browser based on the Qt4 library. It is a +front-end for net-snmp, and it allows the user to query any SNMP-enabled +device. It implements SNMPv1 and SNMPv2c, and it is released under the +GPLv2 license. + +qtmib supports a large number of MIBs out of the box. It currently tracks +the netdisco MIB archive. You can also install private MIBs by dropping +them in the ~/.config/qtmib/mibs directory. diff --git a/network/qtmib/qtmib.SlackBuild b/network/qtmib/qtmib.SlackBuild index 4a46a07f17..c1ac26ce26 100644 --- a/network/qtmib/qtmib.SlackBuild +++ b/network/qtmib/qtmib.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for qtmib # Copyright (c) 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,11 @@ # 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 +# - actually use SLKCFLAGS +# - grammar nitpicks in README, slack-desc + PRGNAM=qtmib VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} @@ -66,12 +72,10 @@ 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 {} \; +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 \ --mandir=/usr/man \ @@ -81,9 +85,7 @@ find -L . \ sed -i "s|share/man|man|g" Makefile 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 +strip $PKG/usr/bin/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING README RELNOTES $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/qtmib/qtmib.info b/network/qtmib/qtmib.info index a831307154..d82bc975e6 100644 --- a/network/qtmib/qtmib.info +++ b/network/qtmib/qtmib.info @@ -6,5 +6,5 @@ MD5SUM="1715ae9c88e1f0d355f9a93b3248455e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LEVAI Daniel" -EMAIL="leva@ecentrum.hu" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/qtmib/slack-desc b/network/qtmib/slack-desc index 3272299757..b38ac5aeef 100644 --- a/network/qtmib/slack-desc +++ b/network/qtmib/slack-desc @@ -6,12 +6,12 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -qtmib: qtmib (an easy-to-use SNMP MIB Browser) +qtmib: qtmib (graphical SNMP MIB Browser) qtmib: -qtmib: qtmib is an easy-to-use SNMP MIB Browser based on QT4 library. It is -qtmib: build as a front-end for net-snmp, and it allows the user to query any +qtmib: qtmib is an easy-to-use SNMP MIB Browser based on the Qt4 library. It +qtmib: is a front-end for net-snmp, and it allows the user to query any qtmib: SNMP-enabled device. It implements SNMPv1 and SNMPv2c, and it is -qtmib: released under GPL v2 license. +qtmib: released under the GPLv2 license. qtmib: qtmib: Homepage: http://qtmib.sourceforge.net/ qtmib: diff --git a/network/qutebrowser-tox/8232d38.patch b/network/qutebrowser-tox/8232d38.patch new file mode 100644 index 0000000000..952170b1bd --- /dev/null +++ b/network/qutebrowser-tox/8232d38.patch @@ -0,0 +1,42 @@ +From 8232d384929641be7409e026d20843a2edd73e48 Mon Sep 17 00:00:00 2001 +From: Florian Bruhin <me@the-compiler.org> +Date: Tue, 13 Apr 2021 16:33:13 +0200 +Subject: [PATCH] notifications: Handle MaxNotificationsExceeded error from + GNOME Flashback + +(cherry picked from commit 2cfc64579a22e7dd933c9591e6bb141b877b58e0) +--- + qutebrowser/browser/webengine/notification.py | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py +index 36493f4f72..5e32b63276 100644 +--- a/qutebrowser/browser/webengine/notification.py ++++ b/qutebrowser/browser/webengine/notification.py +@@ -693,6 +693,15 @@ class DBusNotificationAdapter(AbstractNotificationAdapter): + SPEC_VERSION = "1.2" # Released in January 2011, still current in March 2021. + NAME = "libnotify" + ++ _NON_FATAL_ERRORS = { ++ # notification daemon is gone ++ "org.freedesktop.DBus.Error.NoReply", ++ ++ # https://gitlab.gnome.org/GNOME/gnome-flashback/-/blob/3.40.0/gnome-flashback/libnotifications/nd-daemon.c#L178-187 ++ # Exceeded maximum number of notifications ++ "org.freedesktop.Notifications.MaxNotificationsExceeded", ++ } ++ + def __init__(self, parent: QObject = None) -> None: + super().__init__(bridge) + if not qtutils.version_check('5.14'): +@@ -878,8 +887,8 @@ def _verify_message( + + if msg.type() == QDBusMessage.ErrorMessage: + err = msg.errorName() +- if err == "org.freedesktop.DBus.Error.NoReply": +- self.error.emit(msg.errorMessage()) # notification daemon is gone ++ if err in self._NON_FATAL_ERRORS: ++ self.error.emit(msg.errorMessage()) + return + + raise Error(f"Got DBus error: {err} - {msg.errorMessage()}") diff --git a/network/qutebrowser-tox/README b/network/qutebrowser-tox/README index fd030b08fb..7b852e17a5 100644 --- a/network/qutebrowser-tox/README +++ b/network/qutebrowser-tox/README @@ -4,9 +4,12 @@ It's based on Qt and PyQt5 and free software, licensed under the GPL. It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. -This script runs tox to install all needed dependencies in a virtual +This SlackBuild installs all needed dependencies in a virtual environment subfolder. This comes with an up-to-date Qt/PyQt including a pre-compiled QtWebEngine binary, but has a couple of caveats: * It only works on 64-bit x86 systems. * It comes with a QtWebEngine compiled without proprietary codec support - (such as h.264). + (such as h.264). + +Before version 1.10.0 this SlackBuild used tox to manage virtualenv, +hence the name of the SlackBuild. diff --git a/network/qutebrowser-tox/README.SBo.Widevine b/network/qutebrowser-tox/README.SBo index e3d4f55732..829582a8cf 100644 --- a/network/qutebrowser-tox/README.SBo.Widevine +++ b/network/qutebrowser-tox/README.SBo @@ -1,3 +1,17 @@ +Qutebrowser crashes +=================== + +If qutebrowser starts to crash, its cache may be corrupt. This often +happens after an upgrade. To remove the cache run: +rm -rf ~/.cache/qutebrowser/ +rm -rf ~/.local/share/qutebrowser/webengine/Application\ Cache/ +rm -rf ~/.local/share/qutebrowser/webengine/GPUCache +rm -rf ~/.local/share/qutebrowser/webengine/Service\ Worker/CacheStorage +rm -rf ~/.local/share/qutebrowser/webengine/Service\ Worker/ScriptCache + +Widevine support +================ + Widevine DRM support requires libwidevinecdm.so plugin. Qutebrowser searches for it in the following directories: diff --git a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild index d811b4133a..40794c7ea8 100644 --- a/network/qutebrowser-tox/qutebrowser-tox.SlackBuild +++ b/network/qutebrowser-tox/qutebrowser-tox.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qutebrowser-tox -# Copyright 2019, Alexander Verbovetsky, Moscow, Russia +# Copyright 2019-2021, Alexander Verbovetsky, Moscow, Russia # 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=qutebrowser-tox -VERSION=${VERSION:-1.8.1} -SSLVERSION=${SSLVERSION:-1.1.1d} +VERSION=${VERSION:-2.2.0} +SSLVERSION=${SSLVERSION:-1.1.1k} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,9 +54,11 @@ cd $PKG/opt tar xvf $CWD/qutebrowser-$VERSION.tar.gz mv qutebrowser-$VERSION qutebrowser cd qutebrowser -sed -i "/\[testenv:mkvenv-pypi\]/ a \ -install_command = pip install --no-index --find-links $CWD/ {opts} {packages}"\ - tox.ini +sed -i.bak "s|\(run_venv(venv_dir, 'python', '-m', 'pip', 'install',\)|\1 \ +'--no-index', '--find-links=$CWD/',|" scripts/mkvenv.py + +sed -i "/env\['PATH'\] = str(bin_path) + os.pathsep + env\['PATH'\]/d" \ + scripts/asciidoc2html.py chown -R root:root . find -L . \ @@ -65,12 +67,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -tox -e mkvenv-pypi +patch -p1 < $CWD/8232d38.patch + +python3 scripts/mkvenv.py --skip-smoke-test + +mv scripts/mkvenv.py.bak scripts/mkvenv.py find ./ -type f -name '*.pyc' -delete find ./ -type d -name '__pycache__' -delete find ./ -type f -exec sed -i -e "s|$PKG||" {} \; -sed -i "/\[testenv:mkvenv-pypi\]/ {n;d;}" tox.ini find ./ -type f -exec sed -i -e \ '1,2 s|^#!/usr/bin/env python.*$|#!/opt/qutebrowser/.venv/bin/python3|' {} \; .venv/bin/python3 -m compileall scripts/__init__.py \ diff --git a/network/qutebrowser-tox/qutebrowser-tox.info b/network/qutebrowser-tox/qutebrowser-tox.info index 6db8bf37dd..7e33863895 100644 --- a/network/qutebrowser-tox/qutebrowser-tox.info +++ b/network/qutebrowser-tox/qutebrowser-tox.info @@ -1,36 +1,50 @@ PRGNAM="qutebrowser-tox" -VERSION="1.8.1" +VERSION="2.2.0" HOMEPAGE="https://qutebrowser.org" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v1.8.1/qutebrowser-1.8.1.tar.gz \ - https://files.pythonhosted.org/packages/1d/e7/fd8b501e7a6dfe492a433deb7b9d833d39ca74916fa8bc63dd1a4947a671/Jinja2-2.10.1-py2.py3-none-any.whl \ - https://files.pythonhosted.org/packages/98/7b/ff284bd8c80654e471b769062a9b43cc5d03e7a615048d96f4619df8d420/MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl \ - https://files.pythonhosted.org/packages/26/a8/5d28fb652c80f41c28e7a54fcb576339904246d3662dad9afcb414f78cce/PyQt5-5.12.3-5.12.5-cp35.cp36.cp37.cp38-abi3-manylinux1_x86_64.whl \ - https://files.pythonhosted.org/packages/bf/63/d363b567237375235d270049fd6416c83949f470bb51539458966cd7a38c/PyQt5_sip-4.19.19-cp37-cp37m-manylinux1_x86_64.whl \ - https://files.pythonhosted.org/packages/00/1b/bb518696c3884f330dcb54e8cd3ca2e975082c6f35f1148f28d018c99248/PyQtWebEngine-5.12.1-5.12.5-cp35.cp36.cp37.cp38-abi3-manylinux1_x86_64.whl \ - https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe/PyYAML-5.1.2.tar.gz \ - https://files.pythonhosted.org/packages/5c/73/1dfa428150e3ccb0fa3e68db406e5be48698f2a979ccbcec795f28f44048/Pygments-2.4.2-py2.py3-none-any.whl \ - https://files.pythonhosted.org/packages/23/96/d828354fa2dbdf216eaa7b7de0db692f12c234f7ef888cc14980ef40d1d2/attrs-19.1.0-py2.py3-none-any.whl \ - https://files.pythonhosted.org/packages/4f/a6/728666f39bfff1719fc94c481890b2106837da9318031f71a8424b662e12/colorama-0.4.1-py2.py3-none-any.whl \ - https://files.pythonhosted.org/packages/6b/15/a9fb9010f58d1c55dd0b7779db2334feb9a572d407024f39a60f44293861/cssutils-1.0.2-py3-none-any.whl \ - https://files.pythonhosted.org/packages/f9/bd/10398e2c2d2070cc8a9c7153abfbd4ddb2895a2c52a32722ab8689e0cc7d/pyPEG2-2.15.2.tar.gz \ - https://github.com/mozilla/pdf.js/releases/download/v2.3.200/pdfjs-2.3.200-dist.zip \ - https://www.openssl.org/source/openssl-1.1.1d.tar.gz" -MD5SUM_x86_64="cb57d11fba16065c01af77dbffdb5137 \ - 93ca8152bf9ca03214158a49d542402f \ - ce9334cb93c3fb155b6395458935ad61 \ - f66e5c5b6fac3df369927f8959f73043 \ - f4bf07b7c67a96a33e2323b644e523de \ - cf20138f750278175dce6353d650c5f4 \ - 20f87ab421b0271dbf371dc5c1cddb5c \ - ea723daf498a9805b481619c19ab75f8 \ - 853dff18dd0f6cf4e9abc357e9df6e17 \ - d7c988b7a52ec3eb418a99b1128bca07 \ - e5e872b22e870f6834d49c1fb2d8a9fb \ - 84057d292808553290f0b78f42c64bbe \ - 3d493360f527da454d42c90a7f559041 \ - 3be209000dbc7e1b95bcdf47980a3baa" -REQUIRES=" python3 tox" +DOWNLOAD_x86_64="https://github.com/qutebrowser/qutebrowser/archive/v2.2.0/qutebrowser-2.2.0.tar.gz \ + https://files.pythonhosted.org/packages/fe/ef/60d7ba03b5c442309ef42e7d69959f73aacccd0d86008362a681c4698e83/pip-21.0.1-py3-none-any.whl \ + https://files.pythonhosted.org/packages/ae/42/2876a3a136f8bfa9bd703518441c8db78ff1eeaddf174baa85c083c1fd15/setuptools-56.0.0-py3-none-any.whl \ + https://files.pythonhosted.org/packages/65/63/39d04c74222770ed1589c0eaba06c05891801219272420b40311cd60c880/wheel-0.36.2-py2.py3-none-any.whl \ + https://files.pythonhosted.org/packages/ed/62/cd9f10702c75b242f82da858668fba0cda04cda92133244d3d1555e530b4/PyQt5-5.15.4-cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl \ + https://files.pythonhosted.org/packages/83/d4/241a6a518d0bcf0a9fcdcbad5edfed18d43e884317eab8d5230a2b27e206/PyQt5_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \ + https://files.pythonhosted.org/packages/31/24/f887203677955ba4d5d4efe9176ac7ed2bf84efce8c243ab91e63183ad9e/PyQt5_sip-12.8.1-cp37-cp37m-manylinux1_x86_64.whl \ + https://files.pythonhosted.org/packages/8a/4a/570f9544d872c27d4c71f72c81af6890337a952a1b2923828c8f9dd56244/PyQtWebEngine-5.15.4-cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl \ + https://files.pythonhosted.org/packages/48/62/117c9c96837287b181fce6da481065ddda68b3a8c0fa5f00ea62cc08b877/PyQtWebEngine_Qt5-5.15.2-py3-none-manylinux2014_x86_64.whl \ + https://files.pythonhosted.org/packages/39/5d/68618c48e0c2f051143d0dfb981dc9098fe3362f77bfe53bb6f970800ac2/adblock-0.4.3-cp37-cp37m-manylinux2010_x86_64.whl \ + https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl \ + https://files.pythonhosted.org/packages/99/8f/b0ac918b2234848ec5bd2a887d2be7d6686355fcb22d7a0efe878d5c1555/importlib_metadata-3.10.0-py3-none-any.whl \ + https://files.pythonhosted.org/packages/f0/5e/69e6a0602c1f18d390952177de648468c4a380252858b0022affc3ce7811/importlib_resources-5.1.2-py3-none-any.whl \ + https://files.pythonhosted.org/packages/7e/c2/1eece8c95ddbc9b1aeb64f5783a9e07a286de42191b7204d67b7496ddf35/Jinja2-2.11.3-py2.py3-none-any.whl \ + https://files.pythonhosted.org/packages/c2/37/2e4def8ce3739a258998215df907f5815ecd1af71e62147f5eea2d12d4e8/MarkupSafe-1.1.1-cp37-cp37m-manylinux2010_x86_64.whl \ + https://files.pythonhosted.org/packages/3a/80/a52c0a7c5939737c6dca75a831e89658ecb6f590fb7752ac777d221937b9/Pygments-2.8.1-py3-none-any.whl \ + https://files.pythonhosted.org/packages/7a/a5/393c087efdc78091afa2af9f1378762f9821c9c1d7a22c5753fb5ac5f97a/PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl \ + https://files.pythonhosted.org/packages/60/7a/e881b5abb54db0e6e671ab088d079c57ce54e8a01a3ca443f561ccadb37e/typing_extensions-3.7.4.3-py3-none-any.whl \ + https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7de3337d0cd79074dd1bed4dd840f16ae/zipp-3.4.1-py3-none-any.whl \ + https://github.com/mozilla/pdf.js/releases/download/v2.7.570/pdfjs-2.7.570-dist.zip \ + https://www.openssl.org/source/openssl-1.1.1k.tar.gz" +MD5SUM_x86_64="c3d6baacef40ee84e0c5b01fd0f3e3a7 \ + e6e25dc3ecf3bab199b5ba1f14e81474 \ + 23559a79917a14480246c46e797e73c5 \ + 6c222a4df97a3311b4e189a59c47dea0 \ + 2020d0624acda6a6ab1abdb868f146ae \ + 038f56bd7af99133f591c7497b64ea17 \ + 15ab5559104be2d1ca4c9c7802ed3e9b \ + ff98ca82869ad5e0ecf8208908f3edbe \ + d9fe06e7758913f32dc09324ff9abfdf \ + 504321e0e009e2fbb194ffde9d9a594a \ + 1dcd07acf2b1875ed09428e1ddf7e028 \ + f99fe16a8f0c96a7149bd99a84dbb6f9 \ + 4414bda5a4cd09f2b87cffa1aa10fd33 \ + 8e733c6f4cdef7f6a336299e8e548dfa \ + c9c9888fa812cc8bc44cf6951b5d84e1 \ + 06d37d76edec4042d9438544df32e30e \ + 11fe109ca339ae11e59a410b85ecd14e \ + cbf20d17c294eb6a2d5e98669cfe67a6 \ + 483005e4371c4272901908cffc968ac2 \ + 836a95e4a7dd859781673dc5222b4ec6 \ + c4e7d95f782b08116afa27b30393dd27" +REQUIRES="libxkbcommon krb5 python3 Pygments" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org" diff --git a/network/qutebrowser/README b/network/qutebrowser/README index 9e22eb03c3..f1ca3e6236 100644 --- a/network/qutebrowser/README +++ b/network/qutebrowser/README @@ -1,29 +1,59 @@ -qutebrowser (qt5 keyboard driven webbrowser) +Qutebrowser (qt5 keyboard driven web browser) -qutebrowser is a keyboard-focused browser with a minimal +Qutebrowser is a keyboard-focused browser with a minimal GUI. It's based on Python and PyQt5 and free software, licensed under the GPL. It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. +OPTIONAL DEPENDENCIES: -Optional dependency: +qt5-webkit (for the webkit backend) +Pygments (for the :view-source command with the QtWebKit backend. + and with QtWebEngine for ":view-source --pygments") -qt5-webkit-annulen (for the webkit backend) +ADBLOCK NOTE: +If the Python `adblock' library is available, it is now used to +integrate Brave's Rust adblocker library for improved adblocking based +on ABP-like filter lists (such as EasyList). If it is unavailable, +Qutebrowser falls back to host-blocking. -NOTE: +There are 36 rust requirements for python-adblock, and they aren't +available on SBo yet, so the easiest way to install it is with pip3, +which requires a working network connection. -pyPEG2 needs building for python3: +Instructions to install it into ~/.local/lib with pip3: -PYTHON3=yes ./pyPEG2.SlackBuild +1. Update llvm to the package in extra/ -If you are using sbopkg you can add this as an option on -their pages before starting the build queue. +To update with slackpkg: +Edit /etc/slackpkg/slackpkg.conf and change the order of PRIORITY so +that `extra' is before `%PKGMAIN' in the list: -NOTE 2: + PRIORITY=( extra patches %PKGMAIN pasture testing ) -There is a list of changes and fixes for versions on the -release page: +Run `slackpkg upgrade llvm' -https://github.com/qutebrowser/qutebrowser/releases +Reset PRIORITY back to the default order. The pip3 commands should be +run as your normal user: + +2. Update pip3 to the latest version: pip3 install --user --upgrade pip + +3. Install adblock: pip3 install --user adblock + +Now start Qutebrowser and check `:version;'. It should list adblock +with the version number, e.g.: + +adblock: 0.4.2 + +Next, run the update command: + +:adblock-update + +To see what options there are: + +:set content.blocking<TAB> + +llvm can be added to /etc/slackpkg/blacklist to keep this version, or +run the slackpkg command again to revert back to the stock version. diff --git a/network/qutebrowser/qutebrowser.SlackBuild b/network/qutebrowser/qutebrowser.SlackBuild index 879ed72491..ad93cee7ae 100644 --- a/network/qutebrowser/qutebrowser.SlackBuild +++ b/network/qutebrowser/qutebrowser.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for qutebrowser -# Copyright 2017 Dave Woodfall <dave@tty1.uk> +# Copyright 2017 Dave 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=qutebrowser -VERSION=${VERSION:-1.8.0} +VERSION=${VERSION:-2.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -39,20 +39,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 @@ -68,20 +54,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 -f misc/Makefile install DESTDIR=$PKG PREFIX=/usr +make -f misc/Makefile install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man find $PKG -name \*\.opt-1.pyc -exec rm -f {} \; -mkdir -p $PKG/usr/share/pixmaps -cp icons/qutebrowser.xpm $PKG/usr/share/pixmaps/ - -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 +install -D -m 0644 icons/qutebrowser.xpm \ + $PKG/usr/share/pixmaps/qutebrowser.xpm -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 +gzip -9 $PKG/usr/man/man1/qutebrowser.1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE README.asciidoc $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/qutebrowser/qutebrowser.info b/network/qutebrowser/qutebrowser.info index 8b959820a7..c7fd782303 100644 --- a/network/qutebrowser/qutebrowser.info +++ b/network/qutebrowser/qutebrowser.info @@ -1,10 +1,10 @@ PRGNAM="qutebrowser" -VERSION="1.8.0" +VERSION="2.2.0" HOMEPAGE="http://qutebrowser.org/" -DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v1.8.0/qutebrowser-1.8.0.tar.gz" -MD5SUM="bd78cdb324f7f7dd81cf428fecf02b12" +DOWNLOAD="https://github.com/qutebrowser/qutebrowser/releases/download/v2.2.0/qutebrowser-2.2.0.tar.gz" +MD5SUM="762d7dc0f939ee0ca54701ba233e7175" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3-attrs python3-PyYAML Pygments Jinja2 pyPEG2 python3-PyQt5" +REQUIRES="python3-PyYAML Jinja2 python3-PyQtWebEngine python-toml importlib-resources python-zipp" MAINTAINER="Dave Woodfall" EMAIL="dave@slackbuilds.org" diff --git a/network/qutebrowser/slack-desc b/network/qutebrowser/slack-desc index 52812e7293..9d4ae8def6 100644 --- a/network/qutebrowser/slack-desc +++ b/network/qutebrowser/slack-desc @@ -10,10 +10,10 @@ qutebrowser: qutebrowser (qt5 keyboard driven webbrowser) qutebrowser: qutebrowser: qutebrowser is a keyboard-focused browser with a minimal GUI. It's qutebrowser: based on Python and PyQt5 and free software, licensed under the GPL. -qutebrowser: It was inspired by other browsers/addons like dwb and -qutebrowser: Vimperator/Pentadactyl. qutebrowser: -qutebrowser: qt5-webkit-annulen is an optional dependency for the webkit backend. +qutebrowser: It was inspired by other browsers/addons like Vimperator/Pentadactyl +qutebrowser: and dwb. qutebrowser: -qutebrowser: https://qutebrowser.org +qutebrowser: qt5-webkit is an optional dependency for the webkit backend. qutebrowser: +qutebrowser: https://qutebrowser.org diff --git a/network/r2e/r2e.info b/network/r2e/r2e.info index 13c53aeefa..4d13aaf2db 100644 --- a/network/r2e/r2e.info +++ b/network/r2e/r2e.info @@ -1,7 +1,7 @@ PRGNAM="r2e" VERSION="2.71" -HOMEPAGE="http://www.allthingsrss.com/rss2email/" -DOWNLOAD="http://www.allthingsrss.com/rss2email/rss2email-2.71.tar.gz" +HOMEPAGE="https://web.archive.org/web/20130114170616/http://www.allthingsrss.com/rss2email/" +DOWNLOAD="https://web.archive.org/web/20130114074037if_/http://www.allthingsrss.com/rss2email/rss2email-2.71.tar.gz" MD5SUM="7d7dbac5aa181b07261516213a312f39" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/network/r8168/r8168.SlackBuild b/network/r8168/r8168.SlackBuild index 3603724cc5..7b9680604b 100644 --- a/network/r8168/r8168.SlackBuild +++ b/network/r8168/r8168.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for r8168 -# Copyright 2016-2019 Hunter Sezen California, USA +# Copyright 2016-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=r8168 -VERSION=${VERSION:-8.047.04} +VERSION=${VERSION:-8.048.03} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/r8168/r8168.info b/network/r8168/r8168.info index cae76bd233..506ee476d6 100644 --- a/network/r8168/r8168.info +++ b/network/r8168/r8168.info @@ -1,8 +1,8 @@ PRGNAM="r8168" -VERSION="8.047.04" +VERSION="8.048.03" HOMEPAGE="https://github.com/mtorromeo/r8168" -DOWNLOAD="https://github.com/mtorromeo/r8168/archive/8.047.04/r8168-8.047.04.tar.gz" -MD5SUM="e6f1d8a3ed4d2569c21667b9a4ff9dc5" +DOWNLOAD="https://github.com/mtorromeo/r8168/archive/8.048.03/r8168-8.048.03.tar.gz" +MD5SUM="e8a989c5f21718cc48e07ec350abdf12" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/radicale/radicale.SlackBuild b/network/radicale/radicale.SlackBuild index 21eee9ee44..b0927b5380 100644 --- a/network/radicale/radicale.SlackBuild +++ b/network/radicale/radicale.SlackBuild @@ -75,12 +75,10 @@ install -m0644 logging $PKG/etc/radicale/logging.new install -m0644 -D radicale.wsgi $PKG/var/lib/radicale/radicale.wsgi install -m0644 radicale.fcgi $PKG/var/lib/radicale/radicale.fcgi -# docs mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp COPYING README schema.sql config logging $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# logrotate mkdir -p $PKG/etc/logrotate.d cat << EOF > $PKG/etc/logrotate.d/radicale /var/log/radicale { diff --git a/network/radicale/radicale.info b/network/radicale/radicale.info index b9086eeb22..390d4f0595 100644 --- a/network/radicale/radicale.info +++ b/network/radicale/radicale.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mod_wsgi" MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" +EMAIL="slackbuilds@schoepfer.info" diff --git a/network/rclone/README b/network/rclone/README index 77de1242a6..fe1d6364a1 100644 --- a/network/rclone/README +++ b/network/rclone/README @@ -1,26 +1,18 @@ -Rclone is a command line program to sync files and directories to and from - - Google Drive - Amazon S3 - Openstack Swift / Rackspace cloud files / Memset Memstore - Dropbox - Google Cloud Storage - Amazon Drive - Microsoft One Drive - Hubic - Backblaze B2 - Yandex Disk - SFTP - The local filesystem +Rclone ("rsync for cloud storage") is a command line program to sync +files and directories to and from different cloud storage providers. Features - MD5/SHA1 hashes checked at all times for file integrity + MD5/SHA-1 hashes checked at all times for file integrity Timestamps preserved on files Partial syncs supported on a whole file basis Copy mode to just copy new/changed files Sync (one way) mode to make a directory identical Check mode to check for file hash equality - Can sync to and from network, eg two different cloud accounts + Can sync to and from network, e.g. two different cloud accounts + Optional large file chunking (Chunker) Optional encryption (Crypt) - Optional FUSE mount + Optional cache (Cache) + Optional FUSE mount (rclone mount) + Multi-threaded downloads to local disk + Can serve local or remote files over HTTP/WebDav/FTP/SFTP/dlna diff --git a/network/rclone/rclone.SlackBuild b/network/rclone/rclone.SlackBuild index 8cb280b95d..5e635a093d 100644 --- a/network/rclone/rclone.SlackBuild +++ b/network/rclone/rclone.SlackBuild @@ -1,7 +1,6 @@ #!/bin/sh -# Slackware build script for rclone - +# Copyright 2019-2021 Andrew Payne <phalange@komputermatrix.com> # Copyright 2017-2018 Rodrigo Gimenez <estrod[at]zoho[dot]com> # All rights reserved. # @@ -22,12 +21,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - PRGNAM=rclone -VERSION=${VERSION:-1.42} +VERSION=${VERSION:-1.54.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +set -e + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -36,52 +36,42 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then - SUFFIX="linux-386" -elif [ "$ARCH" = "x86_64" ]; then - SUFFIX="linux-amd64" -elif [ "$ARCH" = "arm" ]; then - SUFFIX="linux-arm" +if [ "$ARCH" = "x86_64" ]; then + BIT="64bit" else - echo "$ARCH is not supported." >&2 + echo "$ARCH is not supported." exit 1 fi -set -e - -rm -rf $PKG +TMP=${TMP:-/tmp/SBo} +CWD=$(pwd) +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-v$VERSION-$SUFFIX -unzip $CWD/$PRGNAM-v$VERSION-$SUFFIX.zip -cd $PRGNAM-v$VERSION-$SUFFIX +rm -rf $PRGNAM-$VERSION +unzip -o $CWD/$PRGNAM-v$VERSION-linux-amd64.zip +cd $PRGNAM-v$VERSION-linux-amd64 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 -Ddm755 $PKG/usr/bin -install -m 775 rclone $PKG/usr/bin - -install -Ddm 755 $PKG/usr/man/man1 -cp rclone.1 $PKG/usr/man/man1 +rm -rf $PKG +mkdir -p $PKG/usr/bin/ +mkdir -p $PKG/usr/man/man1/ +cp rclone $PKG/usr/bin/ +cp rclone.1 $PKG/usr/man/man1/ 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 +for i in $( find $PKG/usr/ -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION - -cp -a \ - README.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cp -a README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-bin.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/rclone/rclone.info b/network/rclone/rclone.info index 9d55eef852..1e296f30ce 100644 --- a/network/rclone/rclone.info +++ b/network/rclone/rclone.info @@ -1,10 +1,10 @@ PRGNAM="rclone" -VERSION="1.42" +VERSION="1.54.1" HOMEPAGE="https://rclone.org" -DOWNLOAD="https://downloads.rclone.org/v1.42/rclone-v1.42-linux-386.zip" -MD5SUM="a7cb1d96382d010f8bc2b19e237f917e" -DOWNLOAD_x86_64="https://downloads.rclone.org/v1.42/rclone-v1.42-linux-amd64.zip" -MD5SUM_x86_64="f9892658a2c311ef288261095a0d3377" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://github.com/rclone/rclone/releases/download/v1.54.1/rclone-v1.54.1-linux-amd64.zip" +MD5SUM_x86_64="93fee2d8ab0ad802e0476cf0c549f15c" REQUIRES="" -MAINTAINER="Rodrigo Gimenez" -EMAIL="estrod[at]zoho[dot]com" +MAINTAINER="Andrew Payne" +EMAIL="phalange@komputermatrix.com" diff --git a/network/rclone/slack-desc b/network/rclone/slack-desc index a7e2b07cc2..a21c250f16 100644 --- a/network/rclone/slack-desc +++ b/network/rclone/slack-desc @@ -8,11 +8,11 @@ |-----handy-ruler------------------------------------------------------| rclone: rclone (rsync for cloud storage) rclone: -rclone: Rclone is a command line program to sync files and directories to -rclone: and from Google Drive, Amazon S3, Openstack Swift / Rackspace -rclone: cloud files / Memset Memstore, Dropbox, Google Cloud Storage, -rclone: Amazon Drive, Microsoft One Drive, Hubic, Backblaze B2, Yandex Disk, -rclone: SFTP and the local filesystem. +rclone: Rclone ("rsync for cloud storage") is a command line program to sync +rclone: files and directories to and from different cloud storage providers. +rclone: +rclone: Homepage: https://rclone.org/ +rclone: rclone: rclone: rclone: diff --git a/network/remmina/remmina.desktop b/network/remmina/remmina.desktop index ab66e7e9c4..1ef82b0730 100644 --- a/network/remmina/remmina.desktop +++ b/network/remmina/remmina.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.1 +Version=1.0 Name=Remmina Remote Desktop Client Comment=Connect to remote desktops TryExec=remmina diff --git a/network/republicanywhere/republicanywhere.info b/network/republicanywhere/republicanywhere.info index edb7a88440..b086d68c9f 100644 --- a/network/republicanywhere/republicanywhere.info +++ b/network/republicanywhere/republicanywhere.info @@ -2,7 +2,7 @@ PRGNAM="republicanywhere" VERSION="1.5.9" HOMEPAGE="https://republicwireless.com/republic-anywhere" DOWNLOAD="UNSUPPORTED" -MD5SUM="UNSUPPORTED" +MD5SUM="" DOWNLOAD_x86_64="http://files.republicwireless.com/public/apps/anywhere/debian/pool/main/r/republicanywhere/republicanywhere_1.5.9_amd64.deb" MD5SUM_x86_64="b14abfb808831ee613117fed5d51bc71" REQUIRES="" diff --git a/network/resilio-sync/README b/network/resilio-sync/README new file mode 100644 index 0000000000..ea38d34a4c --- /dev/null +++ b/network/resilio-sync/README @@ -0,0 +1,17 @@ +Resilio Sync (formerly BitTorrent Sync) by Resilio, Inc. is a +proprietary peer-to-peer file synchronization tool available for +Windows, Mac, Linux, Android, iOS, Windows Phone, Amazon Kindle Fire +and BSD. It can sync files between devices on a local network, or +between remote devices over the Internet via a modified version of +the BitTorrent protocol. + +If you want to run Resilio Sync as a service, you need to have an +rslsync user and group prior to running the service. +Something like this will suffice for most systems: + +groupadd -g 364 rslsync +useradd -u 364 -g rslsync -d /dev/null -s /bin/false rslsync + +If you want to run rslsync as a regular user, you do not need an +extra system user. You can conveniently start rslsync in user mode +by using the provided rslsync-usermode script. diff --git a/network/resilio-sync/resilio-sync.SlackBuild b/network/resilio-sync/resilio-sync.SlackBuild new file mode 100644 index 0000000000..5db2b30563 --- /dev/null +++ b/network/resilio-sync/resilio-sync.SlackBuild @@ -0,0 +1,85 @@ +#!/bin/sh + +# Slackware build script for resilio-sync + +# Copyright 2020 +# 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=resilio-sync +VERSION=${VERSION:-2.6.4.1344} +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 + LIBDIRSUFFIX="" + SRCSUFFIX="i386" +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" + SRCSUFFIX="i386" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" + SRCSUFFIX="amd64" +else + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +mkdir -p $PRGNAM-$VERSION +cd $PKG +ar p $CWD/$PRGNAM\_$VERSION-$BUILD\_$SRCSUFFIX.deb data.tar.xz | tar xJv + +# Delete unnecessary systemd service-files +rm -r $PKG/lib $PKG/usr/lib + +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 {} \; + +cat $CWD/rslsync-usermode > $PKG/usr/bin/rslsync-usermode +chmod 755 $PKG/usr/bin/rslsync-usermode + +mv $PKG/usr/share/man $PKG/usr/man + +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/network/resilio-sync/resilio-sync.info b/network/resilio-sync/resilio-sync.info new file mode 100644 index 0000000000..19eec7ff58 --- /dev/null +++ b/network/resilio-sync/resilio-sync.info @@ -0,0 +1,10 @@ +PRGNAM="resilio-sync" +VERSION="2.6.4.1344" +HOMEPAGE="https://www.resilio.com/individuals/" +DOWNLOAD="https://download-cdn.resilio.com/2.6.4.1344/Debian/resilio-sync_2.6.4.1344-1_i386.deb" +MD5SUM="88c772375315a0682bff5376da96bb95" +DOWNLOAD_x86_64="https://download-cdn.resilio.com/2.6.4.1344/Debian/resilio-sync_2.6.4.1344-1_amd64.deb" +MD5SUM_x86_64="ddc3facc1ac96842264d510d6ff632cc" +REQUIRES="" +MAINTAINER="Spycrowsoft" +EMAIL="spycrowsoft [ at ] gmail [ dot ] com" diff --git a/network/resilio-sync/rslsync-usermode b/network/resilio-sync/rslsync-usermode new file mode 100644 index 0000000000..c3f7b96d7a --- /dev/null +++ b/network/resilio-sync/rslsync-usermode @@ -0,0 +1,7 @@ +#!/bin/bash + +# This script conveniently starts Resilio-Sync in user-mode. + +/etc/resilio-sync/init_user_config.sh + +rslsync --config $HOME/.config/resilio-sync/config.json diff --git a/network/resilio-sync/slack-desc b/network/resilio-sync/slack-desc new file mode 100644 index 0000000000..0652c16225 --- /dev/null +++ b/network/resilio-sync/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------------------------------------------------------| +resilio-sync: resilio-sync (Sync All Your Data Across All Your Devices) +resilio-sync: +resilio-sync: Resilio Sync Home is a simple yet full featured solution for file sync +resilio-sync: and sharing that's powered by P2P technology for fast and secure +resilio-sync: transfers. +resilio-sync: +resilio-sync: https://www.resilio.com/individuals/ +resilio-sync: +resilio-sync: +resilio-sync: +resilio-sync: diff --git a/network/riot-web/README b/network/riot-web/README index 20d910bc48..9b9a6376e2 100644 --- a/network/riot-web/README +++ b/network/riot-web/README @@ -19,7 +19,13 @@ Now with end-to-end encryption using the Olm and Megolm cryptographic ratchets conversation. This is a packaging of the pre-built released version of Riot (on Github). -You should use your favourite web browser to enjoy it. Type your browser name -before before run this script: + +Riot-web now is needed to run under a web server(e.g. NGINX). +After building, a start script (in /usr/bin) is set to invoke a simple +web server (a Python built-in module) listening at port 8000, and then start a +web browser to access it at localhost:8000. Feel free to change these +settings. + +Type your favourite browser name before running this script, e.g. BROWSER=firefox ./riot-web.Slackbuild diff --git a/network/riot-web/doinst.sh b/network/riot-web/doinst.sh index 65c7e2eeb9..19926c6b1f 100644 --- a/network/riot-web/doinst.sh +++ b/network/riot-web/doinst.sh @@ -7,3 +7,6 @@ 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 + +# Riot-web should have a real config to work. +ln -sf /opt/riot-web/config.sample.json /opt/riot-web/config.json diff --git a/network/riot-web/riot-web.SlackBuild b/network/riot-web/riot-web.SlackBuild index ef5f0a3b22..b3a2878311 100644 --- a/network/riot-web/riot-web.SlackBuild +++ b/network/riot-web/riot-web.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=riot-web PKGNAM=riot -VERSION=${VERSION:-1.2.1} +VERSION=${VERSION:-1.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,8 +75,10 @@ mv ${PKGNAM}-v${VERSION} $PKG/opt/${PRGNAM} # Create a script to let the browser to launch the app. mkdir -p $PKG/usr/bin -echo -e "#!/bin/bash -$BROWSER /opt/${PRGNAM}/index.html" \ +echo -e "#!/bin/sh +cd /opt/riot-web && python3 -m http.server 8000 --bind 127.0.0.1 & +sleep 5 +$BROWSER http://localhost:8000" \ > $PKG/usr/bin/riot-web chmod a+x $PKG/usr/bin/riot-web diff --git a/network/riot-web/riot-web.info b/network/riot-web/riot-web.info index 54c730ca88..72fd335d9f 100644 --- a/network/riot-web/riot-web.info +++ b/network/riot-web/riot-web.info @@ -1,10 +1,10 @@ PRGNAM="riot-web" -VERSION="1.2.1" +VERSION="1.6.0" HOMEPAGE="https://riot.im/" -DOWNLOAD="https://github.com/vector-im/riot-web/releases/download/v1.2.1/riot-v1.2.1.tar.gz" -MD5SUM="391793b36e176a626e78b30b9e70256c" +DOWNLOAD="https://github.com/vector-im/riot-web/releases/download/v1.6.0/riot-v1.6.0.tar.gz" +MD5SUM="6261bc00b53d68eea81d3db55952bf8d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3" MAINTAINER="MDrights" EMAIL="psychi2009@gmail.com" diff --git a/network/rspamd/README b/network/rspamd/README index 705ffd1689..ea65f2a21e 100644 --- a/network/rspamd/README +++ b/network/rspamd/README @@ -13,7 +13,8 @@ available. Groupname and Username -You must have the "rspamd" group and user to run this script, for example: +You must have the "rspamd" group and user to run this script, for +example: groupadd -g 359 rspamd useradd -u 359 -s /bin/false -d /dev/null -g rspamd rspamd diff --git a/network/rspamd/Toolset.cmake.patch b/network/rspamd/Toolset.cmake.patch new file mode 100644 index 0000000000..f70735d899 --- /dev/null +++ b/network/rspamd/Toolset.cmake.patch @@ -0,0 +1,16 @@ +--- cmake/Toolset.cmake 2020-09-23 18:31:57.275661294 -0600 ++++ cmake/Toolset.cmake 2020-09-23 18:32:34.812659218 -0600 +@@ -45,10 +45,10 @@ + find_program(GOLD_PATH NAMES "ld.gold" "gold") + + if(NOT LINKER_NAME) +- if(LLD_PATH) +- set(LINKER_NAME "lld") +- elseif(GOLD_PATH) ++ if(GOLD_PATH) + set(LINKER_NAME "gold") ++ elseif(LLD_PATH) ++ set(LINKER_NAME "lld") + else() + message(STATUS "Use generic 'ld' as a linker") + endif() diff --git a/network/rspamd/doinst.sh b/network/rspamd/doinst.sh index 533485ecf5..116a6481e5 100644 --- a/network/rspamd/doinst.sh +++ b/network/rspamd/doinst.sh @@ -22,5 +22,7 @@ preserve_perms() { config $NEW } -config etc/rspamd/rspamd.conf.new +find etc/rspamd -type f -name '*.new' \ + | while read new ; do config $new ; done + preserve_perms etc/rc.d/rc.rspamd.new diff --git a/network/rspamd/rspamd.SlackBuild b/network/rspamd/rspamd.SlackBuild index 1821c2026b..60ff15d91d 100644 --- a/network/rspamd/rspamd.SlackBuild +++ b/network/rspamd/rspamd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Rspamd -# Copyright 2018, 2019 Ebben Aries <e@dscp.org> +# Copyright 2018-2020 Ebben Aries <e@dscp.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=rspamd -VERSION=${VERSION:-1.9.4} -BUILD=${BUILD:-1} +VERSION=${VERSION:-2.5} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -80,8 +80,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 {} \; +# Patch to use correct linker +# https://github.com/rspamd/rspamd/issues/3168#issuecomment-583849873 +patch -p0 < $CWD/Toolset.cmake.patch + mkdir -p build cd build + export "PATH=/opt/cmake-202x/bin:$PATH" cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -104,9 +109,6 @@ 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 -# remove empty directory tree -rmdir -p --ignore-fail-on-non-empty $PKG/usr/share/examples/rspamd - mkdir -p $PKG/var/log/rspamd chown rspamd:rspamd $PKG/var/log/rspamd chmod 0755 $PKG/var/log/rspamd diff --git a/network/rspamd/rspamd.info b/network/rspamd/rspamd.info index 0fd4280c31..8b978a1de4 100644 --- a/network/rspamd/rspamd.info +++ b/network/rspamd/rspamd.info @@ -1,10 +1,10 @@ PRGNAM="rspamd" -VERSION="1.9.4" +VERSION="2.5" HOMEPAGE="https://rspamd.com" -DOWNLOAD="https://github.com/rspamd/rspamd/archive/1.9.4/rspamd-1.9.4.tar.gz" -MD5SUM="930b07b1f55dfc9c46abbe266eae9856" +DOWNLOAD="https://github.com/rspamd/rspamd/archive/2.5/rspamd-2.5.tar.gz" +MD5SUM="9b70be38ca7e17ee89373b764fef1ea7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ragel luajit redis hyperscan" +REQUIRES="ragel luajit redis hyperscan cmake-202x libsodium" MAINTAINER="Ebben Aries" EMAIL="e@dscp.org" diff --git a/network/rspamd/slack-desc b/network/rspamd/slack-desc index f020c73be4..5fd336b92a 100644 --- a/network/rspamd/slack-desc +++ b/network/rspamd/slack-desc @@ -13,12 +13,7 @@ rspamd: messages by a number of rules including regular expressions, rspamd: statistical analysis and custom services such as URL black lists. rspamd: Each message is analysed by Rspamd and given a spam score. rspamd: -rspamd: According to this spam score and the user’s settings Rspamd recommends -rspamd: an action for the MTA to apply to the message: for example, to pass, -rspamd: to reject or to add a header. Rspamd is designed to process hundreds -rspamd: of messages per second simultaneously and has a number of features -rspamd: available. -rspamd: rspamd: Home-Page: https://rspamd.com rspamd: rspamd: +rspamd: diff --git a/network/rss2email/4b36e28.patch b/network/rss2email/4b36e28.patch new file mode 100644 index 0000000000..5b6a050c7e --- /dev/null +++ b/network/rss2email/4b36e28.patch @@ -0,0 +1,239 @@ +diff -Naur orig/CHANGELOG new/CHANGELOG +--- orig/CHANGELOG 2020-08-31 18:03:24.000000000 +0300 ++++ new/CHANGELOG 2020-09-05 16:09:45.000000000 +0300 +@@ -1,4 +1,7 @@ + UNRELEASED ++ * Improve log messages ++ * Remove documentation of `smtp-ssl-protocol` as this option was dropped in 2016 ++ * Stop forging SMTP and sendmail envelope sender (#134) + + v3.12.2 (2020-08-31) + * Fix bug `AttributeError: 'NoneType' object has no attribute 'close'` (#126) +diff -Naur orig/r2e.1 new/r2e.1 +--- orig/r2e.1 2020-08-31 18:03:24.000000000 +0300 ++++ new/r2e.1 2020-09-05 16:09:45.000000000 +0300 +@@ -253,8 +253,6 @@ + SMTP server + .IP smtp-ssl + Connect to the SMTP server using SSL +-.IP smtp-ssl-protocol +-TLS/SSL version to use on STARTTLS when not using 'smtp-ssl'. + .RE + .SS IMAP configuration + .IP imap-auth +diff -Naur orig/rss2email/__init__.py new/rss2email/__init__.py +--- orig/rss2email/__init__.py 2020-08-31 18:03:24.000000000 +0300 ++++ new/rss2email/__init__.py 2020-09-05 16:09:45.000000000 +0300 +@@ -26,7 +26,7 @@ + import sys as _sys + + +-__version__ = '3.12.2' ++__version__ = '3.12.1' + __url__ = 'https://github.com/rss2email/rss2email' + __author__ = 'The rss2email maintainers' + __email__ = 'rss2email@tremily.us' +diff -Naur orig/rss2email/config.py new/rss2email/config.py +--- orig/rss2email/config.py 2020-08-31 18:03:24.000000000 +0300 ++++ new/rss2email/config.py 2020-09-05 16:09:45.000000000 +0300 +@@ -83,11 +83,11 @@ + # Transfer-Encoding. For local mailing it is safe and + # convenient to use 8bit. + ('use-8bit', str(False)), +- # True: Only use the 'from' address. ++ # True: Only use the 'from' address. Overrides the use-publisher-email setting. + # False: Use the email address specified by the feed, when possible. + ('force-from', str(False)), +- # True: Use the publisher's email if you can't find the author's. +- # False: Just use the 'from' email instead. ++ # True: Use author's email if found, or use publisher's email if found, or use the 'from' setting. ++ # False: Use author's email if found, or use the 'from' setting. + ('use-publisher-email', str(False)), + # If empty, only use the feed email address rather than + # friendly name plus email address. Available attributes may +@@ -132,7 +132,7 @@ + # because the old entries will not be recorded under their new + # link-based ids. + ('trust-link', str(False)), +- # If 'trust-guid' or 'trust-link' is True, this settings allows to receive ++ # If 'trust-guid' or 'trust-link' is True, this setting allows to receive + # a new email message in reply to the previous one when the post changes. + ('reply-changes', str(False)), + # To most correctly encode emails with international +diff -Naur orig/rss2email/email.py new/rss2email/email.py +--- orig/rss2email/email.py 2020-08-31 18:03:24.000000000 +0300 ++++ new/rss2email/email.py 2020-09-05 16:09:45.000000000 +0300 +@@ -151,7 +151,7 @@ + message[key] = _Header(value, encoding) + return message + +-def smtp_send(sender, recipient, message, config=None, section='DEFAULT'): ++def smtp_send(recipient, message, config=None, section='DEFAULT'): + if config is None: + config = _config.CONFIG + server = config.get(section, 'smtp-server') +@@ -190,7 +190,7 @@ + except Exception as e: + raise _error.SMTPAuthenticationError( + server=server, username=username) +- smtp.send_message(message, sender, recipient.split(',')) ++ smtp.send_message(message, config.get(section, 'from'), recipient.split(',')) + smtp.quit() + + def imap_send(message, config=None, section='DEFAULT'): +@@ -345,12 +345,12 @@ + else: + return bytesio.getvalue() + +-def sendmail_send(sender, recipient, message, config=None, section='DEFAULT'): ++def sendmail_send(recipient, message, config=None, section='DEFAULT'): + if config is None: + config = _config.CONFIG + message_bytes = _flatten(message) + sendmail = config.get(section, 'sendmail') +- sender_name,sender_addr = _parseaddr(sender) ++ sender_name,sender_addr = _parseaddr(config.get(section, 'from')) + _LOG.debug( + 'sending message to {} via {}'.format(recipient, sendmail)) + try: +@@ -366,11 +366,11 @@ + except Exception as e: + raise _error.SendmailError() from e + +-def send(sender, recipient, message, config=None, section='DEFAULT'): ++def send(recipient, message, config=None, section='DEFAULT'): + protocol = config.get(section, 'email-protocol') + if protocol == 'smtp': + smtp_send( +- sender=sender, recipient=recipient, message=message, ++ recipient=recipient, message=message, + config=config, section=section) + elif protocol == 'imap': + imap_send(message=message, config=config, section=section) +@@ -378,5 +378,5 @@ + maildir_send(message=message, config=config, section=section) + else: + sendmail_send( +- sender=sender, recipient=recipient, message=message, ++ recipient=recipient, message=message, + config=config, section=section) +diff -Naur orig/rss2email/error.py new/rss2email/error.py +--- orig/rss2email/error.py 2020-08-31 18:03:24.000000000 +0300 ++++ new/rss2email/error.py 2020-09-05 16:09:45.000000000 +0300 +@@ -42,15 +42,14 @@ + + + class TimeoutError (RSS2EmailError): +- def __init__(self, time_limited_function, message=None): +- if message is None: +- if time_limited_function.error is not None: +- message = ( +- 'error while running time limited function: {}'.format( +- time_limited_function.error[1])) +- else: +- message = '{} second timeout exceeded'.format( +- time_limited_function.timeout) ++ def __init__(self, time_limited_function): ++ if time_limited_function.error is not None: ++ message = ( ++ 'error while running time limited function in {}: {}'.format( ++ time_limited_function.name, time_limited_function.error[1])) ++ else: ++ message = '{} second timeout exceeded in {}'.format( ++ time_limited_function.timeout, time_limited_function.name) + super(TimeoutError, self).__init__(message=message) + self.time_limited_function = time_limited_function + +@@ -148,8 +147,9 @@ + class InvalidFeedConfig (FeedError): + def __init__(self, setting, feed, message=None, **kwargs): + if not message: +- message = "invalid feed configuration {}".format( +- {setting: getattr(feed, setting)}) ++ message = ( ++ "invalid feed configuration '{setting}' in {feed}".format( ++ setting=getattr(feed, setting), feed=feed)) + super(InvalidFeedConfig, self).__init__( + feed=feed, message=message, **kwargs) + self.setting = setting +diff -Naur orig/rss2email/feed.py new/rss2email/feed.py +--- orig/rss2email/feed.py 2020-08-31 18:03:24.000000000 +0300 ++++ new/rss2email/feed.py 2020-09-05 16:09:45.000000000 +0300 +@@ -373,7 +373,7 @@ + kwargs = {} + if proxy: + kwargs['handlers'] = [_urllib_request.ProxyHandler({'http':proxy})] +- f = _util.TimeLimitedFunction(timeout, _feedparser.parse) ++ f = _util.TimeLimitedFunction('feed {}'.format(self.name), timeout, _feedparser.parse) + return f(self.url, self.etag, modified=self.modified, **kwargs) + + def _process(self, parsed): +@@ -773,9 +773,9 @@ + if entry.get('summary_detail', None): + contents.append(entry.summary_detail) + if self.html_mail: +- types = ['text/html', 'text/plain'] ++ types = ['application/xhtml+xml', 'text/html', 'text/plain'] + else: +- types = ['text/plain', 'text/html'] ++ types = ['text/plain', 'text/html', 'application/xhtml+xml'] + for content_type in types: + for content in contents: + if content['type'] == content_type: +@@ -871,7 +871,7 @@ + section = self.section + if section not in self.config: + section = 'DEFAULT' +- _email.send(sender=sender, recipient=self.to, message=message, ++ _email.send(recipient=self.to, message=message, + config=self.config, section=section) + + def run(self, send=True): +diff -Naur orig/rss2email/feeds.py new/rss2email/feeds.py +--- orig/rss2email/feeds.py 2020-08-31 18:03:24.000000000 +0300 ++++ new/rss2email/feeds.py 2020-09-05 16:09:45.000000000 +0300 +@@ -239,11 +239,10 @@ + def load(self, require=False): + _LOG.debug('load feed configuration from {}'.format(self.configfiles)) + if self.configfiles: +- self.read_configfiles = self.config.read(self.configfiles) ++ read_configfiles = self.config.read(self.configfiles) + else: +- self.read_configfiles = [] +- _LOG.debug('loaded configuration from {}'.format( +- self.read_configfiles)) ++ read_configfiles = [] ++ _LOG.debug('loaded configuration from {}'.format(read_configfiles)) + self._load_feeds(require=require) + + def _load_feeds(self, require): +diff -Naur orig/rss2email/util.py new/rss2email/util.py +--- orig/rss2email/util.py 2020-08-31 18:03:24.000000000 +0300 ++++ new/rss2email/util.py 2020-09-05 16:09:45.000000000 +0300 +@@ -35,19 +35,20 @@ + >>> def sleeping_return(sleep, x): + ... time.sleep(sleep) + ... return x +- >>> TimeLimitedFunction(0.5, sleeping_return)(0.1, 'x') ++ >>> TimeLimitedFunction('sleeping', 0.5, sleeping_return)(0.1, 'x') + 'x' +- >>> TimeLimitedFunction(0.5, sleeping_return)(10, 'y') ++ >>> TimeLimitedFunction('sleeping', 0.5, sleeping_return)(10, 'y') + Traceback (most recent call last): + ... +- rss2email.error.TimeoutError: 0.5 second timeout exceeded +- >>> TimeLimitedFunction(0.5, time.sleep)('x') ++ rss2email.error.TimeoutError: 0.5 second timeout exceeded in sleeping ++ >>> TimeLimitedFunction('sleep', 0.5, time.sleep)('x') + Traceback (most recent call last): + ... +- rss2email.error.TimeoutError: error while running time limited function: a float is required ++ rss2email.error.TimeoutError: error while running time limited function in sleep: a float is required + """ +- def __init__(self, timeout, target, **kwargs): ++ def __init__(self, name, timeout, target, **kwargs): + super(TimeLimitedFunction, self).__init__(target=target, daemon=True, **kwargs) ++ self.name = name + self.timeout = timeout + self.result = None + self.error = None diff --git a/network/rss2email/README b/network/rss2email/README new file mode 100644 index 0000000000..cdc9dd0f20 --- /dev/null +++ b/network/rss2email/README @@ -0,0 +1,8 @@ +A python script that converts RSS/Atom newsfeeds to email. + +It is the successor to the rss2email by Aaron Swartz, available on SBo +as r2e. + +rss2email requires feedparser to be built with python3 support. + +rss2email will conflict with r2e. diff --git a/network/rss2email/rss2email.SlackBuild b/network/rss2email/rss2email.SlackBuild new file mode 100644 index 0000000000..f6e181b909 --- /dev/null +++ b/network/rss2email/rss2email.SlackBuild @@ -0,0 +1,94 @@ +#!/bin/sh + +# Slackware build script for rss2email + +# 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=rss2email +VERSION=${VERSION:-3.12.2} # Don't forget to remove the patch below!!! +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 + +# For ver. 3.12.2 only +patch -p1 < $CWD/4b36e28.patch + +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 + +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 +gzip -c9 r2e.1 > $PKG/usr/man/man1/r2e.1.gz + +install -m 0644 -T -D completion/r2e.zsh $PKG/usr/share/zsh/site-functions/_r2e + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS CHANGELOG HACKING.md README.rst $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/network/rss2email/rss2email.info b/network/rss2email/rss2email.info new file mode 100644 index 0000000000..1b46bee487 --- /dev/null +++ b/network/rss2email/rss2email.info @@ -0,0 +1,10 @@ +PRGNAM="rss2email" +VERSION="3.12.2" +HOMEPAGE="https://github.com/rss2email/rss2email" +DOWNLOAD="https://github.com/rss2email/rss2email/archive/v3.12.2/rss2email-3.12.2.tar.gz" +MD5SUM="9975f0c0f637daaa025d09ae54c33a8c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="python3 feedparser html2text" +MAINTAINER="Alexander Verbovetsky" +EMAIL="alik@ejik.org" diff --git a/network/WireGuard/slack-desc b/network/rss2email/slack-desc index 1605ab22e1..9c4d4fb883 100644 --- a/network/WireGuard/slack-desc +++ b/network/rss2email/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -WireGuard: WireGuard (fast, modern, secure VPN) -WireGuard: -WireGuard: WireGuard is a VPN that uses state-of-the-art cryptography. It is -WireGuard: designed as a general purpose VPN for running on embedded interfaces -WireGuard: and super computers alike, fit for many different circumstances. -WireGuard: -WireGuard: https://www.wireguard.com/ -WireGuard: -WireGuard: -WireGuard: -WireGuard: +rss2email: rss2email (rss to email gateway) +rss2email: +rss2email: A python script that converts RSS/Atom newsfeeds to email. +rss2email: +rss2email: +rss2email: +rss2email: Homepage: https://github.com/rss2email/rss2email +rss2email: +rss2email: +rss2email: +rss2email: diff --git a/network/rtl8821ce/README b/network/rtl8821ce/README new file mode 100644 index 0000000000..0c7cf68af3 --- /dev/null +++ b/network/rtl8821ce/README @@ -0,0 +1,24 @@ +Realtek RTL8821CE Driver maintained by Tomás Pinho for Arch Linux. +Still, can serve Slackers as well! + +NOTE: + + Although the driver builds for kernel 4.4.x as found in -14.2, + I only tested it in the field on kernel 5.4.x as found in -current. + Also, upstream warns that the source is targeting kernels > 4.14. + +To build the package for a kernel different from the running one, +start the script setting the KERNEL variable as in: + + KERNEL=4.4.14 ./rtl8821ce.SlackBuild + +NOTE: + +1. If you experience problems using this driver (e.g. a non-working + WiFi or Bluetooth), visit project's homepage to learn about possible + solutions. +2. If you want to use this driver on -14.2, but with the kernel from + -current, you will need to compile the kernel yourself on -14.2. + Otherwise, you will run into compilation errors while building + the driver. I have no intent of fixing that, unless you provide me + with a working patch. ;-) diff --git a/network/rtl8821ce/allow-kver-ksrc.patch b/network/rtl8821ce/allow-kver-ksrc.patch new file mode 100644 index 0000000000..0629f749ee --- /dev/null +++ b/network/rtl8821ce/allow-kver-ksrc.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index 5b5dc9a..da26fdd 100755 +--- a/Makefile ++++ b/Makefile +@@ -1218,8 +1218,8 @@ EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT + SUBARCH := $(shell uname -m | sed -e s/i.86/i386/) + ARCH ?= $(SUBARCH) + CROSS_COMPILE ?= +-KVER := $(shell uname -r) +-KSRC := /lib/modules/$(KVER)/build ++KVER ?= $(shell uname -r) ++KSRC ?= /lib/modules/$(KVER)/build + MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ + INSTALL_PREFIX := + STAGINGMODDIR := /lib/modules/$(KVER)/kernel/drivers/staging diff --git a/network/rtl8821ce/doinst.sh b/network/rtl8821ce/doinst.sh new file mode 100644 index 0000000000..766ff48186 --- /dev/null +++ b/network/rtl8821ce/doinst.sh @@ -0,0 +1 @@ +chroot . /sbin/depmod -a @KERNEL@ diff --git a/network/rtl8821ce/opt-for-performance.patch b/network/rtl8821ce/opt-for-performance.patch new file mode 100644 index 0000000000..636bab7f52 --- /dev/null +++ b/network/rtl8821ce/opt-for-performance.patch @@ -0,0 +1,11 @@ +diff --git a/Makefile b/Makefile +index 5b5dc9a..4cfa841 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) +-EXTRA_CFLAGS += -O1 ++EXTRA_CFLAGS += -O2 + #EXTRA_CFLAGS += -O3 + #EXTRA_CFLAGS += -Wall + #EXTRA_CFLAGS += -Wextra diff --git a/network/rtl8821ce/rtl8821ce.SlackBuild b/network/rtl8821ce/rtl8821ce.SlackBuild new file mode 100644 index 0000000000..7f0c62e51c --- /dev/null +++ b/network/rtl8821ce/rtl8821ce.SlackBuild @@ -0,0 +1,82 @@ +#!/bin/sh + +# Slackware build script for Realtek RTL8821CE Driver + +# Copyright 2020 Andrzej Telszewski, Szczecin +# 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=rtl8821ce +VERSION=${VERSION:-20201006_fe97b50} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +KERNEL=${KERNEL:-$(uname -r)} +KERNELPATH=${KERNELPATH:-/lib/modules/${KERNEL}/build} +PKG_VERS=${VERSION}_$(printf "%s" "${KERNEL}" | tr - _) + +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=${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 . +chmod -R a-st,u+rwX,go-w+rX . + +# Optimize with -O2, inline with Slackware. + +patch -p1 < $CWD/opt-for-performance.patch + +# Allow building for kernels other than the running one. + +patch -p1 < $CWD/allow-kver-ksrc.patch + +make KVER=${KERNEL} KSRC=${KERNELPATH} + +mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/realtek/rtlwifi/$PRGNAM +install -m 0644 8821ce.ko $PKG/lib/modules/$KERNEL/kernel/drivers/net/wireless/realtek/rtlwifi/$PRGNAM + +mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERS +cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$PKG_VERS +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKG_VERS/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +sed $CWD/doinst.sh -e "s%@KERNEL@%$KERNEL%" > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERS-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/rtl8821ce/rtl8821ce.info b/network/rtl8821ce/rtl8821ce.info new file mode 100644 index 0000000000..a2c50137c9 --- /dev/null +++ b/network/rtl8821ce/rtl8821ce.info @@ -0,0 +1,10 @@ +PRGNAM="rtl8821ce" +VERSION="20201006_fe97b50" +HOMEPAGE="https://github.com/tomaspinho/rtl8821ce/" +DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/rtl8821ce/rtl8821ce-20201006_fe97b50.tar.gz" +MD5SUM="f467f778f099b0f7a1634fe2f8bf0af4" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Andrzej Telszewski" +EMAIL="atelszewski@gmail.com" diff --git a/network/rtl8821ce/slack-desc b/network/rtl8821ce/slack-desc new file mode 100644 index 0000000000..70df3960a0 --- /dev/null +++ b/network/rtl8821ce/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------------------------------------------------------| +rtl8821ce: rtl8821ce (Realtek RTL8821CE Driver) +rtl8821ce: +rtl8821ce: Realtek RTL8821CE Driver maintained by Tomás Pinho for Arch Linux. +rtl8821ce: Still, can serve Slackers as well! +rtl8821ce: +rtl8821ce: If you experience problems using this driver, please visit +rtl8821ce: project's homepage to learn about possible solutions. +rtl8821ce: +rtl8821ce: Homepage: https://github.com/tomaspinho/rtl8821ce/ +rtl8821ce: +rtl8821ce: diff --git a/network/s-nail/s-nail.SlackBuild b/network/s-nail/s-nail.SlackBuild index 4e6d96403f..b50c566f5a 100644 --- a/network/s-nail/s-nail.SlackBuild +++ b/network/s-nail/s-nail.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for S-nail # Copyright 2008, 2009, 2010, 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2018 - 2019 Johannes Schoepfer, Germany +# Copyright 2018 - 2020 Johannes Schoepfer, Germany # 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=s-nail -VERSION=${VERSION:-14.9.15} +VERSION=${VERSION:-14.9.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/s-nail/s-nail.info b/network/s-nail/s-nail.info index f724e20880..5fa74b7f7a 100644 --- a/network/s-nail/s-nail.info +++ b/network/s-nail/s-nail.info @@ -1,8 +1,8 @@ PRGNAM="s-nail" -VERSION="14.9.15" +VERSION="14.9.17" HOMEPAGE="https://www.sdaoden.eu/code.html" -DOWNLOAD="https://www.sdaoden.eu/downloads/s-nail-14.9.15.tar.xz" -MD5SUM="2091022caf39eee9330b4c2b7e91eff3" +DOWNLOAD="https://www.sdaoden.eu/downloads/s-nail-14.9.17.tar.xz" +MD5SUM="844524dee4c7c9b5255a2b0cf7159c7a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" diff --git a/network/sabnzbd/sabnzbd.SlackBuild b/network/sabnzbd/sabnzbd.SlackBuild index f9f61183b6..408776d4b5 100644 --- a/network/sabnzbd/sabnzbd.SlackBuild +++ b/network/sabnzbd/sabnzbd.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sabnzbd -VERSION=${VERSION:-2.3.6} +VERSION=${VERSION:-2.3.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/sabnzbd/sabnzbd.info b/network/sabnzbd/sabnzbd.info index d635bae835..f8de3b6278 100644 --- a/network/sabnzbd/sabnzbd.info +++ b/network/sabnzbd/sabnzbd.info @@ -1,8 +1,8 @@ PRGNAM="sabnzbd" -VERSION="2.3.6" +VERSION="2.3.9" HOMEPAGE="http://sabnzbd.org" -DOWNLOAD="https://github.com/sabnzbd/sabnzbd/releases/download/2.3.6/SABnzbd-2.3.6-src.tar.gz" -MD5SUM="8ebdf61ae058209704619f5aa637bdee" +DOWNLOAD="https://github.com/sabnzbd/sabnzbd/releases/download/2.3.9/SABnzbd-2.3.9-src.tar.gz" +MD5SUM="6845962498a6c3629818e28b32edeac6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python-cheetah python-yenc pyOpenSSL unrar par2cmdline" diff --git a/network/scapy/scapy.SlackBuild b/network/scapy/scapy.SlackBuild index 61888c7449..9b63aebaed 100644 --- a/network/scapy/scapy.SlackBuild +++ b/network/scapy/scapy.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for scapy (http://www.secdev.org/projects/scapy/) # -# Copyright 2008-2019 Corrado Franco (http://conraid.net) +# Copyright 2008-2021 Corrado Franco (http://conraid.net) # All rights reserved. # # This program is free software: you can redistribute it and/or modify @@ -24,7 +24,7 @@ # <http://www.gnu.org/licenses/>. PRGNAM=scapy -VERSION=${VERSION:-2.4.3} +VERSION=${VERSION:-2.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/scapy/scapy.info b/network/scapy/scapy.info index 9c53507ecd..4c873228bc 100644 --- a/network/scapy/scapy.info +++ b/network/scapy/scapy.info @@ -1,8 +1,8 @@ PRGNAM="scapy" -VERSION="2.4.3" +VERSION="2.4.4" HOMEPAGE="http://www.secdev.org/projects/scapy/" -DOWNLOAD="https://github.com/secdev/scapy/archive/v2.4.3/scapy-2.4.3.tar.gz" -MD5SUM="c94f3825391c102ca9740e41f4ed2ec0" +DOWNLOAD="https://github.com/secdev/scapy/archive/v2.4.4/scapy-2.4.4.tar.gz" +MD5SUM="e75f869b0d932732f810cae624783226" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/scrcpy/README b/network/scrcpy/README new file mode 100644 index 0000000000..e921297b10 --- /dev/null +++ b/network/scrcpy/README @@ -0,0 +1,22 @@ +scrcpy is a tool that allows to display and control an Android device +connected on USB (or over TCP/IP). It does not require any root access. + +scrcpy requires adb as runtime dependency. adb is part of the package +android-tools on slackbuilds.org . + +scrcpy requires the Android device to be switched to Developer Mode +and have a few options switched on (tested on a Redmi 9C NFC phone): + +- USB debugging + +On some devices it also requires: + +- USB debugging (Security settings) + +See https://github.com/Genymobile/scrcpy#requirements for additional +details. + +This SlackBuild uses the prebuilt server instead of compiling it from +source, to minimize dependencies. + +Note: the SlackBuild was tested on Slackware64-14.2 only diff --git a/network/createrepo_c/createrepo_c.SlackBuild b/network/scrcpy/scrcpy.SlackBuild index b7e60f7a8e..b7b5d586c8 100644 --- a/network/createrepo_c/createrepo_c.SlackBuild +++ b/network/scrcpy/scrcpy.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for createrepo_c +# Slackware build script for scrcpy -# Copyright 2019 Sergei Fedosoff <eleksir@gmail.com> +# Copyright 2021 toolonely <lonely_@tutanota.com> # 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=createrepo_c -VERSION=${VERSION:-0.14.2} +PRGNAM=scrcpy +VERSION=${VERSION:-1.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,29 +71,30 @@ find -L . \ 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 - -make -make install DESTDIR=$PKG + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + --strip \ + -Db_lto=true \ + -Dprebuilt_server=$CWD/scrcpy-server-v$VERSION + 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 -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 diff --git a/network/scrcpy/scrcpy.info b/network/scrcpy/scrcpy.info new file mode 100644 index 0000000000..f715e06499 --- /dev/null +++ b/network/scrcpy/scrcpy.info @@ -0,0 +1,12 @@ +PRGNAM="scrcpy" +VERSION="1.17" +HOMEPAGE="https://github.com/Genymobile/scrcpy" +DOWNLOAD="https://github.com/Genymobile/scrcpy/archive/v1.17/scrcpy-1.17.tar.gz \ + https://github.com/Genymobile/scrcpy/releases/download/v1.17/scrcpy-server-v1.17" +MD5SUM="6ed058f41b918abe44f0a46b7d187a3f \ + 1de2cadd13e4da6f957aeaed9926adc6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="meson ffmpeg SDL2" +MAINTAINER="toolonely" +EMAIL="lonely_@tutanota.com" diff --git a/network/fping3/slack-desc b/network/scrcpy/slack-desc index e65a12eed9..57efb9463d 100644 --- a/network/fping3/slack-desc +++ b/network/scrcpy/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fping3: fping3 (send ICMP ECHO_REQUEST packets to network hosts) -fping3: -fping3: fping is a program to send ICMP echo probes to network hosts, similar -fping3: to ping, but much better performing when pinging multiple hosts. -fping3: -fping3: Homepage: http://fping.org/ -fping3: -fping3: -fping3: -fping3: -fping3: +scrcpy: scrcpy (display and control your Android device) +scrcpy: +scrcpy: This application provides display and control of Android devices +scrcpy: connected on USB (or over TCP/IP). It does not require any +scrcpy: root access. +scrcpy: +scrcpy: https://github.com/Genymobile/scrcpy +scrcpy: +scrcpy: +scrcpy: +scrcpy: diff --git a/network/sfeed/README b/network/sfeed/README index 8214d5bc45..41378184a0 100644 --- a/network/sfeed/README +++ b/network/sfeed/README @@ -1,5 +1,5 @@ SFeed is a simple RSS and Atom parser. README.SLACKWARE contains starter tips. -/usr/doc/sfeed-0.9.14/README contains detailed post-install +/usr/doc/sfeed-0.9.22/README contains detailed post-install instructions. diff --git a/network/sfeed/README.SLACKWARE b/network/sfeed/README.SLACKWARE index 8c524c6281..22702d68a3 100644 --- a/network/sfeed/README.SLACKWARE +++ b/network/sfeed/README.SLACKWARE @@ -1,17 +1,17 @@ -The following instructions are taken from /usr/doc/sfeed-0.9.14/README -Note that the slackbuild removes /usr/share/doc/sfeed; thus, please -copy necessary files from /usr/doc/sfeed-0.9.14 +The following instructions are taken from /usr/doc/sfeed-0.9.22/README +Note that the slackbuild removes /usr/share/doc/sfeed; thus, please +copy necessary files from /usr/doc/sfeed-0.9.22 - Initialize sfeed folders: mkdir -p "$HOME/.sfeed/feeds" - Initialize sfeedrc, such as by copying and editing the example file: -cp /usr/doc/sfeed-0.9.14/sfeedrc.example "$HOME/.sfeed/sfeedrc" +cp /usr/doc/sfeed-0.9.22/sfeedrc.example "$HOME/.sfeed/sfeedrc" $EDITOR "$HOME/.sfeed/sfeedrc" - Update feeds: sfeed_update - Format feeds. For example, view feeds in HTML (no frames). -cp /usr/doc/sfeed-0.9.14/style.css "$HOME/.sfeed/style.css" +cp /usr/doc/sfeed-0.9.22/style.css "$HOME/.sfeed/style.css" sfeed_html $HOME/.sfeed/feeds/* > "$HOME/.sfeed/feeds.html" diff --git a/network/sfeed/sfeed.SlackBuild b/network/sfeed/sfeed.SlackBuild index 6f3a6d9b6a..5b9d2a4437 100644 --- a/network/sfeed/sfeed.SlackBuild +++ b/network/sfeed/sfeed.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for sfeed -# Copyright 2019 Isaac Yu <isaacyu1@isaacyu1.com> +# Copyright 2019-2021 Isaac Yu <isaacyu1@isaacyu1.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sfeed -VERSION=${VERSION:-0.9.14} +VERSION=${VERSION:-0.9.22} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -63,13 +63,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 \ +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 +make install PREFIX=/usr MANPREFIX=/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 diff --git a/network/sfeed/sfeed.info b/network/sfeed/sfeed.info index 3dab71971c..fbed4d46f6 100644 --- a/network/sfeed/sfeed.info +++ b/network/sfeed/sfeed.info @@ -1,8 +1,8 @@ PRGNAM="sfeed" -VERSION="0.9.14" +VERSION="0.9.22" HOMEPAGE="https://codemadness.org/releases/sfeed/" -DOWNLOAD="https://codemadness.org/releases/sfeed/sfeed-0.9.14.tar.gz" -MD5SUM="5a7e1388a06f3ba233e479fe3c697ac5" +DOWNLOAD="https://codemadness.org/releases/sfeed/sfeed-0.9.22.tar.gz" +MD5SUM="96da8f382f7cc211a9de477a03b93785" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/shadowsocks-libev/shadowsocks-libev.SlackBuild b/network/shadowsocks-libev/shadowsocks-libev.SlackBuild index 4189c3b379..59467093f9 100644 --- a/network/shadowsocks-libev/shadowsocks-libev.SlackBuild +++ b/network/shadowsocks-libev/shadowsocks-libev.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for shadowsocks-libev -# Copyright 2018 Cheng Bao (awabimakoto@gmail.com) Beijing, China +# Copyright 2020 Cheng Bao (awabimakoto@gmail.com) Beijing, China # 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=shadowsocks-libev -VERSION=${VERSION:-3.3.3} +VERSION=${VERSION:-3.3.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/shadowsocks-libev/shadowsocks-libev.info b/network/shadowsocks-libev/shadowsocks-libev.info index 9c34020396..8c7b668ad9 100644 --- a/network/shadowsocks-libev/shadowsocks-libev.info +++ b/network/shadowsocks-libev/shadowsocks-libev.info @@ -1,8 +1,8 @@ PRGNAM="shadowsocks-libev" -VERSION="3.3.3" +VERSION="3.3.5" HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev" -DOWNLOAD="https://github.com/shadowsocks/shadowsocks-libev/releases/download/v3.3.3/shadowsocks-libev-3.3.3.tar.gz" -MD5SUM="c453caff983be120faf3f35e9c83eb62" +DOWNLOAD="https://github.com/shadowsocks/shadowsocks-libev/releases/download/v3.3.5/shadowsocks-libev-3.3.5.tar.gz" +MD5SUM="891392c245ab4702b70f0053bd3eec6b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mbedtls libsodium libev c-ares" diff --git a/network/shorewall-core/README b/network/shorewall-core/README index ef3127a790..1c5b62089a 100644 --- a/network/shorewall-core/README +++ b/network/shorewall-core/README @@ -1,15 +1,19 @@ Shorewall-core (Iptables Made Easy) -The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter -(iptables) based firewall that can be used on a dedicated firewall system, a -multi-function gateway/router/server or on a standalone GNU/Linux system. +The Shoreline Firewall, more commonly known as "Shorewall", is a +Netfilter (iptables) based firewall that can be used on a dedicated +firewall system, a multi-function gateway/router/server or on a +standalone GNU/Linux system. As of version 4.5, shorewall consists of 3 packages: -* shorewall-core, containing the common elements to both IPv4 and IPv6 components +* shorewall-core, containing the common elements to both IPv4 and IPv6 + components * shorewall, the IPv4 component * shorewall6, the IPv6 component -The shorewall-core package is needed for both but now you can install the IPv6 -packages without needing the IPv4 one if you are on aIV6 network only. +The shorewall-core package is needed for both but now you can install +the IPv6 packages without needing the IPv4 one if you are on aIV6 +network only. -xtables-addons is an optional dependency to use the new per-IP accounting feature. +xtables-addons is an optional dependency to use the new per-IP +accounting feature. diff --git a/network/shorewall-core/shorewall-core.SlackBuild b/network/shorewall-core/shorewall-core.SlackBuild index 970e63a775..3979b91135 100644 --- a/network/shorewall-core/shorewall-core.SlackBuild +++ b/network/shorewall-core/shorewall-core.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=shorewall-core -VERSION=${VERSION:-5.2.3.4} +VERSION=${VERSION:-5.2.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/shorewall-core/shorewall-core.info b/network/shorewall-core/shorewall-core.info index b1f72796cd..3fd281738a 100644 --- a/network/shorewall-core/shorewall-core.info +++ b/network/shorewall-core/shorewall-core.info @@ -1,8 +1,8 @@ PRGNAM="shorewall-core" -VERSION="5.2.3.4" -HOMEPAGE="http://www.shorewall.net" -DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-core-5.2.3.4.tar.bz2" -MD5SUM="44337f9484303f855df527ffb09e8087" +VERSION="5.2.8" +HOMEPAGE="https://shorewall.org" +DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-5.2.8.tar.bz2" +MD5SUM="07c7371fd2896e87f373b760561e41a8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/shorewall/README b/network/shorewall/README index 4586b6a7d0..abb04663cf 100644 --- a/network/shorewall/README +++ b/network/shorewall/README @@ -1,13 +1,16 @@ Shorewall (IPv4 support package for shorewall) -The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter -(iptables) based firewall that can be used on a dedicated firewall system, a -multi-function gateway/router/server or on a standalone GNU/Linux system. +The Shoreline Firewall, more commonly known as "Shorewall", is a +Netfilter (iptables) based firewall that can be used on a dedicated +firewall system, a multi-function gateway/router/server or on a +standalone GNU/Linux system. As of version 4.5, shorewall consists of 3 packages: -* shorewall-core, containing the common elements to both IPv4 and IPv6 components +* shorewall-core, containing the common elements to both IPv4 and IPv6 + components * shorewall, the IPv4 component * shorewall6, the IPv6 component -The shorewall-core package is needed for both but now you can install the IPv6 -packages without needing the IPv4 one if you are on aIV6 network only. +The shorewall-core package is needed for both but now you can install +the IPv6 packages without needing the IPv4 one if you are on aIV6 +network only. diff --git a/network/shorewall/shorewall.SlackBuild b/network/shorewall/shorewall.SlackBuild index 9d55e2e363..729f735a57 100644 --- a/network/shorewall/shorewall.SlackBuild +++ b/network/shorewall/shorewall.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=shorewall -VERSION=${VERSION:-5.2.3.4} +VERSION=${VERSION:-5.2.8} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/shorewall/shorewall.info b/network/shorewall/shorewall.info index b53cfe47ef..9cd69afffc 100644 --- a/network/shorewall/shorewall.info +++ b/network/shorewall/shorewall.info @@ -1,8 +1,8 @@ PRGNAM="shorewall" -VERSION="5.2.3.4" -HOMEPAGE="http://www.shorewall.net" -DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-5.2.3.4.tar.bz2" -MD5SUM="9f3e6ebfa32f2fb752d20a6c6394c397" +VERSION="5.2.8" +HOMEPAGE="https://shorewall.org" +DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-5.2.8.tar.bz2" +MD5SUM="0e4041810f066deef40bf9e57fa79e96" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="shorewall-core" diff --git a/network/shorewall6/README b/network/shorewall6/README index 20e94d57ad..0a0309db2c 100644 --- a/network/shorewall6/README +++ b/network/shorewall6/README @@ -1,13 +1,16 @@ Shorewall (IPv6 support package for shorewall) -The Shoreline Firewall, more commonly known as "Shorewall", is a Netfilter -(iptables) based firewall that can be used on a dedicated firewall system, a -multi-function gateway/router/server or on a standalone GNU/Linux system. +The Shoreline Firewall, more commonly known as "Shorewall", is a +Netfilter (iptables) based firewall that can be used on a dedicated +firewall system, a multi-function gateway/router/server or on a +standalone GNU/Linux system. As of version 4.5, shorewall consists of 3 packages: -* shorewall-core, containing the common elements to both IPv4 and IPv6 components +* shorewall-core, containing the common elements to both IPv4 and IPv6 + components * shorewall, the IPv4 component * shorewall6, the IPv6 component -The shorewall-core package is needed for both but now you can install the IPv6 -packages without needing the IPv4 one if you are on aIV6 network only. +The shorewall-core package is needed for both but now you can install +the IPv6 packages without needing the IPv4 one if you are on aIV6 +network only. diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild index 86c05f75fb..234c1390ba 100644 --- a/network/shorewall6/shorewall6.SlackBuild +++ b/network/shorewall6/shorewall6.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=shorewall6 -VERSION=${VERSION:-5.2.3.4} +VERSION=${VERSION:-5.2.8} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/shorewall6/shorewall6.info b/network/shorewall6/shorewall6.info index cdbd520db0..eca8a9b2a9 100644 --- a/network/shorewall6/shorewall6.info +++ b/network/shorewall6/shorewall6.info @@ -1,8 +1,8 @@ PRGNAM="shorewall6" -VERSION="5.2.3.4" -HOMEPAGE="http://www.shorewall.net" -DOWNLOAD="http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-5.2.3.4.tar.bz2" -MD5SUM="1cfccf231f697a65ff112863c98f74a8" +VERSION="5.2.8" +HOMEPAGE="https://shorewall.org" +DOWNLOAD="https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-5.2.8.tar.bz2" +MD5SUM="4a9a2f55cd40bb2cc17dae0227350c4d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="shorewall-core" diff --git a/network/sic/README b/network/sic/README index e721f1205d..c4a96694d5 100644 --- a/network/sic/README +++ b/network/sic/README @@ -1 +1,10 @@ -sic is an extremely simple IRC client. +sic (simple irc client) + +sic is an extremely simple IRC client. It consists of less than 250 +lines of code. + +The default host is "irc.oftc.net" and the default port is 6667. You +can change these by setting IRCHOST and/or IRCPORT in the script's +environment, e.g.: + +# IRCHOST=chat.freenode.org IRCPORT=6668 ./sic.SlackBuild diff --git a/network/sic/sic.SlackBuild b/network/sic/sic.SlackBuild index 33638e6832..fb4c624018 100644 --- a/network/sic/sic.SlackBuild +++ b/network/sic/sic.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh # # Slackware build script for sic -# Copyright 2011 Haroldo F. Jardim <hfjardim@gmail.com> +# Copyright 2011 Haroldo F. Jardim <email removed> +# Now maintained by B. Watson <yalhcru@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,14 +22,24 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20201113 bkw: The original author of this script hasn't been heard +# from since 2011, and it needs some attention (still mentions i486) +# so I'm taking it. +# - new maintainer +# - i486 => i586 +# - fix that => than typo in slack-desc +# - expand README a bit +# - add env vars for default host and port +# - simplify script + PRGNAM=sic -VERSION=${VERSION:-1.1} +VERSION=${VERSION:-1.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 @@ -39,8 +50,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" @@ -62,31 +73,28 @@ rm -rf $PRGNAM-$VERSION tar xvzf $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 644 * sed -i "s/CFLAGS =/CFLAGS +=/" config.mk -CFLAGS="$SLKCFLAGS" \ +[ -n "$IRCHOST" ] && \ + sed -i "/host *= *\"/s,\"[^\"]*\",\"$IRCHOST\"," $PRGNAM.c + +[ -n "$IRCPORT" ] && \ + sed -i "/port *= *\"/s,\"[^\"]*\",\"$IRCPORT\"," $PRGNAM.c + +CFLAGS="$SLKCFLAGS -Wl,-s" \ DESTDIR=$PKG \ make \ PREFIX=/usr \ MANPREFIX=/usr/man \ install -find $PKG | xargs 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 +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 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 -find $PKG/usr/doc -type f -exec chmod 0644 {} \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/sic/sic.info b/network/sic/sic.info index 1aeede0c85..f466828855 100644 --- a/network/sic/sic.info +++ b/network/sic/sic.info @@ -1,10 +1,10 @@ PRGNAM="sic" -VERSION="1.1" +VERSION="1.2" HOMEPAGE="http://tools.suckless.org/sic" -DOWNLOAD="http://dl.suckless.org/tools/sic-1.1.tar.gz" -MD5SUM="856d0e5faa151ae9602713ee7d34a2d5" +DOWNLOAD="http://dl.suckless.org/tools/sic-1.2.tar.gz" +MD5SUM="eb099e790c3ce7866df50d3fe1a52c25" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Haroldo F. Jardim" -EMAIL="hfjardim@gmail.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/sic/slack-desc b/network/sic/slack-desc index a5f706b903..8a2a71b460 100644 --- a/network/sic/slack-desc +++ b/network/sic/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| sic: sic (simple irc client) sic: -sic: sic is an extremely simple IRC client. It consists of less that 250 +sic: sic is an extremely simple IRC client. It consists of less than 250 sic: lines of code. sic: sic: http://tools.suckless.org/sic diff --git a/network/signal-desktop/signal-desktop.SlackBuild b/network/signal-desktop/signal-desktop.SlackBuild index 68cbd0aea4..dff9df468f 100644 --- a/network/signal-desktop/signal-desktop.SlackBuild +++ b/network/signal-desktop/signal-desktop.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=signal-desktop -VERSION=${VERSION:-1.27.4} +VERSION=${VERSION:-5.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/signal-desktop/signal-desktop.info b/network/signal-desktop/signal-desktop.info index d64e4153eb..9804287ed4 100644 --- a/network/signal-desktop/signal-desktop.info +++ b/network/signal-desktop/signal-desktop.info @@ -1,10 +1,10 @@ PRGNAM="signal-desktop" -VERSION="1.27.4" +VERSION="5.0.0" HOMEPAGE="https://signal.org/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/signal-desktop/signal-desktop_1.27.4_amd64.deb" -MD5SUM_x86_64="bdea577fbd07f838c87e89f16c3717f7" -REQUIRES="" +DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/signal-desktop/signal-desktop_5.0.0_amd64.deb" +MD5SUM_x86_64="08bb40ef176be688cec25957a06fffd8" +REQUIRES="libxkbcommon" MAINTAINER="David O'Shaughnessy" EMAIL="dev@osh.id.au" diff --git a/network/sipp/sipp.SlackBuild b/network/sipp/sipp.SlackBuild index 06edad04f4..288eb1c8f1 100644 --- a/network/sipp/sipp.SlackBuild +++ b/network/sipp/sipp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for SIPp -# Copyright 2013-2019 Kent Fritz Mountain View, California, USA +# Copyright 2013-2020 Kent Fritz Mountain View, 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=sipp -VERSION=${VERSION:-3.5.2} +VERSION=${VERSION:-3.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -97,7 +97,7 @@ mkdir -p $PKG/usr/share/$PRGNAM/pcap cp -a pcap/* $PKG/usr/share/$PRGNAM/pcap mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md LICENSE.txt THANKS CHANGES.md FAQ.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.md LICENSE.txt THANKS CHANGES.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/sipp/sipp.info b/network/sipp/sipp.info index 79b08686dd..519aa0a9de 100644 --- a/network/sipp/sipp.info +++ b/network/sipp/sipp.info @@ -1,8 +1,8 @@ PRGNAM="sipp" -VERSION="3.5.2" +VERSION="3.6.0" HOMEPAGE="http://sipp.sourceforge.net" -DOWNLOAD="https://github.com/SIPp/sipp/releases/download/v3.5.2/sipp-3.5.2.tar.gz" -MD5SUM="604df972c6ed3ddc598b2b83d7a8ddad" +DOWNLOAD="https://github.com/SIPp/sipp/releases/download/v3.6.0/sipp-3.6.0.tar.gz" +MD5SUM="1fd27333d179d786d3f6a67ee451fae9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/skype4pidgin/skype4pidgin.SlackBuild b/network/skype4pidgin/skype4pidgin.SlackBuild index cbd3911f97..a66958472a 100644 --- a/network/skype4pidgin/skype4pidgin.SlackBuild +++ b/network/skype4pidgin/skype4pidgin.SlackBuild @@ -1,48 +1,47 @@ #!/bin/sh -# Slackware build script for SkypeWeb Chat for Pidgin +# Slackware build script for skype4pidgin # -# Copyright 2018 Ekin Akoglu <ekinakoglu@gmail.com> # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com> +# Copyright 2018 Ekin Akoglu <ekinakoglu@gmail.com> +# Copyright 2020 Dominik Drobek <dominik.drobek (at) o2.pl> # All rights reserved. # -# Based on: -# SBo's cmake-template -# -# Previously used chunks from Erik W. Hanson's FaceBook SlackBuild. -# # 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. +# 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=skype4pidgin -VERSION=${VERSION:-1.5} +VERSION=${VERSION:-1.7} 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 ;; + 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="" @@ -52,9 +51,6 @@ elif [ "$ARCH" = "i686" ]; then 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="" @@ -62,11 +58,6 @@ fi set -e -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -80,13 +71,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 {} \; -# Go to skypeweb folder, since there are two plugins in this archive cd skypeweb - -# Let's compile! 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 gpl3.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/skype4pidgin/skype4pidgin.info b/network/skype4pidgin/skype4pidgin.info index 51f94b4ff0..080f646cc6 100644 --- a/network/skype4pidgin/skype4pidgin.info +++ b/network/skype4pidgin/skype4pidgin.info @@ -1,10 +1,10 @@ PRGNAM="skype4pidgin" -VERSION="1.5" +VERSION="1.7" HOMEPAGE="https://github.com/EionRobb/skype4pidgin" -DOWNLOAD="https://github.com/EionRobb/skype4pidgin/archive/1.5/skype4pidgin-1.5.tar.gz" -MD5SUM="8f524b4090b0d2c2fc4878477c61140f" +DOWNLOAD="https://github.com/EionRobb/skype4pidgin/archive/1.7/skype4pidgin-1.7.tar.gz" +MD5SUM="6af9359c55f4644fc8848389df582848" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="json-glib" -MAINTAINER="Ekin Akoglu" -EMAIL="ekinakoglu@gmail.com" +MAINTAINER="Dominik Drobek" +EMAIL="dominik.drobek (at) o2.pl" diff --git a/network/skype4pidgin/slack-desc b/network/skype4pidgin/slack-desc index 1c774a97bd..d1d7a51476 100644 --- a/network/skype4pidgin/slack-desc +++ b/network/skype4pidgin/slack-desc @@ -11,8 +11,8 @@ skype4pidgin: skype4pidgin: Adds Skype client-less chat (text only) to Pidgin using the SkypeWeb skype4pidgin: protocol. Has many features already, such as group chat. skype4pidgin: -skype4pidgin: Homepage: -skype4pidgin: https://github.com/EionRobb/skype4pidgin +skype4pidgin: Homepage: https://github.com/EionRobb/skype4pidgin +skype4pidgin: skype4pidgin: skype4pidgin: skype4pidgin: diff --git a/network/skypeforlinux/skypeforlinux.SlackBuild b/network/skypeforlinux/skypeforlinux.SlackBuild index d9fd4a4a8d..600dfc1a7b 100644 --- a/network/skypeforlinux/skypeforlinux.SlackBuild +++ b/network/skypeforlinux/skypeforlinux.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for skypeforlinux -# Copyright 2017, 2018, 2019 Mario Preksavec, Zagreb, Croatia +# Copyright 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=skypeforlinux -VERSION=${VERSION:-8.51.0.92} +VERSION=${VERSION:-8.65.0.76} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/skypeforlinux/skypeforlinux.info b/network/skypeforlinux/skypeforlinux.info index 4d6c38d0cd..f7f973d7e6 100644 --- a/network/skypeforlinux/skypeforlinux.info +++ b/network/skypeforlinux/skypeforlinux.info @@ -1,10 +1,10 @@ PRGNAM="skypeforlinux" -VERSION="8.51.0.92" +VERSION="8.65.0.76" HOMEPAGE="https://www.skype.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.51.0.92_amd64.deb" -MD5SUM_x86_64="e65f32767eb510d86db889247d6e9767" +DOWNLOAD_x86_64="https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.65.0.76_amd64.deb" +MD5SUM_x86_64="283a82cefb9dc7ba3baad25e47ce9a82" REQUIRES="%README%" MAINTAINER="Mario Preksavec" EMAIL="mario at slackware dot hr" diff --git a/network/slack/slack.SlackBuild b/network/slack/slack.SlackBuild index ff56d8e8e6..8147f4bd6d 100644 --- a/network/slack/slack.SlackBuild +++ b/network/slack/slack.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=slack -VERSION=${VERSION:-4.0.2} +VERSION=${VERSION:-4.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/slack/slack.info b/network/slack/slack.info index 52ac6656cb..1149a34c65 100644 --- a/network/slack/slack.info +++ b/network/slack/slack.info @@ -1,10 +1,10 @@ PRGNAM="slack" -VERSION="4.0.2" +VERSION="4.4.2" HOMEPAGE="https://slack.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://downloads.slack-edge.com/linux_releases/slack-desktop-4.0.2-amd64.deb" -MD5SUM_x86_64="8a2a502035741b04d6a29c772370ca21" +DOWNLOAD_x86_64="https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.2-amd64.deb" +MD5SUM_x86_64="bf426603bbaa765566435893764de83e" REQUIRES="" MAINTAINER="Pedro R.M. Júnior" EMAIL="pedrormjunior@gmail.com" diff --git a/network/slimjet/doinst.sh b/network/slimjet/doinst.sh index 65c7e2eeb9..d8b0d0d87b 100644 --- a/network/slimjet/doinst.sh +++ b/network/slimjet/doinst.sh @@ -1,3 +1,4 @@ + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi @@ -7,3 +8,4 @@ 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/network/slimjet/files/slimjet.desktop b/network/slimjet/files/slimjet.desktop new file mode 100644 index 0000000000..49a73ad3d2 --- /dev/null +++ b/network/slimjet/files/slimjet.desktop @@ -0,0 +1,224 @@ +[Desktop Entry] +Version=1.0 +Name=Slimjet Web Browser +# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. +# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. +GenericName=Web Browser +GenericName[ar]=متصفح الشبكة +GenericName[bg]=Уеб браузър +GenericName[ca]=Navegador web +GenericName[cs]=WWW prohlížeč +GenericName[da]=Browser +GenericName[de]=Web-Browser +GenericName[el]=Περιηγητής ιστού +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web +GenericName[gu]=વેબ બ્રાઉઝર +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hu]=Webböngésző +GenericName[it]=Browser Web +GenericName[ja]=ウェブブラウザ +GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ +GenericName[ko]=웹 브라우저 +GenericName[lt]=Žiniatinklio naršyklė +GenericName[lv]=Tīmekļa pārlūks +GenericName[ml]=വെബ് ബ്രൌസര് +GenericName[mr]=वेब ब्राऊजर +GenericName[nb]=Nettleser +GenericName[nl]=Webbrowser +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador da Internet +GenericName[ro]=Navigator de Internet +GenericName[ru]=Веб-браузер +GenericName[sl]=Spletni brskalnik +GenericName[sv]=Webbläsare +GenericName[ta]=இணைய உலாவி +GenericName[th]=เว็บเบราว์เซอร์ +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Навігатор Тенет +GenericName[zh_CN]=网页浏览器 +GenericName[zh_HK]=網頁瀏覽器 +GenericName[zh_TW]=網頁瀏覽器 +# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[fil]=Web Browser +GenericName[hr]=Web preglednik +GenericName[id]=Browser Web +GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର +GenericName[sk]=WWW prehliadač +GenericName[sr]=Интернет прегледник +GenericName[te]=మహాతల అన్వేషి +GenericName[vi]=Bộ duyệt Web +# Gnome and KDE 3 uses Comment. +Comment=Access the Internet +Comment[ar]=الدخول إلى الإنترنت +Comment[bg]=Достъп до интернет +Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন +Comment[ca]=Accedeix a Internet +Comment[cs]=Přístup k internetu +Comment[da]=Få adgang til internettet +Comment[de]=Internetzugriff +Comment[el]=Πρόσβαση στο Διαδίκτυο +Comment[en_GB]=Access the Internet +Comment[es]=Accede a Internet. +Comment[et]=Pääs Internetti +Comment[fi]=Käytä internetiä +Comment[fil]=I-access ang Internet +Comment[fr]=Accéder à Internet +Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો +Comment[he]=גישה אל האינטרנט +Comment[hi]=इंटरनेट तक पहुंच स्थापित करें +Comment[hr]=Pristup Internetu +Comment[hu]=Internetelérés +Comment[id]=Akses Internet +Comment[it]=Accesso a Internet +Comment[ja]=インターネットにアクセス +Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ +Comment[ko]=인터넷 연결 +Comment[lt]=Interneto prieiga +Comment[lv]=Piekļūt internetam +Comment[ml]=ഇന്റര്നെറ്റ് ആക്സസ് ചെയ്യുക +Comment[mr]=इंटरनेटमध्ये प्रवेश करा +Comment[nb]=Gå til Internett +Comment[nl]=Verbinding maken met internet +Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ +Comment[pl]=Skorzystaj z internetu +Comment[pt]=Aceder à Internet +Comment[pt_BR]=Acessar a internet +Comment[ro]=Accesaţi Internetul +Comment[ru]=Доступ в Интернет +Comment[sk]=Prístup do siete Internet +Comment[sl]=Dostop do interneta +Comment[sr]=Приступите Интернету +Comment[sv]=Gå ut på Internet +Comment[ta]=இணையத்தை அணுகுதல் +Comment[te]=ఇంటర్నెట్ను ఆక్సెస్ చెయ్యండి +Comment[th]=เข้าถึงอินเทอร์เน็ต +Comment[tr]=İnternet'e erişin +Comment[uk]=Доступ до Інтернету +Comment[vi]=Truy cập Internet +Comment[zh_CN]=访问互联网 +Comment[zh_HK]=連線到網際網路 +Comment[zh_TW]=連線到網際網路 +Exec=/usr/bin/flashpeak-slimjet %U +Terminal=false +Icon=slimjet +Type=Application +Categories=Network;WebBrowser; +MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; +X-Ayatana-Desktop-Shortcuts=NewWindow;NewIncognito + +Name[en_US]=Slimjet Web Browser + +[X-NewWindow Shortcut Group] +Name=New Window +Name[am]=አዲስ መስኮት +Name[ar]=نافذة جديدة +Name[bg]=Нов прозорец +Name[bn]=নতুন উইন্ডো +Name[ca]=Finestra nova +Name[cs]=Nové okno +Name[da]=Nyt vindue +Name[de]=Neues Fenster +Name[el]=Νέο Παράθυρο +Name[en_GB]=New Window +Name[es]=Nueva ventana +Name[et]=Uus aken +Name[fa]=پنجره جدید +Name[fi]=Uusi ikkuna +Name[fil]=New Window +Name[fr]=Nouvelle fenêtre +Name[gu]=નવી વિંડો +Name[hi]=नई विंडो +Name[hr]=Novi prozor +Name[hu]=Új ablak +Name[id]=Jendela Baru +Name[it]=Nuova finestra +Name[iw]=חלון חדש +Name[ja]=新規ウインドウ +Name[kn]=ಹೊಸ ವಿಂಡೊ +Name[ko]=새 창 +Name[lt]=Naujas langas +Name[lv]=Jauns logs +Name[ml]=പുതിയ വിന്ഡോ +Name[mr]=नवीन विंडो +Name[nl]=Nieuw venster +Name[no]=Nytt vindu +Name[pl]=Nowe okno +Name[pt]=Nova janela +Name[pt_BR]=Nova janela +Name[ro]=Fereastră nouă +Name[ru]=Новое окно +Name[sk]=Nové okno +Name[sl]=Novo okno +Name[sr]=Нови прозор +Name[sv]=Nytt fönster +Name[sw]=Dirisha Jipya +Name[ta]=புதிய சாளரம் +Name[te]=క్రొత్త విండో +Name[th]=หน้าต่างใหม่ +Name[tr]=Yeni Pencere +Name[uk]=Нове вікно +Name[vi]=Cửa sổ Mới +Name[zh_CN]=新建窗口 +Name[zh_TW]=開新視窗 +Exec=/usr/bin/flashpeak-slimjet +TargetEnvironment=Unity + +[X-NewIncognito Shortcut Group] +Name=New Incognito Window +Name[ar]=نافذة جديدة للتصفح المتخفي +Name[bg]=Нов прозорец „инкогнито“ +Name[bn]=নতুন ছদ্মবেশী উইন্ডো +Name[ca]=Finestra d'incògnit nova +Name[cs]=Nové anonymní okno +Name[da]=Nyt inkognitovindue +Name[de]=Neues Inkognito-Fenster +Name[el]=Νέο παράθυρο για ανώνυμη περιήγηση +Name[en_GB]=New Incognito window +Name[es]=Nueva ventana de incógnito +Name[et]=Uus inkognito aken +Name[fa]=پنجره جدید حالت ناشناس +Name[fi]=Uusi incognito-ikkuna +Name[fil]=Bagong Incognito window +Name[fr]=Nouvelle fenêtre de navigation privée +Name[gu]=નવી છુપી વિંડો +Name[hi]=नई गुप्त विंडो +Name[hr]=Novi anoniman prozor +Name[hu]=Új Inkognitóablak +Name[id]=Jendela Penyamaran baru +Name[it]=Nuova finestra di navigazione in incognito +Name[iw]=חלון חדש לגלישה בסתר +Name[ja]=新しいシークレット ウィンドウ +Name[kn]=ಹೊಸ ಅಜ್ಞಾತ ವಿಂಡೋ +Name[ko]=새 시크릿 창 +Name[lt]=Naujas inkognito langas +Name[lv]=Jauns inkognito režīma logs +Name[ml]=പുതിയ വേഷ പ്രച്ഛന്ന വിന്ഡോ +Name[mr]=नवीन गुप्त विंडो +Name[nl]=Nieuw incognitovenster +Name[no]=Nytt inkognitovindu +Name[pl]=Nowe okno incognito +Name[pt]=Nova janela de navegação anónima +Name[pt_BR]=Nova janela anônima +Name[ro]=Fereastră nouă incognito +Name[ru]=Новое окно в режиме инкогнито +Name[sk]=Nové okno inkognito +Name[sl]=Novo okno brez beleženja zgodovine +Name[sr]=Нови прозор за прегледање без архивирања +Name[sv]=Nytt inkognitofönster +Name[ta]=புதிய மறைநிலைச் சாளரம் +Name[te]=క్రొత్త అజ్ఞాత విండో +Name[th]=หน้าต่างใหม่ที่ไม่ระบุตัวตน +Name[tr]=Yeni Gizli pencere +Name[uk]=Нове вікно в режимі анонімного перегляду +Name[vi]=Cửa sổ ẩn danh mới +Name[zh_CN]=新建隐身窗口 +Name[zh_TW]=新增無痕式視窗 +Exec=/usr/bin/flashpeak-slimjet --incognito +TargetEnvironment=Unity diff --git a/network/slimjet/slimjet.SlackBuild b/network/slimjet/slimjet.SlackBuild index 8186a410b2..bd57b25c68 100644 --- a/network/slimjet/slimjet.SlackBuild +++ b/network/slimjet/slimjet.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for slimjet -# Copyright 2017-2018 Skaendo <skaendo@linuxmail.org> +# Copyright 2017, 2018, 2019, 2020 Skaendo <skaendo@linuxmail.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=slimjet -VERSION=${VERSION:-24.0.5.0} +VERSION=${VERSION:-26.0.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,13 +81,14 @@ ln -s /opt/slimjet/product_logo_128.png \ # Install .desktop File mkdir -p $PKG/usr/share/applications/apps -cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications +cp $CWD/files/$PRGNAM.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 license.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a license.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/slimjet/slimjet.info b/network/slimjet/slimjet.info index 895ef8d660..2d5f9599ea 100644 --- a/network/slimjet/slimjet.info +++ b/network/slimjet/slimjet.info @@ -1,10 +1,10 @@ PRGNAM="slimjet" -VERSION="24.0.5.0" +VERSION="26.0.5.0" HOMEPAGE="https://www.slimjet.com" DOWNLOAD="https://www.slimjetbrowser.com/release/slimjet_i386.tar.xz" -MD5SUM="673371dd71a69310c1cd302e788b5601" +MD5SUM="01340e4890b6296b33d8eb85d668f874" DOWNLOAD_x86_64="https://www.slimjetbrowser.com/release/slimjet_amd64.tar.xz" -MD5SUM_x86_64="fa7dd20e7a7c937818b70d4cc2034e61" +MD5SUM_x86_64="0759295bbe7a4c252ee94b824f1d9196" REQUIRES="" MAINTAINER="Skaendo" EMAIL="skaendo@linuxmail.org" diff --git a/network/slirp4netns/slirp4netns.info b/network/slirp4netns/slirp4netns.info index 3960882ca2..c9fd17abca 100644 --- a/network/slirp4netns/slirp4netns.info +++ b/network/slirp4netns/slirp4netns.info @@ -2,7 +2,7 @@ PRGNAM="slirp4netns" VERSION="0.4.1" HOMEPAGE="https://github.com/rootless-containers/slirp4netns" DOWNLOAD="https://github.com/rootless-containers/slirp4netns/archive/v0.4.1/slirp4netns-0.4.1.tar.gz" -MD5SUM="ecf1f07df723ab04bc84d2d45251f407" +MD5SUM="2511da14fcacff3a4c5d6c501f04e20b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/slurm/slurm.SlackBuild b/network/slurm/slurm.SlackBuild index d1a61eec41..dd3bc02382 100644 --- a/network/slurm/slurm.SlackBuild +++ b/network/slurm/slurm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Slurm -# Copyright 2015-2019 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,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=slurm -VERSION=${VERSION:-19.05.2} +VERSION=${VERSION:-20.11.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/slurm/slurm.info b/network/slurm/slurm.info index 512cd28bbc..ffc533afbe 100644 --- a/network/slurm/slurm.info +++ b/network/slurm/slurm.info @@ -1,10 +1,10 @@ PRGNAM="slurm" -VERSION="19.05.2" +VERSION="20.11.4" HOMEPAGE="https://slurm.schedmd.com/" -DOWNLOAD="https://download.schedmd.com/slurm/slurm-19.05.2.tar.bz2" -MD5SUM="6a6777f24fe54e356120c56c7774c18a" +DOWNLOAD="https://download.schedmd.com/slurm/slurm-20.11.4.tar.bz2" +MD5SUM="4b5ff978527f73eff9691d559d19a494" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="munge" +REQUIRES="munge python3" MAINTAINER="Emmanuel N. Millan" EMAIL="emmanueln@gmail.com" diff --git a/network/smstools3/smstools3.SlackBuild b/network/smstools3/smstools3.SlackBuild index 4936906f92..2564390f94 100644 --- a/network/smstools3/smstools3.SlackBuild +++ b/network/smstools3/smstools3.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for smstools3 -# 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/network/smstools3/smstools3.info b/network/smstools3/smstools3.info index 2b93193511..a41b978ac3 100644 --- a/network/smstools3/smstools3.info +++ b/network/smstools3/smstools3.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/network/snmpsim/snmpsim.info b/network/snmpsim/snmpsim.info index 9b2389b8d2..9fb7883828 100644 --- a/network/snmpsim/snmpsim.info +++ b/network/snmpsim/snmpsim.info @@ -6,5 +6,5 @@ MD5SUM="9cf35ba624f09a2d723fa9dea83f243f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pysnmp" -MAINTAINER="Ilya Etingof" -EMAIL="ilya@glas.net" +MAINTAINER="Charles Polisher" +EMAIL="cpolish@surewest.net" diff --git a/network/spamassassin/slack-desc b/network/spamassassin/slack-desc index da362b6936..ac7015f84a 100644 --- a/network/spamassassin/slack-desc +++ b/network/spamassassin/slack-desc @@ -13,7 +13,7 @@ spamassassin: of tests to identify unsolicited bulk email, more commonly spamassassin: known as Spam. These tests are applied to email headers and spamassassin: content to classify email using advanced statistical methods. spamassassin: -spamassassin: Homepage: http://spamassassin.apache.org +spamassassin: Homepage: https://spamassassin.apache.org spamassassin: spamassassin: spamassassin: diff --git a/network/spamassassin/spamassassin.SlackBuild b/network/spamassassin/spamassassin.SlackBuild index d17f9d5e45..5b982b084e 100644 --- a/network/spamassassin/spamassassin.SlackBuild +++ b/network/spamassassin/spamassassin.SlackBuild @@ -5,6 +5,8 @@ # Copyright 2008-2015 LukenShiro, Italy # All rights reserved. # +# Maintained by Gerardo Zamudio <gerardo.zamudio@linux.com> +# # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # @@ -26,7 +28,7 @@ # spamassassin database, and most of spamassassin dependencies' scripts. PRGNAM=spamassassin -VERSION=${VERSION:-3.4.1} +VERSION=${VERSION:-3.4.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/spamassassin/spamassassin.info b/network/spamassassin/spamassassin.info index ad427e451f..bfa522dc00 100644 --- a/network/spamassassin/spamassassin.info +++ b/network/spamassassin/spamassassin.info @@ -1,10 +1,10 @@ PRGNAM="spamassassin" -VERSION="3.4.1" -HOMEPAGE="http://spamassassin.apache.org/" -DOWNLOAD="http://www.eu.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2" -MD5SUM="0db5d27d7b782ff5eadee12b95eae84c" +VERSION="3.4.6" +HOMEPAGE="https://spamassassin.apache.org/" +DOWNLOAD="https://downloads.apache.org//spamassassin/source/Mail-SpamAssassin-3.4.6.tar.bz2" +MD5SUM="0ef3f64ffcdf6f1e96068e19a16ce1be" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libwww-perl perl-Crypt-OpenSSL-Bignum perl-Encode-Detect perl-IO-Socket-INET6 perl-IO-Socket-SSL perl-IP-Country perl-Image-Info perl-Mail-DKIM perl-Mail-SPF perl-Net-Ident perl-Net-Server pyzor re2c" -MAINTAINER="LukenShiro" -EMAIL="lukenshiro@ngi.it" +MAINTAINER="Gerardo Zamudio" +EMAIL="gerardo.zamudio@linux.com" diff --git a/network/speedometer/changelog b/network/speedometer/changelog new file mode 100644 index 0000000000..3ab3448f88 --- /dev/null +++ b/network/speedometer/changelog @@ -0,0 +1,153 @@ +speedometer (2.8-3) unstable; urgency=medium + + * New maintainer. (Closes: #920070) + * Switch to Python 3, consequently: + - debian/control: updated dependencies to python3. + - debian/patches/update-to-python3.patch: added to provide + python3 support. (Closes: #943229) + * Using new DH level format. Consequently: + - debian/compat: removed. + - debian/control: Changed from 'debhelper' to 'debhelper-compat' in + Build-Depends field and bumped level to 12. + * debian/control: + - Added the field Rules-Requires-Root: no + - Standards-Version: bumped to 4.4.1 (no changes needed) + - Switch VCS URLs to salsa.debian.org + * debian/copyright: + - Added safe uri (https) to Format. + - Updated years and rights. + * debian/rules: + - Added pybuild support. + - Updated to reduced format. + * debian/salsa-ci.yml: added to provide CI tests for Salsa. + * debian/upstream/metadata: created. + * debian/upstream.changelog: removed, upstream no longer uses hg repo. + * debian/watch: + - migrated to version 4. + - updated to new repository in Github an using new variables. + + + -- Giovani Augusto Ferreira <giovani@debian.org> Tue, 17 Dec 2019 10:43:07 -0300 + +speedometer (2.8-2) unstable; urgency=medium + + * debian/compat + - Updae to 9. + * debian/control + - (Build-Depends): Update to debhelper 9. + - (Homepage): Move field. + - (Standards-Version): Update to 3.9.8. + - (Vcs-*): Update to anonscm.debian.org. + * debian/copyright + - Update URLs. + * debian/pod2man.mk + - Make build reproducible (Closes: 782221). + Patch thanks to Reiner Herrmann <reiner@reiner-h.de>. + + -- Jari Aalto <jari.aalto@cante.net> Wed, 19 Oct 2016 18:25:25 +0300 + +speedometer (2.8-1) unstable; urgency=low + + [Jari Aalto] + * New upstream release + - Linear scale (Closes: #415397). + * debian/copyright + - (Format): Update URL. + * debian/rules + - (get-changelog): Add more commentary. + * debian/upstream.changelog + - Update. + + [tony mancill] + * Add python-setuptools to Build-Depends + + -- Jari Aalto <jari.aalto@cante.net> Fri, 09 Dec 2011 14:30:46 +0200 + +speedometer (2.7-1) unstable; urgency=low + + * New upstream release + - Fix Python 2.5.4 DeprecationWarning: The popen2 module is deprecated + (Closes: #583573). + * debian/compat + - Update to 8. + * debian/control + - (Build-Depends): Update to debhelper 8. + - (Standards-Version): Update to 3.9.2. + * debian/copyright + - Update to DEP5. + - (Files: *): Correct license to LGPL 2.1. + * debian/*.mk + - Minor updates. + * debian/speedometer.1.pod + - (top level): Proper starting comment. + - (DESCRIPTION): Improve documentation to note that + traffic must be generated (Closes: #583576). + - (EXAMPLES): Adjust indentation. + - (SEE ALSO): Add more programs. + - (AUTHORS): Adjust wording. + * debian/rules + - (PKGDIR): New. + - (get-changelog): New. + - Cleanup rules handled by dh(1). + + -- Jari Aalto <jari.aalto@cante.net> Thu, 21 Apr 2011 19:34:18 +0300 + +speedometer (2.6-3) unstable; urgency=low + + * debian/control + - (Depends): Update to python-urwid (>= 0.9.9.1), because (0.9.9) is + not compatible (Closes: #569070). Update to debhelper 7.1 due to + oveerrides in debian/rules + - (Standards-Version): update to 3.8.4. + * debian/rules: + - (binary-indep): Remove unused commands. + - (install): remove target. + - (override_dh_auto_install): New target. + - (.PHONY): cleanup targets. + + -- Jari Aalto <jari.aalto@cante.net> Mon, 22 Feb 2010 16:18:59 +0200 + +speedometer (2.6-2) unstable; urgency=low + + * Move to packaging format: 3.0 (quilt). + * debian/clean + - Move content from 'rules' for dh(1) to use. + * debian/compat + - Update to 7. + * debian/control + - (Build-Depends): update to debhelper 7. + - (Description): convert examples to bullets. + - (Depends): add ${misc:Depends} for debhelper, + add version to dependency python-urwid (>= 0.9.1). + - (Standards-Version): update to 3.8.3 + * debian/copyright + - (GPL): Use FSF URL (FSF recommendation). + * debian/rules + - Remove rules obsoleted by dh(1). + * debian/source/format + - New file. + * debian/speedometer.1 + - Delete file generated from *.pod source (see debian/rules::man). + * debian/speedometer.manpages + - Move content from 'rules' for dh(1) to use. + + -- Jari Aalto <jari.aalto@cante.net> Sat, 19 Dec 2009 13:52:03 +0200 + +speedometer (2.6-1) unstable; urgency=low + + * New upstream version. (Closes: #473420). + * debian/changelog + - Adjust indentation and layout. + - Change time to ISO 8601 notation. + * debian/control + - (Vcs-*): New fields. + - (Homepage): move to separate field. + - (Standards-Version): Update to 3.8.0. + + -- Jari Aalto <jari.aalto@cante.net> Sat, 18 Oct 2008 01:07:47 +0300 + +speedometer (2.4-1) unstable; urgency=low + + * Initial release (Closes: #404671) + + -- Jari Aalto <jari.aalto@cante.net> Sat, 13 Jan 2007 20:34:25 +0200 diff --git a/network/speedometer/speedometer.1.pod b/network/speedometer/speedometer.1.pod new file mode 100644 index 0000000000..7e228f8fae --- /dev/null +++ b/network/speedometer/speedometer.1.pod @@ -0,0 +1,147 @@ +# Copyright +# +# Copyright (C) 2007-2010 Jari Aalto +# +# License +# +# 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, see <http://www.gnu.org/licenses/>. +# +# Description +# +# To learn what TOP LEVEL sections to use in manual pages, +# see POSIX/Susv standard and "Utility Description Defaults" at +# http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap01.html#tag_01_11 +# +# This is manual page in Perl POD format. Read more at +# http://perldoc.perl.org/perlpod.html or run command: +# +# perldoc perlpod | less +# +# To check the syntax: +# +# podchecker *.pod +# +# Create manual page with command: +# +# pod2man PAGE.N.pod > PAGE.N + +=pod + +=head1 NAME + +speedometer - measure and display the rate of data across a network connection + +=head1 SYNOPSIS + + speedometer [options] tap [[-c] tap] ... + +=head1 DESCRIPTION + +Monitor network traffic or speed/progress of a file transfer. At least +one tap option (B<-f>, B<-rx>, B<-tx>) must be entered. Option B<-c> +starts a new column, otherwise taps are piled vertically. + +Note: before you use the program, satrt generating traffic by +transferring files in/out e.g. with scp(1) in the network you're +measuring. + +=head1 OPTIONS + +=over 4 + +=item B<-b> + +Use old blocky display instead of smoothed display even when UTF-8 +encoding is detected. + +=item B<-f filename [size]> + +Display download speed with progress bar. This option must be used if +directly following another file tap without an expected size +specified. + +=item B<-i interval> + +Interval in seconds. Examples: 5 or 0.25". Default is 1. + +=item B<-p> + +Use plain-text display (one tap only). + +=item B<-rx iface> + +Display bytes received on network interface. + +=item B<-tx iface> + +Display bytes transmitted on network interface. + +=item B<-z> + +Report zero size on files that don't exist instead of waiting for them +to be created + +=back + +EXAMPLES + +How long it will take for my 38MB transfer to finish? + + speedometer favorite_episode.rm $(( 38 * 1024 * 1024 )) + +How quickly is another transfer going? + + speedometer dl/big.avi + +How fast is this LAN? + + host-a$ cat /dev/zero | nc -l -p 12345 + host-b$ nc host-a 12345 > /dev/null + host-b$ speedometer -rx eth0 + +How fast is the upstream on this ADSL line? + + speedometer -tx ppp0 + +How fast can I write data to my filesystem? (with at least 1GB free) + + dd bs=1000000 count=1000 if=/dev/zero of=bigfile & + speedometer bigfile + +=head1 ENVIRONMENT + +None. + +=head1 FILES + +None. + +=head1 SEE ALSO + +htop(1) +iotop(1) +scp(1) +top(1) +vmstat(1) + +=head1 AUTHORS + +Program was written by Ian Ward <ian.ward@excess.org> + +This manual page was written by Jari Aalto <jari.aalto@cante.net>. +Released under license GNU GPL version 2 or (at your option) any later +version. For more information about license, visit +<http://www.gnu.org/copyleft/gpl.html>. + +=cut diff --git a/network/speedometer/speedometer.SlackBuild b/network/speedometer/speedometer.SlackBuild index 32b374ea93..9fb3e89275 100644 --- a/network/speedometer/speedometer.SlackBuild +++ b/network/speedometer/speedometer.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for speedometer -# Copyright 2015 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 @@ -24,12 +24,12 @@ PRGNAM=speedometer VERSION=${VERSION:-2.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} 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 +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" @@ -69,15 +69,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 {} \; -python setup.py install --root=$PKG +patch -Np1 < $CWD/update-to-python3.patch +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="CHANGELOG" +# make manpage. +mkdir -p $PKG/usr/man/man1/ +pod2man $CWD/speedometer.1.pod > $PKG/usr/man/man1/speedometer.1 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +install -Dm644 $CWD/changelog $PKG/usr/doc/$PRGNAM-$VERSION/CHANGELOG cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/speedometer/speedometer.info b/network/speedometer/speedometer.info index f99c0b453c..0bcb7a15fd 100644 --- a/network/speedometer/speedometer.info +++ b/network/speedometer/speedometer.info @@ -5,6 +5,6 @@ DOWNLOAD="http://excess.org/speedometer/speedometer-2.8.tar.gz" MD5SUM="aa52b9253117523202d6ec8c110344ef" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="psutil python3-six python3-urwid" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/network/speedometer/update-to-python3.patch b/network/speedometer/update-to-python3.patch new file mode 100644 index 0000000000..dfce959f3b --- /dev/null +++ b/network/speedometer/update-to-python3.patch @@ -0,0 +1,174 @@ +Description: Update upstream source to Python 3. + Based on fixes at https://github.com/kenduest/speedometer/ +Author: Giovani Augusto Ferreira <giovani@debian.org> +Last-Update: 2019-12-08 + +Index: speedometer/speedometer.py +=================================================================== +--- speedometer.orig/speedometer.py ++++ speedometer/speedometer.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # speedometer.py + # Copyright (C) 2001-2011 Ian Ward +@@ -21,6 +21,8 @@ import os + import string + import math + import re ++import psutil ++import six + + __usage__ = """Usage: speedometer [options] tap [[-c] tap]... + Monitor network traffic or speed/progress of a file transfer. At least one +@@ -76,6 +78,10 @@ units_per_second = 'bytes' + chart_minimum = 2**5 + chart_maximum = 2**32 + ++if six.PY3: ++ def long(*args,**kwargs): ++ return int(*args,**kwargs) ++ + graph_scale = None + def update_scale(): + """ +@@ -400,7 +406,8 @@ class SpeedGraph: + self.log = [] + self.bar = [] + +- def get_data(self, (maxcol,maxrow)): ++ def get_data(self, max_col_row): ++ maxcol, maxrow = max_col_row + bar = self.bar[-maxcol:] + if len(bar) < maxcol: + bar = [[0]]*(maxcol-len(bar)) + bar +@@ -409,8 +416,8 @@ class SpeedGraph: + def selectable(self): + return False + +- def render(self, (maxcol, maxrow), focus=False): +- ++ def render(self, max_col_row, focus=False): ++ maxcol, maxrow = max_col_row + left = max(0, len(self.log)-maxcol) + pad = maxcol-(len(self.log)-left) + +@@ -445,8 +452,8 @@ class SpeedGraph: + for i in range(left+max(0, ldist-pad),len(l)-rdist+1): + li = l[i] + if li == 0: continue +- if i and l[i-1]>=li: continue +- if l[i+1]>li: continue ++ if i and l[i-1] != None and l[i-1]>=li: continue ++ if li is None or l[i+1]>li: continue + highs.append((li, -i)) + + highs.sort() +@@ -471,7 +478,7 @@ class SpeedGraph: + + + def speed_scale(s): +- if s <= 0: return 0 ++ if s is None or s <= 0: return 0 + if logarithmic_scale: + s = math.log(s, 2) + s = min(graph_range(), max(0, s-graph_min())) +@@ -498,7 +505,7 @@ def readable_speed(speed): + if speed == None or speed < 0: speed = 0 + + units = "B/s ", "KiB/s", "MiB/s", "GiB/s", "TiB/s" +- step = 1L ++ step = long(1) + + for u in units: + +@@ -511,7 +518,7 @@ def readable_speed(speed): + if speed/step < 1024: + return "%4d " %(speed/step) + u + +- step = step * 1024L ++ step = step * long(1024) + + return "%4d " % (speed/(step/1024)) + units[-1] + +@@ -524,7 +531,7 @@ def readable_speed_bits(speed): + + speed = speed * 8 + units = "b/s ", "Kib/s", "Mib/s", "Gib/s", "Tib/s" +- step = 1L ++ step = long(1) + + for u in units: + +@@ -537,7 +544,7 @@ def readable_speed_bits(speed): + if speed/step < 1024: + return "%4d " %(speed/step) + u + +- step = step * 1024L ++ step = step * long(1024) + + return "%4d " % (speed/(step/1024)) + units[-1] + +@@ -607,18 +614,12 @@ def network_feed(device,rxtx): + r = re.compile(r"^\s*" + re.escape(device) + r":(.*)$", re.MULTILINE) + + def networkfn(devre=r,rxtx=rxtx): +- f = open('/proc/net/dev') +- dev_lines = f.read() +- f.close() +- match = devre.search(dev_lines) +- if not match: +- return None +- +- parts = match.group(1).split() + if rxtx == 'RX': +- return long(parts[0]) ++ val=psutil.net_io_counters(pernic=True)[device].bytes_recv + else: +- return long(parts[8]) ++ val=psutil.net_io_counters(pernic=True)[device].bytes_sent ++ ++ return long(val) + + return networkfn + +@@ -728,7 +729,7 @@ def time_as_units(seconds): + # (multiplicative factor, suffix) + units = (1,"s"), (60,"m"), (60,"h"), (24,"d"), (7,"w"), (52,"y") + +- scale = 1L ++ scale = long(1) + topunit = -1 + # find the top unit to use + for mul, suf in units: +@@ -757,7 +758,7 @@ def readable_time(seconds, columns=None) + for value, suf in time_as_units(seconds): + new_out = out + if out: new_out = new_out + ' ' +- new_out = new_out + `value` + suf ++ new_out = new_out + value + suf + if columns and len(new_out) > columns: break + out = new_out + +@@ -1091,6 +1092,6 @@ def wait_all(cols): + if __name__ == "__main__": + try: + console() +- except KeyboardInterrupt, err: ++ except KeyboardInterrupt as err: + pass + +Index: speedometer/setup.py +=================================================================== +--- speedometer.orig/setup.py ++++ speedometer/setup.py +@@ -35,7 +35,7 @@ setup_d = { + 'scripts': ['speedometer.py'], + 'entry_points': { + 'console_scripts': ['speedometer = speedometer:console'],}, +- 'install_requires': ['urwid >= 0.9.9.1'], ++ 'install_requires': ['urwid >= 0.9.9.1', 'psutil', 'six'], + 'license':"LGPL", + 'keywords':"network bandwidth monitor system speed download file progress console", + 'platforms':"Linux", diff --git a/network/speedtest-cli/README b/network/speedtest-cli/README index 92e211c0de..464b091550 100644 --- a/network/speedtest-cli/README +++ b/network/speedtest-cli/README @@ -1 +1,3 @@ Command line interface for testing internet bandwidth using speedtest.net + +Optional dependency: python3 diff --git a/network/speedtest-cli/speedtest-cli.SlackBuild b/network/speedtest-cli/speedtest-cli.SlackBuild index 917dc63ca4..fc239bbd50 100644 --- a/network/speedtest-cli/speedtest-cli.SlackBuild +++ b/network/speedtest-cli/speedtest-cli.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for speedtest-cli -# Copyright 2014-2019 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,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=speedtest-cli -VERSION=${VERSION:-2.1.2} -BUILD=${BUILD:-1} +VERSION=${VERSION:-2.1.3} +BUILD=${BUILD:-3} 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/network/speedtest-cli/speedtest-cli.info b/network/speedtest-cli/speedtest-cli.info index 2f063b47fe..6f2f9c5567 100644 --- a/network/speedtest-cli/speedtest-cli.info +++ b/network/speedtest-cli/speedtest-cli.info @@ -1,8 +1,8 @@ PRGNAM="speedtest-cli" -VERSION="2.1.2" +VERSION="2.1.3" HOMEPAGE="https://github.com/sivel/speedtest-cli" -DOWNLOAD="https://files.pythonhosted.org/packages/5c/c8/296057f78f16721863f9edb5abdb0d2648c5c6932697f29d80d920fdcd91/speedtest-cli-2.1.2.tar.gz" -MD5SUM="543d38f8939e1716641cc7c00169ca03" +DOWNLOAD="https://files.pythonhosted.org/packages/85/d2/32c8a30768b788d319f94cde3a77e0ccc1812dca464ad8062d3c4d703e06/speedtest-cli-2.1.3.tar.gz" +MD5SUM="4bd1cf455e210ce47be1a3290988160b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/spice/README b/network/spice/README index 33f1c5c341..c8f4286b58 100644 --- a/network/spice/README +++ b/network/spice/README @@ -7,5 +7,5 @@ without compromising on the user experience. libcacard is an optional dependency for virtual smartcard support. -lz4, opus, gst-libav, and gst-plugins-bad (with x264 support) are also +lz4, opus, gst-libav, and gst-plugins-ugly (with x264 support) are also optional dependencies. diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild index 0bfd2b7954..287d9a23cc 100644 --- a/network/sqlmap/sqlmap.SlackBuild +++ b/network/sqlmap/sqlmap.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for sqlmap. # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it> -# 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=sqlmap -VERSION=${VERSION:-1.2.10} +VERSION=${VERSION:-1.4.9} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/sqlmap/sqlmap.info b/network/sqlmap/sqlmap.info index d60732ed67..2d9ff51976 100644 --- a/network/sqlmap/sqlmap.info +++ b/network/sqlmap/sqlmap.info @@ -1,8 +1,8 @@ PRGNAM="sqlmap" -VERSION="1.2.10" +VERSION="1.4.9" HOMEPAGE="http://sqlmap.org/" -DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.2.10/sqlmap-1.2.10.tar.gz" -MD5SUM="55e5aa88807d9ea720edd95792a335a6" +DOWNLOAD="https://github.com/sqlmapproject/sqlmap/archive/1.4.9/sqlmap-1.4.9.tar.gz" +MD5SUM="f79dac9b60f40ccdb4e1a05797b7cdc6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/squid/rc.squid b/network/squid/rc.squid index 7aef4777fe..2f3463e6be 100644 --- a/network/squid/rc.squid +++ b/network/squid/rc.squid @@ -34,7 +34,7 @@ squid_start() { # Create piddir and set proper permissions mkdir -p /var/run/squid - chown root:@SQUIDGROUP@ /var/run/squid + chown @SQUIDUSER@:@SQUIDGROUP@ /var/run/squid echo "Starting Squid: $SQUIDCMD -F" $SQUIDCMD -F diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild index 900d9081c8..2f8ef8fce1 100644 --- a/network/squid/squid.SlackBuild +++ b/network/squid/squid.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=squid -VERSION=${VERSION:-3.5.26} +VERSION=${VERSION:-4.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -68,10 +68,10 @@ 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 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 {} \; OPT_ICAP="" if [ "${ICAP:-no}" = "yes" ]; then @@ -117,26 +117,25 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/* mkdir -p $PKG/etc/rc.d -sed -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new +sed -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," \ + $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new mkdir -p $PKG/etc/logrotate.d -sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \ +sed -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/squid.logrotate \ > $PKG/etc/logrotate.d/squid.new -mv $PKG/etc/squid/mime.conf $PKG/etc/squid/mime.conf.new -mv $PKG/etc/squid/cachemgr.conf $PKG/etc/squid/cachemgr.conf.new -rm $PKG/etc/squid/squid.conf -cat $CWD/squid.conf > $PKG/etc/squid/squid.conf.new -cat $CWD/squid.conf.documented > $PKG/etc/squid/squid.conf.documented +( cd $PKG/etc/squid + for i in mime cachemgr squid ; do mv $i.conf $i.conf.new ; done ) +cp src/squid.conf.documented $PKG/etc/squid/squid.conf.documented mkdir -p $PKG/var/{cache,lib,run}/squid chown $SQUIDUSER:$SQUIDGROUP $PKG/var/{cache,lib,log,run}/squid -## Edit the config file to set the user and group to run as -sed -i -e 's%^cache_effective_user nobody%cache_effective_user '"$SQUIDUSER"'%g' \ - $PKG/etc/squid/squid.conf.new -sed -i -e 's%^cache_effective_group nobody%cache_effective_group '"$SQUIDGROUP"'%g' \ - $PKG/etc/squid/squid.conf.new +# Set a chache dir, the user and group to run as and set the pid location +sed -i "s|^#cache_dir|cache_dir|" $PKG/etc/squid/squid.conf.new +echo -e "\npid_filename /var/run/squid/squid.pid" >> $PKG/etc/squid/squid.conf.new +echo "cache_effective_user $SQUIDUSER" >> $PKG/etc/squid/squid.conf.new +echo "cache_effective_group $SQUIDGROUP" >> $PKG/etc/squid/squid.conf.new mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/squid/squid.conf b/network/squid/squid.conf deleted file mode 100644 index 1e9345bc30..0000000000 --- a/network/squid/squid.conf +++ /dev/null @@ -1,7806 +0,0 @@ -# WELCOME TO SQUID 3.4.10 -# ---------------------------- -# -# This is the documentation for the Squid configuration file. -# This documentation can also be found online at: -# http://www.squid-cache.org/Doc/config/ -# -# You may wish to look at the Squid home page and wiki for the -# FAQ and other documentation: -# http://www.squid-cache.org/ -# http://wiki.squid-cache.org/SquidFaq -# http://wiki.squid-cache.org/ConfigExamples -# -# This documentation shows what the defaults for various directives -# happen to be. If you don't need to change the default, you should -# leave the line out of your squid.conf in most cases. -# -# In some cases "none" refers to no default setting at all, -# while in other cases it refers to the value of the option -# - the comments for that keyword indicate if this is the case. -# - -# Configuration options can be included using the "include" directive. -# Include takes a list of files to include. Quoting and wildcards are -# supported. -# -# For example, -# -# include /path/to/included/file/squid.acl.config -# -# Includes can be nested up to a hard-coded depth of 16 levels. -# This arbitrary restriction is to prevent recursive include references -# from causing Squid entering an infinite loop whilst trying to load -# configuration files. -# -# Values with byte units -# -# Squid accepts size units on some size related directives. All -# such directives are documented with a default value displaying -# a unit. -# -# Units accepted by Squid are: -# bytes - byte -# KB - Kilobyte (1024 bytes) -# MB - Megabyte -# GB - Gigabyte -# -# Values with spaces, quotes, and other special characters -# -# Squid supports directive parameters with spaces, quotes, and other -# special characters. Surround such parameters with "double quotes". Use -# the configuration_includes_quoted_values directive to enable or -# disable that support. -# -# For example; -# -# configuration_includes_quoted_values on -# acl group external groupCheck Administrators "Internet Users" Guest -# configuration_includes_quoted_values off -# -# -# Conditional configuration -# -# If-statements can be used to make configuration directives -# depend on conditions: -# -# if <CONDITION> -# ... regular configuration directives ... -# [else -# ... regular configuration directives ...] -# endif -# -# The else part is optional. The keywords "if", "else", and "endif" -# must be typed on their own lines, as if they were regular -# configuration directives. -# -# NOTE: An else-if condition is not supported. -# -# These individual conditions types are supported: -# -# true -# Always evaluates to true. -# false -# Always evaluates to false. -# <integer> = <integer> -# Equality comparison of two integer numbers. -# -# -# SMP-Related Macros -# -# The following SMP-related preprocessor macros can be used. -# -# ${process_name} expands to the current Squid process "name" -# (e.g., squid1, squid2, or cache1). -# -# ${process_number} expands to the current Squid process -# identifier, which is an integer number (e.g., 1, 2, 3) unique -# across all Squid processes. - -# TAG: broken_vary_encoding -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: cache_vary -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: collapsed_forwarding -# This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495 -#Default: -# none - -# TAG: error_map -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: external_refresh_check -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: location_rewrite_program -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: refresh_stale_hit -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: ignore_ims_on_miss -# Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'. -#Default: -# none - -# TAG: ignore_expect_100 -# Remove this line. The HTTP/1.1 feature is now fully supported by default. -#Default: -# none - -# TAG: dns_v4_fallback -# Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant. -#Default: -# none - -# TAG: ftp_list_width -# Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead. -#Default: -# none - -# TAG: maximum_single_addr_tries -# Replaced by connect_retries. The behaviour has changed, please read the documentation before altering. -#Default: -# none - -# TAG: update_headers -# Remove this line. The feature is supported by default in storage types where update is implemented. -#Default: -# none - -# TAG: url_rewrite_concurrency -# Remove this line. Set the 'concurrency=' option of url_rewrite_children instead. -#Default: -# none - -# TAG: dns_testnames -# Remove this line. DNS is no longer tested on startup. -#Default: -# none - -# TAG: extension_methods -# Remove this line. All valid methods for HTTP are accepted by default. -#Default: -# none - -# TAG: zero_buffers -#Default: -# none - -# TAG: incoming_rate -#Default: -# none - -# TAG: server_http11 -# Remove this line. HTTP/1.1 is supported by default. -#Default: -# none - -# TAG: upgrade_http0.9 -# Remove this line. ICY/1.0 streaming protocol is supported by default. -#Default: -# none - -# TAG: zph_local -# Alter these entries. Use the qos_flows directive instead. -#Default: -# none - -# TAG: header_access -# Since squid-3.0 replace with request_header_access or reply_header_access -# depending on whether you wish to match client requests or server replies. -#Default: -# none - -# TAG: httpd_accel_no_pmtu_disc -# Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead. -#Default: -# none - -# TAG: wais_relay_host -# Replace this line with 'cache_peer' configuration. -#Default: -# none - -# TAG: wais_relay_port -# Replace this line with 'cache_peer' configuration. -#Default: -# none - -# OPTIONS FOR AUTHENTICATION -# ----------------------------------------------------------------------------- - -# TAG: auth_param -# This is used to define parameters for the various authentication -# schemes supported by Squid. -# -# format: auth_param scheme parameter [setting] -# -# The order in which authentication schemes are presented to the client is -# dependent on the order the scheme first appears in config file. IE -# has a bug (it's not RFC 2617 compliant) in that it will use the basic -# scheme if basic is the first entry presented, even if more secure -# schemes are presented. For now use the order in the recommended -# settings section below. If other browsers have difficulties (don't -# recognize the schemes offered even if you are using basic) either -# put basic first, or disable the other schemes (by commenting out their -# program entry). -# -# Once an authentication scheme is fully configured, it can only be -# shutdown by shutting squid down and restarting. Changes can be made on -# the fly and activated with a reconfigure. I.E. You can change to a -# different helper, but not unconfigure the helper completely. -# -# Please note that while this directive defines how Squid processes -# authentication it does not automatically activate authentication. -# To use authentication you must in addition make use of ACLs based -# on login name in http_access (proxy_auth, proxy_auth_regex or -# external with %LOGIN used in the format tag). The browser will be -# challenged for authentication on the first such acl encountered -# in http_access processing and will also be re-challenged for new -# login credentials if the request is being denied by a proxy_auth -# type acl. -# -# WARNING: authentication can't be used in a transparently intercepting -# proxy as the client then thinks it is talking to an origin server and -# not the proxy. This is a limitation of bending the TCP/IP protocol to -# transparently intercepting port 80, not a limitation in Squid. -# Ports flagged 'transparent', 'intercept', or 'tproxy' have -# authentication disabled. -# -# === Parameters for the basic scheme follow. === -# -# "program" cmdline -# Specify the command for the external authenticator. Such a program -# reads a line containing "username password" and replies with one of -# three results: -# -# OK -# the user exists. -# -# ERR -# the user does not exist. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. -# -# "ERR" and "BH" results may optionally be followed by message="..." -# containing a description available as %m in the returned error page. -# -# If you use an authenticator, make sure you have 1 acl of type -# proxy_auth. -# -# By default, the basic authentication scheme is not used unless a -# program is specified. -# -# If you want to use the traditional NCSA proxy authentication, set -# this line to something like -# -# auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd -# -# "utf8" on|off -# HTTP uses iso-latin-1 as character set, while some authentication -# backends such as LDAP expects UTF-8. If this is set to on Squid will -# translate the HTTP iso-latin-1 charset to UTF-8 before sending the -# username & password to the helper. -# -# "children" numberofchildren [startup=N] [idle=N] [concurrency=N] -# The maximum number of authenticator processes to spawn. If you start too few -# Squid will have to wait for them to process a backlog of credential -# verifications, slowing it down. When password verifications are -# done via a (slow) network you are likely to need lots of -# authenticator processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# The concurrency= option sets the number of concurrent requests the -# helper can process. The default of 0 is used for helpers who only -# supports one request at a time. Setting this to a number greater than -# 0 changes the protocol used to include a channel number first on the -# request/response line, allowing multiple requests to be sent to the -# same helper in parallel without waiting for the response. -# Must not be set unless it's known the helper supports this. -# -# auth_param basic children 20 startup=0 idle=1 -# -# "realm" realmstring -# Specifies the realm name which is to be reported to the -# client for the basic proxy authentication scheme (part of -# the text the user will see when prompted their username and -# password). There is no default. -# auth_param basic realm Squid proxy-caching web server -# -# "credentialsttl" timetolive -# Specifies how long squid assumes an externally validated -# username:password pair is valid for - in other words how -# often the helper program is called for that user. Set this -# low to force revalidation with short lived passwords. Note -# setting this high does not impact your susceptibility -# to replay attacks unless you are using an one-time password -# system (such as SecureID). If you are using such a system, -# you will be vulnerable to replay attacks unless you also -# use the max_user_ip ACL in an http_access rule. -# -# "casesensitive" on|off -# Specifies if usernames are case sensitive. Most user databases are -# case insensitive allowing the same username to be spelled using both -# lower and upper case letters, but some are case sensitive. This -# makes a big difference for user_max_ip ACL processing and similar. -# auth_param basic casesensitive off -# -# === Parameters for the digest scheme follow === -# -# "program" cmdline -# Specify the command for the external authenticator. Such -# a program reads a line containing "username":"realm" and -# replies with one of three results: -# -# OK ha1="..." -# the user exists. The ha1= key is mandatory and -# contains the appropriate H(A1) value, hex encoded. -# See rfc 2616 for the definition of H(A1). -# -# ERR -# the user does not exist. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. -# -# "ERR" and "BH" results may optionally be followed by message="..." -# containing a description available as %m in the returned error page. -# -# By default, the digest authentication scheme is not used unless a -# program is specified. -# -# If you want to use a digest authenticator, set this line to -# something like -# -# auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass -# -# "utf8" on|off -# HTTP uses iso-latin-1 as character set, while some authentication -# backends such as LDAP expects UTF-8. If this is set to on Squid will -# translate the HTTP iso-latin-1 charset to UTF-8 before sending the -# username & password to the helper. -# -# "children" numberofchildren [startup=N] [idle=N] [concurrency=N] -# The maximum number of authenticator processes to spawn (default 5). -# If you start too few Squid will have to wait for them to -# process a backlog of H(A1) calculations, slowing it down. -# When the H(A1) calculations are done via a (slow) network -# you are likely to need lots of authenticator processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# The concurrency= option sets the number of concurrent requests the -# helper can process. The default of 0 is used for helpers who only -# supports one request at a time. Setting this to a number greater than -# 0 changes the protocol used to include a channel number first on the -# request/response line, allowing multiple requests to be sent to the -# same helper in parallel without waiting for the response. -# Must not be set unless it's known the helper supports this. -# -# auth_param digest children 20 startup=0 idle=1 -# -# "realm" realmstring -# Specifies the realm name which is to be reported to the -# client for the digest proxy authentication scheme (part of -# the text the user will see when prompted their username and -# password). There is no default. -# auth_param digest realm Squid proxy-caching web server -# -# "nonce_garbage_interval" timeinterval -# Specifies the interval that nonces that have been issued -# to client_agent's are checked for validity. -# -# "nonce_max_duration" timeinterval -# Specifies the maximum length of time a given nonce will be -# valid for. -# -# "nonce_max_count" number -# Specifies the maximum number of times a given nonce can be -# used. -# -# "nonce_strictness" on|off -# Determines if squid requires strict increment-by-1 behavior -# for nonce counts, or just incrementing (off - for use when -# user agents generate nonce counts that occasionally miss 1 -# (ie, 1,2,4,6)). Default off. -# -# "check_nonce_count" on|off -# This directive if set to off can disable the nonce count check -# completely to work around buggy digest qop implementations in -# certain mainstream browser versions. Default on to check the -# nonce count to protect from authentication replay attacks. -# -# "post_workaround" on|off -# This is a workaround to certain buggy browsers who sends -# an incorrect request digest in POST requests when reusing -# the same nonce as acquired earlier on a GET request. -# -# === NTLM scheme options follow === -# -# "program" cmdline -# Specify the command for the external NTLM authenticator. -# Such a program reads exchanged NTLMSSP packets with -# the browser via Squid until authentication is completed. -# If you use an NTLM authenticator, make sure you have 1 acl -# of type proxy_auth. By default, the NTLM authenticator program -# is not used. -# -# auth_param ntlm program /usr/bin/ntlm_auth -# -# "children" numberofchildren [startup=N] [idle=N] -# The maximum number of authenticator processes to spawn (default 5). -# If you start too few Squid will have to wait for them to -# process a backlog of credential verifications, slowing it -# down. When credential verifications are done via a (slow) -# network you are likely to need lots of authenticator -# processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# auth_param ntlm children 20 startup=0 idle=1 -# -# "keep_alive" on|off -# If you experience problems with PUT/POST requests when using the -# Negotiate authentication scheme then you can try setting this to -# off. This will cause Squid to forcibly close the connection on -# the initial requests where the browser asks which schemes are -# supported by the proxy. -# -# auth_param ntlm keep_alive on -# -# === Options for configuring the NEGOTIATE auth-scheme follow === -# -# "program" cmdline -# Specify the command for the external Negotiate authenticator. -# This protocol is used in Microsoft Active-Directory enabled setups with -# the Microsoft Internet Explorer or Mozilla Firefox browsers. -# Its main purpose is to exchange credentials with the Squid proxy -# using the Kerberos mechanisms. -# If you use a Negotiate authenticator, make sure you have at least -# one acl of type proxy_auth active. By default, the negotiate -# authenticator program is not used. -# The only supported program for this role is the ntlm_auth -# program distributed as part of Samba, version 4 or later. -# -# auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego -# -# "children" numberofchildren [startup=N] [idle=N] -# The maximum number of authenticator processes to spawn (default 5). -# If you start too few Squid will have to wait for them to -# process a backlog of credential verifications, slowing it -# down. When credential verifications are done via a (slow) -# network you are likely to need lots of authenticator -# processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# auth_param negotiate children 20 startup=0 idle=1 -# -# "keep_alive" on|off -# If you experience problems with PUT/POST requests when using the -# Negotiate authentication scheme then you can try setting this to -# off. This will cause Squid to forcibly close the connection on -# the initial requests where the browser asks which schemes are -# supported by the proxy. -# -# auth_param negotiate keep_alive on -# -# -# Examples: -# -##Recommended minimum configuration per scheme: -##auth_param negotiate program <uncomment and complete this line to activate> -##auth_param negotiate children 20 startup=0 idle=1 -##auth_param negotiate keep_alive on -## -##auth_param ntlm program <uncomment and complete this line to activate> -##auth_param ntlm children 20 startup=0 idle=1 -##auth_param ntlm keep_alive on -## -##auth_param digest program <uncomment and complete this line> -##auth_param digest children 20 startup=0 idle=1 -##auth_param digest realm Squid proxy-caching web server -##auth_param digest nonce_garbage_interval 5 minutes -##auth_param digest nonce_max_duration 30 minutes -##auth_param digest nonce_max_count 50 -## -##auth_param basic program <uncomment and complete this line> -##auth_param basic children 5 startup=5 idle=1 -##auth_param basic realm Squid proxy-caching web server -##auth_param basic credentialsttl 2 hours -#Default: -# none - -# TAG: authenticate_cache_garbage_interval -# The time period between garbage collection across the username cache. -# This is a trade-off between memory utilization (long intervals - say -# 2 days) and CPU (short intervals - say 1 minute). Only change if you -# have good reason to. -#Default: -# authenticate_cache_garbage_interval 1 hour - -# TAG: authenticate_ttl -# The time a user & their credentials stay in the logged in -# user cache since their last request. When the garbage -# interval passes, all user credentials that have passed their -# TTL are removed from memory. -#Default: -# authenticate_ttl 1 hour - -# TAG: authenticate_ip_ttl -# If you use proxy authentication and the 'max_user_ip' ACL, -# this directive controls how long Squid remembers the IP -# addresses associated with each user. Use a small value -# (e.g., 60 seconds) if your users might change addresses -# quickly, as is the case with dialup. You might be safe -# using a larger value (e.g., 2 hours) in a corporate LAN -# environment with relatively static address assignments. -#Default: -# authenticate_ip_ttl 1 second - -# ACCESS CONTROLS -# ----------------------------------------------------------------------------- - -# TAG: external_acl_type -# This option defines external acl classes using a helper program -# to look up the status -# -# external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..] -# -# Options: -# -# ttl=n TTL in seconds for cached results (defaults to 3600 -# for 1 hour) -# -# negative_ttl=n -# TTL for cached negative lookups (default same -# as ttl) -# -# grace=n Percentage remaining of TTL where a refresh of a -# cached entry should be initiated without needing to -# wait for a new reply. (default is for no grace period) -# -# cache=n Limit the result cache size, default is 262144. -# The expanded FORMAT value is used as the cache key, so -# if the details in FORMAT are highly variable a larger -# cache may be needed to produce reduction in helper load. -# -# children-max=n -# Maximum number of acl helper processes spawned to service -# external acl lookups of this type. (default 20) -# -# children-startup=n -# Minimum number of acl helper processes to spawn during -# startup and reconfigure to service external acl lookups -# of this type. (default 0) -# -# children-idle=n -# Number of acl helper processes to keep ahead of traffic -# loads. Squid will spawn this many at once whenever load -# rises above the capabilities of existing processes. -# Up to the value of children-max. (default 1) -# -# concurrency=n concurrency level per process. Only used with helpers -# capable of processing more than one query at a time. -# -# protocol=2.5 Compatibility mode for Squid-2.5 external acl helpers. -# -# ipv4 / ipv6 IP protocol used to communicate with this helper. -# The default is to auto-detect IPv6 and use it when available. -# -# -# FORMAT specifications -# -# %LOGIN Authenticated user login name -# %EXT_USER Username from previous external acl -# %EXT_LOG Log details from previous external acl -# %EXT_TAG Tag from previous external acl -# %IDENT Ident user name -# %SRC Client IP -# %SRCPORT Client source port -# %URI Requested URI -# %DST Requested host -# %PROTO Requested protocol -# %PORT Requested port -# %PATH Requested URL path -# %METHOD Request method -# %MYADDR Squid interface address -# %MYPORT Squid http_port number -# %PATH Requested URL-path (including query-string if any) -# %USER_CERT SSL User certificate in PEM format -# %USER_CERTCHAIN SSL User certificate chain in PEM format -# %USER_CERT_xx SSL User certificate subject attribute xx -# %USER_CA_CERT_xx SSL User certificate issuer attribute xx -# -# %>{Header} HTTP request header "Header" -# %>{Hdr:member} -# HTTP request header "Hdr" list member "member" -# %>{Hdr:;member} -# HTTP request header list member using ; as -# list separator. ; can be any non-alphanumeric -# character. -# -# %<{Header} HTTP reply header "Header" -# %<{Hdr:member} -# HTTP reply header "Hdr" list member "member" -# %<{Hdr:;member} -# HTTP reply header list member using ; as -# list separator. ; can be any non-alphanumeric -# character. -# -# %ACL The name of the ACL being tested. -# %DATA The ACL arguments. If not used then any arguments -# is automatically added at the end of the line -# sent to the helper. -# NOTE: this will encode the arguments as one token, -# whereas the default will pass each separately. -# -# %% The percent sign. Useful for helpers which need -# an unchanging input format. -# -# -# General request syntax: -# -# [channel-ID] FORMAT-values [acl-values ...] -# -# -# FORMAT-values consists of transaction details expanded with -# whitespace separation per the config file FORMAT specification -# using the FORMAT macros listed above. -# -# acl-values consists of any string specified in the referencing -# config 'acl ... external' line. see the "acl external" directive. -# -# Request values sent to the helper are URL escaped to protect -# each value in requests against whitespaces. -# -# If using protocol=2.5 then the request sent to the helper is not -# URL escaped to protect against whitespace. -# -# NOTE: protocol=3.0 is deprecated as no longer necessary. -# -# When using the concurrency= option the protocol is changed by -# introducing a query channel tag in front of the request/response. -# The query channel tag is a number between 0 and concurrency-1. -# This value must be echoed back unchanged to Squid as the first part -# of the response relating to its request. -# -# -# The helper receives lines expanded per the above format specification -# and for each input line returns 1 line starting with OK/ERR/BH result -# code and optionally followed by additional keywords with more details. -# -# -# General result syntax: -# -# [channel-ID] result keyword=value ... -# -# Result consists of one of the codes: -# -# OK -# the ACL test produced a match. -# -# ERR -# the ACL test does not produce a match. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. -# -# The meaning of 'a match' is determined by your squid.conf -# access control configuration. See the Squid wiki for details. -# -# Defined keywords: -# -# user= The users name (login) -# -# password= The users password (for login= cache_peer option) -# -# message= Message describing the reason for this response. -# Available as %o in error pages. -# Useful on (ERR and BH results). -# -# tag= Apply a tag to a request. Only sets a tag once, -# does not alter existing tags. -# -# log= String to be logged in access.log. Available as -# %ea in logformat specifications. -# -# Any keywords may be sent on any response whether OK, ERR or BH. -# -# All response keyword values need to be a single token with URL -# escaping, or enclosed in double quotes (") and escaped using \ on -# any double quotes or \ characters within the value. The wrapping -# double quotes are removed before the value is interpreted by Squid. -# \r and \n are also replace by CR and LF. -# -# Some example key values: -# -# user=John%20Smith -# user="John Smith" -# user="J. \"Bob\" Smith" -#Default: -# none - -# TAG: acl -# Defining an Access List -# -# Every access list definition must begin with an aclname and acltype, -# followed by either type-specific arguments or a quoted filename that -# they are read from. -# -# acl aclname acltype argument ... -# acl aclname acltype "file" ... -# -# When using "file", the file should contain one item per line. -# -# Some acl types supports options which changes their default behaviour. -# The available options are: -# -# -i,+i By default, regular expressions are CASE-SENSITIVE. To make them -# case-insensitive, use the -i option. To return case-sensitive -# use the +i option between patterns, or make a new ACL line -# without -i. -# -# -n Disable lookups and address type conversions. If lookup or -# conversion is required because the parameter type (IP or -# domain name) does not match the message address type (domain -# name or IP), then the ACL would immediately declare a mismatch -# without any warnings or lookups. -# -# -- Used to stop processing all options, in the case the first acl -# value has '-' character as first character (for example the '-' -# is a valid domain name) -# -# Some acl types require suspending the current request in order -# to access some external data source. -# Those which do are marked with the tag [slow], those which -# don't are marked as [fast]. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl -# for further information -# -# ***** ACL TYPES AVAILABLE ***** -# -# acl aclname src ip-address/mask ... # clients IP address [fast] -# acl aclname src addr1-addr2/mask ... # range of addresses [fast] -# acl aclname dst [-n] ip-address/mask ... # URL host's IP address [slow] -# acl aclname localip ip-address/mask ... # IP address the client connected to [fast] -# -# acl aclname arp mac-address ... (xx:xx:xx:xx:xx:xx notation) -# # The arp ACL requires the special configure option --enable-arp-acl. -# # Furthermore, the ARP ACL code is not portable to all operating systems. -# # It works on Linux, Solaris, Windows, FreeBSD, and some -# # other *BSD variants. -# # [fast] -# # -# # NOTE: Squid can only determine the MAC address for clients that are on -# # the same subnet. If the client is on a different subnet, -# # then Squid cannot find out its MAC address. -# -# acl aclname srcdomain .foo.com ... -# # reverse lookup, from client IP [slow] -# acl aclname dstdomain [-n] .foo.com ... -# # Destination server from URL [fast] -# acl aclname srcdom_regex [-i] \.foo\.com ... -# # regex matching client name [slow] -# acl aclname dstdom_regex [-n] [-i] \.foo\.com ... -# # regex matching server [fast] -# # -# # For dstdomain and dstdom_regex a reverse lookup is tried if a IP -# # based URL is used and no match is found. The name "none" is used -# # if the reverse lookup fails. -# -# acl aclname src_as number ... -# acl aclname dst_as number ... -# # [fast] -# # Except for access control, AS numbers can be used for -# # routing of requests to specific caches. Here's an -# # example for routing all requests for AS#1241 and only -# # those to mycache.mydomain.net: -# # acl asexample dst_as 1241 -# # cache_peer_access mycache.mydomain.net allow asexample -# # cache_peer_access mycache_mydomain.net deny all -# -# acl aclname peername myPeer ... -# # [fast] -# # match against a named cache_peer entry -# # set unique name= on cache_peer lines for reliable use. -# -# acl aclname time [day-abbrevs] [h1:m1-h2:m2] -# # [fast] -# # day-abbrevs: -# # S - Sunday -# # M - Monday -# # T - Tuesday -# # W - Wednesday -# # H - Thursday -# # F - Friday -# # A - Saturday -# # h1:m1 must be less than h2:m2 -# -# acl aclname url_regex [-i] ^http:// ... -# # regex matching on whole URL [fast] -# acl aclname urllogin [-i] [^a-zA-Z0-9] ... -# # regex matching on URL login field -# acl aclname urlpath_regex [-i] \.gif$ ... -# # regex matching on URL path [fast] -# -# acl aclname port 80 70 21 0-1024... # destination TCP port [fast] -# # ranges are alloed -# acl aclname localport 3128 ... # TCP port the client connected to [fast] -# # NP: for interception mode this is usually '80' -# -# acl aclname myportname 3128 ... # http(s)_port name [fast] -# -# acl aclname proto HTTP FTP ... # request protocol [fast] -# -# acl aclname method GET POST ... # HTTP request method [fast] -# -# acl aclname http_status 200 301 500- 400-403 ... -# # status code in reply [fast] -# -# acl aclname browser [-i] regexp ... -# # pattern match on User-Agent header (see also req_header below) [fast] -# -# acl aclname referer_regex [-i] regexp ... -# # pattern match on Referer header [fast] -# # Referer is highly unreliable, so use with care -# -# acl aclname ident username ... -# acl aclname ident_regex [-i] pattern ... -# # string match on ident output [slow] -# # use REQUIRED to accept any non-null ident. -# -# acl aclname proxy_auth [-i] username ... -# acl aclname proxy_auth_regex [-i] pattern ... -# # perform http authentication challenge to the client and match against -# # supplied credentials [slow] -# # -# # takes a list of allowed usernames. -# # use REQUIRED to accept any valid username. -# # -# # Will use proxy authentication in forward-proxy scenarios, and plain -# # http authenticaiton in reverse-proxy scenarios -# # -# # NOTE: when a Proxy-Authentication header is sent but it is not -# # needed during ACL checking the username is NOT logged -# # in access.log. -# # -# # NOTE: proxy_auth requires a EXTERNAL authentication program -# # to check username/password combinations (see -# # auth_param directive). -# # -# # NOTE: proxy_auth can't be used in a transparent/intercepting proxy -# # as the browser needs to be configured for using a proxy in order -# # to respond to proxy authentication. -# -# acl aclname snmp_community string ... -# # A community string to limit access to your SNMP Agent [fast] -# # Example: -# # -# # acl snmppublic snmp_community public -# -# acl aclname maxconn number -# # This will be matched when the client's IP address has -# # more than <number> TCP connections established. [fast] -# # NOTE: This only measures direct TCP links so X-Forwarded-For -# # indirect clients are not counted. -# -# acl aclname max_user_ip [-s] number -# # This will be matched when the user attempts to log in from more -# # than <number> different ip addresses. The authenticate_ip_ttl -# # parameter controls the timeout on the ip entries. [fast] -# # If -s is specified the limit is strict, denying browsing -# # from any further IP addresses until the ttl has expired. Without -# # -s Squid will just annoy the user by "randomly" denying requests. -# # (the counter is reset each time the limit is reached and a -# # request is denied) -# # NOTE: in acceleration mode or where there is mesh of child proxies, -# # clients may appear to come from multiple addresses if they are -# # going through proxy farms, so a limit of 1 may cause user problems. -# -# acl aclname random probability -# # Pseudo-randomly match requests. Based on the probability given. -# # Probability may be written as a decimal (0.333), fraction (1/3) -# # or ratio of matches:non-matches (3:5). -# -# acl aclname req_mime_type [-i] mime-type ... -# # regex match against the mime type of the request generated -# # by the client. Can be used to detect file upload or some -# # types HTTP tunneling requests [fast] -# # NOTE: This does NOT match the reply. You cannot use this -# # to match the returned file type. -# -# acl aclname req_header header-name [-i] any\.regex\.here -# # regex match against any of the known request headers. May be -# # thought of as a superset of "browser", "referer" and "mime-type" -# # ACL [fast] -# -# acl aclname rep_mime_type [-i] mime-type ... -# # regex match against the mime type of the reply received by -# # squid. Can be used to detect file download or some -# # types HTTP tunneling requests. [fast] -# # NOTE: This has no effect in http_access rules. It only has -# # effect in rules that affect the reply data stream such as -# # http_reply_access. -# -# acl aclname rep_header header-name [-i] any\.regex\.here -# # regex match against any of the known reply headers. May be -# # thought of as a superset of "browser", "referer" and "mime-type" -# # ACLs [fast] -# -# acl aclname external class_name [arguments...] -# # external ACL lookup via a helper class defined by the -# # external_acl_type directive [slow] -# -# acl aclname user_cert attribute values... -# # match against attributes in a user SSL certificate -# # attribute is one of DN/C/O/CN/L/ST [fast] -# -# acl aclname ca_cert attribute values... -# # match against attributes a users issuing CA SSL certificate -# # attribute is one of DN/C/O/CN/L/ST [fast] -# -# acl aclname ext_user username ... -# acl aclname ext_user_regex [-i] pattern ... -# # string match on username returned by external acl helper [slow] -# # use REQUIRED to accept any non-null user name. -# -# acl aclname tag tagvalue ... -# # string match on tag returned by external acl helper [slow] -# -# acl aclname hier_code codename ... -# # string match against squid hierarchy code(s); [fast] -# # e.g., DIRECT, PARENT_HIT, NONE, etc. -# # -# # NOTE: This has no effect in http_access rules. It only has -# # effect in rules that affect the reply data stream such as -# # http_reply_access. -# -# acl aclname note name [value ...] -# # match transaction annotation [fast] -# # Without values, matches any annotation with a given name. -# # With value(s), matches any annotation with a given name that -# # also has one of the given values. -# # Names and values are compared using a string equality test. -# # Annotation sources include note and adaptation_meta directives -# # as well as helper and eCAP responses. -# -# acl aclname any-of acl1 acl2 ... -# # match any one of the acls [fast or slow] -# # The first matching ACL stops further ACL evaluation. -# # -# # ACLs from multiple any-of lines with the same name are ORed. -# # For example, A = (a1 or a2) or (a3 or a4) can be written as -# # acl A any-of a1 a2 -# # acl A any-of a3 a4 -# # -# # This group ACL is fast if all evaluated ACLs in the group are fast -# # and slow otherwise. -# -# acl aclname all-of acl1 acl2 ... -# # match all of the acls [fast or slow] -# # The first mismatching ACL stops further ACL evaluation. -# # -# # ACLs from multiple all-of lines with the same name are ORed. -# # For example, B = (b1 and b2) or (b3 and b4) can be written as -# # acl B all-of b1 b2 -# # acl B all-of b3 b4 -# # -# # This group ACL is fast if all evaluated ACLs in the group are fast -# # and slow otherwise. -# -# Examples: -# acl macaddress arp 09:00:2b:23:45:67 -# acl myexample dst_as 1241 -# acl password proxy_auth REQUIRED -# acl fileupload req_mime_type -i ^multipart/form-data$ -# acl javascript rep_mime_type -i ^application/x-javascript$ -# -#Default: -# ACLs all, manager, localhost, and to_localhost are predefined. -# -# -# Recommended minimum configuration: -# - -# Example rule allowing access from your local networks. -# Adapt to list your (internal) IP networks from where browsing -# should be allowed -acl localnet src 10.0.0.0/8 # RFC1918 possible internal network -acl localnet src 172.16.0.0/12 # RFC1918 possible internal network -acl localnet src 192.168.0.0/16 # RFC1918 possible internal network -acl localnet src fc00::/7 # RFC 4193 local private network range -acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines - -acl SSL_ports port 443 -acl Safe_ports port 80 # http -acl Safe_ports port 21 # ftp -acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher -acl Safe_ports port 210 # wais -acl Safe_ports port 1025-65535 # unregistered ports -acl Safe_ports port 280 # http-mgmt -acl Safe_ports port 488 # gss-http -acl Safe_ports port 591 # filemaker -acl Safe_ports port 777 # multiling http -acl CONNECT method CONNECT - -# TAG: follow_x_forwarded_for -# Allowing or Denying the X-Forwarded-For header to be followed to -# find the original source of a request. -# -# Requests may pass through a chain of several other proxies -# before reaching us. The X-Forwarded-For header will contain a -# comma-separated list of the IP addresses in the chain, with the -# rightmost address being the most recent. -# -# If a request reaches us from a source that is allowed by this -# configuration item, then we consult the X-Forwarded-For header -# to see where that host received the request from. If the -# X-Forwarded-For header contains multiple addresses, we continue -# backtracking until we reach an address for which we are not allowed -# to follow the X-Forwarded-For header, or until we reach the first -# address in the list. For the purpose of ACL used in the -# follow_x_forwarded_for directive the src ACL type always matches -# the address we are testing and srcdomain matches its rDNS. -# -# The end result of this process is an IP address that we will -# refer to as the indirect client address. This address may -# be treated as the client address for access control, ICAP, delay -# pools and logging, depending on the acl_uses_indirect_client, -# icap_uses_indirect_client, delay_pool_uses_indirect_client, -# log_uses_indirect_client and tproxy_uses_indirect_client options. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -# SECURITY CONSIDERATIONS: -# -# Any host for which we follow the X-Forwarded-For header -# can place incorrect information in the header, and Squid -# will use the incorrect information as if it were the -# source address of the request. This may enable remote -# hosts to bypass any access control restrictions that are -# based on the client's source addresses. -# -# For example: -# -# acl localhost src 127.0.0.1 -# acl my_other_proxy srcdomain .proxy.example.com -# follow_x_forwarded_for allow localhost -# follow_x_forwarded_for allow my_other_proxy -#Default: -# X-Forwarded-For header will be ignored. - -# TAG: acl_uses_indirect_client on|off -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in acl matching. -# -# NOTE: maxconn ACL considers direct TCP links and indirect -# clients will always have zero. So no match. -#Default: -# acl_uses_indirect_client on - -# TAG: delay_pool_uses_indirect_client on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-follow-x-forwarded-for and --enable-delay-pools -# -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in delay pools. -#Default: -# delay_pool_uses_indirect_client on - -# TAG: log_uses_indirect_client on|off -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in the access log. -#Default: -# log_uses_indirect_client on - -# TAG: tproxy_uses_indirect_client on|off -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address when spoofing the outgoing client. -# -# This has no effect on requests arriving in non-tproxy -# mode ports. -# -# SECURITY WARNING: Usage of this option is dangerous -# and should not be used trivially. Correct configuration -# of follow_x_forewarded_for with a limited set of trusted -# sources is required to prevent abuse of your proxy. -#Default: -# tproxy_uses_indirect_client off - -# TAG: spoof_client_ip -# Control client IP address spoofing of TPROXY traffic based on -# defined access lists. -# -# spoof_client_ip allow|deny [!]aclname ... -# -# If there are no "spoof_client_ip" lines present, the default -# is to "allow" spoofing of any suitable request. -# -# Note that the cache_peer "no-tproxy" option overrides this ACL. -# -# This clause supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow spoofing on all TPROXY traffic. - -# TAG: http_access -# Allowing or Denying access based on defined access lists -# -# Access to the HTTP port: -# http_access allow|deny [!]aclname ... -# -# NOTE on default values: -# -# If there are no "access" lines present, the default is to deny -# the request. -# -# If none of the "access" lines cause a match, the default is the -# opposite of the last line in the list. If the last line was -# deny, the default is allow. Conversely, if the last line -# is allow, the default will be deny. For these reasons, it is a -# good idea to have an "deny all" entry at the end of your access -# lists to avoid potential confusion. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -#Default: -# Deny, unless rules exist in squid.conf. -# - -# -# Recommended minimum Access Permission configuration: -# -# Deny requests to certain unsafe ports -http_access deny !Safe_ports - -# Deny CONNECT to other than secure SSL ports -http_access deny CONNECT !SSL_ports - -# Only allow cachemgr access from localhost -http_access allow localhost manager -http_access deny manager - -# We strongly recommend the following be uncommented to protect innocent -# web applications running on the proxy server who think the only -# one who can access services on "localhost" is a local user -#http_access deny to_localhost - -# -# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS -# - -# Example rule allowing access from your local networks. -# Adapt localnet in the ACL section to list your (internal) IP networks -# from where browsing should be allowed -http_access allow localnet -http_access allow localhost - -# And finally deny all other access to this proxy -http_access deny all - -# TAG: adapted_http_access -# Allowing or Denying access based on defined access lists -# -# Essentially identical to http_access, but runs after redirectors -# and ICAP/eCAP adaptation. Allowing access control based on their -# output. -# -# If not set then only http_access is used. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: http_reply_access -# Allow replies to client requests. This is complementary to http_access. -# -# http_reply_access allow|deny [!] aclname ... -# -# NOTE: if there are no access lines present, the default is to allow -# all replies. -# -# If none of the access lines cause a match the opposite of the -# last line will apply. Thus it is good practice to end the rules -# with an "allow all" or "deny all" entry. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: icp_access -# Allowing or Denying access to the ICP port based on defined -# access lists -# -# icp_access allow|deny [!]aclname ... -# -# NOTE: The default if no icp_access lines are present is to -# deny all traffic. This default may cause problems with peers -# using ICP. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -## Allow ICP queries from local networks only -##icp_access allow localnet -##icp_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: htcp_access -# Allowing or Denying access to the HTCP port based on defined -# access lists -# -# htcp_access allow|deny [!]aclname ... -# -# See also htcp_clr_access for details on access control for -# cache purge (CLR) HTCP messages. -# -# NOTE: The default if no htcp_access lines are present is to -# deny all traffic. This default may cause problems with peers -# using the htcp option. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -## Allow HTCP queries from local networks only -##htcp_access allow localnet -##htcp_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: htcp_clr_access -# Allowing or Denying access to purge content using HTCP based -# on defined access lists. -# See htcp_access for details on general HTCP access control. -# -# htcp_clr_access allow|deny [!]aclname ... -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -## Allow HTCP CLR requests from trusted peers -#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2 -#htcp_clr_access allow htcp_clr_peer -#htcp_clr_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: miss_access -# Determins whether network access is permitted when satisfying a request. -# -# For example; -# to force your neighbors to use you as a sibling instead of -# a parent. -# -# acl localclients src 192.0.2.0/24 2001:DB8::a:0/64 -# miss_access deny !localclients -# miss_access allow all -# -# This means only your local clients are allowed to fetch relayed/MISS -# replies from the network and all other clients can only fetch cached -# objects (HITs). -# -# The default for this setting allows all clients who passed the -# http_access rules to relay via this proxy. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: ident_lookup_access -# A list of ACL elements which, if matched, cause an ident -# (RFC 931) lookup to be performed for this request. For -# example, you might choose to always perform ident lookups -# for your main multi-user Unix boxes, but not for your Macs -# and PCs. By default, ident lookups are not performed for -# any requests. -# -# To enable ident lookups for specific client addresses, you -# can follow this example: -# -# acl ident_aware_hosts src 198.168.1.0/24 -# ident_lookup_access allow ident_aware_hosts -# ident_lookup_access deny all -# -# Only src type ACL checks are fully supported. A srcdomain -# ACL might work at times, but it will not always provide -# the correct result. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Unless rules exist in squid.conf, IDENT is not fetched. - -# TAG: reply_body_max_size size [acl acl...] -# This option specifies the maximum size of a reply body. It can be -# used to prevent users from downloading very large files, such as -# MP3's and movies. When the reply headers are received, the -# reply_body_max_size lines are processed, and the first line where -# all (if any) listed ACLs are true is used as the maximum body size -# for this reply. -# -# This size is checked twice. First when we get the reply headers, -# we check the content-length value. If the content length value exists -# and is larger than the allowed size, the request is denied and the -# user receives an error message that says "the request or reply -# is too large." If there is no content-length, and the reply -# size exceeds this limit, the client's connection is just closed -# and they will receive a partial reply. -# -# WARNING: downstream caches probably can not detect a partial reply -# if there is no content-length header, so they will cache -# partial responses and give them out as hits. You should NOT -# use this option if you have downstream caches. -# -# WARNING: A maximum size smaller than the size of squid's error messages -# will cause an infinite loop and crash squid. Ensure that the smallest -# non-zero value you use is greater that the maximum header size plus -# the size of your largest error page. -# -# If you set this parameter none (the default), there will be -# no limit imposed. -# -# Configuration Format is: -# reply_body_max_size SIZE UNITS [acl ...] -# ie. -# reply_body_max_size 10 MB -# -#Default: -# No limit is applied. - -# NETWORK OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: http_port -# Usage: port [mode] [options] -# hostname:port [mode] [options] -# 1.2.3.4:port [mode] [options] -# -# The socket addresses where Squid will listen for HTTP client -# requests. You may specify multiple socket addresses. -# There are three forms: port alone, hostname with port, and -# IP address with port. If you specify a hostname or IP -# address, Squid binds the socket to that specific -# address. Most likely, you do not need to bind to a specific -# address, so you can use the port number alone. -# -# If you are running Squid in accelerator mode, you -# probably want to listen on port 80 also, or instead. -# -# The -a command line option may be used to specify additional -# port(s) where Squid listens for proxy request. Such ports will -# be plain proxy ports with no options. -# -# You may specify multiple socket addresses on multiple lines. -# -# Modes: -# -# intercept Support for IP-Layer interception of -# outgoing requests without browser settings. -# NP: disables authentication and IPv6 on the port. -# -# tproxy Support Linux TPROXY for spoofing outgoing -# connections using the client IP address. -# NP: disables authentication and maybe IPv6 on the port. -# -# accel Accelerator / reverse proxy mode -# -# ssl-bump For each CONNECT request allowed by ssl_bump ACLs, -# establish secure connection with the client and with -# the server, decrypt HTTPS messages as they pass through -# Squid, and treat them as unencrypted HTTP messages, -# becoming the man-in-the-middle. -# -# The ssl_bump option is required to fully enable -# bumping of CONNECT requests. -# -# Omitting the mode flag causes default forward proxy mode to be used. -# -# -# Accelerator Mode Options: -# -# defaultsite=domainname -# What to use for the Host: header if it is not present -# in a request. Determines what site (not origin server) -# accelerators should consider the default. -# -# no-vhost Disable using HTTP/1.1 Host header for virtual domain support. -# -# protocol= Protocol to reconstruct accelerated requests with. -# Defaults to http for http_port and https for -# https_port -# -# vport Virtual host port support. Using the http_port number -# instead of the port passed on Host: headers. -# -# vport=NN Virtual host port support. Using the specified port -# number instead of the port passed on Host: headers. -# -# act-as-origin -# Act as if this Squid is the origin server. -# This currently means generate new Date: and Expires: -# headers on HIT instead of adding Age:. -# -# ignore-cc Ignore request Cache-Control headers. -# -# WARNING: This option violates HTTP specifications if -# used in non-accelerator setups. -# -# allow-direct Allow direct forwarding in accelerator mode. Normally -# accelerated requests are denied direct forwarding as if -# never_direct was used. -# -# WARNING: this option opens accelerator mode to security -# vulnerabilities usually only affecting in interception -# mode. Make sure to protect forwarding with suitable -# http_access rules when using this. -# -# -# SSL Bump Mode Options: -# In addition to these options ssl-bump requires TLS/SSL options. -# -# generate-host-certificates[=<on|off>] -# Dynamically create SSL server certificates for the -# destination hosts of bumped CONNECT requests.When -# enabled, the cert and key options are used to sign -# generated certificates. Otherwise generated -# certificate will be selfsigned. -# If there is a CA certificate lifetime of the generated -# certificate equals lifetime of the CA certificate. If -# generated certificate is selfsigned lifetime is three -# years. -# This option is enabled by default when ssl-bump is used. -# See the ssl-bump option above for more information. -# -# dynamic_cert_mem_cache_size=SIZE -# Approximate total RAM size spent on cached generated -# certificates. If set to zero, caching is disabled. The -# default value is 4MB. -# -# TLS / SSL Options: -# -# cert= Path to SSL certificate (PEM format). -# -# key= Path to SSL private key file (PEM format) -# if not specified, the certificate file is -# assumed to be a combined certificate and -# key file. -# -# version= The version of SSL/TLS supported -# 1 automatic (default) -# 2 SSLv2 only -# 3 SSLv3 only -# 4 TLSv1.0 only -# 5 TLSv1.1 only -# 6 TLSv1.2 only -# -# cipher= Colon separated list of supported ciphers. -# NOTE: some ciphers such as EDH ciphers depend on -# additional settings. If those settings are -# omitted the ciphers may be silently ignored -# by the OpenSSL library. -# -# options= Various SSL implementation options. The most important -# being: -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1.0 -# NO_TLSv1_1 Disallow the use of TLSv1.1 -# NO_TLSv1_2 Disallow the use of TLSv1.2 -# SINGLE_DH_USE Always create a new key when using -# temporary/ephemeral DH key exchanges -# ALL Enable various bug workarounds -# suggested as "harmless" by OpenSSL -# Be warned that this reduces SSL/TLS -# strength to some attacks. -# See OpenSSL SSL_CTX_set_options documentation for a -# complete list of options. -# -# clientca= File containing the list of CAs to use when -# requesting a client certificate. -# -# cafile= File containing additional CA certificates to -# use when verifying client certificates. If unset -# clientca will be used. -# -# capath= Directory containing additional CA certificates -# and CRL lists to use when verifying client certificates. -# -# crlfile= File of additional CRL lists to use when verifying -# the client certificate, in addition to CRLs stored in -# the capath. Implies VERIFY_CRL flag below. -# -# dhparams= File containing DH parameters for temporary/ephemeral -# DH key exchanges. See OpenSSL documentation for details -# on how to create this file. -# WARNING: EDH ciphers will be silently disabled if this -# option is not set. -# -# sslflags= Various flags modifying the use of SSL: -# DELAYED_AUTH -# Don't request client certificates -# immediately, but wait until acl processing -# requires a certificate (not yet implemented). -# NO_DEFAULT_CA -# Don't use the default CA lists built in -# to OpenSSL. -# NO_SESSION_REUSE -# Don't allow for session reuse. Each connection -# will result in a new SSL session. -# VERIFY_CRL -# Verify CRL lists when accepting client -# certificates. -# VERIFY_CRL_ALL -# Verify CRL lists for all certificates in the -# client certificate chain. -# -# sslcontext= SSL session ID context identifier. -# -# Other Options: -# -# connection-auth[=on|off] -# use connection-auth=off to tell Squid to prevent -# forwarding Microsoft connection oriented authentication -# (NTLM, Negotiate and Kerberos) -# -# disable-pmtu-discovery= -# Control Path-MTU discovery usage: -# off lets OS decide on what to do (default). -# transparent disable PMTU discovery when transparent -# support is enabled. -# always disable always PMTU discovery. -# -# In many setups of transparently intercepting proxies -# Path-MTU discovery can not work on traffic towards the -# clients. This is the case when the intercepting device -# does not fully track connections and fails to forward -# ICMP must fragment messages to the cache server. If you -# have such setup and experience that certain clients -# sporadically hang or never complete requests set -# disable-pmtu-discovery option to 'transparent'. -# -# name= Specifies a internal name for the port. Defaults to -# the port specification (port or addr:port) -# -# tcpkeepalive[=idle,interval,timeout] -# Enable TCP keepalive probes of idle connections. -# In seconds; idle is the initial time before TCP starts -# probing the connection, interval how often to probe, and -# timeout the time before giving up. -# -# If you run Squid on a dual-homed machine with an internal -# and an external interface we recommend you to specify the -# internal address:port in http_port. This way Squid will only be -# visible on the internal address. -# -# - -# Squid normally listens to port 3128 -http_port 3128 - -# TAG: https_port -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Usage: [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...] -# -# The socket address where Squid will listen for client requests made -# over TLS or SSL connections. Commonly referred to as HTTPS. -# -# This is most useful for situations where you are running squid in -# accelerator mode and you want to do the SSL work at the accelerator level. -# -# You may specify multiple socket addresses on multiple lines, -# each with their own SSL certificate and/or options. -# -# Modes: -# -# accel Accelerator / reverse proxy mode -# -# intercept Support for IP-Layer interception of -# outgoing requests without browser settings. -# NP: disables authentication and IPv6 on the port. -# -# tproxy Support Linux TPROXY for spoofing outgoing -# connections using the client IP address. -# NP: disables authentication and maybe IPv6 on the port. -# -# ssl-bump For each intercepted connection allowed by ssl_bump -# ACLs, establish a secure connection with the client and with -# the server, decrypt HTTPS messages as they pass through -# Squid, and treat them as unencrypted HTTP messages, -# becoming the man-in-the-middle. -# -# An "ssl_bump server-first" match is required to -# fully enable bumping of intercepted SSL connections. -# -# Requires tproxy or intercept. -# -# Omitting the mode flag causes default forward proxy mode to be used. -# -# -# See http_port for a list of generic options -# -# -# SSL Options: -# -# cert= Path to SSL certificate (PEM format). -# -# key= Path to SSL private key file (PEM format) -# if not specified, the certificate file is -# assumed to be a combined certificate and -# key file. -# -# version= The version of SSL/TLS supported -# 1 automatic (default) -# 2 SSLv2 only -# 3 SSLv3 only -# 4 TLSv1 only -# -# cipher= Colon separated list of supported ciphers. -# -# options= Various SSL engine options. The most important -# being: -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1 -# SINGLE_DH_USE Always create a new key when using -# temporary/ephemeral DH key exchanges -# See src/ssl_support.c or OpenSSL SSL_CTX_set_options -# documentation for a complete list of options. -# -# clientca= File containing the list of CAs to use when -# requesting a client certificate. -# -# cafile= File containing additional CA certificates to -# use when verifying client certificates. If unset -# clientca will be used. -# -# capath= Directory containing additional CA certificates -# and CRL lists to use when verifying client certificates. -# -# crlfile= File of additional CRL lists to use when verifying -# the client certificate, in addition to CRLs stored in -# the capath. Implies VERIFY_CRL flag below. -# -# dhparams= File containing DH parameters for temporary/ephemeral -# DH key exchanges. -# -# sslflags= Various flags modifying the use of SSL: -# DELAYED_AUTH -# Don't request client certificates -# immediately, but wait until acl processing -# requires a certificate (not yet implemented). -# NO_DEFAULT_CA -# Don't use the default CA lists built in -# to OpenSSL. -# NO_SESSION_REUSE -# Don't allow for session reuse. Each connection -# will result in a new SSL session. -# VERIFY_CRL -# Verify CRL lists when accepting client -# certificates. -# VERIFY_CRL_ALL -# Verify CRL lists for all certificates in the -# client certificate chain. -# -# sslcontext= SSL session ID context identifier. -# -# generate-host-certificates[=<on|off>] -# Dynamically create SSL server certificates for the -# destination hosts of bumped SSL requests.When -# enabled, the cert and key options are used to sign -# generated certificates. Otherwise generated -# certificate will be selfsigned. -# If there is CA certificate life time of generated -# certificate equals lifetime of CA certificate. If -# generated certificate is selfsigned lifetime is three -# years. -# This option is enabled by default when SslBump is used. -# See the sslBump option above for more information. -# -# dynamic_cert_mem_cache_size=SIZE -# Approximate total RAM size spent on cached generated -# certificates. If set to zero, caching is disabled. The -# default value is 4MB. -# -# See http_port for a list of available options. -#Default: -# none - -# TAG: tcp_outgoing_tos -# Allows you to select a TOS/Diffserv value for packets outgoing -# on the server side, based on an ACL. -# -# tcp_outgoing_tos ds-field [!]aclname ... -# -# Example where normal_service_net uses the TOS value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# tcp_outgoing_tos 0x00 normal_service_net -# tcp_outgoing_tos 0x20 good_service_net -# -# TOS/DSCP values really only have local significance - so you should -# know what you're specifying. For more information, see RFC2474, -# RFC2475, and RFC3260. -# -# The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or -# "default" to use whatever default your host has. Note that in -# practice often only multiples of 4 is usable as the two rightmost bits -# have been redefined for use by ECN (RFC 3168 section 23.1). -# -# Processing proceeds in the order specified, and stops at first fully -# matching line. -#Default: -# none - -# TAG: clientside_tos -# Allows you to select a TOS/Diffserv value for packets being transmitted -# on the client-side, based on an ACL. -# -# clientside_tos ds-field [!]aclname ... -# -# Example where normal_service_net uses the TOS value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# clientside_tos 0x00 normal_service_net -# clientside_tos 0x20 good_service_net -# -# Note: This feature is incompatible with qos_flows. Any TOS values set here -# will be overwritten by TOS values in qos_flows. -#Default: -# none - -# TAG: tcp_outgoing_mark -# Note: This option is only available if Squid is rebuilt with the -# Packet MARK (Linux) -# -# Allows you to apply a Netfilter mark value to outgoing packets -# on the server side, based on an ACL. -# -# tcp_outgoing_mark mark-value [!]aclname ... -# -# Example where normal_service_net uses the mark value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# tcp_outgoing_mark 0x00 normal_service_net -# tcp_outgoing_mark 0x20 good_service_net -#Default: -# none - -# TAG: clientside_mark -# Note: This option is only available if Squid is rebuilt with the -# Packet MARK (Linux) -# -# Allows you to apply a Netfilter mark value to packets being transmitted -# on the client-side, based on an ACL. -# -# clientside_mark mark-value [!]aclname ... -# -# Example where normal_service_net uses the mark value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# clientside_mark 0x00 normal_service_net -# clientside_mark 0x20 good_service_net -# -# Note: This feature is incompatible with qos_flows. Any mark values set here -# will be overwritten by mark values in qos_flows. -#Default: -# none - -# TAG: qos_flows -# Allows you to select a TOS/DSCP value to mark outgoing -# connections to the client, based on where the reply was sourced. -# For platforms using netfilter, allows you to set a netfilter mark -# value instead of, or in addition to, a TOS value. -# -# By default this functionality is disabled. To enable it with the default -# settings simply use "qos_flows mark" or "qos_flows tos". Default -# settings will result in the netfilter mark or TOS value being copied -# from the upstream connection to the client. Note that it is the connection -# CONNMARK value not the packet MARK value that is copied. -# -# It is not currently possible to copy the mark or TOS value from the -# client to the upstream connection request. -# -# TOS values really only have local significance - so you should -# know what you're specifying. For more information, see RFC2474, -# RFC2475, and RFC3260. -# -# The TOS/DSCP byte must be exactly that - a octet value 0 - 255. Note that -# in practice often only multiples of 4 is usable as the two rightmost bits -# have been redefined for use by ECN (RFC 3168 section 23.1). -# -# Mark values can be any unsigned 32-bit integer value. -# -# This setting is configured by setting the following values: -# -# tos|mark Whether to set TOS or netfilter mark values -# -# local-hit=0xFF Value to mark local cache hits. -# -# sibling-hit=0xFF Value to mark hits from sibling peers. -# -# parent-hit=0xFF Value to mark hits from parent peers. -# -# miss=0xFF[/mask] Value to mark cache misses. Takes precedence -# over the preserve-miss feature (see below), unless -# mask is specified, in which case only the bits -# specified in the mask are written. -# -# The TOS variant of the following features are only possible on Linux -# and require your kernel to be patched with the TOS preserving ZPH -# patch, available from http://zph.bratcheda.org -# No patch is needed to preserve the netfilter mark, which will work -# with all variants of netfilter. -# -# disable-preserve-miss -# This option disables the preservation of the TOS or netfilter -# mark. By default, the existing TOS or netfilter mark value of -# the response coming from the remote server will be retained -# and masked with miss-mark. -# NOTE: in the case of a netfilter mark, the mark must be set on -# the connection (using the CONNMARK target) not on the packet -# (MARK target). -# -# miss-mask=0xFF -# Allows you to mask certain bits in the TOS or mark value -# received from the remote server, before copying the value to -# the TOS sent towards clients. -# Default for tos: 0xFF (TOS from server is not changed). -# Default for mark: 0xFFFFFFFF (mark from server is not changed). -# -# All of these features require the --enable-zph-qos compilation flag -# (enabled by default). Netfilter marking also requires the -# libnetfilter_conntrack libraries (--with-netfilter-conntrack) and -# libcap 2.09+ (--with-libcap). -# -#Default: -# none - -# TAG: tcp_outgoing_address -# Allows you to map requests to different outgoing IP addresses -# based on the username or source address of the user making -# the request. -# -# tcp_outgoing_address ipaddr [[!]aclname] ... -# -# For example; -# Forwarding clients with dedicated IPs for certain subnets. -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.2.0/24 -# -# tcp_outgoing_address 2001:db8::c001 good_service_net -# tcp_outgoing_address 10.1.0.2 good_service_net -# -# tcp_outgoing_address 2001:db8::beef normal_service_net -# tcp_outgoing_address 10.1.0.1 normal_service_net -# -# tcp_outgoing_address 2001:db8::1 -# tcp_outgoing_address 10.1.0.3 -# -# Processing proceeds in the order specified, and stops at first fully -# matching line. -# -# Squid will add an implicit IP version test to each line. -# Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses. -# Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses. -# -# -# NOTE: The use of this directive using client dependent ACLs is -# incompatible with the use of server side persistent connections. To -# ensure correct results it is best to set server_persistent_connections -# to off when using this directive in such configurations. -# -# NOTE: The use of this directive to set a local IP on outgoing TCP links -# is incompatible with using TPROXY to set client IP out outbound TCP links. -# When needing to contact peers use the no-tproxy cache_peer option and the -# client_dst_passthru directive re-enable normal forwarding such as this. -# -#Default: -# Address selection is performed by the operating system. - -# TAG: host_verify_strict -# Regardless of this option setting, when dealing with intercepted -# traffic, Squid always verifies that the destination IP address matches -# the Host header domain or IP (called 'authority form URL'). -# -# This enforcement is performed to satisfy a MUST-level requirement in -# RFC 2616 section 14.23: "The Host field value MUST represent the naming -# authority of the origin server or gateway given by the original URL". -# -# When set to ON: -# Squid always responds with an HTTP 409 (Conflict) error -# page and logs a security warning if there is no match. -# -# Squid verifies that the destination IP address matches -# the Host header for forward-proxy and reverse-proxy traffic -# as well. For those traffic types, Squid also enables the -# following checks, comparing the corresponding Host header -# and Request-URI components: -# -# * The host names (domain or IP) must be identical, -# but valueless or missing Host header disables all checks. -# For the two host names to match, both must be either IP -# or FQDN. -# -# * Port numbers must be identical, but if a port is missing -# the scheme-default port is assumed. -# -# -# When set to OFF (the default): -# Squid allows suspicious requests to continue but logs a -# security warning and blocks caching of the response. -# -# * Forward-proxy traffic is not checked at all. -# -# * Reverse-proxy traffic is not checked at all. -# -# * Intercepted traffic which passes verification is handled -# according to client_dst_passthru. -# -# * Intercepted requests which fail verification are sent -# to the client original destination instead of DIRECT. -# This overrides 'client_dst_passthru off'. -# -# For now suspicious intercepted CONNECT requests are always -# responded to with an HTTP 409 (Conflict) error page. -# -# -# SECURITY NOTE: -# -# As described in CVE-2009-0801 when the Host: header alone is used -# to determine the destination of a request it becomes trivial for -# malicious scripts on remote websites to bypass browser same-origin -# security policy and sandboxing protections. -# -# The cause of this is that such applets are allowed to perform their -# own HTTP stack, in which case the same-origin policy of the browser -# sandbox only verifies that the applet tries to contact the same IP -# as from where it was loaded at the IP level. The Host: header may -# be different from the connected IP and approved origin. -# -#Default: -# host_verify_strict off - -# TAG: client_dst_passthru -# With NAT or TPROXY intercepted traffic Squid may pass the request -# directly to the original client destination IP or seek a faster -# source using the HTTP Host header. -# -# Using Host to locate alternative servers can provide faster -# connectivity with a range of failure recovery options. -# But can also lead to connectivity trouble when the client and -# server are attempting stateful interactions unaware of the proxy. -# -# This option (on by default) prevents alternative DNS entries being -# located to send intercepted traffic DIRECT to an origin server. -# The clients original destination IP and port will be used instead. -# -# Regardless of this option setting, when dealing with intercepted -# traffic Squid will verify the Host: header and any traffic which -# fails Host verification will be treated as if this option were ON. -# -# see host_verify_strict for details on the verification process. -#Default: -# client_dst_passthru on - -# SSL OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: ssl_unclean_shutdown -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Some browsers (especially MSIE) bugs out on SSL shutdown -# messages. -#Default: -# ssl_unclean_shutdown off - -# TAG: ssl_engine -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# The OpenSSL engine to use. You will need to set this if you -# would like to use hardware SSL acceleration for example. -#Default: -# none - -# TAG: sslproxy_client_certificate -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Client SSL Certificate to use when proxying https:// URLs -#Default: -# none - -# TAG: sslproxy_client_key -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Client SSL Key to use when proxying https:// URLs -#Default: -# none - -# TAG: sslproxy_version -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# SSL version level to use when proxying https:// URLs -# -# The versions of SSL/TLS supported: -# -# 1 automatic (default) -# 2 SSLv2 only -# 3 SSLv3 only -# 4 TLSv1.0 only -# 5 TLSv1.1 only -# 6 TLSv1.2 only -#Default: -# automatic SSL/TLS version negotiation - -# TAG: sslproxy_options -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# SSL implementation options to use when proxying https:// URLs -# -# The most important being: -# -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1.0 -# NO_TLSv1_1 Disallow the use of TLSv1.1 -# NO_TLSv1_2 Disallow the use of TLSv1.2 -# SINGLE_DH_USE -# Always create a new key when using temporary/ephemeral -# DH key exchanges -# SSL_OP_NO_TICKET -# Disable use of RFC5077 session tickets. Some servers -# may have problems understanding the TLS extension due -# to ambiguous specification in RFC4507. -# ALL Enable various bug workarounds suggested as "harmless" -# by OpenSSL. Be warned that this may reduce SSL/TLS -# strength to some attacks. -# -# See the OpenSSL SSL_CTX_set_options documentation for a -# complete list of possible options. -#Default: -# none - -# TAG: sslproxy_cipher -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# SSL cipher list to use when proxying https:// URLs -# -# Colon separated list of supported ciphers. -#Default: -# none - -# TAG: sslproxy_cafile -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# file containing CA certificates to use when verifying server -# certificates while proxying https:// URLs -#Default: -# none - -# TAG: sslproxy_capath -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# directory containing CA certificates to use when verifying -# server certificates while proxying https:// URLs -#Default: -# none - -# TAG: ssl_bump -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# This option is consulted when a CONNECT request is received on -# an http_port (or a new connection is intercepted at an -# https_port), provided that port was configured with an ssl-bump -# flag. The subsequent data on the connection is either treated as -# HTTPS and decrypted OR tunneled at TCP level without decryption, -# depending on the first bumping "mode" which ACLs match. -# -# ssl_bump <mode> [!]acl ... -# -# The following bumping modes are supported: -# -# client-first -# Allow bumping of the connection. Establish a secure connection -# with the client first, then connect to the server. This old mode -# does not allow Squid to mimic server SSL certificate and does -# not work with intercepted SSL connections. -# -# server-first -# Allow bumping of the connection. Establish a secure connection -# with the server first, then establish a secure connection with -# the client, using a mimicked server certificate. Works with both -# CONNECT requests and intercepted SSL connections. -# -# none -# Become a TCP tunnel without decoding the connection. -# Works with both CONNECT requests and intercepted SSL -# connections. This is the default behavior when no -# ssl_bump option is given or no ssl_bump ACLs match. -# -# By default, no connections are bumped. -# -# The first matching ssl_bump option wins. If no ACLs match, the -# connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump -# does not have an implicit "negate the last given option" rule. You -# must make that rule explicit if you convert old ssl_bump allow/deny -# rules that rely on such an implicit rule. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -# See also: http_port ssl-bump, https_port ssl-bump -# -# -# # Example: Bump all requests except those originating from -# # localhost or those going to example.com. -# -# acl broken_sites dstdomain .example.com -# ssl_bump none localhost -# ssl_bump none broken_sites -# ssl_bump server-first all -#Default: -# Does not bump unless rules are present in squid.conf - -# TAG: sslproxy_flags -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Various flags modifying the use of SSL while proxying https:// URLs: -# DONT_VERIFY_PEER Accept certificates that fail verification. -# For refined control, see sslproxy_cert_error. -# NO_DEFAULT_CA Don't use the default CA list built in -# to OpenSSL. -#Default: -# none - -# TAG: sslproxy_cert_error -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Use this ACL to bypass server certificate validation errors. -# -# For example, the following lines will bypass all validation errors -# when talking to servers for example.com. All other -# validation errors will result in ERR_SECURE_CONNECT_FAIL error. -# -# acl BrokenButTrustedServers dstdomain example.com -# sslproxy_cert_error allow BrokenButTrustedServers -# sslproxy_cert_error deny all -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# Using slow acl types may result in server crashes -# -# Without this option, all server certificate validation errors -# terminate the transaction to protect Squid and the client. -# -# SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed -# but should not happen unless your OpenSSL library is buggy. -# -# SECURITY WARNING: -# Bypassing validation errors is dangerous because an -# error usually implies that the server cannot be trusted -# and the connection may be insecure. -# -# See also: sslproxy_flags and DONT_VERIFY_PEER. -#Default: -# Server certificate errors terminate the transaction. - -# TAG: sslproxy_cert_sign -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# -# sslproxy_cert_sign <signing algorithm> acl ... -# -# The following certificate signing algorithms are supported: -# -# signTrusted -# Sign using the configured CA certificate which is usually -# placed in and trusted by end-user browsers. This is the -# default for trusted origin server certificates. -# -# signUntrusted -# Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error. -# This is the default for untrusted origin server certificates -# that are not self-signed (see ssl::certUntrusted). -# -# signSelf -# Sign using a self-signed certificate with the right CN to -# generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the -# browser. This is the default for self-signed origin server -# certificates (see ssl::certSelfSigned). -# -# This clause only supports fast acl types. -# -# When sslproxy_cert_sign acl(s) match, Squid uses the corresponding -# signing algorithm to generate the certificate and ignores all -# subsequent sslproxy_cert_sign options (the first match wins). If no -# acl(s) match, the default signing algorithm is determined by errors -# detected when obtaining and validating the origin server certificate. -# -# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can -# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a -# CONNECT request that carries a domain name. In all other cases (CONNECT -# to an IP address or an intercepted SSL connection), Squid cannot detect -# the domain mismatch at certificate generation time when -# bump-server-first is used. -#Default: -# none - -# TAG: sslproxy_cert_adapt -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# -# sslproxy_cert_adapt <adaptation algorithm> acl ... -# -# The following certificate adaptation algorithms are supported: -# -# setValidAfter -# Sets the "Not After" property to the "Not After" property of -# the CA certificate used to sign generated certificates. -# -# setValidBefore -# Sets the "Not Before" property to the "Not Before" property of -# the CA certificate used to sign generated certificates. -# -# setCommonName or setCommonName{CN} -# Sets Subject.CN property to the host name specified as a -# CN parameter or, if no explicit CN parameter was specified, -# extracted from the CONNECT request. It is a misconfiguration -# to use setCommonName without an explicit parameter for -# intercepted or tproxied SSL connections. -# -# This clause only supports fast acl types. -# -# Squid first groups sslproxy_cert_adapt options by adaptation algorithm. -# Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the -# corresponding adaptation algorithm to generate the certificate and -# ignores all subsequent sslproxy_cert_adapt options in that algorithm's -# group (i.e., the first match wins within each algorithm group). If no -# acl(s) match, the default mimicking action takes place. -# -# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can -# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a -# CONNECT request that carries a domain name. In all other cases (CONNECT -# to an IP address or an intercepted SSL connection), Squid cannot detect -# the domain mismatch at certificate generation time when -# bump-server-first is used. -#Default: -# none - -# TAG: sslpassword_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Specify a program used for entering SSL key passphrases -# when using encrypted SSL certificate keys. If not specified -# keys must either be unencrypted, or Squid started with the -N -# option to allow it to query interactively for the passphrase. -# -# The key file name is given as argument to the program allowing -# selection of the right password if you have multiple encrypted -# keys. -#Default: -# none - -# OPTIONS RELATING TO EXTERNAL SSL_CRTD -# ----------------------------------------------------------------------------- - -# TAG: sslcrtd_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl-crtd -# -# Specify the location and options of the executable for ssl_crtd process. -# /usr/libexec/ssl_crtd program requires -s and -M parameters -# For more information use: -# /usr/libexec/ssl_crtd -h -#Default: -# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB - -# TAG: sslcrtd_children -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl-crtd -# -# The maximum number of processes spawn to service ssl server. -# The maximum this may be safely set to is 32. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup=N -# -# Sets the minimum number of processes to spawn when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few children temporary slows Squid under load while it -# tries to spawn enough additional processes to cope with traffic. -# -# idle=N -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# You must have at least one ssl_crtd process. -#Default: -# sslcrtd_children 32 startup=5 idle=1 - -# TAG: sslcrtvalidator_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Specify the location and options of the executable for ssl_crt_validator -# process. -# -# Usage: sslcrtvalidator_program [ttl=n] [cache=n] path ... -# -# Options: -# ttl=n TTL in seconds for cached results. The default is 60 secs -# cache=n limit the result cache size. The default value is 2048 -#Default: -# none - -# TAG: sslcrtvalidator_children -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# The maximum number of processes spawn to service SSL server. -# The maximum this may be safely set to is 32. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup=N -# -# Sets the minimum number of processes to spawn when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few children temporary slows Squid under load while it -# tries to spawn enough additional processes to cope with traffic. -# -# idle=N -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# concurrency= -# -# The number of requests each certificate validator helper can handle in -# parallel. A value of 0 indicates the certficate validator does not -# support concurrency. Defaults to 1. -# -# When this directive is set to a value >= 1 then the protocol -# used to communicate with the helper is modified to include -# a request ID in front of the request/response. The request -# ID from the request must be echoed back with the response -# to that request. -# -# You must have at least one ssl_crt_validator process. -#Default: -# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1 - -# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM -# ----------------------------------------------------------------------------- - -# TAG: cache_peer -# To specify other caches in a hierarchy, use the format: -# -# cache_peer hostname type http-port icp-port [options] -# -# For example, -# -# # proxy icp -# # hostname type port port options -# # -------------------- -------- ----- ----- ----------- -# cache_peer parent.foo.net parent 3128 3130 default -# cache_peer sib1.foo.net sibling 3128 3130 proxy-only -# cache_peer sib2.foo.net sibling 3128 3130 proxy-only -# cache_peer example.com parent 80 0 default -# cache_peer cdn.example.com sibling 3128 0 -# -# type: either 'parent', 'sibling', or 'multicast'. -# -# proxy-port: The port number where the peer accept HTTP requests. -# For other Squid proxies this is usually 3128 -# For web servers this is usually 80 -# -# icp-port: Used for querying neighbor caches about objects. -# Set to 0 if the peer does not support ICP or HTCP. -# See ICP and HTCP options below for additional details. -# -# -# ==== ICP OPTIONS ==== -# -# You MUST also set icp_port and icp_access explicitly when using these options. -# The defaults will prevent peer traffic using ICP. -# -# -# no-query Disable ICP queries to this neighbor. -# -# multicast-responder -# Indicates the named peer is a member of a multicast group. -# ICP queries will not be sent directly to the peer, but ICP -# replies will be accepted from it. -# -# closest-only Indicates that, for ICP_OP_MISS replies, we'll only forward -# CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes. -# -# background-ping -# To only send ICP queries to this neighbor infrequently. -# This is used to keep the neighbor round trip time updated -# and is usually used in conjunction with weighted-round-robin. -# -# -# ==== HTCP OPTIONS ==== -# -# You MUST also set htcp_port and htcp_access explicitly when using these options. -# The defaults will prevent peer traffic using HTCP. -# -# -# htcp Send HTCP, instead of ICP, queries to the neighbor. -# You probably also want to set the "icp-port" to 4827 -# instead of 3130. This directive accepts a comma separated -# list of options described below. -# -# htcp=oldsquid Send HTCP to old Squid versions (2.5 or earlier). -# -# htcp=no-clr Send HTCP to the neighbor but without -# sending any CLR requests. This cannot be used with -# only-clr. -# -# htcp=only-clr Send HTCP to the neighbor but ONLY CLR requests. -# This cannot be used with no-clr. -# -# htcp=no-purge-clr -# Send HTCP to the neighbor including CLRs but only when -# they do not result from PURGE requests. -# -# htcp=forward-clr -# Forward any HTCP CLR requests this proxy receives to the peer. -# -# -# ==== PEER SELECTION METHODS ==== -# -# The default peer selection method is ICP, with the first responding peer -# being used as source. These options can be used for better load balancing. -# -# -# default This is a parent cache which can be used as a "last-resort" -# if a peer cannot be located by any of the peer-selection methods. -# If specified more than once, only the first is used. -# -# round-robin Load-Balance parents which should be used in a round-robin -# fashion in the absence of any ICP queries. -# weight=N can be used to add bias. -# -# weighted-round-robin -# Load-Balance parents which should be used in a round-robin -# fashion with the frequency of each parent being based on the -# round trip time. Closer parents are used more often. -# Usually used for background-ping parents. -# weight=N can be used to add bias. -# -# carp Load-Balance parents which should be used as a CARP array. -# The requests will be distributed among the parents based on the -# CARP load balancing hash function based on their weight. -# -# userhash Load-balance parents based on the client proxy_auth or ident username. -# -# sourcehash Load-balance parents based on the client source IP. -# -# multicast-siblings -# To be used only for cache peers of type "multicast". -# ALL members of this multicast group have "sibling" -# relationship with it, not "parent". This is to a multicast -# group when the requested object would be fetched only from -# a "parent" cache, anyway. It's useful, e.g., when -# configuring a pool of redundant Squid proxies, being -# members of the same multicast group. -# -# -# ==== PEER SELECTION OPTIONS ==== -# -# weight=N use to affect the selection of a peer during any weighted -# peer-selection mechanisms. -# The weight must be an integer; default is 1, -# larger weights are favored more. -# This option does not affect parent selection if a peering -# protocol is not in use. -# -# basetime=N Specify a base amount to be subtracted from round trip -# times of parents. -# It is subtracted before division by weight in calculating -# which parent to fectch from. If the rtt is less than the -# base time the rtt is set to a minimal value. -# -# ttl=N Specify a TTL to use when sending multicast ICP queries -# to this address. -# Only useful when sending to a multicast group. -# Because we don't accept ICP replies from random -# hosts, you must configure other group members as -# peers with the 'multicast-responder' option. -# -# no-delay To prevent access to this neighbor from influencing the -# delay pools. -# -# digest-url=URL Tell Squid to fetch the cache digest (if digests are -# enabled) for this host from the specified URL rather -# than the Squid default location. -# -# -# ==== CARP OPTIONS ==== -# -# carp-key=key-specification -# use a different key than the full URL to hash against the peer. -# the key-specification is a comma-separated list of the keywords -# scheme, host, port, path, params -# Order is not important. -# -# ==== ACCELERATOR / REVERSE-PROXY OPTIONS ==== -# -# originserver Causes this parent to be contacted as an origin server. -# Meant to be used in accelerator setups when the peer -# is a web server. -# -# forceddomain=name -# Set the Host header of requests forwarded to this peer. -# Useful in accelerator setups where the server (peer) -# expects a certain domain name but clients may request -# others. ie example.com or www.example.com -# -# no-digest Disable request of cache digests. -# -# no-netdb-exchange -# Disables requesting ICMP RTT database (NetDB). -# -# -# ==== AUTHENTICATION OPTIONS ==== -# -# login=user:password -# If this is a personal/workgroup proxy and your parent -# requires proxy authentication. -# -# Note: The string can include URL escapes (i.e. %20 for -# spaces). This also means % must be written as %%. -# -# login=PASSTHRU -# Send login details received from client to this peer. -# Both Proxy- and WWW-Authorization headers are passed -# without alteration to the peer. -# Authentication is not required by Squid for this to work. -# -# Note: This will pass any form of authentication but -# only Basic auth will work through a proxy unless the -# connection-auth options are also used. -# -# login=PASS Send login details received from client to this peer. -# Authentication is not required by this option. -# -# If there are no client-provided authentication headers -# to pass on, but username and password are available -# from an external ACL user= and password= result tags -# they may be sent instead. -# -# Note: To combine this with proxy_auth both proxies must -# share the same user database as HTTP only allows for -# a single login (one for proxy, one for origin server). -# Also be warned this will expose your users proxy -# password to the peer. USE WITH CAUTION -# -# login=*:password -# Send the username to the upstream cache, but with a -# fixed password. This is meant to be used when the peer -# is in another administrative domain, but it is still -# needed to identify each user. -# The star can optionally be followed by some extra -# information which is added to the username. This can -# be used to identify this proxy to the peer, similar to -# the login=username:password option above. -# -# login=NEGOTIATE -# If this is a personal/workgroup proxy and your parent -# requires a secure proxy authentication. -# The first principal from the default keytab or defined by -# the environment variable KRB5_KTNAME will be used. -# -# WARNING: The connection may transmit requests from multiple -# clients. Negotiate often assumes end-to-end authentication -# and a single-client. Which is not strictly true here. -# -# login=NEGOTIATE:principal_name -# If this is a personal/workgroup proxy and your parent -# requires a secure proxy authentication. -# The principal principal_name from the default keytab or -# defined by the environment variable KRB5_KTNAME will be -# used. -# -# WARNING: The connection may transmit requests from multiple -# clients. Negotiate often assumes end-to-end authentication -# and a single-client. Which is not strictly true here. -# -# connection-auth=on|off -# Tell Squid that this peer does or not support Microsoft -# connection oriented authentication, and any such -# challenges received from there should be ignored. -# Default is auto to automatically determine the status -# of the peer. -# -# -# ==== SSL / HTTPS / TLS OPTIONS ==== -# -# ssl Encrypt connections to this peer with SSL/TLS. -# -# sslcert=/path/to/ssl/certificate -# A client SSL certificate to use when connecting to -# this peer. -# -# sslkey=/path/to/ssl/key -# The private SSL key corresponding to sslcert above. -# If 'sslkey' is not specified 'sslcert' is assumed to -# reference a combined file containing both the -# certificate and the key. -# -# sslversion=1|2|3|4|5|6 -# The SSL version to use when connecting to this peer -# 1 = automatic (default) -# 2 = SSL v2 only -# 3 = SSL v3 only -# 4 = TLS v1.0 only -# 5 = TLS v1.1 only -# 6 = TLS v1.2 only -# -# sslcipher=... The list of valid SSL ciphers to use when connecting -# to this peer. -# -# ssloptions=... Specify various SSL implementation options: -# -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1.0 -# NO_TLSv1_1 Disallow the use of TLSv1.1 -# NO_TLSv1_2 Disallow the use of TLSv1.2 -# SINGLE_DH_USE -# Always create a new key when using -# temporary/ephemeral DH key exchanges -# ALL Enable various bug workarounds -# suggested as "harmless" by OpenSSL -# Be warned that this reduces SSL/TLS -# strength to some attacks. -# -# See the OpenSSL SSL_CTX_set_options documentation for a -# more complete list. -# -# sslcafile=... A file containing additional CA certificates to use -# when verifying the peer certificate. -# -# sslcapath=... A directory containing additional CA certificates to -# use when verifying the peer certificate. -# -# sslcrlfile=... A certificate revocation list file to use when -# verifying the peer certificate. -# -# sslflags=... Specify various flags modifying the SSL implementation: -# -# DONT_VERIFY_PEER -# Accept certificates even if they fail to -# verify. -# NO_DEFAULT_CA -# Don't use the default CA list built in -# to OpenSSL. -# DONT_VERIFY_DOMAIN -# Don't verify the peer certificate -# matches the server name -# -# ssldomain= The peer name as advertised in it's certificate. -# Used for verifying the correctness of the received peer -# certificate. If not specified the peer hostname will be -# used. -# -# front-end-https -# Enable the "Front-End-Https: On" header needed when -# using Squid as a SSL frontend in front of Microsoft OWA. -# See MS KB document Q307347 for details on this header. -# If set to auto the header will only be added if the -# request is forwarded as a https:// URL. -# -# -# ==== GENERAL OPTIONS ==== -# -# connect-timeout=N -# A peer-specific connect timeout. -# Also see the peer_connect_timeout directive. -# -# connect-fail-limit=N -# How many times connecting to a peer must fail before -# it is marked as down. Default is 10. -# -# allow-miss Disable Squid's use of only-if-cached when forwarding -# requests to siblings. This is primarily useful when -# icp_hit_stale is used by the sibling. To extensive use -# of this option may result in forwarding loops, and you -# should avoid having two-way peerings with this option. -# For example to deny peer usage on requests from peer -# by denying cache_peer_access if the source is a peer. -# -# max-conn=N Limit the amount of connections Squid may open to this -# peer. see also -# -# name=xxx Unique name for the peer. -# Required if you have multiple peers on the same host -# but different ports. -# This name can be used in cache_peer_access and similar -# directives to dentify the peer. -# Can be used by outgoing access controls through the -# peername ACL type. -# -# no-tproxy Do not use the client-spoof TPROXY support when forwarding -# requests to this peer. Use normal address selection instead. -# This overrides the spoof_client_ip ACL. -# -# proxy-only objects fetched from the peer will not be stored locally. -# -#Default: -# none - -# TAG: cache_peer_domain -# Use to limit the domains for which a neighbor cache will be -# queried. -# -# Usage: -# cache_peer_domain cache-host domain [domain ...] -# cache_peer_domain cache-host !domain -# -# For example, specifying -# -# cache_peer_domain parent.foo.net .edu -# -# has the effect such that UDP query packets are sent to -# 'bigserver' only when the requested object exists on a -# server in the .edu domain. Prefixing the domainname -# with '!' means the cache will be queried for objects -# NOT in that domain. -# -# NOTE: * Any number of domains may be given for a cache-host, -# either on the same or separate lines. -# * When multiple domains are given for a particular -# cache-host, the first matched domain is applied. -# * Cache hosts with no domain restrictions are queried -# for all requests. -# * There are no defaults. -# * There is also a 'cache_peer_access' tag in the ACL -# section. -#Default: -# none - -# TAG: cache_peer_access -# Similar to 'cache_peer_domain' but provides more flexibility by -# using ACL elements. -# -# Usage: -# cache_peer_access cache-host allow|deny [!]aclname ... -# -# The syntax is identical to 'http_access' and the other lists of -# ACL elements. See the comments for 'http_access' below, or -# the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl). -#Default: -# none - -# TAG: neighbor_type_domain -# Modify the cache_peer neighbor type when passing requests -# about specific domains to the peer. -# -# Usage: -# neighbor_type_domain neighbor parent|sibling domain domain ... -# -# For example: -# cache_peer foo.example.com parent 3128 3130 -# neighbor_type_domain foo.example.com sibling .au .de -# -# The above configuration treats all requests to foo.example.com as a -# parent proxy unless the request is for a .au or .de ccTLD domain name. -#Default: -# The peer type from cache_peer directive is used for all requests to that peer. - -# TAG: dead_peer_timeout (seconds) -# This controls how long Squid waits to declare a peer cache -# as "dead." If there are no ICP replies received in this -# amount of time, Squid will declare the peer dead and not -# expect to receive any further ICP replies. However, it -# continues to send ICP queries, and will mark the peer as -# alive upon receipt of the first subsequent ICP reply. -# -# This timeout also affects when Squid expects to receive ICP -# replies from peers. If more than 'dead_peer' seconds have -# passed since the last ICP reply was received, Squid will not -# expect to receive an ICP reply on the next query. Thus, if -# your time between requests is greater than this timeout, you -# will see a lot of requests sent DIRECT to origin servers -# instead of to your parents. -#Default: -# dead_peer_timeout 10 seconds - -# TAG: forward_max_tries -# Controls how many different forward paths Squid will try -# before giving up. See also forward_timeout. -# -# NOTE: connect_retries (default: none) can make each of these -# possible forwarding paths be tried multiple times. -#Default: -# forward_max_tries 10 - -# TAG: hierarchy_stoplist -# A list of words which, if found in a URL, cause the object to -# be handled directly by this cache. In other words, use this -# to not query neighbor caches for certain objects. You may -# list this option multiple times. -# -# Example: -# hierarchy_stoplist cgi-bin ? -# -# Note: never_direct overrides this option. -#Default: -# none - -# MEMORY CACHE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: cache_mem (bytes) -# NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE. -# IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL -# USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER -# THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS. -# -# 'cache_mem' specifies the ideal amount of memory to be used -# for: -# * In-Transit objects -# * Hot Objects -# * Negative-Cached objects -# -# Data for these objects are stored in 4 KB blocks. This -# parameter specifies the ideal upper limit on the total size of -# 4 KB blocks allocated. In-Transit objects take the highest -# priority. -# -# In-transit objects have priority over the others. When -# additional space is needed for incoming data, negative-cached -# and hot objects will be released. In other words, the -# negative-cached and hot objects will fill up any unused space -# not needed for in-transit objects. -# -# If circumstances require, this limit will be exceeded. -# Specifically, if your incoming request rate requires more than -# 'cache_mem' of memory to hold in-transit objects, Squid will -# exceed this limit to satisfy the new requests. When the load -# decreases, blocks will be freed until the high-water mark is -# reached. Thereafter, blocks will be used to store hot -# objects. -# -# If shared memory caching is enabled, Squid does not use the shared -# cache space for in-transit objects, but they still consume as much -# local memory as they need. For more details about the shared memory -# cache, see memory_cache_shared. -#Default: -# cache_mem 256 MB - -# TAG: maximum_object_size_in_memory (bytes) -# Objects greater than this size will not be attempted to kept in -# the memory cache. This should be set high enough to keep objects -# accessed frequently in memory to improve performance whilst low -# enough to keep larger objects from hoarding cache_mem. -#Default: -# maximum_object_size_in_memory 512 KB - -# TAG: memory_cache_shared on|off -# Controls whether the memory cache is shared among SMP workers. -# -# The shared memory cache is meant to occupy cache_mem bytes and replace -# the non-shared memory cache, although some entities may still be -# cached locally by workers for now (e.g., internal and in-transit -# objects may be served from a local memory cache even if shared memory -# caching is enabled). -# -# By default, the memory cache is shared if and only if all of the -# following conditions are satisfied: Squid runs in SMP mode with -# multiple workers, cache_mem is positive, and Squid environment -# supports required IPC primitives (e.g., POSIX shared memory segments -# and GCC-style atomic operations). -# -# To avoid blocking locks, shared memory uses opportunistic algorithms -# that do not guarantee that every cachable entity that could have been -# shared among SMP workers will actually be shared. -# -# Currently, entities exceeding 32KB in size cannot be shared. -#Default: -# "on" where supported if doing memory caching with multiple SMP workers. - -# TAG: memory_cache_mode -# Controls which objects to keep in the memory cache (cache_mem) -# -# always Keep most recently fetched objects in memory (default) -# -# disk Only disk cache hits are kept in memory, which means -# an object must first be cached on disk and then hit -# a second time before cached in memory. -# -# network Only objects fetched from network is kept in memory -#Default: -# Keep the most recently fetched objects in memory - -# TAG: memory_replacement_policy -# The memory replacement policy parameter determines which -# objects are purged from memory when memory space is needed. -# -# See cache_replacement_policy for details on algorithms. -#Default: -# memory_replacement_policy lru - -# DISK CACHE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: cache_replacement_policy -# The cache replacement policy parameter determines which -# objects are evicted (replaced) when disk space is needed. -# -# lru : Squid's original list based LRU policy -# heap GDSF : Greedy-Dual Size Frequency -# heap LFUDA: Least Frequently Used with Dynamic Aging -# heap LRU : LRU policy implemented using a heap -# -# Applies to any cache_dir lines listed below this directive. -# -# The LRU policies keeps recently referenced objects. -# -# The heap GDSF policy optimizes object hit rate by keeping smaller -# popular objects in cache so it has a better chance of getting a -# hit. It achieves a lower byte hit rate than LFUDA though since -# it evicts larger (possibly popular) objects. -# -# The heap LFUDA policy keeps popular objects in cache regardless of -# their size and thus optimizes byte hit rate at the expense of -# hit rate since one large, popular object will prevent many -# smaller, slightly less popular objects from being cached. -# -# Both policies utilize a dynamic aging mechanism that prevents -# cache pollution that can otherwise occur with frequency-based -# replacement policies. -# -# NOTE: if using the LFUDA replacement policy you should increase -# the value of maximum_object_size above its default of 4 MB to -# to maximize the potential byte hit rate improvement of LFUDA. -# -# For more information about the GDSF and LFUDA cache replacement -# policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html -# and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html. -#Default: -# cache_replacement_policy lru - -# TAG: minimum_object_size (bytes) -# Objects smaller than this size will NOT be saved on disk. The -# value is specified in bytes, and the default is 0 KB, which -# means all responses can be stored. -#Default: -# no limit - -# TAG: maximum_object_size (bytes) -# Set the default value for max-size parameter on any cache_dir. -# The value is specified in bytes, and the default is 4 MB. -# -# If you wish to get a high BYTES hit ratio, you should probably -# increase this (one 32 MB object hit counts for 3200 10KB -# hits). -# -# If you wish to increase hit ratio more than you want to -# save bandwidth you should leave this low. -# -# NOTE: if using the LFUDA replacement policy you should increase -# this value to maximize the byte hit rate improvement of LFUDA! -# See cache_replacement_policy for a discussion of this policy. -#Default: -# maximum_object_size 4 MB - -# TAG: cache_dir -# Format: -# cache_dir Type Directory-Name Fs-specific-data [options] -# -# You can specify multiple cache_dir lines to spread the -# cache among different disk partitions. -# -# Type specifies the kind of storage system to use. Only "ufs" -# is built by default. To enable any of the other storage systems -# see the --enable-storeio configure option. -# -# 'Directory' is a top-level directory where cache swap -# files will be stored. If you want to use an entire disk -# for caching, this can be the mount-point directory. -# The directory must exist and be writable by the Squid -# process. Squid will NOT create this directory for you. -# -# In SMP configurations, cache_dir must not precede the workers option -# and should use configuration macros or conditionals to give each -# worker interested in disk caching a dedicated cache directory. -# -# -# ==== The ufs store type ==== -# -# "ufs" is the old well-known Squid storage format that has always -# been there. -# -# Usage: -# cache_dir ufs Directory-Name Mbytes L1 L2 [options] -# -# 'Mbytes' is the amount of disk space (MB) to use under this -# directory. The default is 100 MB. Change this to suit your -# configuration. Do NOT put the size of your disk drive here. -# Instead, if you want Squid to use the entire disk drive, -# subtract 20% and use that value. -# -# 'L1' is the number of first-level subdirectories which -# will be created under the 'Directory'. The default is 16. -# -# 'L2' is the number of second-level subdirectories which -# will be created under each first-level directory. The default -# is 256. -# -# -# ==== The aufs store type ==== -# -# "aufs" uses the same storage format as "ufs", utilizing -# POSIX-threads to avoid blocking the main Squid process on -# disk-I/O. This was formerly known in Squid as async-io. -# -# Usage: -# cache_dir aufs Directory-Name Mbytes L1 L2 [options] -# -# see argument descriptions under ufs above -# -# -# ==== The diskd store type ==== -# -# "diskd" uses the same storage format as "ufs", utilizing a -# separate process to avoid blocking the main Squid process on -# disk-I/O. -# -# Usage: -# cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n] -# -# see argument descriptions under ufs above -# -# Q1 specifies the number of unacknowledged I/O requests when Squid -# stops opening new files. If this many messages are in the queues, -# Squid won't open new files. Default is 64 -# -# Q2 specifies the number of unacknowledged messages when Squid -# starts blocking. If this many messages are in the queues, -# Squid blocks until it receives some replies. Default is 72 -# -# When Q1 < Q2 (the default), the cache directory is optimized -# for lower response time at the expense of a decrease in hit -# ratio. If Q1 > Q2, the cache directory is optimized for -# higher hit ratio at the expense of an increase in response -# time. -# -# -# ==== The rock store type ==== -# -# Usage: -# cache_dir rock Directory-Name Mbytes <max-size=bytes> [options] -# -# The Rock Store type is a database-style storage. All cached -# entries are stored in a "database" file, using fixed-size slots, -# one entry per slot. The database size is specified in MB. The -# slot size is specified in bytes using the max-size option. See -# below for more info on the max-size option. -# -# If possible, Squid using Rock Store creates a dedicated kid -# process called "disker" to avoid blocking Squid worker(s) on disk -# I/O. One disker kid is created for each rock cache_dir. Diskers -# are created only when Squid, running in daemon mode, has support -# for the IpcIo disk I/O module. -# -# swap-timeout=msec: Squid will not start writing a miss to or -# reading a hit from disk if it estimates that the swap operation -# will take more than the specified number of milliseconds. By -# default and when set to zero, disables the disk I/O time limit -# enforcement. Ignored when using blocking I/O module because -# blocking synchronous I/O does not allow Squid to estimate the -# expected swap wait time. -# -# max-swap-rate=swaps/sec: Artificially limits disk access using -# the specified I/O rate limit. Swap out requests that -# would cause the average I/O rate to exceed the limit are -# delayed. Individual swap in requests (i.e., hits or reads) are -# not delayed, but they do contribute to measured swap rate and -# since they are placed in the same FIFO queue as swap out -# requests, they may wait longer if max-swap-rate is smaller. -# This is necessary on file systems that buffer "too -# many" writes and then start blocking Squid and other processes -# while committing those writes to disk. Usually used together -# with swap-timeout to avoid excessive delays and queue overflows -# when disk demand exceeds available disk "bandwidth". By default -# and when set to zero, disables the disk I/O rate limit -# enforcement. Currently supported by IpcIo module only. -# -# -# ==== The coss store type ==== -# -# NP: COSS filesystem in Squid-3 has been deemed too unstable for -# production use and has thus been removed from this release. -# We hope that it can be made usable again soon. -# -# block-size=n defines the "block size" for COSS cache_dir's. -# Squid uses file numbers as block numbers. Since file numbers -# are limited to 24 bits, the block size determines the maximum -# size of the COSS partition. The default is 512 bytes, which -# leads to a maximum cache_dir size of 512<<24, or 8 GB. Note -# you should not change the coss block size after Squid -# has written some objects to the cache_dir. -# -# The coss file store has changed from 2.5. Now it uses a file -# called 'stripe' in the directory names in the config - and -# this will be created by squid -z. -# -# -# ==== COMMON OPTIONS ==== -# -# no-store no new objects should be stored to this cache_dir. -# -# min-size=n the minimum object size in bytes this cache_dir -# will accept. It's used to restrict a cache_dir -# to only store large objects (e.g. AUFS) while -# other stores are optimized for smaller objects -# (e.g. COSS). -# Defaults to 0. -# -# max-size=n the maximum object size in bytes this cache_dir -# supports. -# The value in maximum_object_size directive sets -# the default unless more specific details are -# available (ie a small store capacity). -# -# Note: To make optimal use of the max-size limits you should order -# the cache_dir lines with the smallest max-size value first. -# -# Note for coss, max-size must be less than COSS_MEMBUF_SZ, -# which can be changed with the --with-coss-membuf-size=N configure -# option. -# -#Default: -# No disk cache. Store cache ojects only in memory. -# - -# Uncomment and adjust the following to add a disk cache directory. -cache_dir ufs /var/cache/squid 256 16 256 - -# TAG: store_dir_select_algorithm -# How Squid selects which cache_dir to use when the response -# object will fit into more than one. -# -# Regardless of which algorithm is used the cache_dir min-size -# and max-size parameters are obeyed. As such they can affect -# the selection algorithm by limiting the set of considered -# cache_dir. -# -# Algorithms: -# -# least-load -# -# This algorithm is suited to caches with similar cache_dir -# sizes and disk speeds. -# -# The disk with the least I/O pending is selected. -# When there are multiple disks with the same I/O load ranking -# the cache_dir with most available capacity is selected. -# -# When a mix of cache_dir sizes are configured the faster disks -# have a naturally lower I/O loading and larger disks have more -# capacity. So space used to store objects and data throughput -# may be very unbalanced towards larger disks. -# -# -# round-robin -# -# This algorithm is suited to caches with unequal cache_dir -# disk sizes. -# -# Each cache_dir is selected in a rotation. The next suitable -# cache_dir is used. -# -# Available cache_dir capacity is only considered in relation -# to whether the object will fit and meets the min-size and -# max-size parameters. -# -# Disk I/O loading is only considered to prevent overload on slow -# disks. This algorithm does not spread objects by size, so any -# I/O loading per-disk may appear very unbalanced and volatile. -# -#Default: -# store_dir_select_algorithm least-load - -# TAG: max_open_disk_fds -# To avoid having disk as the I/O bottleneck Squid can optionally -# bypass the on-disk cache if more than this amount of disk file -# descriptors are open. -# -# A value of 0 indicates no limit. -#Default: -# no limit - -# TAG: cache_swap_low (percent, 0-100) -# The low-water mark for cache object replacement. -# Replacement begins when the swap (disk) usage is above the -# low-water mark and attempts to maintain utilization near the -# low-water mark. As swap utilization gets close to high-water -# mark object eviction becomes more aggressive. If utilization is -# close to the low-water mark less replacement is done each time. -# -# Defaults are 90% and 95%. If you have a large cache, 5% could be -# hundreds of MB. If this is the case you may wish to set these -# numbers closer together. -# -# See also cache_swap_high -#Default: -# cache_swap_low 90 - -# TAG: cache_swap_high (percent, 0-100) -# The high-water mark for cache object replacement. -# Replacement begins when the swap (disk) usage is above the -# low-water mark and attempts to maintain utilization near the -# low-water mark. As swap utilization gets close to high-water -# mark object eviction becomes more aggressive. If utilization is -# close to the low-water mark less replacement is done each time. -# -# Defaults are 90% and 95%. If you have a large cache, 5% could be -# hundreds of MB. If this is the case you may wish to set these -# numbers closer together. -# -# See also cache_swap_low -#Default: -# cache_swap_high 95 - -# LOGFILE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: logformat -# Usage: -# -# logformat <name> <format specification> -# -# Defines an access log format. -# -# The <format specification> is a string with embedded % format codes -# -# % format codes all follow the same basic structure where all but -# the formatcode is optional. Output strings are automatically escaped -# as required according to their context and the output format -# modifiers are usually not needed, but can be specified if an explicit -# output format is desired. -# -# % ["|[|'|#] [-] [[0]width] [{argument}] formatcode -# -# " output in quoted string format -# [ output in squid text log format as used by log_mime_hdrs -# # output in URL quoted format -# ' output as-is -# -# - left aligned -# -# width minimum and/or maximum field width: -# [width_min][.width_max] -# When minimum starts with 0, the field is zero-padded. -# String values exceeding maximum width are truncated. -# -# {arg} argument such as header name etc -# -# Format codes: -# -# % a literal % character -# sn Unique sequence number per log line entry -# err_code The ID of an error response served by Squid or -# a similar internal error identifier. -# err_detail Additional err_code-dependent error information. -# note The annotation specified by the argument. Also -# logs the adaptation meta headers set by the -# adaptation_meta configuration parameter. -# If no argument given all annotations logged. -# The argument may include a separator to use with -# annotation values: -# name[:separator] -# By default, multiple note values are separated with "," -# and multiple notes are separated with "\r\n". -# When logging named notes with %{name}note, the -# explicitly configured separator is used between note -# values. When logging all notes with %note, the -# explicitly configured separator is used between -# individual notes. There is currently no way to -# specify both value and notes separators when logging -# all notes with %note. -# -# Connection related format codes: -# -# >a Client source IP address -# >A Client FQDN -# >p Client source port -# >eui Client source EUI (MAC address, EUI-48 or EUI-64 identifier) -# >la Local IP address the client connected to -# >lp Local port number the client connected to -# >qos Client connection TOS/DSCP value set by Squid -# >nfmark Client connection netfilter mark set by Squid -# -# la Local listening IP address the client connection was connected to. -# lp Local listening port number the client connection was connected to. -# -# <a Server IP address of the last server or peer connection -# <A Server FQDN or peer name -# <p Server port number of the last server or peer connection -# <la Local IP address of the last server or peer connection -# <lp Local port number of the last server or peer connection -# <qos Server connection TOS/DSCP value set by Squid -# <nfmark Server connection netfilter mark set by Squid -# -# Time related format codes: -# -# ts Seconds since epoch -# tu subsecond time (milliseconds) -# tl Local time. Optional strftime format argument -# default %d/%b/%Y:%H:%M:%S %z -# tg GMT time. Optional strftime format argument -# default %d/%b/%Y:%H:%M:%S %z -# tr Response time (milliseconds) -# dt Total time spent making DNS lookups (milliseconds) -# -# Access Control related format codes: -# -# et Tag returned by external acl -# ea Log string returned by external acl -# un User name (any available) -# ul User name from authentication -# ue User name from external acl helper -# ui User name from ident -# us User name from SSL -# -# HTTP related format codes: -# -# [http::]>h Original received request header. -# Usually differs from the request header sent by -# Squid, although most fields are often preserved. -# Accepts optional header field name/value filter -# argument using name[:[separator]element] format. -# [http::]>ha Received request header after adaptation and -# redirection (pre-cache REQMOD vectoring point). -# Usually differs from the request header sent by -# Squid, although most fields are often preserved. -# Optional header name argument as for >h -# [http::]<h Reply header. Optional header name argument -# as for >h -# [http::]>Hs HTTP status code sent to the client -# [http::]<Hs HTTP status code received from the next hop -# [http::]<bs Number of HTTP-equivalent message body bytes -# received from the next hop, excluding chunked -# transfer encoding and control messages. -# Generated FTP/Gopher listings are treated as -# received bodies. -# [http::]mt MIME content type -# [http::]rm Request method (GET/POST etc) -# [http::]>rm Request method from client -# [http::]<rm Request method sent to server or peer -# [http::]ru Request URL from client (historic, filtered for logging) -# [http::]>ru Request URL from client -# [http::]<ru Request URL sent to server or peer -# [http::]rp Request URL-Path excluding hostname -# [http::]>rp Request URL-Path excluding hostname from client -# [http::]<rp Request URL-Path excluding hostname sento to server or peer -# [http::]rv Request protocol version -# [http::]>rv Request protocol version from client -# [http::]<rv Request protocol version sent to server or peer -# [http::]<st Sent reply size including HTTP headers -# [http::]>st Received request size including HTTP headers. In the -# case of chunked requests the chunked encoding metadata -# are not included -# [http::]>sh Received HTTP request headers size -# [http::]<sh Sent HTTP reply headers size -# [http::]st Request+Reply size including HTTP headers -# [http::]<sH Reply high offset sent -# [http::]<sS Upstream object size -# [http::]<pt Peer response time in milliseconds. The timer starts -# when the last request byte is sent to the next hop -# and stops when the last response byte is received. -# [http::]<tt Total server-side time in milliseconds. The timer -# starts with the first connect request (or write I/O) -# sent to the first selected peer. The timer stops -# with the last I/O with the last peer. -# -# Squid handling related format codes: -# -# Ss Squid request status (TCP_MISS etc) -# Sh Squid hierarchy status (DEFAULT_PARENT etc) -# -# SSL-related format codes: -# -# ssl::bump_mode SslBump decision for the transaction: -# -# For CONNECT requests that initiated bumping of -# a connection and for any request received on -# an already bumped connection, Squid logs the -# corresponding SslBump mode ("server-first" or -# "client-first"). See the ssl_bump option for -# more information about these modes. -# -# A "none" token is logged for requests that -# triggered "ssl_bump" ACL evaluation matching -# either a "none" rule or no rules at all. -# -# In all other cases, a single dash ("-") is -# logged. -# -# If ICAP is enabled, the following code becomes available (as -# well as ICAP log codes documented with the icap_log option): -# -# icap::tt Total ICAP processing time for the HTTP -# transaction. The timer ticks when ICAP -# ACLs are checked and when ICAP -# transaction is in progress. -# -# If adaptation is enabled the following three codes become available: -# -# adapt::<last_h The header of the last ICAP response or -# meta-information from the last eCAP -# transaction related to the HTTP transaction. -# Like <h, accepts an optional header name -# argument. -# -# adapt::sum_trs Summed adaptation transaction response -# times recorded as a comma-separated list in -# the order of transaction start time. Each time -# value is recorded as an integer number, -# representing response time of one or more -# adaptation (ICAP or eCAP) transaction in -# milliseconds. When a failed transaction is -# being retried or repeated, its time is not -# logged individually but added to the -# replacement (next) transaction. See also: -# adapt::all_trs. -# -# adapt::all_trs All adaptation transaction response times. -# Same as adaptation_strs but response times of -# individual transactions are never added -# together. Instead, all transaction response -# times are recorded individually. -# -# You can prefix adapt::*_trs format codes with adaptation -# service name in curly braces to record response time(s) specific -# to that service. For example: %{my_service}adapt::sum_trs -# -# If SSL is enabled, the following formating codes become available: -# -# %ssl::>cert_subject The Subject field of the received client -# SSL certificate or a dash ('-') if Squid has -# received an invalid/malformed certificate or -# no certificate at all. Consider encoding the -# logged value because Subject often has spaces. -# -# %ssl::>cert_issuer The Issuer field of the received client -# SSL certificate or a dash ('-') if Squid has -# received an invalid/malformed certificate or -# no certificate at all. Consider encoding the -# logged value because Issuer often has spaces. -# -# The default formats available (which do not need re-defining) are: -# -#logformat squid %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt -#logformat common %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh -#logformat combined %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh -#logformat referrer %ts.%03tu %>a %{Referer}>h %ru -#logformat useragent %>a [%tl] "%{User-Agent}>h" -# -# NOTE: When the log_mime_hdrs directive is set to ON. -# The squid, common and combined formats have a safely encoded copy -# of the mime headers appended to each line within a pair of brackets. -# -# NOTE: The common and combined formats are not quite true to the Apache definition. -# The logs from Squid contain an extra status and hierarchy code appended. -# -#Default: -# The format definitions squid, common, combined, referrer, useragent are built in. - -# TAG: access_log -# Configures whether and how Squid logs HTTP and ICP transactions. -# If access logging is enabled, a single line is logged for every -# matching HTTP or ICP request. The recommended directive formats are: -# -# access_log <module>:<place> [option ...] [acl acl ...] -# access_log none [acl acl ...] -# -# The following directive format is accepted but may be deprecated: -# access_log <module>:<place> [<logformat name> [acl acl ...]] -# -# In most cases, the first ACL name must not contain the '=' character -# and should not be equal to an existing logformat name. You can always -# start with an 'all' ACL to work around those restrictions. -# -# Will log to the specified module:place using the specified format (which -# must be defined in a logformat directive) those entries which match -# ALL the acl's specified (which must be defined in acl clauses). -# If no acl is specified, all requests will be logged to this destination. -# -# ===== Available options for the recommended directive format ===== -# -# logformat=name Names log line format (either built-in or -# defined by a logformat directive). Defaults -# to 'squid'. -# -# buffer-size=64KB Defines approximate buffering limit for log -# records (see buffered_logs). Squid should not -# keep more than the specified size and, hence, -# should flush records before the buffer becomes -# full to avoid overflows under normal -# conditions (the exact flushing algorithm is -# module-dependent though). The on-error option -# controls overflow handling. -# -# on-error=die|drop Defines action on unrecoverable errors. The -# 'drop' action ignores (i.e., does not log) -# affected log records. The default 'die' action -# kills the affected worker. The drop action -# support has not been tested for modules other -# than tcp. -# -# ===== Modules Currently available ===== -# -# none Do not log any requests matching these ACL. -# Do not specify Place or logformat name. -# -# stdio Write each log line to disk immediately at the completion of -# each request. -# Place: the filename and path to be written. -# -# daemon Very similar to stdio. But instead of writing to disk the log -# line is passed to a daemon helper for asychronous handling instead. -# Place: varies depending on the daemon. -# -# log_file_daemon Place: the file name and path to be written. -# -# syslog To log each request via syslog facility. -# Place: The syslog facility and priority level for these entries. -# Place Format: facility.priority -# -# where facility could be any of: -# authpriv, daemon, local0 ... local7 or user. -# -# And priority could be any of: -# err, warning, notice, info, debug. -# -# udp To send each log line as text data to a UDP receiver. -# Place: The destination host name or IP and port. -# Place Format: //host:port -# -# tcp To send each log line as text data to a TCP receiver. -# Lines may be accumulated before sending (see buffered_logs). -# Place: The destination host name or IP and port. -# Place Format: //host:port -# -# Default: -# access_log daemon:/var/log/squid/access.log squid -#Default: -# access_log daemon:/var/log/squid/access.log squid - -# TAG: icap_log -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# ICAP log files record ICAP transaction summaries, one line per -# transaction. -# -# The icap_log option format is: -# icap_log <filepath> [<logformat name> [acl acl ...]] -# icap_log none [acl acl ...]] -# -# Please see access_log option documentation for details. The two -# kinds of logs share the overall configuration approach and many -# features. -# -# ICAP processing of a single HTTP message or transaction may -# require multiple ICAP transactions. In such cases, multiple -# ICAP transaction log lines will correspond to a single access -# log line. -# -# ICAP log uses logformat codes that make sense for an ICAP -# transaction. Header-related codes are applied to the HTTP header -# embedded in an ICAP server response, with the following caveats: -# For REQMOD, there is no HTTP response header unless the ICAP -# server performed request satisfaction. For RESPMOD, the HTTP -# request header is the header sent to the ICAP server. For -# OPTIONS, there are no HTTP headers. -# -# The following format codes are also available for ICAP logs: -# -# icap::<A ICAP server IP address. Similar to <A. -# -# icap::<service_name ICAP service name from the icap_service -# option in Squid configuration file. -# -# icap::ru ICAP Request-URI. Similar to ru. -# -# icap::rm ICAP request method (REQMOD, RESPMOD, or -# OPTIONS). Similar to existing rm. -# -# icap::>st Bytes sent to the ICAP server (TCP payload -# only; i.e., what Squid writes to the socket). -# -# icap::<st Bytes received from the ICAP server (TCP -# payload only; i.e., what Squid reads from -# the socket). -# -# icap::<bs Number of message body bytes received from the -# ICAP server. ICAP message body, if any, usually -# includes encapsulated HTTP message headers and -# possibly encapsulated HTTP message body. The -# HTTP body part is dechunked before its size is -# computed. -# -# icap::tr Transaction response time (in -# milliseconds). The timer starts when -# the ICAP transaction is created and -# stops when the transaction is completed. -# Similar to tr. -# -# icap::tio Transaction I/O time (in milliseconds). The -# timer starts when the first ICAP request -# byte is scheduled for sending. The timers -# stops when the last byte of the ICAP response -# is received. -# -# icap::to Transaction outcome: ICAP_ERR* for all -# transaction errors, ICAP_OPT for OPTION -# transactions, ICAP_ECHO for 204 -# responses, ICAP_MOD for message -# modification, and ICAP_SAT for request -# satisfaction. Similar to Ss. -# -# icap::Hs ICAP response status code. Similar to Hs. -# -# icap::>h ICAP request header(s). Similar to >h. -# -# icap::<h ICAP response header(s). Similar to <h. -# -# The default ICAP log format, which can be used without an explicit -# definition, is called icap_squid: -# -#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A - -# -# See also: logformat, log_icap, and %adapt::<last_h -#Default: -# none - -# TAG: logfile_daemon -# Specify the path to the logfile-writing daemon. This daemon is -# used to write the access and store logs, if configured. -# -# Squid sends a number of commands to the log daemon: -# L<data>\n - logfile data -# R\n - rotate file -# T\n - truncate file -# O\n - reopen file -# F\n - flush file -# r<n>\n - set rotate count to <n> -# b<n>\n - 1 = buffer output, 0 = don't buffer output -# -# No responses is expected. -#Default: -# logfile_daemon /usr/libexec/log_file_daemon - -# TAG: log_access -# Remove this line. Use acls with access_log directives to control access logging -#Default: -# none - -# TAG: log_icap -# Remove this line. Use acls with icap_log directives to control icap logging -#Default: -# none - -# TAG: stats_collection allow|deny acl acl... -# This options allows you to control which requests gets accounted -# in performance counters. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow logging for all transactions. - -# TAG: cache_store_log -# Logs the activities of the storage manager. Shows which -# objects are ejected from the cache, and which objects are -# saved and for how long. -# There are not really utilities to analyze this data, so you can safely -# disable it (the default). -# -# Store log uses modular logging outputs. See access_log for the list -# of modules supported. -# -# Example: -# cache_store_log stdio:/var/log/squid/store.log -# cache_store_log daemon:/var/log/squid/store.log -#Default: -# none - -# TAG: cache_swap_state -# Location for the cache "swap.state" file. This index file holds -# the metadata of objects saved on disk. It is used to rebuild -# the cache during startup. Normally this file resides in each -# 'cache_dir' directory, but you may specify an alternate -# pathname here. Note you must give a full filename, not just -# a directory. Since this is the index for the whole object -# list you CANNOT periodically rotate it! -# -# If %s can be used in the file name it will be replaced with a -# a representation of the cache_dir name where each / is replaced -# with '.'. This is needed to allow adding/removing cache_dir -# lines when cache_swap_log is being used. -# -# If have more than one 'cache_dir', and %s is not used in the name -# these swap logs will have names such as: -# -# cache_swap_log.00 -# cache_swap_log.01 -# cache_swap_log.02 -# -# The numbered extension (which is added automatically) -# corresponds to the order of the 'cache_dir' lines in this -# configuration file. If you change the order of the 'cache_dir' -# lines in this file, these index files will NOT correspond to -# the correct 'cache_dir' entry (unless you manually rename -# them). We recommend you do NOT use this option. It is -# better to keep these index files in each 'cache_dir' directory. -#Default: -# Store the journal inside its cache_dir - -# TAG: logfile_rotate -# Specifies the number of logfile rotations to make when you -# type 'squid -k rotate'. The default is 10, which will rotate -# with extensions 0 through 9. Setting logfile_rotate to 0 will -# disable the file name rotation, but the logfiles are still closed -# and re-opened. This will enable you to rename the logfiles -# yourself just before sending the rotate signal. -# -# Note, the 'squid -k rotate' command normally sends a USR1 -# signal to the running squid process. In certain situations -# (e.g. on Linux with Async I/O), USR1 is used for other -# purposes, so -k rotate uses another signal. It is best to get -# in the habit of using 'squid -k rotate' instead of 'kill -USR1 -# <pid>'. -# -# Note, from Squid-3.1 this option is only a default for cache.log, -# that log can be rotated separately by using debug_options. -#Default: -# logfile_rotate 10 - -# TAG: emulate_httpd_log -# Replace this with an access_log directive using the format 'common' or 'combined'. -#Default: -# none - -# TAG: log_ip_on_direct -# Remove this option from your config. To log server or peer names use %<A in the log format. -#Default: -# none - -# TAG: mime_table -# Path to Squid's icon configuration file. -# -# You shouldn't need to change this, but the default file contains -# examples and formatting information if you do. -#Default: -# mime_table /etc/squid/mime.conf - -# TAG: log_mime_hdrs on|off -# The Cache can record both the request and the response MIME -# headers for each HTTP transaction. The headers are encoded -# safely and will appear as two bracketed fields at the end of -# the access log (for either the native or httpd-emulated log -# formats). To enable this logging set log_mime_hdrs to 'on'. -#Default: -# log_mime_hdrs off - -# TAG: useragent_log -# Replace this with an access_log directive using the format 'useragent'. -#Default: -# none - -# TAG: referer_log -# Replace this with an access_log directive using the format 'referrer'. -#Default: -# none - -# TAG: pid_filename -# A filename to write the process-id to. To disable, enter "none". -#Default: -pid_filename /var/run/squid/squid.pid - -# TAG: log_fqdn -# Remove this option from your config. To log FQDN use %>A in the log format. -#Default: -# none - -# TAG: client_netmask -# A netmask for client addresses in logfiles and cachemgr output. -# Change this to protect the privacy of your cache clients. -# A netmask of 255.255.255.0 will log all IP's in that range with -# the last digit set to '0'. -#Default: -# Log full client IP address - -# TAG: forward_log -# Use a regular access.log with ACL limiting it to MISS events. -#Default: -# none - -# TAG: strip_query_terms -# By default, Squid strips query terms from requested URLs before -# logging. This protects your user's privacy and reduces log size. -# -# When investigating HIT/MISS or other caching behaviour you -# will need to disable this to see the full URL used by Squid. -#Default: -# strip_query_terms on - -# TAG: buffered_logs on|off -# Whether to write/send access_log records ASAP or accumulate them and -# then write/send them in larger chunks. Buffering may improve -# performance because it decreases the number of I/Os. However, -# buffering increases the delay before log records become available to -# the final recipient (e.g., a disk file or logging daemon) and, -# hence, increases the risk of log records loss. -# -# Note that even when buffered_logs are off, Squid may have to buffer -# records if it cannot write/send them immediately due to pending I/Os -# (e.g., the I/O writing the previous log record) or connectivity loss. -# -# Currently honored by 'daemon' and 'tcp' access_log modules only. -#Default: -# buffered_logs off - -# TAG: netdb_filename -# Note: This option is only available if Squid is rebuilt with the -# --enable-icmp -# -# Where Squid stores it's netdb journal. -# When enabled this journal preserves netdb state between restarts. -# -# To disable, enter "none". -#Default: -# netdb_filename stdio:/var/log/squid/netdb.state - -# OPTIONS FOR TROUBLESHOOTING -# ----------------------------------------------------------------------------- - -# TAG: cache_log -# Squid administrative logging file. -# -# This is where general information about Squid behavior goes. You can -# increase the amount of data logged to this file and how often it is -# rotated with "debug_options" -#Default: -# cache_log /var/log/squid/cache.log - -# TAG: debug_options -# Logging options are set as section,level where each source file -# is assigned a unique section. Lower levels result in less -# output, Full debugging (level 9) can result in a very large -# log file, so be careful. -# -# The magic word "ALL" sets debugging levels for all sections. -# The default is to run with "ALL,1" to record important warnings. -# -# The rotate=N option can be used to keep more or less of these logs -# than would otherwise be kept by logfile_rotate. -# For most uses a single log should be enough to monitor current -# events affecting Squid. -#Default: -# Log all critical and important messages. - -# TAG: coredump_dir -# By default Squid leaves core files in the directory from where -# it was started. If you set 'coredump_dir' to a directory -# that exists, Squid will chdir() to that directory at startup -# and coredump files will be left there. -# -#Default: -# Use the directory from where Squid was started. -# - -# Leave coredumps in the first cache dir -coredump_dir /var/log/squid/cache/squid - -# OPTIONS FOR FTP GATEWAYING -# ----------------------------------------------------------------------------- - -# TAG: ftp_user -# If you want the anonymous login password to be more informative -# (and enable the use of picky FTP servers), set this to something -# reasonable for your domain, like wwwuser@somewhere.net -# -# The reason why this is domainless by default is the -# request can be made on the behalf of a user in any domain, -# depending on how the cache is used. -# Some FTP server also validate the email address is valid -# (for example perl.com). -#Default: -# ftp_user Squid@ - -# TAG: ftp_passive -# If your firewall does not allow Squid to use passive -# connections, turn off this option. -# -# Use of ftp_epsv_all option requires this to be ON. -#Default: -# ftp_passive on - -# TAG: ftp_epsv_all -# FTP Protocol extensions permit the use of a special "EPSV ALL" command. -# -# NATs may be able to put the connection on a "fast path" through the -# translator, as the EPRT command will never be used and therefore, -# translation of the data portion of the segments will never be needed. -# -# When a client only expects to do two-way FTP transfers this may be -# useful. -# If squid finds that it must do a three-way FTP transfer after issuing -# an EPSV ALL command, the FTP session will fail. -# -# If you have any doubts about this option do not use it. -# Squid will nicely attempt all other connection methods. -# -# Requires ftp_passive to be ON (default) for any effect. -#Default: -# ftp_epsv_all off - -# TAG: ftp_epsv -# FTP Protocol extensions permit the use of a special "EPSV" command. -# -# NATs may be able to put the connection on a "fast path" through the -# translator using EPSV, as the EPRT command will never be used -# and therefore, translation of the data portion of the segments -# will never be needed. -# -# Turning this OFF will prevent EPSV being attempted. -# WARNING: Doing so will convert Squid back to the old behavior with all -# the related problems with external NAT devices/layers. -# -# Requires ftp_passive to be ON (default) for any effect. -#Default: -# ftp_epsv on - -# TAG: ftp_eprt -# FTP Protocol extensions permit the use of a special "EPRT" command. -# -# This extension provides a protocol neutral alternative to the -# IPv4-only PORT command. When supported it enables active FTP data -# channels over IPv6 and efficient NAT handling. -# -# Turning this OFF will prevent EPRT being attempted and will skip -# straight to using PORT for IPv4 servers. -# -# Some devices are known to not handle this extension correctly and -# may result in crashes. Devices which suport EPRT enough to fail -# cleanly will result in Squid attempting PORT anyway. This directive -# should only be disabled when EPRT results in device failures. -# -# WARNING: Doing so will convert Squid back to the old behavior with all -# the related problems with external NAT devices/layers and IPv4-only FTP. -#Default: -# ftp_eprt on - -# TAG: ftp_sanitycheck -# For security and data integrity reasons Squid by default performs -# sanity checks of the addresses of FTP data connections ensure the -# data connection is to the requested server. If you need to allow -# FTP connections to servers using another IP address for the data -# connection turn this off. -#Default: -# ftp_sanitycheck on - -# TAG: ftp_telnet_protocol -# The FTP protocol is officially defined to use the telnet protocol -# as transport channel for the control connection. However, many -# implementations are broken and does not respect this aspect of -# the FTP protocol. -# -# If you have trouble accessing files with ASCII code 255 in the -# path or similar problems involving this ASCII code you can -# try setting this directive to off. If that helps, report to the -# operator of the FTP server in question that their FTP server -# is broken and does not follow the FTP standard. -#Default: -# ftp_telnet_protocol on - -# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS -# ----------------------------------------------------------------------------- - -# TAG: diskd_program -# Specify the location of the diskd executable. -# Note this is only useful if you have compiled in -# diskd as one of the store io modules. -#Default: -# diskd_program /usr/libexec/diskd - -# TAG: unlinkd_program -# Specify the location of the executable for file deletion process. -#Default: -# unlinkd_program /usr/libexec/unlinkd - -# TAG: pinger_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-icmp -# -# Specify the location of the executable for the pinger process. -#Default: -# pinger_program /usr/libexec/pinger - -# TAG: pinger_enable -# Note: This option is only available if Squid is rebuilt with the -# --enable-icmp -# -# Control whether the pinger is active at run-time. -# Enables turning ICMP pinger on and off with a simple -# squid -k reconfigure. -#Default: -# pinger_enable on - -# OPTIONS FOR URL REWRITING -# ----------------------------------------------------------------------------- - -# TAG: url_rewrite_program -# Specify the location of the executable URL rewriter to use. -# Since they can perform almost any function there isn't one included. -# -# For each requested URL, the rewriter will receive on line with the format -# -# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL> -# -# -# After processing the request the helper must reply using the following format: -# -# [channel-ID <SP>] result [<SP> kv-pairs] -# -# The result code can be: -# -# OK status=30N url="..." -# Redirect the URL to the one supplied in 'url='. -# 'status=' is optional and contains the status code to send -# the client in Squids HTTP response. It must be one of the -# HTTP redirect status codes: 301, 302, 303, 307, 308. -# When no status is given Squid will use 302. -# -# OK rewrite-url="..." -# Rewrite the URL to the one supplied in 'rewrite-url='. -# The new URL is fetched directly by Squid and returned to -# the client as the response to its request. -# -# OK -# When neither of url= and rewrite-url= are sent Squid does -# not change the URL. -# -# ERR -# Do not change the URL. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. The 'message=' key name is -# reserved for delivering a log message. -# -# -# In the future, the interface protocol will be extended with -# key=value pairs ("kv-pairs" shown above). Helper programs -# should be prepared to receive and possibly ignore additional -# whitespace-separated tokens on each input line. -# -# When using the concurrency= option the protocol is changed by -# introducing a query channel tag in front of the request/response. -# The query channel tag is a number between 0 and concurrency-1. -# This value must be echoed back unchanged to Squid as the first part -# of the response relating to its request. -# -# WARNING: URL re-writing ability should be avoided whenever possible. -# Use the URL redirect form of response instead. -# -# Re-write creates a difference in the state held by the client -# and server. Possibly causing confusion when the server response -# contains snippets of its view state. Embeded URLs, response -# and content Location headers, etc. are not re-written by this -# interface. -# -# By default, a URL rewriter is not used. -#Default: -# none - -# TAG: url_rewrite_children -# The maximum number of redirector processes to spawn. If you limit -# it too few Squid will have to wait for them to process a backlog of -# URLs, slowing it down. If you allow too many they will use RAM -# and other system resources noticably. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup= -# -# Sets a minimum of how many processes are to be spawned when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few will cause an initial slowdown in traffic as Squid -# attempts to simultaneously spawn enough processes to cope. -# -# idle= -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# concurrency= -# -# The number of requests each redirector helper can handle in -# parallel. Defaults to 0 which indicates the redirector -# is a old-style single threaded redirector. -# -# When this directive is set to a value >= 1 then the protocol -# used to communicate with the helper is modified to include -# an ID in front of the request/response. The ID from the request -# must be echoed back with the response to that request. -#Default: -# url_rewrite_children 20 startup=0 idle=1 concurrency=0 - -# TAG: url_rewrite_host_header -# To preserve same-origin security policies in browsers and -# prevent Host: header forgery by redirectors Squid rewrites -# any Host: header in redirected requests. -# -# If you are running an accelerator this may not be a wanted -# effect of a redirector. This directive enables you disable -# Host: alteration in reverse-proxy traffic. -# -# WARNING: Entries are cached on the result of the URL rewriting -# process, so be careful if you have domain-virtual hosts. -# -# WARNING: Squid and other software verifies the URL and Host -# are matching, so be careful not to relay through other proxies -# or inspecting firewalls with this disabled. -#Default: -# url_rewrite_host_header on - -# TAG: url_rewrite_access -# If defined, this access list specifies which requests are -# sent to the redirector processes. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: url_rewrite_bypass -# When this is 'on', a request will not go through the -# redirector if all the helpers are busy. If this is 'off' -# and the redirector queue grows too large, Squid will exit -# with a FATAL error and ask you to increase the number of -# redirectors. You should only enable this if the redirectors -# are not critical to your caching system. If you use -# redirectors for access control, and you enable this option, -# users may have access to pages they should not -# be allowed to request. -#Default: -# url_rewrite_bypass off - -# OPTIONS FOR STORE ID -# ----------------------------------------------------------------------------- - -# TAG: store_id_program -# Specify the location of the executable StoreID helper to use. -# Since they can perform almost any function there isn't one included. -# -# For each requested URL, the helper will receive one line with the format -# -# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL> -# -# -# After processing the request the helper must reply using the following format: -# -# [channel-ID <SP>] result [<SP> kv-pairs] -# -# The result code can be: -# -# OK store-id="..." -# Use the StoreID supplied in 'store-id='. -# -# ERR -# The default is to use HTTP request URL as the store ID. -# -# BH -# An internal error occured in the helper, preventing -# a result being identified. -# -# -# Helper programs should be prepared to receive and possibly ignore additional -# kv-pairs with keys they do not support. -# -# When using the concurrency= option the protocol is changed by -# introducing a query channel tag in front of the request/response. -# The query channel tag is a number between 0 and concurrency-1. -# This value must be echoed back unchanged to Squid as the first part -# of the response relating to its request. -# -# NOTE: when using StoreID refresh_pattern will apply to the StoreID -# returned from the helper and not the URL. -# -# WARNING: Wrong StoreID value returned by a careless helper may result -# in the wrong cached response returned to the user. -# -# By default, a StoreID helper is not used. -#Default: -# none - -# TAG: store_id_children -# The maximum number of StoreID helper processes to spawn. If you limit -# it too few Squid will have to wait for them to process a backlog of -# requests, slowing it down. If you allow too many they will use RAM -# and other system resources noticably. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup= -# -# Sets a minimum of how many processes are to be spawned when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few will cause an initial slowdown in traffic as Squid -# attempts to simultaneously spawn enough processes to cope. -# -# idle= -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# concurrency= -# -# The number of requests each storeID helper can handle in -# parallel. Defaults to 0 which indicates the helper -# is a old-style single threaded program. -# -# When this directive is set to a value >= 1 then the protocol -# used to communicate with the helper is modified to include -# an ID in front of the request/response. The ID from the request -# must be echoed back with the response to that request. -#Default: -# store_id_children 20 startup=0 idle=1 concurrency=0 - -# TAG: store_id_access -# If defined, this access list specifies which requests are -# sent to the StoreID processes. By default all requests -# are sent. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: store_id_bypass -# When this is 'on', a request will not go through the -# helper if all helpers are busy. If this is 'off' -# and the helper queue grows too large, Squid will exit -# with a FATAL error and ask you to increase the number of -# helpers. You should only enable this if the helperss -# are not critical to your caching system. If you use -# helpers for critical caching components, and you enable this -# option, users may not get objects from cache. -#Default: -# store_id_bypass on - -# OPTIONS FOR TUNING THE CACHE -# ----------------------------------------------------------------------------- - -# TAG: cache -# A list of ACL elements which, if matched and denied, cause the request to -# not be satisfied from the cache and the reply to not be cached. -# In other words, use this to force certain objects to never be cached. -# -# You must use the words 'allow' or 'deny' to indicate whether items -# matching the ACL should be allowed or denied into the cache. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow caching, unless rules exist in squid.conf. - -# TAG: max_stale time-units -# This option puts an upper limit on how stale content Squid -# will serve from the cache if cache validation fails. -# Can be overriden by the refresh_pattern max-stale option. -#Default: -# max_stale 1 week - -# TAG: refresh_pattern -# usage: refresh_pattern [-i] regex min percent max [options] -# -# By default, regular expressions are CASE-SENSITIVE. To make -# them case-insensitive, use the -i option. -# -# 'Min' is the time (in minutes) an object without an explicit -# expiry time should be considered fresh. The recommended -# value is 0, any higher values may cause dynamic applications -# to be erroneously cached unless the application designer -# has taken the appropriate actions. -# -# 'Percent' is a percentage of the objects age (time since last -# modification age) an object without explicit expiry time -# will be considered fresh. -# -# 'Max' is an upper limit on how long objects without an explicit -# expiry time will be considered fresh. -# -# options: override-expire -# override-lastmod -# reload-into-ims -# ignore-reload -# ignore-no-store -# ignore-must-revalidate -# ignore-private -# ignore-auth -# max-stale=NN -# refresh-ims -# store-stale -# -# override-expire enforces min age even if the server -# sent an explicit expiry time (e.g., with the -# Expires: header or Cache-Control: max-age). Doing this -# VIOLATES the HTTP standard. Enabling this feature -# could make you liable for problems which it causes. -# -# Note: override-expire does not enforce staleness - it only extends -# freshness / min. If the server returns a Expires time which -# is longer than your max time, Squid will still consider -# the object fresh for that period of time. -# -# override-lastmod enforces min age even on objects -# that were modified recently. -# -# reload-into-ims changes a client no-cache or ``reload'' -# request for a cached entry into a conditional request using -# If-Modified-Since and/or If-None-Match headers, provided the -# cached entry has a Last-Modified and/or a strong ETag header. -# Doing this VIOLATES the HTTP standard. Enabling this feature -# could make you liable for problems which it causes. -# -# ignore-reload ignores a client no-cache or ``reload'' -# header. Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which -# it causes. -# -# ignore-no-store ignores any ``Cache-control: no-store'' -# headers received from a server. Doing this VIOLATES -# the HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# -# ignore-must-revalidate ignores any ``Cache-Control: must-revalidate`` -# headers received from a server. Doing this VIOLATES -# the HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# -# ignore-private ignores any ``Cache-control: private'' -# headers received from a server. Doing this VIOLATES -# the HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# -# ignore-auth caches responses to requests with authorization, -# as if the originserver had sent ``Cache-control: public'' -# in the response header. Doing this VIOLATES the HTTP standard. -# Enabling this feature could make you liable for problems which -# it causes. -# -# refresh-ims causes squid to contact the origin server -# when a client issues an If-Modified-Since request. This -# ensures that the client will receive an updated version -# if one is available. -# -# store-stale stores responses even if they don't have explicit -# freshness or a validator (i.e., Last-Modified or an ETag) -# present, or if they're already stale. By default, Squid will -# not cache such responses because they usually can't be -# reused. Note that such responses will be stale by default. -# -# max-stale=NN provide a maximum staleness factor. Squid won't -# serve objects more stale than this even if it failed to -# validate the object. Default: use the max_stale global limit. -# -# Basically a cached object is: -# -# FRESH if expires < now, else STALE -# STALE if age > max -# FRESH if lm-factor < percent, else STALE -# FRESH if age < min -# else STALE -# -# The refresh_pattern lines are checked in the order listed here. -# The first entry which matches is used. If none of the entries -# match the default will be used. -# -# Note, you must uncomment all the default lines if you want -# to change one. The default setting is only active if none is -# used. -# -# - -# -# Add any of your own refresh_pattern entries above these. -# -refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 -refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 -refresh_pattern . 0 20% 4320 - -# TAG: quick_abort_min (KB) -#Default: -# quick_abort_min 16 KB - -# TAG: quick_abort_max (KB) -#Default: -# quick_abort_max 16 KB - -# TAG: quick_abort_pct (percent) -# The cache by default continues downloading aborted requests -# which are almost completed (less than 16 KB remaining). This -# may be undesirable on slow (e.g. SLIP) links and/or very busy -# caches. Impatient users may tie up file descriptors and -# bandwidth by repeatedly requesting and immediately aborting -# downloads. -# -# When the user aborts a request, Squid will check the -# quick_abort values to the amount of data transferred until -# then. -# -# If the transfer has less than 'quick_abort_min' KB remaining, -# it will finish the retrieval. -# -# If the transfer has more than 'quick_abort_max' KB remaining, -# it will abort the retrieval. -# -# If more than 'quick_abort_pct' of the transfer has completed, -# it will finish the retrieval. -# -# If you do not want any retrieval to continue after the client -# has aborted, set both 'quick_abort_min' and 'quick_abort_max' -# to '0 KB'. -# -# If you want retrievals to always continue if they are being -# cached set 'quick_abort_min' to '-1 KB'. -#Default: -# quick_abort_pct 95 - -# TAG: read_ahead_gap buffer-size -# The amount of data the cache will buffer ahead of what has been -# sent to the client when retrieving an object from another server. -#Default: -# read_ahead_gap 16 KB - -# TAG: negative_ttl time-units -# Set the Default Time-to-Live (TTL) for failed requests. -# Certain types of failures (such as "connection refused" and -# "404 Not Found") are able to be negatively-cached for a short time. -# Modern web servers should provide Expires: header, however if they -# do not this can provide a minimum TTL. -# The default is not to cache errors with unknown expiry details. -# -# Note that this is different from negative caching of DNS lookups. -# -# WARNING: Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which it -# causes. -#Default: -# negative_ttl 0 seconds - -# TAG: positive_dns_ttl time-units -# Upper limit on how long Squid will cache positive DNS responses. -# Default is 6 hours (360 minutes). This directive must be set -# larger than negative_dns_ttl. -#Default: -# positive_dns_ttl 6 hours - -# TAG: negative_dns_ttl time-units -# Time-to-Live (TTL) for negative caching of failed DNS lookups. -# This also sets the lower cache limit on positive lookups. -# Minimum value is 1 second, and it is not recommendable to go -# much below 10 seconds. -#Default: -# negative_dns_ttl 1 minutes - -# TAG: range_offset_limit size [acl acl...] -# usage: (size) [units] [[!]aclname] -# -# Sets an upper limit on how far (number of bytes) into the file -# a Range request may be to cause Squid to prefetch the whole file. -# If beyond this limit, Squid forwards the Range request as it is and -# the result is NOT cached. -# -# This is to stop a far ahead range request (lets say start at 17MB) -# from making Squid fetch the whole object up to that point before -# sending anything to the client. -# -# Multiple range_offset_limit lines may be specified, and they will -# be searched from top to bottom on each request until a match is found. -# The first match found will be used. If no line matches a request, the -# default limit of 0 bytes will be used. -# -# 'size' is the limit specified as a number of units. -# -# 'units' specifies whether to use bytes, KB, MB, etc. -# If no units are specified bytes are assumed. -# -# A size of 0 causes Squid to never fetch more than the -# client requested. (default) -# -# A size of 'none' causes Squid to always fetch the object from the -# beginning so it may cache the result. (2.0 style) -# -# 'aclname' is the name of a defined ACL. -# -# NP: Using 'none' as the byte value here will override any quick_abort settings -# that may otherwise apply to the range request. The range request will -# be fully fetched from start to finish regardless of the client -# actions. This affects bandwidth usage. -#Default: -# none - -# TAG: minimum_expiry_time (seconds) -# The minimum caching time according to (Expires - Date) -# headers Squid honors if the object can't be revalidated. -# The default is 60 seconds. -# -# In reverse proxy environments it might be desirable to honor -# shorter object lifetimes. It is most likely better to make -# your server return a meaningful Last-Modified header however. -# -# In ESI environments where page fragments often have short -# lifetimes, this will often be best set to 0. -#Default: -# minimum_expiry_time 60 seconds - -# TAG: store_avg_object_size (bytes) -# Average object size, used to estimate number of objects your -# cache can hold. The default is 13 KB. -# -# This is used to pre-seed the cache index memory allocation to -# reduce expensive reallocate operations while handling clients -# traffic. Too-large values may result in memory allocation during -# peak traffic, too-small values will result in wasted memory. -# -# Check the cache manager 'info' report metrics for the real -# object sizes seen by your Squid before tuning this. -#Default: -# store_avg_object_size 13 KB - -# TAG: store_objects_per_bucket -# Target number of objects per bucket in the store hash table. -# Lowering this value increases the total number of buckets and -# also the storage maintenance rate. The default is 20. -#Default: -# store_objects_per_bucket 20 - -# HTTP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: request_header_max_size (KB) -# This specifies the maximum size for HTTP headers in a request. -# Request headers are usually relatively small (about 512 bytes). -# Placing a limit on the request header size will catch certain -# bugs (for example with persistent connections) and possibly -# buffer-overflow or denial-of-service attacks. -#Default: -# request_header_max_size 64 KB - -# TAG: reply_header_max_size (KB) -# This specifies the maximum size for HTTP headers in a reply. -# Reply headers are usually relatively small (about 512 bytes). -# Placing a limit on the reply header size will catch certain -# bugs (for example with persistent connections) and possibly -# buffer-overflow or denial-of-service attacks. -#Default: -# reply_header_max_size 64 KB - -# TAG: request_body_max_size (bytes) -# This specifies the maximum size for an HTTP request body. -# In other words, the maximum size of a PUT/POST request. -# A user who attempts to send a request with a body larger -# than this limit receives an "Invalid Request" error message. -# If you set this parameter to a zero (the default), there will -# be no limit imposed. -# -# See also client_request_buffer_max_size for an alternative -# limitation on client uploads which can be configured. -#Default: -# No limit. - -# TAG: client_request_buffer_max_size (bytes) -# This specifies the maximum buffer size of a client request. -# It prevents squid eating too much memory when somebody uploads -# a large file. -#Default: -# client_request_buffer_max_size 512 KB - -# TAG: chunked_request_body_max_size (bytes) -# A broken or confused HTTP/1.1 client may send a chunked HTTP -# request to Squid. Squid does not have full support for that -# feature yet. To cope with such requests, Squid buffers the -# entire request and then dechunks request body to create a -# plain HTTP/1.0 request with a known content length. The plain -# request is then used by the rest of Squid code as usual. -# -# The option value specifies the maximum size of the buffer used -# to hold the request before the conversion. If the chunked -# request size exceeds the specified limit, the conversion -# fails, and the client receives an "unsupported request" error, -# as if dechunking was disabled. -# -# Dechunking is enabled by default. To disable conversion of -# chunked requests, set the maximum to zero. -# -# Request dechunking feature and this option in particular are a -# temporary hack. When chunking requests and responses are fully -# supported, there will be no need to buffer a chunked request. -#Default: -# chunked_request_body_max_size 64 KB - -# TAG: broken_posts -# A list of ACL elements which, if matched, causes Squid to send -# an extra CRLF pair after the body of a PUT/POST request. -# -# Some HTTP servers has broken implementations of PUT/POST, -# and rely on an extra CRLF pair sent by some WWW clients. -# -# Quote from RFC2616 section 4.1 on this matter: -# -# Note: certain buggy HTTP/1.0 client implementations generate an -# extra CRLF's after a POST request. To restate what is explicitly -# forbidden by the BNF, an HTTP/1.1 client must not preface or follow -# a request with an extra CRLF. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -#Example: -# acl buggy_server url_regex ^http://.... -# broken_posts allow buggy_server -#Default: -# Obey RFC 2616. - -# TAG: adaptation_uses_indirect_client on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap) -# -# Controls whether the indirect client IP address (instead of the direct -# client IP address) is passed to adaptation services. -# -# See also: follow_x_forwarded_for adaptation_send_client_ip -#Default: -# adaptation_uses_indirect_client on - -# TAG: via on|off -# If set (default), Squid will include a Via header in requests and -# replies as required by RFC2616. -#Default: -# via on - -# TAG: ie_refresh on|off -# Microsoft Internet Explorer up until version 5.5 Service -# Pack 1 has an issue with transparent proxies, wherein it -# is impossible to force a refresh. Turning this on provides -# a partial fix to the problem, by causing all IMS-REFRESH -# requests from older IE versions to check the origin server -# for fresh content. This reduces hit ratio by some amount -# (~10% in my experience), but allows users to actually get -# fresh content when they want it. Note because Squid -# cannot tell if the user is using 5.5 or 5.5SP1, the behavior -# of 5.5 is unchanged from old versions of Squid (i.e. a -# forced refresh is impossible). Newer versions of IE will, -# hopefully, continue to have the new behavior and will be -# handled based on that assumption. This option defaults to -# the old Squid behavior, which is better for hit ratios but -# worse for clients using IE, if they need to be able to -# force fresh content. -#Default: -# ie_refresh off - -# TAG: vary_ignore_expire on|off -# Many HTTP servers supporting Vary gives such objects -# immediate expiry time with no cache-control header -# when requested by a HTTP/1.0 client. This option -# enables Squid to ignore such expiry times until -# HTTP/1.1 is fully implemented. -# -# WARNING: If turned on this may eventually cause some -# varying objects not intended for caching to get cached. -#Default: -# vary_ignore_expire off - -# TAG: request_entities -# Squid defaults to deny GET and HEAD requests with request entities, -# as the meaning of such requests are undefined in the HTTP standard -# even if not explicitly forbidden. -# -# Set this directive to on if you have clients which insists -# on sending request entities in GET or HEAD requests. But be warned -# that there is server software (both proxies and web servers) which -# can fail to properly process this kind of request which may make you -# vulnerable to cache pollution attacks if enabled. -#Default: -# request_entities off - -# TAG: request_header_access -# Usage: request_header_access header_name allow|deny [!]aclname ... -# -# WARNING: Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which it -# causes. -# -# This option replaces the old 'anonymize_headers' and the -# older 'http_anonymizer' option with something that is much -# more configurable. A list of ACLs for each header name allows -# removal of specific header fields under specific conditions. -# -# This option only applies to outgoing HTTP request headers (i.e., -# headers sent by Squid to the next HTTP hop such as a cache peer -# or an origin server). The option has no effect during cache hit -# detection. The equivalent adaptation vectoring point in ICAP -# terminology is post-cache REQMOD. -# -# The option is applied to individual outgoing request header -# fields. For each request header field F, Squid uses the first -# qualifying sets of request_header_access rules: -# -# 1. Rules with header_name equal to F's name. -# 2. Rules with header_name 'Other', provided F's name is not -# on the hard-coded list of commonly used HTTP header names. -# 3. Rules with header_name 'All'. -# -# Within that qualifying rule set, rule ACLs are checked as usual. -# If ACLs of an "allow" rule match, the header field is allowed to -# go through as is. If ACLs of a "deny" rule match, the header is -# removed and request_header_replace is then checked to identify -# if the removed header has a replacement. If no rules within the -# set have matching ACLs, the header field is left as is. -# -# For example, to achieve the same behavior as the old -# 'http_anonymizer standard' option, you should use: -# -# request_header_access From deny all -# request_header_access Referer deny all -# request_header_access User-Agent deny all -# -# Or, to reproduce the old 'http_anonymizer paranoid' feature -# you should use: -# -# request_header_access Authorization allow all -# request_header_access Proxy-Authorization allow all -# request_header_access Cache-Control allow all -# request_header_access Content-Length allow all -# request_header_access Content-Type allow all -# request_header_access Date allow all -# request_header_access Host allow all -# request_header_access If-Modified-Since allow all -# request_header_access Pragma allow all -# request_header_access Accept allow all -# request_header_access Accept-Charset allow all -# request_header_access Accept-Encoding allow all -# request_header_access Accept-Language allow all -# request_header_access Connection allow all -# request_header_access All deny all -# -# HTTP reply headers are controlled with the reply_header_access directive. -# -# By default, all headers are allowed (no anonymizing is performed). -#Default: -# No limits. - -# TAG: reply_header_access -# Usage: reply_header_access header_name allow|deny [!]aclname ... -# -# WARNING: Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which it -# causes. -# -# This option only applies to reply headers, i.e., from the -# server to the client. -# -# This is the same as request_header_access, but in the other -# direction. Please see request_header_access for detailed -# documentation. -# -# For example, to achieve the same behavior as the old -# 'http_anonymizer standard' option, you should use: -# -# reply_header_access Server deny all -# reply_header_access WWW-Authenticate deny all -# reply_header_access Link deny all -# -# Or, to reproduce the old 'http_anonymizer paranoid' feature -# you should use: -# -# reply_header_access Allow allow all -# reply_header_access WWW-Authenticate allow all -# reply_header_access Proxy-Authenticate allow all -# reply_header_access Cache-Control allow all -# reply_header_access Content-Encoding allow all -# reply_header_access Content-Length allow all -# reply_header_access Content-Type allow all -# reply_header_access Date allow all -# reply_header_access Expires allow all -# reply_header_access Last-Modified allow all -# reply_header_access Location allow all -# reply_header_access Pragma allow all -# reply_header_access Content-Language allow all -# reply_header_access Retry-After allow all -# reply_header_access Title allow all -# reply_header_access Content-Disposition allow all -# reply_header_access Connection allow all -# reply_header_access All deny all -# -# HTTP request headers are controlled with the request_header_access directive. -# -# By default, all headers are allowed (no anonymizing is -# performed). -#Default: -# No limits. - -# TAG: request_header_replace -# Usage: request_header_replace header_name message -# Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit) -# -# This option allows you to change the contents of headers -# denied with request_header_access above, by replacing them -# with some fixed string. -# -# This only applies to request headers, not reply headers. -# -# By default, headers are removed if denied. -#Default: -# none - -# TAG: reply_header_replace -# Usage: reply_header_replace header_name message -# Example: reply_header_replace Server Foo/1.0 -# -# This option allows you to change the contents of headers -# denied with reply_header_access above, by replacing them -# with some fixed string. -# -# This only applies to reply headers, not request headers. -# -# By default, headers are removed if denied. -#Default: -# none - -# TAG: request_header_add -# Usage: request_header_add field-name field-value acl1 [acl2] ... -# Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all -# -# This option adds header fields to outgoing HTTP requests (i.e., -# request headers sent by Squid to the next HTTP hop such as a -# cache peer or an origin server). The option has no effect during -# cache hit detection. The equivalent adaptation vectoring point -# in ICAP terminology is post-cache REQMOD. -# -# Field-name is a token specifying an HTTP header name. If a -# standard HTTP header name is used, Squid does not check whether -# the new header conflicts with any existing headers or violates -# HTTP rules. If the request to be modified already contains a -# field with the same name, the old field is preserved but the -# header field values are not merged. -# -# Field-value is either a token or a quoted string. If quoted -# string format is used, then the surrounding quotes are removed -# while escape sequences and %macros are processed. -# -# In theory, all of the logformat codes can be used as %macros. -# However, unlike logging (which happens at the very end of -# transaction lifetime), the transaction may not yet have enough -# information to expand a macro when the new header value is needed. -# And some information may already be available to Squid but not yet -# committed where the macro expansion code can access it (report -# such instances!). The macro will be expanded into a single dash -# ('-') in such cases. Not all macros have been tested. -# -# One or more Squid ACLs may be specified to restrict header -# injection to matching requests. As always in squid.conf, all -# ACLs in an option ACL list must be satisfied for the insertion -# to happen. The request_header_add option supports fast ACLs -# only. -#Default: -# none - -# TAG: note -# This option used to log custom information about the master -# transaction. For example, an admin may configure Squid to log -# which "user group" the transaction belongs to, where "user group" -# will be determined based on a set of ACLs and not [just] -# authentication information. -# Values of key/value pairs can be logged using %{key}note macros: -# -# note key value acl ... -# logformat myFormat ... %{key}note ... -#Default: -# none - -# TAG: relaxed_header_parser on|off|warn -# In the default "on" setting Squid accepts certain forms -# of non-compliant HTTP messages where it is unambiguous -# what the sending application intended even if the message -# is not correctly formatted. The messages is then normalized -# to the correct form when forwarded by Squid. -# -# If set to "warn" then a warning will be emitted in cache.log -# each time such HTTP error is encountered. -# -# If set to "off" then such HTTP errors will cause the request -# or response to be rejected. -#Default: -# relaxed_header_parser on - -# TIMEOUTS -# ----------------------------------------------------------------------------- - -# TAG: forward_timeout time-units -# This parameter specifies how long Squid should at most attempt in -# finding a forwarding path for the request before giving up. -#Default: -# forward_timeout 4 minutes - -# TAG: connect_timeout time-units -# This parameter specifies how long to wait for the TCP connect to -# the requested server or peer to complete before Squid should -# attempt to find another path where to forward the request. -#Default: -# connect_timeout 1 minute - -# TAG: peer_connect_timeout time-units -# This parameter specifies how long to wait for a pending TCP -# connection to a peer cache. The default is 30 seconds. You -# may also set different timeout values for individual neighbors -# with the 'connect-timeout' option on a 'cache_peer' line. -#Default: -# peer_connect_timeout 30 seconds - -# TAG: read_timeout time-units -# The read_timeout is applied on server-side connections. After -# each successful read(), the timeout will be extended by this -# amount. If no data is read again after this amount of time, -# the request is aborted and logged with ERR_READ_TIMEOUT. The -# default is 15 minutes. -#Default: -# read_timeout 15 minutes - -# TAG: write_timeout time-units -# This timeout is tracked for all connections that have data -# available for writing and are waiting for the socket to become -# ready. After each successful write, the timeout is extended by -# the configured amount. If Squid has data to write but the -# connection is not ready for the configured duration, the -# transaction associated with the connection is terminated. The -# default is 15 minutes. -#Default: -# write_timeout 15 minutes - -# TAG: request_timeout -# How long to wait for complete HTTP request headers after initial -# connection establishment. -#Default: -# request_timeout 5 minutes - -# TAG: client_idle_pconn_timeout -# How long to wait for the next HTTP request on a persistent -# client connection after the previous request completes. -#Default: -# client_idle_pconn_timeout 2 minutes - -# TAG: client_lifetime time-units -# The maximum amount of time a client (browser) is allowed to -# remain connected to the cache process. This protects the Cache -# from having a lot of sockets (and hence file descriptors) tied up -# in a CLOSE_WAIT state from remote clients that go away without -# properly shutting down (either because of a network failure or -# because of a poor client implementation). The default is one -# day, 1440 minutes. -# -# NOTE: The default value is intended to be much larger than any -# client would ever need to be connected to your cache. You -# should probably change client_lifetime only as a last resort. -# If you seem to have many client connections tying up -# filedescriptors, we recommend first tuning the read_timeout, -# request_timeout, persistent_request_timeout and quick_abort values. -#Default: -# client_lifetime 1 day - -# TAG: half_closed_clients -# Some clients may shutdown the sending side of their TCP -# connections, while leaving their receiving sides open. Sometimes, -# Squid can not tell the difference between a half-closed and a -# fully-closed TCP connection. -# -# By default, Squid will immediately close client connections when -# read(2) returns "no more data to read." -# -# Change this option to 'on' and Squid will keep open connections -# until a read(2) or write(2) on the socket returns an error. -# This may show some benefits for reverse proxies. But if not -# it is recommended to leave OFF. -#Default: -# half_closed_clients off - -# TAG: server_idle_pconn_timeout -# Timeout for idle persistent connections to servers and other -# proxies. -#Default: -# server_idle_pconn_timeout 1 minute - -# TAG: ident_timeout -# Maximum time to wait for IDENT lookups to complete. -# -# If this is too high, and you enabled IDENT lookups from untrusted -# users, you might be susceptible to denial-of-service by having -# many ident requests going at once. -#Default: -# ident_timeout 10 seconds - -# TAG: shutdown_lifetime time-units -# When SIGTERM or SIGHUP is received, the cache is put into -# "shutdown pending" mode until all active sockets are closed. -# This value is the lifetime to set for all open descriptors -# during shutdown mode. Any active clients after this many -# seconds will receive a 'timeout' message. -#Default: -# shutdown_lifetime 30 seconds - -# ADMINISTRATIVE PARAMETERS -# ----------------------------------------------------------------------------- - -# TAG: cache_mgr -# Email-address of local cache manager who will receive -# mail if the cache dies. The default is "webmaster". -#Default: -# cache_mgr webmaster - -# TAG: mail_from -# From: email-address for mail sent when the cache dies. -# The default is to use 'squid@unique_hostname'. -# -# See also: unique_hostname directive. -#Default: -# none - -# TAG: mail_program -# Email program used to send mail if the cache dies. -# The default is "mail". The specified program must comply -# with the standard Unix mail syntax: -# mail-program recipient < mailfile -# -# Optional command line options can be specified. -#Default: -# mail_program mail - -# TAG: cache_effective_user -# If you start Squid as root, it will change its effective/real -# UID/GID to the user specified below. The default is to change -# to UID of nobody. -# see also; cache_effective_group -#Default: -# cache_effective_user nobody - -# TAG: cache_effective_group -# Squid sets the GID to the effective user's default group ID -# (taken from the password file) and supplementary group list -# from the groups membership. -# -# If you want Squid to run with a specific GID regardless of -# the group memberships of the effective user then set this -# to the group (or GID) you want Squid to run as. When set -# all other group privileges of the effective user are ignored -# and only this GID is effective. If Squid is not started as -# root the user starting Squid MUST be member of the specified -# group. -# -# This option is not recommended by the Squid Team. -# Our preference is for administrators to configure a secure -# user account for squid with UID/GID matching system policies. -#Default: -# Use system group memberships of the cache_effective_user account - -# TAG: httpd_suppress_version_string on|off -# Suppress Squid version string info in HTTP headers and HTML error pages. -#Default: -# httpd_suppress_version_string off - -# TAG: visible_hostname -# If you want to present a special hostname in error messages, etc, -# define this. Otherwise, the return value of gethostname() -# will be used. If you have multiple caches in a cluster and -# get errors about IP-forwarding you must set them to have individual -# names with this setting. -#Default: -# Automatically detect the system host name - -# TAG: unique_hostname -# If you want to have multiple machines with the same -# 'visible_hostname' you must give each machine a different -# 'unique_hostname' so forwarding loops can be detected. -#Default: -# Copy the value from visible_hostname - -# TAG: hostname_aliases -# A list of other DNS names your cache has. -#Default: -# none - -# TAG: umask -# Minimum umask which should be enforced while the proxy -# is running, in addition to the umask set at startup. -# -# For a traditional octal representation of umasks, start -# your value with 0. -#Default: -# umask 027 - -# OPTIONS FOR THE CACHE REGISTRATION SERVICE -# ----------------------------------------------------------------------------- -# -# This section contains parameters for the (optional) cache -# announcement service. This service is provided to help -# cache administrators locate one another in order to join or -# create cache hierarchies. -# -# An 'announcement' message is sent (via UDP) to the registration -# service by Squid. By default, the announcement message is NOT -# SENT unless you enable it with 'announce_period' below. -# -# The announcement message includes your hostname, plus the -# following information from this configuration file: -# -# http_port -# icp_port -# cache_mgr -# -# All current information is processed regularly and made -# available on the Web at http://www.ircache.net/Cache/Tracker/. - -# TAG: announce_period -# This is how frequently to send cache announcements. -# -# To enable announcing your cache, just set an announce period. -# -# Example: -# announce_period 1 day -#Default: -# Announcement messages disabled. - -# TAG: announce_host -# Set the hostname where announce registration messages will be sent. -# -# See also announce_port and announce_file -#Default: -# announce_host tracker.ircache.net - -# TAG: announce_file -# The contents of this file will be included in the announce -# registration messages. -#Default: -# none - -# TAG: announce_port -# Set the port where announce registration messages will be sent. -# -# See also announce_host and announce_file -#Default: -# announce_port 3131 - -# HTTPD-ACCELERATOR OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: httpd_accel_surrogate_id -# Surrogates (http://www.esi.org/architecture_spec_1.0.html) -# need an identification token to allow control targeting. Because -# a farm of surrogates may all perform the same tasks, they may share -# an identification token. -#Default: -# visible_hostname is used if no specific ID is set. - -# TAG: http_accel_surrogate_remote on|off -# Remote surrogates (such as those in a CDN) honour the header -# "Surrogate-Control: no-store-remote". -# -# Set this to on to have squid behave as a remote surrogate. -#Default: -# http_accel_surrogate_remote off - -# TAG: esi_parser libxml2|expat|custom -# Note: This option is only available if Squid is rebuilt with the -# --enable-esi -# -# ESI markup is not strictly XML compatible. The custom ESI parser -# will give higher performance, but cannot handle non ASCII character -# encodings. -#Default: -# esi_parser custom - -# DELAY POOL PARAMETERS -# ----------------------------------------------------------------------------- - -# TAG: delay_pools -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This represents the number of delay pools to be used. For example, -# if you have one class 2 delay pool and one class 3 delays pool, you -# have a total of 2 delay pools. -# -# See also delay_parameters, delay_class, delay_access for pool -# configuration details. -#Default: -# delay_pools 0 - -# TAG: delay_class -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This defines the class of each delay pool. There must be exactly one -# delay_class line for each delay pool. For example, to define two -# delay pools, one of class 2 and one of class 3, the settings above -# and here would be: -# -# Example: -# delay_pools 4 # 4 delay pools -# delay_class 1 2 # pool 1 is a class 2 pool -# delay_class 2 3 # pool 2 is a class 3 pool -# delay_class 3 4 # pool 3 is a class 4 pool -# delay_class 4 5 # pool 4 is a class 5 pool -# -# The delay pool classes are: -# -# class 1 Everything is limited by a single aggregate -# bucket. -# -# class 2 Everything is limited by a single aggregate -# bucket as well as an "individual" bucket chosen -# from bits 25 through 32 of the IPv4 address. -# -# class 3 Everything is limited by a single aggregate -# bucket as well as a "network" bucket chosen -# from bits 17 through 24 of the IP address and a -# "individual" bucket chosen from bits 17 through -# 32 of the IPv4 address. -# -# class 4 Everything in a class 3 delay pool, with an -# additional limit on a per user basis. This -# only takes effect if the username is established -# in advance - by forcing authentication in your -# http_access rules. -# -# class 5 Requests are grouped according their tag (see -# external_acl's tag= reply). -# -# -# Each pool also requires a delay_parameters directive to configure the pool size -# and speed limits used whenever the pool is applied to a request. Along with -# a set of delay_access directives to determine when it is used. -# -# NOTE: If an IP address is a.b.c.d -# -> bits 25 through 32 are "d" -# -> bits 17 through 24 are "c" -# -> bits 17 through 32 are "c * 256 + d" -# -# NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to -# IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -# See also delay_parameters and delay_access. -#Default: -# none - -# TAG: delay_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This is used to determine which delay pool a request falls into. -# -# delay_access is sorted per pool and the matching starts with pool 1, -# then pool 2, ..., and finally pool N. The first delay pool where the -# request is allowed is selected for the request. If it does not allow -# the request to any pool then the request is not delayed (default). -# -# For example, if you want some_big_clients in delay -# pool 1 and lotsa_little_clients in delay pool 2: -# -# delay_access 1 allow some_big_clients -# delay_access 1 deny all -# delay_access 2 allow lotsa_little_clients -# delay_access 2 deny all -# delay_access 3 allow authenticated_clients -# -# See also delay_parameters and delay_class. -# -#Default: -# Deny using the pool, unless allow rules exist in squid.conf for the pool. - -# TAG: delay_parameters -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This defines the parameters for a delay pool. Each delay pool has -# a number of "buckets" associated with it, as explained in the -# description of delay_class. -# -# For a class 1 delay pool, the syntax is: -# delay_pools pool 1 -# delay_parameters pool aggregate -# -# For a class 2 delay pool: -# delay_pools pool 2 -# delay_parameters pool aggregate individual -# -# For a class 3 delay pool: -# delay_pools pool 3 -# delay_parameters pool aggregate network individual -# -# For a class 4 delay pool: -# delay_pools pool 4 -# delay_parameters pool aggregate network individual user -# -# For a class 5 delay pool: -# delay_pools pool 5 -# delay_parameters pool tagrate -# -# The option variables are: -# -# pool a pool number - ie, a number between 1 and the -# number specified in delay_pools as used in -# delay_class lines. -# -# aggregate the speed limit parameters for the aggregate bucket -# (class 1, 2, 3). -# -# individual the speed limit parameters for the individual -# buckets (class 2, 3). -# -# network the speed limit parameters for the network buckets -# (class 3). -# -# user the speed limit parameters for the user buckets -# (class 4). -# -# tagrate the speed limit parameters for the tag buckets -# (class 5). -# -# A pair of delay parameters is written restore/maximum, where restore is -# the number of bytes (not bits - modem and network speeds are usually -# quoted in bits) per second placed into the bucket, and maximum is the -# maximum number of bytes which can be in the bucket at any time. -# -# There must be one delay_parameters line for each delay pool. -# -# -# For example, if delay pool number 1 is a class 2 delay pool as in the -# above example, and is being used to strictly limit each host to 64Kbit/sec -# (plus overheads), with no overall limit, the line is: -# -# delay_parameters 1 -1/-1 8000/8000 -# -# Note that 8 x 8000 KByte/sec -> 64Kbit/sec. -# -# Note that the figure -1 is used to represent "unlimited". -# -# -# And, if delay pool number 2 is a class 3 delay pool as in the above -# example, and you want to limit it to a total of 256Kbit/sec (strict limit) -# with each 8-bit network permitted 64Kbit/sec (strict limit) and each -# individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits -# to permit a decent web page to be downloaded at a decent speed -# (if the network is not being limited due to overuse) but slow down -# large downloads more significantly: -# -# delay_parameters 2 32000/32000 8000/8000 600/8000 -# -# Note that 8 x 32000 KByte/sec -> 256Kbit/sec. -# 8 x 8000 KByte/sec -> 64Kbit/sec. -# 8 x 600 Byte/sec -> 4800bit/sec. -# -# -# Finally, for a class 4 delay pool as in the example - each user will -# be limited to 128Kbits/sec no matter how many workstations they are logged into.: -# -# delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000 -# -# -# See also delay_class and delay_access. -# -#Default: -# none - -# TAG: delay_initial_bucket_level (percent, 0-100) -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# The initial bucket percentage is used to determine how much is put -# in each bucket when squid starts, is reconfigured, or first notices -# a host accessing it (in class 2 and class 3, individual hosts and -# networks only have buckets associated with them once they have been -# "seen" by squid). -#Default: -# delay_initial_bucket_level 50 - -# CLIENT DELAY POOL PARAMETERS -# ----------------------------------------------------------------------------- - -# TAG: client_delay_pools -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This option specifies the number of client delay pools used. It must -# preceed other client_delay_* options. -# -# Example: -# client_delay_pools 2 -# -# See also client_delay_parameters and client_delay_access. -#Default: -# client_delay_pools 0 - -# TAG: client_delay_initial_bucket_level (percent, 0-no_limit) -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This option determines the initial bucket size as a percentage of -# max_bucket_size from client_delay_parameters. Buckets are created -# at the time of the "first" connection from the matching IP. Idle -# buckets are periodically deleted up. -# -# You can specify more than 100 percent but note that such "oversized" -# buckets are not refilled until their size goes down to max_bucket_size -# from client_delay_parameters. -# -# Example: -# client_delay_initial_bucket_level 50 -#Default: -# client_delay_initial_bucket_level 50 - -# TAG: client_delay_parameters -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# -# This option configures client-side bandwidth limits using the -# following format: -# -# client_delay_parameters pool speed_limit max_bucket_size -# -# pool is an integer ID used for client_delay_access matching. -# -# speed_limit is bytes added to the bucket per second. -# -# max_bucket_size is the maximum size of a bucket, enforced after any -# speed_limit additions. -# -# Please see the delay_parameters option for more information and -# examples. -# -# Example: -# client_delay_parameters 1 1024 2048 -# client_delay_parameters 2 51200 16384 -# -# See also client_delay_access. -# -#Default: -# none - -# TAG: client_delay_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This option determines the client-side delay pool for the -# request: -# -# client_delay_access pool_ID allow|deny acl_name -# -# All client_delay_access options are checked in their pool ID -# order, starting with pool 1. The first checked pool with allowed -# request is selected for the request. If no ACL matches or there -# are no client_delay_access options, the request bandwidth is not -# limited. -# -# The ACL-selected pool is then used to find the -# client_delay_parameters for the request. Client-side pools are -# not used to aggregate clients. Clients are always aggregated -# based on their source IP addresses (one bucket per source IP). -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# Additionally, only the client TCP connection details are available. -# ACLs testing HTTP properties will not work. -# -# Please see delay_access for more examples. -# -# Example: -# client_delay_access 1 allow low_rate_network -# client_delay_access 2 allow vips_network -# -# -# See also client_delay_parameters and client_delay_pools. -#Default: -# Deny use of the pool, unless allow rules exist in squid.conf for the pool. - -# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: wccp_router -# Use this option to define your WCCP ``home'' router for -# Squid. -# -# wccp_router supports a single WCCP(v1) router -# -# wccp2_router supports multiple WCCPv2 routers -# -# only one of the two may be used at the same time and defines -# which version of WCCP to use. -#Default: -# WCCP disabled. - -# TAG: wccp2_router -# Use this option to define your WCCP ``home'' router for -# Squid. -# -# wccp_router supports a single WCCP(v1) router -# -# wccp2_router supports multiple WCCPv2 routers -# -# only one of the two may be used at the same time and defines -# which version of WCCP to use. -#Default: -# WCCPv2 disabled. - -# TAG: wccp_version -# This directive is only relevant if you need to set up WCCP(v1) -# to some very old and end-of-life Cisco routers. In all other -# setups it must be left unset or at the default setting. -# It defines an internal version in the WCCP(v1) protocol, -# with version 4 being the officially documented protocol. -# -# According to some users, Cisco IOS 11.2 and earlier only -# support WCCP version 3. If you're using that or an earlier -# version of IOS, you may need to change this value to 3, otherwise -# do not specify this parameter. -#Default: -# wccp_version 4 - -# TAG: wccp2_rebuild_wait -# If this is enabled Squid will wait for the cache dir rebuild to finish -# before sending the first wccp2 HereIAm packet -#Default: -# wccp2_rebuild_wait on - -# TAG: wccp2_forwarding_method -# WCCP2 allows the setting of forwarding methods between the -# router/switch and the cache. Valid values are as follows: -# -# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel) -# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting) -# -# Currently (as of IOS 12.4) cisco routers only support GRE. -# Cisco switches only support the L2 redirect assignment method. -#Default: -# wccp2_forwarding_method gre - -# TAG: wccp2_return_method -# WCCP2 allows the setting of return methods between the -# router/switch and the cache for packets that the cache -# decides not to handle. Valid values are as follows: -# -# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel) -# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting) -# -# Currently (as of IOS 12.4) cisco routers only support GRE. -# Cisco switches only support the L2 redirect assignment. -# -# If the "ip wccp redirect exclude in" command has been -# enabled on the cache interface, then it is still safe for -# the proxy server to use a l2 redirect method even if this -# option is set to GRE. -#Default: -# wccp2_return_method gre - -# TAG: wccp2_assignment_method -# WCCP2 allows the setting of methods to assign the WCCP hash -# Valid values are as follows: -# -# hash - Hash assignment -# mask - Mask assignment -# -# As a general rule, cisco routers support the hash assignment method -# and cisco switches support the mask assignment method. -#Default: -# wccp2_assignment_method hash - -# TAG: wccp2_service -# WCCP2 allows for multiple traffic services. There are two -# types: "standard" and "dynamic". The standard type defines -# one service id - http (id 0). The dynamic service ids can be from -# 51 to 255 inclusive. In order to use a dynamic service id -# one must define the type of traffic to be redirected; this is done -# using the wccp2_service_info option. -# -# The "standard" type does not require a wccp2_service_info option, -# just specifying the service id will suffice. -# -# MD5 service authentication can be enabled by adding -# "password=<password>" to the end of this service declaration. -# -# Examples: -# -# wccp2_service standard 0 # for the 'web-cache' standard service -# wccp2_service dynamic 80 # a dynamic service type which will be -# # fleshed out with subsequent options. -# wccp2_service standard 0 password=foo -#Default: -# Use the 'web-cache' standard service. - -# TAG: wccp2_service_info -# Dynamic WCCPv2 services require further information to define the -# traffic you wish to have diverted. -# -# The format is: -# -# wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>.. -# priority=<priority> ports=<port>,<port>.. -# -# The relevant WCCPv2 flags: -# + src_ip_hash, dst_ip_hash -# + source_port_hash, dst_port_hash -# + src_ip_alt_hash, dst_ip_alt_hash -# + src_port_alt_hash, dst_port_alt_hash -# + ports_source -# -# The port list can be one to eight entries. -# -# Example: -# -# wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source -# priority=240 ports=80 -# -# Note: the service id must have been defined by a previous -# 'wccp2_service dynamic <id>' entry. -#Default: -# none - -# TAG: wccp2_weight -# Each cache server gets assigned a set of the destination -# hash proportional to their weight. -#Default: -# wccp2_weight 10000 - -# TAG: wccp_address -# Use this option if you require WCCPv2 to use a specific -# interface address. -# -# The default behavior is to not bind to any specific address. -#Default: -# Address selected by the operating system. - -# TAG: wccp2_address -# Use this option if you require WCCP to use a specific -# interface address. -# -# The default behavior is to not bind to any specific address. -#Default: -# Address selected by the operating system. - -# PERSISTENT CONNECTION HANDLING -# ----------------------------------------------------------------------------- -# -# Also see "pconn_timeout" in the TIMEOUTS section - -# TAG: client_persistent_connections -# Persistent connection support for clients. -# Squid uses persistent connections (when allowed). You can use -# this option to disable persistent connections with clients. -#Default: -# client_persistent_connections on - -# TAG: server_persistent_connections -# Persistent connection support for servers. -# Squid uses persistent connections (when allowed). You can use -# this option to disable persistent connections with servers. -#Default: -# server_persistent_connections on - -# TAG: persistent_connection_after_error -# With this directive the use of persistent connections after -# HTTP errors can be disabled. Useful if you have clients -# who fail to handle errors on persistent connections proper. -#Default: -# persistent_connection_after_error on - -# TAG: detect_broken_pconn -# Some servers have been found to incorrectly signal the use -# of HTTP/1.0 persistent connections even on replies not -# compatible, causing significant delays. This server problem -# has mostly been seen on redirects. -# -# By enabling this directive Squid attempts to detect such -# broken replies and automatically assume the reply is finished -# after 10 seconds timeout. -#Default: -# detect_broken_pconn off - -# CACHE DIGEST OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: digest_generation -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This controls whether the server will generate a Cache Digest -# of its contents. By default, Cache Digest generation is -# enabled if Squid is compiled with --enable-cache-digests defined. -#Default: -# digest_generation on - -# TAG: digest_bits_per_entry -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the number of bits of the server's Cache Digest which -# will be associated with the Digest entry for a given HTTP -# Method and URL (public key) combination. The default is 5. -#Default: -# digest_bits_per_entry 5 - -# TAG: digest_rebuild_period (seconds) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the wait time between Cache Digest rebuilds. -#Default: -# digest_rebuild_period 1 hour - -# TAG: digest_rewrite_period (seconds) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the wait time between Cache Digest writes to -# disk. -#Default: -# digest_rewrite_period 1 hour - -# TAG: digest_swapout_chunk_size (bytes) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the number of bytes of the Cache Digest to write to -# disk at a time. It defaults to 4096 bytes (4KB), the Squid -# default swap page. -#Default: -# digest_swapout_chunk_size 4096 bytes - -# TAG: digest_rebuild_chunk_percentage (percent, 0-100) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the percentage of the Cache Digest to be scanned at a -# time. By default it is set to 10% of the Cache Digest. -#Default: -# digest_rebuild_chunk_percentage 10 - -# SNMP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: snmp_port -# The port number where Squid listens for SNMP requests. To enable -# SNMP support set this to a suitable port number. Port number -# 3401 is often used for the Squid SNMP agent. By default it's -# set to "0" (disabled) -# -# Example: -# snmp_port 3401 -#Default: -# SNMP disabled. - -# TAG: snmp_access -# Allowing or denying access to the SNMP port. -# -# All access to the agent is denied by default. -# usage: -# -# snmp_access allow|deny [!]aclname ... -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -#Example: -# snmp_access allow snmppublic localhost -# snmp_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: snmp_incoming_address -# Just like 'udp_incoming_address', but for the SNMP port. -# -# snmp_incoming_address is used for the SNMP socket receiving -# messages from SNMP agents. -# -# The default snmp_incoming_address is to listen on all -# available network interfaces. -#Default: -# Accept SNMP packets from all machine interfaces. - -# TAG: snmp_outgoing_address -# Just like 'udp_outgoing_address', but for the SNMP port. -# -# snmp_outgoing_address is used for SNMP packets returned to SNMP -# agents. -# -# If snmp_outgoing_address is not set it will use the same socket -# as snmp_incoming_address. Only change this if you want to have -# SNMP replies sent using another address than where this Squid -# listens for SNMP queries. -# -# NOTE, snmp_incoming_address and snmp_outgoing_address can not have -# the same value since they both use the same port. -#Default: -# Use snmp_incoming_address or an address selected by the operating system. - -# ICP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: icp_port -# The port number where Squid sends and receives ICP queries to -# and from neighbor caches. The standard UDP port for ICP is 3130. -# -# Example: -# icp_port 3130 -#Default: -# ICP disabled. - -# TAG: htcp_port -# The port number where Squid sends and receives HTCP queries to -# and from neighbor caches. To turn it on you want to set it to -# 4827. -# -# Example: -# htcp_port 4827 -#Default: -# HTCP disabled. - -# TAG: log_icp_queries on|off -# If set, ICP queries are logged to access.log. You may wish -# do disable this if your ICP load is VERY high to speed things -# up or to simplify log analysis. -#Default: -# log_icp_queries on - -# TAG: udp_incoming_address -# udp_incoming_address is used for UDP packets received from other -# caches. -# -# The default behavior is to not bind to any specific address. -# -# Only change this if you want to have all UDP queries received on -# a specific interface/address. -# -# NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS -# modules. Altering it will affect all of them in the same manner. -# -# see also; udp_outgoing_address -# -# NOTE, udp_incoming_address and udp_outgoing_address can not -# have the same value since they both use the same port. -#Default: -# Accept packets from all machine interfaces. - -# TAG: udp_outgoing_address -# udp_outgoing_address is used for UDP packets sent out to other -# caches. -# -# The default behavior is to not bind to any specific address. -# -# Instead it will use the same socket as udp_incoming_address. -# Only change this if you want to have UDP queries sent using another -# address than where this Squid listens for UDP queries from other -# caches. -# -# NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS -# modules. Altering it will affect all of them in the same manner. -# -# see also; udp_incoming_address -# -# NOTE, udp_incoming_address and udp_outgoing_address can not -# have the same value since they both use the same port. -#Default: -# Use udp_incoming_address or an address selected by the operating system. - -# TAG: icp_hit_stale on|off -# If you want to return ICP_HIT for stale cache objects, set this -# option to 'on'. If you have sibling relationships with caches -# in other administrative domains, this should be 'off'. If you only -# have sibling relationships with caches under your control, -# it is probably okay to set this to 'on'. -# If set to 'on', your siblings should use the option "allow-miss" -# on their cache_peer lines for connecting to you. -#Default: -# icp_hit_stale off - -# TAG: minimum_direct_hops -# If using the ICMP pinging stuff, do direct fetches for sites -# which are no more than this many hops away. -#Default: -# minimum_direct_hops 4 - -# TAG: minimum_direct_rtt (msec) -# If using the ICMP pinging stuff, do direct fetches for sites -# which are no more than this many rtt milliseconds away. -#Default: -# minimum_direct_rtt 400 - -# TAG: netdb_low -# The low water mark for the ICMP measurement database. -# -# Note: high watermark controlled by netdb_high directive. -# -# These watermarks are counts, not percents. The defaults are -# (low) 900 and (high) 1000. When the high water mark is -# reached, database entries will be deleted until the low -# mark is reached. -#Default: -# netdb_low 900 - -# TAG: netdb_high -# The high water mark for the ICMP measurement database. -# -# Note: low watermark controlled by netdb_low directive. -# -# These watermarks are counts, not percents. The defaults are -# (low) 900 and (high) 1000. When the high water mark is -# reached, database entries will be deleted until the low -# mark is reached. -#Default: -# netdb_high 1000 - -# TAG: netdb_ping_period -# The minimum period for measuring a site. There will be at -# least this much delay between successive pings to the same -# network. The default is five minutes. -#Default: -# netdb_ping_period 5 minutes - -# TAG: query_icmp on|off -# If you want to ask your peers to include ICMP data in their ICP -# replies, enable this option. -# -# If your peer has configured Squid (during compilation) with -# '--enable-icmp' that peer will send ICMP pings to origin server -# sites of the URLs it receives. If you enable this option the -# ICP replies from that peer will include the ICMP data (if available). -# Then, when choosing a parent cache, Squid will choose the parent with -# the minimal RTT to the origin server. When this happens, the -# hierarchy field of the access.log will be -# "CLOSEST_PARENT_MISS". This option is off by default. -#Default: -# query_icmp off - -# TAG: test_reachability on|off -# When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH -# instead of ICP_MISS if the target host is NOT in the ICMP -# database, or has a zero RTT. -#Default: -# test_reachability off - -# TAG: icp_query_timeout (msec) -# Normally Squid will automatically determine an optimal ICP -# query timeout value based on the round-trip-time of recent ICP -# queries. If you want to override the value determined by -# Squid, set this 'icp_query_timeout' to a non-zero value. This -# value is specified in MILLISECONDS, so, to use a 2-second -# timeout (the old default), you would write: -# -# icp_query_timeout 2000 -#Default: -# Dynamic detection. - -# TAG: maximum_icp_query_timeout (msec) -# Normally the ICP query timeout is determined dynamically. But -# sometimes it can lead to very large values (say 5 seconds). -# Use this option to put an upper limit on the dynamic timeout -# value. Do NOT use this option to always use a fixed (instead -# of a dynamic) timeout value. To set a fixed timeout see the -# 'icp_query_timeout' directive. -#Default: -# maximum_icp_query_timeout 2000 - -# TAG: minimum_icp_query_timeout (msec) -# Normally the ICP query timeout is determined dynamically. But -# sometimes it can lead to very small timeouts, even lower than -# the normal latency variance on your link due to traffic. -# Use this option to put an lower limit on the dynamic timeout -# value. Do NOT use this option to always use a fixed (instead -# of a dynamic) timeout value. To set a fixed timeout see the -# 'icp_query_timeout' directive. -#Default: -# minimum_icp_query_timeout 5 - -# TAG: background_ping_rate time-units -# Controls how often the ICP pings are sent to siblings that -# have background-ping set. -#Default: -# background_ping_rate 10 seconds - -# MULTICAST ICP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: mcast_groups -# This tag specifies a list of multicast groups which your server -# should join to receive multicasted ICP queries. -# -# NOTE! Be very careful what you put here! Be sure you -# understand the difference between an ICP _query_ and an ICP -# _reply_. This option is to be set only if you want to RECEIVE -# multicast queries. Do NOT set this option to SEND multicast -# ICP (use cache_peer for that). ICP replies are always sent via -# unicast, so this option does not affect whether or not you will -# receive replies from multicast group members. -# -# You must be very careful to NOT use a multicast address which -# is already in use by another group of caches. -# -# If you are unsure about multicast, please read the Multicast -# chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/). -# -# Usage: mcast_groups 239.128.16.128 224.0.1.20 -# -# By default, Squid doesn't listen on any multicast groups. -#Default: -# none - -# TAG: mcast_miss_addr -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# If you enable this option, every "cache miss" URL will -# be sent out on the specified multicast address. -# -# Do not enable this option unless you are are absolutely -# certain you understand what you are doing. -#Default: -# disabled. - -# TAG: mcast_miss_ttl -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# This is the time-to-live value for packets multicasted -# when multicasting off cache miss URLs is enabled. By -# default this is set to 'site scope', i.e. 16. -#Default: -# mcast_miss_ttl 16 - -# TAG: mcast_miss_port -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# This is the port number to be used in conjunction with -# 'mcast_miss_addr'. -#Default: -# mcast_miss_port 3135 - -# TAG: mcast_miss_encode_key -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# The URLs that are sent in the multicast miss stream are -# encrypted. This is the encryption key. -#Default: -# mcast_miss_encode_key XXXXXXXXXXXXXXXX - -# TAG: mcast_icp_query_timeout (msec) -# For multicast peers, Squid regularly sends out ICP "probes" to -# count how many other peers are listening on the given multicast -# address. This value specifies how long Squid should wait to -# count all the replies. The default is 2000 msec, or 2 -# seconds. -#Default: -# mcast_icp_query_timeout 2000 - -# INTERNAL ICON OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: icon_directory -# Where the icons are stored. These are normally kept in -# /usr/share/squid/icons -#Default: -# icon_directory /usr/share/squid/icons - -# TAG: global_internal_static -# This directive controls is Squid should intercept all requests for -# /squid-internal-static/ no matter which host the URL is requesting -# (default on setting), or if nothing special should be done for -# such URLs (off setting). The purpose of this directive is to make -# icons etc work better in complex cache hierarchies where it may -# not always be possible for all corners in the cache mesh to reach -# the server generating a directory listing. -#Default: -# global_internal_static on - -# TAG: short_icon_urls -# If this is enabled Squid will use short URLs for icons. -# If disabled it will revert to the old behavior of including -# it's own name and port in the URL. -# -# If you run a complex cache hierarchy with a mix of Squid and -# other proxies you may need to disable this directive. -#Default: -# short_icon_urls on - -# ERROR PAGE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: error_directory -# If you wish to create your own versions of the default -# error files to customize them to suit your company copy -# the error/template files to another directory and point -# this tag at them. -# -# WARNING: This option will disable multi-language support -# on error pages if used. -# -# The squid developers are interested in making squid available in -# a wide variety of languages. If you are making translations for a -# language that Squid does not currently provide please consider -# contributing your translation back to the project. -# http://wiki.squid-cache.org/Translations -# -# The squid developers working on translations are happy to supply drop-in -# translated error files in exchange for any new language contributions. -#Default: -# Send error pages in the clients preferred language - -# TAG: error_default_language -# Set the default language which squid will send error pages in -# if no existing translation matches the clients language -# preferences. -# -# If unset (default) generic English will be used. -# -# The squid developers are interested in making squid available in -# a wide variety of languages. If you are interested in making -# translations for any language see the squid wiki for details. -# http://wiki.squid-cache.org/Translations -#Default: -# Generate English language pages. - -# TAG: error_log_languages -# Log to cache.log what languages users are attempting to -# auto-negotiate for translations. -# -# Successful negotiations are not logged. Only failures -# have meaning to indicate that Squid may need an upgrade -# of its error page translations. -#Default: -# error_log_languages on - -# TAG: err_page_stylesheet -# CSS Stylesheet to pattern the display of Squid default error pages. -# -# For information on CSS see http://www.w3.org/Style/CSS/ -#Default: -# err_page_stylesheet /etc/squid/errorpage.css - -# TAG: err_html_text -# HTML text to include in error messages. Make this a "mailto" -# URL to your admin address, or maybe just a link to your -# organizations Web page. -# -# To include this in your error messages, you must rewrite -# the error template files (found in the "errors" directory). -# Wherever you want the 'err_html_text' line to appear, -# insert a %L tag in the error template file. -#Default: -# none - -# TAG: email_err_data on|off -# If enabled, information about the occurred error will be -# included in the mailto links of the ERR pages (if %W is set) -# so that the email body contains the data. -# Syntax is <A HREF="mailto:%w%W">%w</A> -#Default: -# email_err_data on - -# TAG: deny_info -# Usage: deny_info err_page_name acl -# or deny_info http://... acl -# or deny_info TCP_RESET acl -# -# This can be used to return a ERR_ page for requests which -# do not pass the 'http_access' rules. Squid remembers the last -# acl it evaluated in http_access, and if a 'deny_info' line exists -# for that ACL Squid returns a corresponding error page. -# -# The acl is typically the last acl on the http_access deny line which -# denied access. The exceptions to this rule are: -# - When Squid needs to request authentication credentials. It's then -# the first authentication related acl encountered -# - When none of the http_access lines matches. It's then the last -# acl processed on the last http_access line. -# - When the decision to deny access was made by an adaptation service, -# the acl name is the corresponding eCAP or ICAP service_name. -# -# NP: If providing your own custom error pages with error_directory -# you may also specify them by your custom file name: -# Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys -# -# By defaut Squid will send "403 Forbidden". A different 4xx or 5xx -# may be specified by prefixing the file name with the code and a colon. -# e.g. 404:ERR_CUSTOM_ACCESS_DENIED -# -# Alternatively you can tell Squid to reset the TCP connection -# by specifying TCP_RESET. -# -# Or you can specify an error URL or URL pattern. The browsers will -# get redirected to the specified URL after formatting tags have -# been replaced. Redirect will be done with 302 or 307 according to -# HTTP/1.1 specs. A different 3xx code may be specified by prefixing -# the URL. e.g. 303:http://example.com/ -# -# URL FORMAT TAGS: -# %a - username (if available. Password NOT included) -# %B - FTP path URL -# %e - Error number -# %E - Error description -# %h - Squid hostname -# %H - Request domain name -# %i - Client IP Address -# %M - Request Method -# %o - Message result from external ACL helper -# %p - Request Port number -# %P - Request Protocol name -# %R - Request URL path -# %T - Timestamp in RFC 1123 format -# %U - Full canonical URL from client -# (HTTPS URLs terminate with *) -# %u - Full canonical URL from client -# %w - Admin email from squid.conf -# %x - Error name -# %% - Literal percent (%) code -# -#Default: -# none - -# OPTIONS INFLUENCING REQUEST FORWARDING -# ----------------------------------------------------------------------------- - -# TAG: nonhierarchical_direct -# By default, Squid will send any non-hierarchical requests -# (matching hierarchy_stoplist or not cacheable request type) direct -# to origin servers. -# -# When this is set to "off", Squid will prefer to send these -# requests to parents. -# -# Note that in most configurations, by turning this off you will only -# add latency to these request without any improvement in global hit -# ratio. -# -# This option only sets a preference. If the parent is unavailable a -# direct connection to the origin server may still be attempted. To -# completely prevent direct connections use never_direct. -#Default: -# nonhierarchical_direct on - -# TAG: prefer_direct -# Normally Squid tries to use parents for most requests. If you for some -# reason like it to first try going direct and only use a parent if -# going direct fails set this to on. -# -# By combining nonhierarchical_direct off and prefer_direct on you -# can set up Squid to use a parent as a backup path if going direct -# fails. -# -# Note: If you want Squid to use parents for all requests see -# the never_direct directive. prefer_direct only modifies how Squid -# acts on cacheable requests. -#Default: -# prefer_direct off - -# TAG: cache_miss_revalidate on|off -# RFC 7232 defines a conditional request mechanism to prevent -# response objects being unnecessarily transferred over the network. -# If that mechanism is used by the client and a cache MISS occurs -# it can prevent new cache entries being created. -# -# This option determines whether Squid on cache MISS will pass the -# client revalidation request to the server or tries to fetch new -# content for caching. It can be useful while the cache is mostly -# empty to more quickly have the cache populated by generating -# non-conditional GETs. -# -# When set to 'on' (default), Squid will pass all client If-* headers -# to the server. This permits server responses without a cacheable -# payload to be delivered and on MISS no new cache entry is created. -# -# When set to 'off' and if the request is cacheable, Squid will -# remove the clients If-Modified-Since and If-None-Match headers from -# the request sent to the server. This requests a 200 status response -# from the server to create a new cache entry with. -#Default: -# cache_miss_revalidate on - -# TAG: always_direct -# Usage: always_direct allow|deny [!]aclname ... -# -# Here you can use ACL elements to specify requests which should -# ALWAYS be forwarded by Squid to the origin servers without using -# any peers. For example, to always directly forward requests for -# local servers ignoring any parents or siblings you may have use -# something like: -# -# acl local-servers dstdomain my.domain.net -# always_direct allow local-servers -# -# To always forward FTP requests directly, use -# -# acl FTP proto FTP -# always_direct allow FTP -# -# NOTE: There is a similar, but opposite option named -# 'never_direct'. You need to be aware that "always_direct deny -# foo" is NOT the same thing as "never_direct allow foo". You -# may need to use a deny rule to exclude a more-specific case of -# some other rule. Example: -# -# acl local-external dstdomain external.foo.net -# acl local-servers dstdomain .foo.net -# always_direct deny local-external -# always_direct allow local-servers -# -# NOTE: If your goal is to make the client forward the request -# directly to the origin server bypassing Squid then this needs -# to be done in the client configuration. Squid configuration -# can only tell Squid how Squid should fetch the object. -# -# NOTE: This directive is not related to caching. The replies -# is cached as usual even if you use always_direct. To not cache -# the replies see the 'cache' directive. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Prevent any cache_peer being used for this request. - -# TAG: never_direct -# Usage: never_direct allow|deny [!]aclname ... -# -# never_direct is the opposite of always_direct. Please read -# the description for always_direct if you have not already. -# -# With 'never_direct' you can use ACL elements to specify -# requests which should NEVER be forwarded directly to origin -# servers. For example, to force the use of a proxy for all -# requests, except those in your local domain use something like: -# -# acl local-servers dstdomain .foo.net -# never_direct deny local-servers -# never_direct allow all -# -# or if Squid is inside a firewall and there are local intranet -# servers inside the firewall use something like: -# -# acl local-intranet dstdomain .foo.net -# acl local-external dstdomain external.foo.net -# always_direct deny local-external -# always_direct allow local-intranet -# never_direct allow all -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow DNS results to be used for this request. - -# ADVANCED NETWORKING OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: incoming_udp_average -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# incoming_udp_average 6 - -# TAG: incoming_tcp_average -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# incoming_tcp_average 4 - -# TAG: incoming_dns_average -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# incoming_dns_average 4 - -# TAG: min_udp_poll_cnt -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# min_udp_poll_cnt 8 - -# TAG: min_dns_poll_cnt -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# min_dns_poll_cnt 8 - -# TAG: min_tcp_poll_cnt -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# min_tcp_poll_cnt 8 - -# TAG: accept_filter -# FreeBSD: -# -# The name of an accept(2) filter to install on Squid's -# listen socket(s). This feature is perhaps specific to -# FreeBSD and requires support in the kernel. -# -# The 'httpready' filter delays delivering new connections -# to Squid until a full HTTP request has been received. -# See the accf_http(9) man page for details. -# -# The 'dataready' filter delays delivering new connections -# to Squid until there is some data to process. -# See the accf_dataready(9) man page for details. -# -# Linux: -# -# The 'data' filter delays delivering of new connections -# to Squid until there is some data to process by TCP_ACCEPT_DEFER. -# You may optionally specify a number of seconds to wait by -# 'data=N' where N is the number of seconds. Defaults to 30 -# if not specified. See the tcp(7) man page for details. -#EXAMPLE: -## FreeBSD -#accept_filter httpready -## Linux -#accept_filter data -#Default: -# none - -# TAG: client_ip_max_connections -# Set an absolute limit on the number of connections a single -# client IP can use. Any more than this and Squid will begin to drop -# new connections from the client until it closes some links. -# -# Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP -# connections from the client. For finer control use the ACL access controls. -# -# Requires client_db to be enabled (the default). -# -# WARNING: This may noticably slow down traffic received via external proxies -# or NAT devices and cause them to rebound error messages back to their clients. -#Default: -# No limit. - -# TAG: tcp_recv_bufsize (bytes) -# Size of receive buffer to set for TCP sockets. Probably just -# as easy to change your kernel's default. -# Omit from squid.conf to use the default buffer size. -#Default: -# Use operating system TCP defaults. - -# ICAP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: icap_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# If you want to enable the ICAP module support, set this to on. -#Default: -# icap_enable off - -# TAG: icap_connect_timeout -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This parameter specifies how long to wait for the TCP connect to -# the requested ICAP server to complete before giving up and either -# terminating the HTTP transaction or bypassing the failure. -# -# The default for optional services is peer_connect_timeout. -# The default for essential services is connect_timeout. -# If this option is explicitly set, its value applies to all services. -#Default: -# none - -# TAG: icap_io_timeout time-units -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This parameter specifies how long to wait for an I/O activity on -# an established, active ICAP connection before giving up and -# either terminating the HTTP transaction or bypassing the -# failure. -#Default: -# Use read_timeout. - -# TAG: icap_service_failure_limit limit [in memory-depth time-units] -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The limit specifies the number of failures that Squid tolerates -# when establishing a new TCP connection with an ICAP service. If -# the number of failures exceeds the limit, the ICAP service is -# not used for new ICAP requests until it is time to refresh its -# OPTIONS. -# -# A negative value disables the limit. Without the limit, an ICAP -# service will not be considered down due to connectivity failures -# between ICAP OPTIONS requests. -# -# Squid forgets ICAP service failures older than the specified -# value of memory-depth. The memory fading algorithm -# is approximate because Squid does not remember individual -# errors but groups them instead, splitting the option -# value into ten time slots of equal length. -# -# When memory-depth is 0 and by default this option has no -# effect on service failure expiration. -# -# Squid always forgets failures when updating service settings -# using an ICAP OPTIONS transaction, regardless of this option -# setting. -# -# For example, -# # suspend service usage after 10 failures in 5 seconds: -# icap_service_failure_limit 10 in 5 seconds -#Default: -# icap_service_failure_limit 10 - -# TAG: icap_service_revival_delay -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The delay specifies the number of seconds to wait after an ICAP -# OPTIONS request failure before requesting the options again. The -# failed ICAP service is considered "down" until fresh OPTIONS are -# fetched. -# -# The actual delay cannot be smaller than the hardcoded minimum -# delay of 30 seconds. -#Default: -# icap_service_revival_delay 180 - -# TAG: icap_preview_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The ICAP Preview feature allows the ICAP server to handle the -# HTTP message by looking only at the beginning of the message body -# or even without receiving the body at all. In some environments, -# previews greatly speedup ICAP processing. -# -# During an ICAP OPTIONS transaction, the server may tell Squid what -# HTTP messages should be previewed and how big the preview should be. -# Squid will not use Preview if the server did not request one. -# -# To disable ICAP Preview for all ICAP services, regardless of -# individual ICAP server OPTIONS responses, set this option to "off". -#Example: -#icap_preview_enable off -#Default: -# icap_preview_enable on - -# TAG: icap_preview_size -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The default size of preview data to be sent to the ICAP server. -# This value might be overwritten on a per server basis by OPTIONS requests. -#Default: -# No preview sent. - -# TAG: icap_206_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# 206 (Partial Content) responses is an ICAP extension that allows the -# ICAP agents to optionally combine adapted and original HTTP message -# content. The decision to combine is postponed until the end of the -# ICAP response. Squid supports Partial Content extension by default. -# -# Activation of the Partial Content extension is negotiated with each -# ICAP service during OPTIONS exchange. Most ICAP servers should handle -# negotation correctly even if they do not support the extension, but -# some might fail. To disable Partial Content support for all ICAP -# services and to avoid any negotiation, set this option to "off". -# -# Example: -# icap_206_enable off -#Default: -# icap_206_enable on - -# TAG: icap_default_options_ttl -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The default TTL value for ICAP OPTIONS responses that don't have -# an Options-TTL header. -#Default: -# icap_default_options_ttl 60 - -# TAG: icap_persistent_connections on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Whether or not Squid should use persistent connections to -# an ICAP server. -#Default: -# icap_persistent_connections on - -# TAG: adaptation_send_client_ip on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# If enabled, Squid shares HTTP client IP information with adaptation -# services. For ICAP, Squid adds the X-Client-IP header to ICAP requests. -# For eCAP, Squid sets the libecap::metaClientIp transaction option. -# -# See also: adaptation_uses_indirect_client -#Default: -# adaptation_send_client_ip off - -# TAG: adaptation_send_username on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# This sends authenticated HTTP client username (if available) to -# the adaptation service. -# -# For ICAP, the username value is encoded based on the -# icap_client_username_encode option and is sent using the header -# specified by the icap_client_username_header option. -#Default: -# adaptation_send_username off - -# TAG: icap_client_username_header -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# ICAP request header name to use for adaptation_send_username. -#Default: -# icap_client_username_header X-Client-Username - -# TAG: icap_client_username_encode on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Whether to base64 encode the authenticated client username. -#Default: -# icap_client_username_encode off - -# TAG: icap_service -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Defines a single ICAP service using the following format: -# -# icap_service id vectoring_point uri [option ...] -# -# id: ID -# an opaque identifier or name which is used to direct traffic to -# this specific service. Must be unique among all adaptation -# services in squid.conf. -# -# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache -# This specifies at which point of transaction processing the -# ICAP service should be activated. *_postcache vectoring points -# are not yet supported. -# -# uri: icap://servername:port/servicepath -# ICAP server and service location. -# -# ICAP does not allow a single service to handle both REQMOD and RESPMOD -# transactions. Squid does not enforce that requirement. You can specify -# services with the same service_url and different vectoring_points. You -# can even specify multiple identical services as long as their -# service_names differ. -# -# To activate a service, use the adaptation_access directive. To group -# services, use adaptation_service_chain and adaptation_service_set. -# -# Service options are separated by white space. ICAP services support -# the following name=value options: -# -# bypass=on|off|1|0 -# If set to 'on' or '1', the ICAP service is treated as -# optional. If the service cannot be reached or malfunctions, -# Squid will try to ignore any errors and process the message as -# if the service was not enabled. No all ICAP errors can be -# bypassed. If set to 0, the ICAP service is treated as -# essential and all ICAP errors will result in an error page -# returned to the HTTP client. -# -# Bypass is off by default: services are treated as essential. -# -# routing=on|off|1|0 -# If set to 'on' or '1', the ICAP service is allowed to -# dynamically change the current message adaptation plan by -# returning a chain of services to be used next. The services -# are specified using the X-Next-Services ICAP response header -# value, formatted as a comma-separated list of service names. -# Each named service should be configured in squid.conf. Other -# services are ignored. An empty X-Next-Services value results -# in an empty plan which ends the current adaptation. -# -# Dynamic adaptation plan may cross or cover multiple supported -# vectoring points in their natural processing order. -# -# Routing is not allowed by default: the ICAP X-Next-Services -# response header is ignored. -# -# ipv6=on|off -# Only has effect on split-stack systems. The default on those systems -# is to use IPv4-only connections. When set to 'on' this option will -# make Squid use IPv6-only connections to contact this ICAP service. -# -# on-overload=block|bypass|wait|force -# If the service Max-Connections limit has been reached, do -# one of the following for each new ICAP transaction: -# * block: send an HTTP error response to the client -# * bypass: ignore the "over-connected" ICAP service -# * wait: wait (in a FIFO queue) for an ICAP connection slot -# * force: proceed, ignoring the Max-Connections limit -# -# In SMP mode with N workers, each worker assumes the service -# connection limit is Max-Connections/N, even though not all -# workers may use a given service. -# -# The default value is "bypass" if service is bypassable, -# otherwise it is set to "wait". -# -# -# max-conn=number -# Use the given number as the Max-Connections limit, regardless -# of the Max-Connections value given by the service, if any. -# -# Older icap_service format without optional named parameters is -# deprecated but supported for backward compatibility. -# -#Example: -#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0 -#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on -#Default: -# none - -# TAG: icap_class -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This deprecated option was documented to define an ICAP service -# chain, even though it actually defined a set of similar, redundant -# services, and the chains were not supported. -# -# To define a set of redundant services, please use the -# adaptation_service_set directive. For service chains, use -# adaptation_service_chain. -#Default: -# none - -# TAG: icap_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This option is deprecated. Please use adaptation_access, which -# has the same ICAP functionality, but comes with better -# documentation, and eCAP support. -#Default: -# none - -# eCAP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: ecap_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap -# -# Controls whether eCAP support is enabled. -#Default: -# ecap_enable off - -# TAG: ecap_service -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap -# -# Defines a single eCAP service -# -# ecap_service id vectoring_point uri [option ...] -# -# id: ID -# an opaque identifier or name which is used to direct traffic to -# this specific service. Must be unique among all adaptation -# services in squid.conf. -# -# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache -# This specifies at which point of transaction processing the -# eCAP service should be activated. *_postcache vectoring points -# are not yet supported. -# -# uri: ecap://vendor/service_name?custom&cgi=style¶meters=optional -# Squid uses the eCAP service URI to match this configuration -# line with one of the dynamically loaded services. Each loaded -# eCAP service must have a unique URI. Obtain the right URI from -# the service provider. -# -# To activate a service, use the adaptation_access directive. To group -# services, use adaptation_service_chain and adaptation_service_set. -# -# Service options are separated by white space. eCAP services support -# the following name=value options: -# -# bypass=on|off|1|0 -# If set to 'on' or '1', the eCAP service is treated as optional. -# If the service cannot be reached or malfunctions, Squid will try -# to ignore any errors and process the message as if the service -# was not enabled. No all eCAP errors can be bypassed. -# If set to 'off' or '0', the eCAP service is treated as essential -# and all eCAP errors will result in an error page returned to the -# HTTP client. -# -# Bypass is off by default: services are treated as essential. -# -# routing=on|off|1|0 -# If set to 'on' or '1', the eCAP service is allowed to -# dynamically change the current message adaptation plan by -# returning a chain of services to be used next. -# -# Dynamic adaptation plan may cross or cover multiple supported -# vectoring points in their natural processing order. -# -# Routing is not allowed by default. -# -# Older ecap_service format without optional named parameters is -# deprecated but supported for backward compatibility. -# -# -#Example: -#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off -#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on -#Default: -# none - -# TAG: loadable_modules -# Instructs Squid to load the specified dynamic module(s) or activate -# preloaded module(s). -#Example: -#loadable_modules /usr/lib/MinimalAdapter.so -#Default: -# none - -# MESSAGE ADAPTATION OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: adaptation_service_set -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# -# Configures an ordered set of similar, redundant services. This is -# useful when hot standby or backup adaptation servers are available. -# -# adaptation_service_set set_name service_name1 service_name2 ... -# -# The named services are used in the set declaration order. The first -# applicable adaptation service from the set is used first. The next -# applicable service is tried if and only if the transaction with the -# previous service fails and the message waiting to be adapted is still -# intact. -# -# When adaptation starts, broken services are ignored as if they were -# not a part of the set. A broken service is a down optional service. -# -# The services in a set must be attached to the same vectoring point -# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD). -# -# If all services in a set are optional then adaptation failures are -# bypassable. If all services in the set are essential, then a -# transaction failure with one service may still be retried using -# another service from the set, but when all services fail, the master -# transaction fails as well. -# -# A set may contain a mix of optional and essential services, but that -# is likely to lead to surprising results because broken services become -# ignored (see above), making previously bypassable failures fatal. -# Technically, it is the bypassability of the last failed service that -# matters. -# -# See also: adaptation_access adaptation_service_chain -# -#Example: -#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup -#adaptation service_set svcLogger loggerLocal loggerRemote -#Default: -# none - -# TAG: adaptation_service_chain -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# -# Configures a list of complementary services that will be applied -# one-by-one, forming an adaptation chain or pipeline. This is useful -# when Squid must perform different adaptations on the same message. -# -# adaptation_service_chain chain_name service_name1 svc_name2 ... -# -# The named services are used in the chain declaration order. The first -# applicable adaptation service from the chain is used first. The next -# applicable service is applied to the successful adaptation results of -# the previous service in the chain. -# -# When adaptation starts, broken services are ignored as if they were -# not a part of the chain. A broken service is a down optional service. -# -# Request satisfaction terminates the adaptation chain because Squid -# does not currently allow declaration of RESPMOD services at the -# "reqmod_precache" vectoring point (see icap_service or ecap_service). -# -# The services in a chain must be attached to the same vectoring point -# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD). -# -# A chain may contain a mix of optional and essential services. If an -# essential adaptation fails (or the failure cannot be bypassed for -# other reasons), the master transaction fails. Otherwise, the failure -# is bypassed as if the failed adaptation service was not in the chain. -# -# See also: adaptation_access adaptation_service_set -# -#Example: -#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector -#Default: -# none - -# TAG: adaptation_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# Sends an HTTP transaction to an ICAP or eCAP adaptation service. -# -# adaptation_access service_name allow|deny [!]aclname... -# adaptation_access set_name allow|deny [!]aclname... -# -# At each supported vectoring point, the adaptation_access -# statements are processed in the order they appear in this -# configuration file. Statements pointing to the following services -# are ignored (i.e., skipped without checking their ACL): -# -# - services serving different vectoring points -# - "broken-but-bypassable" services -# - "up" services configured to ignore such transactions -# (e.g., based on the ICAP Transfer-Ignore header). -# -# When a set_name is used, all services in the set are checked -# using the same rules, to find the first applicable one. See -# adaptation_service_set for details. -# -# If an access list is checked and there is a match, the -# processing stops: For an "allow" rule, the corresponding -# adaptation service is used for the transaction. For a "deny" -# rule, no adaptation service is activated. -# -# It is currently not possible to apply more than one adaptation -# service at the same vectoring point to the same HTTP transaction. -# -# See also: icap_service and ecap_service -# -#Example: -#adaptation_access service_1 allow all -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: adaptation_service_iteration_limit -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# Limits the number of iterations allowed when applying adaptation -# services to a message. If your longest adaptation set or chain -# may have more than 16 services, increase the limit beyond its -# default value of 16. If detecting infinite iteration loops sooner -# is critical, make the iteration limit match the actual number -# of services in your longest adaptation set or chain. -# -# Infinite adaptation loops are most likely with routing services. -# -# See also: icap_service routing=1 -#Default: -# adaptation_service_iteration_limit 16 - -# TAG: adaptation_masterx_shared_names -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# For each master transaction (i.e., the HTTP request and response -# sequence, including all related ICAP and eCAP exchanges), Squid -# maintains a table of metadata. The table entries are (name, value) -# pairs shared among eCAP and ICAP exchanges. The table is destroyed -# with the master transaction. -# -# This option specifies the table entry names that Squid must accept -# from and forward to the adaptation transactions. -# -# An ICAP REQMOD or RESPMOD transaction may set an entry in the -# shared table by returning an ICAP header field with a name -# specified in adaptation_masterx_shared_names. -# -# An eCAP REQMOD or RESPMOD transaction may set an entry in the -# shared table by implementing the libecap::visitEachOption() API -# to provide an option with a name specified in -# adaptation_masterx_shared_names. -# -# Squid will store and forward the set entry to subsequent adaptation -# transactions within the same master transaction scope. -# -# Only one shared entry name is supported at this time. -# -#Example: -## share authentication information among ICAP services -#adaptation_masterx_shared_names X-Subscriber-ID -#Default: -# none - -# TAG: adaptation_meta -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# This option allows Squid administrator to add custom ICAP request -# headers or eCAP options to Squid ICAP requests or eCAP transactions. -# Use it to pass custom authentication tokens and other -# transaction-state related meta information to an ICAP/eCAP service. -# -# The addition of a meta header is ACL-driven: -# adaptation_meta name value [!]aclname ... -# -# Processing for a given header name stops after the first ACL list match. -# Thus, it is impossible to add two headers with the same name. If no ACL -# lists match for a given header name, no such header is added. For -# example: -# -# # do not debug transactions except for those that need debugging -# adaptation_meta X-Debug 1 needs_debugging -# -# # log all transactions except for those that must remain secret -# adaptation_meta X-Log 1 !keep_secret -# -# # mark transactions from users in the "G 1" group -# adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1 -# -# The "value" parameter may be a regular squid.conf token or a "double -# quoted string". Within the quoted string, use backslash (\) to escape -# any character, which is currently only useful for escaping backslashes -# and double quotes. For example, -# "this string has one backslash (\\) and two \"quotes\"" -# -# Used adaptation_meta header values may be logged via %note -# logformat code. If multiple adaptation_meta headers with the same name -# are used during master transaction lifetime, the header values are -# logged in the order they were used and duplicate values are ignored -# (only the first repeated value will be logged). -#Default: -# none - -# TAG: icap_retry -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This ACL determines which retriable ICAP transactions are -# retried. Transactions that received a complete ICAP response -# and did not have to consume or produce HTTP bodies to receive -# that response are usually retriable. -# -# icap_retry allow|deny [!]aclname ... -# -# Squid automatically retries some ICAP I/O timeouts and errors -# due to persistent connection race conditions. -# -# See also: icap_retry_limit -#Default: -# icap_retry deny all - -# TAG: icap_retry_limit -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Limits the number of retries allowed. -# -# Communication errors due to persistent connection race -# conditions are unavoidable, automatically retried, and do not -# count against this limit. -# -# See also: icap_retry -#Default: -# No retries are allowed. - -# DNS OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: check_hostnames -# For security and stability reasons Squid can check -# hostnames for Internet standard RFC compliance. If you want -# Squid to perform these checks turn this directive on. -#Default: -# check_hostnames off - -# TAG: allow_underscore -# Underscore characters is not strictly allowed in Internet hostnames -# but nevertheless used by many sites. Set this to off if you want -# Squid to be strict about the standard. -# This check is performed only when check_hostnames is set to on. -#Default: -# allow_underscore on - -# TAG: cache_dns_program -# Note: This option is only available if Squid is rebuilt with the -# --disable-internal-dns -# -# Specify the location of the executable for dnslookup process. -#Default: -# cache_dns_program /usr/libexec/dnsserver - -# TAG: dns_children -# Note: This option is only available if Squid is rebuilt with the -# --disable-internal-dns -# -# The maximum number of processes spawn to service DNS name lookups. -# If you limit it too few Squid will have to wait for them to process -# a backlog of requests, slowing it down. If you allow too many they -# will use RAM and other system resources noticably. -# The maximum this may be safely set to is 32. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup= -# -# Sets a minimum of how many processes are to be spawned when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few will cause an initial slowdown in traffic as Squid -# attempts to simultaneously spawn enough processes to cope. -# -# idle= -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -#Default: -# dns_children 32 startup=1 idle=1 - -# TAG: dns_retransmit_interval -# Initial retransmit interval for DNS queries. The interval is -# doubled each time all configured DNS servers have been tried. -#Default: -# dns_retransmit_interval 5 seconds - -# TAG: dns_timeout -# DNS Query timeout. If no response is received to a DNS query -# within this time all DNS servers for the queried domain -# are assumed to be unavailable. -#Default: -# dns_timeout 30 seconds - -# TAG: dns_packet_max -# Maximum number of bytes packet size to advertise via EDNS. -# Set to "none" to disable EDNS large packet support. -# -# For legacy reasons DNS UDP replies will default to 512 bytes which -# is too small for many responses. EDNS provides a means for Squid to -# negotiate receiving larger responses back immediately without having -# to failover with repeat requests. Responses larger than this limit -# will retain the old behaviour of failover to TCP DNS. -# -# Squid has no real fixed limit internally, but allowing packet sizes -# over 1500 bytes requires network jumbogram support and is usually not -# necessary. -# -# WARNING: The RFC also indicates that some older resolvers will reply -# with failure of the whole request if the extension is added. Some -# resolvers have already been identified which will reply with mangled -# EDNS response on occasion. Usually in response to many-KB jumbogram -# sizes being advertised by Squid. -# Squid will currently treat these both as an unable-to-resolve domain -# even if it would be resolvable without EDNS. -#Default: -# EDNS disabled - -# TAG: dns_defnames on|off -# Normally the RES_DEFNAMES resolver option is disabled -# (see res_init(3)). This prevents caches in a hierarchy -# from interpreting single-component hostnames locally. To allow -# Squid to handle single-component names, enable this option. -#Default: -# Search for single-label domain names is disabled. - -# TAG: dns_multicast_local on|off -# When set to on, Squid sends multicast DNS lookups on the local -# network for domains ending in .local and .arpa. -# This enables local servers and devices to be contacted in an -# ad-hoc or zero-configuration network environment. -#Default: -# Search for .local and .arpa names is disabled. - -# TAG: dns_nameservers -# Use this if you want to specify a list of DNS name servers -# (IP addresses) to use instead of those given in your -# /etc/resolv.conf file. -# -# On Windows platforms, if no value is specified here or in -# the /etc/resolv.conf file, the list of DNS name servers are -# taken from the Windows registry, both static and dynamic DHCP -# configurations are supported. -# -# Example: dns_nameservers 10.0.0.1 192.172.0.4 -#Default: -# Use operating system definitions - -# TAG: hosts_file -# Location of the host-local IP name-address associations -# database. Most Operating Systems have such a file on different -# default locations: -# - Un*X & Linux: /etc/hosts -# - Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts -# (%SystemRoot% value install default is c:\winnt) -# - Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts -# (%SystemRoot% value install default is c:\windows) -# - Windows 9x/Me: %windir%\hosts -# (%windir% value is usually c:\windows) -# - Cygwin: /etc/hosts -# -# The file contains newline-separated definitions, in the -# form ip_address_in_dotted_form name [name ...] names are -# whitespace-separated. Lines beginning with an hash (#) -# character are comments. -# -# The file is checked at startup and upon configuration. -# If set to 'none', it won't be checked. -# If append_domain is used, that domain will be added to -# domain-local (i.e. not containing any dot character) host -# definitions. -#Default: -# hosts_file /etc/hosts - -# TAG: append_domain -# Appends local domain name to hostnames without any dots in -# them. append_domain must begin with a period. -# -# Be warned there are now Internet names with no dots in -# them using only top-domain names, so setting this may -# cause some Internet sites to become unavailable. -# -#Example: -# append_domain .yourdomain.com -#Default: -# Use operating system definitions - -# TAG: ignore_unknown_nameservers -# By default Squid checks that DNS responses are received -# from the same IP addresses they are sent to. If they -# don't match, Squid ignores the response and writes a warning -# message to cache.log. You can allow responses from unknown -# nameservers by setting this option to 'off'. -#Default: -# ignore_unknown_nameservers on - -# TAG: dns_v4_first -# With the IPv6 Internet being as fast or faster than IPv4 Internet -# for most networks Squid prefers to contact websites over IPv6. -# -# This option reverses the order of preference to make Squid contact -# dual-stack websites over IPv4 first. Squid will still perform both -# IPv6 and IPv4 DNS lookups before connecting. -# -# WARNING: -# This option will restrict the situations under which IPv6 -# connectivity is used (and tested). Hiding network problems -# which would otherwise be detected and warned about. -#Default: -# dns_v4_first off - -# TAG: ipcache_size (number of entries) -# Maximum number of DNS IP cache entries. -#Default: -# ipcache_size 1024 - -# TAG: ipcache_low (percent) -#Default: -# ipcache_low 90 - -# TAG: ipcache_high (percent) -# The size, low-, and high-water marks for the IP cache. -#Default: -# ipcache_high 95 - -# TAG: fqdncache_size (number of entries) -# Maximum number of FQDN cache entries. -#Default: -# fqdncache_size 1024 - -# MISCELLANEOUS -# ----------------------------------------------------------------------------- - -# TAG: configuration_includes_quoted_values on|off -# Previous Squid versions have defined "quoted/string" as syntax for -# ACL to signifiy the value is an included file containing values and -# has treated the " characters in other places of the configuration file -# as part of the parameter value it was used for. -# -# For compatibility with existing installations that behaviour -# remains the default. -# -# If this directive is set to 'on', Squid will start parsing each -# "quoted string" as a single configuration directive parameter. The -# quotes are stripped before the parameter value is interpreted or use. -# -# That will continue for all lines until this directive is set to 'off', -# where Squid will return to the default configuration parsing. -# -# For example; -# -# configuration_includes_quoted_values on -# acl group external groupCheck Administrators "Internet Users" Guest -# configuration_includes_quoted_values off -# -#Default: -# configuration_includes_quoted_values off - -# TAG: memory_pools on|off -# If set, Squid will keep pools of allocated (but unused) memory -# available for future use. If memory is a premium on your -# system and you believe your malloc library outperforms Squid -# routines, disable this. -#Default: -# memory_pools on - -# TAG: memory_pools_limit (bytes) -# Used only with memory_pools on: -# memory_pools_limit 50 MB -# -# If set to a non-zero value, Squid will keep at most the specified -# limit of allocated (but unused) memory in memory pools. All free() -# requests that exceed this limit will be handled by your malloc -# library. Squid does not pre-allocate any memory, just safe-keeps -# objects that otherwise would be free()d. Thus, it is safe to set -# memory_pools_limit to a reasonably high value even if your -# configuration will use less memory. -# -# If set to none, Squid will keep all memory it can. That is, there -# will be no limit on the total amount of memory used for safe-keeping. -# -# To disable memory allocation optimization, do not set -# memory_pools_limit to 0 or none. Set memory_pools to "off" instead. -# -# An overhead for maintaining memory pools is not taken into account -# when the limit is checked. This overhead is close to four bytes per -# object kept. However, pools may actually _save_ memory because of -# reduced memory thrashing in your malloc library. -#Default: -# memory_pools_limit 5 MB - -# TAG: forwarded_for on|off|transparent|truncate|delete -# If set to "on", Squid will append your client's IP address -# in the HTTP requests it forwards. By default it looks like: -# -# X-Forwarded-For: 192.1.2.3 -# -# If set to "off", it will appear as -# -# X-Forwarded-For: unknown -# -# If set to "transparent", Squid will not alter the -# X-Forwarded-For header in any way. -# -# If set to "delete", Squid will delete the entire -# X-Forwarded-For header. -# -# If set to "truncate", Squid will remove all existing -# X-Forwarded-For entries, and place the client IP as the sole entry. -#Default: -# forwarded_for on - -# TAG: cachemgr_passwd -# Specify passwords for cachemgr operations. -# -# Usage: cachemgr_passwd password action action ... -# -# Some valid actions are (see cache manager menu for a full list): -# 5min -# 60min -# asndb -# authenticator -# cbdata -# client_list -# comm_incoming -# config * -# counters -# delay -# digest_stats -# dns -# events -# filedescriptors -# fqdncache -# histograms -# http_headers -# info -# io -# ipcache -# mem -# menu -# netdb -# non_peers -# objects -# offline_toggle * -# pconn -# peer_select -# reconfigure * -# redirector -# refresh -# server_list -# shutdown * -# store_digest -# storedir -# utilization -# via_headers -# vm_objects -# -# * Indicates actions which will not be performed without a -# valid password, others can be performed if not listed here. -# -# To disable an action, set the password to "disable". -# To allow performing an action without a password, set the -# password to "none". -# -# Use the keyword "all" to set the same password for all actions. -# -#Example: -# cachemgr_passwd secret shutdown -# cachemgr_passwd lesssssssecret info stats/objects -# cachemgr_passwd disable all -#Default: -# No password. Actions which require password are denied. - -# TAG: client_db on|off -# If you want to disable collecting per-client statistics, -# turn off client_db here. -#Default: -# client_db on - -# TAG: refresh_all_ims on|off -# When you enable this option, squid will always check -# the origin server for an update when a client sends an -# If-Modified-Since request. Many browsers use IMS -# requests when the user requests a reload, and this -# ensures those clients receive the latest version. -# -# By default (off), squid may return a Not Modified response -# based on the age of the cached version. -#Default: -# refresh_all_ims off - -# TAG: reload_into_ims on|off -# When you enable this option, client no-cache or ``reload'' -# requests will be changed to If-Modified-Since requests. -# Doing this VIOLATES the HTTP standard. Enabling this -# feature could make you liable for problems which it -# causes. -# -# see also refresh_pattern for a more selective approach. -#Default: -# reload_into_ims off - -# TAG: connect_retries -# This sets the maximum number of connection attempts made for each -# TCP connection. The connect_retries attempts must all still -# complete within the connection timeout period. -# -# The default is not to re-try if the first connection attempt fails. -# The (not recommended) maximum is 10 tries. -# -# A warning message will be generated if it is set to a too-high -# value and the configured value will be over-ridden. -# -# Note: These re-tries are in addition to forward_max_tries -# which limit how many different addresses may be tried to find -# a useful server. -#Default: -# Do not retry failed connections. - -# TAG: retry_on_error -# If set to ON Squid will automatically retry requests when -# receiving an error response with status 403 (Forbidden), -# 500 (Internal Error), 501 or 503 (Service not available). -# Status 502 and 504 (Gateway errors) are always retried. -# -# This is mainly useful if you are in a complex cache hierarchy to -# work around access control errors. -# -# NOTE: This retry will attempt to find another working destination. -# Which is different from the server which just failed. -#Default: -# retry_on_error off - -# TAG: as_whois_server -# WHOIS server to query for AS numbers. NOTE: AS numbers are -# queried only when Squid starts up, not for every request. -#Default: -# as_whois_server whois.ra.net - -# TAG: offline_mode -# Enable this option and Squid will never try to validate cached -# objects. -#Default: -# offline_mode off - -# TAG: uri_whitespace -# What to do with requests that have whitespace characters in the -# URI. Options: -# -# strip: The whitespace characters are stripped out of the URL. -# This is the behavior recommended by RFC2396 and RFC3986 -# for tolerant handling of generic URI. -# NOTE: This is one difference between generic URI and HTTP URLs. -# -# deny: The request is denied. The user receives an "Invalid -# Request" message. -# This is the behaviour recommended by RFC2616 for safe -# handling of HTTP request URL. -# -# allow: The request is allowed and the URI is not changed. The -# whitespace characters remain in the URI. Note the -# whitespace is passed to redirector processes if they -# are in use. -# Note this may be considered a violation of RFC2616 -# request parsing where whitespace is prohibited in the -# URL field. -# -# encode: The request is allowed and the whitespace characters are -# encoded according to RFC1738. -# -# chop: The request is allowed and the URI is chopped at the -# first whitespace. -# -# -# NOTE the current Squid implementation of encode and chop violates -# RFC2616 by not using a 301 redirect after altering the URL. -#Default: -# uri_whitespace strip - -# TAG: chroot -# Specifies a directory where Squid should do a chroot() while -# initializing. This also causes Squid to fully drop root -# privileges after initializing. This means, for example, if you -# use a HTTP port less than 1024 and try to reconfigure, you may -# get an error saying that Squid can not open the port. -#Default: -# none - -# TAG: balance_on_multiple_ip -# Modern IP resolvers in squid sort lookup results by preferred access. -# By default squid will use these IP in order and only rotates to -# the next listed when the most preffered fails. -# -# Some load balancing servers based on round robin DNS have been -# found not to preserve user session state across requests -# to different IP addresses. -# -# Enabling this directive Squid rotates IP's per request. -#Default: -# balance_on_multiple_ip off - -# TAG: pipeline_prefetch -# HTTP clients may send a pipeline of 1+N requests to Squid using a -# single connection, without waiting for Squid to respond to the first -# of those requests. This option limits the number of concurrent -# requests Squid will try to handle in parallel. If set to N, Squid -# will try to receive and process up to 1+N requests on the same -# connection concurrently. -# -# Defaults to 0 (off) for bandwidth management and access logging -# reasons. -# -# NOTE: pipelining requires persistent connections to clients. -# -# WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication. -#Default: -# Do not pre-parse pipelined requests. - -# TAG: high_response_time_warning (msec) -# If the one-minute median response time exceeds this value, -# Squid prints a WARNING with debug level 0 to get the -# administrators attention. The value is in milliseconds. -#Default: -# disabled. - -# TAG: high_page_fault_warning -# If the one-minute average page fault rate exceeds this -# value, Squid prints a WARNING with debug level 0 to get -# the administrators attention. The value is in page faults -# per second. -#Default: -# disabled. - -# TAG: high_memory_warning -# Note: This option is only available if Squid is rebuilt with the -# GNU Malloc with mstats() -# -# If the memory usage (as determined by mallinfo) exceeds -# this amount, Squid prints a WARNING with debug level 0 to get -# the administrators attention. -#Default: -# disabled. - -# TAG: sleep_after_fork (microseconds) -# When this is set to a non-zero value, the main Squid process -# sleeps the specified number of microseconds after a fork() -# system call. This sleep may help the situation where your -# system reports fork() failures due to lack of (virtual) -# memory. Note, however, if you have a lot of child -# processes, these sleep delays will add up and your -# Squid will not service requests for some amount of time -# until all the child processes have been started. -# On Windows value less then 1000 (1 milliseconds) are -# rounded to 1000. -#Default: -# sleep_after_fork 0 - -# TAG: windows_ipaddrchangemonitor on|off -# Note: This option is only available if Squid is rebuilt with the -# MS Windows -# -# On Windows Squid by default will monitor IP address changes and will -# reconfigure itself after any detected event. This is very useful for -# proxies connected to internet with dial-up interfaces. -# In some cases (a Proxy server acting as VPN gateway is one) it could be -# desiderable to disable this behaviour setting this to 'off'. -# Note: after changing this, Squid service must be restarted. -#Default: -# windows_ipaddrchangemonitor on - -# TAG: eui_lookup -# Whether to lookup the EUI or MAC address of a connected client. -#Default: -# eui_lookup on - -# TAG: max_filedescriptors -# Reduce the maximum number of filedescriptors supported below -# the usual operating system defaults. -# -# Remove from squid.conf to inherit the current ulimit setting. -# -# Note: Changing this requires a restart of Squid. Also -# not all I/O types supports large values (eg on Windows). -#Default: -# Use operating system limits set by ulimit. - -# TAG: workers -# Number of main Squid processes or "workers" to fork and maintain. -# 0: "no daemon" mode, like running "squid -N ..." -# 1: "no SMP" mode, start one main Squid process daemon (default) -# N: start N main Squid process daemons (i.e., SMP mode) -# -# In SMP mode, each worker does nearly all what a single Squid daemon -# does (e.g., listen on http_port and forward HTTP requests). -#Default: -# SMP support disabled. - -# TAG: cpu_affinity_map -# Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,... -# -# Sets 1:1 mapping between Squid processes and CPU cores. For example, -# -# cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7 -# -# affects processes 1 through 4 only and places them on the first -# four even cores, starting with core #1. -# -# CPU cores are numbered starting from 1. Requires support for -# sched_getaffinity(2) and sched_setaffinity(2) system calls. -# -# Multiple cpu_affinity_map options are merged. -# -# See also: workers -#Default: -# Let operating system decide. - diff --git a/network/squid/squid.conf.documented b/network/squid/squid.conf.documented deleted file mode 100644 index bd70bbfa5f..0000000000 --- a/network/squid/squid.conf.documented +++ /dev/null @@ -1,7806 +0,0 @@ -# WELCOME TO SQUID 3.4.10 -# ---------------------------- -# -# This is the documentation for the Squid configuration file. -# This documentation can also be found online at: -# http://www.squid-cache.org/Doc/config/ -# -# You may wish to look at the Squid home page and wiki for the -# FAQ and other documentation: -# http://www.squid-cache.org/ -# http://wiki.squid-cache.org/SquidFaq -# http://wiki.squid-cache.org/ConfigExamples -# -# This documentation shows what the defaults for various directives -# happen to be. If you don't need to change the default, you should -# leave the line out of your squid.conf in most cases. -# -# In some cases "none" refers to no default setting at all, -# while in other cases it refers to the value of the option -# - the comments for that keyword indicate if this is the case. -# - -# Configuration options can be included using the "include" directive. -# Include takes a list of files to include. Quoting and wildcards are -# supported. -# -# For example, -# -# include /path/to/included/file/squid.acl.config -# -# Includes can be nested up to a hard-coded depth of 16 levels. -# This arbitrary restriction is to prevent recursive include references -# from causing Squid entering an infinite loop whilst trying to load -# configuration files. -# -# Values with byte units -# -# Squid accepts size units on some size related directives. All -# such directives are documented with a default value displaying -# a unit. -# -# Units accepted by Squid are: -# bytes - byte -# KB - Kilobyte (1024 bytes) -# MB - Megabyte -# GB - Gigabyte -# -# Values with spaces, quotes, and other special characters -# -# Squid supports directive parameters with spaces, quotes, and other -# special characters. Surround such parameters with "double quotes". Use -# the configuration_includes_quoted_values directive to enable or -# disable that support. -# -# For example; -# -# configuration_includes_quoted_values on -# acl group external groupCheck Administrators "Internet Users" Guest -# configuration_includes_quoted_values off -# -# -# Conditional configuration -# -# If-statements can be used to make configuration directives -# depend on conditions: -# -# if <CONDITION> -# ... regular configuration directives ... -# [else -# ... regular configuration directives ...] -# endif -# -# The else part is optional. The keywords "if", "else", and "endif" -# must be typed on their own lines, as if they were regular -# configuration directives. -# -# NOTE: An else-if condition is not supported. -# -# These individual conditions types are supported: -# -# true -# Always evaluates to true. -# false -# Always evaluates to false. -# <integer> = <integer> -# Equality comparison of two integer numbers. -# -# -# SMP-Related Macros -# -# The following SMP-related preprocessor macros can be used. -# -# ${process_name} expands to the current Squid process "name" -# (e.g., squid1, squid2, or cache1). -# -# ${process_number} expands to the current Squid process -# identifier, which is an integer number (e.g., 1, 2, 3) unique -# across all Squid processes. - -# TAG: broken_vary_encoding -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: cache_vary -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: collapsed_forwarding -# This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495 -#Default: -# none - -# TAG: error_map -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: external_refresh_check -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: location_rewrite_program -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: refresh_stale_hit -# This option is not yet supported by Squid-3. -#Default: -# none - -# TAG: ignore_ims_on_miss -# Remove this line. The HTTP/1.1 feature is now configured by 'cache_miss_revalidate'. -#Default: -# none - -# TAG: ignore_expect_100 -# Remove this line. The HTTP/1.1 feature is now fully supported by default. -#Default: -# none - -# TAG: dns_v4_fallback -# Remove this line. Squid performs a 'Happy Eyeballs' algorithm, the 'fallback' algorithm is no longer relevant. -#Default: -# none - -# TAG: ftp_list_width -# Remove this line. Configure FTP page display using the CSS controls in errorpages.css instead. -#Default: -# none - -# TAG: maximum_single_addr_tries -# Replaced by connect_retries. The behaviour has changed, please read the documentation before altering. -#Default: -# none - -# TAG: update_headers -# Remove this line. The feature is supported by default in storage types where update is implemented. -#Default: -# none - -# TAG: url_rewrite_concurrency -# Remove this line. Set the 'concurrency=' option of url_rewrite_children instead. -#Default: -# none - -# TAG: dns_testnames -# Remove this line. DNS is no longer tested on startup. -#Default: -# none - -# TAG: extension_methods -# Remove this line. All valid methods for HTTP are accepted by default. -#Default: -# none - -# TAG: zero_buffers -#Default: -# none - -# TAG: incoming_rate -#Default: -# none - -# TAG: server_http11 -# Remove this line. HTTP/1.1 is supported by default. -#Default: -# none - -# TAG: upgrade_http0.9 -# Remove this line. ICY/1.0 streaming protocol is supported by default. -#Default: -# none - -# TAG: zph_local -# Alter these entries. Use the qos_flows directive instead. -#Default: -# none - -# TAG: header_access -# Since squid-3.0 replace with request_header_access or reply_header_access -# depending on whether you wish to match client requests or server replies. -#Default: -# none - -# TAG: httpd_accel_no_pmtu_disc -# Since squid-3.0 use the 'disable-pmtu-discovery' flag on http_port instead. -#Default: -# none - -# TAG: wais_relay_host -# Replace this line with 'cache_peer' configuration. -#Default: -# none - -# TAG: wais_relay_port -# Replace this line with 'cache_peer' configuration. -#Default: -# none - -# OPTIONS FOR AUTHENTICATION -# ----------------------------------------------------------------------------- - -# TAG: auth_param -# This is used to define parameters for the various authentication -# schemes supported by Squid. -# -# format: auth_param scheme parameter [setting] -# -# The order in which authentication schemes are presented to the client is -# dependent on the order the scheme first appears in config file. IE -# has a bug (it's not RFC 2617 compliant) in that it will use the basic -# scheme if basic is the first entry presented, even if more secure -# schemes are presented. For now use the order in the recommended -# settings section below. If other browsers have difficulties (don't -# recognize the schemes offered even if you are using basic) either -# put basic first, or disable the other schemes (by commenting out their -# program entry). -# -# Once an authentication scheme is fully configured, it can only be -# shutdown by shutting squid down and restarting. Changes can be made on -# the fly and activated with a reconfigure. I.E. You can change to a -# different helper, but not unconfigure the helper completely. -# -# Please note that while this directive defines how Squid processes -# authentication it does not automatically activate authentication. -# To use authentication you must in addition make use of ACLs based -# on login name in http_access (proxy_auth, proxy_auth_regex or -# external with %LOGIN used in the format tag). The browser will be -# challenged for authentication on the first such acl encountered -# in http_access processing and will also be re-challenged for new -# login credentials if the request is being denied by a proxy_auth -# type acl. -# -# WARNING: authentication can't be used in a transparently intercepting -# proxy as the client then thinks it is talking to an origin server and -# not the proxy. This is a limitation of bending the TCP/IP protocol to -# transparently intercepting port 80, not a limitation in Squid. -# Ports flagged 'transparent', 'intercept', or 'tproxy' have -# authentication disabled. -# -# === Parameters for the basic scheme follow. === -# -# "program" cmdline -# Specify the command for the external authenticator. Such a program -# reads a line containing "username password" and replies with one of -# three results: -# -# OK -# the user exists. -# -# ERR -# the user does not exist. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. -# -# "ERR" and "BH" results may optionally be followed by message="..." -# containing a description available as %m in the returned error page. -# -# If you use an authenticator, make sure you have 1 acl of type -# proxy_auth. -# -# By default, the basic authentication scheme is not used unless a -# program is specified. -# -# If you want to use the traditional NCSA proxy authentication, set -# this line to something like -# -# auth_param basic program /usr/libexec/basic_ncsa_auth /usr/etc/passwd -# -# "utf8" on|off -# HTTP uses iso-latin-1 as character set, while some authentication -# backends such as LDAP expects UTF-8. If this is set to on Squid will -# translate the HTTP iso-latin-1 charset to UTF-8 before sending the -# username & password to the helper. -# -# "children" numberofchildren [startup=N] [idle=N] [concurrency=N] -# The maximum number of authenticator processes to spawn. If you start too few -# Squid will have to wait for them to process a backlog of credential -# verifications, slowing it down. When password verifications are -# done via a (slow) network you are likely to need lots of -# authenticator processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# The concurrency= option sets the number of concurrent requests the -# helper can process. The default of 0 is used for helpers who only -# supports one request at a time. Setting this to a number greater than -# 0 changes the protocol used to include a channel number first on the -# request/response line, allowing multiple requests to be sent to the -# same helper in parallel without waiting for the response. -# Must not be set unless it's known the helper supports this. -# -# auth_param basic children 20 startup=0 idle=1 -# -# "realm" realmstring -# Specifies the realm name which is to be reported to the -# client for the basic proxy authentication scheme (part of -# the text the user will see when prompted their username and -# password). There is no default. -# auth_param basic realm Squid proxy-caching web server -# -# "credentialsttl" timetolive -# Specifies how long squid assumes an externally validated -# username:password pair is valid for - in other words how -# often the helper program is called for that user. Set this -# low to force revalidation with short lived passwords. Note -# setting this high does not impact your susceptibility -# to replay attacks unless you are using an one-time password -# system (such as SecureID). If you are using such a system, -# you will be vulnerable to replay attacks unless you also -# use the max_user_ip ACL in an http_access rule. -# -# "casesensitive" on|off -# Specifies if usernames are case sensitive. Most user databases are -# case insensitive allowing the same username to be spelled using both -# lower and upper case letters, but some are case sensitive. This -# makes a big difference for user_max_ip ACL processing and similar. -# auth_param basic casesensitive off -# -# === Parameters for the digest scheme follow === -# -# "program" cmdline -# Specify the command for the external authenticator. Such -# a program reads a line containing "username":"realm" and -# replies with one of three results: -# -# OK ha1="..." -# the user exists. The ha1= key is mandatory and -# contains the appropriate H(A1) value, hex encoded. -# See rfc 2616 for the definition of H(A1). -# -# ERR -# the user does not exist. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. -# -# "ERR" and "BH" results may optionally be followed by message="..." -# containing a description available as %m in the returned error page. -# -# By default, the digest authentication scheme is not used unless a -# program is specified. -# -# If you want to use a digest authenticator, set this line to -# something like -# -# auth_param digest program /usr/bin/digest_pw_auth /usr/etc/digpass -# -# "utf8" on|off -# HTTP uses iso-latin-1 as character set, while some authentication -# backends such as LDAP expects UTF-8. If this is set to on Squid will -# translate the HTTP iso-latin-1 charset to UTF-8 before sending the -# username & password to the helper. -# -# "children" numberofchildren [startup=N] [idle=N] [concurrency=N] -# The maximum number of authenticator processes to spawn (default 5). -# If you start too few Squid will have to wait for them to -# process a backlog of H(A1) calculations, slowing it down. -# When the H(A1) calculations are done via a (slow) network -# you are likely to need lots of authenticator processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# The concurrency= option sets the number of concurrent requests the -# helper can process. The default of 0 is used for helpers who only -# supports one request at a time. Setting this to a number greater than -# 0 changes the protocol used to include a channel number first on the -# request/response line, allowing multiple requests to be sent to the -# same helper in parallel without waiting for the response. -# Must not be set unless it's known the helper supports this. -# -# auth_param digest children 20 startup=0 idle=1 -# -# "realm" realmstring -# Specifies the realm name which is to be reported to the -# client for the digest proxy authentication scheme (part of -# the text the user will see when prompted their username and -# password). There is no default. -# auth_param digest realm Squid proxy-caching web server -# -# "nonce_garbage_interval" timeinterval -# Specifies the interval that nonces that have been issued -# to client_agent's are checked for validity. -# -# "nonce_max_duration" timeinterval -# Specifies the maximum length of time a given nonce will be -# valid for. -# -# "nonce_max_count" number -# Specifies the maximum number of times a given nonce can be -# used. -# -# "nonce_strictness" on|off -# Determines if squid requires strict increment-by-1 behavior -# for nonce counts, or just incrementing (off - for use when -# user agents generate nonce counts that occasionally miss 1 -# (ie, 1,2,4,6)). Default off. -# -# "check_nonce_count" on|off -# This directive if set to off can disable the nonce count check -# completely to work around buggy digest qop implementations in -# certain mainstream browser versions. Default on to check the -# nonce count to protect from authentication replay attacks. -# -# "post_workaround" on|off -# This is a workaround to certain buggy browsers who sends -# an incorrect request digest in POST requests when reusing -# the same nonce as acquired earlier on a GET request. -# -# === NTLM scheme options follow === -# -# "program" cmdline -# Specify the command for the external NTLM authenticator. -# Such a program reads exchanged NTLMSSP packets with -# the browser via Squid until authentication is completed. -# If you use an NTLM authenticator, make sure you have 1 acl -# of type proxy_auth. By default, the NTLM authenticator program -# is not used. -# -# auth_param ntlm program /usr/bin/ntlm_auth -# -# "children" numberofchildren [startup=N] [idle=N] -# The maximum number of authenticator processes to spawn (default 5). -# If you start too few Squid will have to wait for them to -# process a backlog of credential verifications, slowing it -# down. When credential verifications are done via a (slow) -# network you are likely to need lots of authenticator -# processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# auth_param ntlm children 20 startup=0 idle=1 -# -# "keep_alive" on|off -# If you experience problems with PUT/POST requests when using the -# Negotiate authentication scheme then you can try setting this to -# off. This will cause Squid to forcibly close the connection on -# the initial requests where the browser asks which schemes are -# supported by the proxy. -# -# auth_param ntlm keep_alive on -# -# === Options for configuring the NEGOTIATE auth-scheme follow === -# -# "program" cmdline -# Specify the command for the external Negotiate authenticator. -# This protocol is used in Microsoft Active-Directory enabled setups with -# the Microsoft Internet Explorer or Mozilla Firefox browsers. -# Its main purpose is to exchange credentials with the Squid proxy -# using the Kerberos mechanisms. -# If you use a Negotiate authenticator, make sure you have at least -# one acl of type proxy_auth active. By default, the negotiate -# authenticator program is not used. -# The only supported program for this role is the ntlm_auth -# program distributed as part of Samba, version 4 or later. -# -# auth_param negotiate program /usr/bin/ntlm_auth --helper-protocol=gss-spnego -# -# "children" numberofchildren [startup=N] [idle=N] -# The maximum number of authenticator processes to spawn (default 5). -# If you start too few Squid will have to wait for them to -# process a backlog of credential verifications, slowing it -# down. When credential verifications are done via a (slow) -# network you are likely to need lots of authenticator -# processes. -# -# The startup= and idle= options permit some skew in the exact amount -# run. A minimum of startup=N will begin during startup and reconfigure. -# Squid will start more in groups of up to idle=N in an attempt to meet -# traffic needs and to keep idle=N free above those traffic needs up to -# the maximum. -# -# auth_param negotiate children 20 startup=0 idle=1 -# -# "keep_alive" on|off -# If you experience problems with PUT/POST requests when using the -# Negotiate authentication scheme then you can try setting this to -# off. This will cause Squid to forcibly close the connection on -# the initial requests where the browser asks which schemes are -# supported by the proxy. -# -# auth_param negotiate keep_alive on -# -# -# Examples: -# -##Recommended minimum configuration per scheme: -##auth_param negotiate program <uncomment and complete this line to activate> -##auth_param negotiate children 20 startup=0 idle=1 -##auth_param negotiate keep_alive on -## -##auth_param ntlm program <uncomment and complete this line to activate> -##auth_param ntlm children 20 startup=0 idle=1 -##auth_param ntlm keep_alive on -## -##auth_param digest program <uncomment and complete this line> -##auth_param digest children 20 startup=0 idle=1 -##auth_param digest realm Squid proxy-caching web server -##auth_param digest nonce_garbage_interval 5 minutes -##auth_param digest nonce_max_duration 30 minutes -##auth_param digest nonce_max_count 50 -## -##auth_param basic program <uncomment and complete this line> -##auth_param basic children 5 startup=5 idle=1 -##auth_param basic realm Squid proxy-caching web server -##auth_param basic credentialsttl 2 hours -#Default: -# none - -# TAG: authenticate_cache_garbage_interval -# The time period between garbage collection across the username cache. -# This is a trade-off between memory utilization (long intervals - say -# 2 days) and CPU (short intervals - say 1 minute). Only change if you -# have good reason to. -#Default: -# authenticate_cache_garbage_interval 1 hour - -# TAG: authenticate_ttl -# The time a user & their credentials stay in the logged in -# user cache since their last request. When the garbage -# interval passes, all user credentials that have passed their -# TTL are removed from memory. -#Default: -# authenticate_ttl 1 hour - -# TAG: authenticate_ip_ttl -# If you use proxy authentication and the 'max_user_ip' ACL, -# this directive controls how long Squid remembers the IP -# addresses associated with each user. Use a small value -# (e.g., 60 seconds) if your users might change addresses -# quickly, as is the case with dialup. You might be safe -# using a larger value (e.g., 2 hours) in a corporate LAN -# environment with relatively static address assignments. -#Default: -# authenticate_ip_ttl 1 second - -# ACCESS CONTROLS -# ----------------------------------------------------------------------------- - -# TAG: external_acl_type -# This option defines external acl classes using a helper program -# to look up the status -# -# external_acl_type name [options] FORMAT.. /path/to/helper [helper arguments..] -# -# Options: -# -# ttl=n TTL in seconds for cached results (defaults to 3600 -# for 1 hour) -# -# negative_ttl=n -# TTL for cached negative lookups (default same -# as ttl) -# -# grace=n Percentage remaining of TTL where a refresh of a -# cached entry should be initiated without needing to -# wait for a new reply. (default is for no grace period) -# -# cache=n Limit the result cache size, default is 262144. -# The expanded FORMAT value is used as the cache key, so -# if the details in FORMAT are highly variable a larger -# cache may be needed to produce reduction in helper load. -# -# children-max=n -# Maximum number of acl helper processes spawned to service -# external acl lookups of this type. (default 20) -# -# children-startup=n -# Minimum number of acl helper processes to spawn during -# startup and reconfigure to service external acl lookups -# of this type. (default 0) -# -# children-idle=n -# Number of acl helper processes to keep ahead of traffic -# loads. Squid will spawn this many at once whenever load -# rises above the capabilities of existing processes. -# Up to the value of children-max. (default 1) -# -# concurrency=n concurrency level per process. Only used with helpers -# capable of processing more than one query at a time. -# -# protocol=2.5 Compatibility mode for Squid-2.5 external acl helpers. -# -# ipv4 / ipv6 IP protocol used to communicate with this helper. -# The default is to auto-detect IPv6 and use it when available. -# -# -# FORMAT specifications -# -# %LOGIN Authenticated user login name -# %EXT_USER Username from previous external acl -# %EXT_LOG Log details from previous external acl -# %EXT_TAG Tag from previous external acl -# %IDENT Ident user name -# %SRC Client IP -# %SRCPORT Client source port -# %URI Requested URI -# %DST Requested host -# %PROTO Requested protocol -# %PORT Requested port -# %PATH Requested URL path -# %METHOD Request method -# %MYADDR Squid interface address -# %MYPORT Squid http_port number -# %PATH Requested URL-path (including query-string if any) -# %USER_CERT SSL User certificate in PEM format -# %USER_CERTCHAIN SSL User certificate chain in PEM format -# %USER_CERT_xx SSL User certificate subject attribute xx -# %USER_CA_CERT_xx SSL User certificate issuer attribute xx -# -# %>{Header} HTTP request header "Header" -# %>{Hdr:member} -# HTTP request header "Hdr" list member "member" -# %>{Hdr:;member} -# HTTP request header list member using ; as -# list separator. ; can be any non-alphanumeric -# character. -# -# %<{Header} HTTP reply header "Header" -# %<{Hdr:member} -# HTTP reply header "Hdr" list member "member" -# %<{Hdr:;member} -# HTTP reply header list member using ; as -# list separator. ; can be any non-alphanumeric -# character. -# -# %ACL The name of the ACL being tested. -# %DATA The ACL arguments. If not used then any arguments -# is automatically added at the end of the line -# sent to the helper. -# NOTE: this will encode the arguments as one token, -# whereas the default will pass each separately. -# -# %% The percent sign. Useful for helpers which need -# an unchanging input format. -# -# -# General request syntax: -# -# [channel-ID] FORMAT-values [acl-values ...] -# -# -# FORMAT-values consists of transaction details expanded with -# whitespace separation per the config file FORMAT specification -# using the FORMAT macros listed above. -# -# acl-values consists of any string specified in the referencing -# config 'acl ... external' line. see the "acl external" directive. -# -# Request values sent to the helper are URL escaped to protect -# each value in requests against whitespaces. -# -# If using protocol=2.5 then the request sent to the helper is not -# URL escaped to protect against whitespace. -# -# NOTE: protocol=3.0 is deprecated as no longer necessary. -# -# When using the concurrency= option the protocol is changed by -# introducing a query channel tag in front of the request/response. -# The query channel tag is a number between 0 and concurrency-1. -# This value must be echoed back unchanged to Squid as the first part -# of the response relating to its request. -# -# -# The helper receives lines expanded per the above format specification -# and for each input line returns 1 line starting with OK/ERR/BH result -# code and optionally followed by additional keywords with more details. -# -# -# General result syntax: -# -# [channel-ID] result keyword=value ... -# -# Result consists of one of the codes: -# -# OK -# the ACL test produced a match. -# -# ERR -# the ACL test does not produce a match. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. -# -# The meaning of 'a match' is determined by your squid.conf -# access control configuration. See the Squid wiki for details. -# -# Defined keywords: -# -# user= The users name (login) -# -# password= The users password (for login= cache_peer option) -# -# message= Message describing the reason for this response. -# Available as %o in error pages. -# Useful on (ERR and BH results). -# -# tag= Apply a tag to a request. Only sets a tag once, -# does not alter existing tags. -# -# log= String to be logged in access.log. Available as -# %ea in logformat specifications. -# -# Any keywords may be sent on any response whether OK, ERR or BH. -# -# All response keyword values need to be a single token with URL -# escaping, or enclosed in double quotes (") and escaped using \ on -# any double quotes or \ characters within the value. The wrapping -# double quotes are removed before the value is interpreted by Squid. -# \r and \n are also replace by CR and LF. -# -# Some example key values: -# -# user=John%20Smith -# user="John Smith" -# user="J. \"Bob\" Smith" -#Default: -# none - -# TAG: acl -# Defining an Access List -# -# Every access list definition must begin with an aclname and acltype, -# followed by either type-specific arguments or a quoted filename that -# they are read from. -# -# acl aclname acltype argument ... -# acl aclname acltype "file" ... -# -# When using "file", the file should contain one item per line. -# -# Some acl types supports options which changes their default behaviour. -# The available options are: -# -# -i,+i By default, regular expressions are CASE-SENSITIVE. To make them -# case-insensitive, use the -i option. To return case-sensitive -# use the +i option between patterns, or make a new ACL line -# without -i. -# -# -n Disable lookups and address type conversions. If lookup or -# conversion is required because the parameter type (IP or -# domain name) does not match the message address type (domain -# name or IP), then the ACL would immediately declare a mismatch -# without any warnings or lookups. -# -# -- Used to stop processing all options, in the case the first acl -# value has '-' character as first character (for example the '-' -# is a valid domain name) -# -# Some acl types require suspending the current request in order -# to access some external data source. -# Those which do are marked with the tag [slow], those which -# don't are marked as [fast]. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl -# for further information -# -# ***** ACL TYPES AVAILABLE ***** -# -# acl aclname src ip-address/mask ... # clients IP address [fast] -# acl aclname src addr1-addr2/mask ... # range of addresses [fast] -# acl aclname dst [-n] ip-address/mask ... # URL host's IP address [slow] -# acl aclname localip ip-address/mask ... # IP address the client connected to [fast] -# -# acl aclname arp mac-address ... (xx:xx:xx:xx:xx:xx notation) -# # The arp ACL requires the special configure option --enable-arp-acl. -# # Furthermore, the ARP ACL code is not portable to all operating systems. -# # It works on Linux, Solaris, Windows, FreeBSD, and some -# # other *BSD variants. -# # [fast] -# # -# # NOTE: Squid can only determine the MAC address for clients that are on -# # the same subnet. If the client is on a different subnet, -# # then Squid cannot find out its MAC address. -# -# acl aclname srcdomain .foo.com ... -# # reverse lookup, from client IP [slow] -# acl aclname dstdomain [-n] .foo.com ... -# # Destination server from URL [fast] -# acl aclname srcdom_regex [-i] \.foo\.com ... -# # regex matching client name [slow] -# acl aclname dstdom_regex [-n] [-i] \.foo\.com ... -# # regex matching server [fast] -# # -# # For dstdomain and dstdom_regex a reverse lookup is tried if a IP -# # based URL is used and no match is found. The name "none" is used -# # if the reverse lookup fails. -# -# acl aclname src_as number ... -# acl aclname dst_as number ... -# # [fast] -# # Except for access control, AS numbers can be used for -# # routing of requests to specific caches. Here's an -# # example for routing all requests for AS#1241 and only -# # those to mycache.mydomain.net: -# # acl asexample dst_as 1241 -# # cache_peer_access mycache.mydomain.net allow asexample -# # cache_peer_access mycache_mydomain.net deny all -# -# acl aclname peername myPeer ... -# # [fast] -# # match against a named cache_peer entry -# # set unique name= on cache_peer lines for reliable use. -# -# acl aclname time [day-abbrevs] [h1:m1-h2:m2] -# # [fast] -# # day-abbrevs: -# # S - Sunday -# # M - Monday -# # T - Tuesday -# # W - Wednesday -# # H - Thursday -# # F - Friday -# # A - Saturday -# # h1:m1 must be less than h2:m2 -# -# acl aclname url_regex [-i] ^http:// ... -# # regex matching on whole URL [fast] -# acl aclname urllogin [-i] [^a-zA-Z0-9] ... -# # regex matching on URL login field -# acl aclname urlpath_regex [-i] \.gif$ ... -# # regex matching on URL path [fast] -# -# acl aclname port 80 70 21 0-1024... # destination TCP port [fast] -# # ranges are alloed -# acl aclname localport 3128 ... # TCP port the client connected to [fast] -# # NP: for interception mode this is usually '80' -# -# acl aclname myportname 3128 ... # http(s)_port name [fast] -# -# acl aclname proto HTTP FTP ... # request protocol [fast] -# -# acl aclname method GET POST ... # HTTP request method [fast] -# -# acl aclname http_status 200 301 500- 400-403 ... -# # status code in reply [fast] -# -# acl aclname browser [-i] regexp ... -# # pattern match on User-Agent header (see also req_header below) [fast] -# -# acl aclname referer_regex [-i] regexp ... -# # pattern match on Referer header [fast] -# # Referer is highly unreliable, so use with care -# -# acl aclname ident username ... -# acl aclname ident_regex [-i] pattern ... -# # string match on ident output [slow] -# # use REQUIRED to accept any non-null ident. -# -# acl aclname proxy_auth [-i] username ... -# acl aclname proxy_auth_regex [-i] pattern ... -# # perform http authentication challenge to the client and match against -# # supplied credentials [slow] -# # -# # takes a list of allowed usernames. -# # use REQUIRED to accept any valid username. -# # -# # Will use proxy authentication in forward-proxy scenarios, and plain -# # http authenticaiton in reverse-proxy scenarios -# # -# # NOTE: when a Proxy-Authentication header is sent but it is not -# # needed during ACL checking the username is NOT logged -# # in access.log. -# # -# # NOTE: proxy_auth requires a EXTERNAL authentication program -# # to check username/password combinations (see -# # auth_param directive). -# # -# # NOTE: proxy_auth can't be used in a transparent/intercepting proxy -# # as the browser needs to be configured for using a proxy in order -# # to respond to proxy authentication. -# -# acl aclname snmp_community string ... -# # A community string to limit access to your SNMP Agent [fast] -# # Example: -# # -# # acl snmppublic snmp_community public -# -# acl aclname maxconn number -# # This will be matched when the client's IP address has -# # more than <number> TCP connections established. [fast] -# # NOTE: This only measures direct TCP links so X-Forwarded-For -# # indirect clients are not counted. -# -# acl aclname max_user_ip [-s] number -# # This will be matched when the user attempts to log in from more -# # than <number> different ip addresses. The authenticate_ip_ttl -# # parameter controls the timeout on the ip entries. [fast] -# # If -s is specified the limit is strict, denying browsing -# # from any further IP addresses until the ttl has expired. Without -# # -s Squid will just annoy the user by "randomly" denying requests. -# # (the counter is reset each time the limit is reached and a -# # request is denied) -# # NOTE: in acceleration mode or where there is mesh of child proxies, -# # clients may appear to come from multiple addresses if they are -# # going through proxy farms, so a limit of 1 may cause user problems. -# -# acl aclname random probability -# # Pseudo-randomly match requests. Based on the probability given. -# # Probability may be written as a decimal (0.333), fraction (1/3) -# # or ratio of matches:non-matches (3:5). -# -# acl aclname req_mime_type [-i] mime-type ... -# # regex match against the mime type of the request generated -# # by the client. Can be used to detect file upload or some -# # types HTTP tunneling requests [fast] -# # NOTE: This does NOT match the reply. You cannot use this -# # to match the returned file type. -# -# acl aclname req_header header-name [-i] any\.regex\.here -# # regex match against any of the known request headers. May be -# # thought of as a superset of "browser", "referer" and "mime-type" -# # ACL [fast] -# -# acl aclname rep_mime_type [-i] mime-type ... -# # regex match against the mime type of the reply received by -# # squid. Can be used to detect file download or some -# # types HTTP tunneling requests. [fast] -# # NOTE: This has no effect in http_access rules. It only has -# # effect in rules that affect the reply data stream such as -# # http_reply_access. -# -# acl aclname rep_header header-name [-i] any\.regex\.here -# # regex match against any of the known reply headers. May be -# # thought of as a superset of "browser", "referer" and "mime-type" -# # ACLs [fast] -# -# acl aclname external class_name [arguments...] -# # external ACL lookup via a helper class defined by the -# # external_acl_type directive [slow] -# -# acl aclname user_cert attribute values... -# # match against attributes in a user SSL certificate -# # attribute is one of DN/C/O/CN/L/ST [fast] -# -# acl aclname ca_cert attribute values... -# # match against attributes a users issuing CA SSL certificate -# # attribute is one of DN/C/O/CN/L/ST [fast] -# -# acl aclname ext_user username ... -# acl aclname ext_user_regex [-i] pattern ... -# # string match on username returned by external acl helper [slow] -# # use REQUIRED to accept any non-null user name. -# -# acl aclname tag tagvalue ... -# # string match on tag returned by external acl helper [slow] -# -# acl aclname hier_code codename ... -# # string match against squid hierarchy code(s); [fast] -# # e.g., DIRECT, PARENT_HIT, NONE, etc. -# # -# # NOTE: This has no effect in http_access rules. It only has -# # effect in rules that affect the reply data stream such as -# # http_reply_access. -# -# acl aclname note name [value ...] -# # match transaction annotation [fast] -# # Without values, matches any annotation with a given name. -# # With value(s), matches any annotation with a given name that -# # also has one of the given values. -# # Names and values are compared using a string equality test. -# # Annotation sources include note and adaptation_meta directives -# # as well as helper and eCAP responses. -# -# acl aclname any-of acl1 acl2 ... -# # match any one of the acls [fast or slow] -# # The first matching ACL stops further ACL evaluation. -# # -# # ACLs from multiple any-of lines with the same name are ORed. -# # For example, A = (a1 or a2) or (a3 or a4) can be written as -# # acl A any-of a1 a2 -# # acl A any-of a3 a4 -# # -# # This group ACL is fast if all evaluated ACLs in the group are fast -# # and slow otherwise. -# -# acl aclname all-of acl1 acl2 ... -# # match all of the acls [fast or slow] -# # The first mismatching ACL stops further ACL evaluation. -# # -# # ACLs from multiple all-of lines with the same name are ORed. -# # For example, B = (b1 and b2) or (b3 and b4) can be written as -# # acl B all-of b1 b2 -# # acl B all-of b3 b4 -# # -# # This group ACL is fast if all evaluated ACLs in the group are fast -# # and slow otherwise. -# -# Examples: -# acl macaddress arp 09:00:2b:23:45:67 -# acl myexample dst_as 1241 -# acl password proxy_auth REQUIRED -# acl fileupload req_mime_type -i ^multipart/form-data$ -# acl javascript rep_mime_type -i ^application/x-javascript$ -# -#Default: -# ACLs all, manager, localhost, and to_localhost are predefined. -# -# -# Recommended minimum configuration: -# - -# Example rule allowing access from your local networks. -# Adapt to list your (internal) IP networks from where browsing -# should be allowed -acl localnet src 10.0.0.0/8 # RFC1918 possible internal network -acl localnet src 172.16.0.0/12 # RFC1918 possible internal network -acl localnet src 192.168.0.0/16 # RFC1918 possible internal network -acl localnet src fc00::/7 # RFC 4193 local private network range -acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines - -acl SSL_ports port 443 -acl Safe_ports port 80 # http -acl Safe_ports port 21 # ftp -acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher -acl Safe_ports port 210 # wais -acl Safe_ports port 1025-65535 # unregistered ports -acl Safe_ports port 280 # http-mgmt -acl Safe_ports port 488 # gss-http -acl Safe_ports port 591 # filemaker -acl Safe_ports port 777 # multiling http -acl CONNECT method CONNECT - -# TAG: follow_x_forwarded_for -# Allowing or Denying the X-Forwarded-For header to be followed to -# find the original source of a request. -# -# Requests may pass through a chain of several other proxies -# before reaching us. The X-Forwarded-For header will contain a -# comma-separated list of the IP addresses in the chain, with the -# rightmost address being the most recent. -# -# If a request reaches us from a source that is allowed by this -# configuration item, then we consult the X-Forwarded-For header -# to see where that host received the request from. If the -# X-Forwarded-For header contains multiple addresses, we continue -# backtracking until we reach an address for which we are not allowed -# to follow the X-Forwarded-For header, or until we reach the first -# address in the list. For the purpose of ACL used in the -# follow_x_forwarded_for directive the src ACL type always matches -# the address we are testing and srcdomain matches its rDNS. -# -# The end result of this process is an IP address that we will -# refer to as the indirect client address. This address may -# be treated as the client address for access control, ICAP, delay -# pools and logging, depending on the acl_uses_indirect_client, -# icap_uses_indirect_client, delay_pool_uses_indirect_client, -# log_uses_indirect_client and tproxy_uses_indirect_client options. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -# SECURITY CONSIDERATIONS: -# -# Any host for which we follow the X-Forwarded-For header -# can place incorrect information in the header, and Squid -# will use the incorrect information as if it were the -# source address of the request. This may enable remote -# hosts to bypass any access control restrictions that are -# based on the client's source addresses. -# -# For example: -# -# acl localhost src 127.0.0.1 -# acl my_other_proxy srcdomain .proxy.example.com -# follow_x_forwarded_for allow localhost -# follow_x_forwarded_for allow my_other_proxy -#Default: -# X-Forwarded-For header will be ignored. - -# TAG: acl_uses_indirect_client on|off -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in acl matching. -# -# NOTE: maxconn ACL considers direct TCP links and indirect -# clients will always have zero. So no match. -#Default: -# acl_uses_indirect_client on - -# TAG: delay_pool_uses_indirect_client on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-follow-x-forwarded-for and --enable-delay-pools -# -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in delay pools. -#Default: -# delay_pool_uses_indirect_client on - -# TAG: log_uses_indirect_client on|off -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address in the access log. -#Default: -# log_uses_indirect_client on - -# TAG: tproxy_uses_indirect_client on|off -# Controls whether the indirect client address -# (see follow_x_forwarded_for) is used instead of the -# direct client address when spoofing the outgoing client. -# -# This has no effect on requests arriving in non-tproxy -# mode ports. -# -# SECURITY WARNING: Usage of this option is dangerous -# and should not be used trivially. Correct configuration -# of follow_x_forewarded_for with a limited set of trusted -# sources is required to prevent abuse of your proxy. -#Default: -# tproxy_uses_indirect_client off - -# TAG: spoof_client_ip -# Control client IP address spoofing of TPROXY traffic based on -# defined access lists. -# -# spoof_client_ip allow|deny [!]aclname ... -# -# If there are no "spoof_client_ip" lines present, the default -# is to "allow" spoofing of any suitable request. -# -# Note that the cache_peer "no-tproxy" option overrides this ACL. -# -# This clause supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow spoofing on all TPROXY traffic. - -# TAG: http_access -# Allowing or Denying access based on defined access lists -# -# Access to the HTTP port: -# http_access allow|deny [!]aclname ... -# -# NOTE on default values: -# -# If there are no "access" lines present, the default is to deny -# the request. -# -# If none of the "access" lines cause a match, the default is the -# opposite of the last line in the list. If the last line was -# deny, the default is allow. Conversely, if the last line -# is allow, the default will be deny. For these reasons, it is a -# good idea to have an "deny all" entry at the end of your access -# lists to avoid potential confusion. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -#Default: -# Deny, unless rules exist in squid.conf. -# - -# -# Recommended minimum Access Permission configuration: -# -# Deny requests to certain unsafe ports -http_access deny !Safe_ports - -# Deny CONNECT to other than secure SSL ports -http_access deny CONNECT !SSL_ports - -# Only allow cachemgr access from localhost -http_access allow localhost manager -http_access deny manager - -# We strongly recommend the following be uncommented to protect innocent -# web applications running on the proxy server who think the only -# one who can access services on "localhost" is a local user -#http_access deny to_localhost - -# -# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS -# - -# Example rule allowing access from your local networks. -# Adapt localnet in the ACL section to list your (internal) IP networks -# from where browsing should be allowed -http_access allow localnet -http_access allow localhost - -# And finally deny all other access to this proxy -http_access deny all - -# TAG: adapted_http_access -# Allowing or Denying access based on defined access lists -# -# Essentially identical to http_access, but runs after redirectors -# and ICAP/eCAP adaptation. Allowing access control based on their -# output. -# -# If not set then only http_access is used. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: http_reply_access -# Allow replies to client requests. This is complementary to http_access. -# -# http_reply_access allow|deny [!] aclname ... -# -# NOTE: if there are no access lines present, the default is to allow -# all replies. -# -# If none of the access lines cause a match the opposite of the -# last line will apply. Thus it is good practice to end the rules -# with an "allow all" or "deny all" entry. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: icp_access -# Allowing or Denying access to the ICP port based on defined -# access lists -# -# icp_access allow|deny [!]aclname ... -# -# NOTE: The default if no icp_access lines are present is to -# deny all traffic. This default may cause problems with peers -# using ICP. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -## Allow ICP queries from local networks only -##icp_access allow localnet -##icp_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: htcp_access -# Allowing or Denying access to the HTCP port based on defined -# access lists -# -# htcp_access allow|deny [!]aclname ... -# -# See also htcp_clr_access for details on access control for -# cache purge (CLR) HTCP messages. -# -# NOTE: The default if no htcp_access lines are present is to -# deny all traffic. This default may cause problems with peers -# using the htcp option. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -## Allow HTCP queries from local networks only -##htcp_access allow localnet -##htcp_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: htcp_clr_access -# Allowing or Denying access to purge content using HTCP based -# on defined access lists. -# See htcp_access for details on general HTCP access control. -# -# htcp_clr_access allow|deny [!]aclname ... -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -## Allow HTCP CLR requests from trusted peers -#acl htcp_clr_peer src 192.0.2.2 2001:DB8::2 -#htcp_clr_access allow htcp_clr_peer -#htcp_clr_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: miss_access -# Determins whether network access is permitted when satisfying a request. -# -# For example; -# to force your neighbors to use you as a sibling instead of -# a parent. -# -# acl localclients src 192.0.2.0/24 2001:DB8::a:0/64 -# miss_access deny !localclients -# miss_access allow all -# -# This means only your local clients are allowed to fetch relayed/MISS -# replies from the network and all other clients can only fetch cached -# objects (HITs). -# -# The default for this setting allows all clients who passed the -# http_access rules to relay via this proxy. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: ident_lookup_access -# A list of ACL elements which, if matched, cause an ident -# (RFC 931) lookup to be performed for this request. For -# example, you might choose to always perform ident lookups -# for your main multi-user Unix boxes, but not for your Macs -# and PCs. By default, ident lookups are not performed for -# any requests. -# -# To enable ident lookups for specific client addresses, you -# can follow this example: -# -# acl ident_aware_hosts src 198.168.1.0/24 -# ident_lookup_access allow ident_aware_hosts -# ident_lookup_access deny all -# -# Only src type ACL checks are fully supported. A srcdomain -# ACL might work at times, but it will not always provide -# the correct result. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Unless rules exist in squid.conf, IDENT is not fetched. - -# TAG: reply_body_max_size size [acl acl...] -# This option specifies the maximum size of a reply body. It can be -# used to prevent users from downloading very large files, such as -# MP3's and movies. When the reply headers are received, the -# reply_body_max_size lines are processed, and the first line where -# all (if any) listed ACLs are true is used as the maximum body size -# for this reply. -# -# This size is checked twice. First when we get the reply headers, -# we check the content-length value. If the content length value exists -# and is larger than the allowed size, the request is denied and the -# user receives an error message that says "the request or reply -# is too large." If there is no content-length, and the reply -# size exceeds this limit, the client's connection is just closed -# and they will receive a partial reply. -# -# WARNING: downstream caches probably can not detect a partial reply -# if there is no content-length header, so they will cache -# partial responses and give them out as hits. You should NOT -# use this option if you have downstream caches. -# -# WARNING: A maximum size smaller than the size of squid's error messages -# will cause an infinite loop and crash squid. Ensure that the smallest -# non-zero value you use is greater that the maximum header size plus -# the size of your largest error page. -# -# If you set this parameter none (the default), there will be -# no limit imposed. -# -# Configuration Format is: -# reply_body_max_size SIZE UNITS [acl ...] -# ie. -# reply_body_max_size 10 MB -# -#Default: -# No limit is applied. - -# NETWORK OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: http_port -# Usage: port [mode] [options] -# hostname:port [mode] [options] -# 1.2.3.4:port [mode] [options] -# -# The socket addresses where Squid will listen for HTTP client -# requests. You may specify multiple socket addresses. -# There are three forms: port alone, hostname with port, and -# IP address with port. If you specify a hostname or IP -# address, Squid binds the socket to that specific -# address. Most likely, you do not need to bind to a specific -# address, so you can use the port number alone. -# -# If you are running Squid in accelerator mode, you -# probably want to listen on port 80 also, or instead. -# -# The -a command line option may be used to specify additional -# port(s) where Squid listens for proxy request. Such ports will -# be plain proxy ports with no options. -# -# You may specify multiple socket addresses on multiple lines. -# -# Modes: -# -# intercept Support for IP-Layer interception of -# outgoing requests without browser settings. -# NP: disables authentication and IPv6 on the port. -# -# tproxy Support Linux TPROXY for spoofing outgoing -# connections using the client IP address. -# NP: disables authentication and maybe IPv6 on the port. -# -# accel Accelerator / reverse proxy mode -# -# ssl-bump For each CONNECT request allowed by ssl_bump ACLs, -# establish secure connection with the client and with -# the server, decrypt HTTPS messages as they pass through -# Squid, and treat them as unencrypted HTTP messages, -# becoming the man-in-the-middle. -# -# The ssl_bump option is required to fully enable -# bumping of CONNECT requests. -# -# Omitting the mode flag causes default forward proxy mode to be used. -# -# -# Accelerator Mode Options: -# -# defaultsite=domainname -# What to use for the Host: header if it is not present -# in a request. Determines what site (not origin server) -# accelerators should consider the default. -# -# no-vhost Disable using HTTP/1.1 Host header for virtual domain support. -# -# protocol= Protocol to reconstruct accelerated requests with. -# Defaults to http for http_port and https for -# https_port -# -# vport Virtual host port support. Using the http_port number -# instead of the port passed on Host: headers. -# -# vport=NN Virtual host port support. Using the specified port -# number instead of the port passed on Host: headers. -# -# act-as-origin -# Act as if this Squid is the origin server. -# This currently means generate new Date: and Expires: -# headers on HIT instead of adding Age:. -# -# ignore-cc Ignore request Cache-Control headers. -# -# WARNING: This option violates HTTP specifications if -# used in non-accelerator setups. -# -# allow-direct Allow direct forwarding in accelerator mode. Normally -# accelerated requests are denied direct forwarding as if -# never_direct was used. -# -# WARNING: this option opens accelerator mode to security -# vulnerabilities usually only affecting in interception -# mode. Make sure to protect forwarding with suitable -# http_access rules when using this. -# -# -# SSL Bump Mode Options: -# In addition to these options ssl-bump requires TLS/SSL options. -# -# generate-host-certificates[=<on|off>] -# Dynamically create SSL server certificates for the -# destination hosts of bumped CONNECT requests.When -# enabled, the cert and key options are used to sign -# generated certificates. Otherwise generated -# certificate will be selfsigned. -# If there is a CA certificate lifetime of the generated -# certificate equals lifetime of the CA certificate. If -# generated certificate is selfsigned lifetime is three -# years. -# This option is enabled by default when ssl-bump is used. -# See the ssl-bump option above for more information. -# -# dynamic_cert_mem_cache_size=SIZE -# Approximate total RAM size spent on cached generated -# certificates. If set to zero, caching is disabled. The -# default value is 4MB. -# -# TLS / SSL Options: -# -# cert= Path to SSL certificate (PEM format). -# -# key= Path to SSL private key file (PEM format) -# if not specified, the certificate file is -# assumed to be a combined certificate and -# key file. -# -# version= The version of SSL/TLS supported -# 1 automatic (default) -# 2 SSLv2 only -# 3 SSLv3 only -# 4 TLSv1.0 only -# 5 TLSv1.1 only -# 6 TLSv1.2 only -# -# cipher= Colon separated list of supported ciphers. -# NOTE: some ciphers such as EDH ciphers depend on -# additional settings. If those settings are -# omitted the ciphers may be silently ignored -# by the OpenSSL library. -# -# options= Various SSL implementation options. The most important -# being: -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1.0 -# NO_TLSv1_1 Disallow the use of TLSv1.1 -# NO_TLSv1_2 Disallow the use of TLSv1.2 -# SINGLE_DH_USE Always create a new key when using -# temporary/ephemeral DH key exchanges -# ALL Enable various bug workarounds -# suggested as "harmless" by OpenSSL -# Be warned that this reduces SSL/TLS -# strength to some attacks. -# See OpenSSL SSL_CTX_set_options documentation for a -# complete list of options. -# -# clientca= File containing the list of CAs to use when -# requesting a client certificate. -# -# cafile= File containing additional CA certificates to -# use when verifying client certificates. If unset -# clientca will be used. -# -# capath= Directory containing additional CA certificates -# and CRL lists to use when verifying client certificates. -# -# crlfile= File of additional CRL lists to use when verifying -# the client certificate, in addition to CRLs stored in -# the capath. Implies VERIFY_CRL flag below. -# -# dhparams= File containing DH parameters for temporary/ephemeral -# DH key exchanges. See OpenSSL documentation for details -# on how to create this file. -# WARNING: EDH ciphers will be silently disabled if this -# option is not set. -# -# sslflags= Various flags modifying the use of SSL: -# DELAYED_AUTH -# Don't request client certificates -# immediately, but wait until acl processing -# requires a certificate (not yet implemented). -# NO_DEFAULT_CA -# Don't use the default CA lists built in -# to OpenSSL. -# NO_SESSION_REUSE -# Don't allow for session reuse. Each connection -# will result in a new SSL session. -# VERIFY_CRL -# Verify CRL lists when accepting client -# certificates. -# VERIFY_CRL_ALL -# Verify CRL lists for all certificates in the -# client certificate chain. -# -# sslcontext= SSL session ID context identifier. -# -# Other Options: -# -# connection-auth[=on|off] -# use connection-auth=off to tell Squid to prevent -# forwarding Microsoft connection oriented authentication -# (NTLM, Negotiate and Kerberos) -# -# disable-pmtu-discovery= -# Control Path-MTU discovery usage: -# off lets OS decide on what to do (default). -# transparent disable PMTU discovery when transparent -# support is enabled. -# always disable always PMTU discovery. -# -# In many setups of transparently intercepting proxies -# Path-MTU discovery can not work on traffic towards the -# clients. This is the case when the intercepting device -# does not fully track connections and fails to forward -# ICMP must fragment messages to the cache server. If you -# have such setup and experience that certain clients -# sporadically hang or never complete requests set -# disable-pmtu-discovery option to 'transparent'. -# -# name= Specifies a internal name for the port. Defaults to -# the port specification (port or addr:port) -# -# tcpkeepalive[=idle,interval,timeout] -# Enable TCP keepalive probes of idle connections. -# In seconds; idle is the initial time before TCP starts -# probing the connection, interval how often to probe, and -# timeout the time before giving up. -# -# If you run Squid on a dual-homed machine with an internal -# and an external interface we recommend you to specify the -# internal address:port in http_port. This way Squid will only be -# visible on the internal address. -# -# - -# Squid normally listens to port 3128 -http_port 3128 - -# TAG: https_port -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Usage: [ip:]port cert=certificate.pem [key=key.pem] [mode] [options...] -# -# The socket address where Squid will listen for client requests made -# over TLS or SSL connections. Commonly referred to as HTTPS. -# -# This is most useful for situations where you are running squid in -# accelerator mode and you want to do the SSL work at the accelerator level. -# -# You may specify multiple socket addresses on multiple lines, -# each with their own SSL certificate and/or options. -# -# Modes: -# -# accel Accelerator / reverse proxy mode -# -# intercept Support for IP-Layer interception of -# outgoing requests without browser settings. -# NP: disables authentication and IPv6 on the port. -# -# tproxy Support Linux TPROXY for spoofing outgoing -# connections using the client IP address. -# NP: disables authentication and maybe IPv6 on the port. -# -# ssl-bump For each intercepted connection allowed by ssl_bump -# ACLs, establish a secure connection with the client and with -# the server, decrypt HTTPS messages as they pass through -# Squid, and treat them as unencrypted HTTP messages, -# becoming the man-in-the-middle. -# -# An "ssl_bump server-first" match is required to -# fully enable bumping of intercepted SSL connections. -# -# Requires tproxy or intercept. -# -# Omitting the mode flag causes default forward proxy mode to be used. -# -# -# See http_port for a list of generic options -# -# -# SSL Options: -# -# cert= Path to SSL certificate (PEM format). -# -# key= Path to SSL private key file (PEM format) -# if not specified, the certificate file is -# assumed to be a combined certificate and -# key file. -# -# version= The version of SSL/TLS supported -# 1 automatic (default) -# 2 SSLv2 only -# 3 SSLv3 only -# 4 TLSv1 only -# -# cipher= Colon separated list of supported ciphers. -# -# options= Various SSL engine options. The most important -# being: -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1 -# SINGLE_DH_USE Always create a new key when using -# temporary/ephemeral DH key exchanges -# See src/ssl_support.c or OpenSSL SSL_CTX_set_options -# documentation for a complete list of options. -# -# clientca= File containing the list of CAs to use when -# requesting a client certificate. -# -# cafile= File containing additional CA certificates to -# use when verifying client certificates. If unset -# clientca will be used. -# -# capath= Directory containing additional CA certificates -# and CRL lists to use when verifying client certificates. -# -# crlfile= File of additional CRL lists to use when verifying -# the client certificate, in addition to CRLs stored in -# the capath. Implies VERIFY_CRL flag below. -# -# dhparams= File containing DH parameters for temporary/ephemeral -# DH key exchanges. -# -# sslflags= Various flags modifying the use of SSL: -# DELAYED_AUTH -# Don't request client certificates -# immediately, but wait until acl processing -# requires a certificate (not yet implemented). -# NO_DEFAULT_CA -# Don't use the default CA lists built in -# to OpenSSL. -# NO_SESSION_REUSE -# Don't allow for session reuse. Each connection -# will result in a new SSL session. -# VERIFY_CRL -# Verify CRL lists when accepting client -# certificates. -# VERIFY_CRL_ALL -# Verify CRL lists for all certificates in the -# client certificate chain. -# -# sslcontext= SSL session ID context identifier. -# -# generate-host-certificates[=<on|off>] -# Dynamically create SSL server certificates for the -# destination hosts of bumped SSL requests.When -# enabled, the cert and key options are used to sign -# generated certificates. Otherwise generated -# certificate will be selfsigned. -# If there is CA certificate life time of generated -# certificate equals lifetime of CA certificate. If -# generated certificate is selfsigned lifetime is three -# years. -# This option is enabled by default when SslBump is used. -# See the sslBump option above for more information. -# -# dynamic_cert_mem_cache_size=SIZE -# Approximate total RAM size spent on cached generated -# certificates. If set to zero, caching is disabled. The -# default value is 4MB. -# -# See http_port for a list of available options. -#Default: -# none - -# TAG: tcp_outgoing_tos -# Allows you to select a TOS/Diffserv value for packets outgoing -# on the server side, based on an ACL. -# -# tcp_outgoing_tos ds-field [!]aclname ... -# -# Example where normal_service_net uses the TOS value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# tcp_outgoing_tos 0x00 normal_service_net -# tcp_outgoing_tos 0x20 good_service_net -# -# TOS/DSCP values really only have local significance - so you should -# know what you're specifying. For more information, see RFC2474, -# RFC2475, and RFC3260. -# -# The TOS/DSCP byte must be exactly that - a octet value 0 - 255, or -# "default" to use whatever default your host has. Note that in -# practice often only multiples of 4 is usable as the two rightmost bits -# have been redefined for use by ECN (RFC 3168 section 23.1). -# -# Processing proceeds in the order specified, and stops at first fully -# matching line. -#Default: -# none - -# TAG: clientside_tos -# Allows you to select a TOS/Diffserv value for packets being transmitted -# on the client-side, based on an ACL. -# -# clientside_tos ds-field [!]aclname ... -# -# Example where normal_service_net uses the TOS value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# clientside_tos 0x00 normal_service_net -# clientside_tos 0x20 good_service_net -# -# Note: This feature is incompatible with qos_flows. Any TOS values set here -# will be overwritten by TOS values in qos_flows. -#Default: -# none - -# TAG: tcp_outgoing_mark -# Note: This option is only available if Squid is rebuilt with the -# Packet MARK (Linux) -# -# Allows you to apply a Netfilter mark value to outgoing packets -# on the server side, based on an ACL. -# -# tcp_outgoing_mark mark-value [!]aclname ... -# -# Example where normal_service_net uses the mark value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# tcp_outgoing_mark 0x00 normal_service_net -# tcp_outgoing_mark 0x20 good_service_net -#Default: -# none - -# TAG: clientside_mark -# Note: This option is only available if Squid is rebuilt with the -# Packet MARK (Linux) -# -# Allows you to apply a Netfilter mark value to packets being transmitted -# on the client-side, based on an ACL. -# -# clientside_mark mark-value [!]aclname ... -# -# Example where normal_service_net uses the mark value 0x00 -# and good_service_net uses 0x20 -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.1.0/24 -# clientside_mark 0x00 normal_service_net -# clientside_mark 0x20 good_service_net -# -# Note: This feature is incompatible with qos_flows. Any mark values set here -# will be overwritten by mark values in qos_flows. -#Default: -# none - -# TAG: qos_flows -# Allows you to select a TOS/DSCP value to mark outgoing -# connections to the client, based on where the reply was sourced. -# For platforms using netfilter, allows you to set a netfilter mark -# value instead of, or in addition to, a TOS value. -# -# By default this functionality is disabled. To enable it with the default -# settings simply use "qos_flows mark" or "qos_flows tos". Default -# settings will result in the netfilter mark or TOS value being copied -# from the upstream connection to the client. Note that it is the connection -# CONNMARK value not the packet MARK value that is copied. -# -# It is not currently possible to copy the mark or TOS value from the -# client to the upstream connection request. -# -# TOS values really only have local significance - so you should -# know what you're specifying. For more information, see RFC2474, -# RFC2475, and RFC3260. -# -# The TOS/DSCP byte must be exactly that - a octet value 0 - 255. Note that -# in practice often only multiples of 4 is usable as the two rightmost bits -# have been redefined for use by ECN (RFC 3168 section 23.1). -# -# Mark values can be any unsigned 32-bit integer value. -# -# This setting is configured by setting the following values: -# -# tos|mark Whether to set TOS or netfilter mark values -# -# local-hit=0xFF Value to mark local cache hits. -# -# sibling-hit=0xFF Value to mark hits from sibling peers. -# -# parent-hit=0xFF Value to mark hits from parent peers. -# -# miss=0xFF[/mask] Value to mark cache misses. Takes precedence -# over the preserve-miss feature (see below), unless -# mask is specified, in which case only the bits -# specified in the mask are written. -# -# The TOS variant of the following features are only possible on Linux -# and require your kernel to be patched with the TOS preserving ZPH -# patch, available from http://zph.bratcheda.org -# No patch is needed to preserve the netfilter mark, which will work -# with all variants of netfilter. -# -# disable-preserve-miss -# This option disables the preservation of the TOS or netfilter -# mark. By default, the existing TOS or netfilter mark value of -# the response coming from the remote server will be retained -# and masked with miss-mark. -# NOTE: in the case of a netfilter mark, the mark must be set on -# the connection (using the CONNMARK target) not on the packet -# (MARK target). -# -# miss-mask=0xFF -# Allows you to mask certain bits in the TOS or mark value -# received from the remote server, before copying the value to -# the TOS sent towards clients. -# Default for tos: 0xFF (TOS from server is not changed). -# Default for mark: 0xFFFFFFFF (mark from server is not changed). -# -# All of these features require the --enable-zph-qos compilation flag -# (enabled by default). Netfilter marking also requires the -# libnetfilter_conntrack libraries (--with-netfilter-conntrack) and -# libcap 2.09+ (--with-libcap). -# -#Default: -# none - -# TAG: tcp_outgoing_address -# Allows you to map requests to different outgoing IP addresses -# based on the username or source address of the user making -# the request. -# -# tcp_outgoing_address ipaddr [[!]aclname] ... -# -# For example; -# Forwarding clients with dedicated IPs for certain subnets. -# -# acl normal_service_net src 10.0.0.0/24 -# acl good_service_net src 10.0.2.0/24 -# -# tcp_outgoing_address 2001:db8::c001 good_service_net -# tcp_outgoing_address 10.1.0.2 good_service_net -# -# tcp_outgoing_address 2001:db8::beef normal_service_net -# tcp_outgoing_address 10.1.0.1 normal_service_net -# -# tcp_outgoing_address 2001:db8::1 -# tcp_outgoing_address 10.1.0.3 -# -# Processing proceeds in the order specified, and stops at first fully -# matching line. -# -# Squid will add an implicit IP version test to each line. -# Requests going to IPv4 websites will use the outgoing 10.1.0.* addresses. -# Requests going to IPv6 websites will use the outgoing 2001:db8:* addresses. -# -# -# NOTE: The use of this directive using client dependent ACLs is -# incompatible with the use of server side persistent connections. To -# ensure correct results it is best to set server_persistent_connections -# to off when using this directive in such configurations. -# -# NOTE: The use of this directive to set a local IP on outgoing TCP links -# is incompatible with using TPROXY to set client IP out outbound TCP links. -# When needing to contact peers use the no-tproxy cache_peer option and the -# client_dst_passthru directive re-enable normal forwarding such as this. -# -#Default: -# Address selection is performed by the operating system. - -# TAG: host_verify_strict -# Regardless of this option setting, when dealing with intercepted -# traffic, Squid always verifies that the destination IP address matches -# the Host header domain or IP (called 'authority form URL'). -# -# This enforcement is performed to satisfy a MUST-level requirement in -# RFC 2616 section 14.23: "The Host field value MUST represent the naming -# authority of the origin server or gateway given by the original URL". -# -# When set to ON: -# Squid always responds with an HTTP 409 (Conflict) error -# page and logs a security warning if there is no match. -# -# Squid verifies that the destination IP address matches -# the Host header for forward-proxy and reverse-proxy traffic -# as well. For those traffic types, Squid also enables the -# following checks, comparing the corresponding Host header -# and Request-URI components: -# -# * The host names (domain or IP) must be identical, -# but valueless or missing Host header disables all checks. -# For the two host names to match, both must be either IP -# or FQDN. -# -# * Port numbers must be identical, but if a port is missing -# the scheme-default port is assumed. -# -# -# When set to OFF (the default): -# Squid allows suspicious requests to continue but logs a -# security warning and blocks caching of the response. -# -# * Forward-proxy traffic is not checked at all. -# -# * Reverse-proxy traffic is not checked at all. -# -# * Intercepted traffic which passes verification is handled -# according to client_dst_passthru. -# -# * Intercepted requests which fail verification are sent -# to the client original destination instead of DIRECT. -# This overrides 'client_dst_passthru off'. -# -# For now suspicious intercepted CONNECT requests are always -# responded to with an HTTP 409 (Conflict) error page. -# -# -# SECURITY NOTE: -# -# As described in CVE-2009-0801 when the Host: header alone is used -# to determine the destination of a request it becomes trivial for -# malicious scripts on remote websites to bypass browser same-origin -# security policy and sandboxing protections. -# -# The cause of this is that such applets are allowed to perform their -# own HTTP stack, in which case the same-origin policy of the browser -# sandbox only verifies that the applet tries to contact the same IP -# as from where it was loaded at the IP level. The Host: header may -# be different from the connected IP and approved origin. -# -#Default: -# host_verify_strict off - -# TAG: client_dst_passthru -# With NAT or TPROXY intercepted traffic Squid may pass the request -# directly to the original client destination IP or seek a faster -# source using the HTTP Host header. -# -# Using Host to locate alternative servers can provide faster -# connectivity with a range of failure recovery options. -# But can also lead to connectivity trouble when the client and -# server are attempting stateful interactions unaware of the proxy. -# -# This option (on by default) prevents alternative DNS entries being -# located to send intercepted traffic DIRECT to an origin server. -# The clients original destination IP and port will be used instead. -# -# Regardless of this option setting, when dealing with intercepted -# traffic Squid will verify the Host: header and any traffic which -# fails Host verification will be treated as if this option were ON. -# -# see host_verify_strict for details on the verification process. -#Default: -# client_dst_passthru on - -# SSL OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: ssl_unclean_shutdown -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Some browsers (especially MSIE) bugs out on SSL shutdown -# messages. -#Default: -# ssl_unclean_shutdown off - -# TAG: ssl_engine -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# The OpenSSL engine to use. You will need to set this if you -# would like to use hardware SSL acceleration for example. -#Default: -# none - -# TAG: sslproxy_client_certificate -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Client SSL Certificate to use when proxying https:// URLs -#Default: -# none - -# TAG: sslproxy_client_key -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Client SSL Key to use when proxying https:// URLs -#Default: -# none - -# TAG: sslproxy_version -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# SSL version level to use when proxying https:// URLs -# -# The versions of SSL/TLS supported: -# -# 1 automatic (default) -# 2 SSLv2 only -# 3 SSLv3 only -# 4 TLSv1.0 only -# 5 TLSv1.1 only -# 6 TLSv1.2 only -#Default: -# automatic SSL/TLS version negotiation - -# TAG: sslproxy_options -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# SSL implementation options to use when proxying https:// URLs -# -# The most important being: -# -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1.0 -# NO_TLSv1_1 Disallow the use of TLSv1.1 -# NO_TLSv1_2 Disallow the use of TLSv1.2 -# SINGLE_DH_USE -# Always create a new key when using temporary/ephemeral -# DH key exchanges -# SSL_OP_NO_TICKET -# Disable use of RFC5077 session tickets. Some servers -# may have problems understanding the TLS extension due -# to ambiguous specification in RFC4507. -# ALL Enable various bug workarounds suggested as "harmless" -# by OpenSSL. Be warned that this may reduce SSL/TLS -# strength to some attacks. -# -# See the OpenSSL SSL_CTX_set_options documentation for a -# complete list of possible options. -#Default: -# none - -# TAG: sslproxy_cipher -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# SSL cipher list to use when proxying https:// URLs -# -# Colon separated list of supported ciphers. -#Default: -# none - -# TAG: sslproxy_cafile -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# file containing CA certificates to use when verifying server -# certificates while proxying https:// URLs -#Default: -# none - -# TAG: sslproxy_capath -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# directory containing CA certificates to use when verifying -# server certificates while proxying https:// URLs -#Default: -# none - -# TAG: ssl_bump -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# This option is consulted when a CONNECT request is received on -# an http_port (or a new connection is intercepted at an -# https_port), provided that port was configured with an ssl-bump -# flag. The subsequent data on the connection is either treated as -# HTTPS and decrypted OR tunneled at TCP level without decryption, -# depending on the first bumping "mode" which ACLs match. -# -# ssl_bump <mode> [!]acl ... -# -# The following bumping modes are supported: -# -# client-first -# Allow bumping of the connection. Establish a secure connection -# with the client first, then connect to the server. This old mode -# does not allow Squid to mimic server SSL certificate and does -# not work with intercepted SSL connections. -# -# server-first -# Allow bumping of the connection. Establish a secure connection -# with the server first, then establish a secure connection with -# the client, using a mimicked server certificate. Works with both -# CONNECT requests and intercepted SSL connections. -# -# none -# Become a TCP tunnel without decoding the connection. -# Works with both CONNECT requests and intercepted SSL -# connections. This is the default behavior when no -# ssl_bump option is given or no ssl_bump ACLs match. -# -# By default, no connections are bumped. -# -# The first matching ssl_bump option wins. If no ACLs match, the -# connection is not bumped. Unlike most allow/deny ACL lists, ssl_bump -# does not have an implicit "negate the last given option" rule. You -# must make that rule explicit if you convert old ssl_bump allow/deny -# rules that rely on such an implicit rule. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -# See also: http_port ssl-bump, https_port ssl-bump -# -# -# # Example: Bump all requests except those originating from -# # localhost or those going to example.com. -# -# acl broken_sites dstdomain .example.com -# ssl_bump none localhost -# ssl_bump none broken_sites -# ssl_bump server-first all -#Default: -# Does not bump unless rules are present in squid.conf - -# TAG: sslproxy_flags -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Various flags modifying the use of SSL while proxying https:// URLs: -# DONT_VERIFY_PEER Accept certificates that fail verification. -# For refined control, see sslproxy_cert_error. -# NO_DEFAULT_CA Don't use the default CA list built in -# to OpenSSL. -#Default: -# none - -# TAG: sslproxy_cert_error -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Use this ACL to bypass server certificate validation errors. -# -# For example, the following lines will bypass all validation errors -# when talking to servers for example.com. All other -# validation errors will result in ERR_SECURE_CONNECT_FAIL error. -# -# acl BrokenButTrustedServers dstdomain example.com -# sslproxy_cert_error allow BrokenButTrustedServers -# sslproxy_cert_error deny all -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# Using slow acl types may result in server crashes -# -# Without this option, all server certificate validation errors -# terminate the transaction to protect Squid and the client. -# -# SQUID_X509_V_ERR_INFINITE_VALIDATION error cannot be bypassed -# but should not happen unless your OpenSSL library is buggy. -# -# SECURITY WARNING: -# Bypassing validation errors is dangerous because an -# error usually implies that the server cannot be trusted -# and the connection may be insecure. -# -# See also: sslproxy_flags and DONT_VERIFY_PEER. -#Default: -# Server certificate errors terminate the transaction. - -# TAG: sslproxy_cert_sign -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# -# sslproxy_cert_sign <signing algorithm> acl ... -# -# The following certificate signing algorithms are supported: -# -# signTrusted -# Sign using the configured CA certificate which is usually -# placed in and trusted by end-user browsers. This is the -# default for trusted origin server certificates. -# -# signUntrusted -# Sign to guarantee an X509_V_ERR_CERT_UNTRUSTED browser error. -# This is the default for untrusted origin server certificates -# that are not self-signed (see ssl::certUntrusted). -# -# signSelf -# Sign using a self-signed certificate with the right CN to -# generate a X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT error in the -# browser. This is the default for self-signed origin server -# certificates (see ssl::certSelfSigned). -# -# This clause only supports fast acl types. -# -# When sslproxy_cert_sign acl(s) match, Squid uses the corresponding -# signing algorithm to generate the certificate and ignores all -# subsequent sslproxy_cert_sign options (the first match wins). If no -# acl(s) match, the default signing algorithm is determined by errors -# detected when obtaining and validating the origin server certificate. -# -# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can -# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a -# CONNECT request that carries a domain name. In all other cases (CONNECT -# to an IP address or an intercepted SSL connection), Squid cannot detect -# the domain mismatch at certificate generation time when -# bump-server-first is used. -#Default: -# none - -# TAG: sslproxy_cert_adapt -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# -# sslproxy_cert_adapt <adaptation algorithm> acl ... -# -# The following certificate adaptation algorithms are supported: -# -# setValidAfter -# Sets the "Not After" property to the "Not After" property of -# the CA certificate used to sign generated certificates. -# -# setValidBefore -# Sets the "Not Before" property to the "Not Before" property of -# the CA certificate used to sign generated certificates. -# -# setCommonName or setCommonName{CN} -# Sets Subject.CN property to the host name specified as a -# CN parameter or, if no explicit CN parameter was specified, -# extracted from the CONNECT request. It is a misconfiguration -# to use setCommonName without an explicit parameter for -# intercepted or tproxied SSL connections. -# -# This clause only supports fast acl types. -# -# Squid first groups sslproxy_cert_adapt options by adaptation algorithm. -# Within a group, when sslproxy_cert_adapt acl(s) match, Squid uses the -# corresponding adaptation algorithm to generate the certificate and -# ignores all subsequent sslproxy_cert_adapt options in that algorithm's -# group (i.e., the first match wins within each algorithm group). If no -# acl(s) match, the default mimicking action takes place. -# -# WARNING: SQUID_X509_V_ERR_DOMAIN_MISMATCH and ssl:certDomainMismatch can -# be used with sslproxy_cert_adapt, but if and only if Squid is bumping a -# CONNECT request that carries a domain name. In all other cases (CONNECT -# to an IP address or an intercepted SSL connection), Squid cannot detect -# the domain mismatch at certificate generation time when -# bump-server-first is used. -#Default: -# none - -# TAG: sslpassword_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Specify a program used for entering SSL key passphrases -# when using encrypted SSL certificate keys. If not specified -# keys must either be unencrypted, or Squid started with the -N -# option to allow it to query interactively for the passphrase. -# -# The key file name is given as argument to the program allowing -# selection of the right password if you have multiple encrypted -# keys. -#Default: -# none - -# OPTIONS RELATING TO EXTERNAL SSL_CRTD -# ----------------------------------------------------------------------------- - -# TAG: sslcrtd_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl-crtd -# -# Specify the location and options of the executable for ssl_crtd process. -# /usr/libexec/ssl_crtd program requires -s and -M parameters -# For more information use: -# /usr/libexec/ssl_crtd -h -#Default: -# sslcrtd_program /usr/libexec/ssl_crtd -s /var/log/squid/lib/ssl_db -M 4MB - -# TAG: sslcrtd_children -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl-crtd -# -# The maximum number of processes spawn to service ssl server. -# The maximum this may be safely set to is 32. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup=N -# -# Sets the minimum number of processes to spawn when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few children temporary slows Squid under load while it -# tries to spawn enough additional processes to cope with traffic. -# -# idle=N -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# You must have at least one ssl_crtd process. -#Default: -# sslcrtd_children 32 startup=5 idle=1 - -# TAG: sslcrtvalidator_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# Specify the location and options of the executable for ssl_crt_validator -# process. -# -# Usage: sslcrtvalidator_program [ttl=n] [cache=n] path ... -# -# Options: -# ttl=n TTL in seconds for cached results. The default is 60 secs -# cache=n limit the result cache size. The default value is 2048 -#Default: -# none - -# TAG: sslcrtvalidator_children -# Note: This option is only available if Squid is rebuilt with the -# --enable-ssl -# -# The maximum number of processes spawn to service SSL server. -# The maximum this may be safely set to is 32. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup=N -# -# Sets the minimum number of processes to spawn when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few children temporary slows Squid under load while it -# tries to spawn enough additional processes to cope with traffic. -# -# idle=N -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# concurrency= -# -# The number of requests each certificate validator helper can handle in -# parallel. A value of 0 indicates the certficate validator does not -# support concurrency. Defaults to 1. -# -# When this directive is set to a value >= 1 then the protocol -# used to communicate with the helper is modified to include -# a request ID in front of the request/response. The request -# ID from the request must be echoed back with the response -# to that request. -# -# You must have at least one ssl_crt_validator process. -#Default: -# sslcrtvalidator_children 32 startup=5 idle=1 concurrency=1 - -# OPTIONS WHICH AFFECT THE NEIGHBOR SELECTION ALGORITHM -# ----------------------------------------------------------------------------- - -# TAG: cache_peer -# To specify other caches in a hierarchy, use the format: -# -# cache_peer hostname type http-port icp-port [options] -# -# For example, -# -# # proxy icp -# # hostname type port port options -# # -------------------- -------- ----- ----- ----------- -# cache_peer parent.foo.net parent 3128 3130 default -# cache_peer sib1.foo.net sibling 3128 3130 proxy-only -# cache_peer sib2.foo.net sibling 3128 3130 proxy-only -# cache_peer example.com parent 80 0 default -# cache_peer cdn.example.com sibling 3128 0 -# -# type: either 'parent', 'sibling', or 'multicast'. -# -# proxy-port: The port number where the peer accept HTTP requests. -# For other Squid proxies this is usually 3128 -# For web servers this is usually 80 -# -# icp-port: Used for querying neighbor caches about objects. -# Set to 0 if the peer does not support ICP or HTCP. -# See ICP and HTCP options below for additional details. -# -# -# ==== ICP OPTIONS ==== -# -# You MUST also set icp_port and icp_access explicitly when using these options. -# The defaults will prevent peer traffic using ICP. -# -# -# no-query Disable ICP queries to this neighbor. -# -# multicast-responder -# Indicates the named peer is a member of a multicast group. -# ICP queries will not be sent directly to the peer, but ICP -# replies will be accepted from it. -# -# closest-only Indicates that, for ICP_OP_MISS replies, we'll only forward -# CLOSEST_PARENT_MISSes and never FIRST_PARENT_MISSes. -# -# background-ping -# To only send ICP queries to this neighbor infrequently. -# This is used to keep the neighbor round trip time updated -# and is usually used in conjunction with weighted-round-robin. -# -# -# ==== HTCP OPTIONS ==== -# -# You MUST also set htcp_port and htcp_access explicitly when using these options. -# The defaults will prevent peer traffic using HTCP. -# -# -# htcp Send HTCP, instead of ICP, queries to the neighbor. -# You probably also want to set the "icp-port" to 4827 -# instead of 3130. This directive accepts a comma separated -# list of options described below. -# -# htcp=oldsquid Send HTCP to old Squid versions (2.5 or earlier). -# -# htcp=no-clr Send HTCP to the neighbor but without -# sending any CLR requests. This cannot be used with -# only-clr. -# -# htcp=only-clr Send HTCP to the neighbor but ONLY CLR requests. -# This cannot be used with no-clr. -# -# htcp=no-purge-clr -# Send HTCP to the neighbor including CLRs but only when -# they do not result from PURGE requests. -# -# htcp=forward-clr -# Forward any HTCP CLR requests this proxy receives to the peer. -# -# -# ==== PEER SELECTION METHODS ==== -# -# The default peer selection method is ICP, with the first responding peer -# being used as source. These options can be used for better load balancing. -# -# -# default This is a parent cache which can be used as a "last-resort" -# if a peer cannot be located by any of the peer-selection methods. -# If specified more than once, only the first is used. -# -# round-robin Load-Balance parents which should be used in a round-robin -# fashion in the absence of any ICP queries. -# weight=N can be used to add bias. -# -# weighted-round-robin -# Load-Balance parents which should be used in a round-robin -# fashion with the frequency of each parent being based on the -# round trip time. Closer parents are used more often. -# Usually used for background-ping parents. -# weight=N can be used to add bias. -# -# carp Load-Balance parents which should be used as a CARP array. -# The requests will be distributed among the parents based on the -# CARP load balancing hash function based on their weight. -# -# userhash Load-balance parents based on the client proxy_auth or ident username. -# -# sourcehash Load-balance parents based on the client source IP. -# -# multicast-siblings -# To be used only for cache peers of type "multicast". -# ALL members of this multicast group have "sibling" -# relationship with it, not "parent". This is to a multicast -# group when the requested object would be fetched only from -# a "parent" cache, anyway. It's useful, e.g., when -# configuring a pool of redundant Squid proxies, being -# members of the same multicast group. -# -# -# ==== PEER SELECTION OPTIONS ==== -# -# weight=N use to affect the selection of a peer during any weighted -# peer-selection mechanisms. -# The weight must be an integer; default is 1, -# larger weights are favored more. -# This option does not affect parent selection if a peering -# protocol is not in use. -# -# basetime=N Specify a base amount to be subtracted from round trip -# times of parents. -# It is subtracted before division by weight in calculating -# which parent to fectch from. If the rtt is less than the -# base time the rtt is set to a minimal value. -# -# ttl=N Specify a TTL to use when sending multicast ICP queries -# to this address. -# Only useful when sending to a multicast group. -# Because we don't accept ICP replies from random -# hosts, you must configure other group members as -# peers with the 'multicast-responder' option. -# -# no-delay To prevent access to this neighbor from influencing the -# delay pools. -# -# digest-url=URL Tell Squid to fetch the cache digest (if digests are -# enabled) for this host from the specified URL rather -# than the Squid default location. -# -# -# ==== CARP OPTIONS ==== -# -# carp-key=key-specification -# use a different key than the full URL to hash against the peer. -# the key-specification is a comma-separated list of the keywords -# scheme, host, port, path, params -# Order is not important. -# -# ==== ACCELERATOR / REVERSE-PROXY OPTIONS ==== -# -# originserver Causes this parent to be contacted as an origin server. -# Meant to be used in accelerator setups when the peer -# is a web server. -# -# forceddomain=name -# Set the Host header of requests forwarded to this peer. -# Useful in accelerator setups where the server (peer) -# expects a certain domain name but clients may request -# others. ie example.com or www.example.com -# -# no-digest Disable request of cache digests. -# -# no-netdb-exchange -# Disables requesting ICMP RTT database (NetDB). -# -# -# ==== AUTHENTICATION OPTIONS ==== -# -# login=user:password -# If this is a personal/workgroup proxy and your parent -# requires proxy authentication. -# -# Note: The string can include URL escapes (i.e. %20 for -# spaces). This also means % must be written as %%. -# -# login=PASSTHRU -# Send login details received from client to this peer. -# Both Proxy- and WWW-Authorization headers are passed -# without alteration to the peer. -# Authentication is not required by Squid for this to work. -# -# Note: This will pass any form of authentication but -# only Basic auth will work through a proxy unless the -# connection-auth options are also used. -# -# login=PASS Send login details received from client to this peer. -# Authentication is not required by this option. -# -# If there are no client-provided authentication headers -# to pass on, but username and password are available -# from an external ACL user= and password= result tags -# they may be sent instead. -# -# Note: To combine this with proxy_auth both proxies must -# share the same user database as HTTP only allows for -# a single login (one for proxy, one for origin server). -# Also be warned this will expose your users proxy -# password to the peer. USE WITH CAUTION -# -# login=*:password -# Send the username to the upstream cache, but with a -# fixed password. This is meant to be used when the peer -# is in another administrative domain, but it is still -# needed to identify each user. -# The star can optionally be followed by some extra -# information which is added to the username. This can -# be used to identify this proxy to the peer, similar to -# the login=username:password option above. -# -# login=NEGOTIATE -# If this is a personal/workgroup proxy and your parent -# requires a secure proxy authentication. -# The first principal from the default keytab or defined by -# the environment variable KRB5_KTNAME will be used. -# -# WARNING: The connection may transmit requests from multiple -# clients. Negotiate often assumes end-to-end authentication -# and a single-client. Which is not strictly true here. -# -# login=NEGOTIATE:principal_name -# If this is a personal/workgroup proxy and your parent -# requires a secure proxy authentication. -# The principal principal_name from the default keytab or -# defined by the environment variable KRB5_KTNAME will be -# used. -# -# WARNING: The connection may transmit requests from multiple -# clients. Negotiate often assumes end-to-end authentication -# and a single-client. Which is not strictly true here. -# -# connection-auth=on|off -# Tell Squid that this peer does or not support Microsoft -# connection oriented authentication, and any such -# challenges received from there should be ignored. -# Default is auto to automatically determine the status -# of the peer. -# -# -# ==== SSL / HTTPS / TLS OPTIONS ==== -# -# ssl Encrypt connections to this peer with SSL/TLS. -# -# sslcert=/path/to/ssl/certificate -# A client SSL certificate to use when connecting to -# this peer. -# -# sslkey=/path/to/ssl/key -# The private SSL key corresponding to sslcert above. -# If 'sslkey' is not specified 'sslcert' is assumed to -# reference a combined file containing both the -# certificate and the key. -# -# sslversion=1|2|3|4|5|6 -# The SSL version to use when connecting to this peer -# 1 = automatic (default) -# 2 = SSL v2 only -# 3 = SSL v3 only -# 4 = TLS v1.0 only -# 5 = TLS v1.1 only -# 6 = TLS v1.2 only -# -# sslcipher=... The list of valid SSL ciphers to use when connecting -# to this peer. -# -# ssloptions=... Specify various SSL implementation options: -# -# NO_SSLv2 Disallow the use of SSLv2 -# NO_SSLv3 Disallow the use of SSLv3 -# NO_TLSv1 Disallow the use of TLSv1.0 -# NO_TLSv1_1 Disallow the use of TLSv1.1 -# NO_TLSv1_2 Disallow the use of TLSv1.2 -# SINGLE_DH_USE -# Always create a new key when using -# temporary/ephemeral DH key exchanges -# ALL Enable various bug workarounds -# suggested as "harmless" by OpenSSL -# Be warned that this reduces SSL/TLS -# strength to some attacks. -# -# See the OpenSSL SSL_CTX_set_options documentation for a -# more complete list. -# -# sslcafile=... A file containing additional CA certificates to use -# when verifying the peer certificate. -# -# sslcapath=... A directory containing additional CA certificates to -# use when verifying the peer certificate. -# -# sslcrlfile=... A certificate revocation list file to use when -# verifying the peer certificate. -# -# sslflags=... Specify various flags modifying the SSL implementation: -# -# DONT_VERIFY_PEER -# Accept certificates even if they fail to -# verify. -# NO_DEFAULT_CA -# Don't use the default CA list built in -# to OpenSSL. -# DONT_VERIFY_DOMAIN -# Don't verify the peer certificate -# matches the server name -# -# ssldomain= The peer name as advertised in it's certificate. -# Used for verifying the correctness of the received peer -# certificate. If not specified the peer hostname will be -# used. -# -# front-end-https -# Enable the "Front-End-Https: On" header needed when -# using Squid as a SSL frontend in front of Microsoft OWA. -# See MS KB document Q307347 for details on this header. -# If set to auto the header will only be added if the -# request is forwarded as a https:// URL. -# -# -# ==== GENERAL OPTIONS ==== -# -# connect-timeout=N -# A peer-specific connect timeout. -# Also see the peer_connect_timeout directive. -# -# connect-fail-limit=N -# How many times connecting to a peer must fail before -# it is marked as down. Default is 10. -# -# allow-miss Disable Squid's use of only-if-cached when forwarding -# requests to siblings. This is primarily useful when -# icp_hit_stale is used by the sibling. To extensive use -# of this option may result in forwarding loops, and you -# should avoid having two-way peerings with this option. -# For example to deny peer usage on requests from peer -# by denying cache_peer_access if the source is a peer. -# -# max-conn=N Limit the amount of connections Squid may open to this -# peer. see also -# -# name=xxx Unique name for the peer. -# Required if you have multiple peers on the same host -# but different ports. -# This name can be used in cache_peer_access and similar -# directives to dentify the peer. -# Can be used by outgoing access controls through the -# peername ACL type. -# -# no-tproxy Do not use the client-spoof TPROXY support when forwarding -# requests to this peer. Use normal address selection instead. -# This overrides the spoof_client_ip ACL. -# -# proxy-only objects fetched from the peer will not be stored locally. -# -#Default: -# none - -# TAG: cache_peer_domain -# Use to limit the domains for which a neighbor cache will be -# queried. -# -# Usage: -# cache_peer_domain cache-host domain [domain ...] -# cache_peer_domain cache-host !domain -# -# For example, specifying -# -# cache_peer_domain parent.foo.net .edu -# -# has the effect such that UDP query packets are sent to -# 'bigserver' only when the requested object exists on a -# server in the .edu domain. Prefixing the domainname -# with '!' means the cache will be queried for objects -# NOT in that domain. -# -# NOTE: * Any number of domains may be given for a cache-host, -# either on the same or separate lines. -# * When multiple domains are given for a particular -# cache-host, the first matched domain is applied. -# * Cache hosts with no domain restrictions are queried -# for all requests. -# * There are no defaults. -# * There is also a 'cache_peer_access' tag in the ACL -# section. -#Default: -# none - -# TAG: cache_peer_access -# Similar to 'cache_peer_domain' but provides more flexibility by -# using ACL elements. -# -# Usage: -# cache_peer_access cache-host allow|deny [!]aclname ... -# -# The syntax is identical to 'http_access' and the other lists of -# ACL elements. See the comments for 'http_access' below, or -# the Squid FAQ (http://wiki.squid-cache.org/SquidFaq/SquidAcl). -#Default: -# none - -# TAG: neighbor_type_domain -# Modify the cache_peer neighbor type when passing requests -# about specific domains to the peer. -# -# Usage: -# neighbor_type_domain neighbor parent|sibling domain domain ... -# -# For example: -# cache_peer foo.example.com parent 3128 3130 -# neighbor_type_domain foo.example.com sibling .au .de -# -# The above configuration treats all requests to foo.example.com as a -# parent proxy unless the request is for a .au or .de ccTLD domain name. -#Default: -# The peer type from cache_peer directive is used for all requests to that peer. - -# TAG: dead_peer_timeout (seconds) -# This controls how long Squid waits to declare a peer cache -# as "dead." If there are no ICP replies received in this -# amount of time, Squid will declare the peer dead and not -# expect to receive any further ICP replies. However, it -# continues to send ICP queries, and will mark the peer as -# alive upon receipt of the first subsequent ICP reply. -# -# This timeout also affects when Squid expects to receive ICP -# replies from peers. If more than 'dead_peer' seconds have -# passed since the last ICP reply was received, Squid will not -# expect to receive an ICP reply on the next query. Thus, if -# your time between requests is greater than this timeout, you -# will see a lot of requests sent DIRECT to origin servers -# instead of to your parents. -#Default: -# dead_peer_timeout 10 seconds - -# TAG: forward_max_tries -# Controls how many different forward paths Squid will try -# before giving up. See also forward_timeout. -# -# NOTE: connect_retries (default: none) can make each of these -# possible forwarding paths be tried multiple times. -#Default: -# forward_max_tries 10 - -# TAG: hierarchy_stoplist -# A list of words which, if found in a URL, cause the object to -# be handled directly by this cache. In other words, use this -# to not query neighbor caches for certain objects. You may -# list this option multiple times. -# -# Example: -# hierarchy_stoplist cgi-bin ? -# -# Note: never_direct overrides this option. -#Default: -# none - -# MEMORY CACHE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: cache_mem (bytes) -# NOTE: THIS PARAMETER DOES NOT SPECIFY THE MAXIMUM PROCESS SIZE. -# IT ONLY PLACES A LIMIT ON HOW MUCH ADDITIONAL MEMORY SQUID WILL -# USE AS A MEMORY CACHE OF OBJECTS. SQUID USES MEMORY FOR OTHER -# THINGS AS WELL. SEE THE SQUID FAQ SECTION 8 FOR DETAILS. -# -# 'cache_mem' specifies the ideal amount of memory to be used -# for: -# * In-Transit objects -# * Hot Objects -# * Negative-Cached objects -# -# Data for these objects are stored in 4 KB blocks. This -# parameter specifies the ideal upper limit on the total size of -# 4 KB blocks allocated. In-Transit objects take the highest -# priority. -# -# In-transit objects have priority over the others. When -# additional space is needed for incoming data, negative-cached -# and hot objects will be released. In other words, the -# negative-cached and hot objects will fill up any unused space -# not needed for in-transit objects. -# -# If circumstances require, this limit will be exceeded. -# Specifically, if your incoming request rate requires more than -# 'cache_mem' of memory to hold in-transit objects, Squid will -# exceed this limit to satisfy the new requests. When the load -# decreases, blocks will be freed until the high-water mark is -# reached. Thereafter, blocks will be used to store hot -# objects. -# -# If shared memory caching is enabled, Squid does not use the shared -# cache space for in-transit objects, but they still consume as much -# local memory as they need. For more details about the shared memory -# cache, see memory_cache_shared. -#Default: -# cache_mem 256 MB - -# TAG: maximum_object_size_in_memory (bytes) -# Objects greater than this size will not be attempted to kept in -# the memory cache. This should be set high enough to keep objects -# accessed frequently in memory to improve performance whilst low -# enough to keep larger objects from hoarding cache_mem. -#Default: -# maximum_object_size_in_memory 512 KB - -# TAG: memory_cache_shared on|off -# Controls whether the memory cache is shared among SMP workers. -# -# The shared memory cache is meant to occupy cache_mem bytes and replace -# the non-shared memory cache, although some entities may still be -# cached locally by workers for now (e.g., internal and in-transit -# objects may be served from a local memory cache even if shared memory -# caching is enabled). -# -# By default, the memory cache is shared if and only if all of the -# following conditions are satisfied: Squid runs in SMP mode with -# multiple workers, cache_mem is positive, and Squid environment -# supports required IPC primitives (e.g., POSIX shared memory segments -# and GCC-style atomic operations). -# -# To avoid blocking locks, shared memory uses opportunistic algorithms -# that do not guarantee that every cachable entity that could have been -# shared among SMP workers will actually be shared. -# -# Currently, entities exceeding 32KB in size cannot be shared. -#Default: -# "on" where supported if doing memory caching with multiple SMP workers. - -# TAG: memory_cache_mode -# Controls which objects to keep in the memory cache (cache_mem) -# -# always Keep most recently fetched objects in memory (default) -# -# disk Only disk cache hits are kept in memory, which means -# an object must first be cached on disk and then hit -# a second time before cached in memory. -# -# network Only objects fetched from network is kept in memory -#Default: -# Keep the most recently fetched objects in memory - -# TAG: memory_replacement_policy -# The memory replacement policy parameter determines which -# objects are purged from memory when memory space is needed. -# -# See cache_replacement_policy for details on algorithms. -#Default: -# memory_replacement_policy lru - -# DISK CACHE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: cache_replacement_policy -# The cache replacement policy parameter determines which -# objects are evicted (replaced) when disk space is needed. -# -# lru : Squid's original list based LRU policy -# heap GDSF : Greedy-Dual Size Frequency -# heap LFUDA: Least Frequently Used with Dynamic Aging -# heap LRU : LRU policy implemented using a heap -# -# Applies to any cache_dir lines listed below this directive. -# -# The LRU policies keeps recently referenced objects. -# -# The heap GDSF policy optimizes object hit rate by keeping smaller -# popular objects in cache so it has a better chance of getting a -# hit. It achieves a lower byte hit rate than LFUDA though since -# it evicts larger (possibly popular) objects. -# -# The heap LFUDA policy keeps popular objects in cache regardless of -# their size and thus optimizes byte hit rate at the expense of -# hit rate since one large, popular object will prevent many -# smaller, slightly less popular objects from being cached. -# -# Both policies utilize a dynamic aging mechanism that prevents -# cache pollution that can otherwise occur with frequency-based -# replacement policies. -# -# NOTE: if using the LFUDA replacement policy you should increase -# the value of maximum_object_size above its default of 4 MB to -# to maximize the potential byte hit rate improvement of LFUDA. -# -# For more information about the GDSF and LFUDA cache replacement -# policies see http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html -# and http://fog.hpl.external.hp.com/techreports/98/HPL-98-173.html. -#Default: -# cache_replacement_policy lru - -# TAG: minimum_object_size (bytes) -# Objects smaller than this size will NOT be saved on disk. The -# value is specified in bytes, and the default is 0 KB, which -# means all responses can be stored. -#Default: -# no limit - -# TAG: maximum_object_size (bytes) -# Set the default value for max-size parameter on any cache_dir. -# The value is specified in bytes, and the default is 4 MB. -# -# If you wish to get a high BYTES hit ratio, you should probably -# increase this (one 32 MB object hit counts for 3200 10KB -# hits). -# -# If you wish to increase hit ratio more than you want to -# save bandwidth you should leave this low. -# -# NOTE: if using the LFUDA replacement policy you should increase -# this value to maximize the byte hit rate improvement of LFUDA! -# See cache_replacement_policy for a discussion of this policy. -#Default: -# maximum_object_size 4 MB - -# TAG: cache_dir -# Format: -# cache_dir Type Directory-Name Fs-specific-data [options] -# -# You can specify multiple cache_dir lines to spread the -# cache among different disk partitions. -# -# Type specifies the kind of storage system to use. Only "ufs" -# is built by default. To enable any of the other storage systems -# see the --enable-storeio configure option. -# -# 'Directory' is a top-level directory where cache swap -# files will be stored. If you want to use an entire disk -# for caching, this can be the mount-point directory. -# The directory must exist and be writable by the Squid -# process. Squid will NOT create this directory for you. -# -# In SMP configurations, cache_dir must not precede the workers option -# and should use configuration macros or conditionals to give each -# worker interested in disk caching a dedicated cache directory. -# -# -# ==== The ufs store type ==== -# -# "ufs" is the old well-known Squid storage format that has always -# been there. -# -# Usage: -# cache_dir ufs Directory-Name Mbytes L1 L2 [options] -# -# 'Mbytes' is the amount of disk space (MB) to use under this -# directory. The default is 100 MB. Change this to suit your -# configuration. Do NOT put the size of your disk drive here. -# Instead, if you want Squid to use the entire disk drive, -# subtract 20% and use that value. -# -# 'L1' is the number of first-level subdirectories which -# will be created under the 'Directory'. The default is 16. -# -# 'L2' is the number of second-level subdirectories which -# will be created under each first-level directory. The default -# is 256. -# -# -# ==== The aufs store type ==== -# -# "aufs" uses the same storage format as "ufs", utilizing -# POSIX-threads to avoid blocking the main Squid process on -# disk-I/O. This was formerly known in Squid as async-io. -# -# Usage: -# cache_dir aufs Directory-Name Mbytes L1 L2 [options] -# -# see argument descriptions under ufs above -# -# -# ==== The diskd store type ==== -# -# "diskd" uses the same storage format as "ufs", utilizing a -# separate process to avoid blocking the main Squid process on -# disk-I/O. -# -# Usage: -# cache_dir diskd Directory-Name Mbytes L1 L2 [options] [Q1=n] [Q2=n] -# -# see argument descriptions under ufs above -# -# Q1 specifies the number of unacknowledged I/O requests when Squid -# stops opening new files. If this many messages are in the queues, -# Squid won't open new files. Default is 64 -# -# Q2 specifies the number of unacknowledged messages when Squid -# starts blocking. If this many messages are in the queues, -# Squid blocks until it receives some replies. Default is 72 -# -# When Q1 < Q2 (the default), the cache directory is optimized -# for lower response time at the expense of a decrease in hit -# ratio. If Q1 > Q2, the cache directory is optimized for -# higher hit ratio at the expense of an increase in response -# time. -# -# -# ==== The rock store type ==== -# -# Usage: -# cache_dir rock Directory-Name Mbytes <max-size=bytes> [options] -# -# The Rock Store type is a database-style storage. All cached -# entries are stored in a "database" file, using fixed-size slots, -# one entry per slot. The database size is specified in MB. The -# slot size is specified in bytes using the max-size option. See -# below for more info on the max-size option. -# -# If possible, Squid using Rock Store creates a dedicated kid -# process called "disker" to avoid blocking Squid worker(s) on disk -# I/O. One disker kid is created for each rock cache_dir. Diskers -# are created only when Squid, running in daemon mode, has support -# for the IpcIo disk I/O module. -# -# swap-timeout=msec: Squid will not start writing a miss to or -# reading a hit from disk if it estimates that the swap operation -# will take more than the specified number of milliseconds. By -# default and when set to zero, disables the disk I/O time limit -# enforcement. Ignored when using blocking I/O module because -# blocking synchronous I/O does not allow Squid to estimate the -# expected swap wait time. -# -# max-swap-rate=swaps/sec: Artificially limits disk access using -# the specified I/O rate limit. Swap out requests that -# would cause the average I/O rate to exceed the limit are -# delayed. Individual swap in requests (i.e., hits or reads) are -# not delayed, but they do contribute to measured swap rate and -# since they are placed in the same FIFO queue as swap out -# requests, they may wait longer if max-swap-rate is smaller. -# This is necessary on file systems that buffer "too -# many" writes and then start blocking Squid and other processes -# while committing those writes to disk. Usually used together -# with swap-timeout to avoid excessive delays and queue overflows -# when disk demand exceeds available disk "bandwidth". By default -# and when set to zero, disables the disk I/O rate limit -# enforcement. Currently supported by IpcIo module only. -# -# -# ==== The coss store type ==== -# -# NP: COSS filesystem in Squid-3 has been deemed too unstable for -# production use and has thus been removed from this release. -# We hope that it can be made usable again soon. -# -# block-size=n defines the "block size" for COSS cache_dir's. -# Squid uses file numbers as block numbers. Since file numbers -# are limited to 24 bits, the block size determines the maximum -# size of the COSS partition. The default is 512 bytes, which -# leads to a maximum cache_dir size of 512<<24, or 8 GB. Note -# you should not change the coss block size after Squid -# has written some objects to the cache_dir. -# -# The coss file store has changed from 2.5. Now it uses a file -# called 'stripe' in the directory names in the config - and -# this will be created by squid -z. -# -# -# ==== COMMON OPTIONS ==== -# -# no-store no new objects should be stored to this cache_dir. -# -# min-size=n the minimum object size in bytes this cache_dir -# will accept. It's used to restrict a cache_dir -# to only store large objects (e.g. AUFS) while -# other stores are optimized for smaller objects -# (e.g. COSS). -# Defaults to 0. -# -# max-size=n the maximum object size in bytes this cache_dir -# supports. -# The value in maximum_object_size directive sets -# the default unless more specific details are -# available (ie a small store capacity). -# -# Note: To make optimal use of the max-size limits you should order -# the cache_dir lines with the smallest max-size value first. -# -# Note for coss, max-size must be less than COSS_MEMBUF_SZ, -# which can be changed with the --with-coss-membuf-size=N configure -# option. -# -#Default: -# No disk cache. Store cache ojects only in memory. -# - -# Uncomment and adjust the following to add a disk cache directory. -#cache_dir ufs /var/log/squid/cache/squid 100 16 256 - -# TAG: store_dir_select_algorithm -# How Squid selects which cache_dir to use when the response -# object will fit into more than one. -# -# Regardless of which algorithm is used the cache_dir min-size -# and max-size parameters are obeyed. As such they can affect -# the selection algorithm by limiting the set of considered -# cache_dir. -# -# Algorithms: -# -# least-load -# -# This algorithm is suited to caches with similar cache_dir -# sizes and disk speeds. -# -# The disk with the least I/O pending is selected. -# When there are multiple disks with the same I/O load ranking -# the cache_dir with most available capacity is selected. -# -# When a mix of cache_dir sizes are configured the faster disks -# have a naturally lower I/O loading and larger disks have more -# capacity. So space used to store objects and data throughput -# may be very unbalanced towards larger disks. -# -# -# round-robin -# -# This algorithm is suited to caches with unequal cache_dir -# disk sizes. -# -# Each cache_dir is selected in a rotation. The next suitable -# cache_dir is used. -# -# Available cache_dir capacity is only considered in relation -# to whether the object will fit and meets the min-size and -# max-size parameters. -# -# Disk I/O loading is only considered to prevent overload on slow -# disks. This algorithm does not spread objects by size, so any -# I/O loading per-disk may appear very unbalanced and volatile. -# -#Default: -# store_dir_select_algorithm least-load - -# TAG: max_open_disk_fds -# To avoid having disk as the I/O bottleneck Squid can optionally -# bypass the on-disk cache if more than this amount of disk file -# descriptors are open. -# -# A value of 0 indicates no limit. -#Default: -# no limit - -# TAG: cache_swap_low (percent, 0-100) -# The low-water mark for cache object replacement. -# Replacement begins when the swap (disk) usage is above the -# low-water mark and attempts to maintain utilization near the -# low-water mark. As swap utilization gets close to high-water -# mark object eviction becomes more aggressive. If utilization is -# close to the low-water mark less replacement is done each time. -# -# Defaults are 90% and 95%. If you have a large cache, 5% could be -# hundreds of MB. If this is the case you may wish to set these -# numbers closer together. -# -# See also cache_swap_high -#Default: -# cache_swap_low 90 - -# TAG: cache_swap_high (percent, 0-100) -# The high-water mark for cache object replacement. -# Replacement begins when the swap (disk) usage is above the -# low-water mark and attempts to maintain utilization near the -# low-water mark. As swap utilization gets close to high-water -# mark object eviction becomes more aggressive. If utilization is -# close to the low-water mark less replacement is done each time. -# -# Defaults are 90% and 95%. If you have a large cache, 5% could be -# hundreds of MB. If this is the case you may wish to set these -# numbers closer together. -# -# See also cache_swap_low -#Default: -# cache_swap_high 95 - -# LOGFILE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: logformat -# Usage: -# -# logformat <name> <format specification> -# -# Defines an access log format. -# -# The <format specification> is a string with embedded % format codes -# -# % format codes all follow the same basic structure where all but -# the formatcode is optional. Output strings are automatically escaped -# as required according to their context and the output format -# modifiers are usually not needed, but can be specified if an explicit -# output format is desired. -# -# % ["|[|'|#] [-] [[0]width] [{argument}] formatcode -# -# " output in quoted string format -# [ output in squid text log format as used by log_mime_hdrs -# # output in URL quoted format -# ' output as-is -# -# - left aligned -# -# width minimum and/or maximum field width: -# [width_min][.width_max] -# When minimum starts with 0, the field is zero-padded. -# String values exceeding maximum width are truncated. -# -# {arg} argument such as header name etc -# -# Format codes: -# -# % a literal % character -# sn Unique sequence number per log line entry -# err_code The ID of an error response served by Squid or -# a similar internal error identifier. -# err_detail Additional err_code-dependent error information. -# note The annotation specified by the argument. Also -# logs the adaptation meta headers set by the -# adaptation_meta configuration parameter. -# If no argument given all annotations logged. -# The argument may include a separator to use with -# annotation values: -# name[:separator] -# By default, multiple note values are separated with "," -# and multiple notes are separated with "\r\n". -# When logging named notes with %{name}note, the -# explicitly configured separator is used between note -# values. When logging all notes with %note, the -# explicitly configured separator is used between -# individual notes. There is currently no way to -# specify both value and notes separators when logging -# all notes with %note. -# -# Connection related format codes: -# -# >a Client source IP address -# >A Client FQDN -# >p Client source port -# >eui Client source EUI (MAC address, EUI-48 or EUI-64 identifier) -# >la Local IP address the client connected to -# >lp Local port number the client connected to -# >qos Client connection TOS/DSCP value set by Squid -# >nfmark Client connection netfilter mark set by Squid -# -# la Local listening IP address the client connection was connected to. -# lp Local listening port number the client connection was connected to. -# -# <a Server IP address of the last server or peer connection -# <A Server FQDN or peer name -# <p Server port number of the last server or peer connection -# <la Local IP address of the last server or peer connection -# <lp Local port number of the last server or peer connection -# <qos Server connection TOS/DSCP value set by Squid -# <nfmark Server connection netfilter mark set by Squid -# -# Time related format codes: -# -# ts Seconds since epoch -# tu subsecond time (milliseconds) -# tl Local time. Optional strftime format argument -# default %d/%b/%Y:%H:%M:%S %z -# tg GMT time. Optional strftime format argument -# default %d/%b/%Y:%H:%M:%S %z -# tr Response time (milliseconds) -# dt Total time spent making DNS lookups (milliseconds) -# -# Access Control related format codes: -# -# et Tag returned by external acl -# ea Log string returned by external acl -# un User name (any available) -# ul User name from authentication -# ue User name from external acl helper -# ui User name from ident -# us User name from SSL -# -# HTTP related format codes: -# -# [http::]>h Original received request header. -# Usually differs from the request header sent by -# Squid, although most fields are often preserved. -# Accepts optional header field name/value filter -# argument using name[:[separator]element] format. -# [http::]>ha Received request header after adaptation and -# redirection (pre-cache REQMOD vectoring point). -# Usually differs from the request header sent by -# Squid, although most fields are often preserved. -# Optional header name argument as for >h -# [http::]<h Reply header. Optional header name argument -# as for >h -# [http::]>Hs HTTP status code sent to the client -# [http::]<Hs HTTP status code received from the next hop -# [http::]<bs Number of HTTP-equivalent message body bytes -# received from the next hop, excluding chunked -# transfer encoding and control messages. -# Generated FTP/Gopher listings are treated as -# received bodies. -# [http::]mt MIME content type -# [http::]rm Request method (GET/POST etc) -# [http::]>rm Request method from client -# [http::]<rm Request method sent to server or peer -# [http::]ru Request URL from client (historic, filtered for logging) -# [http::]>ru Request URL from client -# [http::]<ru Request URL sent to server or peer -# [http::]rp Request URL-Path excluding hostname -# [http::]>rp Request URL-Path excluding hostname from client -# [http::]<rp Request URL-Path excluding hostname sento to server or peer -# [http::]rv Request protocol version -# [http::]>rv Request protocol version from client -# [http::]<rv Request protocol version sent to server or peer -# [http::]<st Sent reply size including HTTP headers -# [http::]>st Received request size including HTTP headers. In the -# case of chunked requests the chunked encoding metadata -# are not included -# [http::]>sh Received HTTP request headers size -# [http::]<sh Sent HTTP reply headers size -# [http::]st Request+Reply size including HTTP headers -# [http::]<sH Reply high offset sent -# [http::]<sS Upstream object size -# [http::]<pt Peer response time in milliseconds. The timer starts -# when the last request byte is sent to the next hop -# and stops when the last response byte is received. -# [http::]<tt Total server-side time in milliseconds. The timer -# starts with the first connect request (or write I/O) -# sent to the first selected peer. The timer stops -# with the last I/O with the last peer. -# -# Squid handling related format codes: -# -# Ss Squid request status (TCP_MISS etc) -# Sh Squid hierarchy status (DEFAULT_PARENT etc) -# -# SSL-related format codes: -# -# ssl::bump_mode SslBump decision for the transaction: -# -# For CONNECT requests that initiated bumping of -# a connection and for any request received on -# an already bumped connection, Squid logs the -# corresponding SslBump mode ("server-first" or -# "client-first"). See the ssl_bump option for -# more information about these modes. -# -# A "none" token is logged for requests that -# triggered "ssl_bump" ACL evaluation matching -# either a "none" rule or no rules at all. -# -# In all other cases, a single dash ("-") is -# logged. -# -# If ICAP is enabled, the following code becomes available (as -# well as ICAP log codes documented with the icap_log option): -# -# icap::tt Total ICAP processing time for the HTTP -# transaction. The timer ticks when ICAP -# ACLs are checked and when ICAP -# transaction is in progress. -# -# If adaptation is enabled the following three codes become available: -# -# adapt::<last_h The header of the last ICAP response or -# meta-information from the last eCAP -# transaction related to the HTTP transaction. -# Like <h, accepts an optional header name -# argument. -# -# adapt::sum_trs Summed adaptation transaction response -# times recorded as a comma-separated list in -# the order of transaction start time. Each time -# value is recorded as an integer number, -# representing response time of one or more -# adaptation (ICAP or eCAP) transaction in -# milliseconds. When a failed transaction is -# being retried or repeated, its time is not -# logged individually but added to the -# replacement (next) transaction. See also: -# adapt::all_trs. -# -# adapt::all_trs All adaptation transaction response times. -# Same as adaptation_strs but response times of -# individual transactions are never added -# together. Instead, all transaction response -# times are recorded individually. -# -# You can prefix adapt::*_trs format codes with adaptation -# service name in curly braces to record response time(s) specific -# to that service. For example: %{my_service}adapt::sum_trs -# -# If SSL is enabled, the following formating codes become available: -# -# %ssl::>cert_subject The Subject field of the received client -# SSL certificate or a dash ('-') if Squid has -# received an invalid/malformed certificate or -# no certificate at all. Consider encoding the -# logged value because Subject often has spaces. -# -# %ssl::>cert_issuer The Issuer field of the received client -# SSL certificate or a dash ('-') if Squid has -# received an invalid/malformed certificate or -# no certificate at all. Consider encoding the -# logged value because Issuer often has spaces. -# -# The default formats available (which do not need re-defining) are: -# -#logformat squid %ts.%03tu %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt -#logformat common %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st %Ss:%Sh -#logformat combined %>a %[ui %[un [%tl] "%rm %ru HTTP/%rv" %>Hs %<st "%{Referer}>h" "%{User-Agent}>h" %Ss:%Sh -#logformat referrer %ts.%03tu %>a %{Referer}>h %ru -#logformat useragent %>a [%tl] "%{User-Agent}>h" -# -# NOTE: When the log_mime_hdrs directive is set to ON. -# The squid, common and combined formats have a safely encoded copy -# of the mime headers appended to each line within a pair of brackets. -# -# NOTE: The common and combined formats are not quite true to the Apache definition. -# The logs from Squid contain an extra status and hierarchy code appended. -# -#Default: -# The format definitions squid, common, combined, referrer, useragent are built in. - -# TAG: access_log -# Configures whether and how Squid logs HTTP and ICP transactions. -# If access logging is enabled, a single line is logged for every -# matching HTTP or ICP request. The recommended directive formats are: -# -# access_log <module>:<place> [option ...] [acl acl ...] -# access_log none [acl acl ...] -# -# The following directive format is accepted but may be deprecated: -# access_log <module>:<place> [<logformat name> [acl acl ...]] -# -# In most cases, the first ACL name must not contain the '=' character -# and should not be equal to an existing logformat name. You can always -# start with an 'all' ACL to work around those restrictions. -# -# Will log to the specified module:place using the specified format (which -# must be defined in a logformat directive) those entries which match -# ALL the acl's specified (which must be defined in acl clauses). -# If no acl is specified, all requests will be logged to this destination. -# -# ===== Available options for the recommended directive format ===== -# -# logformat=name Names log line format (either built-in or -# defined by a logformat directive). Defaults -# to 'squid'. -# -# buffer-size=64KB Defines approximate buffering limit for log -# records (see buffered_logs). Squid should not -# keep more than the specified size and, hence, -# should flush records before the buffer becomes -# full to avoid overflows under normal -# conditions (the exact flushing algorithm is -# module-dependent though). The on-error option -# controls overflow handling. -# -# on-error=die|drop Defines action on unrecoverable errors. The -# 'drop' action ignores (i.e., does not log) -# affected log records. The default 'die' action -# kills the affected worker. The drop action -# support has not been tested for modules other -# than tcp. -# -# ===== Modules Currently available ===== -# -# none Do not log any requests matching these ACL. -# Do not specify Place or logformat name. -# -# stdio Write each log line to disk immediately at the completion of -# each request. -# Place: the filename and path to be written. -# -# daemon Very similar to stdio. But instead of writing to disk the log -# line is passed to a daemon helper for asychronous handling instead. -# Place: varies depending on the daemon. -# -# log_file_daemon Place: the file name and path to be written. -# -# syslog To log each request via syslog facility. -# Place: The syslog facility and priority level for these entries. -# Place Format: facility.priority -# -# where facility could be any of: -# authpriv, daemon, local0 ... local7 or user. -# -# And priority could be any of: -# err, warning, notice, info, debug. -# -# udp To send each log line as text data to a UDP receiver. -# Place: The destination host name or IP and port. -# Place Format: //host:port -# -# tcp To send each log line as text data to a TCP receiver. -# Lines may be accumulated before sending (see buffered_logs). -# Place: The destination host name or IP and port. -# Place Format: //host:port -# -# Default: -# access_log daemon:/var/log/squid/access.log squid -#Default: -# access_log daemon:/var/log/squid/access.log squid - -# TAG: icap_log -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# ICAP log files record ICAP transaction summaries, one line per -# transaction. -# -# The icap_log option format is: -# icap_log <filepath> [<logformat name> [acl acl ...]] -# icap_log none [acl acl ...]] -# -# Please see access_log option documentation for details. The two -# kinds of logs share the overall configuration approach and many -# features. -# -# ICAP processing of a single HTTP message or transaction may -# require multiple ICAP transactions. In such cases, multiple -# ICAP transaction log lines will correspond to a single access -# log line. -# -# ICAP log uses logformat codes that make sense for an ICAP -# transaction. Header-related codes are applied to the HTTP header -# embedded in an ICAP server response, with the following caveats: -# For REQMOD, there is no HTTP response header unless the ICAP -# server performed request satisfaction. For RESPMOD, the HTTP -# request header is the header sent to the ICAP server. For -# OPTIONS, there are no HTTP headers. -# -# The following format codes are also available for ICAP logs: -# -# icap::<A ICAP server IP address. Similar to <A. -# -# icap::<service_name ICAP service name from the icap_service -# option in Squid configuration file. -# -# icap::ru ICAP Request-URI. Similar to ru. -# -# icap::rm ICAP request method (REQMOD, RESPMOD, or -# OPTIONS). Similar to existing rm. -# -# icap::>st Bytes sent to the ICAP server (TCP payload -# only; i.e., what Squid writes to the socket). -# -# icap::<st Bytes received from the ICAP server (TCP -# payload only; i.e., what Squid reads from -# the socket). -# -# icap::<bs Number of message body bytes received from the -# ICAP server. ICAP message body, if any, usually -# includes encapsulated HTTP message headers and -# possibly encapsulated HTTP message body. The -# HTTP body part is dechunked before its size is -# computed. -# -# icap::tr Transaction response time (in -# milliseconds). The timer starts when -# the ICAP transaction is created and -# stops when the transaction is completed. -# Similar to tr. -# -# icap::tio Transaction I/O time (in milliseconds). The -# timer starts when the first ICAP request -# byte is scheduled for sending. The timers -# stops when the last byte of the ICAP response -# is received. -# -# icap::to Transaction outcome: ICAP_ERR* for all -# transaction errors, ICAP_OPT for OPTION -# transactions, ICAP_ECHO for 204 -# responses, ICAP_MOD for message -# modification, and ICAP_SAT for request -# satisfaction. Similar to Ss. -# -# icap::Hs ICAP response status code. Similar to Hs. -# -# icap::>h ICAP request header(s). Similar to >h. -# -# icap::<h ICAP response header(s). Similar to <h. -# -# The default ICAP log format, which can be used without an explicit -# definition, is called icap_squid: -# -#logformat icap_squid %ts.%03tu %6icap::tr %>a %icap::to/%03icap::Hs %icap::<size %icap::rm %icap::ru% %un -/%icap::<A - -# -# See also: logformat, log_icap, and %adapt::<last_h -#Default: -# none - -# TAG: logfile_daemon -# Specify the path to the logfile-writing daemon. This daemon is -# used to write the access and store logs, if configured. -# -# Squid sends a number of commands to the log daemon: -# L<data>\n - logfile data -# R\n - rotate file -# T\n - truncate file -# O\n - reopen file -# F\n - flush file -# r<n>\n - set rotate count to <n> -# b<n>\n - 1 = buffer output, 0 = don't buffer output -# -# No responses is expected. -#Default: -# logfile_daemon /usr/libexec/log_file_daemon - -# TAG: log_access -# Remove this line. Use acls with access_log directives to control access logging -#Default: -# none - -# TAG: log_icap -# Remove this line. Use acls with icap_log directives to control icap logging -#Default: -# none - -# TAG: stats_collection allow|deny acl acl... -# This options allows you to control which requests gets accounted -# in performance counters. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow logging for all transactions. - -# TAG: cache_store_log -# Logs the activities of the storage manager. Shows which -# objects are ejected from the cache, and which objects are -# saved and for how long. -# There are not really utilities to analyze this data, so you can safely -# disable it (the default). -# -# Store log uses modular logging outputs. See access_log for the list -# of modules supported. -# -# Example: -# cache_store_log stdio:/var/log/squid/store.log -# cache_store_log daemon:/var/log/squid/store.log -#Default: -# none - -# TAG: cache_swap_state -# Location for the cache "swap.state" file. This index file holds -# the metadata of objects saved on disk. It is used to rebuild -# the cache during startup. Normally this file resides in each -# 'cache_dir' directory, but you may specify an alternate -# pathname here. Note you must give a full filename, not just -# a directory. Since this is the index for the whole object -# list you CANNOT periodically rotate it! -# -# If %s can be used in the file name it will be replaced with a -# a representation of the cache_dir name where each / is replaced -# with '.'. This is needed to allow adding/removing cache_dir -# lines when cache_swap_log is being used. -# -# If have more than one 'cache_dir', and %s is not used in the name -# these swap logs will have names such as: -# -# cache_swap_log.00 -# cache_swap_log.01 -# cache_swap_log.02 -# -# The numbered extension (which is added automatically) -# corresponds to the order of the 'cache_dir' lines in this -# configuration file. If you change the order of the 'cache_dir' -# lines in this file, these index files will NOT correspond to -# the correct 'cache_dir' entry (unless you manually rename -# them). We recommend you do NOT use this option. It is -# better to keep these index files in each 'cache_dir' directory. -#Default: -# Store the journal inside its cache_dir - -# TAG: logfile_rotate -# Specifies the number of logfile rotations to make when you -# type 'squid -k rotate'. The default is 10, which will rotate -# with extensions 0 through 9. Setting logfile_rotate to 0 will -# disable the file name rotation, but the logfiles are still closed -# and re-opened. This will enable you to rename the logfiles -# yourself just before sending the rotate signal. -# -# Note, the 'squid -k rotate' command normally sends a USR1 -# signal to the running squid process. In certain situations -# (e.g. on Linux with Async I/O), USR1 is used for other -# purposes, so -k rotate uses another signal. It is best to get -# in the habit of using 'squid -k rotate' instead of 'kill -USR1 -# <pid>'. -# -# Note, from Squid-3.1 this option is only a default for cache.log, -# that log can be rotated separately by using debug_options. -#Default: -# logfile_rotate 10 - -# TAG: emulate_httpd_log -# Replace this with an access_log directive using the format 'common' or 'combined'. -#Default: -# none - -# TAG: log_ip_on_direct -# Remove this option from your config. To log server or peer names use %<A in the log format. -#Default: -# none - -# TAG: mime_table -# Path to Squid's icon configuration file. -# -# You shouldn't need to change this, but the default file contains -# examples and formatting information if you do. -#Default: -# mime_table /etc/squid/mime.conf - -# TAG: log_mime_hdrs on|off -# The Cache can record both the request and the response MIME -# headers for each HTTP transaction. The headers are encoded -# safely and will appear as two bracketed fields at the end of -# the access log (for either the native or httpd-emulated log -# formats). To enable this logging set log_mime_hdrs to 'on'. -#Default: -# log_mime_hdrs off - -# TAG: useragent_log -# Replace this with an access_log directive using the format 'useragent'. -#Default: -# none - -# TAG: referer_log -# Replace this with an access_log directive using the format 'referrer'. -#Default: -# none - -# TAG: pid_filename -# A filename to write the process-id to. To disable, enter "none". -#Default: -# pid_filename /var/run/squid - -# TAG: log_fqdn -# Remove this option from your config. To log FQDN use %>A in the log format. -#Default: -# none - -# TAG: client_netmask -# A netmask for client addresses in logfiles and cachemgr output. -# Change this to protect the privacy of your cache clients. -# A netmask of 255.255.255.0 will log all IP's in that range with -# the last digit set to '0'. -#Default: -# Log full client IP address - -# TAG: forward_log -# Use a regular access.log with ACL limiting it to MISS events. -#Default: -# none - -# TAG: strip_query_terms -# By default, Squid strips query terms from requested URLs before -# logging. This protects your user's privacy and reduces log size. -# -# When investigating HIT/MISS or other caching behaviour you -# will need to disable this to see the full URL used by Squid. -#Default: -# strip_query_terms on - -# TAG: buffered_logs on|off -# Whether to write/send access_log records ASAP or accumulate them and -# then write/send them in larger chunks. Buffering may improve -# performance because it decreases the number of I/Os. However, -# buffering increases the delay before log records become available to -# the final recipient (e.g., a disk file or logging daemon) and, -# hence, increases the risk of log records loss. -# -# Note that even when buffered_logs are off, Squid may have to buffer -# records if it cannot write/send them immediately due to pending I/Os -# (e.g., the I/O writing the previous log record) or connectivity loss. -# -# Currently honored by 'daemon' and 'tcp' access_log modules only. -#Default: -# buffered_logs off - -# TAG: netdb_filename -# Note: This option is only available if Squid is rebuilt with the -# --enable-icmp -# -# Where Squid stores it's netdb journal. -# When enabled this journal preserves netdb state between restarts. -# -# To disable, enter "none". -#Default: -# netdb_filename stdio:/var/log/squid/netdb.state - -# OPTIONS FOR TROUBLESHOOTING -# ----------------------------------------------------------------------------- - -# TAG: cache_log -# Squid administrative logging file. -# -# This is where general information about Squid behavior goes. You can -# increase the amount of data logged to this file and how often it is -# rotated with "debug_options" -#Default: -# cache_log /var/log/squid/cache.log - -# TAG: debug_options -# Logging options are set as section,level where each source file -# is assigned a unique section. Lower levels result in less -# output, Full debugging (level 9) can result in a very large -# log file, so be careful. -# -# The magic word "ALL" sets debugging levels for all sections. -# The default is to run with "ALL,1" to record important warnings. -# -# The rotate=N option can be used to keep more or less of these logs -# than would otherwise be kept by logfile_rotate. -# For most uses a single log should be enough to monitor current -# events affecting Squid. -#Default: -# Log all critical and important messages. - -# TAG: coredump_dir -# By default Squid leaves core files in the directory from where -# it was started. If you set 'coredump_dir' to a directory -# that exists, Squid will chdir() to that directory at startup -# and coredump files will be left there. -# -#Default: -# Use the directory from where Squid was started. -# - -# Leave coredumps in the first cache dir -coredump_dir /var/log/squid/cache/squid - -# OPTIONS FOR FTP GATEWAYING -# ----------------------------------------------------------------------------- - -# TAG: ftp_user -# If you want the anonymous login password to be more informative -# (and enable the use of picky FTP servers), set this to something -# reasonable for your domain, like wwwuser@somewhere.net -# -# The reason why this is domainless by default is the -# request can be made on the behalf of a user in any domain, -# depending on how the cache is used. -# Some FTP server also validate the email address is valid -# (for example perl.com). -#Default: -# ftp_user Squid@ - -# TAG: ftp_passive -# If your firewall does not allow Squid to use passive -# connections, turn off this option. -# -# Use of ftp_epsv_all option requires this to be ON. -#Default: -# ftp_passive on - -# TAG: ftp_epsv_all -# FTP Protocol extensions permit the use of a special "EPSV ALL" command. -# -# NATs may be able to put the connection on a "fast path" through the -# translator, as the EPRT command will never be used and therefore, -# translation of the data portion of the segments will never be needed. -# -# When a client only expects to do two-way FTP transfers this may be -# useful. -# If squid finds that it must do a three-way FTP transfer after issuing -# an EPSV ALL command, the FTP session will fail. -# -# If you have any doubts about this option do not use it. -# Squid will nicely attempt all other connection methods. -# -# Requires ftp_passive to be ON (default) for any effect. -#Default: -# ftp_epsv_all off - -# TAG: ftp_epsv -# FTP Protocol extensions permit the use of a special "EPSV" command. -# -# NATs may be able to put the connection on a "fast path" through the -# translator using EPSV, as the EPRT command will never be used -# and therefore, translation of the data portion of the segments -# will never be needed. -# -# Turning this OFF will prevent EPSV being attempted. -# WARNING: Doing so will convert Squid back to the old behavior with all -# the related problems with external NAT devices/layers. -# -# Requires ftp_passive to be ON (default) for any effect. -#Default: -# ftp_epsv on - -# TAG: ftp_eprt -# FTP Protocol extensions permit the use of a special "EPRT" command. -# -# This extension provides a protocol neutral alternative to the -# IPv4-only PORT command. When supported it enables active FTP data -# channels over IPv6 and efficient NAT handling. -# -# Turning this OFF will prevent EPRT being attempted and will skip -# straight to using PORT for IPv4 servers. -# -# Some devices are known to not handle this extension correctly and -# may result in crashes. Devices which suport EPRT enough to fail -# cleanly will result in Squid attempting PORT anyway. This directive -# should only be disabled when EPRT results in device failures. -# -# WARNING: Doing so will convert Squid back to the old behavior with all -# the related problems with external NAT devices/layers and IPv4-only FTP. -#Default: -# ftp_eprt on - -# TAG: ftp_sanitycheck -# For security and data integrity reasons Squid by default performs -# sanity checks of the addresses of FTP data connections ensure the -# data connection is to the requested server. If you need to allow -# FTP connections to servers using another IP address for the data -# connection turn this off. -#Default: -# ftp_sanitycheck on - -# TAG: ftp_telnet_protocol -# The FTP protocol is officially defined to use the telnet protocol -# as transport channel for the control connection. However, many -# implementations are broken and does not respect this aspect of -# the FTP protocol. -# -# If you have trouble accessing files with ASCII code 255 in the -# path or similar problems involving this ASCII code you can -# try setting this directive to off. If that helps, report to the -# operator of the FTP server in question that their FTP server -# is broken and does not follow the FTP standard. -#Default: -# ftp_telnet_protocol on - -# OPTIONS FOR EXTERNAL SUPPORT PROGRAMS -# ----------------------------------------------------------------------------- - -# TAG: diskd_program -# Specify the location of the diskd executable. -# Note this is only useful if you have compiled in -# diskd as one of the store io modules. -#Default: -# diskd_program /usr/libexec/diskd - -# TAG: unlinkd_program -# Specify the location of the executable for file deletion process. -#Default: -# unlinkd_program /usr/libexec/unlinkd - -# TAG: pinger_program -# Note: This option is only available if Squid is rebuilt with the -# --enable-icmp -# -# Specify the location of the executable for the pinger process. -#Default: -# pinger_program /usr/libexec/pinger - -# TAG: pinger_enable -# Note: This option is only available if Squid is rebuilt with the -# --enable-icmp -# -# Control whether the pinger is active at run-time. -# Enables turning ICMP pinger on and off with a simple -# squid -k reconfigure. -#Default: -# pinger_enable on - -# OPTIONS FOR URL REWRITING -# ----------------------------------------------------------------------------- - -# TAG: url_rewrite_program -# Specify the location of the executable URL rewriter to use. -# Since they can perform almost any function there isn't one included. -# -# For each requested URL, the rewriter will receive on line with the format -# -# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL> -# -# -# After processing the request the helper must reply using the following format: -# -# [channel-ID <SP>] result [<SP> kv-pairs] -# -# The result code can be: -# -# OK status=30N url="..." -# Redirect the URL to the one supplied in 'url='. -# 'status=' is optional and contains the status code to send -# the client in Squids HTTP response. It must be one of the -# HTTP redirect status codes: 301, 302, 303, 307, 308. -# When no status is given Squid will use 302. -# -# OK rewrite-url="..." -# Rewrite the URL to the one supplied in 'rewrite-url='. -# The new URL is fetched directly by Squid and returned to -# the client as the response to its request. -# -# OK -# When neither of url= and rewrite-url= are sent Squid does -# not change the URL. -# -# ERR -# Do not change the URL. -# -# BH -# An internal error occurred in the helper, preventing -# a result being identified. The 'message=' key name is -# reserved for delivering a log message. -# -# -# In the future, the interface protocol will be extended with -# key=value pairs ("kv-pairs" shown above). Helper programs -# should be prepared to receive and possibly ignore additional -# whitespace-separated tokens on each input line. -# -# When using the concurrency= option the protocol is changed by -# introducing a query channel tag in front of the request/response. -# The query channel tag is a number between 0 and concurrency-1. -# This value must be echoed back unchanged to Squid as the first part -# of the response relating to its request. -# -# WARNING: URL re-writing ability should be avoided whenever possible. -# Use the URL redirect form of response instead. -# -# Re-write creates a difference in the state held by the client -# and server. Possibly causing confusion when the server response -# contains snippets of its view state. Embeded URLs, response -# and content Location headers, etc. are not re-written by this -# interface. -# -# By default, a URL rewriter is not used. -#Default: -# none - -# TAG: url_rewrite_children -# The maximum number of redirector processes to spawn. If you limit -# it too few Squid will have to wait for them to process a backlog of -# URLs, slowing it down. If you allow too many they will use RAM -# and other system resources noticably. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup= -# -# Sets a minimum of how many processes are to be spawned when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few will cause an initial slowdown in traffic as Squid -# attempts to simultaneously spawn enough processes to cope. -# -# idle= -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# concurrency= -# -# The number of requests each redirector helper can handle in -# parallel. Defaults to 0 which indicates the redirector -# is a old-style single threaded redirector. -# -# When this directive is set to a value >= 1 then the protocol -# used to communicate with the helper is modified to include -# an ID in front of the request/response. The ID from the request -# must be echoed back with the response to that request. -#Default: -# url_rewrite_children 20 startup=0 idle=1 concurrency=0 - -# TAG: url_rewrite_host_header -# To preserve same-origin security policies in browsers and -# prevent Host: header forgery by redirectors Squid rewrites -# any Host: header in redirected requests. -# -# If you are running an accelerator this may not be a wanted -# effect of a redirector. This directive enables you disable -# Host: alteration in reverse-proxy traffic. -# -# WARNING: Entries are cached on the result of the URL rewriting -# process, so be careful if you have domain-virtual hosts. -# -# WARNING: Squid and other software verifies the URL and Host -# are matching, so be careful not to relay through other proxies -# or inspecting firewalls with this disabled. -#Default: -# url_rewrite_host_header on - -# TAG: url_rewrite_access -# If defined, this access list specifies which requests are -# sent to the redirector processes. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: url_rewrite_bypass -# When this is 'on', a request will not go through the -# redirector if all the helpers are busy. If this is 'off' -# and the redirector queue grows too large, Squid will exit -# with a FATAL error and ask you to increase the number of -# redirectors. You should only enable this if the redirectors -# are not critical to your caching system. If you use -# redirectors for access control, and you enable this option, -# users may have access to pages they should not -# be allowed to request. -#Default: -# url_rewrite_bypass off - -# OPTIONS FOR STORE ID -# ----------------------------------------------------------------------------- - -# TAG: store_id_program -# Specify the location of the executable StoreID helper to use. -# Since they can perform almost any function there isn't one included. -# -# For each requested URL, the helper will receive one line with the format -# -# [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL> -# -# -# After processing the request the helper must reply using the following format: -# -# [channel-ID <SP>] result [<SP> kv-pairs] -# -# The result code can be: -# -# OK store-id="..." -# Use the StoreID supplied in 'store-id='. -# -# ERR -# The default is to use HTTP request URL as the store ID. -# -# BH -# An internal error occured in the helper, preventing -# a result being identified. -# -# -# Helper programs should be prepared to receive and possibly ignore additional -# kv-pairs with keys they do not support. -# -# When using the concurrency= option the protocol is changed by -# introducing a query channel tag in front of the request/response. -# The query channel tag is a number between 0 and concurrency-1. -# This value must be echoed back unchanged to Squid as the first part -# of the response relating to its request. -# -# NOTE: when using StoreID refresh_pattern will apply to the StoreID -# returned from the helper and not the URL. -# -# WARNING: Wrong StoreID value returned by a careless helper may result -# in the wrong cached response returned to the user. -# -# By default, a StoreID helper is not used. -#Default: -# none - -# TAG: store_id_children -# The maximum number of StoreID helper processes to spawn. If you limit -# it too few Squid will have to wait for them to process a backlog of -# requests, slowing it down. If you allow too many they will use RAM -# and other system resources noticably. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup= -# -# Sets a minimum of how many processes are to be spawned when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few will cause an initial slowdown in traffic as Squid -# attempts to simultaneously spawn enough processes to cope. -# -# idle= -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -# -# concurrency= -# -# The number of requests each storeID helper can handle in -# parallel. Defaults to 0 which indicates the helper -# is a old-style single threaded program. -# -# When this directive is set to a value >= 1 then the protocol -# used to communicate with the helper is modified to include -# an ID in front of the request/response. The ID from the request -# must be echoed back with the response to that request. -#Default: -# store_id_children 20 startup=0 idle=1 concurrency=0 - -# TAG: store_id_access -# If defined, this access list specifies which requests are -# sent to the StoreID processes. By default all requests -# are sent. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: store_id_bypass -# When this is 'on', a request will not go through the -# helper if all helpers are busy. If this is 'off' -# and the helper queue grows too large, Squid will exit -# with a FATAL error and ask you to increase the number of -# helpers. You should only enable this if the helperss -# are not critical to your caching system. If you use -# helpers for critical caching components, and you enable this -# option, users may not get objects from cache. -#Default: -# store_id_bypass on - -# OPTIONS FOR TUNING THE CACHE -# ----------------------------------------------------------------------------- - -# TAG: cache -# A list of ACL elements which, if matched and denied, cause the request to -# not be satisfied from the cache and the reply to not be cached. -# In other words, use this to force certain objects to never be cached. -# -# You must use the words 'allow' or 'deny' to indicate whether items -# matching the ACL should be allowed or denied into the cache. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow caching, unless rules exist in squid.conf. - -# TAG: max_stale time-units -# This option puts an upper limit on how stale content Squid -# will serve from the cache if cache validation fails. -# Can be overriden by the refresh_pattern max-stale option. -#Default: -# max_stale 1 week - -# TAG: refresh_pattern -# usage: refresh_pattern [-i] regex min percent max [options] -# -# By default, regular expressions are CASE-SENSITIVE. To make -# them case-insensitive, use the -i option. -# -# 'Min' is the time (in minutes) an object without an explicit -# expiry time should be considered fresh. The recommended -# value is 0, any higher values may cause dynamic applications -# to be erroneously cached unless the application designer -# has taken the appropriate actions. -# -# 'Percent' is a percentage of the objects age (time since last -# modification age) an object without explicit expiry time -# will be considered fresh. -# -# 'Max' is an upper limit on how long objects without an explicit -# expiry time will be considered fresh. -# -# options: override-expire -# override-lastmod -# reload-into-ims -# ignore-reload -# ignore-no-store -# ignore-must-revalidate -# ignore-private -# ignore-auth -# max-stale=NN -# refresh-ims -# store-stale -# -# override-expire enforces min age even if the server -# sent an explicit expiry time (e.g., with the -# Expires: header or Cache-Control: max-age). Doing this -# VIOLATES the HTTP standard. Enabling this feature -# could make you liable for problems which it causes. -# -# Note: override-expire does not enforce staleness - it only extends -# freshness / min. If the server returns a Expires time which -# is longer than your max time, Squid will still consider -# the object fresh for that period of time. -# -# override-lastmod enforces min age even on objects -# that were modified recently. -# -# reload-into-ims changes a client no-cache or ``reload'' -# request for a cached entry into a conditional request using -# If-Modified-Since and/or If-None-Match headers, provided the -# cached entry has a Last-Modified and/or a strong ETag header. -# Doing this VIOLATES the HTTP standard. Enabling this feature -# could make you liable for problems which it causes. -# -# ignore-reload ignores a client no-cache or ``reload'' -# header. Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which -# it causes. -# -# ignore-no-store ignores any ``Cache-control: no-store'' -# headers received from a server. Doing this VIOLATES -# the HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# -# ignore-must-revalidate ignores any ``Cache-Control: must-revalidate`` -# headers received from a server. Doing this VIOLATES -# the HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# -# ignore-private ignores any ``Cache-control: private'' -# headers received from a server. Doing this VIOLATES -# the HTTP standard. Enabling this feature could make you -# liable for problems which it causes. -# -# ignore-auth caches responses to requests with authorization, -# as if the originserver had sent ``Cache-control: public'' -# in the response header. Doing this VIOLATES the HTTP standard. -# Enabling this feature could make you liable for problems which -# it causes. -# -# refresh-ims causes squid to contact the origin server -# when a client issues an If-Modified-Since request. This -# ensures that the client will receive an updated version -# if one is available. -# -# store-stale stores responses even if they don't have explicit -# freshness or a validator (i.e., Last-Modified or an ETag) -# present, or if they're already stale. By default, Squid will -# not cache such responses because they usually can't be -# reused. Note that such responses will be stale by default. -# -# max-stale=NN provide a maximum staleness factor. Squid won't -# serve objects more stale than this even if it failed to -# validate the object. Default: use the max_stale global limit. -# -# Basically a cached object is: -# -# FRESH if expires < now, else STALE -# STALE if age > max -# FRESH if lm-factor < percent, else STALE -# FRESH if age < min -# else STALE -# -# The refresh_pattern lines are checked in the order listed here. -# The first entry which matches is used. If none of the entries -# match the default will be used. -# -# Note, you must uncomment all the default lines if you want -# to change one. The default setting is only active if none is -# used. -# -# - -# -# Add any of your own refresh_pattern entries above these. -# -refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 -refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 -refresh_pattern . 0 20% 4320 - -# TAG: quick_abort_min (KB) -#Default: -# quick_abort_min 16 KB - -# TAG: quick_abort_max (KB) -#Default: -# quick_abort_max 16 KB - -# TAG: quick_abort_pct (percent) -# The cache by default continues downloading aborted requests -# which are almost completed (less than 16 KB remaining). This -# may be undesirable on slow (e.g. SLIP) links and/or very busy -# caches. Impatient users may tie up file descriptors and -# bandwidth by repeatedly requesting and immediately aborting -# downloads. -# -# When the user aborts a request, Squid will check the -# quick_abort values to the amount of data transferred until -# then. -# -# If the transfer has less than 'quick_abort_min' KB remaining, -# it will finish the retrieval. -# -# If the transfer has more than 'quick_abort_max' KB remaining, -# it will abort the retrieval. -# -# If more than 'quick_abort_pct' of the transfer has completed, -# it will finish the retrieval. -# -# If you do not want any retrieval to continue after the client -# has aborted, set both 'quick_abort_min' and 'quick_abort_max' -# to '0 KB'. -# -# If you want retrievals to always continue if they are being -# cached set 'quick_abort_min' to '-1 KB'. -#Default: -# quick_abort_pct 95 - -# TAG: read_ahead_gap buffer-size -# The amount of data the cache will buffer ahead of what has been -# sent to the client when retrieving an object from another server. -#Default: -# read_ahead_gap 16 KB - -# TAG: negative_ttl time-units -# Set the Default Time-to-Live (TTL) for failed requests. -# Certain types of failures (such as "connection refused" and -# "404 Not Found") are able to be negatively-cached for a short time. -# Modern web servers should provide Expires: header, however if they -# do not this can provide a minimum TTL. -# The default is not to cache errors with unknown expiry details. -# -# Note that this is different from negative caching of DNS lookups. -# -# WARNING: Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which it -# causes. -#Default: -# negative_ttl 0 seconds - -# TAG: positive_dns_ttl time-units -# Upper limit on how long Squid will cache positive DNS responses. -# Default is 6 hours (360 minutes). This directive must be set -# larger than negative_dns_ttl. -#Default: -# positive_dns_ttl 6 hours - -# TAG: negative_dns_ttl time-units -# Time-to-Live (TTL) for negative caching of failed DNS lookups. -# This also sets the lower cache limit on positive lookups. -# Minimum value is 1 second, and it is not recommendable to go -# much below 10 seconds. -#Default: -# negative_dns_ttl 1 minutes - -# TAG: range_offset_limit size [acl acl...] -# usage: (size) [units] [[!]aclname] -# -# Sets an upper limit on how far (number of bytes) into the file -# a Range request may be to cause Squid to prefetch the whole file. -# If beyond this limit, Squid forwards the Range request as it is and -# the result is NOT cached. -# -# This is to stop a far ahead range request (lets say start at 17MB) -# from making Squid fetch the whole object up to that point before -# sending anything to the client. -# -# Multiple range_offset_limit lines may be specified, and they will -# be searched from top to bottom on each request until a match is found. -# The first match found will be used. If no line matches a request, the -# default limit of 0 bytes will be used. -# -# 'size' is the limit specified as a number of units. -# -# 'units' specifies whether to use bytes, KB, MB, etc. -# If no units are specified bytes are assumed. -# -# A size of 0 causes Squid to never fetch more than the -# client requested. (default) -# -# A size of 'none' causes Squid to always fetch the object from the -# beginning so it may cache the result. (2.0 style) -# -# 'aclname' is the name of a defined ACL. -# -# NP: Using 'none' as the byte value here will override any quick_abort settings -# that may otherwise apply to the range request. The range request will -# be fully fetched from start to finish regardless of the client -# actions. This affects bandwidth usage. -#Default: -# none - -# TAG: minimum_expiry_time (seconds) -# The minimum caching time according to (Expires - Date) -# headers Squid honors if the object can't be revalidated. -# The default is 60 seconds. -# -# In reverse proxy environments it might be desirable to honor -# shorter object lifetimes. It is most likely better to make -# your server return a meaningful Last-Modified header however. -# -# In ESI environments where page fragments often have short -# lifetimes, this will often be best set to 0. -#Default: -# minimum_expiry_time 60 seconds - -# TAG: store_avg_object_size (bytes) -# Average object size, used to estimate number of objects your -# cache can hold. The default is 13 KB. -# -# This is used to pre-seed the cache index memory allocation to -# reduce expensive reallocate operations while handling clients -# traffic. Too-large values may result in memory allocation during -# peak traffic, too-small values will result in wasted memory. -# -# Check the cache manager 'info' report metrics for the real -# object sizes seen by your Squid before tuning this. -#Default: -# store_avg_object_size 13 KB - -# TAG: store_objects_per_bucket -# Target number of objects per bucket in the store hash table. -# Lowering this value increases the total number of buckets and -# also the storage maintenance rate. The default is 20. -#Default: -# store_objects_per_bucket 20 - -# HTTP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: request_header_max_size (KB) -# This specifies the maximum size for HTTP headers in a request. -# Request headers are usually relatively small (about 512 bytes). -# Placing a limit on the request header size will catch certain -# bugs (for example with persistent connections) and possibly -# buffer-overflow or denial-of-service attacks. -#Default: -# request_header_max_size 64 KB - -# TAG: reply_header_max_size (KB) -# This specifies the maximum size for HTTP headers in a reply. -# Reply headers are usually relatively small (about 512 bytes). -# Placing a limit on the reply header size will catch certain -# bugs (for example with persistent connections) and possibly -# buffer-overflow or denial-of-service attacks. -#Default: -# reply_header_max_size 64 KB - -# TAG: request_body_max_size (bytes) -# This specifies the maximum size for an HTTP request body. -# In other words, the maximum size of a PUT/POST request. -# A user who attempts to send a request with a body larger -# than this limit receives an "Invalid Request" error message. -# If you set this parameter to a zero (the default), there will -# be no limit imposed. -# -# See also client_request_buffer_max_size for an alternative -# limitation on client uploads which can be configured. -#Default: -# No limit. - -# TAG: client_request_buffer_max_size (bytes) -# This specifies the maximum buffer size of a client request. -# It prevents squid eating too much memory when somebody uploads -# a large file. -#Default: -# client_request_buffer_max_size 512 KB - -# TAG: chunked_request_body_max_size (bytes) -# A broken or confused HTTP/1.1 client may send a chunked HTTP -# request to Squid. Squid does not have full support for that -# feature yet. To cope with such requests, Squid buffers the -# entire request and then dechunks request body to create a -# plain HTTP/1.0 request with a known content length. The plain -# request is then used by the rest of Squid code as usual. -# -# The option value specifies the maximum size of the buffer used -# to hold the request before the conversion. If the chunked -# request size exceeds the specified limit, the conversion -# fails, and the client receives an "unsupported request" error, -# as if dechunking was disabled. -# -# Dechunking is enabled by default. To disable conversion of -# chunked requests, set the maximum to zero. -# -# Request dechunking feature and this option in particular are a -# temporary hack. When chunking requests and responses are fully -# supported, there will be no need to buffer a chunked request. -#Default: -# chunked_request_body_max_size 64 KB - -# TAG: broken_posts -# A list of ACL elements which, if matched, causes Squid to send -# an extra CRLF pair after the body of a PUT/POST request. -# -# Some HTTP servers has broken implementations of PUT/POST, -# and rely on an extra CRLF pair sent by some WWW clients. -# -# Quote from RFC2616 section 4.1 on this matter: -# -# Note: certain buggy HTTP/1.0 client implementations generate an -# extra CRLF's after a POST request. To restate what is explicitly -# forbidden by the BNF, an HTTP/1.1 client must not preface or follow -# a request with an extra CRLF. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -#Example: -# acl buggy_server url_regex ^http://.... -# broken_posts allow buggy_server -#Default: -# Obey RFC 2616. - -# TAG: adaptation_uses_indirect_client on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap) -# -# Controls whether the indirect client IP address (instead of the direct -# client IP address) is passed to adaptation services. -# -# See also: follow_x_forwarded_for adaptation_send_client_ip -#Default: -# adaptation_uses_indirect_client on - -# TAG: via on|off -# If set (default), Squid will include a Via header in requests and -# replies as required by RFC2616. -#Default: -# via on - -# TAG: ie_refresh on|off -# Microsoft Internet Explorer up until version 5.5 Service -# Pack 1 has an issue with transparent proxies, wherein it -# is impossible to force a refresh. Turning this on provides -# a partial fix to the problem, by causing all IMS-REFRESH -# requests from older IE versions to check the origin server -# for fresh content. This reduces hit ratio by some amount -# (~10% in my experience), but allows users to actually get -# fresh content when they want it. Note because Squid -# cannot tell if the user is using 5.5 or 5.5SP1, the behavior -# of 5.5 is unchanged from old versions of Squid (i.e. a -# forced refresh is impossible). Newer versions of IE will, -# hopefully, continue to have the new behavior and will be -# handled based on that assumption. This option defaults to -# the old Squid behavior, which is better for hit ratios but -# worse for clients using IE, if they need to be able to -# force fresh content. -#Default: -# ie_refresh off - -# TAG: vary_ignore_expire on|off -# Many HTTP servers supporting Vary gives such objects -# immediate expiry time with no cache-control header -# when requested by a HTTP/1.0 client. This option -# enables Squid to ignore such expiry times until -# HTTP/1.1 is fully implemented. -# -# WARNING: If turned on this may eventually cause some -# varying objects not intended for caching to get cached. -#Default: -# vary_ignore_expire off - -# TAG: request_entities -# Squid defaults to deny GET and HEAD requests with request entities, -# as the meaning of such requests are undefined in the HTTP standard -# even if not explicitly forbidden. -# -# Set this directive to on if you have clients which insists -# on sending request entities in GET or HEAD requests. But be warned -# that there is server software (both proxies and web servers) which -# can fail to properly process this kind of request which may make you -# vulnerable to cache pollution attacks if enabled. -#Default: -# request_entities off - -# TAG: request_header_access -# Usage: request_header_access header_name allow|deny [!]aclname ... -# -# WARNING: Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which it -# causes. -# -# This option replaces the old 'anonymize_headers' and the -# older 'http_anonymizer' option with something that is much -# more configurable. A list of ACLs for each header name allows -# removal of specific header fields under specific conditions. -# -# This option only applies to outgoing HTTP request headers (i.e., -# headers sent by Squid to the next HTTP hop such as a cache peer -# or an origin server). The option has no effect during cache hit -# detection. The equivalent adaptation vectoring point in ICAP -# terminology is post-cache REQMOD. -# -# The option is applied to individual outgoing request header -# fields. For each request header field F, Squid uses the first -# qualifying sets of request_header_access rules: -# -# 1. Rules with header_name equal to F's name. -# 2. Rules with header_name 'Other', provided F's name is not -# on the hard-coded list of commonly used HTTP header names. -# 3. Rules with header_name 'All'. -# -# Within that qualifying rule set, rule ACLs are checked as usual. -# If ACLs of an "allow" rule match, the header field is allowed to -# go through as is. If ACLs of a "deny" rule match, the header is -# removed and request_header_replace is then checked to identify -# if the removed header has a replacement. If no rules within the -# set have matching ACLs, the header field is left as is. -# -# For example, to achieve the same behavior as the old -# 'http_anonymizer standard' option, you should use: -# -# request_header_access From deny all -# request_header_access Referer deny all -# request_header_access User-Agent deny all -# -# Or, to reproduce the old 'http_anonymizer paranoid' feature -# you should use: -# -# request_header_access Authorization allow all -# request_header_access Proxy-Authorization allow all -# request_header_access Cache-Control allow all -# request_header_access Content-Length allow all -# request_header_access Content-Type allow all -# request_header_access Date allow all -# request_header_access Host allow all -# request_header_access If-Modified-Since allow all -# request_header_access Pragma allow all -# request_header_access Accept allow all -# request_header_access Accept-Charset allow all -# request_header_access Accept-Encoding allow all -# request_header_access Accept-Language allow all -# request_header_access Connection allow all -# request_header_access All deny all -# -# HTTP reply headers are controlled with the reply_header_access directive. -# -# By default, all headers are allowed (no anonymizing is performed). -#Default: -# No limits. - -# TAG: reply_header_access -# Usage: reply_header_access header_name allow|deny [!]aclname ... -# -# WARNING: Doing this VIOLATES the HTTP standard. Enabling -# this feature could make you liable for problems which it -# causes. -# -# This option only applies to reply headers, i.e., from the -# server to the client. -# -# This is the same as request_header_access, but in the other -# direction. Please see request_header_access for detailed -# documentation. -# -# For example, to achieve the same behavior as the old -# 'http_anonymizer standard' option, you should use: -# -# reply_header_access Server deny all -# reply_header_access WWW-Authenticate deny all -# reply_header_access Link deny all -# -# Or, to reproduce the old 'http_anonymizer paranoid' feature -# you should use: -# -# reply_header_access Allow allow all -# reply_header_access WWW-Authenticate allow all -# reply_header_access Proxy-Authenticate allow all -# reply_header_access Cache-Control allow all -# reply_header_access Content-Encoding allow all -# reply_header_access Content-Length allow all -# reply_header_access Content-Type allow all -# reply_header_access Date allow all -# reply_header_access Expires allow all -# reply_header_access Last-Modified allow all -# reply_header_access Location allow all -# reply_header_access Pragma allow all -# reply_header_access Content-Language allow all -# reply_header_access Retry-After allow all -# reply_header_access Title allow all -# reply_header_access Content-Disposition allow all -# reply_header_access Connection allow all -# reply_header_access All deny all -# -# HTTP request headers are controlled with the request_header_access directive. -# -# By default, all headers are allowed (no anonymizing is -# performed). -#Default: -# No limits. - -# TAG: request_header_replace -# Usage: request_header_replace header_name message -# Example: request_header_replace User-Agent Nutscrape/1.0 (CP/M; 8-bit) -# -# This option allows you to change the contents of headers -# denied with request_header_access above, by replacing them -# with some fixed string. -# -# This only applies to request headers, not reply headers. -# -# By default, headers are removed if denied. -#Default: -# none - -# TAG: reply_header_replace -# Usage: reply_header_replace header_name message -# Example: reply_header_replace Server Foo/1.0 -# -# This option allows you to change the contents of headers -# denied with reply_header_access above, by replacing them -# with some fixed string. -# -# This only applies to reply headers, not request headers. -# -# By default, headers are removed if denied. -#Default: -# none - -# TAG: request_header_add -# Usage: request_header_add field-name field-value acl1 [acl2] ... -# Example: request_header_add X-Client-CA "CA=%ssl::>cert_issuer" all -# -# This option adds header fields to outgoing HTTP requests (i.e., -# request headers sent by Squid to the next HTTP hop such as a -# cache peer or an origin server). The option has no effect during -# cache hit detection. The equivalent adaptation vectoring point -# in ICAP terminology is post-cache REQMOD. -# -# Field-name is a token specifying an HTTP header name. If a -# standard HTTP header name is used, Squid does not check whether -# the new header conflicts with any existing headers or violates -# HTTP rules. If the request to be modified already contains a -# field with the same name, the old field is preserved but the -# header field values are not merged. -# -# Field-value is either a token or a quoted string. If quoted -# string format is used, then the surrounding quotes are removed -# while escape sequences and %macros are processed. -# -# In theory, all of the logformat codes can be used as %macros. -# However, unlike logging (which happens at the very end of -# transaction lifetime), the transaction may not yet have enough -# information to expand a macro when the new header value is needed. -# And some information may already be available to Squid but not yet -# committed where the macro expansion code can access it (report -# such instances!). The macro will be expanded into a single dash -# ('-') in such cases. Not all macros have been tested. -# -# One or more Squid ACLs may be specified to restrict header -# injection to matching requests. As always in squid.conf, all -# ACLs in an option ACL list must be satisfied for the insertion -# to happen. The request_header_add option supports fast ACLs -# only. -#Default: -# none - -# TAG: note -# This option used to log custom information about the master -# transaction. For example, an admin may configure Squid to log -# which "user group" the transaction belongs to, where "user group" -# will be determined based on a set of ACLs and not [just] -# authentication information. -# Values of key/value pairs can be logged using %{key}note macros: -# -# note key value acl ... -# logformat myFormat ... %{key}note ... -#Default: -# none - -# TAG: relaxed_header_parser on|off|warn -# In the default "on" setting Squid accepts certain forms -# of non-compliant HTTP messages where it is unambiguous -# what the sending application intended even if the message -# is not correctly formatted. The messages is then normalized -# to the correct form when forwarded by Squid. -# -# If set to "warn" then a warning will be emitted in cache.log -# each time such HTTP error is encountered. -# -# If set to "off" then such HTTP errors will cause the request -# or response to be rejected. -#Default: -# relaxed_header_parser on - -# TIMEOUTS -# ----------------------------------------------------------------------------- - -# TAG: forward_timeout time-units -# This parameter specifies how long Squid should at most attempt in -# finding a forwarding path for the request before giving up. -#Default: -# forward_timeout 4 minutes - -# TAG: connect_timeout time-units -# This parameter specifies how long to wait for the TCP connect to -# the requested server or peer to complete before Squid should -# attempt to find another path where to forward the request. -#Default: -# connect_timeout 1 minute - -# TAG: peer_connect_timeout time-units -# This parameter specifies how long to wait for a pending TCP -# connection to a peer cache. The default is 30 seconds. You -# may also set different timeout values for individual neighbors -# with the 'connect-timeout' option on a 'cache_peer' line. -#Default: -# peer_connect_timeout 30 seconds - -# TAG: read_timeout time-units -# The read_timeout is applied on server-side connections. After -# each successful read(), the timeout will be extended by this -# amount. If no data is read again after this amount of time, -# the request is aborted and logged with ERR_READ_TIMEOUT. The -# default is 15 minutes. -#Default: -# read_timeout 15 minutes - -# TAG: write_timeout time-units -# This timeout is tracked for all connections that have data -# available for writing and are waiting for the socket to become -# ready. After each successful write, the timeout is extended by -# the configured amount. If Squid has data to write but the -# connection is not ready for the configured duration, the -# transaction associated with the connection is terminated. The -# default is 15 minutes. -#Default: -# write_timeout 15 minutes - -# TAG: request_timeout -# How long to wait for complete HTTP request headers after initial -# connection establishment. -#Default: -# request_timeout 5 minutes - -# TAG: client_idle_pconn_timeout -# How long to wait for the next HTTP request on a persistent -# client connection after the previous request completes. -#Default: -# client_idle_pconn_timeout 2 minutes - -# TAG: client_lifetime time-units -# The maximum amount of time a client (browser) is allowed to -# remain connected to the cache process. This protects the Cache -# from having a lot of sockets (and hence file descriptors) tied up -# in a CLOSE_WAIT state from remote clients that go away without -# properly shutting down (either because of a network failure or -# because of a poor client implementation). The default is one -# day, 1440 minutes. -# -# NOTE: The default value is intended to be much larger than any -# client would ever need to be connected to your cache. You -# should probably change client_lifetime only as a last resort. -# If you seem to have many client connections tying up -# filedescriptors, we recommend first tuning the read_timeout, -# request_timeout, persistent_request_timeout and quick_abort values. -#Default: -# client_lifetime 1 day - -# TAG: half_closed_clients -# Some clients may shutdown the sending side of their TCP -# connections, while leaving their receiving sides open. Sometimes, -# Squid can not tell the difference between a half-closed and a -# fully-closed TCP connection. -# -# By default, Squid will immediately close client connections when -# read(2) returns "no more data to read." -# -# Change this option to 'on' and Squid will keep open connections -# until a read(2) or write(2) on the socket returns an error. -# This may show some benefits for reverse proxies. But if not -# it is recommended to leave OFF. -#Default: -# half_closed_clients off - -# TAG: server_idle_pconn_timeout -# Timeout for idle persistent connections to servers and other -# proxies. -#Default: -# server_idle_pconn_timeout 1 minute - -# TAG: ident_timeout -# Maximum time to wait for IDENT lookups to complete. -# -# If this is too high, and you enabled IDENT lookups from untrusted -# users, you might be susceptible to denial-of-service by having -# many ident requests going at once. -#Default: -# ident_timeout 10 seconds - -# TAG: shutdown_lifetime time-units -# When SIGTERM or SIGHUP is received, the cache is put into -# "shutdown pending" mode until all active sockets are closed. -# This value is the lifetime to set for all open descriptors -# during shutdown mode. Any active clients after this many -# seconds will receive a 'timeout' message. -#Default: -# shutdown_lifetime 30 seconds - -# ADMINISTRATIVE PARAMETERS -# ----------------------------------------------------------------------------- - -# TAG: cache_mgr -# Email-address of local cache manager who will receive -# mail if the cache dies. The default is "webmaster". -#Default: -# cache_mgr webmaster - -# TAG: mail_from -# From: email-address for mail sent when the cache dies. -# The default is to use 'squid@unique_hostname'. -# -# See also: unique_hostname directive. -#Default: -# none - -# TAG: mail_program -# Email program used to send mail if the cache dies. -# The default is "mail". The specified program must comply -# with the standard Unix mail syntax: -# mail-program recipient < mailfile -# -# Optional command line options can be specified. -#Default: -# mail_program mail - -# TAG: cache_effective_user -# If you start Squid as root, it will change its effective/real -# UID/GID to the user specified below. The default is to change -# to UID of nobody. -# see also; cache_effective_group -#Default: -# cache_effective_user nobody - -# TAG: cache_effective_group -# Squid sets the GID to the effective user's default group ID -# (taken from the password file) and supplementary group list -# from the groups membership. -# -# If you want Squid to run with a specific GID regardless of -# the group memberships of the effective user then set this -# to the group (or GID) you want Squid to run as. When set -# all other group privileges of the effective user are ignored -# and only this GID is effective. If Squid is not started as -# root the user starting Squid MUST be member of the specified -# group. -# -# This option is not recommended by the Squid Team. -# Our preference is for administrators to configure a secure -# user account for squid with UID/GID matching system policies. -#Default: -# Use system group memberships of the cache_effective_user account - -# TAG: httpd_suppress_version_string on|off -# Suppress Squid version string info in HTTP headers and HTML error pages. -#Default: -# httpd_suppress_version_string off - -# TAG: visible_hostname -# If you want to present a special hostname in error messages, etc, -# define this. Otherwise, the return value of gethostname() -# will be used. If you have multiple caches in a cluster and -# get errors about IP-forwarding you must set them to have individual -# names with this setting. -#Default: -# Automatically detect the system host name - -# TAG: unique_hostname -# If you want to have multiple machines with the same -# 'visible_hostname' you must give each machine a different -# 'unique_hostname' so forwarding loops can be detected. -#Default: -# Copy the value from visible_hostname - -# TAG: hostname_aliases -# A list of other DNS names your cache has. -#Default: -# none - -# TAG: umask -# Minimum umask which should be enforced while the proxy -# is running, in addition to the umask set at startup. -# -# For a traditional octal representation of umasks, start -# your value with 0. -#Default: -# umask 027 - -# OPTIONS FOR THE CACHE REGISTRATION SERVICE -# ----------------------------------------------------------------------------- -# -# This section contains parameters for the (optional) cache -# announcement service. This service is provided to help -# cache administrators locate one another in order to join or -# create cache hierarchies. -# -# An 'announcement' message is sent (via UDP) to the registration -# service by Squid. By default, the announcement message is NOT -# SENT unless you enable it with 'announce_period' below. -# -# The announcement message includes your hostname, plus the -# following information from this configuration file: -# -# http_port -# icp_port -# cache_mgr -# -# All current information is processed regularly and made -# available on the Web at http://www.ircache.net/Cache/Tracker/. - -# TAG: announce_period -# This is how frequently to send cache announcements. -# -# To enable announcing your cache, just set an announce period. -# -# Example: -# announce_period 1 day -#Default: -# Announcement messages disabled. - -# TAG: announce_host -# Set the hostname where announce registration messages will be sent. -# -# See also announce_port and announce_file -#Default: -# announce_host tracker.ircache.net - -# TAG: announce_file -# The contents of this file will be included in the announce -# registration messages. -#Default: -# none - -# TAG: announce_port -# Set the port where announce registration messages will be sent. -# -# See also announce_host and announce_file -#Default: -# announce_port 3131 - -# HTTPD-ACCELERATOR OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: httpd_accel_surrogate_id -# Surrogates (http://www.esi.org/architecture_spec_1.0.html) -# need an identification token to allow control targeting. Because -# a farm of surrogates may all perform the same tasks, they may share -# an identification token. -#Default: -# visible_hostname is used if no specific ID is set. - -# TAG: http_accel_surrogate_remote on|off -# Remote surrogates (such as those in a CDN) honour the header -# "Surrogate-Control: no-store-remote". -# -# Set this to on to have squid behave as a remote surrogate. -#Default: -# http_accel_surrogate_remote off - -# TAG: esi_parser libxml2|expat|custom -# Note: This option is only available if Squid is rebuilt with the -# --enable-esi -# -# ESI markup is not strictly XML compatible. The custom ESI parser -# will give higher performance, but cannot handle non ASCII character -# encodings. -#Default: -# esi_parser custom - -# DELAY POOL PARAMETERS -# ----------------------------------------------------------------------------- - -# TAG: delay_pools -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This represents the number of delay pools to be used. For example, -# if you have one class 2 delay pool and one class 3 delays pool, you -# have a total of 2 delay pools. -# -# See also delay_parameters, delay_class, delay_access for pool -# configuration details. -#Default: -# delay_pools 0 - -# TAG: delay_class -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This defines the class of each delay pool. There must be exactly one -# delay_class line for each delay pool. For example, to define two -# delay pools, one of class 2 and one of class 3, the settings above -# and here would be: -# -# Example: -# delay_pools 4 # 4 delay pools -# delay_class 1 2 # pool 1 is a class 2 pool -# delay_class 2 3 # pool 2 is a class 3 pool -# delay_class 3 4 # pool 3 is a class 4 pool -# delay_class 4 5 # pool 4 is a class 5 pool -# -# The delay pool classes are: -# -# class 1 Everything is limited by a single aggregate -# bucket. -# -# class 2 Everything is limited by a single aggregate -# bucket as well as an "individual" bucket chosen -# from bits 25 through 32 of the IPv4 address. -# -# class 3 Everything is limited by a single aggregate -# bucket as well as a "network" bucket chosen -# from bits 17 through 24 of the IP address and a -# "individual" bucket chosen from bits 17 through -# 32 of the IPv4 address. -# -# class 4 Everything in a class 3 delay pool, with an -# additional limit on a per user basis. This -# only takes effect if the username is established -# in advance - by forcing authentication in your -# http_access rules. -# -# class 5 Requests are grouped according their tag (see -# external_acl's tag= reply). -# -# -# Each pool also requires a delay_parameters directive to configure the pool size -# and speed limits used whenever the pool is applied to a request. Along with -# a set of delay_access directives to determine when it is used. -# -# NOTE: If an IP address is a.b.c.d -# -> bits 25 through 32 are "d" -# -> bits 17 through 24 are "c" -# -> bits 17 through 32 are "c * 256 + d" -# -# NOTE-2: Due to the use of bitmasks in class 2,3,4 pools they only apply to -# IPv4 traffic. Class 1 and 5 pools may be used with IPv6 traffic. -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -# See also delay_parameters and delay_access. -#Default: -# none - -# TAG: delay_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This is used to determine which delay pool a request falls into. -# -# delay_access is sorted per pool and the matching starts with pool 1, -# then pool 2, ..., and finally pool N. The first delay pool where the -# request is allowed is selected for the request. If it does not allow -# the request to any pool then the request is not delayed (default). -# -# For example, if you want some_big_clients in delay -# pool 1 and lotsa_little_clients in delay pool 2: -# -# delay_access 1 allow some_big_clients -# delay_access 1 deny all -# delay_access 2 allow lotsa_little_clients -# delay_access 2 deny all -# delay_access 3 allow authenticated_clients -# -# See also delay_parameters and delay_class. -# -#Default: -# Deny using the pool, unless allow rules exist in squid.conf for the pool. - -# TAG: delay_parameters -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This defines the parameters for a delay pool. Each delay pool has -# a number of "buckets" associated with it, as explained in the -# description of delay_class. -# -# For a class 1 delay pool, the syntax is: -# delay_pools pool 1 -# delay_parameters pool aggregate -# -# For a class 2 delay pool: -# delay_pools pool 2 -# delay_parameters pool aggregate individual -# -# For a class 3 delay pool: -# delay_pools pool 3 -# delay_parameters pool aggregate network individual -# -# For a class 4 delay pool: -# delay_pools pool 4 -# delay_parameters pool aggregate network individual user -# -# For a class 5 delay pool: -# delay_pools pool 5 -# delay_parameters pool tagrate -# -# The option variables are: -# -# pool a pool number - ie, a number between 1 and the -# number specified in delay_pools as used in -# delay_class lines. -# -# aggregate the speed limit parameters for the aggregate bucket -# (class 1, 2, 3). -# -# individual the speed limit parameters for the individual -# buckets (class 2, 3). -# -# network the speed limit parameters for the network buckets -# (class 3). -# -# user the speed limit parameters for the user buckets -# (class 4). -# -# tagrate the speed limit parameters for the tag buckets -# (class 5). -# -# A pair of delay parameters is written restore/maximum, where restore is -# the number of bytes (not bits - modem and network speeds are usually -# quoted in bits) per second placed into the bucket, and maximum is the -# maximum number of bytes which can be in the bucket at any time. -# -# There must be one delay_parameters line for each delay pool. -# -# -# For example, if delay pool number 1 is a class 2 delay pool as in the -# above example, and is being used to strictly limit each host to 64Kbit/sec -# (plus overheads), with no overall limit, the line is: -# -# delay_parameters 1 -1/-1 8000/8000 -# -# Note that 8 x 8000 KByte/sec -> 64Kbit/sec. -# -# Note that the figure -1 is used to represent "unlimited". -# -# -# And, if delay pool number 2 is a class 3 delay pool as in the above -# example, and you want to limit it to a total of 256Kbit/sec (strict limit) -# with each 8-bit network permitted 64Kbit/sec (strict limit) and each -# individual host permitted 4800bit/sec with a bucket maximum size of 64Kbits -# to permit a decent web page to be downloaded at a decent speed -# (if the network is not being limited due to overuse) but slow down -# large downloads more significantly: -# -# delay_parameters 2 32000/32000 8000/8000 600/8000 -# -# Note that 8 x 32000 KByte/sec -> 256Kbit/sec. -# 8 x 8000 KByte/sec -> 64Kbit/sec. -# 8 x 600 Byte/sec -> 4800bit/sec. -# -# -# Finally, for a class 4 delay pool as in the example - each user will -# be limited to 128Kbits/sec no matter how many workstations they are logged into.: -# -# delay_parameters 4 32000/32000 8000/8000 600/64000 16000/16000 -# -# -# See also delay_class and delay_access. -# -#Default: -# none - -# TAG: delay_initial_bucket_level (percent, 0-100) -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# The initial bucket percentage is used to determine how much is put -# in each bucket when squid starts, is reconfigured, or first notices -# a host accessing it (in class 2 and class 3, individual hosts and -# networks only have buckets associated with them once they have been -# "seen" by squid). -#Default: -# delay_initial_bucket_level 50 - -# CLIENT DELAY POOL PARAMETERS -# ----------------------------------------------------------------------------- - -# TAG: client_delay_pools -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This option specifies the number of client delay pools used. It must -# preceed other client_delay_* options. -# -# Example: -# client_delay_pools 2 -# -# See also client_delay_parameters and client_delay_access. -#Default: -# client_delay_pools 0 - -# TAG: client_delay_initial_bucket_level (percent, 0-no_limit) -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This option determines the initial bucket size as a percentage of -# max_bucket_size from client_delay_parameters. Buckets are created -# at the time of the "first" connection from the matching IP. Idle -# buckets are periodically deleted up. -# -# You can specify more than 100 percent but note that such "oversized" -# buckets are not refilled until their size goes down to max_bucket_size -# from client_delay_parameters. -# -# Example: -# client_delay_initial_bucket_level 50 -#Default: -# client_delay_initial_bucket_level 50 - -# TAG: client_delay_parameters -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# -# This option configures client-side bandwidth limits using the -# following format: -# -# client_delay_parameters pool speed_limit max_bucket_size -# -# pool is an integer ID used for client_delay_access matching. -# -# speed_limit is bytes added to the bucket per second. -# -# max_bucket_size is the maximum size of a bucket, enforced after any -# speed_limit additions. -# -# Please see the delay_parameters option for more information and -# examples. -# -# Example: -# client_delay_parameters 1 1024 2048 -# client_delay_parameters 2 51200 16384 -# -# See also client_delay_access. -# -#Default: -# none - -# TAG: client_delay_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-delay-pools -# -# This option determines the client-side delay pool for the -# request: -# -# client_delay_access pool_ID allow|deny acl_name -# -# All client_delay_access options are checked in their pool ID -# order, starting with pool 1. The first checked pool with allowed -# request is selected for the request. If no ACL matches or there -# are no client_delay_access options, the request bandwidth is not -# limited. -# -# The ACL-selected pool is then used to find the -# client_delay_parameters for the request. Client-side pools are -# not used to aggregate clients. Clients are always aggregated -# based on their source IP addresses (one bucket per source IP). -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# Additionally, only the client TCP connection details are available. -# ACLs testing HTTP properties will not work. -# -# Please see delay_access for more examples. -# -# Example: -# client_delay_access 1 allow low_rate_network -# client_delay_access 2 allow vips_network -# -# -# See also client_delay_parameters and client_delay_pools. -#Default: -# Deny use of the pool, unless allow rules exist in squid.conf for the pool. - -# WCCPv1 AND WCCPv2 CONFIGURATION OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: wccp_router -# Use this option to define your WCCP ``home'' router for -# Squid. -# -# wccp_router supports a single WCCP(v1) router -# -# wccp2_router supports multiple WCCPv2 routers -# -# only one of the two may be used at the same time and defines -# which version of WCCP to use. -#Default: -# WCCP disabled. - -# TAG: wccp2_router -# Use this option to define your WCCP ``home'' router for -# Squid. -# -# wccp_router supports a single WCCP(v1) router -# -# wccp2_router supports multiple WCCPv2 routers -# -# only one of the two may be used at the same time and defines -# which version of WCCP to use. -#Default: -# WCCPv2 disabled. - -# TAG: wccp_version -# This directive is only relevant if you need to set up WCCP(v1) -# to some very old and end-of-life Cisco routers. In all other -# setups it must be left unset or at the default setting. -# It defines an internal version in the WCCP(v1) protocol, -# with version 4 being the officially documented protocol. -# -# According to some users, Cisco IOS 11.2 and earlier only -# support WCCP version 3. If you're using that or an earlier -# version of IOS, you may need to change this value to 3, otherwise -# do not specify this parameter. -#Default: -# wccp_version 4 - -# TAG: wccp2_rebuild_wait -# If this is enabled Squid will wait for the cache dir rebuild to finish -# before sending the first wccp2 HereIAm packet -#Default: -# wccp2_rebuild_wait on - -# TAG: wccp2_forwarding_method -# WCCP2 allows the setting of forwarding methods between the -# router/switch and the cache. Valid values are as follows: -# -# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel) -# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting) -# -# Currently (as of IOS 12.4) cisco routers only support GRE. -# Cisco switches only support the L2 redirect assignment method. -#Default: -# wccp2_forwarding_method gre - -# TAG: wccp2_return_method -# WCCP2 allows the setting of return methods between the -# router/switch and the cache for packets that the cache -# decides not to handle. Valid values are as follows: -# -# gre - GRE encapsulation (forward the packet in a GRE/WCCP tunnel) -# l2 - L2 redirect (forward the packet using Layer 2/MAC rewriting) -# -# Currently (as of IOS 12.4) cisco routers only support GRE. -# Cisco switches only support the L2 redirect assignment. -# -# If the "ip wccp redirect exclude in" command has been -# enabled on the cache interface, then it is still safe for -# the proxy server to use a l2 redirect method even if this -# option is set to GRE. -#Default: -# wccp2_return_method gre - -# TAG: wccp2_assignment_method -# WCCP2 allows the setting of methods to assign the WCCP hash -# Valid values are as follows: -# -# hash - Hash assignment -# mask - Mask assignment -# -# As a general rule, cisco routers support the hash assignment method -# and cisco switches support the mask assignment method. -#Default: -# wccp2_assignment_method hash - -# TAG: wccp2_service -# WCCP2 allows for multiple traffic services. There are two -# types: "standard" and "dynamic". The standard type defines -# one service id - http (id 0). The dynamic service ids can be from -# 51 to 255 inclusive. In order to use a dynamic service id -# one must define the type of traffic to be redirected; this is done -# using the wccp2_service_info option. -# -# The "standard" type does not require a wccp2_service_info option, -# just specifying the service id will suffice. -# -# MD5 service authentication can be enabled by adding -# "password=<password>" to the end of this service declaration. -# -# Examples: -# -# wccp2_service standard 0 # for the 'web-cache' standard service -# wccp2_service dynamic 80 # a dynamic service type which will be -# # fleshed out with subsequent options. -# wccp2_service standard 0 password=foo -#Default: -# Use the 'web-cache' standard service. - -# TAG: wccp2_service_info -# Dynamic WCCPv2 services require further information to define the -# traffic you wish to have diverted. -# -# The format is: -# -# wccp2_service_info <id> protocol=<protocol> flags=<flag>,<flag>.. -# priority=<priority> ports=<port>,<port>.. -# -# The relevant WCCPv2 flags: -# + src_ip_hash, dst_ip_hash -# + source_port_hash, dst_port_hash -# + src_ip_alt_hash, dst_ip_alt_hash -# + src_port_alt_hash, dst_port_alt_hash -# + ports_source -# -# The port list can be one to eight entries. -# -# Example: -# -# wccp2_service_info 80 protocol=tcp flags=src_ip_hash,ports_source -# priority=240 ports=80 -# -# Note: the service id must have been defined by a previous -# 'wccp2_service dynamic <id>' entry. -#Default: -# none - -# TAG: wccp2_weight -# Each cache server gets assigned a set of the destination -# hash proportional to their weight. -#Default: -# wccp2_weight 10000 - -# TAG: wccp_address -# Use this option if you require WCCPv2 to use a specific -# interface address. -# -# The default behavior is to not bind to any specific address. -#Default: -# Address selected by the operating system. - -# TAG: wccp2_address -# Use this option if you require WCCP to use a specific -# interface address. -# -# The default behavior is to not bind to any specific address. -#Default: -# Address selected by the operating system. - -# PERSISTENT CONNECTION HANDLING -# ----------------------------------------------------------------------------- -# -# Also see "pconn_timeout" in the TIMEOUTS section - -# TAG: client_persistent_connections -# Persistent connection support for clients. -# Squid uses persistent connections (when allowed). You can use -# this option to disable persistent connections with clients. -#Default: -# client_persistent_connections on - -# TAG: server_persistent_connections -# Persistent connection support for servers. -# Squid uses persistent connections (when allowed). You can use -# this option to disable persistent connections with servers. -#Default: -# server_persistent_connections on - -# TAG: persistent_connection_after_error -# With this directive the use of persistent connections after -# HTTP errors can be disabled. Useful if you have clients -# who fail to handle errors on persistent connections proper. -#Default: -# persistent_connection_after_error on - -# TAG: detect_broken_pconn -# Some servers have been found to incorrectly signal the use -# of HTTP/1.0 persistent connections even on replies not -# compatible, causing significant delays. This server problem -# has mostly been seen on redirects. -# -# By enabling this directive Squid attempts to detect such -# broken replies and automatically assume the reply is finished -# after 10 seconds timeout. -#Default: -# detect_broken_pconn off - -# CACHE DIGEST OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: digest_generation -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This controls whether the server will generate a Cache Digest -# of its contents. By default, Cache Digest generation is -# enabled if Squid is compiled with --enable-cache-digests defined. -#Default: -# digest_generation on - -# TAG: digest_bits_per_entry -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the number of bits of the server's Cache Digest which -# will be associated with the Digest entry for a given HTTP -# Method and URL (public key) combination. The default is 5. -#Default: -# digest_bits_per_entry 5 - -# TAG: digest_rebuild_period (seconds) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the wait time between Cache Digest rebuilds. -#Default: -# digest_rebuild_period 1 hour - -# TAG: digest_rewrite_period (seconds) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the wait time between Cache Digest writes to -# disk. -#Default: -# digest_rewrite_period 1 hour - -# TAG: digest_swapout_chunk_size (bytes) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the number of bytes of the Cache Digest to write to -# disk at a time. It defaults to 4096 bytes (4KB), the Squid -# default swap page. -#Default: -# digest_swapout_chunk_size 4096 bytes - -# TAG: digest_rebuild_chunk_percentage (percent, 0-100) -# Note: This option is only available if Squid is rebuilt with the -# --enable-cache-digests -# -# This is the percentage of the Cache Digest to be scanned at a -# time. By default it is set to 10% of the Cache Digest. -#Default: -# digest_rebuild_chunk_percentage 10 - -# SNMP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: snmp_port -# The port number where Squid listens for SNMP requests. To enable -# SNMP support set this to a suitable port number. Port number -# 3401 is often used for the Squid SNMP agent. By default it's -# set to "0" (disabled) -# -# Example: -# snmp_port 3401 -#Default: -# SNMP disabled. - -# TAG: snmp_access -# Allowing or denying access to the SNMP port. -# -# All access to the agent is denied by default. -# usage: -# -# snmp_access allow|deny [!]aclname ... -# -# This clause only supports fast acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -# -#Example: -# snmp_access allow snmppublic localhost -# snmp_access deny all -#Default: -# Deny, unless rules exist in squid.conf. - -# TAG: snmp_incoming_address -# Just like 'udp_incoming_address', but for the SNMP port. -# -# snmp_incoming_address is used for the SNMP socket receiving -# messages from SNMP agents. -# -# The default snmp_incoming_address is to listen on all -# available network interfaces. -#Default: -# Accept SNMP packets from all machine interfaces. - -# TAG: snmp_outgoing_address -# Just like 'udp_outgoing_address', but for the SNMP port. -# -# snmp_outgoing_address is used for SNMP packets returned to SNMP -# agents. -# -# If snmp_outgoing_address is not set it will use the same socket -# as snmp_incoming_address. Only change this if you want to have -# SNMP replies sent using another address than where this Squid -# listens for SNMP queries. -# -# NOTE, snmp_incoming_address and snmp_outgoing_address can not have -# the same value since they both use the same port. -#Default: -# Use snmp_incoming_address or an address selected by the operating system. - -# ICP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: icp_port -# The port number where Squid sends and receives ICP queries to -# and from neighbor caches. The standard UDP port for ICP is 3130. -# -# Example: -# icp_port 3130 -#Default: -# ICP disabled. - -# TAG: htcp_port -# The port number where Squid sends and receives HTCP queries to -# and from neighbor caches. To turn it on you want to set it to -# 4827. -# -# Example: -# htcp_port 4827 -#Default: -# HTCP disabled. - -# TAG: log_icp_queries on|off -# If set, ICP queries are logged to access.log. You may wish -# do disable this if your ICP load is VERY high to speed things -# up or to simplify log analysis. -#Default: -# log_icp_queries on - -# TAG: udp_incoming_address -# udp_incoming_address is used for UDP packets received from other -# caches. -# -# The default behavior is to not bind to any specific address. -# -# Only change this if you want to have all UDP queries received on -# a specific interface/address. -# -# NOTE: udp_incoming_address is used by the ICP, HTCP, and DNS -# modules. Altering it will affect all of them in the same manner. -# -# see also; udp_outgoing_address -# -# NOTE, udp_incoming_address and udp_outgoing_address can not -# have the same value since they both use the same port. -#Default: -# Accept packets from all machine interfaces. - -# TAG: udp_outgoing_address -# udp_outgoing_address is used for UDP packets sent out to other -# caches. -# -# The default behavior is to not bind to any specific address. -# -# Instead it will use the same socket as udp_incoming_address. -# Only change this if you want to have UDP queries sent using another -# address than where this Squid listens for UDP queries from other -# caches. -# -# NOTE: udp_outgoing_address is used by the ICP, HTCP, and DNS -# modules. Altering it will affect all of them in the same manner. -# -# see also; udp_incoming_address -# -# NOTE, udp_incoming_address and udp_outgoing_address can not -# have the same value since they both use the same port. -#Default: -# Use udp_incoming_address or an address selected by the operating system. - -# TAG: icp_hit_stale on|off -# If you want to return ICP_HIT for stale cache objects, set this -# option to 'on'. If you have sibling relationships with caches -# in other administrative domains, this should be 'off'. If you only -# have sibling relationships with caches under your control, -# it is probably okay to set this to 'on'. -# If set to 'on', your siblings should use the option "allow-miss" -# on their cache_peer lines for connecting to you. -#Default: -# icp_hit_stale off - -# TAG: minimum_direct_hops -# If using the ICMP pinging stuff, do direct fetches for sites -# which are no more than this many hops away. -#Default: -# minimum_direct_hops 4 - -# TAG: minimum_direct_rtt (msec) -# If using the ICMP pinging stuff, do direct fetches for sites -# which are no more than this many rtt milliseconds away. -#Default: -# minimum_direct_rtt 400 - -# TAG: netdb_low -# The low water mark for the ICMP measurement database. -# -# Note: high watermark controlled by netdb_high directive. -# -# These watermarks are counts, not percents. The defaults are -# (low) 900 and (high) 1000. When the high water mark is -# reached, database entries will be deleted until the low -# mark is reached. -#Default: -# netdb_low 900 - -# TAG: netdb_high -# The high water mark for the ICMP measurement database. -# -# Note: low watermark controlled by netdb_low directive. -# -# These watermarks are counts, not percents. The defaults are -# (low) 900 and (high) 1000. When the high water mark is -# reached, database entries will be deleted until the low -# mark is reached. -#Default: -# netdb_high 1000 - -# TAG: netdb_ping_period -# The minimum period for measuring a site. There will be at -# least this much delay between successive pings to the same -# network. The default is five minutes. -#Default: -# netdb_ping_period 5 minutes - -# TAG: query_icmp on|off -# If you want to ask your peers to include ICMP data in their ICP -# replies, enable this option. -# -# If your peer has configured Squid (during compilation) with -# '--enable-icmp' that peer will send ICMP pings to origin server -# sites of the URLs it receives. If you enable this option the -# ICP replies from that peer will include the ICMP data (if available). -# Then, when choosing a parent cache, Squid will choose the parent with -# the minimal RTT to the origin server. When this happens, the -# hierarchy field of the access.log will be -# "CLOSEST_PARENT_MISS". This option is off by default. -#Default: -# query_icmp off - -# TAG: test_reachability on|off -# When this is 'on', ICP MISS replies will be ICP_MISS_NOFETCH -# instead of ICP_MISS if the target host is NOT in the ICMP -# database, or has a zero RTT. -#Default: -# test_reachability off - -# TAG: icp_query_timeout (msec) -# Normally Squid will automatically determine an optimal ICP -# query timeout value based on the round-trip-time of recent ICP -# queries. If you want to override the value determined by -# Squid, set this 'icp_query_timeout' to a non-zero value. This -# value is specified in MILLISECONDS, so, to use a 2-second -# timeout (the old default), you would write: -# -# icp_query_timeout 2000 -#Default: -# Dynamic detection. - -# TAG: maximum_icp_query_timeout (msec) -# Normally the ICP query timeout is determined dynamically. But -# sometimes it can lead to very large values (say 5 seconds). -# Use this option to put an upper limit on the dynamic timeout -# value. Do NOT use this option to always use a fixed (instead -# of a dynamic) timeout value. To set a fixed timeout see the -# 'icp_query_timeout' directive. -#Default: -# maximum_icp_query_timeout 2000 - -# TAG: minimum_icp_query_timeout (msec) -# Normally the ICP query timeout is determined dynamically. But -# sometimes it can lead to very small timeouts, even lower than -# the normal latency variance on your link due to traffic. -# Use this option to put an lower limit on the dynamic timeout -# value. Do NOT use this option to always use a fixed (instead -# of a dynamic) timeout value. To set a fixed timeout see the -# 'icp_query_timeout' directive. -#Default: -# minimum_icp_query_timeout 5 - -# TAG: background_ping_rate time-units -# Controls how often the ICP pings are sent to siblings that -# have background-ping set. -#Default: -# background_ping_rate 10 seconds - -# MULTICAST ICP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: mcast_groups -# This tag specifies a list of multicast groups which your server -# should join to receive multicasted ICP queries. -# -# NOTE! Be very careful what you put here! Be sure you -# understand the difference between an ICP _query_ and an ICP -# _reply_. This option is to be set only if you want to RECEIVE -# multicast queries. Do NOT set this option to SEND multicast -# ICP (use cache_peer for that). ICP replies are always sent via -# unicast, so this option does not affect whether or not you will -# receive replies from multicast group members. -# -# You must be very careful to NOT use a multicast address which -# is already in use by another group of caches. -# -# If you are unsure about multicast, please read the Multicast -# chapter in the Squid FAQ (http://www.squid-cache.org/FAQ/). -# -# Usage: mcast_groups 239.128.16.128 224.0.1.20 -# -# By default, Squid doesn't listen on any multicast groups. -#Default: -# none - -# TAG: mcast_miss_addr -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# If you enable this option, every "cache miss" URL will -# be sent out on the specified multicast address. -# -# Do not enable this option unless you are are absolutely -# certain you understand what you are doing. -#Default: -# disabled. - -# TAG: mcast_miss_ttl -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# This is the time-to-live value for packets multicasted -# when multicasting off cache miss URLs is enabled. By -# default this is set to 'site scope', i.e. 16. -#Default: -# mcast_miss_ttl 16 - -# TAG: mcast_miss_port -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# This is the port number to be used in conjunction with -# 'mcast_miss_addr'. -#Default: -# mcast_miss_port 3135 - -# TAG: mcast_miss_encode_key -# Note: This option is only available if Squid is rebuilt with the -# -DMULTICAST_MISS_STREAM define -# -# The URLs that are sent in the multicast miss stream are -# encrypted. This is the encryption key. -#Default: -# mcast_miss_encode_key XXXXXXXXXXXXXXXX - -# TAG: mcast_icp_query_timeout (msec) -# For multicast peers, Squid regularly sends out ICP "probes" to -# count how many other peers are listening on the given multicast -# address. This value specifies how long Squid should wait to -# count all the replies. The default is 2000 msec, or 2 -# seconds. -#Default: -# mcast_icp_query_timeout 2000 - -# INTERNAL ICON OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: icon_directory -# Where the icons are stored. These are normally kept in -# /usr/share/squid/icons -#Default: -# icon_directory /usr/share/squid/icons - -# TAG: global_internal_static -# This directive controls is Squid should intercept all requests for -# /squid-internal-static/ no matter which host the URL is requesting -# (default on setting), or if nothing special should be done for -# such URLs (off setting). The purpose of this directive is to make -# icons etc work better in complex cache hierarchies where it may -# not always be possible for all corners in the cache mesh to reach -# the server generating a directory listing. -#Default: -# global_internal_static on - -# TAG: short_icon_urls -# If this is enabled Squid will use short URLs for icons. -# If disabled it will revert to the old behavior of including -# it's own name and port in the URL. -# -# If you run a complex cache hierarchy with a mix of Squid and -# other proxies you may need to disable this directive. -#Default: -# short_icon_urls on - -# ERROR PAGE OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: error_directory -# If you wish to create your own versions of the default -# error files to customize them to suit your company copy -# the error/template files to another directory and point -# this tag at them. -# -# WARNING: This option will disable multi-language support -# on error pages if used. -# -# The squid developers are interested in making squid available in -# a wide variety of languages. If you are making translations for a -# language that Squid does not currently provide please consider -# contributing your translation back to the project. -# http://wiki.squid-cache.org/Translations -# -# The squid developers working on translations are happy to supply drop-in -# translated error files in exchange for any new language contributions. -#Default: -# Send error pages in the clients preferred language - -# TAG: error_default_language -# Set the default language which squid will send error pages in -# if no existing translation matches the clients language -# preferences. -# -# If unset (default) generic English will be used. -# -# The squid developers are interested in making squid available in -# a wide variety of languages. If you are interested in making -# translations for any language see the squid wiki for details. -# http://wiki.squid-cache.org/Translations -#Default: -# Generate English language pages. - -# TAG: error_log_languages -# Log to cache.log what languages users are attempting to -# auto-negotiate for translations. -# -# Successful negotiations are not logged. Only failures -# have meaning to indicate that Squid may need an upgrade -# of its error page translations. -#Default: -# error_log_languages on - -# TAG: err_page_stylesheet -# CSS Stylesheet to pattern the display of Squid default error pages. -# -# For information on CSS see http://www.w3.org/Style/CSS/ -#Default: -# err_page_stylesheet /etc/squid/errorpage.css - -# TAG: err_html_text -# HTML text to include in error messages. Make this a "mailto" -# URL to your admin address, or maybe just a link to your -# organizations Web page. -# -# To include this in your error messages, you must rewrite -# the error template files (found in the "errors" directory). -# Wherever you want the 'err_html_text' line to appear, -# insert a %L tag in the error template file. -#Default: -# none - -# TAG: email_err_data on|off -# If enabled, information about the occurred error will be -# included in the mailto links of the ERR pages (if %W is set) -# so that the email body contains the data. -# Syntax is <A HREF="mailto:%w%W">%w</A> -#Default: -# email_err_data on - -# TAG: deny_info -# Usage: deny_info err_page_name acl -# or deny_info http://... acl -# or deny_info TCP_RESET acl -# -# This can be used to return a ERR_ page for requests which -# do not pass the 'http_access' rules. Squid remembers the last -# acl it evaluated in http_access, and if a 'deny_info' line exists -# for that ACL Squid returns a corresponding error page. -# -# The acl is typically the last acl on the http_access deny line which -# denied access. The exceptions to this rule are: -# - When Squid needs to request authentication credentials. It's then -# the first authentication related acl encountered -# - When none of the http_access lines matches. It's then the last -# acl processed on the last http_access line. -# - When the decision to deny access was made by an adaptation service, -# the acl name is the corresponding eCAP or ICAP service_name. -# -# NP: If providing your own custom error pages with error_directory -# you may also specify them by your custom file name: -# Example: deny_info ERR_CUSTOM_ACCESS_DENIED bad_guys -# -# By defaut Squid will send "403 Forbidden". A different 4xx or 5xx -# may be specified by prefixing the file name with the code and a colon. -# e.g. 404:ERR_CUSTOM_ACCESS_DENIED -# -# Alternatively you can tell Squid to reset the TCP connection -# by specifying TCP_RESET. -# -# Or you can specify an error URL or URL pattern. The browsers will -# get redirected to the specified URL after formatting tags have -# been replaced. Redirect will be done with 302 or 307 according to -# HTTP/1.1 specs. A different 3xx code may be specified by prefixing -# the URL. e.g. 303:http://example.com/ -# -# URL FORMAT TAGS: -# %a - username (if available. Password NOT included) -# %B - FTP path URL -# %e - Error number -# %E - Error description -# %h - Squid hostname -# %H - Request domain name -# %i - Client IP Address -# %M - Request Method -# %o - Message result from external ACL helper -# %p - Request Port number -# %P - Request Protocol name -# %R - Request URL path -# %T - Timestamp in RFC 1123 format -# %U - Full canonical URL from client -# (HTTPS URLs terminate with *) -# %u - Full canonical URL from client -# %w - Admin email from squid.conf -# %x - Error name -# %% - Literal percent (%) code -# -#Default: -# none - -# OPTIONS INFLUENCING REQUEST FORWARDING -# ----------------------------------------------------------------------------- - -# TAG: nonhierarchical_direct -# By default, Squid will send any non-hierarchical requests -# (matching hierarchy_stoplist or not cacheable request type) direct -# to origin servers. -# -# When this is set to "off", Squid will prefer to send these -# requests to parents. -# -# Note that in most configurations, by turning this off you will only -# add latency to these request without any improvement in global hit -# ratio. -# -# This option only sets a preference. If the parent is unavailable a -# direct connection to the origin server may still be attempted. To -# completely prevent direct connections use never_direct. -#Default: -# nonhierarchical_direct on - -# TAG: prefer_direct -# Normally Squid tries to use parents for most requests. If you for some -# reason like it to first try going direct and only use a parent if -# going direct fails set this to on. -# -# By combining nonhierarchical_direct off and prefer_direct on you -# can set up Squid to use a parent as a backup path if going direct -# fails. -# -# Note: If you want Squid to use parents for all requests see -# the never_direct directive. prefer_direct only modifies how Squid -# acts on cacheable requests. -#Default: -# prefer_direct off - -# TAG: cache_miss_revalidate on|off -# RFC 7232 defines a conditional request mechanism to prevent -# response objects being unnecessarily transferred over the network. -# If that mechanism is used by the client and a cache MISS occurs -# it can prevent new cache entries being created. -# -# This option determines whether Squid on cache MISS will pass the -# client revalidation request to the server or tries to fetch new -# content for caching. It can be useful while the cache is mostly -# empty to more quickly have the cache populated by generating -# non-conditional GETs. -# -# When set to 'on' (default), Squid will pass all client If-* headers -# to the server. This permits server responses without a cacheable -# payload to be delivered and on MISS no new cache entry is created. -# -# When set to 'off' and if the request is cacheable, Squid will -# remove the clients If-Modified-Since and If-None-Match headers from -# the request sent to the server. This requests a 200 status response -# from the server to create a new cache entry with. -#Default: -# cache_miss_revalidate on - -# TAG: always_direct -# Usage: always_direct allow|deny [!]aclname ... -# -# Here you can use ACL elements to specify requests which should -# ALWAYS be forwarded by Squid to the origin servers without using -# any peers. For example, to always directly forward requests for -# local servers ignoring any parents or siblings you may have use -# something like: -# -# acl local-servers dstdomain my.domain.net -# always_direct allow local-servers -# -# To always forward FTP requests directly, use -# -# acl FTP proto FTP -# always_direct allow FTP -# -# NOTE: There is a similar, but opposite option named -# 'never_direct'. You need to be aware that "always_direct deny -# foo" is NOT the same thing as "never_direct allow foo". You -# may need to use a deny rule to exclude a more-specific case of -# some other rule. Example: -# -# acl local-external dstdomain external.foo.net -# acl local-servers dstdomain .foo.net -# always_direct deny local-external -# always_direct allow local-servers -# -# NOTE: If your goal is to make the client forward the request -# directly to the origin server bypassing Squid then this needs -# to be done in the client configuration. Squid configuration -# can only tell Squid how Squid should fetch the object. -# -# NOTE: This directive is not related to caching. The replies -# is cached as usual even if you use always_direct. To not cache -# the replies see the 'cache' directive. -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Prevent any cache_peer being used for this request. - -# TAG: never_direct -# Usage: never_direct allow|deny [!]aclname ... -# -# never_direct is the opposite of always_direct. Please read -# the description for always_direct if you have not already. -# -# With 'never_direct' you can use ACL elements to specify -# requests which should NEVER be forwarded directly to origin -# servers. For example, to force the use of a proxy for all -# requests, except those in your local domain use something like: -# -# acl local-servers dstdomain .foo.net -# never_direct deny local-servers -# never_direct allow all -# -# or if Squid is inside a firewall and there are local intranet -# servers inside the firewall use something like: -# -# acl local-intranet dstdomain .foo.net -# acl local-external dstdomain external.foo.net -# always_direct deny local-external -# always_direct allow local-intranet -# never_direct allow all -# -# This clause supports both fast and slow acl types. -# See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details. -#Default: -# Allow DNS results to be used for this request. - -# ADVANCED NETWORKING OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: incoming_udp_average -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# incoming_udp_average 6 - -# TAG: incoming_tcp_average -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# incoming_tcp_average 4 - -# TAG: incoming_dns_average -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# incoming_dns_average 4 - -# TAG: min_udp_poll_cnt -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# min_udp_poll_cnt 8 - -# TAG: min_dns_poll_cnt -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# min_dns_poll_cnt 8 - -# TAG: min_tcp_poll_cnt -# Heavy voodoo here. I can't even believe you are reading this. -# Are you crazy? Don't even think about adjusting these unless -# you understand the algorithms in comm_select.c first! -#Default: -# min_tcp_poll_cnt 8 - -# TAG: accept_filter -# FreeBSD: -# -# The name of an accept(2) filter to install on Squid's -# listen socket(s). This feature is perhaps specific to -# FreeBSD and requires support in the kernel. -# -# The 'httpready' filter delays delivering new connections -# to Squid until a full HTTP request has been received. -# See the accf_http(9) man page for details. -# -# The 'dataready' filter delays delivering new connections -# to Squid until there is some data to process. -# See the accf_dataready(9) man page for details. -# -# Linux: -# -# The 'data' filter delays delivering of new connections -# to Squid until there is some data to process by TCP_ACCEPT_DEFER. -# You may optionally specify a number of seconds to wait by -# 'data=N' where N is the number of seconds. Defaults to 30 -# if not specified. See the tcp(7) man page for details. -#EXAMPLE: -## FreeBSD -#accept_filter httpready -## Linux -#accept_filter data -#Default: -# none - -# TAG: client_ip_max_connections -# Set an absolute limit on the number of connections a single -# client IP can use. Any more than this and Squid will begin to drop -# new connections from the client until it closes some links. -# -# Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP -# connections from the client. For finer control use the ACL access controls. -# -# Requires client_db to be enabled (the default). -# -# WARNING: This may noticably slow down traffic received via external proxies -# or NAT devices and cause them to rebound error messages back to their clients. -#Default: -# No limit. - -# TAG: tcp_recv_bufsize (bytes) -# Size of receive buffer to set for TCP sockets. Probably just -# as easy to change your kernel's default. -# Omit from squid.conf to use the default buffer size. -#Default: -# Use operating system TCP defaults. - -# ICAP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: icap_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# If you want to enable the ICAP module support, set this to on. -#Default: -# icap_enable off - -# TAG: icap_connect_timeout -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This parameter specifies how long to wait for the TCP connect to -# the requested ICAP server to complete before giving up and either -# terminating the HTTP transaction or bypassing the failure. -# -# The default for optional services is peer_connect_timeout. -# The default for essential services is connect_timeout. -# If this option is explicitly set, its value applies to all services. -#Default: -# none - -# TAG: icap_io_timeout time-units -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This parameter specifies how long to wait for an I/O activity on -# an established, active ICAP connection before giving up and -# either terminating the HTTP transaction or bypassing the -# failure. -#Default: -# Use read_timeout. - -# TAG: icap_service_failure_limit limit [in memory-depth time-units] -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The limit specifies the number of failures that Squid tolerates -# when establishing a new TCP connection with an ICAP service. If -# the number of failures exceeds the limit, the ICAP service is -# not used for new ICAP requests until it is time to refresh its -# OPTIONS. -# -# A negative value disables the limit. Without the limit, an ICAP -# service will not be considered down due to connectivity failures -# between ICAP OPTIONS requests. -# -# Squid forgets ICAP service failures older than the specified -# value of memory-depth. The memory fading algorithm -# is approximate because Squid does not remember individual -# errors but groups them instead, splitting the option -# value into ten time slots of equal length. -# -# When memory-depth is 0 and by default this option has no -# effect on service failure expiration. -# -# Squid always forgets failures when updating service settings -# using an ICAP OPTIONS transaction, regardless of this option -# setting. -# -# For example, -# # suspend service usage after 10 failures in 5 seconds: -# icap_service_failure_limit 10 in 5 seconds -#Default: -# icap_service_failure_limit 10 - -# TAG: icap_service_revival_delay -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The delay specifies the number of seconds to wait after an ICAP -# OPTIONS request failure before requesting the options again. The -# failed ICAP service is considered "down" until fresh OPTIONS are -# fetched. -# -# The actual delay cannot be smaller than the hardcoded minimum -# delay of 30 seconds. -#Default: -# icap_service_revival_delay 180 - -# TAG: icap_preview_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The ICAP Preview feature allows the ICAP server to handle the -# HTTP message by looking only at the beginning of the message body -# or even without receiving the body at all. In some environments, -# previews greatly speedup ICAP processing. -# -# During an ICAP OPTIONS transaction, the server may tell Squid what -# HTTP messages should be previewed and how big the preview should be. -# Squid will not use Preview if the server did not request one. -# -# To disable ICAP Preview for all ICAP services, regardless of -# individual ICAP server OPTIONS responses, set this option to "off". -#Example: -#icap_preview_enable off -#Default: -# icap_preview_enable on - -# TAG: icap_preview_size -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The default size of preview data to be sent to the ICAP server. -# This value might be overwritten on a per server basis by OPTIONS requests. -#Default: -# No preview sent. - -# TAG: icap_206_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# 206 (Partial Content) responses is an ICAP extension that allows the -# ICAP agents to optionally combine adapted and original HTTP message -# content. The decision to combine is postponed until the end of the -# ICAP response. Squid supports Partial Content extension by default. -# -# Activation of the Partial Content extension is negotiated with each -# ICAP service during OPTIONS exchange. Most ICAP servers should handle -# negotation correctly even if they do not support the extension, but -# some might fail. To disable Partial Content support for all ICAP -# services and to avoid any negotiation, set this option to "off". -# -# Example: -# icap_206_enable off -#Default: -# icap_206_enable on - -# TAG: icap_default_options_ttl -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# The default TTL value for ICAP OPTIONS responses that don't have -# an Options-TTL header. -#Default: -# icap_default_options_ttl 60 - -# TAG: icap_persistent_connections on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Whether or not Squid should use persistent connections to -# an ICAP server. -#Default: -# icap_persistent_connections on - -# TAG: adaptation_send_client_ip on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# If enabled, Squid shares HTTP client IP information with adaptation -# services. For ICAP, Squid adds the X-Client-IP header to ICAP requests. -# For eCAP, Squid sets the libecap::metaClientIp transaction option. -# -# See also: adaptation_uses_indirect_client -#Default: -# adaptation_send_client_ip off - -# TAG: adaptation_send_username on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# This sends authenticated HTTP client username (if available) to -# the adaptation service. -# -# For ICAP, the username value is encoded based on the -# icap_client_username_encode option and is sent using the header -# specified by the icap_client_username_header option. -#Default: -# adaptation_send_username off - -# TAG: icap_client_username_header -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# ICAP request header name to use for adaptation_send_username. -#Default: -# icap_client_username_header X-Client-Username - -# TAG: icap_client_username_encode on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Whether to base64 encode the authenticated client username. -#Default: -# icap_client_username_encode off - -# TAG: icap_service -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Defines a single ICAP service using the following format: -# -# icap_service id vectoring_point uri [option ...] -# -# id: ID -# an opaque identifier or name which is used to direct traffic to -# this specific service. Must be unique among all adaptation -# services in squid.conf. -# -# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache -# This specifies at which point of transaction processing the -# ICAP service should be activated. *_postcache vectoring points -# are not yet supported. -# -# uri: icap://servername:port/servicepath -# ICAP server and service location. -# -# ICAP does not allow a single service to handle both REQMOD and RESPMOD -# transactions. Squid does not enforce that requirement. You can specify -# services with the same service_url and different vectoring_points. You -# can even specify multiple identical services as long as their -# service_names differ. -# -# To activate a service, use the adaptation_access directive. To group -# services, use adaptation_service_chain and adaptation_service_set. -# -# Service options are separated by white space. ICAP services support -# the following name=value options: -# -# bypass=on|off|1|0 -# If set to 'on' or '1', the ICAP service is treated as -# optional. If the service cannot be reached or malfunctions, -# Squid will try to ignore any errors and process the message as -# if the service was not enabled. No all ICAP errors can be -# bypassed. If set to 0, the ICAP service is treated as -# essential and all ICAP errors will result in an error page -# returned to the HTTP client. -# -# Bypass is off by default: services are treated as essential. -# -# routing=on|off|1|0 -# If set to 'on' or '1', the ICAP service is allowed to -# dynamically change the current message adaptation plan by -# returning a chain of services to be used next. The services -# are specified using the X-Next-Services ICAP response header -# value, formatted as a comma-separated list of service names. -# Each named service should be configured in squid.conf. Other -# services are ignored. An empty X-Next-Services value results -# in an empty plan which ends the current adaptation. -# -# Dynamic adaptation plan may cross or cover multiple supported -# vectoring points in their natural processing order. -# -# Routing is not allowed by default: the ICAP X-Next-Services -# response header is ignored. -# -# ipv6=on|off -# Only has effect on split-stack systems. The default on those systems -# is to use IPv4-only connections. When set to 'on' this option will -# make Squid use IPv6-only connections to contact this ICAP service. -# -# on-overload=block|bypass|wait|force -# If the service Max-Connections limit has been reached, do -# one of the following for each new ICAP transaction: -# * block: send an HTTP error response to the client -# * bypass: ignore the "over-connected" ICAP service -# * wait: wait (in a FIFO queue) for an ICAP connection slot -# * force: proceed, ignoring the Max-Connections limit -# -# In SMP mode with N workers, each worker assumes the service -# connection limit is Max-Connections/N, even though not all -# workers may use a given service. -# -# The default value is "bypass" if service is bypassable, -# otherwise it is set to "wait". -# -# -# max-conn=number -# Use the given number as the Max-Connections limit, regardless -# of the Max-Connections value given by the service, if any. -# -# Older icap_service format without optional named parameters is -# deprecated but supported for backward compatibility. -# -#Example: -#icap_service svcBlocker reqmod_precache icap://icap1.mydomain.net:1344/reqmod bypass=0 -#icap_service svcLogger reqmod_precache icap://icap2.mydomain.net:1344/respmod routing=on -#Default: -# none - -# TAG: icap_class -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This deprecated option was documented to define an ICAP service -# chain, even though it actually defined a set of similar, redundant -# services, and the chains were not supported. -# -# To define a set of redundant services, please use the -# adaptation_service_set directive. For service chains, use -# adaptation_service_chain. -#Default: -# none - -# TAG: icap_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This option is deprecated. Please use adaptation_access, which -# has the same ICAP functionality, but comes with better -# documentation, and eCAP support. -#Default: -# none - -# eCAP OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: ecap_enable on|off -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap -# -# Controls whether eCAP support is enabled. -#Default: -# ecap_enable off - -# TAG: ecap_service -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap -# -# Defines a single eCAP service -# -# ecap_service id vectoring_point uri [option ...] -# -# id: ID -# an opaque identifier or name which is used to direct traffic to -# this specific service. Must be unique among all adaptation -# services in squid.conf. -# -# vectoring_point: reqmod_precache|reqmod_postcache|respmod_precache|respmod_postcache -# This specifies at which point of transaction processing the -# eCAP service should be activated. *_postcache vectoring points -# are not yet supported. -# -# uri: ecap://vendor/service_name?custom&cgi=style¶meters=optional -# Squid uses the eCAP service URI to match this configuration -# line with one of the dynamically loaded services. Each loaded -# eCAP service must have a unique URI. Obtain the right URI from -# the service provider. -# -# To activate a service, use the adaptation_access directive. To group -# services, use adaptation_service_chain and adaptation_service_set. -# -# Service options are separated by white space. eCAP services support -# the following name=value options: -# -# bypass=on|off|1|0 -# If set to 'on' or '1', the eCAP service is treated as optional. -# If the service cannot be reached or malfunctions, Squid will try -# to ignore any errors and process the message as if the service -# was not enabled. No all eCAP errors can be bypassed. -# If set to 'off' or '0', the eCAP service is treated as essential -# and all eCAP errors will result in an error page returned to the -# HTTP client. -# -# Bypass is off by default: services are treated as essential. -# -# routing=on|off|1|0 -# If set to 'on' or '1', the eCAP service is allowed to -# dynamically change the current message adaptation plan by -# returning a chain of services to be used next. -# -# Dynamic adaptation plan may cross or cover multiple supported -# vectoring points in their natural processing order. -# -# Routing is not allowed by default. -# -# Older ecap_service format without optional named parameters is -# deprecated but supported for backward compatibility. -# -# -#Example: -#ecap_service s1 reqmod_precache ecap://filters.R.us/leakDetector?on_error=block bypass=off -#ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.cfg bypass=on -#Default: -# none - -# TAG: loadable_modules -# Instructs Squid to load the specified dynamic module(s) or activate -# preloaded module(s). -#Example: -#loadable_modules /usr/lib/MinimalAdapter.so -#Default: -# none - -# MESSAGE ADAPTATION OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: adaptation_service_set -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# -# Configures an ordered set of similar, redundant services. This is -# useful when hot standby or backup adaptation servers are available. -# -# adaptation_service_set set_name service_name1 service_name2 ... -# -# The named services are used in the set declaration order. The first -# applicable adaptation service from the set is used first. The next -# applicable service is tried if and only if the transaction with the -# previous service fails and the message waiting to be adapted is still -# intact. -# -# When adaptation starts, broken services are ignored as if they were -# not a part of the set. A broken service is a down optional service. -# -# The services in a set must be attached to the same vectoring point -# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD). -# -# If all services in a set are optional then adaptation failures are -# bypassable. If all services in the set are essential, then a -# transaction failure with one service may still be retried using -# another service from the set, but when all services fail, the master -# transaction fails as well. -# -# A set may contain a mix of optional and essential services, but that -# is likely to lead to surprising results because broken services become -# ignored (see above), making previously bypassable failures fatal. -# Technically, it is the bypassability of the last failed service that -# matters. -# -# See also: adaptation_access adaptation_service_chain -# -#Example: -#adaptation_service_set svcBlocker urlFilterPrimary urlFilterBackup -#adaptation service_set svcLogger loggerLocal loggerRemote -#Default: -# none - -# TAG: adaptation_service_chain -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# -# Configures a list of complementary services that will be applied -# one-by-one, forming an adaptation chain or pipeline. This is useful -# when Squid must perform different adaptations on the same message. -# -# adaptation_service_chain chain_name service_name1 svc_name2 ... -# -# The named services are used in the chain declaration order. The first -# applicable adaptation service from the chain is used first. The next -# applicable service is applied to the successful adaptation results of -# the previous service in the chain. -# -# When adaptation starts, broken services are ignored as if they were -# not a part of the chain. A broken service is a down optional service. -# -# Request satisfaction terminates the adaptation chain because Squid -# does not currently allow declaration of RESPMOD services at the -# "reqmod_precache" vectoring point (see icap_service or ecap_service). -# -# The services in a chain must be attached to the same vectoring point -# (e.g., pre-cache) and use the same adaptation method (e.g., REQMOD). -# -# A chain may contain a mix of optional and essential services. If an -# essential adaptation fails (or the failure cannot be bypassed for -# other reasons), the master transaction fails. Otherwise, the failure -# is bypassed as if the failed adaptation service was not in the chain. -# -# See also: adaptation_access adaptation_service_set -# -#Example: -#adaptation_service_chain svcRequest requestLogger urlFilter leakDetector -#Default: -# none - -# TAG: adaptation_access -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# Sends an HTTP transaction to an ICAP or eCAP adaptation service. -# -# adaptation_access service_name allow|deny [!]aclname... -# adaptation_access set_name allow|deny [!]aclname... -# -# At each supported vectoring point, the adaptation_access -# statements are processed in the order they appear in this -# configuration file. Statements pointing to the following services -# are ignored (i.e., skipped without checking their ACL): -# -# - services serving different vectoring points -# - "broken-but-bypassable" services -# - "up" services configured to ignore such transactions -# (e.g., based on the ICAP Transfer-Ignore header). -# -# When a set_name is used, all services in the set are checked -# using the same rules, to find the first applicable one. See -# adaptation_service_set for details. -# -# If an access list is checked and there is a match, the -# processing stops: For an "allow" rule, the corresponding -# adaptation service is used for the transaction. For a "deny" -# rule, no adaptation service is activated. -# -# It is currently not possible to apply more than one adaptation -# service at the same vectoring point to the same HTTP transaction. -# -# See also: icap_service and ecap_service -# -#Example: -#adaptation_access service_1 allow all -#Default: -# Allow, unless rules exist in squid.conf. - -# TAG: adaptation_service_iteration_limit -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# Limits the number of iterations allowed when applying adaptation -# services to a message. If your longest adaptation set or chain -# may have more than 16 services, increase the limit beyond its -# default value of 16. If detecting infinite iteration loops sooner -# is critical, make the iteration limit match the actual number -# of services in your longest adaptation set or chain. -# -# Infinite adaptation loops are most likely with routing services. -# -# See also: icap_service routing=1 -#Default: -# adaptation_service_iteration_limit 16 - -# TAG: adaptation_masterx_shared_names -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# For each master transaction (i.e., the HTTP request and response -# sequence, including all related ICAP and eCAP exchanges), Squid -# maintains a table of metadata. The table entries are (name, value) -# pairs shared among eCAP and ICAP exchanges. The table is destroyed -# with the master transaction. -# -# This option specifies the table entry names that Squid must accept -# from and forward to the adaptation transactions. -# -# An ICAP REQMOD or RESPMOD transaction may set an entry in the -# shared table by returning an ICAP header field with a name -# specified in adaptation_masterx_shared_names. -# -# An eCAP REQMOD or RESPMOD transaction may set an entry in the -# shared table by implementing the libecap::visitEachOption() API -# to provide an option with a name specified in -# adaptation_masterx_shared_names. -# -# Squid will store and forward the set entry to subsequent adaptation -# transactions within the same master transaction scope. -# -# Only one shared entry name is supported at this time. -# -#Example: -## share authentication information among ICAP services -#adaptation_masterx_shared_names X-Subscriber-ID -#Default: -# none - -# TAG: adaptation_meta -# Note: This option is only available if Squid is rebuilt with the -# --enable-ecap or --enable-icap-client -# -# This option allows Squid administrator to add custom ICAP request -# headers or eCAP options to Squid ICAP requests or eCAP transactions. -# Use it to pass custom authentication tokens and other -# transaction-state related meta information to an ICAP/eCAP service. -# -# The addition of a meta header is ACL-driven: -# adaptation_meta name value [!]aclname ... -# -# Processing for a given header name stops after the first ACL list match. -# Thus, it is impossible to add two headers with the same name. If no ACL -# lists match for a given header name, no such header is added. For -# example: -# -# # do not debug transactions except for those that need debugging -# adaptation_meta X-Debug 1 needs_debugging -# -# # log all transactions except for those that must remain secret -# adaptation_meta X-Log 1 !keep_secret -# -# # mark transactions from users in the "G 1" group -# adaptation_meta X-Authenticated-Groups "G 1" authed_as_G1 -# -# The "value" parameter may be a regular squid.conf token or a "double -# quoted string". Within the quoted string, use backslash (\) to escape -# any character, which is currently only useful for escaping backslashes -# and double quotes. For example, -# "this string has one backslash (\\) and two \"quotes\"" -# -# Used adaptation_meta header values may be logged via %note -# logformat code. If multiple adaptation_meta headers with the same name -# are used during master transaction lifetime, the header values are -# logged in the order they were used and duplicate values are ignored -# (only the first repeated value will be logged). -#Default: -# none - -# TAG: icap_retry -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# This ACL determines which retriable ICAP transactions are -# retried. Transactions that received a complete ICAP response -# and did not have to consume or produce HTTP bodies to receive -# that response are usually retriable. -# -# icap_retry allow|deny [!]aclname ... -# -# Squid automatically retries some ICAP I/O timeouts and errors -# due to persistent connection race conditions. -# -# See also: icap_retry_limit -#Default: -# icap_retry deny all - -# TAG: icap_retry_limit -# Note: This option is only available if Squid is rebuilt with the -# --enable-icap-client -# -# Limits the number of retries allowed. -# -# Communication errors due to persistent connection race -# conditions are unavoidable, automatically retried, and do not -# count against this limit. -# -# See also: icap_retry -#Default: -# No retries are allowed. - -# DNS OPTIONS -# ----------------------------------------------------------------------------- - -# TAG: check_hostnames -# For security and stability reasons Squid can check -# hostnames for Internet standard RFC compliance. If you want -# Squid to perform these checks turn this directive on. -#Default: -# check_hostnames off - -# TAG: allow_underscore -# Underscore characters is not strictly allowed in Internet hostnames -# but nevertheless used by many sites. Set this to off if you want -# Squid to be strict about the standard. -# This check is performed only when check_hostnames is set to on. -#Default: -# allow_underscore on - -# TAG: cache_dns_program -# Note: This option is only available if Squid is rebuilt with the -# --disable-internal-dns -# -# Specify the location of the executable for dnslookup process. -#Default: -# cache_dns_program /usr/libexec/dnsserver - -# TAG: dns_children -# Note: This option is only available if Squid is rebuilt with the -# --disable-internal-dns -# -# The maximum number of processes spawn to service DNS name lookups. -# If you limit it too few Squid will have to wait for them to process -# a backlog of requests, slowing it down. If you allow too many they -# will use RAM and other system resources noticably. -# The maximum this may be safely set to is 32. -# -# The startup= and idle= options allow some measure of skew in your -# tuning. -# -# startup= -# -# Sets a minimum of how many processes are to be spawned when Squid -# starts or reconfigures. When set to zero the first request will -# cause spawning of the first child process to handle it. -# -# Starting too few will cause an initial slowdown in traffic as Squid -# attempts to simultaneously spawn enough processes to cope. -# -# idle= -# -# Sets a minimum of how many processes Squid is to try and keep available -# at all times. When traffic begins to rise above what the existing -# processes can handle this many more will be spawned up to the maximum -# configured. A minimum setting of 1 is required. -#Default: -# dns_children 32 startup=1 idle=1 - -# TAG: dns_retransmit_interval -# Initial retransmit interval for DNS queries. The interval is -# doubled each time all configured DNS servers have been tried. -#Default: -# dns_retransmit_interval 5 seconds - -# TAG: dns_timeout -# DNS Query timeout. If no response is received to a DNS query -# within this time all DNS servers for the queried domain -# are assumed to be unavailable. -#Default: -# dns_timeout 30 seconds - -# TAG: dns_packet_max -# Maximum number of bytes packet size to advertise via EDNS. -# Set to "none" to disable EDNS large packet support. -# -# For legacy reasons DNS UDP replies will default to 512 bytes which -# is too small for many responses. EDNS provides a means for Squid to -# negotiate receiving larger responses back immediately without having -# to failover with repeat requests. Responses larger than this limit -# will retain the old behaviour of failover to TCP DNS. -# -# Squid has no real fixed limit internally, but allowing packet sizes -# over 1500 bytes requires network jumbogram support and is usually not -# necessary. -# -# WARNING: The RFC also indicates that some older resolvers will reply -# with failure of the whole request if the extension is added. Some -# resolvers have already been identified which will reply with mangled -# EDNS response on occasion. Usually in response to many-KB jumbogram -# sizes being advertised by Squid. -# Squid will currently treat these both as an unable-to-resolve domain -# even if it would be resolvable without EDNS. -#Default: -# EDNS disabled - -# TAG: dns_defnames on|off -# Normally the RES_DEFNAMES resolver option is disabled -# (see res_init(3)). This prevents caches in a hierarchy -# from interpreting single-component hostnames locally. To allow -# Squid to handle single-component names, enable this option. -#Default: -# Search for single-label domain names is disabled. - -# TAG: dns_multicast_local on|off -# When set to on, Squid sends multicast DNS lookups on the local -# network for domains ending in .local and .arpa. -# This enables local servers and devices to be contacted in an -# ad-hoc or zero-configuration network environment. -#Default: -# Search for .local and .arpa names is disabled. - -# TAG: dns_nameservers -# Use this if you want to specify a list of DNS name servers -# (IP addresses) to use instead of those given in your -# /etc/resolv.conf file. -# -# On Windows platforms, if no value is specified here or in -# the /etc/resolv.conf file, the list of DNS name servers are -# taken from the Windows registry, both static and dynamic DHCP -# configurations are supported. -# -# Example: dns_nameservers 10.0.0.1 192.172.0.4 -#Default: -# Use operating system definitions - -# TAG: hosts_file -# Location of the host-local IP name-address associations -# database. Most Operating Systems have such a file on different -# default locations: -# - Un*X & Linux: /etc/hosts -# - Windows NT/2000: %SystemRoot%\system32\drivers\etc\hosts -# (%SystemRoot% value install default is c:\winnt) -# - Windows XP/2003: %SystemRoot%\system32\drivers\etc\hosts -# (%SystemRoot% value install default is c:\windows) -# - Windows 9x/Me: %windir%\hosts -# (%windir% value is usually c:\windows) -# - Cygwin: /etc/hosts -# -# The file contains newline-separated definitions, in the -# form ip_address_in_dotted_form name [name ...] names are -# whitespace-separated. Lines beginning with an hash (#) -# character are comments. -# -# The file is checked at startup and upon configuration. -# If set to 'none', it won't be checked. -# If append_domain is used, that domain will be added to -# domain-local (i.e. not containing any dot character) host -# definitions. -#Default: -# hosts_file /etc/hosts - -# TAG: append_domain -# Appends local domain name to hostnames without any dots in -# them. append_domain must begin with a period. -# -# Be warned there are now Internet names with no dots in -# them using only top-domain names, so setting this may -# cause some Internet sites to become unavailable. -# -#Example: -# append_domain .yourdomain.com -#Default: -# Use operating system definitions - -# TAG: ignore_unknown_nameservers -# By default Squid checks that DNS responses are received -# from the same IP addresses they are sent to. If they -# don't match, Squid ignores the response and writes a warning -# message to cache.log. You can allow responses from unknown -# nameservers by setting this option to 'off'. -#Default: -# ignore_unknown_nameservers on - -# TAG: dns_v4_first -# With the IPv6 Internet being as fast or faster than IPv4 Internet -# for most networks Squid prefers to contact websites over IPv6. -# -# This option reverses the order of preference to make Squid contact -# dual-stack websites over IPv4 first. Squid will still perform both -# IPv6 and IPv4 DNS lookups before connecting. -# -# WARNING: -# This option will restrict the situations under which IPv6 -# connectivity is used (and tested). Hiding network problems -# which would otherwise be detected and warned about. -#Default: -# dns_v4_first off - -# TAG: ipcache_size (number of entries) -# Maximum number of DNS IP cache entries. -#Default: -# ipcache_size 1024 - -# TAG: ipcache_low (percent) -#Default: -# ipcache_low 90 - -# TAG: ipcache_high (percent) -# The size, low-, and high-water marks for the IP cache. -#Default: -# ipcache_high 95 - -# TAG: fqdncache_size (number of entries) -# Maximum number of FQDN cache entries. -#Default: -# fqdncache_size 1024 - -# MISCELLANEOUS -# ----------------------------------------------------------------------------- - -# TAG: configuration_includes_quoted_values on|off -# Previous Squid versions have defined "quoted/string" as syntax for -# ACL to signifiy the value is an included file containing values and -# has treated the " characters in other places of the configuration file -# as part of the parameter value it was used for. -# -# For compatibility with existing installations that behaviour -# remains the default. -# -# If this directive is set to 'on', Squid will start parsing each -# "quoted string" as a single configuration directive parameter. The -# quotes are stripped before the parameter value is interpreted or use. -# -# That will continue for all lines until this directive is set to 'off', -# where Squid will return to the default configuration parsing. -# -# For example; -# -# configuration_includes_quoted_values on -# acl group external groupCheck Administrators "Internet Users" Guest -# configuration_includes_quoted_values off -# -#Default: -# configuration_includes_quoted_values off - -# TAG: memory_pools on|off -# If set, Squid will keep pools of allocated (but unused) memory -# available for future use. If memory is a premium on your -# system and you believe your malloc library outperforms Squid -# routines, disable this. -#Default: -# memory_pools on - -# TAG: memory_pools_limit (bytes) -# Used only with memory_pools on: -# memory_pools_limit 50 MB -# -# If set to a non-zero value, Squid will keep at most the specified -# limit of allocated (but unused) memory in memory pools. All free() -# requests that exceed this limit will be handled by your malloc -# library. Squid does not pre-allocate any memory, just safe-keeps -# objects that otherwise would be free()d. Thus, it is safe to set -# memory_pools_limit to a reasonably high value even if your -# configuration will use less memory. -# -# If set to none, Squid will keep all memory it can. That is, there -# will be no limit on the total amount of memory used for safe-keeping. -# -# To disable memory allocation optimization, do not set -# memory_pools_limit to 0 or none. Set memory_pools to "off" instead. -# -# An overhead for maintaining memory pools is not taken into account -# when the limit is checked. This overhead is close to four bytes per -# object kept. However, pools may actually _save_ memory because of -# reduced memory thrashing in your malloc library. -#Default: -# memory_pools_limit 5 MB - -# TAG: forwarded_for on|off|transparent|truncate|delete -# If set to "on", Squid will append your client's IP address -# in the HTTP requests it forwards. By default it looks like: -# -# X-Forwarded-For: 192.1.2.3 -# -# If set to "off", it will appear as -# -# X-Forwarded-For: unknown -# -# If set to "transparent", Squid will not alter the -# X-Forwarded-For header in any way. -# -# If set to "delete", Squid will delete the entire -# X-Forwarded-For header. -# -# If set to "truncate", Squid will remove all existing -# X-Forwarded-For entries, and place the client IP as the sole entry. -#Default: -# forwarded_for on - -# TAG: cachemgr_passwd -# Specify passwords for cachemgr operations. -# -# Usage: cachemgr_passwd password action action ... -# -# Some valid actions are (see cache manager menu for a full list): -# 5min -# 60min -# asndb -# authenticator -# cbdata -# client_list -# comm_incoming -# config * -# counters -# delay -# digest_stats -# dns -# events -# filedescriptors -# fqdncache -# histograms -# http_headers -# info -# io -# ipcache -# mem -# menu -# netdb -# non_peers -# objects -# offline_toggle * -# pconn -# peer_select -# reconfigure * -# redirector -# refresh -# server_list -# shutdown * -# store_digest -# storedir -# utilization -# via_headers -# vm_objects -# -# * Indicates actions which will not be performed without a -# valid password, others can be performed if not listed here. -# -# To disable an action, set the password to "disable". -# To allow performing an action without a password, set the -# password to "none". -# -# Use the keyword "all" to set the same password for all actions. -# -#Example: -# cachemgr_passwd secret shutdown -# cachemgr_passwd lesssssssecret info stats/objects -# cachemgr_passwd disable all -#Default: -# No password. Actions which require password are denied. - -# TAG: client_db on|off -# If you want to disable collecting per-client statistics, -# turn off client_db here. -#Default: -# client_db on - -# TAG: refresh_all_ims on|off -# When you enable this option, squid will always check -# the origin server for an update when a client sends an -# If-Modified-Since request. Many browsers use IMS -# requests when the user requests a reload, and this -# ensures those clients receive the latest version. -# -# By default (off), squid may return a Not Modified response -# based on the age of the cached version. -#Default: -# refresh_all_ims off - -# TAG: reload_into_ims on|off -# When you enable this option, client no-cache or ``reload'' -# requests will be changed to If-Modified-Since requests. -# Doing this VIOLATES the HTTP standard. Enabling this -# feature could make you liable for problems which it -# causes. -# -# see also refresh_pattern for a more selective approach. -#Default: -# reload_into_ims off - -# TAG: connect_retries -# This sets the maximum number of connection attempts made for each -# TCP connection. The connect_retries attempts must all still -# complete within the connection timeout period. -# -# The default is not to re-try if the first connection attempt fails. -# The (not recommended) maximum is 10 tries. -# -# A warning message will be generated if it is set to a too-high -# value and the configured value will be over-ridden. -# -# Note: These re-tries are in addition to forward_max_tries -# which limit how many different addresses may be tried to find -# a useful server. -#Default: -# Do not retry failed connections. - -# TAG: retry_on_error -# If set to ON Squid will automatically retry requests when -# receiving an error response with status 403 (Forbidden), -# 500 (Internal Error), 501 or 503 (Service not available). -# Status 502 and 504 (Gateway errors) are always retried. -# -# This is mainly useful if you are in a complex cache hierarchy to -# work around access control errors. -# -# NOTE: This retry will attempt to find another working destination. -# Which is different from the server which just failed. -#Default: -# retry_on_error off - -# TAG: as_whois_server -# WHOIS server to query for AS numbers. NOTE: AS numbers are -# queried only when Squid starts up, not for every request. -#Default: -# as_whois_server whois.ra.net - -# TAG: offline_mode -# Enable this option and Squid will never try to validate cached -# objects. -#Default: -# offline_mode off - -# TAG: uri_whitespace -# What to do with requests that have whitespace characters in the -# URI. Options: -# -# strip: The whitespace characters are stripped out of the URL. -# This is the behavior recommended by RFC2396 and RFC3986 -# for tolerant handling of generic URI. -# NOTE: This is one difference between generic URI and HTTP URLs. -# -# deny: The request is denied. The user receives an "Invalid -# Request" message. -# This is the behaviour recommended by RFC2616 for safe -# handling of HTTP request URL. -# -# allow: The request is allowed and the URI is not changed. The -# whitespace characters remain in the URI. Note the -# whitespace is passed to redirector processes if they -# are in use. -# Note this may be considered a violation of RFC2616 -# request parsing where whitespace is prohibited in the -# URL field. -# -# encode: The request is allowed and the whitespace characters are -# encoded according to RFC1738. -# -# chop: The request is allowed and the URI is chopped at the -# first whitespace. -# -# -# NOTE the current Squid implementation of encode and chop violates -# RFC2616 by not using a 301 redirect after altering the URL. -#Default: -# uri_whitespace strip - -# TAG: chroot -# Specifies a directory where Squid should do a chroot() while -# initializing. This also causes Squid to fully drop root -# privileges after initializing. This means, for example, if you -# use a HTTP port less than 1024 and try to reconfigure, you may -# get an error saying that Squid can not open the port. -#Default: -# none - -# TAG: balance_on_multiple_ip -# Modern IP resolvers in squid sort lookup results by preferred access. -# By default squid will use these IP in order and only rotates to -# the next listed when the most preffered fails. -# -# Some load balancing servers based on round robin DNS have been -# found not to preserve user session state across requests -# to different IP addresses. -# -# Enabling this directive Squid rotates IP's per request. -#Default: -# balance_on_multiple_ip off - -# TAG: pipeline_prefetch -# HTTP clients may send a pipeline of 1+N requests to Squid using a -# single connection, without waiting for Squid to respond to the first -# of those requests. This option limits the number of concurrent -# requests Squid will try to handle in parallel. If set to N, Squid -# will try to receive and process up to 1+N requests on the same -# connection concurrently. -# -# Defaults to 0 (off) for bandwidth management and access logging -# reasons. -# -# NOTE: pipelining requires persistent connections to clients. -# -# WARNING: pipelining breaks NTLM and Negotiate/Kerberos authentication. -#Default: -# Do not pre-parse pipelined requests. - -# TAG: high_response_time_warning (msec) -# If the one-minute median response time exceeds this value, -# Squid prints a WARNING with debug level 0 to get the -# administrators attention. The value is in milliseconds. -#Default: -# disabled. - -# TAG: high_page_fault_warning -# If the one-minute average page fault rate exceeds this -# value, Squid prints a WARNING with debug level 0 to get -# the administrators attention. The value is in page faults -# per second. -#Default: -# disabled. - -# TAG: high_memory_warning -# Note: This option is only available if Squid is rebuilt with the -# GNU Malloc with mstats() -# -# If the memory usage (as determined by mallinfo) exceeds -# this amount, Squid prints a WARNING with debug level 0 to get -# the administrators attention. -#Default: -# disabled. - -# TAG: sleep_after_fork (microseconds) -# When this is set to a non-zero value, the main Squid process -# sleeps the specified number of microseconds after a fork() -# system call. This sleep may help the situation where your -# system reports fork() failures due to lack of (virtual) -# memory. Note, however, if you have a lot of child -# processes, these sleep delays will add up and your -# Squid will not service requests for some amount of time -# until all the child processes have been started. -# On Windows value less then 1000 (1 milliseconds) are -# rounded to 1000. -#Default: -# sleep_after_fork 0 - -# TAG: windows_ipaddrchangemonitor on|off -# Note: This option is only available if Squid is rebuilt with the -# MS Windows -# -# On Windows Squid by default will monitor IP address changes and will -# reconfigure itself after any detected event. This is very useful for -# proxies connected to internet with dial-up interfaces. -# In some cases (a Proxy server acting as VPN gateway is one) it could be -# desiderable to disable this behaviour setting this to 'off'. -# Note: after changing this, Squid service must be restarted. -#Default: -# windows_ipaddrchangemonitor on - -# TAG: eui_lookup -# Whether to lookup the EUI or MAC address of a connected client. -#Default: -# eui_lookup on - -# TAG: max_filedescriptors -# Reduce the maximum number of filedescriptors supported below -# the usual operating system defaults. -# -# Remove from squid.conf to inherit the current ulimit setting. -# -# Note: Changing this requires a restart of Squid. Also -# not all I/O types supports large values (eg on Windows). -#Default: -# Use operating system limits set by ulimit. - -# TAG: workers -# Number of main Squid processes or "workers" to fork and maintain. -# 0: "no daemon" mode, like running "squid -N ..." -# 1: "no SMP" mode, start one main Squid process daemon (default) -# N: start N main Squid process daemons (i.e., SMP mode) -# -# In SMP mode, each worker does nearly all what a single Squid daemon -# does (e.g., listen on http_port and forward HTTP requests). -#Default: -# SMP support disabled. - -# TAG: cpu_affinity_map -# Usage: cpu_affinity_map process_numbers=P1,P2,... cores=C1,C2,... -# -# Sets 1:1 mapping between Squid processes and CPU cores. For example, -# -# cpu_affinity_map process_numbers=1,2,3,4 cores=1,3,5,7 -# -# affects processes 1 through 4 only and places them on the first -# four even cores, starting with core #1. -# -# CPU cores are numbered starting from 1. Requires support for -# sched_getaffinity(2) and sched_setaffinity(2) system calls. -# -# Multiple cpu_affinity_map options are merged. -# -# See also: workers -#Default: -# Let operating system decide. - diff --git a/network/squid/squid.info b/network/squid/squid.info index 720212f47b..b8cace6555 100644 --- a/network/squid/squid.info +++ b/network/squid/squid.info @@ -1,8 +1,8 @@ PRGNAM="squid" -VERSION="3.5.26" +VERSION="4.13" HOMEPAGE="http://www.squid-cache.org/" -DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.26.tar.xz" -MD5SUM="510e2c84773879c00d0e7ced997864d9" +DOWNLOAD="http://www.squid-cache.org/Versions/v4/squid-4.13.tar.xz" +MD5SUM="492e54afc15821141ff1d1d9903854d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/squid/squid.logrotate b/network/squid/squid.logrotate index eeca36223f..9c2b9c2816 100644 --- a/network/squid/squid.logrotate +++ b/network/squid/squid.logrotate @@ -7,7 +7,7 @@ # reopen squid.log, effectively using the new logfile. The old logfile # (squid.log.1) will be compressed by logrotate's next invocation. /var/log/squid/*.log { - su @USER@ @GROUP@ + su @SQUIDUSER@ @SQUIDGROUP@ weekly rotate 5 compress diff --git a/network/squirrelmail/README b/network/squirrelmail/README new file mode 100644 index 0000000000..fe88288631 --- /dev/null +++ b/network/squirrelmail/README @@ -0,0 +1,9 @@ +quirrelMail is a project that provides both a web-based email client +and a proxy server for the IMAP protocol. SquirrelMail webmail +is available for any platform supporting PHP. The SquirrelMail +webmail client itself is a complete webmail system, but extra +features are available in the form of plugins. There are over 200 +third-party plugins available for download from the SquirrelMail +website and SquirrelMail ships with several "standard" or "core" +plugins. SquirrelMail webmail has been translated into over 50 +languages. diff --git a/network/squirrelmail/config.php b/network/squirrelmail/config.php new file mode 100644 index 0000000000..d901ee1885 --- /dev/null +++ b/network/squirrelmail/config.php @@ -0,0 +1,177 @@ +<?php + +/** + * SquirrelMail Configuration File + * Created using the configure script, conf.pl + */ + +global $version; +$config_version = '1.4.0'; +$config_use_color = 1; + +$org_name = "SquirrelMail"; +$org_logo = SM_PATH . 'images/sm_logo.png'; +$org_logo_width = '308'; +$org_logo_height = '111'; +$org_title = "SquirrelMail $version"; +$signout_page = ''; +$frame_top = '_top'; + +$provider_uri = 'http://squirrelmail.org/'; + +$provider_name = 'SquirrelMail'; + +$motd = ""; + +$squirrelmail_default_language = 'en_US'; + +$domain = 'localhost'; +$imapServerAddress = 'localhost'; +$imapPort = 143; +$useSendmail = true; +$smtpServerAddress = 'localhost'; +$smtpPort = 25; +$sendmail_path = '/usr/sbin/sendmail'; +$pop_before_smtp = false; +$imap_server_type = 'uw'; +$invert_time = false; +$optional_delimiter = '/'; + +$default_folder_prefix = 'mail/'; +$trash_folder = 'Trash'; +$sent_folder = 'Sent'; +$draft_folder = 'Drafts'; +$default_move_to_trash = true; +$default_move_to_sent = true; +$default_save_as_draft = true; +$show_prefix_option = true; +$list_special_folders_first = true; +$use_special_folder_color = true; +$auto_expunge = true; +$default_sub_of_inbox = false; +$show_contain_subfolders_option = true; +$default_unseen_notify = 2; +$default_unseen_type = 1; +$auto_create_special = true; +$delete_folder = false; +$noselect_fix_enable = false; + +$default_charset = 'utf-8'; +$data_dir = '/var/lib/squirrelmail/prefs/'; +$attachment_dir = '/var/spool/squirrelmail/attach/'; +$dir_hash_level = 0; +$default_left_size = '150'; +$force_username_lowercase = false; +$default_use_priority = true; +$hide_sm_attributions = false; +$default_use_mdn = true; +$edit_identity = true; +$edit_name = true; +$allow_thread_sort = true; +$allow_server_sort = true; +$allow_charset_search = true; +$uid_support = true; + +$plugins[0] = 'delete_move_next'; +$plugins[1] = 'squirrelspell'; +$plugins[2] = 'newmail'; + +$theme_css = ''; +$theme_default = 0; +$theme[0]['PATH'] = SM_PATH . 'themes/default_theme.php'; +$theme[0]['NAME'] = 'Default'; +$theme[1]['PATH'] = SM_PATH . 'themes/plain_blue_theme.php'; +$theme[1]['NAME'] = 'Plain Blue'; +$theme[2]['PATH'] = SM_PATH . 'themes/sandstorm_theme.php'; +$theme[2]['NAME'] = 'Sand Storm'; +$theme[3]['PATH'] = SM_PATH . 'themes/deepocean_theme.php'; +$theme[3]['NAME'] = 'Deep Ocean'; +$theme[4]['PATH'] = SM_PATH . 'themes/slashdot_theme.php'; +$theme[4]['NAME'] = 'Slashdot'; +$theme[5]['PATH'] = SM_PATH . 'themes/purple_theme.php'; +$theme[5]['NAME'] = 'Purple'; +$theme[6]['PATH'] = SM_PATH . 'themes/forest_theme.php'; +$theme[6]['NAME'] = 'Forest'; +$theme[7]['PATH'] = SM_PATH . 'themes/ice_theme.php'; +$theme[7]['NAME'] = 'Ice'; +$theme[8]['PATH'] = SM_PATH . 'themes/seaspray_theme.php'; +$theme[8]['NAME'] = 'Sea Spray'; +$theme[9]['PATH'] = SM_PATH . 'themes/bluesteel_theme.php'; +$theme[9]['NAME'] = 'Blue Steel'; +$theme[10]['PATH'] = SM_PATH . 'themes/dark_grey_theme.php'; +$theme[10]['NAME'] = 'Dark Grey'; +$theme[11]['PATH'] = SM_PATH . 'themes/high_contrast_theme.php'; +$theme[11]['NAME'] = 'High Contrast'; +$theme[12]['PATH'] = SM_PATH . 'themes/black_bean_burrito_theme.php'; +$theme[12]['NAME'] = 'Black Bean Burrito'; +$theme[13]['PATH'] = SM_PATH . 'themes/servery_theme.php'; +$theme[13]['NAME'] = 'Servery'; +$theme[14]['PATH'] = SM_PATH . 'themes/maize_theme.php'; +$theme[14]['NAME'] = 'Maize'; +$theme[15]['PATH'] = SM_PATH . 'themes/bluesnews_theme.php'; +$theme[15]['NAME'] = 'BluesNews'; +$theme[16]['PATH'] = SM_PATH . 'themes/deepocean2_theme.php'; +$theme[16]['NAME'] = 'Deep Ocean 2'; +$theme[17]['PATH'] = SM_PATH . 'themes/blue_grey_theme.php'; +$theme[17]['NAME'] = 'Blue Grey'; +$theme[18]['PATH'] = SM_PATH . 'themes/dompie_theme.php'; +$theme[18]['NAME'] = 'Dompie'; +$theme[19]['PATH'] = SM_PATH . 'themes/methodical_theme.php'; +$theme[19]['NAME'] = 'Methodical'; +$theme[20]['PATH'] = SM_PATH . 'themes/greenhouse_effect.php'; +$theme[20]['NAME'] = 'Greenhouse Effect (Changes)'; +$theme[21]['PATH'] = SM_PATH . 'themes/in_the_pink.php'; +$theme[21]['NAME'] = 'In The Pink (Changes)'; +$theme[22]['PATH'] = SM_PATH . 'themes/kind_of_blue.php'; +$theme[22]['NAME'] = 'Kind of Blue (Changes)'; +$theme[23]['PATH'] = SM_PATH . 'themes/monostochastic.php'; +$theme[23]['NAME'] = 'Monostochastic (Changes)'; +$theme[24]['PATH'] = SM_PATH . 'themes/shades_of_grey.php'; +$theme[24]['NAME'] = 'Shades of Grey (Changes)'; +$theme[25]['PATH'] = SM_PATH . 'themes/spice_of_life.php'; +$theme[25]['NAME'] = 'Spice of Life (Changes)'; +$theme[26]['PATH'] = SM_PATH . 'themes/spice_of_life_lite.php'; +$theme[26]['NAME'] = 'Spice of Life - Lite (Changes)'; +$theme[27]['PATH'] = SM_PATH . 'themes/spice_of_life_dark.php'; +$theme[27]['NAME'] = 'Spice of Life - Dark (Changes)'; +$theme[28]['PATH'] = SM_PATH . 'themes/christmas.php'; +$theme[28]['NAME'] = 'Holiday - Christmas'; +$theme[29]['PATH'] = SM_PATH . 'themes/darkness.php'; +$theme[29]['NAME'] = 'Darkness (Changes)'; +$theme[30]['PATH'] = SM_PATH . 'themes/random.php'; +$theme[30]['NAME'] = 'Random (Changes every login)'; +$theme[31]['PATH'] = SM_PATH . 'themes/midnight.php'; +$theme[31]['NAME'] = 'Midnight'; +$theme[32]['PATH'] = SM_PATH . 'themes/alien_glow.php'; +$theme[32]['NAME'] = 'Alien Glow'; +$theme[33]['PATH'] = SM_PATH . 'themes/dark_green.php'; +$theme[33]['NAME'] = 'Dark Green'; +$theme[34]['PATH'] = SM_PATH . 'themes/penguin.php'; +$theme[34]['NAME'] = 'Penguin'; + +$default_use_javascript_addr_book = false; +$addrbook_dsn = ''; +$addrbook_table = 'address'; + +$prefs_dsn = ''; +$prefs_table = 'userprefs'; +$prefs_user_field = 'user'; +$prefs_key_field = 'prefkey'; +$prefs_val_field = 'prefval'; +$no_list_for_subscribe = false; +$smtp_auth_mech = 'none'; +$imap_auth_mech = 'login'; +$use_imap_tls = false; +$use_smtp_tls = false; +$session_name = 'SQMSESSID'; + +@include SM_PATH . 'config/config_local.php'; + +/** + * Make sure there are no characters after the PHP closing + * tag below (including newline characters and whitespace). + * Otherwise, that character will cause the headers to be + * sent and regular output to begin, which will majorly screw + * things up when we try to send more headers later. + */ +?> diff --git a/network/squirrelmail/config_local.php b/network/squirrelmail/config_local.php new file mode 100644 index 0000000000..fb4ee5967a --- /dev/null +++ b/network/squirrelmail/config_local.php @@ -0,0 +1,18 @@ +<?php + +/** + * Local config overrides. + * + * You can override the config.php settings here. + * Don't do it unless you know what you're doing. + * Use standard PHP syntax, see config.php for examples. + * + * @copyright © 2002-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail + * @subpackage config + */ + +$default_folder_prefix = ''; +?> diff --git a/network/squirrelmail/doinst.sh b/network/squirrelmail/doinst.sh new file mode 100644 index 0000000000..2d2ff2bd28 --- /dev/null +++ b/network/squirrelmail/doinst.sh @@ -0,0 +1,2 @@ +chown apache:apache /var/lib/squirrelmail/prefs /var/spool/squirrelmail/attach +chmod 0700 /var/lib/squirrelmail/prefs /var/spool/squirrelmail/attach diff --git a/network/squirrelmail/slack-desc b/network/squirrelmail/slack-desc new file mode 100644 index 0000000000..f357150415 --- /dev/null +++ b/network/squirrelmail/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------------------------------------------------------| +squirrelmail: squirrelmail (forever green webmail) +squirrelmail: +squirrelmail: SquirrelMail is a project that provides both a web-based email client +squirrelmail: and a proxy server for the IMAP protocol. +squirrelmail: +squirrelmail: +squirrelmail: +squirrelmail: +squirrelmail: +squirrelmail: +squirrelmail: diff --git a/network/squirrelmail/squirrelmail.SlackBuild b/network/squirrelmail/squirrelmail.SlackBuild new file mode 100644 index 0000000000..b3ed6818f2 --- /dev/null +++ b/network/squirrelmail/squirrelmail.SlackBuild @@ -0,0 +1,173 @@ +#!/bin/sh + +# Slackware build script for squirrelmail + +# 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=squirrelmail +VERSION=${VERSION:-1.4.22} +LOCALEVERSION=${LOCALEVERSION:-1.4.18-20090526} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM="squirrelmail-webmail" + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $PKG/usr/share $OUTPUT +cd $PKG/usr/share +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +mv $SRCNAM* $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 {} \; + +mkdir -p $PKG/usr/doc/ +mv doc $PKG/usr/doc/$PRGNAM-$VERSION +mv plugins/README.plugins $PKG/usr/doc/$PRGNAM-$VERSION +mv locale/README.locales $PKG/usr/doc/$PRGNAM-$VERSION +mv themes/README.themes $PKG/usr/doc/$PRGNAM-$VERSION +rm -f $PKG/usr/doc/$PRGNAM-$VERSION/.htaccess +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/etc/httpd/extra +cat $CWD/squirrelmail.conf > $PKG/etc/httpd/extra/squirrelmail.conf + +rm -rf $TMP/squireelmail-locales +mkdir $TMP/squireelmail-locales +cd $TMP/squireelmail-locales +tar xf $CWD/locales-$LOCALEVERSION-src.tar.gz + +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 {} \; + +#use utf-8 by default +for LOCALE in $(ls locale/) ; do + SKIPINVALID= + case $LOCALE in + ja_JP) + CHARSET=euc-jp + ;; + ko_KR) + SKIPINVALID=-c + CHARSET=$(grep CHARSET locale/$LOCALE/setup.php | \ + cut -f6 -d\') + ;; + *) + CHARSET=$(grep CHARSET locale/$LOCALE/setup.php | \ + cut -f6 -d\') + ;; + esac + + grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || true + + if [ "$CHARSET" != utf-8 -a "$CHARSET" != UTF-8 ] ; then + for a in $(ls help/$LOCALE/ 2>/dev/null) ; do + if [ "$LOCALE" == "ja_JP" ] ; then continue ; fi + iconv $SKIPINVALID -f $CHARSET -t utf-8 \ + help/$LOCALE/$a > $a.new && \ + mv $a.new help/$LOCALE/$a + done + sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \ + -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \ + locale/$LOCALE/setup.php > \ + setup.php.new && \ + mv setup.php.new locale/$LOCALE/setup.php + fi +done + +for POFILE in $(find locale -name \*.po) ; do + CHARSET=$(grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\) + if [ "$CHARSET" != utf-8 -a "$CHARSET" != UTF-8 ]; then + sed s/charset=$CHARSET/charset=utf-8/ $POFILE | \ + iconv -f $CHARSET -t utf-8 > $POFILE.new && \ + mv $POFILE.new $POFILE + fi +done + +for POFILE in $(find . -name \*.po) ; do + msgfmt $POFILE -c -o $(echo $POFILE | sed s/\.po\$/.mo/) +done + +find locale -name \*.mo | cpio -pduv $PKG/usr/share/squirrelmail/ +cp -r images/* $PKG/usr/share/squirrelmail/images/ +cp -r help/* $PKG/usr/share/squirrelmail/help/ + +cd $PKG/usr/share/squirrelmail + +sed -i 's/^ *\($default_charset *=\).*$/'"\1 'utf-8';/" \ + config/config_default.php + +sed -i functions/i18n.php \ + -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ + -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" + +rm -f plugins/make_archive.pl + +mkdir -p $PKG/etc/squirrelmail + +cp $CWD/config.php $PKG/etc/squirrelmail/config.php +ln -sf /etc/squirrelmail/config.php config/config.php + +cp $CWD/config_local.php $PKG/etc/squirrelmail/config_local.php +ln -sf /etc/squirrelmail/config_local.php config/config_local.php + +mv plugins/squirrelspell/sqspell_config.php \ + $PKG/etc/squirrelmail/sqspell_config.php +ln -sf /etc/squirrelmail/sqspell_config.php \ + plugins/squirrelspell/sqspell_config.php + +mv data/default_pref $PKG/etc/squirrelmail/default_pref +mkdir -p $PKG/var/lib/squirrelmail/prefs +ln -sf /etc/squirrelmail/default_pref \ + $PKG/var/lib/squirrelmail/prefs/default_pref + +mkdir -p $PKG/var/spool/squirrelmail/attach + +mkdir -p $PKG/etc/cron.daily +cp $CWD/squirrelmail.cron $PKG/etc/cron.daily/squirrelmail +chmod +x $PKG/etc/cron.daily/squirrelmail + +rm -rf contrib data po README configure plugins/demo + +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/network/squirrelmail/squirrelmail.conf b/network/squirrelmail/squirrelmail.conf new file mode 100644 index 0000000000..858426271e --- /dev/null +++ b/network/squirrelmail/squirrelmail.conf @@ -0,0 +1,36 @@ +# +# SquirrelMail is a webmail package written in PHP. +# + +Alias /webmail /usr/share/squirrelmail + +<Directory "/usr/share/squirrelmail/plugins/squirrelspell/modules"> + <IfModule mod_authz_core.c> + # Apache 2.4 + Require all denied + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order deny,allow + Deny from all + </IfModule> +</Directory> + +# this section makes squirrelmail use https connections only, for this you +# need to have mod_ssl installed. If you want to use unsecure http +# connections, just remove this section: +<Directory /usr/share/squirrelmail> + RewriteEngine on + RewriteCond %{HTTPS} !=on + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + <IfModule mod_authz_core.c> + # Apache 2.4 + Require all granted + </IfModule> + <IfModule !mod_authz_core.c> + # Apache 2.2 + Order allow,deny + Allow from all + </IfModule> +</Directory> + diff --git a/network/squirrelmail/squirrelmail.cron b/network/squirrelmail/squirrelmail.cron new file mode 100644 index 0000000000..7556163a6f --- /dev/null +++ b/network/squirrelmail/squirrelmail.cron @@ -0,0 +1,5 @@ +#!/bin/sh + +find /var/spool/squirrelmail/attach/ -type f -mtime +30 -print0 | + xargs -0 rm -f >/dev/null 2>&1 + diff --git a/network/squirrelmail/squirrelmail.info b/network/squirrelmail/squirrelmail.info new file mode 100644 index 0000000000..6c983f39ae --- /dev/null +++ b/network/squirrelmail/squirrelmail.info @@ -0,0 +1,12 @@ +PRGNAM="squirrelmail" +VERSION="1.4.22" +HOMEPAGE="https://squirrelmail.sourceforge.net" +DOWNLOAD="https://downloads.sourceforge.net/project/squirrelmail/stable/1.4.22/squirrelmail-webmail-1.4.22.tar.gz \ + https://sourceforge.net/projects/squirrelmail/files/locales/1.4.18-20090526/locales-1.4.18-20090526-src.tar.gz" +MD5SUM="ae9e2bc7f4fa58162b6152fcb0cbb3a5 \ + fc5258ad981f866844955e27a0fb9b67" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Jan F. Chadima" +EMAIL="jfch@jagda.eu" diff --git a/network/ssh-chat/README b/network/ssh-chat/README new file mode 100644 index 0000000000..839acf76ee --- /dev/null +++ b/network/ssh-chat/README @@ -0,0 +1,23 @@ +ssh-chat (IRC-like chat server using ssh as a client) + +ssh-chat is a custom SSH server written in Go. Instead of a shell, you +get a chat prompt. + +Note that this is only the server. There is no dedicated client: users +just use ssh to connect to the server. + +This SlackBuild just repackages the official release binary, and does +not attempt to compile anything. + +There is no startup script; if you want to run ssh-chat as a daemon, +add something like this to /etc/rc.d/rc.local: + +if [ -x /usr/sbin/ssh-chat ]; then + cd / + /usr/sbin/ssh-chat <options> </dev/null >/dev/null 2>&1 & +fi + +Replace <options> with whatever options you want (one of which should +be --log). If you'd rather run as a non-root user, prefix the command +with e.g. "su - nobody -s ", and make sure your --bind has a port +numbered higher than 1024. diff --git a/network/hipchat2/slack-desc b/network/ssh-chat/slack-desc index 7bb368c576..6b2b1f2413 100644 --- a/network/hipchat2/slack-desc +++ b/network/ssh-chat/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -hipchat2: hipchat2 (old version of HipChat for 32 bit users) -hipchat2: -hipchat2: HipChat is a private group messaging service. -hipchat2: -hipchat2: This SlackBuild packages an old version of HipChat for 32-bit users. -hipchat2: 64-bit users should use the 'hipchat' SlackBuild instead. -hipchat2: -hipchat2: Home: http://www.hipchat.com/linux -hipchat2: -hipchat2: -hipchat2: +ssh-chat: ssh-chat (IRC-like chat server using ssh as a client) +ssh-chat: +ssh-chat: ssh-chat is a custom SSH server written in Go. Instead of a shell, you +ssh-chat: get a chat prompt. +ssh-chat: +ssh-chat: Note that this is only the server. There is no dedicated client: users +ssh-chat: just use ssh to connect to the server. +ssh-chat: +ssh-chat: +ssh-chat: +ssh-chat: diff --git a/network/ssh-chat/ssh-chat.8 b/network/ssh-chat/ssh-chat.8 new file mode 100644 index 0000000000..a1889dafdb --- /dev/null +++ b/network/ssh-chat/ssh-chat.8 @@ -0,0 +1,116 @@ +.\" Man page generated from reStructuredText. +. +.TH SSH-CHAT 8 "2020-11-18" "1.10" "SlackBuilds.org" +.SH NAME +ssh-chat \- custom ssh server providing IRC-like chat +. +.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 ssh-chat(1) man page. Convert with: +. +.\" rst2man.py ssh-chat.rst > ssh-chat.8 +. +.\" rst2man.py comes from the SBo development/docutils package. +. +.SH SYNOPSIS +.sp +ssh\-chat [\fI\-options\fP] +.SH DESCRIPTION +.sp +ssh\-chat is a custom SSH server written in Go. Instead of a shell, +clients get a chat prompt when they connect. +.sp +There is no specific client for ssh\-chat; use a standard ssh client to connect. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \-v\fP,\fB \-\-verbose +Show verbose logging. +.TP +.B \-\-version +Print version and exit. +.TP +.BI \-i\fP,\fB \-\-identity\fB= file +Private key to identify server with. (default: ~/.ssh/id_rsa) +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-bind=host:port +Host and port to listen on. (default: 0.0.0.0:2022) +.UNINDENT +.INDENT 0.0 +.TP +.BI \-\-admin\fB= file +File of public keys who are admins. +.TP +.BI \-\-whitelist\fB= file +Optional file of public keys who are allowed to connect. +.TP +.BI \-\-motd\fB= file +Optional Message of the Day file. +.TP +.BI \-\-log\fB= file +Write chat log to this file. +.TP +.BI \-\-pprof\fB= yes +Enable pprof http server for profiling. +.TP +.B \-h\fP,\fB \-\-help +Show this help message +.UNINDENT +.SH DEMO +.sp +To connect to the project\(aqs ssh\-chat server: +.sp +$ ssh ssh.chat +.SH EXAMPLES +.sp +ssh\-chat \-\-verbose \-\-bind ":22" \-\-identity ~/.ssh/id_dsa +.sp +To bind on port 22, you\(aqll need to make sure it\(aqs free (move any other ssh +daemons to another port) and run ssh\-chat as root (or with sudo). +.sp +Note that ssh\-chat doesn\(aqt run in the background. If you want to \(aqdaemonize\(aq it, +use the \-\-log option, and run it with a command like: +.sp +$ cd / ; ssh\-chat [options] \-\-log=logfile </dev/null >/dev/null 2>&1 & +.SH COPYRIGHT +.sp +See the file /usr/doc/ssh\-chat\-1.10/LICENSE for license information. +.SH AUTHORS +.sp +ssh\-chat was written by Andrey Petrov. +.sp +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. +.SH SEE ALSO +.sp +ssh(1), sshd(1) +.sp +The ssh\-chat homepage: \fI\%https://github.com/shazow/ssh\-chat/\fP +.\" Generated by docutils manpage writer. +. diff --git a/network/ssh-chat/ssh-chat.SlackBuild b/network/ssh-chat/ssh-chat.SlackBuild new file mode 100644 index 0000000000..8227429ec8 --- /dev/null +++ b/network/ssh-chat/ssh-chat.SlackBuild @@ -0,0 +1,62 @@ +#!/bin/sh + +# Slackware build script for ssh-chat + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=ssh-chat +VERSION=${VERSION:-1.10} +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 + i?86) SRCARCH="386" ;; + x86_64) SRCARCH="amd64" ;; + *) echo "Unsupported ARCH '$ARCH' (only i586, i686, x864_64 supported)" 1>&2 + exit 1 ;; +esac + +set -e + +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-linux_$SRCARCH.tgz +cd $PRGNAM +chown -R root:root . + +mkdir -p $PKG/usr/sbin $PKG/usr/doc/$PRGNAM-$VERSION +install -m0755 $PRGNAM $PKG/usr/sbin +install -m0644 README* LICENSE* $PKG/usr/doc/$PRGNAM-$VERSION + +# man page by SlackBuild author +mkdir -p $PKG/usr/man/man8 +gzip -9 < $CWD/$PRGNAM.8 > $PKG/usr/man/man8/$PRGNAM.8.gz + +# include our README since it has Slack-specific stuff. +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/network/ssh-chat/ssh-chat.info b/network/ssh-chat/ssh-chat.info new file mode 100644 index 0000000000..82a1e31182 --- /dev/null +++ b/network/ssh-chat/ssh-chat.info @@ -0,0 +1,10 @@ +PRGNAM="ssh-chat" +VERSION="1.10" +HOMEPAGE="https://github.com/shazow/ssh-chat/" +DOWNLOAD="https://github.com/shazow/ssh-chat/releases/download/v1.10/ssh-chat-linux_386.tgz" +MD5SUM="21313e16a3ffcb2659231d93d4010d40" +DOWNLOAD_x86_64="https://github.com/shazow/ssh-chat/releases/download/v1.10/ssh-chat-linux_amd64.tgz" +MD5SUM_x86_64="624d31da8f76331bc03bd07f3ff6fd4c" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/ssh-chat/ssh-chat.rst b/network/ssh-chat/ssh-chat.rst new file mode 100644 index 0000000000..1e3dfb44ef --- /dev/null +++ b/network/ssh-chat/ssh-chat.rst @@ -0,0 +1,104 @@ +.. RST source for ssh-chat(1) man page. Convert with: +.. rst2man.py ssh-chat.rst > ssh-chat.8 +.. rst2man.py comes from the SBo development/docutils package. + +.. |version| replace:: 1.10 +.. |date| date:: + +======== +ssh-chat +======== + +----------------------------------------- +custom ssh server providing IRC-like chat +----------------------------------------- + +:Manual section: 8 +:Manual group: SlackBuilds.org +:Date: |date| +:Version: |version| + +SYNOPSIS +======== + +ssh-chat [*-options*] + +DESCRIPTION +=========== + +ssh-chat is a custom SSH server written in Go. Instead of a shell, +clients get a chat prompt when they connect. + +There is no specific client for ssh-chat; use a standard ssh client to connect. + +OPTIONS +======= + +-v, --verbose + Show verbose logging. + +--version + Print version and exit. + +-i, --identity=file + Private key to identify server with. (default: ~/.ssh/id_rsa) + +--bind=host:port + Host and port to listen on. (default: 0.0.0.0:2022) + +--admin=file + File of public keys who are admins. + +--whitelist=file + Optional file of public keys who are allowed to connect. + +--motd=file + Optional Message of the Day file. + +--log=file + Write chat log to this file. + +--pprof=yes + Enable pprof http server for profiling. + +-h, --help Show this help message + +DEMO +==== + +To connect to the project's ssh-chat server: + +$ ssh ssh.chat + +EXAMPLES +======== + +ssh-chat --verbose --bind ":22" --identity ~/.ssh/id_dsa + +To bind on port 22, you'll need to make sure it's free (move any other ssh +daemons to another port) and run ssh-chat as root (or with sudo). + +Note that ssh-chat doesn't run in the background. If you want to 'daemonize' it, +use the --log option, and run it with a command like: + +$ cd / ; ssh-chat [options] --log=logfile </dev/null >/dev/null 2>&1 & + +COPYRIGHT +========= + +See the file /usr/doc/ssh-chat-|version|/LICENSE for license information. + +AUTHORS +======= + +ssh-chat was written by Andrey Petrov. + +This man page written for the SlackBuilds.org project +by B. Watson, and is licensed under the WTFPL. + +SEE ALSO +======== + +ssh(1), sshd(1) + +The ssh-chat homepage: https://github.com/shazow/ssh-chat/ diff --git a/network/sshfs-fuse/README b/network/sshfs-fuse/README index 300d34090d..4b484d5915 100644 --- a/network/sshfs-fuse/README +++ b/network/sshfs-fuse/README @@ -1,3 +1,5 @@ +sshfs-fuse (ssh file system module for FUSE) + SSHFS (Secure SHell FileSystem) is a file system for Linux capable of operating on files on a remote computer using just a secure shell login on the remote computer. On the local computer where the SSHFS is mounted, diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild index 1e43941878..c473ebeec4 100644 --- a/network/sshfs-fuse/sshfs-fuse.SlackBuild +++ b/network/sshfs-fuse/sshfs-fuse.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh -# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom # Copyright 2006-2009 Alan Hicks, Lizella, GA +# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom +# Copyright 2020, B. Watson # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +22,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Now maintained by B. Watson <yalhcru@gmail.com> + +# 20201208 bkw: update for v3.7.1. +# 20200804 bkw: update for v3.7.0. +# 20200101 bkw: +# - take over maintenance +# - update for v3.6.0. too many changes to build old versions. + PRGNAM=sshfs-fuse SRCNAM=sshfs -VERSION=${VERSION:-2.8} +VERSION=${VERSION:-3.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,36 +69,43 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +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 \ - -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 +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -make -make install DESTDIR=$PKG +mkdir build +cd build + CFLAGS="-Wl,-s $SLKCFLAGS" \ + CXXFLAGS="-Wl,-s $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 +# Use prebuilt man page, so this build doesn't depend on docutils. +# Don't use the one installed by ninja, if there was one. +MANDIR=$PKG/usr/man/man1 +rm -f $MANDIR/$SRCNAM.1 +mkdir -p $MANDIR +cat $CWD/$SRCNAM.1.gz > $MANDIR/$SRCNAM.1.gz -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 +# We got symlinks for commands, so link the man pages too. Slightly +# wrong, as the linked commands are in /usr/sbin, but the man page +# is section 1 (not 8). I can live with it. +ln -s $SRCNAM.1.gz $MANDIR/mount.fuse.sshfs.1.gz +ln -s $SRCNAM.1.gz $MANDIR/mount.sshfs.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog* README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info index ec97eeb668..54bb56b52e 100644 --- a/network/sshfs-fuse/sshfs-fuse.info +++ b/network/sshfs-fuse/sshfs-fuse.info @@ -1,10 +1,10 @@ PRGNAM="sshfs-fuse" -VERSION="2.8" +VERSION="3.7.1" HOMEPAGE="https://github.com/libfuse/sshfs" -DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs_2.8/sshfs-2.8.tar.gz" -MD5SUM="0ba25e848ee59e2595d6576c8f6284b6" +DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.1/sshfs-3.7.1.tar.xz" +MD5SUM="22ac23d05ca7c56fb568627f086374d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Michiel van Wessem" -EMAIL="michiel@slackbuilds.org" +REQUIRES="meson fuse3" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/sshfs-fuse/sshfs.1.gz b/network/sshfs-fuse/sshfs.1.gz Binary files differnew file mode 100644 index 0000000000..182444d7a1 --- /dev/null +++ b/network/sshfs-fuse/sshfs.1.gz diff --git a/network/sshpass/sshpass.SlackBuild b/network/sshpass/sshpass.SlackBuild index 6811febe8d..595700a06c 100644 --- a/network/sshpass/sshpass.SlackBuild +++ b/network/sshpass/sshpass.SlackBuild @@ -2,9 +2,8 @@ # Slackware build script for sshpass -# Copyright 2012 K.D.Hedger -# kdhedger@yahoo.co.uk -# +# Copyright 2012 K.D.Hedger <kdhedger@yahoo.co.uk> +# Copyright 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sshpass -VERSION=${VERSION:-1.05} +VERSION=${VERSION:-1.06} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/sshpass/sshpass.info b/network/sshpass/sshpass.info index 5de6956cee..5e9dddc1ea 100644 --- a/network/sshpass/sshpass.info +++ b/network/sshpass/sshpass.info @@ -1,10 +1,10 @@ PRGNAM="sshpass" -VERSION="1.05" +VERSION="1.06" HOMEPAGE="https://sourceforge.net/projects/sshpass" -DOWNLOAD="http://downloads.sourceforge.net/sshpass/sshpass-1.05.tar.gz" -MD5SUM="c52d65fdee0712af6f77eb2b60974ac7" +DOWNLOAD="http://downloads.sourceforge.net/sshpass/sshpass-1.06.tar.gz" +MD5SUM="f59695e3b9761fb51be7d795819421f9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="K.D.Hedger" -EMAIL="kdhedger@yahoo.co.uk" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/network/sshuttle/sshuttle.SlackBuild b/network/sshuttle/sshuttle.SlackBuild index ab71b64d8f..4815edb73c 100644 --- a/network/sshuttle/sshuttle.SlackBuild +++ b/network/sshuttle/sshuttle.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh # Slackware build script for "sshuttle". +# Yth | Pont-en-Royans, France | yth@ythogtha.org # Copyright 2014-2016 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=sshuttle -VERSION=${VERSION:-0.78.1} +VERSION=${VERSION:-1.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,7 +72,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 mkdir -p $PKG/usr/man/man8 cat $TMP/$PRGNAM-$VERSION/Documentation/$PRGNAM.8 | gzip -9c > \ diff --git a/network/sshuttle/sshuttle.info b/network/sshuttle/sshuttle.info index 484552dbf3..bf996f1487 100644 --- a/network/sshuttle/sshuttle.info +++ b/network/sshuttle/sshuttle.info @@ -1,10 +1,10 @@ PRGNAM="sshuttle" -VERSION="0.78.1" -HOMEPAGE="https://github.com/apenwarr/sshuttle/" -DOWNLOAD="https://pypi.python.org/packages/48/be/c1c9ead0c38383c4b2a192de4679f09413ddc6701988ca56bd220c64ec50/sshuttle-0.78.1.tar.gz" -MD5SUM="3b792dc650c99ce6e8bbeae6d5f1179e" +VERSION="1.0.5" +HOMEPAGE="https://github.com/sshuttle/sshuttle" +DOWNLOAD="https://pypi.python.org/packages/source/s/sshuttle/sshuttle-1.0.5.tar.gz" +MD5SUM="10c9765f2cc2a3e3e080a4a218428cc4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pytest-runner" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" +REQUIRES="python3" +MAINTAINER="Yth - Arnaud" +EMAIL="yth@ythogtha.org" diff --git a/network/sslscan/README b/network/sslscan/README index 6626f8fa0c..f20fe6373c 100644 --- a/network/sslscan/README +++ b/network/sslscan/README @@ -3,8 +3,8 @@ ciphers that are supported. SSLScan is designed to be easy, lean and fast. The output includes prefered ciphers of the SSL service, the certificate, and is in Text and XML formats. -Upstream recommends building statically against OpenSSL 1.0.2 (with weak -ciphers and small DH keys re-enabled) for the widest compatibility for -scanning. You can build against the system openssl with: +Upstream recommends building statically against OpenSSL 1.1.1 for the +widest compatibility for scanning. You can build against the system +openssl with: STATIC=no ./sslscan.SlackBuild diff --git a/network/sslscan/sslscan.SlackBuild b/network/sslscan/sslscan.SlackBuild index 2292ef2d7b..8cb4d1483a 100644 --- a/network/sslscan/sslscan.SlackBuild +++ b/network/sslscan/sslscan.SlackBuild @@ -5,7 +5,7 @@ # Copyright (c) 2010 Markus Reichelt, Aachen, DE # Copyright (c) 2014 Andrew Clemons, Wellington, New Zealand # Copyright (c) 2015 Andrew Clemons, Leimen, Germany -# Copyright (c) 2016-2019 Andrew Clemons, Wellington, New Zealand +# Copyright (c) 2016-2021 Andrew Clemons, Wellington, New Zealand # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -33,7 +33,7 @@ # 2014-10-23 - changed to build rbsec's fork from github PRGNAM=sslscan -VERSION=${VERSION:-1.11.13} +VERSION=${VERSION:-2.0.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,9 +65,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-rbsec -tar xvf $CWD/$PRGNAM-$VERSION-rbsec.tar.gz -cd $PRGNAM-$VERSION-rbsec +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION sed -i 's/^\(\.openssl.is.fresh:\).*$/\1/' Makefile sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile @@ -75,7 +75,7 @@ sed -i "s/^GIT_VERSION = .*$/GIT_VERSION = $VERSION/" Makefile STATIC=${STATIC:-yes} if [ "$STATIC" = "yes" ] ; then - OPENSSLVERSION=${OPENSSLVERSION:-83abb7af5cee7dd1c9ab500a10a776c586a18f1b} + OPENSSLVERSION=${OPENSSLVERSION:-f82f5392f39797c1cf3a5d114c0125f121b0f769} tar xf "$CWD/openssl-$OPENSSLVERSION.tar.gz" mv "openssl-$OPENSSLVERSION" openssl fi diff --git a/network/sslscan/sslscan.info b/network/sslscan/sslscan.info index 69dc61865c..43d38b4602 100644 --- a/network/sslscan/sslscan.info +++ b/network/sslscan/sslscan.info @@ -1,10 +1,10 @@ PRGNAM="sslscan" -VERSION="1.11.13" +VERSION="2.0.9" HOMEPAGE="https://github.com/rbsec/sslscan" -DOWNLOAD="https://github.com/rbsec/sslscan/archive/1.11.13-rbsec/sslscan-1.11.13-rbsec.tar.gz \ - https://github.com/PeterMosmans/openssl/archive/83abb7af5cee7dd1c9ab500a10a776c586a18f1b/openssl-83abb7af5cee7dd1c9ab500a10a776c586a18f1b.tar.gz" -MD5SUM="ca73b626b93dc228989241b4decd42e6 \ - 7bc7d20f588c8467fdfcddd92a88e3d9" +DOWNLOAD="https://github.com/rbsec/sslscan/archive/2.0.9/sslscan-2.0.9.tar.gz \ + https://github.com/openssl/openssl/archive/f82f5392f39797c1cf3a5d114c0125f121b0f769/openssl-f82f5392f39797c1cf3a5d114c0125f121b0f769.tar.gz" +MD5SUM="40499de48ece973c22fc342067161c80 \ + 442bd6882aaef2f2199507ec6c6ec357" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/ssmtp/ssmtp.SlackBuild b/network/ssmtp/ssmtp.SlackBuild index 528a75876c..68cdd43e76 100644 --- a/network/ssmtp/ssmtp.SlackBuild +++ b/network/ssmtp/ssmtp.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh # Copyright (c) 2011-2014 LEVAI Daniel +# Copyright (c) 2020 B. Watson # All rights reserved. # # * Redistribution and use in source and binary forms, with or without @@ -23,6 +24,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, no script changes yet. + PRGNAM=ssmtp VERSION=${VERSION:-2.64} BUILD=${BUILD:-3} diff --git a/network/ssmtp/ssmtp.info b/network/ssmtp/ssmtp.info index 4cda3081be..7f071a8d22 100644 --- a/network/ssmtp/ssmtp.info +++ b/network/ssmtp/ssmtp.info @@ -6,5 +6,5 @@ MD5SUM="65b4e0df4934a6cd08c506cabcbe584f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="LEVAI Daniel" -EMAIL="leva@ecentrum.hu" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/strongswan/README b/network/strongswan/README index 1a0e9c8a6a..df3dafaff3 100644 --- a/network/strongswan/README +++ b/network/strongswan/README @@ -4,7 +4,7 @@ This SlackBuild enables configure options which are known to compile without issue on a stock Slackware 14.2 system. These options provide additional functionality and increase this packages ability to inter operate with various vendor implementations. Unwanted and/or -unnecessary plugins can be disabled a run-time via the 'load' flag in +unnecessary plugins can be disabled at run-time via the 'load' flag in /etc/strongswan.d/charon/*.conf files. The following configure options are enabled by default: @@ -67,6 +67,10 @@ EXTRA_CONFIG_OPTS environment variable. Example: env EXTRA_CONFIG_OPTS="--enable-socket-dynamic --enable-dhcp" sh ./strongswan.SlackBuild +Certain use cases may cause issues when bypass-lan is loaded. The SlackBuild script +disables loading of the bypass-lan module. This can be changed in bypass-lan.conf +after installation if required. + The list of available options and their descriptions are available here: https://wiki.strongswan.org/projects/strongswan/wiki/Autoconf diff --git a/network/strongswan/doinst.sh b/network/strongswan/doinst.sh index a88995c5ed..19a6ff6ac8 100644 --- a/network/strongswan/doinst.sh +++ b/network/strongswan/doinst.sh @@ -1,22 +1,13 @@ - 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... + 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... } -# doinst.sh reads the list of files from ./install/conffiles at install time. -# ./install/conffiles was generated by strongswan.SlackBuild -for cf in $(cat install/conffiles) -do - config $cf.new -done diff --git a/network/strongswan/strongswan.SlackBuild b/network/strongswan/strongswan.SlackBuild index a36d0c351c..b10ef33b87 100644 --- a/network/strongswan/strongswan.SlackBuild +++ b/network/strongswan/strongswan.SlackBuild @@ -23,6 +23,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# 2020-12-21 +# - upgraded upstream version to 5.9.1 +# - continue building bypass-lan but disable it by default so that the +# admin can still enable it if necessary +# # 2019-09-17 # - upgraded upstream version to 5.8.1 # - added additional "enable" options to DEFAULT_CONFIG_OPTS @@ -33,7 +38,7 @@ # PRGNAM=strongswan -VERSION=${VERSION:-5.8.1} +VERSION=${VERSION:-5.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -165,7 +170,12 @@ cd $PKG for i in $(find etc -type f) do mv $i $i.new - echo $i -done 1>>$PKG/install/conffiles + echo "config $i.new" >> $PKG/install/doinst.sh +done + +# bypass-lan may cause problems for most users but it still used in many +# situations. Disable it by default allowing the user to enable it if +# necessary. +sed -i -e 's/load = yes/load = no/' $PKG/etc/strongswan.d/charon/bypass-lan.conf.new /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/strongswan/strongswan.info b/network/strongswan/strongswan.info index 2150bf7408..e546dc9c3b 100644 --- a/network/strongswan/strongswan.info +++ b/network/strongswan/strongswan.info @@ -1,8 +1,8 @@ PRGNAM="strongswan" -VERSION="5.8.1" +VERSION="5.9.1" HOMEPAGE="https://www.strongswan.org" -DOWNLOAD="https://download.strongswan.org/strongswan-5.8.1.tar.bz2" -MD5SUM="5a6b9980cd1ac4fad3c24b55ed960ac9" +DOWNLOAD="https://download.strongswan.org/strongswan-5.9.1.tar.bz2" +MD5SUM="1f4db969d072e120dc12d1c116a0f658" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/surfraw/surfraw.SlackBuild b/network/surfraw/surfraw.SlackBuild index 37eb88548d..155818de26 100644 --- a/network/surfraw/surfraw.SlackBuild +++ b/network/surfraw/surfraw.SlackBuild @@ -22,9 +22,11 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200111 bkw: Modified by SlackBuilds.org (to fix broken man symlinks) + PRGNAM=surfraw VERSION=${VERSION:-2.3.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} ARCH=noarch @@ -65,8 +67,10 @@ make install DESTDIR=$PKG mv $PKG/etc/xdg/surfraw/conf $PKG/etc/xdg/surfraw/conf.new mv $PKG/etc/xdg/surfraw/bookmarks $PKG/etc/xdg/surfraw/bookmarks.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 +# 20200111 bkw: upstream installs over 100 broken symlinks in the man dir, +# which point to nonexistent gzipped man pages. Turns out, if we gzip the +# ones that *aren't* symlinks, all is well. +find -L $PKG/usr/man -type f -exec gzip -9 {} + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/network/surl/README b/network/surl/README new file mode 100644 index 0000000000..0fe4a8170a --- /dev/null +++ b/network/surl/README @@ -0,0 +1,14 @@ +surl (URL shortener) + +surl is a URL shortening command line application that supports +various sites. It supports stdin or filename input. It grabs the +URLs, converts them, and returns the same text that was used in the +input. It is known to work with a few services, such as tinyurl.com, +is.gd, and others. + +surl hasn't been updated in a few years, so not all of the services +it supports are still functional due to changes in the services' APIs. +The known non-working services have been disabled in this SlackBuild. + +Note: Another "surl" project exists, on github. It's a service, not a +client like this surl. diff --git a/network/surl/disable_broken_services.diff b/network/surl/disable_broken_services.diff new file mode 100644 index 0000000000..a8c3581532 --- /dev/null +++ b/network/surl/disable_broken_services.diff @@ -0,0 +1,94 @@ +diff -Naur recipe-0.7.1.1-1~ppa2/docs/surl.1 recipe-0.7.1.1-1~ppa2.patched/docs/surl.1 +--- recipe-0.7.1.1-1~ppa2/docs/surl.1 2013-09-01 08:27:48.000000000 -0400 ++++ recipe-0.7.1.1-1~ppa2.patched/docs/surl.1 2020-11-14 00:21:20.723851357 -0500 +@@ -124,16 +124,16 @@ + .INDENT 0.0 + .IP \(bu 2 + . +-\fCecho \(aqhttp://google.co.uk\(aq | surl \-a myapikey123 \-u example \-s bit.ly\fP ++\fCecho \(aqhttp://google.co.uk\(aq | surl \-a myapikey123 \-u example \-s turl.ca\fP + .IP \(bu 2 + . +-\fCecho \(aqhttp://www.google.com\(aq | surl \-s tr.im\fP ++\fCecho \(aqhttp://www.google.com\(aq | surl \-s clck.ru\fP + .IP \(bu 2 + . +-\fCsurl \-c http://www.google.com \-s tr.im\fP ++\fCsurl \-c http://www.google.com \-s is.gd\fP + .IP \(bu 2 + . +-\fCsurl \-f example.txt \-i \-s tr.im\fP ++\fCsurl \-f example.txt \-i \-s is.gd\fP + .UNINDENT + .SH BUGS + .sp +diff -Naur recipe-0.7.1.1-1~ppa2/docs/surl.rst recipe-0.7.1.1-1~ppa2.patched/docs/surl.rst +--- recipe-0.7.1.1-1~ppa2/docs/surl.rst 2013-09-01 08:27:48.000000000 -0400 ++++ recipe-0.7.1.1-1~ppa2.patched/docs/surl.rst 2020-11-14 00:19:23.019862057 -0500 +@@ -64,10 +64,10 @@ + + EXAMPLES + ======== +-* ``echo 'http://google.co.uk' | surl -a myapikey123 -u example -s bit.ly`` +-* ``echo 'http://www.google.com' | surl -s tr.im`` +-* ``surl -c http://www.google.com -s tr.im`` +-* ``surl -f example.txt -i -s tr.im`` ++* ``echo 'http://google.co.uk' | surl -a myapikey123 -u example -s turl.ca`` ++* ``echo 'http://www.google.com' | surl -s clck.ru`` ++* ``surl -c http://www.google.com -s is.gd`` ++* ``surl -f example.txt -i -s is.gd`` + + BUGS + ==== +diff -Naur recipe-0.7.1.1-1~ppa2/surl/services.py recipe-0.7.1.1-1~ppa2.patched/surl/services.py +--- recipe-0.7.1.1-1~ppa2/surl/services.py 2013-09-01 08:27:48.000000000 -0400 ++++ recipe-0.7.1.1-1~ppa2.patched/surl/services.py 2020-11-14 00:15:04.403885566 -0500 +@@ -29,30 +29,11 @@ + def supportedServices(): + """ Returns a dictionary with the supported surl services """ + dict_service = { +- 'bit.ly' : bitly_com('bit.ly'), +- 'bitly.com' : bitly_com('bit.ly'), +- 'j.mp' : bitly_com('j.mp'), + 'chilp.it' : chilp_it(), + 'clck.ru' : clck_ru(), +- 'crum.bs' : crum_bs(), +- 'decenturl.com': decenturl_com(), +- 'goo.gl' : goo_gl(), + 'is.gd' : is_gd(), +- 'liip.to' : liip_to(), +- 'metamark.net' : metamark_net(), +- 'redir.ec' : redir_ec(), +- 'ri.ms' : tinyarro_ws('ri.ms'), +- 'ta.gd' : tinyarro_ws('ta.gd'), +- 'tinyarro.ws' : tinyarro_ws('tinyarro.ws'), +- 'sn.im' : sn_im('sn.im'), +- 'snipr.com' : sn_im('snipr.com'), +- 'snipurl.com' : sn_im('snipurl.com'), +- 'snurl.com' : sn_im('snurl.com'), +- 'tiny.cc' : tiny_cc(), + 'tinyurl.com' : tinyurl_com(), + 'turl.ca' : turl_ca(), +- 'twurl.nl' : twurl_nl(), +- 'urlx.ru' : urlx_ru(), + } + return dict_service + +diff -Naur recipe-0.7.1.1-1~ppa2/surl/surl.py recipe-0.7.1.1-1~ppa2.patched/surl/surl.py +--- recipe-0.7.1.1-1~ppa2/surl/surl.py 2013-09-01 08:27:48.000000000 -0400 ++++ recipe-0.7.1.1-1~ppa2.patched/surl/surl.py 2020-11-14 00:17:42.283871214 -0500 +@@ -98,10 +98,10 @@ + print(" -r, --script <path>\t\tThe surlscript to execute") + print("\n\nSupported URL shortening services:") + print(" %s\n" % ', '.join(service_list)) +- print("Example:\n echo 'http://google.co.uk' | surl -a myapikey123 -u example -s bit.ly") +- print(" echo 'http://www.google.com' | surl -s tr.im") +- print(" surl -c http://www.google.com -s tr.im") +- print(" surl -f example.txt -i -s tr.im") ++ print("Example:\n echo 'http://google.co.uk' | surl -a myapikey123 -u example -s turl.ca") ++ print(" echo 'http://www.google.com' | surl -s clck.ru") ++ print(" surl -c http://www.google.com -s is.gd") ++ print(" surl -f example.txt -i -s is.gd") + ps.call("Help()") + ps.unload() + sys.exit(error) diff --git a/network/surl/slack-desc b/network/surl/slack-desc new file mode 100644 index 0000000000..f47efc3aac --- /dev/null +++ b/network/surl/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------------------------------------------------------| +surl: surl (URL shortener) +surl: +surl: surl is a URL shortening command line application that supports +surl: various sites. It supports stdin or filename input. It grabs the +surl: URLs, converts them, and returns the same text that was used in the +surl: input. It is known to work with a few services, such as tinyurl.com, +surl: is.gd, and others. +surl: +surl: +surl: +surl: diff --git a/network/surl/surl.SlackBuild b/network/surl/surl.SlackBuild new file mode 100644 index 0000000000..743b1ef192 --- /dev/null +++ b/network/surl/surl.SlackBuild @@ -0,0 +1,71 @@ +#!/bin/sh + +# Slackware build script for surl + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=surl +VERSION=${VERSION:-0.7.1.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} + +# Upstream files and directories are weirdly named. +TARBALL=$CWD/${PRGNAM}_$VERSION-1~ppa2~ubuntu13.10.1.tar.gz +SRCDIR=recipe-$VERSION-1~ppa2 + +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 $SRCDIR +tar xvf $TARBALL +cd $SRCDIR +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 {} \+ + +patch -p1 < $CWD/disable_broken_services.diff + +sed -i 's,share/man,man,' setup.py +python setup.py install --root=$PKG +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS 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/network/surl/surl.info b/network/surl/surl.info new file mode 100644 index 0000000000..bc3564187c --- /dev/null +++ b/network/surl/surl.info @@ -0,0 +1,10 @@ +PRGNAM="surl" +VERSION="0.7.1.1" +HOMEPAGE="https://launchpad.net/surl" +DOWNLOAD="http://ppa.launchpad.net/surl/ppa/ubuntu/pool/main/s/surl/surl_0.7.1.1-1~ppa2~ubuntu13.10.1.tar.gz" +MD5SUM="a70434fabce4c865edd744dd49786e8a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/swaks/slack-desc b/network/swaks/slack-desc index 712ad401ab..ec6345a9c4 100644 --- a/network/swaks/slack-desc +++ b/network/swaks/slack-desc @@ -10,7 +10,7 @@ swaks: swaks (Swiss Army Knife for SMTP) swaks: swaks: Swaks is a featureful, flexible, scriptable, transaction-oriented swaks: SMTP test tool written and maintained by John Jetmore. -swaks: +swaks: swaks: swaks: swaks: website: https://www.jetmore.org/john/code/swaks/ diff --git a/network/syncthing/README b/network/syncthing/README index 6037811cca..86b1197e66 100644 --- a/network/syncthing/README +++ b/network/syncthing/README @@ -8,8 +8,8 @@ on a local network, or between remote devices over the Internet. Before you can build Syncthing, you have to create a syncthing user and group (used when running syncthing as a system-wide daemon): -# groupadd -g 307 syncthing -# useradd -d /var/lib/syncthing -g syncthing -s /bin/bash -u 307 syncthing +groupadd -g 307 syncthing +useradd -d /var/lib/syncthing -g syncthing -s /bin/bash -u 307 syncthing This package includes a rc.syncthing startup script, suitable for running Syncthing as a system daemon - such as on a server. diff --git a/network/syncthing/syncthing.SlackBuild b/network/syncthing/syncthing.SlackBuild index ab3b0e9a77..f1bfc7fc9a 100644 --- a/network/syncthing/syncthing.SlackBuild +++ b/network/syncthing/syncthing.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=syncthing -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.14.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/syncthing/syncthing.info b/network/syncthing/syncthing.info index f5a8983462..ded831ebd6 100644 --- a/network/syncthing/syncthing.info +++ b/network/syncthing/syncthing.info @@ -1,10 +1,10 @@ PRGNAM="syncthing" -VERSION="1.1.0" +VERSION="1.14.0" HOMEPAGE="https://syncthing.net" -DOWNLOAD="https://github.com/syncthing/syncthing/releases/download/v1.1.0/syncthing-linux-386-v1.1.0.tar.gz" -MD5SUM="ea9136b61f5579b805e773ada06bf451" -DOWNLOAD_x86_64="https://github.com/syncthing/syncthing/releases/download/v1.1.0/syncthing-linux-amd64-v1.1.0.tar.gz" -MD5SUM_x86_64="17a98df24d8bdd178fbd8080665e1609" +DOWNLOAD="https://github.com/syncthing/syncthing/releases/download/v1.14.0/syncthing-linux-386-v1.14.0.tar.gz" +MD5SUM="08be360b13127e25fd87e4ffb871150a" +DOWNLOAD_x86_64="https://github.com/syncthing/syncthing/releases/download/v1.14.0/syncthing-linux-amd64-v1.14.0.tar.gz" +MD5SUM_x86_64="18a0ebe796720813b5fce68cc4256f98" REQUIRES="" MAINTAINER="Sebastian Arcus" EMAIL="s.arcus@open-t.co.uk" diff --git a/network/synergy/020_toolchain_commands.diff b/network/synergy/020_toolchain_commands.diff new file mode 100644 index 0000000000..b5fb3fe705 --- /dev/null +++ b/network/synergy/020_toolchain_commands.diff @@ -0,0 +1,41 @@ +--- ext/toolchain/commands1.py.orig 2017-03-04 00:05:27.000000000 +1000 ++++ ext/toolchain/commands1.py 2020-02-12 09:12:23.304443034 +1000 +@@ -967,16 +967,17 @@ + if sys.version_info < (2, 4): + raise Exception("Python 2.4 or greater required.") + +- p = subprocess.Popen( +- ["git", "log", "--pretty=format:%h", "-n", "1"], +- stdout=subprocess.PIPE, stderr=subprocess.PIPE) +- +- stdout, stderr = p.communicate() +- +- if p.returncode != 0: +- raise Exception('Could not get revision, git error: ' + str(p.returncode)) +- +- return stdout.strip() ++# p = subprocess.Popen( ++# ["git", "log", "--pretty=format:%h", "-n", "1"], ++# stdout=subprocess.PIPE, stderr=subprocess.PIPE) ++# ++# stdout, stderr = p.communicate() ++# ++# if p.returncode != 0: ++# raise Exception('Could not get revision, git error: ' + str(p.returncode)) ++# ++# return stdout.strip() ++ return "1.8.8" + + def getGitBranchName(self): + if sys.version_info < (2, 4): +--- src/gui/src/AboutDialog.cpp.orig 2017-03-04 00:05:27.000000000 +1000 ++++ src/gui/src/AboutDialog.cpp 2020-02-12 09:47:52.648113058 +1000 +@@ -29,7 +29,7 @@ + + m_versionChecker.setApp(synergyApp); + QString version = m_versionChecker.getVersion(); +- version = version + '-' + VERSION_STAGE + '-' + VERSION_REVISION; ++ version = version + '-' + VERSION_STAGE; + m_pLabelSynergyVersion->setText(version); + + QString buildDateString = QString::fromLocal8Bit(__DATE__).simplified(); diff --git a/network/synergy/synergy.SlackBuild b/network/synergy/synergy.SlackBuild index adfcef3e4e..21d6a34f49 100644 --- a/network/synergy/synergy.SlackBuild +++ b/network/synergy/synergy.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for "synergy". # Copyright 2013-2016 Marcel Saegebarth <marc@mos6581.de> +# Copyright 2020 Christoph Willing Brisbane, Australia # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,7 +26,8 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=synergy -VERSION=${VERSION:-1.7.6} +SRCNAM=synergy-core +VERSION=${VERSION:-1.8.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,9 +63,12 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-stable -tar xvf $CWD/v$VERSION-stable.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION-stable.tar.gz -cd $PRGNAM-$VERSION-stable +rm -rf $SRCNAM-$VERSION-stable +tar xvf $CWD/$SRCNAM-$VERSION-stable.tar.gz +cd $SRCNAM-$VERSION-stable +patch -p0 < $CWD/010_include_dns_sd.diff +patch -p0 < $CWD/020_toolchain_commands.diff + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -71,8 +76,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 {} \; -# Thanks Christoph Willing -patch -p0 < $CWD/010_include_dns_sd.diff sh hm.sh configure --generator=1 --release CXXFLAGS="$SLKCFLAGS" sh hm.sh build @@ -82,27 +85,27 @@ mkdir -p $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/man/man1 \ $PKG/usr/share/icons/hicolor/256x256 $PKG/usr/share/applications for file in synergy synergyc synergyd synergys syntool usynergy ; do - install -s -m 0755 $TMP/$PRGNAM-$VERSION-stable/bin/$file $PKG/usr/bin + install -s -m 0755 $TMP/$SRCNAM-$VERSION-stable/bin/$file $PKG/usr/bin done for file in synergy.conf.example synergy.conf.example-advanced synergy.conf.example-basic ; do - install -m 0644 $TMP/$PRGNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION + install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/doc/$PRGNAM-$VERSION done for file in COMPILE ChangeLog INSTALL LICENSE README ; do - install -m 0644 $TMP/$PRGNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION + install -m 0644 $TMP/$SRCNAM-$VERSION-stable/$file $PKG/usr/doc/$PRGNAM-$VERSION done for file in synergyc.man synergys.man ; do - install -m 0644 $TMP/$PRGNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1 + install -m 0644 $TMP/$SRCNAM-$VERSION-stable/doc/$file $PKG/usr/man/man1 done find $PKG/usr/man/man1 -type f -name "*.man" -exec rename '.man' '.1' {} \; find $PKG/usr/man/man1 -type f -name "*.?" -exec gzip -9f {} \; -install -m 0644 $TMP/$PRGNAM-$VERSION-stable/res/synergy.ico \ +install -m 0644 $TMP/$SRCNAM-$VERSION-stable/res/synergy.ico \ $PKG/usr/share/icons/hicolor/256x256 -install -D -m 0644 $TMP/$PRGNAM-$VERSION-stable/res/synergy.desktop \ +install -D -m 0644 $TMP/$SRCNAM-$VERSION-stable/res/synergy.desktop \ $PKG/usr/share/applications cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/synergy/synergy.info b/network/synergy/synergy.info index b9cb88632d..495e3aa017 100644 --- a/network/synergy/synergy.info +++ b/network/synergy/synergy.info @@ -1,10 +1,10 @@ PRGNAM="synergy" -VERSION="1.7.6" +VERSION="1.8.8" HOMEPAGE="http://synergy-project.org/" -DOWNLOAD="https://ftp.mirrorservice.org/sites/download.salixos.org/x86_64/extra-14.2/source/network/synergy/v1.7.6-stable.tar.gz" -MD5SUM="a324798a47445de739a7ed4baf12638f" +DOWNLOAD="https://github.com/symless/synergy-core/archive/v1.8.8-stable/synergy-core-1.8.8-stable.tar.gz" +MD5SUM="ad0514cc4dbfbc90aabc75c7ff17f0f3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avahi" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" +MAINTAINER="Christoph Willing" +EMAIL="chris.willing@linux.com" diff --git a/network/t38modem/README b/network/t38modem/README index 8b80ff7d18..d9f5eb211b 100644 --- a/network/t38modem/README +++ b/network/t38modem/README @@ -4,7 +4,18 @@ What is t38modem? * From IP network view point it's a H.323/SIP endpoint with T.38 fax support. * From your view point it's a gateway between an application and IP network. -This package requires both the OPAL and ptlib packages (both available on -SlackBuilds.) After building and installing OPAL package keep the OPAL source -tree on disk. This package will point to OPAL source tree and use files created -during its build processes to create this package. +After installation update the /etc/rc.d/rc.t38modem.conf file with your SIP +account details and add the following to your /etc/rc.d/rc.local script: + + if [ -x /etc/rc.d/rc.t38modem ]; then + /etc/rc.d/rc.t38modem start + fi + +Optionally, you can add the following to your /etc/rc.d/rc.local_shutdown: + + if [ -x /etc/rc.d/rc.t38modem ]; then + /etc/rc.d/rc.t38modem stop + fi + +If you are using this package with Asterisk there is a sample resetmodem script +that can be placed in the your /var/spool/hylafax/etc directory. diff --git a/network/t38modem/doinst.sh b/network/t38modem/doinst.sh new file mode 100644 index 0000000000..29b7e602de --- /dev/null +++ b/network/t38modem/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.t38modem.new +config etc/rc.d/rc.t38modem.conf.new + diff --git a/network/t38modem/rc.t38modem b/network/t38modem/rc.t38modem new file mode 100644 index 0000000000..158debc2ef --- /dev/null +++ b/network/t38modem/rc.t38modem @@ -0,0 +1,152 @@ +#!/bin/sh + +############################# +# READ T38MODEM CONFIG FILE # +############################# + +# Get the configuration information from /etc/rc.d/rc.t38modem.conf: +. /etc/rc.d/rc.t38modem.conf + +########### +# LOGGING # +########### + +# If possible, log events in /var/log/messages: +if [ -f /var/run/syslogd.pid -a -x /usr/bin/logger ]; then + LOGGER=/usr/bin/logger +else # output to stdout/stderr: + LOGGER=/bin/cat +fi + +MAXMODEMS=6 + +# Function to return PID of modem instance: +modem_pid() { + PID=$(ps -C t38modem -o pid,cmd | grep ${1} | grep -v grep | awk '{print $1}') + echo "$PID" +} + +# Function to start modem interface: +modem_up() { + i=0 + while [ $i -lt $MAXMODEMS ]; do + if [ "${MODEMNAME[$i]}" = "${1}" ]; then + PID=$(modem_pid "${1}") + if [ -n "$PID" ]; then + echo "Modem "${1}" already up..." + else + echo "Starting t38modem on ${1}..." + # Build PTTY name + PTTY=${PTTY[$i]} + if [ -z "${PTTY}" ]; then + PTTY="+/dev/${MODEMNAME[$i]}" + fi + # Start t38modem + nohup \ + /usr/bin/t38modem \ + --no-h323 \ + --sip-t38-udptl-redundancy ${T38_REDUNDANCY[$i]} \ + --sip-listen udp\$*:${LISTEN_PORT[$i]} \ + --sip-register ${SIP_ACCOUNT[$i]}@${SIP_SERVER[$i]},${SIP_PASSWORD[$i]} \ + --ptty ${PTTY} \ + --force-fax-mode \ + --route "modem:.*=sip:<dn>@${SIP_SERVER[$i]}" \ + --route "sip:.*=modem:<dn>" \ + > /dev/null 2>&1 & + fi + break + fi + i=$(($i+1)) + done +} + +# Function to stop modem interface: +modem_down() { + PID=$(modem_pid "${1}") + if [ -n "$PID" ]; then + echo "Stopping t38modem for modem ${1}..." + kill $PID + fi +} + +# Function to report status on modem interface: +modem_status() { + PID=$(modem_pid "${1}") + echo -n "Modem ${1}: " + if [ -n "$PID" ]; then + echo "up" + else + echo "down" + fi +} + +# Function to bring modems up: +start() { + for i in ${MODEMNAME[@]} ; do + modem_up $i + done +} + +# Function to take modems down: +stop() { + for i in ${MODEMNAME[@]} ; do + modem_down $i + done +} + +# Function to query modem states: +status() { + for i in ${MODEMNAME[@]} ; do + modem_status $i + done +} + +############ +### MAIN ### +############ + +case "$1" in +'start') + start + ;; +'stop') + stop + ;; +'restart') + stop + sleep 5 + start + ;; +'status') + status + ;; +*_start) + MODEM=$(echo $1 | /bin/cut -d '_' -f 1) + modem_up $MODEM + ;; +*_stop) + MODEM=$(echo $1 | /bin/cut -d '_' -f 1) + modem_down $MODEM + ;; +*_restart) + MODEM=$(echo $1 | /bin/cut -d '_' -f 1) + modem_down $MODEM + sleep 5 + modem_up $MODEM + ;; +*_status) + MODEM=$(echo $1 | /bin/cut -d '_' -f 1) + modem_status $MODEM + ;; +*_up) + MODEM=$(echo $1 | /bin/cut -d '_' -f 1) + modem_up $MODEM + ;; +*_down) + MODEM=$(echo $1 | /bin/cut -d '_' -f 1) + modem_down $MODEM + ;; +*) + echo "usage: $0 start|stop|restart|status" +esac + diff --git a/network/t38modem/rc.t38modem.conf b/network/t38modem/rc.t38modem.conf new file mode 100644 index 0000000000..bb05c85527 --- /dev/null +++ b/network/t38modem/rc.t38modem.conf @@ -0,0 +1,40 @@ +##################################################### +# Must be set to the number of modems in the config # +##################################################### + +# Config information for modem0: +MODEMNAME[0]="ttyx0" +PTTY[0]="" +SIP_SERVER[0]= +SIP_ACCOUNT[0]= +SIP_PASSWORD[0]= +LISTEN_PORT[0]=5060 +T38_REDUNDANCY[0]=3 + +# Config information for modem1: +MODEMNAME[1]="ttyx1" +PTTY[1]="" +SIP_SERVER[1]= +SIP_ACCOUNT[1]= +SIP_PASSWORD[1]= +LISTEN_PORT[1]=5061 +T38_REDUNDANCY[1]=3 + +# Config information for modem2: +MODEMNAME[2]="ttyx2" +PTTY[2]="" +SIP_SERVER[2]= +SIP_ACCOUNT[2]= +SIP_PASSWORD[2]= +LISTEN_PORT[2]=5062 +T38_REDUNDANCY[2]=3 + +# Config information for modem3: +MODEMNAME[3]="ttyx3" +PTTY[3]="" +SIP_SERVER[3]= +SIP_ACCOUNT[3]= +SIP_PASSWORD[3]= +LISTEN_PORT[3]=5063 +T38_REDUNDANCY[3]=3 + diff --git a/network/t38modem/resetmodem b/network/t38modem/resetmodem new file mode 100644 index 0000000000..661cec143c --- /dev/null +++ b/network/t38modem/resetmodem @@ -0,0 +1,28 @@ +#!/usr/bin/bash + +# This script can be used to unwedge a stuck t38modem virtual modem. In order +# to use this script, you'll need to do the following: +# +# Use the /etc/rc.d/rc.t38modem script provided to start/stop t38modem. This +# will allow you to start up multiple virtual modems using a separate t38modem +# process for each line. You can then start/stop/restart an individual modem +# line without interrupting the other ongoing faxes. +# +# Using visudo, add the following to /etc/sudoers: +# +# # Hylafax system commands +# uucp ALL=(ALL) NOPASSWD: /etc/rc.d/rc.t38modem +# +# Copy this file to the /var/spool/hylafax/etc and set its execute bit: +# +# cp /usr/doc/hylafax-3.15/Hylafax/resetmodem /var/spool/hylafax/etc +# chmod +x /var/spool/hylafax/etc/resetmodem +# + +DEV=$(basename $1) + +if [ "$DEV" = "ttyx0" -o "$DEV" = "ttyx1" -o "$DEV" = "ttyx2" -o "$DEV" = "ttyx3" ]; then + sudo /etc/rc.d/rc.t38modem "${DEV}_restart" +fi + + diff --git a/network/t38modem/slack-desc b/network/t38modem/slack-desc index a650441304..032acfd2f1 100644 --- a/network/t38modem/slack-desc +++ b/network/t38modem/slack-desc @@ -16,4 +16,4 @@ t38modem: support t38modem: * From your view point it's a gateway between an application and IP t38modem: network t38modem: -t38modem: Homepage: https://sourceforge.net/projects/t38modem/ +t38modem: Homepage: https://github.com/T38Modem/t38modem diff --git a/network/t38modem/t38modem.SlackBuild b/network/t38modem/t38modem.SlackBuild index b0690134e9..489b096299 100644 --- a/network/t38modem/t38modem.SlackBuild +++ b/network/t38modem/t38modem.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for t38modem -# Copyright 2015 Christopher Walker Copperas Cove, TX +# Copyright 2015-2020 Chris Walker Kempner, TX # 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=t38modem -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-3.15} 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 +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" @@ -61,8 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz -tar xvf $CWD/${PRGNAM}_${VERSION}-4.debian.tar.gz +unzip $CWD/$PRGNAM-$VERSION.zip cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -71,23 +70,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 {} \; -# -# Apply patches -# -patch -p1 <$TMP/debian/patches/t38modem-opal3.10-patch -patch -p1 <$TMP/debian/patches/spelling-error-fix -patch -p1 <$TMP/debian/patches/opal-3.10.7.patch -patch -p1 <$TMP/debian/patches/opal-3.10.9.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ PTLIBDIR=/usr/share/ptlib \ -OPALDIR=$TMP/opal-${OPALVER:-3.10.10} \ - make USE_UNIX98_PTY=1 USE_LEGACY_PTY=1 USE_OPAL=1 opt +OPALDIR=$TMP/opal-${OPALVER:-3.10.15} \ + make USE_UNIX98_PTY=1 USE_LEGACY_PTY=1 USE_OPAL=1 # Install binaries, READMEs, etc., mkdir -p $PKG/usr/bin -install -o root -g root obj_linux_*_opal/t38modem $PKG/usr/bin +install -o root -g root t38modem $PKG/usr/bin + +mkdir -p $PKG/etc/rc.d +install -o root -g root $CWD/rc.t38modem \ + $PKG/etc/rc.d/rc.t38modem.new +install -o root -g root -m 600 $CWD/rc.t38modem.conf \ + $PKG/etc/rc.d/rc.t38modem.conf.new # Strip binaries and libraries find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -99,12 +96,14 @@ cp -a \ $TMP/$PRGNAM-$VERSION/ReadMe.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ + $CWD/resetmodem \ $TMP/$PRGNAM-$VERSION/HylaFAX/config.ttyx \ $PKG/usr/doc/$PRGNAM-$VERSION/HylaFAX 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/network/t38modem/t38modem.info b/network/t38modem/t38modem.info index bcab7eff84..09a7c9dc50 100644 --- a/network/t38modem/t38modem.info +++ b/network/t38modem/t38modem.info @@ -1,12 +1,10 @@ PRGNAM="t38modem" -VERSION="2.0.0" -HOMEPAGE="https://sourceforge.net/projects/t38modem/" -DOWNLOAD="http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0.orig.tar.gz \ - http://http.debian.net/debian/pool/main/t/t38modem/t38modem_2.0.0-4.debian.tar.gz" -MD5SUM="ffcb224ac414693f2d0a5af720d4952a \ - 8072c6645a33f2660a58acd6f651d42a" +VERSION="3.15" +HOMEPAGE="https://github.com/T38Modem/t38modem" +DOWNLOAD="https://github.com/T38Modem/t38modem/archive/3.15/t38modem-3.15.zip" +MD5SUM="c340d2b6657ba81eaaab4a816367bbe0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="opal" -MAINTAINER="Christopher Walker" +REQUIRES="t38modem-opal" +MAINTAINER="Chris Walker" EMAIL="kris240376@gmail.com" diff --git a/network/t50/README b/network/t50/README index e6e317daaa..28bef4771d 100644 --- a/network/t50/README +++ b/network/t50/README @@ -1,9 +1,9 @@ -T50 is a tool designed to perform stress testing on a variety of infrastructure -network devices, covering some regular protocols (ICMP, IGMP, TCP and UDP), -some infrastructure specific protocols (GRE, IPSec and RSVP) and some routing -protocols (RIP, EIGRP and OSPF). +T50 is a tool designed to perform stress testing on a variety of +infrastructure network devices, covering some regular protocols (ICMP, +IGMP, TCP and UDP), some infrastructure specific protocols (GRE, IPSec +and RSVP) and some routing protocols (RIP, EIGRP and OSPF). -The main differentiator of T50 is that it is able to send all protocols -sequentially using one single SOCKET, and it is capable of being used to -modify network routes, letting IT Security Professionals perform advanced -tests. +The main differentiator of T50 is that it is able to send all +protocols sequentially using one single SOCKET, and it is capable of +being used to modify network routes, letting IT Security Professionals +perform advanced tests. diff --git a/network/t50/t50.SlackBuild b/network/t50/t50.SlackBuild index 3232fc40ef..4974b5c28b 100644 --- a/network/t50/t50.SlackBuild +++ b/network/t50/t50.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for t50 -# Copyright 2013 - Fernando Giannasi - So Paulo - Brasil +# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/tcptunnel/tcptunnel.SlackBuild b/network/tcptunnel/tcptunnel.SlackBuild index 2d85b1481b..3f85fa60b3 100644 --- a/network/tcptunnel/tcptunnel.SlackBuild +++ b/network/tcptunnel/tcptunnel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tcptunnel -# Copyright 2013 - Fernando Giannasi - So Paulo - Brasil +# Copyright 2013 - Fernando Giannasi - São Paulo - Brasil # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/teams/README b/network/teams/README new file mode 100644 index 0000000000..c2dc393bb2 --- /dev/null +++ b/network/teams/README @@ -0,0 +1,7 @@ +Microsoft Teams for Linux is your chat-centered workspace in Office 365. +Instantly access all your team’s content from a single place where +messages, files, people and tools live together. + +This script repackages the Debian package provided by Microsoft. + +Only the 64bit version is available. diff --git a/network/teams/doinst.sh b/network/teams/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/network/teams/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/network/teams/slack-desc b/network/teams/slack-desc new file mode 100644 index 0000000000..a26e534dd3 --- /dev/null +++ b/network/teams/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------------------------------------------------------| +teams: teams (Microsoft Teams for Linux) +teams: +teams: Microsoft Teams for Linux is your chat-centered workspace in Office +teams: 365. Instantly access all your team’s content from a single place +teams: where messages, files, people and tools live together. +teams: +teams: Homepage: https://teams.microsoft.com/downloads +teams: +teams: +teams: +teams: diff --git a/network/waterfox/waterfox.SlackBuild b/network/teams/teams.SlackBuild index a1c2976335..9a6616383b 100644 --- a/network/waterfox/waterfox.SlackBuild +++ b/network/teams/teams.SlackBuild @@ -1,11 +1,8 @@ #!/bin/sh -# Slackware build script for waterfox -# Copyright 2017-2019 Donald Cooley South Haven, Indiana USA +# Slackware build script for teams -# Based on the pale moon SlackBuilds by: -# Copyright 2015 pomfland -# Copyright 2017 skaendo <skaendo at excite dot com> +# Copyright 2020, 2021 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,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=waterfox -VERSION=${VERSION:-56.2.12} +PRGNAM=teams +VERSION=${VERSION:-1.4.00.7556} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,7 +31,7 @@ if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; + *) ARCH=$( uname -m ) ;; esac fi @@ -43,9 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Check and then abort if the architecture is not 64-bit. if [ "$ARCH" != "x86_64" ]; then - echo "$ARCH is unsupported" + echo "$ARCH is not supported." exit 1 fi @@ -53,10 +49,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM -tar xvf $CWD/$PRGNAM-$VERSION.en-US.linux-$ARCH.tar.?z* -cd $PRGNAM +cd $PKG +ar p $CWD/${PRGNAM}_${VERSION}_amd64.deb data.tar.xz | tar -xvJ + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -64,27 +59,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 {} \; -# Install waterfox into /opt -mkdir -p $PKG/opt/waterfox -cp -vr * $PKG/opt/waterfox - -# Link Waterfox binary to /usr/bin -mkdir -p $PKG/usr/bin -ln -s /opt/waterfox/waterfox $PKG/usr/bin/waterfox - -# Install .desktop file -mkdir -p $PKG/usr/share/applications -cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications - -# Icon -mkdir -p $PKG/usr/share/pixmaps/ -#cp $PKG/opt/$PRGNAM/browser/icons/mozicon128.png $PKG/usr/share/pixmaps/waterfox-icon.png -cp $PKG/opt/$PRGNAM/browser/chrome/icons/default/default128.png $PKG/usr/share/pixmaps/waterfox-icon.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 +( cd $PKG/usr + for i in share/teams/LICENSE* ; do ln -s ../../$i $PKG/usr/doc/$PRGNAM-$VERSION/ ; done +) cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/teams/teams.info b/network/teams/teams.info new file mode 100644 index 0000000000..fdf0ea4ee4 --- /dev/null +++ b/network/teams/teams.info @@ -0,0 +1,10 @@ +PRGNAM="teams" +VERSION="1.4.00.7556" +HOMEPAGE="https://teams.microsoft.com/downloads" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_1.4.00.7556_amd64.deb" +MD5SUM_x86_64="3144e00cf533801a3aa48e38d5ec81dc" +REQUIRES="" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/network/teamviewer/teamviewer.SlackBuild b/network/teamviewer/teamviewer.SlackBuild index 6c76b1bb0c..291d818b28 100644 --- a/network/teamviewer/teamviewer.SlackBuild +++ b/network/teamviewer/teamviewer.SlackBuild @@ -26,7 +26,7 @@ # Modified by Mario Preksavec <mario@slackware.hr> PRGNAM=teamviewer -VERSION=${VERSION:-14.7.1965} +VERSION=${VERSION:-15.16.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/teamviewer/teamviewer.info b/network/teamviewer/teamviewer.info index cb6b44952b..217c4407c8 100644 --- a/network/teamviewer/teamviewer.info +++ b/network/teamviewer/teamviewer.info @@ -1,10 +1,10 @@ PRGNAM="teamviewer" -VERSION="14.7.1965" +VERSION="15.16.8" HOMEPAGE="https://www.teamviewer.com/" -DOWNLOAD="https://dl.tvcdn.de/download/linux/version_14x/teamviewer_14.7.1965_i386.deb" -MD5SUM="b7ff1ea7e2fad0ba54bd9676c87b84c0" -DOWNLOAD_x86_64="https://dl.tvcdn.de/download/linux/version_14x/teamviewer_14.7.1965_amd64.deb" -MD5SUM_x86_64="4dc507fe301d868867d6ad9b84507eac" +DOWNLOAD="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.16.8_i386.deb" +MD5SUM="84817975641bcc20521103f2ccd3d519" +DOWNLOAD_x86_64="https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.16.8_amd64.deb" +MD5SUM_x86_64="88897103b9207acc3529291e0611b8c0" REQUIRES="qt5-webkit" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/telegram/README b/network/telegram/README index 02b7582df6..1bab2085c8 100644 --- a/network/telegram/README +++ b/network/telegram/README @@ -2,3 +2,5 @@ Telegram Telegram is a cloud-based mobile and desktop messaging app with a focus on security and speed. + +NOTE: Telegram x86 (32 bit) stays at 2.4.4 diff --git a/network/telegram/telegram.SlackBuild b/network/telegram/telegram.SlackBuild index a40a4863bf..9f1ff6eff5 100644 --- a/network/telegram/telegram.SlackBuild +++ b/network/telegram/telegram.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=telegram SRCNAM=tsetup SRCDIR=Telegram -VERSION=${VERSION:-1.8.15} +VERSION=${VERSION:-2.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,6 +51,7 @@ case "$ARCH" in i586) SRC="${SRCNAM}32" LIBDIRSUFFIX="" + VERSION=2.4.4 ;; *) echo "$ARCH is not supported." diff --git a/network/telegram/telegram.info b/network/telegram/telegram.info index 90559e24ee..dbee2cd1c0 100644 --- a/network/telegram/telegram.info +++ b/network/telegram/telegram.info @@ -1,10 +1,10 @@ PRGNAM="telegram" -VERSION="1.8.15" +VERSION="2.7.1" HOMEPAGE="https://telegram.org" -DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.1.8.15.tar.xz" -MD5SUM="cf67e0325e8ca570de46e38e21129836" -DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.1.8.15.tar.xz" -MD5SUM_x86_64="8fb72570d9a2100669f358aae16394b0" +DOWNLOAD="https://updates.tdesktop.com/tlinux32/tsetup32.2.4.4.tar.xz" +MD5SUM="857865fb0baa7aabadf3a6136f8276ba" +DOWNLOAD_x86_64="https://updates.tdesktop.com/tlinux/tsetup.2.7.1.tar.xz" +MD5SUM_x86_64="e552cb10bcb0e3fa5dfe5eba8a45371a" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/tgt/README b/network/tgt/README new file mode 100644 index 0000000000..838e2479b2 --- /dev/null +++ b/network/tgt/README @@ -0,0 +1,7 @@ +tgt (SCSI target driver) + +SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and +maintenance. + +This is the user-space code. You most probably already have the +kernel-space code enabled. diff --git a/network/tgt/doinst.sh b/network/tgt/doinst.sh new file mode 100644 index 0000000000..65a8251910 --- /dev/null +++ b/network/tgt/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 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/tgt/targets.conf.new +preserve_perms etc/rc.d/rc.tgtd.new diff --git a/network/tgt/slack-desc b/network/tgt/slack-desc new file mode 100644 index 0000000000..175ba0a648 --- /dev/null +++ b/network/tgt/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------------------------------------------------------| +tgt: tgt (SCSI target driver) +tgt: +tgt: SCSI target driver (iSCSI, Fibre Channel, SRP, etc) creation and +tgt: maintenance. +tgt: +tgt: This is the user-space code. You most probably already have the +tgt: kernel-space code enabled. +tgt: +tgt: +tgt: +tgt: diff --git a/network/tgt/tgt.SlackBuild b/network/tgt/tgt.SlackBuild new file mode 100644 index 0000000000..b3ea1b3ef4 --- /dev/null +++ b/network/tgt/tgt.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Slackware build script for tgt + +# Copyright 2020 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=tgt +VERSION=${VERSION:-1.0.79} +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 +mandir=/usr/man docdir=/usr/doc/$PRGNAM-$VERSION make install DESTDIR=$PKG +mv $PKG/etc/tgt/targets.conf $PKG/etc/tgt/targets.conf.new + +install -D -m 0644 scripts/initd.sample $PKG/etc/rc.d/rc.tgtd.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 + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README doc/README.* doc/tmf.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION +chmod 0644 $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 +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/network/tgt/tgt.info b/network/tgt/tgt.info new file mode 100644 index 0000000000..142c1e7a26 --- /dev/null +++ b/network/tgt/tgt.info @@ -0,0 +1,10 @@ +PRGNAM="tgt" +VERSION="1.0.79" +HOMEPAGE="http://stgt.sourceforge.net/" +DOWNLOAD="https://github.com/fujita/tgt/archive/v1.0.79/tgt-1.0.79.tar.gz" +MD5SUM="89483668b4841d740a5f3332a20d6dc9" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Pierre-Philipp Braun" +EMAIL="pbraun@nethence.com" diff --git a/network/tightvnc/README b/network/tightvnc/README index e6132561f5..6c055516e3 100644 --- a/network/tightvnc/README +++ b/network/tightvnc/README @@ -13,3 +13,17 @@ TightVNC is: TightVNC also ships with Xvnc, a headless X server that speaks the VNC protocol. + +NOTE: vncserver/Xvnc requires a configuration file (tightvncserver.conf) in +/etc to operate. A suitable, basic, configuration file is by this slackbuild +in /usr/doc/tightvnc-1.3.10. Copy this file to /etc before attempting to +launch vncserver/Xvnc. + +Also included is a small, optional, patch to vncserver (vncserver.patch), +contributed by Andrei Descul얢, which modifies the vncserver startup to use +the system configured xinitrc instead of the minimal xterm/twm configuration +used by default. Note that if you have launched vncserver prior to applying +the optional patch, you will need to remove the $HOME/.vnc/xstartup file to +use the alternate configuration. If you wish to use the optional patch, you +will need to apply it manually (i.e., using the 'patch' command from the +command line). diff --git a/network/tightvnc/tightvnc.SlackBuild b/network/tightvnc/tightvnc.SlackBuild index d6219e6301..2e946b2b4f 100644 --- a/network/tightvnc/tightvnc.SlackBuild +++ b/network/tightvnc/tightvnc.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tightvnc -# Copyright 2014 Richard Ellis (USA) +# Copyright 2014-2021 Richard Ellis (USA) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,6 +69,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 {} \; +# Apply patch to tightvncserver.conf for Slack 14.2 font and rgb.txt path +# locations +patch < $CWD/tightvncserver.conf.patch + xmkmf make World diff --git a/network/tightvnc/tightvncserver.conf.patch b/network/tightvnc/tightvncserver.conf.patch new file mode 100644 index 0000000000..fc8e5ebe99 --- /dev/null +++ b/network/tightvnc/tightvncserver.conf.patch @@ -0,0 +1,16 @@ +--- tightvncserver.conf.orig 2021-03-27 00:33:41.773056870 -0400 ++++ tightvncserver.conf 2021-03-27 00:38:34.195076768 -0400 +@@ -23,11 +23,11 @@ + # $vncUserDir = "$ENV{HOME}/.vnc"; + # $fontPath = "unix/:7100"; + # $authType = "-rfbauth $vncUserDir/passwd"; +-# $colorPath = "/usr/lib/X11/rgb"; ++$colorPath = "/usr/share/X11/rgb"; + + ## Here is another example of setting the font path: + # +-# $fontPath = "/usr/lib/X11/fonts/misc/" ++$fontPath = "/usr/share/fonts/misc/" + # $fontPath = "$fontPath,/usr/lib/X11/fonts/75dpi/"; + + ## You might wish to make your vnc directory under /tmp, to make sure diff --git a/network/tightvnc/vncserver.patch b/network/tightvnc/vncserver.patch new file mode 100644 index 0000000000..0c3bc23380 --- /dev/null +++ b/network/tightvnc/vncserver.patch @@ -0,0 +1,30 @@ +--- vncserver.orig 2009-02-12 06:27:18.000000000 +0200 ++++ vncserver 2021-03-27 08:35:57.331183132 -0400 +@@ -48,10 +48,12 @@ + + $defaultXStartup + = ("#!/bin/sh\n\n". +- "xrdb \$HOME/.Xresources\n". +- "xsetroot -solid grey\n". +- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". +- "twm &\n"); ++ "#xrdb \$HOME/.Xresources\n". ++ "#xsetroot -solid grey\n". ++ "#xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". ++ "#twm &\n". ++ "# Start X session using xinitrc \n". ++ "/etc/X11/xinit/xinitrc &\n"); + + $xauthorityFile = "$ENV{XAUTHORITY}"; + +@@ -161,7 +163,9 @@ + + $cmd = "Xvnc :$displayNumber"; + $cmd .= " -desktop " . "edString($desktopName); +-$cmd .= " -httpd $vncClasses"; ++if ( -d $vncCllasses ) { ++ $cmd .= " -httpd $vncClasses"; ++} + $cmd .= " -auth $xauthorityFile"; + $cmd .= " -geometry $geometry" if ($geometry); + $cmd .= " -depth $depth" if ($depth); diff --git a/network/tinc/tinc.SlackBuild b/network/tinc/tinc.SlackBuild index 62c3ac436e..377d327691 100644 --- a/network/tinc/tinc.SlackBuild +++ b/network/tinc/tinc.SlackBuild @@ -32,7 +32,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tinc -VERSION=${VERSION:-1.0.35} +VERSION=${VERSION:-1.0.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/tinc/tinc.info b/network/tinc/tinc.info index a8ea7750a3..8cd88c74d3 100644 --- a/network/tinc/tinc.info +++ b/network/tinc/tinc.info @@ -1,8 +1,8 @@ PRGNAM="tinc" -VERSION="1.0.35" +VERSION="1.0.36" HOMEPAGE="https://www.tinc-vpn.org/" -DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.35.tar.gz" -MD5SUM="c44f3eaf6264319953d0cff56f2e98d4" +DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.36.tar.gz" +MD5SUM="535b58ee026ec9551954dcc6ed56edca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/tinyirc/README b/network/tinyirc/README new file mode 100644 index 0000000000..47008dec66 --- /dev/null +++ b/network/tinyirc/README @@ -0,0 +1,10 @@ +tinyirc (tiny IRC client) + +A very small, stripped down IRC client. It doesn't have most of the +more advanced commands in the ircII family of IRC clients, nor does +it have any color, but it works, and it's tiny. It's a bare bones +IRC client which has no editing capabilities other than backspace to +correct typing. + +This SlackBuild sets the default IRC server to chat.freenode.org, when +tinyirc is run without a server argument. diff --git a/network/tinyirc/slack-desc b/network/tinyirc/slack-desc new file mode 100644 index 0000000000..51060e7c9b --- /dev/null +++ b/network/tinyirc/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------------------------------------------------------| +tinyirc: tinyirc (tiny IRC client) +tinyirc: +tinyirc: A very small, stripped down IRC client. It doesn't have most of the +tinyirc: more advanced commands in the ircII family of IRC clients, nor does it +tinyirc: have any color, but it works, and it's tiny. +tinyirc: +tinyirc: +tinyirc: +tinyirc: +tinyirc: +tinyirc: diff --git a/network/tinyirc/tinyirc.SlackBuild b/network/tinyirc/tinyirc.SlackBuild new file mode 100644 index 0000000000..1abc53e2cf --- /dev/null +++ b/network/tinyirc/tinyirc.SlackBuild @@ -0,0 +1,87 @@ +#!/bin/sh + +# Slackware build script for tinyirc + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +PRGNAM=tinyirc +VERSION=${VERSION:-1.1_4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCVER=${VERSION%_*}.dfsg.1 +DEBVER=${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.orig.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 {} \+ + +for i in $( cat debian/patches/series ); do + patch -p1 < debian/patches/$i +done + +# Change the default server and port to something people actually use. +make $PRGNAM \ + SERVER="chat.freenode.net" \ + PORT=6667 \ + CFLAGS="$SLKCFLAGS -DPOSIX -DDO_CTCP -DCURSES -DHAVE_NCURSES" \ + LIBS=-lncurses \ + CC=${CC:-gcc} + +mkdir -p $PKG/usr/bin +install -m0755 -s $PRGNAM $PKG/usr/bin + +mkdir -p $PKG/usr/man/man1 +pod2man -cSlackBuilds.org -s1 -r1.1 -nTINYIRC debian/$PRGNAM.1.pod | \ + gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz + +# These are text files, not word docs, don't confuse desktop software. +rename .doc _doc.txt *.doc + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING announce *.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/network/tinyirc/tinyirc.info b/network/tinyirc/tinyirc.info new file mode 100644 index 0000000000..6325f142f8 --- /dev/null +++ b/network/tinyirc/tinyirc.info @@ -0,0 +1,12 @@ +PRGNAM="tinyirc" +VERSION="1.1_4" +HOMEPAGE="https://github.com/nlaredo/tinyirc/" +DOWNLOAD="http://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1.orig.tar.gz \ + http://deb.debian.org/debian/pool/main/t/tinyirc/tinyirc_1.1.dfsg.1-4.debian.tar.xz" +MD5SUM="b655596125a525d54f82dba6a96a84b7 \ + e2c989de71c7324bc86fb6aa45a4d8a3" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/tinyproxy/tinyproxy.SlackBuild b/network/tinyproxy/tinyproxy.SlackBuild index bde1315e0e..1941ed8d77 100644 --- a/network/tinyproxy/tinyproxy.SlackBuild +++ b/network/tinyproxy/tinyproxy.SlackBuild @@ -3,10 +3,28 @@ # Slackware build script for tinyproxy # Written by Kevin Pulo, kev@pulo.com.au -# Public domain. +# Copyright 2020 Michael Edie Tampa, 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=tinyproxy -VERSION=${VERSION:-1.8.4} +VERSION=${VERSION:-1.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,10 +95,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 -mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new +mv $PKG/etc/$PRGNAM/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new sed -i -e "s,/usr/share,&/$PRGNAM,g" \ -e "s,/usr/share/$PRGNAM/$PRGNAM,/usr/share/$PRGNAM,g" \ - $PKG/etc/tinyproxy.conf.new + $PKG/etc/$PRGNAM/tinyproxy.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog NEWS README TODO docs/*.txt \ diff --git a/network/tinyproxy/tinyproxy.info b/network/tinyproxy/tinyproxy.info index 9ed376cc94..51abf64ceb 100644 --- a/network/tinyproxy/tinyproxy.info +++ b/network/tinyproxy/tinyproxy.info @@ -1,10 +1,10 @@ PRGNAM="tinyproxy" -VERSION="1.8.4" +VERSION="1.10.0" HOMEPAGE="https://tinyproxy.github.io/" -DOWNLOAD="https://github.com/tinyproxy/tinyproxy/releases/download/1.8.4/tinyproxy-1.8.4.tar.xz" -MD5SUM="b181e8c78cb31c2bc16b61fcf2425190" +DOWNLOAD="https://github.com/tinyproxy/tinyproxy/releases/download/1.10.0/tinyproxy-1.10.0.tar.xz" +MD5SUM="3a1321e4942abb9b6cb370e7c2a3c59e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Kevin Pulo" -EMAIL="kev@pulo.com.au" +MAINTAINER="Michael Edie" +EMAIL="michael@edie.io" diff --git a/network/tixati/tixati.SlackBuild b/network/tixati/tixati.SlackBuild index 060b436a95..132c608c68 100644 --- a/network/tixati/tixati.SlackBuild +++ b/network/tixati/tixati.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tixati -# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2015-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=tixati -VERSION=${VERSION:-2.63_1} +VERSION=${VERSION:-2.78_1} SRCVER=$(echo $VERSION | tr _ -) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/tixati/tixati.info b/network/tixati/tixati.info index 0bbb325eed..5403092742 100644 --- a/network/tixati/tixati.info +++ b/network/tixati/tixati.info @@ -1,10 +1,10 @@ PRGNAM="tixati" -VERSION="2.63_1" +VERSION="2.78_1" HOMEPAGE="https://www.tixati.com/" -DOWNLOAD="https://download2.tixati.com/download/tixati-2.63-1.i686.manualinstall.tar.gz" -MD5SUM="4d7814d0e0333fe45d77160e1a20537c" -DOWNLOAD_x86_64="https://download2.tixati.com/download/tixati-2.63-1.x86_64.manualinstall.tar.gz" -MD5SUM_x86_64="4030ab24e1bb7a18dfcbde538816e5c6" +DOWNLOAD="https://download2.tixati.com/download/tixati-2.78-1.i686.manualinstall.tar.gz" +MD5SUM="227f8d87b5ebfe7bfe3e0b9ed5841c82" +DOWNLOAD_x86_64="https://download2.tixati.com/download/tixati-2.78-1.x86_64.manualinstall.tar.gz" +MD5SUM_x86_64="256b842726851370f9359a5a2c815165" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/network/tnftp/tnftp.SlackBuild b/network/tnftp/tnftp.SlackBuild index 3b6f930511..6c1dac60e8 100644 --- a/network/tnftp/tnftp.SlackBuild +++ b/network/tnftp/tnftp.SlackBuild @@ -23,6 +23,7 @@ # Now maintained by B. Watson <yalhcru@gmail.com>. +# 20201024 bkw: update for v20200705. # 20180629 bkw: # - Take over maintenance. # - Add 'todo' to docdir, BUILD=2. @@ -30,8 +31,8 @@ # - Script simplification. PRGNAM=tnftp -VERSION=${VERSION:-20151004} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20200705} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,11 +71,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 --enable-ipv6 --with-socks # configure: WARNING: IPv6 is incompatible with socks, disabling IPv6 support @@ -83,7 +81,14 @@ find -L . \ # /usr/bin/tnftp, and tell the user he can call the socks one by name, # or replace the symlink. -# These configure options are used for both builds: +# These configure options are used for both builds. A word about libedit: +# --enable-editcomplete enables linking with the system libedit (if it +# exists). If there is no system libedit, it builds and links with the +# bundled libedit in the tnftp source. To avoid nasty surprises +# caused by libedit changes (since libedit is not one of my builds), +# I'm going to force it to use the bundled libedit. The disadvantage +# is that it doubles the sizes of the binaries, but they're still well +# under 1MB each. runconfig() { CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -95,6 +100,7 @@ runconfig() { --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ --enable-editcomplete \ + --with-local-libedit \ --enable-ssl \ "$@" } diff --git a/network/tnftp/tnftp.info b/network/tnftp/tnftp.info index ab6241890a..61ac2b566b 100644 --- a/network/tnftp/tnftp.info +++ b/network/tnftp/tnftp.info @@ -1,8 +1,8 @@ PRGNAM="tnftp" -VERSION="20151004" +VERSION="20200705" HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp" -DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20151004.tar.gz" -MD5SUM="a49fbe752318d5a7893f900046ea00d5" +DOWNLOAD="ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/tnftp-20200705.tar.gz" +MD5SUM="fc6a6bfa3d14005b3275b5508c47b8e9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/tor-browser/tor-browser.SlackBuild b/network/tor-browser/tor-browser.SlackBuild index 700a425d28..b2133030b7 100644 --- a/network/tor-browser/tor-browser.SlackBuild +++ b/network/tor-browser/tor-browser.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tor-browser -# Copyright 2014-2019 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=tor-browser -VERSION=${VERSION:-9.0.1} +VERSION=${VERSION:-10.0.15} PRGLANG=${PRGLANG:-en-US} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/tor-browser/tor-browser.info b/network/tor-browser/tor-browser.info index ec30e8c5c4..2b8d5d838a 100644 --- a/network/tor-browser/tor-browser.info +++ b/network/tor-browser/tor-browser.info @@ -1,10 +1,10 @@ PRGNAM="tor-browser" -VERSION="9.0.1" +VERSION="10.0.15" HOMEPAGE="https://www.torproject.org" -DOWNLOAD="https://dist.torproject.org/torbrowser/9.0.1/tor-browser-linux32-9.0.1_en-US.tar.xz" -MD5SUM="c03afbb8ba2faa794580dbe5cb7b7edb" -DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/9.0.1/tor-browser-linux64-9.0.1_en-US.tar.xz" -MD5SUM_x86_64="1ab6397fd7ce81fc6c52d89e7d552ef4" +DOWNLOAD="https://dist.torproject.org/torbrowser/10.0.15/tor-browser-linux32-10.0.15_en-US.tar.xz" +MD5SUM="aad93bbabe1076403b40eb80b6afa575" +DOWNLOAD_x86_64="https://dist.torproject.org/torbrowser/10.0.15/tor-browser-linux64-10.0.15_en-US.tar.xz" +MD5SUM_x86_64="2f6994bae2b0c2a58506f8900bbd5dee" REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/tor/README b/network/tor/README index ef4c0eff74..425c746d6f 100644 --- a/network/tor/README +++ b/network/tor/README @@ -8,18 +8,20 @@ applications with built-in anonymity, safety, and privacy features. This script requires a 'tor' user/group to exist before running. The recommended UID/GID is 220. You can create these like so: groupadd -g 220 tor - useradd -u 220 -g 220 -c "The Onion Router" -d /dev/null -s /bin/false tor + useradd -u 220 -g 220 -c "The Onion Router" -d /dev/null \ + -s /bin/false tor -You can pass another user/group to the script; this is however, less safe: +You can pass another user/group to the script; this is however, less +safe: TOR_USER=nobody TOR_GROUP=nogroup sh tor.SlackBuild The following can be used to start/stop tor automatically: -/etc/rc.d/rc.local +In file /etc/rc.d/rc.local, add following if [ -x /etc/rc.d/rc.tor ]; then /etc/rc.d/rc.tor start fi -/etc/rc.d/rc.local_shutdown +In /etc/rc.d/rc.local_shutdown, add following if [ -x /etc/rc.d/rc.tor ]; then /etc/rc.d/rc.tor stop fi diff --git a/network/tor/README.SLACKWARE b/network/tor/README.SLACKWARE index c57309d816..70b0f821d7 100644 --- a/network/tor/README.SLACKWARE +++ b/network/tor/README.SLACKWARE @@ -6,3 +6,17 @@ the newer script be sure to check changes to both /etc/rc.d/rc.tor.new and /etc/tor/torrc.new as some configurations values are now required and no longer passed on the command line. The original TorProject.org torrc configuration is always available as /etc/tor/torrc.sample. + +Since Tor 0.3.4.1-alpha the directory authority subsystem has been +modularized and can be disabled by passing --disable-module-dirauth to the +./configure script. This means that Tor compiled that way cannot run as a +directory authority or bridge authority. + +Starting from Tor 0.4.2.5 this is the default for the tor.SlackBuild. + +Also, since Tor 0.4.2.5 contrib/dist/torctl has been removed by upstream. +Have a look at https://bugs.torproject.org/30550 + +In case your relay does not start after the upgrade to Tor 0.4.5.6+ +make sure your system is IPv6 ready. Have a look at +https://lists.torproject.org/pipermail/tor-relays/2021-February/019299.html diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild index 74df585827..564266e9c8 100644 --- a/network/tor/tor.SlackBuild +++ b/network/tor/tor.SlackBuild @@ -24,9 +24,10 @@ # Updated by Donald Cooley dfc@warpmail.net # Updated by Fernando Lopez Jr. fernando.lopezjr@gmail.com +# Updated by Markus Reichelt slackbuilds@mareichelt.de PRGNAM=tor -VERSION=${VERSION:-0.4.1.6} +VERSION=${VERSION:-0.4.5.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -97,6 +98,7 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ ./configure \ + --disable-module-dirauth \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -115,7 +117,9 @@ mkdir -p $PKG/var/{run,log,lib}/tor chown $TOR_USER:$TOR_GROUP $PKG/var/{run,log,lib}/tor chmod 0700 $PKG/var/lib/tor install -D -m 0755 $CWD/rc.tor $PKG/etc/rc.d/rc.tor.new -install -D -m 0755 contrib/dist/torctl $PKG/usr/bin/torctl +# this has been removed in tor-0.4.2.5, uncomment if you need this +# in earlier Tor versions +#install -D -m 0755 contrib/dist/torctl $PKG/usr/bin/torctl install -D -m 0644 $CWD/torrc $PKG/etc/tor/torrc.new mkdir -p $PKG/etc/logrotate.d sed -e "s,@USER@,$TOR_USER," -e "s,@GROUP@,$TOR_GROUP," $CWD/logrotate.tor \ diff --git a/network/tor/tor.info b/network/tor/tor.info index 7cd8278b59..ee4a5c1eaf 100644 --- a/network/tor/tor.info +++ b/network/tor/tor.info @@ -1,8 +1,8 @@ PRGNAM="tor" -VERSION="0.4.1.6" +VERSION="0.4.5.7" HOMEPAGE="https://www.torproject.org/" -DOWNLOAD="https://dist.torproject.org/tor-0.4.1.6.tar.gz" -MD5SUM="d5e290d2a09d4225693cebc37a83097f" +DOWNLOAD="https://dist.torproject.org/tor-0.4.5.7.tar.gz" +MD5SUM="3a1800592293a8d4122823eab9233739" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/torsocks/torsocks.SlackBuild b/network/torsocks/torsocks.SlackBuild index c7187f9c8f..e3e38ad8a1 100644 --- a/network/torsocks/torsocks.SlackBuild +++ b/network/torsocks/torsocks.SlackBuild @@ -5,7 +5,7 @@ # Written by Vincent Batts, vbatts@hashbangbash.com PRGNAM=torsocks -VERSION=${VERSION:-2.2.0} +VERSION=${VERSION:-2.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/torsocks/torsocks.info b/network/torsocks/torsocks.info index 36e0c30bcd..e7f8206bd4 100644 --- a/network/torsocks/torsocks.info +++ b/network/torsocks/torsocks.info @@ -1,8 +1,8 @@ PRGNAM="torsocks" -VERSION="2.2.0" +VERSION="2.3.0" HOMEPAGE="https://gitweb.torproject.org/torsocks.git" -DOWNLOAD="https://github.com/dgoulet/torsocks/archive/v2.2.0.tar.gz" -MD5SUM="a86d5e5381236a744f6276df4e85333b" +DOWNLOAD="https://github.com/dgoulet/torsocks/archive/v2.3.0.tar.gz" +MD5SUM="df9a10bc13cbdce04e799c56671fcba5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/tramp/README b/network/tramp/README deleted file mode 100644 index 654ee46bef..0000000000 --- a/network/tramp/README +++ /dev/null @@ -1,8 +0,0 @@ -After the installation of tramp into your Emacs, you will be able to -access files on remote machines as though they were local. -Access to the remote file system for editing files, version control, -and dired are transparently enabled. -Your access to the remote machine can be with the rsh, rlogin, telnet -programs or with any similar connection method. This connection must -pass ASCII successfully to be usable but need not be 8-bit clean. -The package provides support also for ssh connections out of the box. diff --git a/network/tramp/slack-desc b/network/tramp/slack-desc deleted file mode 100644 index 81c9f86ed9..0000000000 --- a/network/tramp/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------------------------------------------------------| -tramp: tramp (remote file editing package for Emacs) -tramp: -tramp: After the installation of tramp into your Emacs, you will be able to -tramp: access files on remote machines as though they were local. -tramp: Access to the remote file system for editing files, version control, -tramp: and dired are transparently enabled. -tramp: Your access to the remote machine can be with the rsh, rlogin, telnet -tramp: programs or with any similar connection method. This connection must -tramp: pass ASCII successfully to be usable but need not be 8-bit clean. -tramp: The package provides support also for ssh connections out of the box. -tramp: diff --git a/network/tramp/tramp.info b/network/tramp/tramp.info deleted file mode 100644 index d9de3b3df2..0000000000 --- a/network/tramp/tramp.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="tramp" -VERSION="2.2.7" -HOMEPAGE="http://www.gnu.org/software/tramp/" -DOWNLOAD="ftp://ftp.gnu.org/gnu/tramp/tramp-2.2.7.tar.gz" -MD5SUM="1458a7a918c39ad8aa2572979b0f6ace" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Renato Martini" -EMAIL="renato.martini@gmail.com" diff --git a/network/transgui/transgui.SlackBuild b/network/transgui/transgui.SlackBuild index 1024c217d9..14885b94dd 100644 --- a/network/transgui/transgui.SlackBuild +++ b/network/transgui/transgui.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for transgui -# Copyright 2016-2018 Jeremy Brent Hansen <jebrhansen+SBo -at- gmail.com> +# Copyright 2016-2019 Jeremy Brent Hansen <jebrhansen+SBo -at- 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=transgui -VERSION=${VERSION:-5.17.0} +VERSION=${VERSION:-5.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/transgui/transgui.info b/network/transgui/transgui.info index 139505f684..97e317bf00 100644 --- a/network/transgui/transgui.info +++ b/network/transgui/transgui.info @@ -1,8 +1,8 @@ PRGNAM="transgui" -VERSION="5.17.0" +VERSION="5.18.0" HOMEPAGE="https://github.com/transmission-remote-gui/transgui" -DOWNLOAD="https://github.com/transmission-remote-gui/transgui/archive/v5.17.0/transgui-5.17.0.tar.gz" -MD5SUM="3137a861a633ea9946885ef5b570c0f8" +DOWNLOAD="https://github.com/transmission-remote-gui/transgui/archive/v5.18.0/transgui-5.18.0.tar.gz" +MD5SUM="5c5edc65a7cdec92e25091937b2162a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lazarus" diff --git a/network/translate-shell/README b/network/translate-shell/README index 7cd3d46a23..0f422b9d78 100644 --- a/network/translate-shell/README +++ b/network/translate-shell/README @@ -1,6 +1,6 @@ Translate Shell (formerly Google Translate CLI) is a command-line translator powered by Google Translate (default), Bing Translator, -Yandex.Translate, DeepL Translator and Apertium. +Yandex.Translate, and Apertium. If you prefer zsh over bash: $ TARGET=zsh ./translate-shell.SlackBuild diff --git a/network/translate-shell/slack-desc b/network/translate-shell/slack-desc index 102dd6e2b3..955c32dacb 100644 --- a/network/translate-shell/slack-desc +++ b/network/translate-shell/slack-desc @@ -10,7 +10,7 @@ translate-shell: translate-shell (a command-line translator) translate-shell: translate-shell: Translate Shell (formerly Google Translate CLI) is a command-line translate-shell: translator powered by Google Translate (default), Bing Translator, -translate-shell: Yandex.Translate, DeepL Translator and Apertium. +translate-shell: Yandex.Translate, and Apertium. translate-shell: translate-shell: translate-shell: diff --git a/network/translate-shell/translate-shell.SlackBuild b/network/translate-shell/translate-shell.SlackBuild index 712d4e73e1..dfc622e051 100644 --- a/network/translate-shell/translate-shell.SlackBuild +++ b/network/translate-shell/translate-shell.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for translate-shell -# Copyright 2018 Azure Zanculmarktum <zanculmarktum@gmail.com> +# Copyright 2018, 2019, 2020 Azure Zanculmarktum <zanculmarktum@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=translate-shell -VERSION=${VERSION:-0.9.6.7} +VERSION=${VERSION:-0.9.6.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,6 +75,7 @@ sed -i \ -e '/^PREFIX/s,\(/usr\)/local,\1,' \ -e '/^TARGET/s,bash,'"$TARGET"',' \ -e '/\$(PREFIX)\/share\/man/s/\(\$(PREFIX)\)\/share\(\/man\)/\1\2/' \ + -e '/install \$(MANDIR)\/\$(COMMAND)\.1/s,install,& -m644,' \ Makefile make @@ -84,7 +85,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 CONTRIBUTING.md LICENSE Makefile README.md README.template.md WAIVER $PKG/usr/doc/$PRGNAM-$VERSION +cp -p CONTRIBUTING.md LICENSE README.md README.template.md WAIVER $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/translate-shell/translate-shell.info b/network/translate-shell/translate-shell.info index c9859006a1..fdd3759d71 100644 --- a/network/translate-shell/translate-shell.info +++ b/network/translate-shell/translate-shell.info @@ -1,8 +1,8 @@ PRGNAM="translate-shell" -VERSION="0.9.6.7" +VERSION="0.9.6.11" HOMEPAGE="https://www.soimort.org/translate-shell/" -DOWNLOAD="https://github.com/soimort/translate-shell/archive/v0.9.6.7/translate-shell-0.9.6.7.tar.gz" -MD5SUM="ceed584244a77a9eb3c08d9dea2405ba" +DOWNLOAD="https://github.com/soimort/translate-shell/archive/v0.9.6.11/translate-shell-0.9.6.11.tar.gz" +MD5SUM="f40e7b0ee66e30ec15481336df58ecba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/transmission-qt4/README b/network/transmission-qt4/README new file mode 100644 index 0000000000..2fdfaa20f7 --- /dev/null +++ b/network/transmission-qt4/README @@ -0,0 +1,10 @@ +transmission-qt4 (bittorrent client) + +Transmission is a lightweight open source BitTorrent client, providing +useful functionality without feature bloat. It consists of a daemon, a +GTK+, Qt and CLI client. + +This is an older release of transmission, and only the Qt4 client is +provided. For the rest of the components (the GTK+ client, the daemon, +and the command-line client), install the main transmission package. +It's safe to install both transmission and transmission-qt4. diff --git a/network/transmission-qt4/doinst.sh b/network/transmission-qt4/doinst.sh new file mode 100644 index 0000000000..19ad22754d --- /dev/null +++ b/network/transmission-qt4/doinst.sh @@ -0,0 +1,13 @@ +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 + +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/network/transmission-qt4/slack-desc b/network/transmission-qt4/slack-desc new file mode 100644 index 0000000000..5dca7159e2 --- /dev/null +++ b/network/transmission-qt4/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------------------------------------------------------| +transmission-qt4: transmission-qt4 (bittorrent client) +transmission-qt4: +transmission-qt4: Transmission is a lightweight open source BitTorrent client, +transmission-qt4: providing useful functionality without feature bloat. +transmission-qt4: It consists of a daemon, a GTK+, Qt and CLI client. +transmission-qt4: +transmission-qt4: This is an older release of transmission. Only the Qt4 client is +transmission-qt4: provided. +transmission-qt4: +transmission-qt4: Homepage: http://transmissionbt.com/ +transmission-qt4: diff --git a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild b/network/transmission-qt4/transmission-qt4.SlackBuild index a898a52faf..0fe8bab7ba 100644 --- a/network/qbittorrent-qt5/qbittorrent-qt5.SlackBuild +++ b/network/transmission-qt4/transmission-qt4.SlackBuild @@ -1,8 +1,10 @@ #!/bin/sh +# Slackware build script for transmission -# Slackware build script for qbittorrent-qt5 - -# Copyright 2009-2010 David Woodfall <dave@dawoodfall.net> +# Copyright 2007 Vasilis Papavasileiou <email removed> +# Copyright 2008-2011 Iskar Enev <email removed> +# Copyright 2011-2013 Niels Horn, Rio de Janeiro, Brazil +# Copyright 2015 B. Watson <yalhcru@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +24,16 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=qbittorrent-qt5 -SRCNAM=qBittorrent -VERSION=${VERSION:-4.1.5} +# 20200525 bkw: new build, forked from the previous +# transmission.SlackBuild. This will go away when Slack 15 releases. + +PRGNAM=transmission-qt4 +VERSION=${VERSION:-2.94} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCNAM=transmission + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -41,6 +47,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +DOCS="AUTHORS COPYING INSTALL NEWS README" + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -60,32 +68,23 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-release-$VERSION -tar xvf $CWD/$SRCNAM-release-$VERSION.tar.?z* -cd $SRCNAM-release-$VERSION +rm -rf $SRCNAM-$VERSION +mkdir -p $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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux +sed -i -e 's%-g -O3 -funroll-loops %%g' configure.ac +sed -i -e 's%-ggdb3 %%g' configure.ac -make -make install INSTALL_ROOT=$PKG -make clean +# fix for -current (does no harm on stable). ref: +# https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13b5e88c6e9c7bd2698d844cb5ed127ed809f7e +rm -f m4/glib-gettext.m4 +# Thanks Larry Hajali +autoreconf -ivf + +CC=gcc CXX=g++ \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -94,26 +93,50 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-gui \ - --build=$ARCH-slackware-linux - + --disable-static \ + --verbose \ + --with-gtk=no \ + --disable-cli \ + --disable-daemon \ + --build=$ARCH-slackware-linux \ + --host=$ARCH-slackware-linux + +# build libraries (but don't install them). this also wastefully builds +# the tools, which we aren't going to install. make -mv src/qbittorrent-nox $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 +# build and install the Qt client +# Fix hard-coded path of man file of Qt client +sed -i "s|share/man/|man/|" qt/qtr.pro + +# Needed when using Qt4 +# https://trac.transmissionbt.com/ticket/5700#comment:2 +echo "QMAKE_CXXFLAGS += -std=c++11" >> qt/qtr.pro + +cd qt + qmake \ + QMAKE_CXXFLAGS+="$SLKCFLAGS" \ + QMAKE_CFLAGS+="$SLKCFLAGS" \ + qtr.pro + sed -i -e 's% -g % %g' Makefile + make + + make install \ + INSTALL_ROOT=$PKG/usr \ + INSTALL_PROGRAM="install -m0755 -p -s" + gzip -9 $PKG/usr/man/man1/*.1 + + mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps -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 + # thanks to b1101 for catching this: + sed -i '/^Icon/s|transmission$|&-qt|' transmission-qt.desktop -mkdir -p $PKG/etc/rc.d -cp $CWD/rc.qbittorrent-nox.new $PKG/etc/rc.d/. + install -m644 transmission-qt.desktop $PKG/usr/share/applications/transmission-qt.desktop + install -m644 icons/transmission.png $PKG/usr/share/pixmaps/transmission-qt.png +cd - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS Changelog NEWS TODO COPYING INSTALL README.md \ - $CWD/README.SBo $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 diff --git a/network/transmission-qt4/transmission-qt4.info b/network/transmission-qt4/transmission-qt4.info new file mode 100644 index 0000000000..9d175a2bcc --- /dev/null +++ b/network/transmission-qt4/transmission-qt4.info @@ -0,0 +1,10 @@ +PRGNAM="transmission-qt4" +VERSION="2.94" +HOMEPAGE="http://www.transmissionbt.com/" +DOWNLOAD="https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz" +MD5SUM="c92829294edfa391c046407eeb16358a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/transmission-remote-gtk/README b/network/transmission-remote-gtk/README index 41c17ca20c..c47f4be41c 100644 --- a/network/transmission-remote-gtk/README +++ b/network/transmission-remote-gtk/README @@ -1,3 +1,5 @@ +transmission-remote-gtk (transmission remote control GUI) + transmission-remote-gtk is a cross-platform application for remote management of the Transmission BitTorrent client using its RPC interface. @@ -8,4 +10,13 @@ management of the Transmission BitTorrent client using its RPC interface. priorities, add/edit/remove trackers. * Change remote settings like global limits, download directory, and connectivity preferences. - * Russian, Polish, Korean, and German, Spanish, Ukranian translations. + * UI translations for many languages. + +Optional dependencies, detected at compile time: + +GeoIP - used to display country flags next to IP addresses. +libappindicator3 - used for integration with KDE's taskbar. +libmrss - used for built-in RSS reader. + +If you want to build without libnotify (desktop notifications) support, +set NOTIFY=no in the script's environment. diff --git a/network/transmission-remote-gtk/slack-desc b/network/transmission-remote-gtk/slack-desc index 78af7c256a..5c44ee8e02 100644 --- a/network/transmission-remote-gtk/slack-desc +++ b/network/transmission-remote-gtk/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -transmission-remote-gtk: transmission-remote-gtk (Transmission Bittorrent remote GUI) +transmission-remote-gtk: transmission-remote-gtk (transmission remote control GUI) transmission-remote-gtk: -transmission-remote-gtk: transmission-remote-gtk is a GTK applicatoin for remote management of +transmission-remote-gtk: transmission-remote-gtk is a GTK application for remote management of transmission-remote-gtk: the Transmission BitTorrent client via its RPC interface. transmission-remote-gtk: -transmission-remote-gtk: Homepage: http://code.google.com/p/transmission-remote-gtk/ -transmission-remote-gtk: -transmission-remote-gtk: -transmission-remote-gtk: +transmission-remote-gtk: Build options: +transmission-remote-gtk: @opts@ transmission-remote-gtk: +transmission-remote-gtk: Homepage: +transmission-remote-gtk: https://github.com/transmission-remote-gtk/transmission-remote-gtk/ transmission-remote-gtk: diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild index 677e991256..4daa00e722 100644 --- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild +++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for transmission-remote-gtk # Copyright 2012-2016 Chris Walker Copperas Cove, TX +# Copyright 2020 B. Watson <yalhcru@gmail.com> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -31,8 +32,19 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20200526 bkw: +# - take over maintenance +# - update for v1.4.1 +# - add NOTIFY=no to build --without-libnotify +# - add README note and slack-desc support for optional deps +# - fix homepage and typo in slack-desc +# - build tweaks +# - get rid of the list of translation languages in README, it's +# no longer accurate (several more added) and I can't be bothered +# to keep it up-to-date. + PRGNAM=transmission-remote-gtk -VERSION=${VERSION:-1.2} +VERSION=${VERSION:-1.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,40 +81,43 @@ 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 . \ - \( -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 {} \+ + +[ "${NOTIFY:-yes}" = "no" ] && NOTIFYOPT="--without-libnotify" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ + $NOTIFYOPT \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --build=$ARCH-slackware-linux make V=1 -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man1/$PRGNAM.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 +# 20200526 bkw: lots of optional deps, let the slack-desc keep track of them +ldd $PKG/usr/bin/$PRGNAM > ldd.tmp +for i in libnotify libappindicator3 libmrss GeoIP; do + opts+="$i:" + grep -q $i ldd.tmp && opts+="yes " || opts+="no " +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 +# 20200526 bkw: this doesn't belong in a package +rm -f $PKG/usr/share/applications/mimeinfo.cache mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING 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 +sed "s,@opts@,$opts," $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.info b/network/transmission-remote-gtk/transmission-remote-gtk.info index 80f1eaffc3..0a7fb4be88 100644 --- a/network/transmission-remote-gtk/transmission-remote-gtk.info +++ b/network/transmission-remote-gtk/transmission-remote-gtk.info @@ -1,10 +1,10 @@ PRGNAM="transmission-remote-gtk" -VERSION="1.2" +VERSION="1.4.1" HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk/" -DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.2/transmission-remote-gtk-1.2.tar.gz" -MD5SUM="dfb485390b49c1f0af5063b44a4fef03" +DOWNLOAD="https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.4.1/transmission-remote-gtk-1.4.1.tar.xz" +MD5SUM="5955f2d80e51c14fa6bf137c9c2bac74" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="transmission json-glib" -MAINTAINER="Christopher Walker" -EMAIL="kris240376@gmail.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/transmission/README b/network/transmission/README index cd8bc73444..6b73e94c74 100644 --- a/network/transmission/README +++ b/network/transmission/README @@ -1,13 +1,20 @@ +transmission (bittorrent client) + Transmission is a lightweight open source BitTorrent client, providing useful functionality without feature bloat. It consists of a daemon, a -GTK+, Qt and CLI client. +GTK+ client, and CLI client [*]. -By default, all 4 components are built. Specific parts can be disabled +By default, all 3 components are built. Specific parts can be disabled by setting one or more environment variables: GTK=no -QT=no CLI=no DAEMON=no -At least one component must be enabled (so all 4 set to "no" won't work). +At least one component must be enabled (so all 3 set to "no" won't work). + +[*] If you're wondering about the Qt client that was in the previous + version of transmission: It's no longer possible to build on + Slackware 14.2 as of transmission-3.0.0, due to outdated g++ and + libstdc++. If you don't mind using an older version of transmission + (2.94), you can install transmission-qt4 to get a Qt GUI. diff --git a/network/transmission/transmission.SlackBuild b/network/transmission/transmission.SlackBuild index 274d96b02c..e29bb915e2 100644 --- a/network/transmission/transmission.SlackBuild +++ b/network/transmission/transmission.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh # Slackware build script for transmission -# Copyright 2007 Vasilis Papavasileiou <el03020 at mail dot ntua dot gr> -# Copyright 2008-2011 Iskar Enev <iskar.enev[@]gmail.com> +# Copyright 2007 Vasilis Papavasileiou <email removed> +# Copyright 2008-2011 Iskar Enev <email removed> # Copyright 2011-2013 Niels Horn, Rio de Janeiro, Brazil # Copyright 2015 B. Watson <yalhcru@gmail.com> # All rights reserved. @@ -24,23 +24,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# 20180207 bkw: update for v2.93 - +# 20200525 bkw: update for v3.00. +# Drop Qt GUI and QT=yes, due to 14.2's old gcc/libstdc++. +# It will come back when 15.0 releases. +# 20180611 bkw: update for v2.94. +# 20180207 bkw: update for v2.93. # 20180116 bkw: security fix, BUILD=2. See: # https://github.com/transmission/transmission/pull/468 # Thanks to Freenode user lord_ for pointing this out. - -# 20180611 bkw: update for v2.94 - # 20170621 bkw: fix build on -current. - # 20150204 bkw: allow user to disable the various components. # By default, all are enabled. We can disable transmission-gtk, # transmission-qt, transmission-cli, and/or transmission-daemon. # But disabling them all is no good. PRGNAM=transmission -VERSION=${VERSION:-2.94} +VERSION=${VERSION:-3.00} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,7 +56,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCUMENTATION="AUTHORS COPYING INSTALL NEWS README" +DOCS="AUTHORS COPYING NEWS.md README.md" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -75,15 +74,34 @@ fi set -e +# 20200525 bkw: I had to drop the Qt client, let's make sure the user +# knows that. +if [ "${QT:-no}" != "no" ]; then + cat <<EOF 1>&2 + +********************************************************************** +The Qt GUI in this version of transmission can't be built on Slackware +14.2. If you don't mind using an older version of transmission, you +can install transmission-qt4 to get a Qt GUI. +********************************************************************** + +EOF + exit 1 +fi + GTK="${GTK:-yes}" -QT="${QT:-yes}" +#QT="${QT:-yes}" CLI="${CLI:-yes}" DAEMON="${DAEMON:-yes}" -if [ "$GTK" != "yes" -a "$QT" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" ]; then +if [ "$GTK" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" ]; then cat <<EOF 1>&2 + +****************************************************************** Can't build transmission with everything disabled, at least one of -GTK QT CLI DAEMON must be 'yes'. +GTK CLI DAEMON must be 'yes'. +****************************************************************** + EOF exit 1 fi @@ -101,16 +119,8 @@ mkdir -p $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 {} \; - -# Fix CVE-2018-5702 for transmission-2.92. Patch came from: -# https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt -#patch -p1 < $CWD/transmission-fix-dns-rebinding-vuln.diff -# Not needed for >= 2.93 +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%-g -O3 -funroll-loops %%g' configure.ac sed -i -e 's%-ggdb3 %%g' configure.ac @@ -139,11 +149,17 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux -# build daemon, GTK and cli client (unless disabled) +# Build daemon, GTK and cli client (unless disabled). This also builds +# the tools (transmission-create and friends). make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG + +if false; then +# As of 3.0.0, transmission-qt can't be built on Slackware 14.2. +# Needs a newer g++ and libstdc++ than we have. +# Left here for reference when 15.0 comes out. +#if [ "$QT" = "yes" ]; then -if [ "$QT" = "yes" ]; then # build the Qt client (transmission-qt) unless disabled # Fix hard-coded path of man file of Qt client sed -i "s|share/man/|man/|" qt/qtr.pro @@ -153,7 +169,7 @@ if [ "$QT" = "yes" ]; then echo "QMAKE_CXXFLAGS += -std=c++11" >> qt/qtr.pro cd $TMP/$PRGNAM-$VERSION/qt - qmake \ + qmake-qt5 \ QMAKE_CXXFLAGS+="$SLKCFLAGS" \ QMAKE_CFLAGS+="$SLKCFLAGS" \ qtr.pro @@ -167,18 +183,15 @@ if [ "$QT" = "yes" ]; then cd - 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 +gzip -9 $PKG/usr/man/man?/* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCUMENTATION $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 -sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc +#sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc +sed "s,@opts@,GTK=$GTK CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG diff --git a/network/transmission/transmission.info b/network/transmission/transmission.info index 6abe22b5a6..7c8faf5cc6 100644 --- a/network/transmission/transmission.info +++ b/network/transmission/transmission.info @@ -1,8 +1,8 @@ PRGNAM="transmission" -VERSION="2.94" +VERSION="3.00" HOMEPAGE="http://www.transmissionbt.com/" -DOWNLOAD="https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz" -MD5SUM="c92829294edfa391c046407eeb16358a" +DOWNLOAD="https://github.com/transmission/transmission-releases/raw/master/transmission-3.00.tar.xz" +MD5SUM="a23a32672b83c89b9b61e90408f53d98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/tribler/tribler.info b/network/tribler/tribler.info index cf064beca4..a9f6fb0f92 100644 --- a/network/tribler/tribler.info +++ b/network/tribler/tribler.info @@ -1,10 +1,10 @@ PRGNAM="tribler" VERSION="6.4.0" HOMEPAGE="https://www.tribler.org/" -DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/tribler-6.4.0.tar.xz" +DOWNLOAD="https://slackware.uk/~urchlay/src/tribler-6.4.0.tar.xz" MD5SUM="979de2e5a22a4c5f13d3e78c77a8bbb2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxPython apsw python-twisted pyasn1 pycrypto python-requests netifaces gmpy libtorrent-rasterbar PyXML" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/network/twine/README b/network/twine/README index 51ccce7629..5558b34c2b 100644 --- a/network/twine/README +++ b/network/twine/README @@ -1,2 +1,4 @@ -Twine is a utility for interacting with PyPI. -Currently it only supports registering projects and uploading distributions. +Twine is a utility for publishing Python packages on PyPI. + +It provides build system independent uploads of source and +binary distribution artifacts for both new and existing projects. diff --git a/network/twine/slack-desc b/network/twine/slack-desc index c215519b8e..c13a32d637 100644 --- a/network/twine/slack-desc +++ b/network/twine/slack-desc @@ -8,9 +8,9 @@ |-----handy-ruler------------------------------------------------------| twine: twine (Utilities for interacting with PyPI) twine: -twine: Twine is a utility for interacting with PyPI. -twine: Currently it only supports registering projects and uploading -twine: distributions. +twine: Twine is a utility for publishing Python packages on PyPI. +twine: It provides build system independent uploads of source and binary +twine: distribution artifacts for both new and existing projects. twine: twine: Homepage: https://github.com/pypa/twine twine: diff --git a/network/twine/twine.SlackBuild b/network/twine/twine.SlackBuild index 0284c8ea58..0cfbc94f61 100644 --- a/network/twine/twine.SlackBuild +++ b/network/twine/twine.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for twine -# 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=twine -VERSION=${VERSION:-1.11.0} +VERSION=${VERSION:-3.1.1} 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/network/twine/twine.info b/network/twine/twine.info index 1be03fcc6d..a5949c4cce 100644 --- a/network/twine/twine.info +++ b/network/twine/twine.info @@ -1,10 +1,10 @@ PRGNAM="twine" -VERSION="1.11.0" +VERSION="3.1.1" HOMEPAGE="https://github.com/pypa/twine" -DOWNLOAD="https://files.pythonhosted.org/packages/9e/89/2971f240b9fc102b2e56ee8b0a9d7c9c3a7cf081b851eb02d85891de20d1/twine-1.11.0.tar.gz" -MD5SUM="1b4de33b45225a30f5f04b118f92c09b" +DOWNLOAD="https://files.pythonhosted.org/packages/7e/2f/e2a91a8ab97e8c9830ce297132631aef5dcd599f076123d1ebb26f1941b6/twine-3.1.1.tar.gz" +MD5SUM="faf033a3458de37df6cdecceb6da2c2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="tqdm pkginfo requests-toolbelt" +REQUIRES="tqdm pkginfo requests-toolbelt readme_renderer python-zipp python-keyring" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/network/uTox/uTox.SlackBuild b/network/uTox/uTox.SlackBuild index 9657894033..96c5837ac5 100644 --- a/network/uTox/uTox.SlackBuild +++ b/network/uTox/uTox.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for uTox # # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com> -# Copyright 2016-2019 Christoph Willing Brisbane, Australia +# Copyright 2016-2021 Christoph Willing Brisbane, Australia # All rights reserved. # # Permission to use, copy, modify, and/or distribute this software for any @@ -19,7 +19,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. PRGNAM=uTox -VERSION=${VERSION:-0.17.1} +VERSION=${VERSION:-0.18.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/uTox/uTox.info b/network/uTox/uTox.info index 56b306d3fc..de041273db 100644 --- a/network/uTox/uTox.info +++ b/network/uTox/uTox.info @@ -1,8 +1,8 @@ PRGNAM="uTox" -VERSION="0.17.1" +VERSION="0.18.1" HOMEPAGE="https://github.com/uTox/uTox" -DOWNLOAD="https://github.com/uTox/uTox/releases/download/v0.17.1/uTox-0.17.1-full.tar.gz" -MD5SUM="f8a01d98c673f4fd0065e156c655575a" +DOWNLOAD="https://github.com/uTox/uTox/releases/download/v0.18.1/uTox-0.18.1-full.tar.gz" +MD5SUM="add2df145292ffe0a30965bdf3e8a3d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="c-toxcore libfilteraudio check" diff --git a/network/ubertooth/ubertooth.SlackBuild b/network/ubertooth/ubertooth.SlackBuild index 412f21b290..8ca1ed36f8 100644 --- a/network/ubertooth/ubertooth.SlackBuild +++ b/network/ubertooth/ubertooth.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ubertooth -VERSION=${VERSION:-2018_12_R1} +VERSION=${VERSION:-2020.12.R1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,7 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $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 \ diff --git a/network/ubertooth/ubertooth.info b/network/ubertooth/ubertooth.info index 95d4311f20..781e286c17 100644 --- a/network/ubertooth/ubertooth.info +++ b/network/ubertooth/ubertooth.info @@ -1,8 +1,8 @@ PRGNAM="ubertooth" -VERSION="2018_12_R1" +VERSION="2020.12.R1" HOMEPAGE="https://github.com/greatscottgadgets/ubertooth" -DOWNLOAD="https://github.com/greatscottgadgets/ubertooth/archive/2018-12-R1/ubertooth-2018_12_R1.tar.gz" -MD5SUM="4b97ee031722a2965633b2bd49e2309d" +DOWNLOAD="https://github.com/greatscottgadgets/ubertooth/archive/2020-12-R1/ubertooth-2020.12.R1.tar.gz" +MD5SUM="4dd2d6539cfc694f3d63424c65b28394" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libbtbb" diff --git a/network/ucarp/getopt.patch b/network/ucarp/getopt.patch new file mode 100644 index 0000000000..c6221ac220 --- /dev/null +++ b/network/ucarp/getopt.patch @@ -0,0 +1,12 @@ +diff -ru ucarp-1.5.2.orig/src/ucarp_p.h ucarp-1.5.2/src/ucarp_p.h +--- ucarp-1.5.2.orig/src/ucarp_p.h 2009-05-27 21:39:23.000000000 +0000 ++++ ucarp-1.5.2/src/ucarp_p.h 2020-02-09 17:57:05.816000000 +0000 +@@ -1,7 +1,7 @@ + #ifndef __CARP_P_H__ + #define __CARP_P_H__ 1 + +-static const char *GETOPT_OPTIONS = "i:s:v:p:Pa:hb:k:x:nu:d:r:zf:BoSM"; ++static const char *GETOPT_OPTIONS = "i:s:v:p:Pa:hb:k:x:nu:d:r:zf:Bo:SM"; + + static struct option long_options[] = { + { "interface", 1, NULL, 'i' }, diff --git a/network/ucarp/ucarp.SlackBuild b/network/ucarp/ucarp.SlackBuild index 2e23d888a6..815e891e40 100644 --- a/network/ucarp/ucarp.SlackBuild +++ b/network/ucarp/ucarp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ucarp -# Copyright 2017 Wayne Cuddy, Fairfax, VA (USA) +# Copyright 2020 Wayne Cuddy, Fairfax, VA (USA) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# 2017 +# Initial release. +# +# 2020-02-10 +# Patch release to correct a bug that prevents the '-o' flag from working. +# + PRGNAM=ucarp VERSION=${VERSION:-1.5.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +77,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/getopt.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/ufw/ufw.SlackBuild b/network/ufw/ufw.SlackBuild index 0ce87b08aa..5fd512f1d9 100644 --- a/network/ufw/ufw.SlackBuild +++ b/network/ufw/ufw.SlackBuild @@ -26,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ufw -VERSION=${VERSION:-0.35} +VERSION=${VERSION:-0.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,6 +75,11 @@ find -L . \ patch -p1 --verbose < $CWD/ufw.conf.patch patch -p1 --verbose < $CWD/ufw-0.35-fix-iptables-path.patch +# Python3 support +if $(python3 -c 'import sys' 2>/dev/null); then + python3 setup.py install --root=$PKG +fi + python setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/network/ufw/ufw.info b/network/ufw/ufw.info index a65a7c07a8..1d396dca15 100644 --- a/network/ufw/ufw.info +++ b/network/ufw/ufw.info @@ -1,8 +1,8 @@ PRGNAM="ufw" -VERSION="0.35" +VERSION="0.36" HOMEPAGE="https://launchpad.net/ufw" -DOWNLOAD="https://launchpad.net/ufw/0.35/0.35/+download/ufw-0.35.tar.gz" -MD5SUM="b7cd2dd4e4e98e46df125fee06edff92" +DOWNLOAD="https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz" +MD5SUM="6d8ab1506da21ae003f4628f93d05781" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild b/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild index 6ac934d1ff..467a59ee09 100644 --- a/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild +++ b/network/uget-chrome-wrapper/uget-chrome-wrapper.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.0.4} BUILD=${BUILD:-2} 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 diff --git a/network/uget-integrator/README b/network/uget-integrator/README new file mode 100644 index 0000000000..020cffc26f --- /dev/null +++ b/network/uget-integrator/README @@ -0,0 +1,13 @@ +Integrate the famous FOSS uGet Download Manager with Google Chrome in Linux systems. +With this tool, uGet can interrupt and catch your downloads from Google Chrome. + +after you install uget-integrator you must install your browsers extension: + +for chrome/chromium/vivaldi: +https://chrome.google.com/webstore/detail/uget-integration/efjgjleilhflffpbnkaofpmdnajdpepi + +for firefox: +https://addons.mozilla.org/en-US/firefox/addon/ugetintegration/ + +for opera: +https://addons.opera.com/en/extensions/details/uget-integration diff --git a/network/uget-integrator/slack-desc b/network/uget-integrator/slack-desc new file mode 100644 index 0000000000..f88ce4b926 --- /dev/null +++ b/network/uget-integrator/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------------------------------------------------------| +uget-integrator: uget-integrator (download manager) +uget-integrator: +uget-integrator: Integrate uGet Download Manager with Google Chrome, Chromium, +uget-integrator: Vivaldi, Opera and Firefox +uget-integrator: +uget-integrator: +uget-integrator: +uget-integrator: Homepage: https://github.com/ugetdm/uget-integrator/ +uget-integrator: +uget-integrator: +uget-integrator: diff --git a/network/uget-integrator/uget-integrator.SlackBuild b/network/uget-integrator/uget-integrator.SlackBuild new file mode 100644 index 0000000000..9f3746442c --- /dev/null +++ b/network/uget-integrator/uget-integrator.SlackBuild @@ -0,0 +1,102 @@ +#!/bin/sh + +# Slackware build script for uget-integrator + +# Copyright 2020 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=uget-integrator +VERSION=${VERSION:-1.0.0} +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} + +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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p "$PKG/usr/bin" + +# reference: https://developer.chrome.com/apps/nativeMessaging +# Chromium +install -Dm775 bin/uget-integrator "$PKG"/usr/bin +mkdir -p "$PKG/etc/chromium/native-messaging-hosts" +install -Dm775 conf/com.ugetdm.chrome.json "$PKG"/etc/chromium/native-messaging-hosts/ + +# Chrome +#mkdir -p "$PKG/etc/opt/chrome/native-messaging-hosts/" +#install -Dm775 bin/uget-integrator "$PKG"/usr/bin +#install -Dm775 conf/com.ugetdm.chrome.json "$PKG"/etc/opt/chrome/native-messaging-hosts/ + +# Firefox +#mkdir -p "$PKG/usr/lib${LIBDIRSUFFIX}/mozilla/native-messaging-hosts" +#install -Dm775 bin/uget-integrator "$PKG"/usr/bin +#install -Dm775 conf/com.ugetdm.firefox.json "$PKG"/usr/lib${LIBDIRSUFFIX}/mozilla/native-messaging-hosts + +# Opera +# - work in progress - + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md changelog copyright $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/network/uget-integrator/uget-integrator.info b/network/uget-integrator/uget-integrator.info new file mode 100644 index 0000000000..ad584b4e30 --- /dev/null +++ b/network/uget-integrator/uget-integrator.info @@ -0,0 +1,10 @@ +PRGNAM="uget-integrator" +VERSION="1.0.0" +HOMEPAGE="https://github.com/ugetdm/uget-integrator/" +DOWNLOAD="https://github.com/ugetdm/uget-integrator/archive/v1.0.0/uget-integrator-1.0.0.tar.gz" +MD5SUM="fc08f3efd2c60c730ae02b45c26123c8" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="uget python3" +MAINTAINER="Fernando Lopez Jr." +EMAIL="fernando.lopezjr@gmail.com" diff --git a/network/uget/uget.SlackBuild b/network/uget/uget.SlackBuild index cda99f41d8..5efd0c72e8 100644 --- a/network/uget/uget.SlackBuild +++ b/network/uget/uget.SlackBuild @@ -6,6 +6,8 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20200223 bkw: update for 2.2.3_1 +# 20191130 bkw: update for 2.2.2 # 20180612 bkw: update for 2.2.1 # 20180109 bkw: @@ -15,15 +17,13 @@ # Slackware these days. Add GSTREAMER variable to disable it. # - update README and slack-desc -# 20170827 bkw: -# - update for 2.0.10 +# 20170827 bkw: update for 2.0.10 # 20170324 bkw: # - update for 2.0.9 # - AUTHORS no longer empty, include in package -# 20160727 bkw: -# - upgrade to 2.0.8 +# 20160727 bkw: upgrade to 2.0.8 # 20150910 bkw: # - upgrade to 2.0.1 @@ -36,10 +36,17 @@ # - don't install empty AUTHORS and ChangeLog PRGNAM=uget -VERSION=${VERSION:-2.2.1} +VERSION=${VERSION:-2.2.3_1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Tarball filename version number doesn't match top-level dir inside +# tarball, and neither matches VERSION 'cause we can't use hyphens. +# This stuff can safely be left in place: if VERSION contains no _ +# character, TARVER == DIRVER == VERSION. +TARVER=${VERSION/_/-} +DIRVER="$( echo $VERSION | cut -d_ -f1 )" + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -72,15 +79,12 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$DIRVER +tar xvf $CWD/$PRGNAM-$TARVER.tar.gz +cd $PRGNAM-$DIRVER 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 {} \+ LIBNOTIFY="${LIBNOTIFY:-yes}" GSTREAMER="${GSTREAMER:-yes}" diff --git a/network/uget/uget.info b/network/uget/uget.info index 9ea53a9d58..0d9e4c2c4d 100644 --- a/network/uget/uget.info +++ b/network/uget/uget.info @@ -1,8 +1,8 @@ PRGNAM="uget" -VERSION="2.2.1" +VERSION="2.2.3_1" HOMEPAGE="https://ugetdm.com" -DOWNLOAD="http://downloads.sourceforge.net/project/urlget/uget%20%28stable%29/2.2.1/uget-2.2.1.tar.gz" -MD5SUM="ef00e0d9a63051d553c4699192274db2" +DOWNLOAD="http://downloads.sourceforge.net/project/urlget/uget%20%28stable%29/2.2.3/uget-2.2.3-1.tar.gz" +MD5SUM="ac623b972ec13909a05bc5d098c5254a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/unbound/unbound.SlackBuild b/network/unbound/unbound.SlackBuild index 5847d5c0d9..a305c32a7a 100644 --- a/network/unbound/unbound.SlackBuild +++ b/network/unbound/unbound.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for unbound -# Copyright 2018 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico +# Copyright 2020 Gerardo Zamudio <gerardo.zamudio@linux.com> Mexico City, Mexico # 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=unbound -VERSION=${VERSION:-1.8.2} +VERSION=${VERSION:-1.13.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -123,7 +123,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/var/run/unbound chown $USER:$GROUP $PKG/var/run/unbound/ -install -m 0640 -D doc/example.conf.in $PKG/etc/unbound/unbound.conf.new +mv $PKG/etc/unbound/unbound.conf $PKG/etc/unbound/unbound.conf.new install -m 0644 -D $CWD/rc.unbound $PKG/etc/rc.d/rc.unbound.new mkdir -p $PKG/install diff --git a/network/unbound/unbound.info b/network/unbound/unbound.info index 9eeaf61441..0d32e3cc39 100644 --- a/network/unbound/unbound.info +++ b/network/unbound/unbound.info @@ -1,8 +1,8 @@ PRGNAM="unbound" -VERSION="1.8.2" +VERSION="1.13.1" HOMEPAGE="https://nlnetlabs.nl/projects/unbound/about/" -DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.8.2.tar.gz" -MD5SUM="3b2f1024df47ccc59a8100c3b40c6dc1" +DOWNLOAD="https://nlnetlabs.nl/downloads/unbound/unbound-1.13.1.tar.gz" +MD5SUM="0cd660a40d733acc6e7cce43731cac62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ldns" diff --git a/network/urlgrabber/urlgrabber.SlackBuild b/network/urlgrabber/urlgrabber.SlackBuild index c49952cba5..b629712bab 100644 --- a/network/urlgrabber/urlgrabber.SlackBuild +++ b/network/urlgrabber/urlgrabber.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for urlgrabber # Copyright (c) 2007 Daniel de Kok <moc.mikciat@leinad> +# Copyright 2020 Ricardo J. Barberis <ricardo.barberis@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/urlgrabber/urlgrabber.info b/network/urlgrabber/urlgrabber.info index ac9096d1c5..d0394d72f6 100644 --- a/network/urlgrabber/urlgrabber.info +++ b/network/urlgrabber/urlgrabber.info @@ -6,5 +6,5 @@ MD5SUM="7cff064649619355d329b26d75872f60" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Javier Rojas" -EMAIL="jerojasro@devnull.li" +MAINTAINER="Ricardo J. Barberis" +EMAIL="ricardo.barberis@gmail.com" diff --git a/network/urlscan/urlscan.SlackBuild b/network/urlscan/urlscan.SlackBuild index 53135d4c57..3ab9b11d11 100644 --- a/network/urlscan/urlscan.SlackBuild +++ b/network/urlscan/urlscan.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for urlscan -# Copyright 2019 abooksigun <abooksigun09@gmail.com> +# Copyright 2020 abooksigun <abooksigun09@gmail.com> # 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=urlscan -VERSION=${VERSION:-0.9.4} +VERSION=${VERSION:-0.9.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,10 +63,10 @@ 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 {} \; + \( -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 {} \; python3 setup.py install --root=$PKG --optimize=1 @@ -76,8 +76,14 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr cp -r $PKG/usr/share/man $PKG/usr rm -r $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 +for man in $( find $PKG/usr/man -type f ); do + gzip -9 $man +done + +for man in $( find $PKG/usr/man -type l ); do + ln -s $( readlink $man ).gz $man.gz + rm $man +done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -t $PKG/usr/doc/$PRGNAM-$VERSION README.rst COPYING requirements.txt diff --git a/network/urlscan/urlscan.info b/network/urlscan/urlscan.info index dd9689a567..8ca34f658a 100644 --- a/network/urlscan/urlscan.info +++ b/network/urlscan/urlscan.info @@ -1,8 +1,8 @@ PRGNAM="urlscan" -VERSION="0.9.4" +VERSION="0.9.5" HOMEPAGE="https://github.com/firecat53/urlscan" -DOWNLOAD="https://github.com/firecat53/urlscan/archive/0.9.4/urlscan-0.9.4.tar.gz" -MD5SUM="5c735bbb872248f0d981b4efcde257ac" +DOWNLOAD="https://github.com/firecat53/urlscan/archive/0.9.5/urlscan-0.9.5.tar.gz" +MD5SUM="6b9434208dbcfd12dd4dde74b4b41b21" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3-urwid" diff --git a/network/varnish/README b/network/varnish/README index d8c1194ce9..4d742ff527 100644 --- a/network/varnish/README +++ b/network/varnish/README @@ -4,5 +4,3 @@ HTTP and configure it to cache the contents. Varnish is free software licensed under a two-clause BSD licence, also known as the FreeBSD licence. The project was initiated in 2005. - -Homepage: https://www.varnish-cache.org/ diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild index 950474649c..deec595f7e 100644 --- a/network/varnish/varnish.SlackBuild +++ b/network/varnish/varnish.SlackBuild @@ -3,15 +3,16 @@ # Slackware build script for varnish-cache # Written by Matt Schurenko <matt.schurenko@gmail.com> +# Updated by Emmanuel N. Millan PRGNAM=varnish -VERSION=${VERSION:-4.0.3} +VERSION=${VERSION:-6.5.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 @@ -22,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" @@ -36,13 +37,13 @@ else LIBDIRSUFFIX="" fi -set -e +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-$VERSION.tgz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/network/varnish/varnish.info b/network/varnish/varnish.info index 00200b4073..17e7902b96 100644 --- a/network/varnish/varnish.info +++ b/network/varnish/varnish.info @@ -1,10 +1,10 @@ PRGNAM="varnish" -VERSION="4.0.3" +VERSION="6.5.1" HOMEPAGE="https://www.varnish-cache.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/varnish-4.0.3.tar.gz" -MD5SUM="16a683f2e41f7d80219cec5d4649380c" +DOWNLOAD="https://varnish-cache.org/_downloads/varnish-6.5.1.tgz" +MD5SUM="09304038cb3bb744a7c1742c8de848a1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="docutils" -MAINTAINER="Matt Schurenko" -EMAIL="matt.schurenko@gmail.com" +REQUIRES="Sphinx" +MAINTAINER="Emmanuel N. Millan" +EMAIL="emmanueln@gmail.com" diff --git a/network/verm/verm.SlackBuild b/network/verm/verm.SlackBuild index 7cf47f213e..501041a028 100644 --- a/network/verm/verm.SlackBuild +++ b/network/verm/verm.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for verm -# Copyright 2016-2018 Andrew Clemons, Wellington New Zealand +# Copyright 2016-2018,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=verm -VERSION=${VERSION:-1.5.1} +VERSION=${VERSION:-1.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,6 +72,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 {} \; +rm -f go.mod # go.mod exists but should not + SRCDIR="$(pwd)" export GOPATH="$SRCDIR" mkdir -p src/github.com/willbryant diff --git a/network/verm/verm.info b/network/verm/verm.info index dbe359a680..10ac2daaa6 100644 --- a/network/verm/verm.info +++ b/network/verm/verm.info @@ -1,8 +1,8 @@ PRGNAM="verm" -VERSION="1.5.1" +VERSION="1.5.2" HOMEPAGE="https://github.com/willbryant/verm" -DOWNLOAD="https://github.com/willbryant/verm/archive/1.5.1/verm-1.5.1.tar.gz" -MD5SUM="18b7c847dda5c52a74bb49ecd35a447a" +DOWNLOAD="https://github.com/willbryant/verm/archive/1.5.2/verm-1.5.2.tar.gz" +MD5SUM="7bd8fb6aea4483531ac1f5475205cfc0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/network/vivaldi/README b/network/vivaldi/README index 6654f9bad4..011f935eb1 100644 --- a/network/vivaldi/README +++ b/network/vivaldi/README @@ -3,4 +3,6 @@ vivaldi (web browser). A Browser for Our Friends. An advanced browser made with the power user in mind. Finally you can surf your way. -Vivaldi for ARM can be downloaded at https://vivaldi.com/download/ +Vivaldi for ARM/ARM64 can be downloaded from: + + https://vivaldi.com/download/archive diff --git a/network/vivaldi/doinst.sh b/network/vivaldi/doinst.sh index 1a8085ae10..65c7e2eeb9 100644 --- a/network/vivaldi/doinst.sh +++ b/network/vivaldi/doinst.sh @@ -7,6 +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 - -rm -f /opt/vivaldi/libffmpeg.so -rm -f /opt/vivaldi/libwidevinecdm.so diff --git a/network/vivaldi/vivaldi.SlackBuild b/network/vivaldi/vivaldi.SlackBuild index d3ffcf4502..36d63fd57a 100644 --- a/network/vivaldi/vivaldi.SlackBuild +++ b/network/vivaldi/vivaldi.SlackBuild @@ -4,6 +4,7 @@ # # Copyright 2015-2017 Edinaldo P. Silva, Rio de Janeiro, Brazil. # Copyright 2017-2019, Alexander Verbovetsky, Moscow, Russia +# Copyright 2019-2021, Ruari Oedegaard, Oslo, Norway # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,9 +25,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vivaldi -VERSION=${VERSION:-2.9.1705.41} -FFMPEG_VERSION="78.0.3904.70" -WIDEVINE_VERSION="4.10.1440.18" +VERSION=${VERSION:-3.7.2218.52} +FFMPEG_VERSION="89.0.4389.90" +WIDEVINE_VERSION="4.10.1582.2" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,21 +56,21 @@ set -e rm -rf $PKG $TMP/$PRGNAM mkdir -p $TMP/$PRGNAM $PKG $OUTPUT - cd $TMP/$PRGNAM -ar p $CWD/${PRGNAM}-stable_${VERSION}-*_${BITS}.deb data.tar.xz | tar xvJ +ar p $CWD/${PRGNAM}-stable_${VERSION}-*_${BITS}.deb data.tar.xz | tar xvJ ./opt ./usr +ar p $CWD/chromium-codecs-ffmpeg-extra_${FFMPEG_VERSION}-*_${BITS}.deb \ + data.tar.xz | tar xOJ ./usr/lib/chromium-browser/libffmpeg.so \ + > opt/vivaldi/libffmpeg.so.${VERSION%\.*\.*} + if [ "x$BITS" = "xarmhf" ] ; then - echo "This script doesn't support installing proprietary media codecs on ARM." -else - mkdir -p var/opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS} - mkdir -p var/opt/vivaldi/media-codecs-${FFMPEG_VERSION} - ar p $CWD/chromium-codecs-ffmpeg-extra_${FFMPEG_VERSION}-*_${BITS}.deb \ - data.tar.xz | tar xJf - ./usr/lib/chromium-browser/libffmpeg.so --strip 4 - mv libffmpeg.so var/opt/vivaldi/media-codecs-${FFMPEG_VERSION} + echo "This script doesn't support installing Widevine on ARM." +elif [ "x$BITS" = "xi386" ] ; then + rm -f opt/vivaldi/WidevineCdm + mkdir -p opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS} unzip -oq $CWD/${WIDEVINE_VERSION}-linux-${WBITS}.zip \ - -d var/opt/vivaldi/WidevineCdm - mv var/opt/vivaldi/WidevineCdm/libwidevinecdm.so \ - var/opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS} + -d opt/vivaldi/WidevineCdm + mv opt/vivaldi/WidevineCdm/libwidevinecdm.so \ + opt/vivaldi/WidevineCdm/_platform_specific/linux_${PBITS} fi chown -R root:root . @@ -80,14 +81,12 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; rm -r opt/vivaldi/cron -rm -f opt/vivaldi/WidevineCdm -mv opt usr var $PKG/ +mv opt usr $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 ln -sf /opt/vivaldi/vivaldi $PKG/usr/bin/vivaldi -ln -fs /var/opt/vivaldi/WidevineCdm $PKG/opt/vivaldi/WidevineCdm for res in 16 22 24 32 48 64 128 256; do install -Dm644 "$PKG/opt/vivaldi/product_logo_${res}.png" \ diff --git a/network/vivaldi/vivaldi.info b/network/vivaldi/vivaldi.info index fc626f4946..c26ed60304 100644 --- a/network/vivaldi/vivaldi.info +++ b/network/vivaldi/vivaldi.info @@ -1,18 +1,16 @@ PRGNAM="vivaldi" -VERSION="2.9.1705.41" +VERSION="3.7.2218.52" HOMEPAGE="https://vivaldi.com" -DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_2.9.1705.41-1_i386.deb \ - https://launchpadlibrarian.net/449418163/chromium-codecs-ffmpeg-extra_78.0.3904.70-0ubuntu0.16.04.2_i386.deb \ - https://dl.google.com/widevine-cdm/4.10.1440.18-linux-ia32.zip" -MD5SUM="150c2ea15bcdf534198b4e4d9aac9bca \ - 9dd2ba0d979042d75987f881842c0351 \ - c151f6314712678ac81b6298bc36c997" -DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_2.9.1705.41-1_amd64.deb \ - https://launchpadlibrarian.net/449403909/chromium-codecs-ffmpeg-extra_78.0.3904.70-0ubuntu0.16.04.2_amd64.deb \ - https://dl.google.com/widevine-cdm/4.10.1440.18-linux-x64.zip" -MD5SUM_x86_64="915726cc2bac8e85db00a6edab97f43b \ - 05224151a111339651b3d19999b65a51 \ - fc6cf66cdff7c57d367b317505f086d1" -REQUIRES="" -MAINTAINER="Alexander Verbovetsky" -EMAIL="alik@ejik.org" +DOWNLOAD="https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.52-1_i386.deb \ + https://launchpadlibrarian.net/528923945/chromium-codecs-ffmpeg-extra_89.0.4389.90-0ubuntu0.16.04.2_i386.deb \ + https://dl.google.com/widevine-cdm/4.10.1582.2-linux-ia32.zip" +MD5SUM="688dcaabbded8a31e70c2be6a5ba3ddf \ + 00d2f09afa9447e9a506c9a4ff52bbdd \ + 247a331a4d5bceb9f20366a39136a4fa" +DOWNLOAD_x86_64="https://downloads.vivaldi.com/stable/vivaldi-stable_3.7.2218.52-1_amd64.deb \ + https://launchpadlibrarian.net/528666745/chromium-codecs-ffmpeg-extra_89.0.4389.90-0ubuntu0.16.04.2_amd64.deb" +MD5SUM_x86_64="89626848f295aa3d6b9fd60706a03f3a \ + 7bbb3d45d15b806c0b29ed0a1728af64" +REQUIRES="libxkbcommon" +MAINTAINER="Ruari Oedegaard" +EMAIL="sbo@ruari.com" diff --git a/network/vnstat/vnstat.SlackBuild b/network/vnstat/vnstat.SlackBuild index 0c6d377584..f58df4c10b 100644 --- a/network/vnstat/vnstat.SlackBuild +++ b/network/vnstat/vnstat.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for vnstat # Copyright 2017-2019 Michiel van Wessem, Manchester, United Kingdom. -# Copyright 2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2019-2020 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=vnstat -VERSION=${VERSION:-2.4} +VERSION=${VERSION:-2.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/vnstat/vnstat.info b/network/vnstat/vnstat.info index 8f0e03b318..9802ad57be 100644 --- a/network/vnstat/vnstat.info +++ b/network/vnstat/vnstat.info @@ -1,8 +1,8 @@ PRGNAM="vnstat" -VERSION="2.4" +VERSION="2.6" HOMEPAGE="https://humdi.net/vnstat/" -DOWNLOAD="https://humdi.net/vnstat/vnstat-2.4.tar.gz" -MD5SUM="e1ed4fdbe0173d826b1e751d3cc93ff1" +DOWNLOAD="https://humdi.net/vnstat/vnstat-2.6.tar.gz" +MD5SUM="fe2928a81243cc8a532a357f97221736" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/vpnc/vpnc.info b/network/vpnc/vpnc.info index 553dbfc0f5..e524643206 100644 --- a/network/vpnc/vpnc.info +++ b/network/vpnc/vpnc.info @@ -6,5 +6,5 @@ MD5SUM="53f94e10df6b192c3ab1cdf4735fef45" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="alkos333" -EMAIL="me@alkos333.net" +MAINTAINER="Robby Workman" +EMAIL="rworkman@slackbuilds.org" diff --git a/network/w3m/w3m.SlackBuild b/network/w3m/w3m.SlackBuild index ca8a3dec0e..416eba172e 100644 --- a/network/w3m/w3m.SlackBuild +++ b/network/w3m/w3m.SlackBuild @@ -19,13 +19,13 @@ # (INCLUDING NEGLIGENCE OR 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@tty1.uk> (2018) +# Now maintained by Dave Woodfall <dave@slackbuilds.org> (2018) # Much appreciation to the debian maintainers for keeping w3m alive and # patched https://packages.debian.org/stretch/w3m PRGNAM=w3m VERSION=${VERSION:-0.5.3_37} -PATCHVERSION=${VERSION//_/-} +PATCHVERSION=$(echo $VERSION | sed "s/_/-/g") SRCVERSION=${SRCVERSION:-0.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/w3m/w3m.info b/network/w3m/w3m.info index d28ff7f97a..308f707d11 100644 --- a/network/w3m/w3m.info +++ b/network/w3m/w3m.info @@ -9,4 +9,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="imlib2" MAINTAINER="Dave Woodfall" -EMAIL="dave@tty1.uk" +EMAIL="dave@slackbuilds.org" diff --git a/network/wakeonlan/wakeonlan.SlackBuild b/network/wakeonlan/wakeonlan.SlackBuild index b3f34ea2b3..8b0c3eaad3 100644 --- a/network/wakeonlan/wakeonlan.SlackBuild +++ b/network/wakeonlan/wakeonlan.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wakeonlan -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2020 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,7 +69,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 {} \; -python setup.py install --root=$PKG +python3 setup.py install --root=$PKG + +mkdir -p $PKG/usr/bin +mv $PKG/usr/bin/wol $PKG/usr/bin/wakeonlan 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/network/wakeonlan/wakeonlan.info b/network/wakeonlan/wakeonlan.info index df492a4c92..41c393af24 100644 --- a/network/wakeonlan/wakeonlan.info +++ b/network/wakeonlan/wakeonlan.info @@ -5,6 +5,6 @@ DOWNLOAD="https://pypi.python.org/packages/source/w/wakeonlan/wakeonlan-0.2.2.ta MD5SUM="738cf2e3c01de8ff393d0863f5172383" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="python3" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/network/waterfox/README b/network/waterfox/README deleted file mode 100644 index b3c73f191f..0000000000 --- a/network/waterfox/README +++ /dev/null @@ -1,23 +0,0 @@ -Waterfox was one of the first widely distributed 64-Bit browsers on -the Web and quickly gained a loyal following. At one time, Waterfox -had one thing in mind - speed. But now Waterfox also attempts to be an -ethical, user-oriented browser. - -Features: - - Disabled Encrypted Media Extensions (EME) - Disabled Web Runtime (deprecated as of 2015) - Removed Pocket - Removed Telemetry - Removed data collection - Removed startup profiling - Allow running of all 64-Bit NPAPI plugins - Allow running of unsigned extensions - Removal of Sponsored Tiles on New Tab Page - Addition of Duplicate Tab option - Locale selector in about:preferences > General - -Waterfox is only available for the x86-64 architecture. - -This SlackBuild just repackages the binary package provided by the project. -It doesn't attempt to build the browser from source. diff --git a/network/waterfox/slack-desc b/network/waterfox/slack-desc deleted file mode 100644 index ea56f854e3..0000000000 --- a/network/waterfox/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------------------------------------------------------| -waterfox: waterfox (Web browser) -waterfox: -waterfox: Waterfox was one of the first widely distributed 64-Bit browsers on -waterfox: the Web and quickly gained a loyal following. At one time, Waterfox -waterfox: had one thing in mind - speed. But now Waterfox also attempts to be an -waterfox: ethical, user-oriented browser -waterfox: -waterfox: -waterfox: -waterfox: Homepage: https://www.waterfox.net -waterfox: diff --git a/network/waterfox/waterfox.desktop b/network/waterfox/waterfox.desktop deleted file mode 100644 index 66c468c68f..0000000000 --- a/network/waterfox/waterfox.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Waterfox Web Browser -Comment=Browse the World Wide Web -Keywords=Internet;WWW;Browser;Web;Explorer -Exec=waterfox %u -Terminal=false -X-MultipleArgs=false -Type=Application -Icon=waterfox -Categories=Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall; -StartupNotify=true diff --git a/network/waterfox/waterfox.info b/network/waterfox/waterfox.info deleted file mode 100644 index 48354ef08c..0000000000 --- a/network/waterfox/waterfox.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="waterfox" -VERSION="56.2.12" -HOMEPAGE="https://www.waterfox.net" -DOWNLOAD="UNSUPPORTED" -MD5SUM="" -DOWNLOAD_x86_64="https://storage-waterfox.netdna-ssl.com/releases/linux64/installer/waterfox-56.2.12.en-US.linux-x86_64.tar.bz2" -MD5SUM_x86_64="20d2c6f0e4ea02942e0168c847e96f77" -REQUIRES="" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" diff --git a/network/wavemon/README b/network/wavemon/README index f1f5ddfffd..3d1a5c51a6 100644 --- a/network/wavemon/README +++ b/network/wavemon/README @@ -11,5 +11,6 @@ It was originally developed by Jan Morgenstern. If you use a filesystem that supports posix capabilities, an easy way to start wavemon as a normal user, while still providing it with all of the -access permissions it requires, is by issuing the following command as root: +access permissions it requires, is by issuing the following command as +root: # setcap cap_net_admin=eip /usr/bin/wavemon diff --git a/network/wavemon/wavemon.SlackBuild b/network/wavemon/wavemon.SlackBuild index e9c8499483..79885a0040 100644 --- a/network/wavemon/wavemon.SlackBuild +++ b/network/wavemon/wavemon.SlackBuild @@ -3,11 +3,11 @@ # Wavemon Copyright 2012 Vliegendehuiskat, Netherlands # Slackware build script for <wavemon> -# Written by Nick Warne <nick@linicks.net> 2019... +# Written by Nick Warne <warne.nick@gmail.com> 2019... # Licensed under the WTFPL <http://sam.zoy.org/wtfpl/COPYING> PRGNAM=wavemon -VERSION=${VERSION:-0.9.0} +VERSION=${wavemon-0.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/wavemon/wavemon.info b/network/wavemon/wavemon.info index ceb1cfe7bc..0774583082 100644 --- a/network/wavemon/wavemon.info +++ b/network/wavemon/wavemon.info @@ -1,10 +1,10 @@ PRGNAM="wavemon" -VERSION="0.9.0" +VERSION="0.9.3" HOMEPAGE="https://github.com/uoaerg/wavemon" -DOWNLOAD=" https://github.com/uoaerg/wavemon/archive/v0.9.0/wavemon-0.9.0.tar.gz" -MD5SUM="7276dd648da5463798f3662d33c29ecc" +DOWNLOAD="https://github.com/uoaerg/wavemon/archive/v0.9.3/wavemon-0.9.3.tar.gz" +MD5SUM="57879ea3bd68381f5e13c721d285f588" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Nick Warne" -EMAIL="nick@linicks.net" +EMAIL="warne.nick@gmail.com" diff --git a/network/webhook/webhook.SlackBuild b/network/webhook/webhook.SlackBuild index fe781a2d37..2c09945c72 100644 --- a/network/webhook/webhook.SlackBuild +++ b/network/webhook/webhook.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=webhook -VERSION=${VERSION:-2.6.10} -BUILD=${BUILD:-5} +VERSION=${VERSION:-2.6.11} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/network/webhook/webhook.info b/network/webhook/webhook.info index dd537026db..1153ffe7e9 100644 --- a/network/webhook/webhook.info +++ b/network/webhook/webhook.info @@ -1,8 +1,8 @@ PRGNAM="webhook" -VERSION="2.6.10" +VERSION="2.6.11" HOMEPAGE="https://github.com/adnanh/webhook" -DOWNLOAD="https://github.com/adnanh/webhook/archive/2.6.10/webhook-2.6.10.tar.gz" -MD5SUM="d99188ebc028ae51b71a6113b4e92e7d" +DOWNLOAD="https://github.com/adnanh/webhook/archive/2.6.11/webhook-2.6.11.tar.gz" +MD5SUM="c4ca240ae1cd17b4aa288b7cb332cab5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="google-go-lang" diff --git a/network/webhook/webhook.sysconfig b/network/webhook/webhook.sysconfig index 5480a856b2..73f8681241 100644 --- a/network/webhook/webhook.sysconfig +++ b/network/webhook/webhook.sysconfig @@ -16,7 +16,7 @@ PIDFILE="/var/run/webhook/webhook.pid" # effective user USER=nobody -# protocol://yourserver:port/PREFIX/:hook-id (default "hooks") +# protocol://yourserver:port/URLPREFIX/:hook-id (default "hooks") URLPREFIX="hooks" # Other options diff --git a/network/weboob/README b/network/weboob/README deleted file mode 100644 index fa3f535370..0000000000 --- a/network/weboob/README +++ /dev/null @@ -1,2 +0,0 @@ -weboob (Web Out Of Browsers) provides several applications to -interact with a lot of websites. diff --git a/network/weboob/weboob.info b/network/weboob/weboob.info deleted file mode 100644 index 38feeabdd3..0000000000 --- a/network/weboob/weboob.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="weboob" -VERSION="0.a" -HOMEPAGE="http://weboob.org/" -DOWNLOAD="https://symlink.me/attachments/download/165/weboob-0.a.tar.gz" -MD5SUM="15568485fd2bea4c53b69a6edb8c7e45" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="PyYAML feedparser html2text lxml mechanize nose python-dateutil rtmpdump" -MAINTAINER="Brandon Soonaye" -EMAIL="brandonsoonaye@live.fr" diff --git a/network/weechat/README b/network/weechat/README index 559b831967..b67241d043 100644 --- a/network/weechat/README +++ b/network/weechat/README @@ -1,6 +1,4 @@ -weechat (IRC client) - -WeeChat is a light & fast multilingual curses-based multiplatform IRC client. +WeeChat is a light, fast, multilingual, curses-based multiplatform IRC client. WeeChat supports: DCC files and chats, multi-server connections, background connections, @@ -9,8 +7,7 @@ WeeChat supports: nick auto-completion, lag indication, auto-logging and client upgrades without dropping connections. -WeeChat will be built with support for Perl, Python and Ruby scripting. If Lua -is installed, it will be auto-detected and scripting support will also be -included. +WeeChat will be built with support for Perl, Python and Ruby scripting. -WeeChat man pages will be built if rubygem-asciidoctor is installed. +WeeChat documentation and manpages will not be built by default. They can be +enabled by setting DOC=ON, provided that ruby/rubygem-asciidoctor is installed. diff --git a/network/weechat/weechat.SlackBuild b/network/weechat/weechat.SlackBuild index 7cd220a689..ee28d2d234 100644 --- a/network/weechat/weechat.SlackBuild +++ b/network/weechat/weechat.SlackBuild @@ -2,7 +2,7 @@ # Originally written by hollywoodb (hollywoodb@fastmail.fm) # Maintained 2011-2016 by sero (firebird209 at gmail dot com) -# Maintained 2017-2019 by Benjamin Trigona-Harany <slackbuilds@jaxartes.net> +# Maintained 2017-2021 by 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=weechat -VERSION=${VERSION:-2.6} +VERSION=${VERSION:-3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,10 +75,13 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_MAN=ON \ + -DENABLE_MAN=OFF \ + -DENABLE_LUA=OFF \ + -DENABLE_JAVASCRIPT=OFF \ -DENABLE_PHP=OFF \ - -DENABLE_PYTHON3=ON \ - -DENABLE_DOC=OFF \ + -DENABLE_PYTHON=ON \ + -DENABLE_DOC=${DOC:-OFF} \ + -DENABLE_MAN=${DOC:-OFF} \ -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ .. @@ -94,6 +97,9 @@ if [ -e $PKG/usr/share/man ]; then fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +if [ -e $PKG/usr/share/doc/$PRGNAM ]; then + mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION/html +fi cp -a \ AUTHORS.adoc COPYING ChangeLog.adoc README.adoc ReleaseNotes.adoc \ $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/weechat/weechat.info b/network/weechat/weechat.info index 454107ea4c..90780d1f44 100644 --- a/network/weechat/weechat.info +++ b/network/weechat/weechat.info @@ -1,8 +1,8 @@ PRGNAM="weechat" -VERSION="2.6" +VERSION="3.1" HOMEPAGE="http://www.weechat.org" -DOWNLOAD="http://weechat.org/files/src/weechat-2.6.tar.bz2" -MD5SUM="d71c00bf479f46036f06a42fe5ace365" +DOWNLOAD="http://weechat.org/files/src/weechat-3.1.tar.bz2" +MD5SUM="baf116300f4ae4050e46b61d11a4df81" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/network/wendzelnntpd/README b/network/wendzelnntpd/README new file mode 100644 index 0000000000..ec444c9b28 --- /dev/null +++ b/network/wendzelnntpd/README @@ -0,0 +1,12 @@ +WendzelNNTPd is an IPv6-ready Usenet server (NNTP daemon) with the +main goal to maximize usability on the console level. WendzelNNTPd +achieves this by breaking down complicated things into an easy-to-use +configuration file and tool. The server is portable (Linux/*BSD/ +*nix), supports AUTHINFO authentication, contains support for Access +Control Lists (ACL), Role-based Access Control (RBAC) and supports +invisible newsgroups. It currently supports MySQL and SQLite backends. + +Note: This package is compiled without MYSQL support and uses + sqlite3 instead. + If you want to use MySQL instead of sqlite3, remove the + "MYSQL=NO" before ./configure in wendzelnntpd.Slackbuild. diff --git a/network/wendzelnntpd/doinst.sh b/network/wendzelnntpd/doinst.sh new file mode 100644 index 0000000000..203ca9ad9f --- /dev/null +++ b/network/wendzelnntpd/doinst.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +UDBFILE=/var/spool/news/wendzelnntpd/usenet.db + +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} +} + +# Keep same perms when installing rc.httpd.new: +preserve_perms etc/rc.d/rc.wendzelnntpd.new + +# Backup old Usenet DB file if existent; if necessary, this allows to provide multiple copies; because after 2x replacing an existing with a .new file, we would lose all postings! However, replacing an existing usenet.db file is necessary since the database format might change and an old file might become incompatible with a newer one. +if [ -f $UDBFILE ]; then mv $UDBFILE ${UDBFILE}.`date +"%m-%d-%y-%H:%M"`.bkp; chmod 0600 ${UDBFILE}.`date +"%m-%d-%y-%H:%M"`.bkp; echo "***Your old usenet database was backuped!***"; fi + +# install config file +config var/spool/news/wendzelnntpd/usenet.db.new + +# Handle config files. Unless this is a fresh installation, the +# admin will have to move the .new files into place to complete +# the package installation, as we don't want to clobber files that +# may contain local customizations. +config etc/wendzelnntpd.conf.new + +# create a first standard newsgroup so that server is directly usable after install +/usr/sbin/wendzelnntpadm addgroup alt.wendzelnntpd.test y diff --git a/network/wendzelnntpd/slack-desc b/network/wendzelnntpd/slack-desc new file mode 100644 index 0000000000..fa06852729 --- /dev/null +++ b/network/wendzelnntpd/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------------------------------------------------------| +wendzelnntpd: wendzelnntpd (Easy-to-use NNTP Server) +wendzelnntpd: +wendzelnntpd: WendzelNNTPd is an IPv6-ready Usenet server (NNTP daemon) with the +wendzelnntpd: main goal to maximize usability on the console level. WendzelNNTPd +wendzelnntpd: achieves this by breaking down complicated things into an easy-to-use +wendzelnntpd: configuration file and tool. The server is portable (Linux/*BSD/ +wendzelnntpd: *nix), supports AUTHINFO authentication, contains support for Access +wendzelnntpd: Control Lists (ACL), Role-based Access Control (RBAC) and supports +wendzelnntpd: invisible newsgroups. It currently supports MySQL and SQLite backends. +wendzelnntpd: Note: This package is compiled without MYSQL support and uses +wendzelnntpd: sqlite3 instead. diff --git a/network/wendzelnntpd/wendzelnntpd.SlackBuild b/network/wendzelnntpd/wendzelnntpd.SlackBuild new file mode 100644 index 0000000000..cff6ef214a --- /dev/null +++ b/network/wendzelnntpd/wendzelnntpd.SlackBuild @@ -0,0 +1,128 @@ +#!/bin/bash -e + +# Slackware build script for WendzelNNTPd +# +# Copyright 2021 Steffen Wendzel, https://www.wendzel.de +# 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. +# +# This script was written using the one from slackbuilds.org as a reference. +# Thanks to Patrick Volkerding and Adis Nezirovic for the original work. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=wendzelnntpd +VERSION=${VERSION:-2.1.2} +TGZ_DIRNAME=cdpxe-WendzelNNTPd-5ea53d6 # for v2.1.2 +BUILD=${BUILD:-3} +TAG=${TAG:-_SBo} +TMP=${TMP:-/tmp/SBo} +OUTPUT=${OUTPUT:-/tmp} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +set -e + +# 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 + +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PRGNAM} +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT + +cd $TMP +rm -rf $TGZ_DIRNAME +tar -xvf $CWD/v$VERSION.tar.gz +cd $TGZ_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 {} \; + +# Configure: +MYSQL=NO DESTDIR=/usr CONFDIR=/etc ./configure + +# Build and install: +make + +# spool dir + usenet database +mkdir -p $PKG/var/spool/news/wendzelnntpd + +# og-rwx since the passwords are stored in the database too! +install -d -m 0700 -o 0 -g 0 $PKG/var/spool/news/wendzelnntpd +cp database/usenet.db $PKG/var/spool/news/wendzelnntpd/usenet.db.new +chmod 600 $PKG/var/spool/news/wendzelnntpd/usenet.db.new + +# add the rc.d script ; also fix URL of the deamon binary +mkdir -p $PKG/etc/rc.d +cat scripts/startup/init.d_script | sed 's/^DAEMON=.*$/DAEMON=\/usr\/sbin\/wendzelnntpd/' > $PKG/etc/rc.d/rc.wendzelnntpd.new +chmod 644 $PKG/etc/rc.d/rc.wendzelnntpd.new + +# add the binaries +mkdir -p $PKG/usr/sbin +chmod 0755 $PKG/usr/sbin/ +cp -v bin/wendzelnntpd bin/wendzelnntpadm $PKG/usr/sbin/ +chmod 755 $PKG/usr/sbin/* + +# rename config file to .new +cp -v wendzelnntpd.conf $PKG/etc/wendzelnntpd.conf.new +chmod 644 $PKG/etc/wendzelnntpd.conf.new + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +# add version number to doc directory and also put it in /usr/doc +# instead of /usr/share/doc +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -vr docs/docs $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -v docs/docs.pdf $PKG/usr/doc/$PRGNAM-$VERSION/docs.pdf +cp -v AUTHOR CHANGELOG HISTORY README.md INSTALL LICENSE database/usenet.db_struct database/mysql_db_struct.sql $PKG/usr/doc/$PRGNAM-$VERSION/ +chmod -R 0644 $PKG/usr/doc/$PRGNAM-$VERSION/* + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# This is kept for the case that wendzelnntpd will contain a manpage in the future. +# Compress man pages +# If the man pages are installed to /usr/share/man instead, you'll need to either +# add the --mandir=/usr/man flag to configure or move them manually after the +# make install process is run. +#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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-$VERSION-$ARCH-${BUILD}${TAG}.${PKGTYPE:-tgz} + diff --git a/network/wendzelnntpd/wendzelnntpd.info b/network/wendzelnntpd/wendzelnntpd.info new file mode 100644 index 0000000000..53e888a969 --- /dev/null +++ b/network/wendzelnntpd/wendzelnntpd.info @@ -0,0 +1,10 @@ +PRGNAM="wendzelnntpd" +VERSION="2.1.2" +HOMEPAGE="https://cdpxe.github.io/WendzelNNTPd/" +DOWNLOAD="https://downloads.sourceforge.net/project/wendzelnntpd/v2.1.2/v2.1.2.tar.gz" +MD5SUM="3cbeeca74d5e6ddb7e3bb99e99f86ddf" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Steffen Wendzel" +EMAIL="wendzel@hs-worms.de" diff --git a/network/wifi-radar/wifi-radar.SlackBuild b/network/wifi-radar/wifi-radar.SlackBuild index ff0388b9c1..e4805217b7 100644 --- a/network/wifi-radar/wifi-radar.SlackBuild +++ b/network/wifi-radar/wifi-radar.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wifi-radar -# 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/network/wifi-radar/wifi-radar.info b/network/wifi-radar/wifi-radar.info index 2453167d1c..5172e442fd 100644 --- a/network/wifi-radar/wifi-radar.info +++ b/network/wifi-radar/wifi-radar.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/network/windscribe/README b/network/windscribe/README new file mode 100644 index 0000000000..d9a9bd4fcd --- /dev/null +++ b/network/windscribe/README @@ -0,0 +1,18 @@ +Windscribe VPN is a Canada-based provider that promises to help you +browse the web privately. It contains a set of tools that work +together to block ad trackers and web beacons, restore access to +blocked content and help you safeguard your privacy online. +You can use Windscribe for free, for as long as you like. +With a confirmed email address you get 10GB/month of data +and access to over 10 countries. + +The following can be used to start/stop Windscribe automatically: +/etc/rc.d/rc.local + if [ -x /etc/rc.d/rc.windscribe ]; then + /etc/rc.d/rc.windscribe start + fi + +/etc/rc.d/rc.local_shutdown + if [ -x /etc/rc.d/rc.windscribe ]; then + /etc/rc.d/rc.windscribe stop + fi diff --git a/network/windscribe/doinst.sh b/network/windscribe/doinst.sh new file mode 100644 index 0000000000..50669a07b6 --- /dev/null +++ b/network/windscribe/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/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 /etc/rc.d/rc.windscribe ]; then + /etc/rc.d/rc.windscribe restart +fi diff --git a/network/windscribe/rc.windscribe b/network/windscribe/rc.windscribe new file mode 100644 index 0000000000..8341cd89c1 --- /dev/null +++ b/network/windscribe/rc.windscribe @@ -0,0 +1,79 @@ +#!/usr/bin/env bash + + + +PRGNAM=windscribe +PID=/var/run/$PRGNAM.pid +DAEMON=/usr/bin/windscribe + + +# +# Function that starts the daemon +# +windscribe_start() +{ + if [ -s $PID ]; then + echo "$PRGNAM is already running: $(cat $PID)" + exit 1 + fi + + if [ -x $DAEMON ]; then + $DAEMON start + pidof $DAEMON > $PID + fi +} + +# +# Function that stops the daemon +# +windscribe_stop() +{ + if [ -s $PID ]; then + $DAEMON stop + rm -rf $PID + else + echo "$PRGNAM is not running." + fi +} + +# +# Function that restarts the daemon +# +windscribe_restart() +{ + windscribe_stop + sleep 1 + windscribe_start +} + +# +# Function that shows the current status of the daemon +# +windscribe_status() +{ + if [ -s $PID ]; then + echo "$PRGNAM is running: $(cat $PID)" + else + echo "$PRGNAM is not running." + fi +} + + +case "$1" in + start) + windscribe_start + ;; + stop) + windscribe_stop + ;; + restart) + windscribe_restart + ;; + status) + windscribe_status + ;; + *) + echo $"Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac diff --git a/network/windscribe/slack-desc b/network/windscribe/slack-desc new file mode 100644 index 0000000000..44efc4ade4 --- /dev/null +++ b/network/windscribe/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------------------------------------------------------| +windscribe: windscribe (Browse the web privately.) +windscribe: +windscribe: Windscribe VPN is a Canada-based provider that promises to help you +windscribe: browse the web privately. It contains a set of tools that work +windscribe: together to block ad trackers and web beacons, restore access to +windscribe: blocked content and help you safeguard your privacy online. +windscribe: You can use Windscribe for free, for as long as you like. With a +windscribe: confirmed email address you get 10GB/month of data. +windscribe: +windscribe: https://www.windscribe.com/ +windscribe: diff --git a/network/windscribe/windscribe.SlackBuild b/network/windscribe/windscribe.SlackBuild new file mode 100644 index 0000000000..215c2b719f --- /dev/null +++ b/network/windscribe/windscribe.SlackBuild @@ -0,0 +1,74 @@ +#!/bin/sh +# +# Slackware build script for Windscribe. +# +# Copyright 2020 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=windscribe +VERSION=${VERSION:-1.4} +BUILD=${BUILD:-52} +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 + +if [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + BITS="amd64" +else + echo "Package for $(uname -m) architecture is not available." + exit 1 +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-${VERSION} +mkdir -p $PRGNAM-${VERSION} +cd $PKG +rpm2cpio $CWD/$PRGNAM-cli-${VERSION}-${BUILD}.${ARCH}.rpm | cpio -idmv +rm -rf usr/lib + +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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +mkdir -p $PKG/etc/rc.d/ +cp $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM + +cd $PKG +/sbin/makepkg -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/windscribe/windscribe.info b/network/windscribe/windscribe.info new file mode 100644 index 0000000000..8ebf338b0c --- /dev/null +++ b/network/windscribe/windscribe.info @@ -0,0 +1,10 @@ +PRGNAM="windscribe" +VERSION="1.4" +HOMEPAGE="https://www.windscribe.com/" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://assets.staticnetcontent.com/desktop/linux/windscribe-cli-1.4-52.x86_64.rpm" +MD5SUM_x86_64="8b04995a4030d4f1c14550dcfe630a34" +REQUIRES="" +MAINTAINER="Reza Talebi" +EMAIL="reza.talebi.73@outlook.com" diff --git a/network/wire/README b/network/wire/README index 40cff1e57c..930951df16 100644 --- a/network/wire/README +++ b/network/wire/README @@ -4,9 +4,9 @@ Our personal and professional data is at the center of a new economy. The information we share on social networks, via email, and messaging services is being used to build profiles. These profiles are in turn used to sell us products and services through targeted advertising and -suggestion. The data collected is vast, detailed, and often very personal. -Vast resources are being spent to refine the profiles, all without -transparency, policy or oversight. +suggestion. The data collected is vast, detailed, and often very +personal. Vast resources are being spent to refine the profiles, all +without transparency, policy or oversight. Our personal and professional online communications should not be part of this economy. In the physical world we talk with each other directly. diff --git a/network/wire/wire.SlackBuild b/network/wire/wire.SlackBuild index 160bd830cf..d8216bbb3c 100644 --- a/network/wire/wire.SlackBuild +++ b/network/wire/wire.SlackBuild @@ -2,7 +2,8 @@ # Slackware build script for wire -# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2016-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2020 David O'Shaughnessy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,16 +24,16 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wire -VERSION=${VERSION:-3.5.2881} +VERSION=${VERSION:-3.24.2939} 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 + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac fi CWD=$(pwd) @@ -41,24 +42,27 @@ 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 -DEBARCH="i386" +# Upstream only has binary support for x86_64. if [ "$ARCH" = "x86_64" ]; then DEBARCH="amd64" +else + echo "Sorry, the Wire binary is only available for x86_64." + exit 1 fi rm -rf $PKG @@ -66,26 +70,26 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION mkdir -p $PRGNAM-$VERSION && cd $PRGNAM-$VERSION -ar p $CWD/$PRGNAM\_$VERSION\_$DEBARCH.deb data.tar.xz | tar xJv +ar p $CWD/${PRGNAM^}-$VERSION\_$DEBARCH.deb data.tar.xz | tar xJv 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 {} \; # Install data mkdir -p $PKG/opt/${PRGNAM^} cp -rf opt/${PRGNAM^}/* $PKG/opt/${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 + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Create soft link for launcher mkdir -p $PKG/usr/bin ( - cd $PKG/usr/bin - ln -sf /opt/${PRGNAM^}/$PRGNAM-desktop $PRGNAM-desktop + cd $PKG/usr/bin + ln -sf /opt/${PRGNAM^}/$PRGNAM-desktop $PRGNAM-desktop ) # Install .desktop file @@ -96,12 +100,12 @@ cat usr/share/applications/$PRGNAM-desktop.desktop > \ # Install .desktop icon mkdir -p $PKG/usr/share/pixmaps install -D -m0644 usr/share/icons/hicolor/32x32/apps/$PRGNAM-desktop.png \ - $PKG/usr/share/pixmaps/$PRGNAM-desktop.png + $PKG/usr/share/pixmaps/$PRGNAM-desktop.png gunzip usr/share/doc/$PRGNAM-desktop/changelog.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a usr/share/doc/$PRGNAM-desktop/changelog opt/${PRGNAM^}/LICENSE* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/wire/wire.info b/network/wire/wire.info index 5bb7ae21fa..d904ad0ea5 100644 --- a/network/wire/wire.info +++ b/network/wire/wire.info @@ -1,10 +1,10 @@ PRGNAM="wire" -VERSION="3.5.2881" +VERSION="3.24.2939" HOMEPAGE="https://wire.com/" -DOWNLOAD="https://wire-app.wire.com/linux/debian/pool/main/wire_3.5.2881_i386.deb" -MD5SUM="8482c67aef41b11637cb655bc52ad843" -DOWNLOAD_x86_64="https://wire-app.wire.com/linux/debian/pool/main/wire_3.5.2881_amd64.deb" -MD5SUM_x86_64="3737d3b06ef0daa378ae6de06f76373a" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://wire-app.wire.com/linux/Wire-3.24.2939_amd64.deb" +MD5SUM_x86_64="f6ef6b45745579dac66d46a6d319ddf8" REQUIRES="" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +MAINTAINER="David O'Shaughnessy" +EMAIL="dev@osh.id.au" diff --git a/network/wireguard-linux-compat/README b/network/wireguard-linux-compat/README new file mode 100644 index 0000000000..5db7f66f25 --- /dev/null +++ b/network/wireguard-linux-compat/README @@ -0,0 +1,12 @@ +WireGuard is a VPN that uses state-of-the-art cryptography. It is +designed as a general purpose VPN for running on embedded interfaces +and super computers alike, fit for many different circumstances. + +This script only builds the WireGuard kernel module. Userspace +tools are also required to configure and use WireGuard tunnels. Refer +to the wireguard-tools script on SlackBuilds. + +NOTE: Slackware-current contains the WireGuard module as of +kernel 5.10.1. If running an up to date -current, installing this +module is no longer required. You will most likely still want to +install the wireguard-tools SlackBuilds package. diff --git a/network/WireGuard/doinst.sh b/network/wireguard-linux-compat/doinst.sh index d335d682c8..d335d682c8 100644 --- a/network/WireGuard/doinst.sh +++ b/network/wireguard-linux-compat/doinst.sh diff --git a/network/wireguard-linux-compat/slack-desc b/network/wireguard-linux-compat/slack-desc new file mode 100644 index 0000000000..625f285323 --- /dev/null +++ b/network/wireguard-linux-compat/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------------------------------------------------------| +wireguard-linux-compat: wireguard-linux-compat (WireGuard kernel module) +wireguard-linux-compat: +wireguard-linux-compat: WireGuard is a VPN that uses state-of-the-art cryptography. It is +wireguard-linux-compat: designed as a general purpose VPN for running on embedded interfaces +wireguard-linux-compat: and super computers alike, fit for many different circumstances. +wireguard-linux-compat: +wireguard-linux-compat: https://www.wireguard.com/ +wireguard-linux-compat: +wireguard-linux-compat: +wireguard-linux-compat: +wireguard-linux-compat: diff --git a/network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild b/network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild new file mode 100644 index 0000000000..c205fdcd73 --- /dev/null +++ b/network/wireguard-linux-compat/wireguard-linux-compat.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for the WireGuard kernel module + +# Copyright 2017-2019 David Spencer, Baildon, West Yorkshire, U.K. +# Copyright 2020-2021 Anj Duvnjak +# 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=wireguard-linux-compat +VERSION=${VERSION:-1.0.20210219} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +KERNEL="${KERNEL:-"$(uname -r)"}" +PKGVER="$(printf %s "${VERSION}_$KERNEL" | tr - _)" + +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 {} \; + +# Although counterintuitive, setting DEPMOD true prevents it executing +# Instead depmod will run as part of doinst.sh + +cd src + env -u ARCH CFLAGS="$SLKCFLAGS" make \ + KERNELRELEASE="$KERNEL" + env -u ARCH make install \ + KERNELRELEASE="$KERNEL" \ + DESTDIR=$PKG \ + INSTALL_MOD_PATH=$PKG \ + DEPMOD="true" +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/install +cat $CWD/slack-desc > $PKG/install/slack-desc +sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/wireguard-linux-compat/wireguard-linux-compat.info b/network/wireguard-linux-compat/wireguard-linux-compat.info new file mode 100644 index 0000000000..eb59f72278 --- /dev/null +++ b/network/wireguard-linux-compat/wireguard-linux-compat.info @@ -0,0 +1,10 @@ +PRGNAM="wireguard-linux-compat" +VERSION="1.0.20210219" +HOMEPAGE="https://www.wireguard.com/" +DOWNLOAD="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20210219.tar.xz" +MD5SUM="8f177b685c7a18ea51ae7f4132cfb444" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Anj Duvnjak" +EMAIL="alvind11@hotmail.com" diff --git a/network/wireguard-tools/README b/network/wireguard-tools/README new file mode 100644 index 0000000000..4769a806fe --- /dev/null +++ b/network/wireguard-tools/README @@ -0,0 +1,20 @@ +WireGuard is a VPN that uses state-of-the-art cryptography. It is +designed as a general purpose VPN for running on embedded interfaces +and super computers alike, fit for many different circumstances. + +WireGuard userspace tools require WireGuard support in the kernel (or +as a kernel module). Refer to the wireguard-linux-compat script on +Slackbuilds to build the associated kernel module package. + +openresolv is an optional runtime dependency -- you need it if you want +to use to use wg-quick's DNS option. + +The wg-quick script needs at least nft 0.7 installed, if using nft. +Slackware 14.2 ships with nftables 0.6. As such the build script +will patch wg-quick to always fall back to iptables. + +If you have nftables 0.7 or newer installed (i.e. you are running +-current or a modified 14.2 installation), you may want to leave +wg-quick unpatched by setting NEW_NFT as follows -: + +NEW_NFT=yes ./wireguard-tools.SlackBuild diff --git a/network/wireguard-tools/slack-desc b/network/wireguard-tools/slack-desc new file mode 100644 index 0000000000..987bf40a55 --- /dev/null +++ b/network/wireguard-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------------------------------------------------------| +wireguard-tools: wireguard-tools (Userspace tools to configure and use WireGuard) +wireguard-tools: +wireguard-tools: WireGuard is a VPN that uses state-of-the-art cryptography. It is +wireguard-tools: designed as a general purpose VPN for running on embedded interfaces +wireguard-tools: and super computers alike, fit for many different circumstances. +wireguard-tools: +wireguard-tools: https://www.wireguard.com/ +wireguard-tools: +wireguard-tools: +wireguard-tools: +wireguard-tools: diff --git a/network/WireGuard/WireGuard.SlackBuild b/network/wireguard-tools/wireguard-tools.SlackBuild index 9596371d13..14099a1bd2 100644 --- a/network/WireGuard/WireGuard.SlackBuild +++ b/network/wireguard-tools/wireguard-tools.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for WireGuard +# Slackware build script for WireGuard userspace tools -# Copyright 2017 David Spencer, Baildon, West Yorkshire, U.K. +# Copyright 2017-2019 David Spencer, Baildon, West Yorkshire, U.K. +# Copyright 2020-2021 Anj Duvnjak # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +23,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=WireGuard -VERSION=${VERSION:-0.0.20181119} +PRGNAM=wireguard-tools +VERSION=${VERSION:-1.0.20210315} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -KERNEL="${KERNEL:-"$(uname -r)"}" -PKGVER="$(printf %s "${VERSION}_$KERNEL" | tr - _)" +PKGVER="$(printf %s "${VERSION}" | tr - _)" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -72,8 +72,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 {} \; -# We do this in doinst.sh -sed -i -e '/depmod -a/d' src/Makefile + +NEW_NFT=${NEW_NFT:-no} +[[ $NEW_NFT != "no" ]] || sed -i 's/type -p nft/false/g' src/wg-quick/linux.bash ; + # If you want this, you can have it :) SYSTEMD="${SYSTEMD:-no}" @@ -83,7 +85,7 @@ cd src env -u ARCH make install \ MANDIR=/usr/man \ DESTDIR=$PKG \ - INSTALL_MOD_PATH=$PKG \ + WITH_WGQUICK=yes \ WITH_SYSTEMDUNITS="$SYSTEMD" cd .. @@ -94,12 +96,10 @@ 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-$PKGVER -cp -a COPYING README.md contrib/examples $PKG/usr/doc/$PRGNAM-$PKGVER cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVER/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -sed "s%@KERNEL@%$KERNEL%" $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/wireguard-tools/wireguard-tools.info b/network/wireguard-tools/wireguard-tools.info new file mode 100644 index 0000000000..3200d7dd29 --- /dev/null +++ b/network/wireguard-tools/wireguard-tools.info @@ -0,0 +1,10 @@ +PRGNAM="wireguard-tools" +VERSION="1.0.20210315" +HOMEPAGE="https://www.wireguard.com/" +DOWNLOAD="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20210315.tar.xz" +MD5SUM="d6663d322ee5e5c4353838c6e9f98a1a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="wireguard-linux-compat" +MAINTAINER="Anj Duvnjak" +EMAIL="alvind11@hotmail.com" diff --git a/network/wireshark/README b/network/wireshark/README index 43e6e37efc..0b16ad486d 100644 --- a/network/wireshark/README +++ b/network/wireshark/README @@ -41,13 +41,15 @@ link libraries present in the old package, which will then be removed when upgrading). Optional dependencies: -- c-ares - krb5 - nghttp2 - spandsp - snappy - lz4 - libsmi +- libminizip +- libilbc +- opus NOTE: Wireshark 3.0 no longer support legacy GTK+ UI. diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild index 5624a7fea8..7f20f93f98 100644 --- a/network/wireshark/wireshark.SlackBuild +++ b/network/wireshark/wireshark.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for wireshark # Copyright 2008-2014 Michiel van Wessem, Leicester, United Kingdom -# Copyright 2017-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2017-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # Originally written by Jick Nan (jick.nan@gmail.com) # All rights reserved. # @@ -30,7 +30,7 @@ # Modified by B. Watson <yalhcru@gmail.com> to add lua52 support. PRGNAM=wireshark -VERSION=${VERSION:-3.0.6} +VERSION=${VERSION:-3.4.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -90,12 +90,16 @@ else echo "=== Building with lua (v5.1)" fi +patch -p1 < $CWD/wireshark.patch + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. make @@ -105,8 +109,6 @@ 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 diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info index f130ee5d07..8bbdeb1031 100644 --- a/network/wireshark/wireshark.info +++ b/network/wireshark/wireshark.info @@ -1,10 +1,10 @@ PRGNAM="wireshark" -VERSION="3.0.6" +VERSION="3.4.4" HOMEPAGE="https://www.wireshark.org/" -DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-3.0.6.tar.xz" -MD5SUM="c6f8d12a3efe21cc7885f7cb0c4bd938" +DOWNLOAD="https://1.as.dl.wireshark.org/src/wireshark-3.4.4.tar.xz" +MD5SUM="dbc93615612db327276aec8391a3c090" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5 lua python3" +REQUIRES="qt5 lua python3 c-ares" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/network/wireshark/wireshark.patch b/network/wireshark/wireshark.patch new file mode 100644 index 0000000000..2d64c04fb1 --- /dev/null +++ b/network/wireshark/wireshark.patch @@ -0,0 +1,10 @@ +--- wireshark-3.2.0/sharkd_session.c.orig 2019-12-24 07:18:33.288976163 +0700 ++++ wireshark-3.2.0/sharkd_session.c 2019-12-24 07:18:52.448168808 +0700 +@@ -16,6 +16,7 @@ + #include <stdarg.h> + #include <string.h> + #include <errno.h> ++#include <stdint.h> + + #include <glib.h> + diff --git a/network/wp-cli/README b/network/wp-cli/README new file mode 100644 index 0000000000..2d60038e8c --- /dev/null +++ b/network/wp-cli/README @@ -0,0 +1,13 @@ + +WP-CLI is a set of command-line tools for managing WordPress +installations. + +WP-CLI need phar extension to build and to work + +Enable the phar extension in your php.ini and +disable the readonly setting for the phar extension: + Set phar.readonly to Off + +Also disable open_basedir +because likely to cause errors with wp-cli + diff --git a/network/wp-cli/files/LICENSE b/network/wp-cli/files/LICENSE new file mode 100644 index 0000000000..017ee0bf17 --- /dev/null +++ b/network/wp-cli/files/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (C) 2011-2019 WP-CLI Development Group (https://github.com/wp-cli/wp-cli/contributors) + +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. diff --git a/network/wp-cli/files/wp-completion.bash b/network/wp-cli/files/wp-completion.bash new file mode 100644 index 0000000000..9df572b6d6 --- /dev/null +++ b/network/wp-cli/files/wp-completion.bash @@ -0,0 +1,23 @@ +# bash completion for the `wp` command + +_wp_complete() { + local OLD_IFS="$IFS" + local cur=${COMP_WORDS[COMP_CWORD]} + + IFS=$'\n'; # want to preserve spaces at the end + local opts="$(wp cli completions --line="$COMP_LINE" --point="$COMP_POINT")" + + if [[ "$opts" =~ \<file\>\s* ]] + then + COMPREPLY=( $(compgen -f -- $cur) ) + elif [[ $opts = "" ]] + then + COMPREPLY=( $(compgen -f -- $cur) ) + else + COMPREPLY=( ${opts[*]} ) + fi + + IFS="$OLD_IFS" + return 0 +} +complete -o nospace -F _wp_complete wp diff --git a/network/wp-cli/slack-desc b/network/wp-cli/slack-desc new file mode 100644 index 0000000000..4687cb903d --- /dev/null +++ b/network/wp-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------------------------------------------------------| +wp-cli: wp-cli (A command line interface for WordPress) +wp-cli: +wp-cli: WP-CLI is a set of command-line tools for managing WordPress +wp-cli: installations. +wp-cli: +wp-cli: http://wp-cli.org +wp-cli: +wp-cli: +wp-cli: +wp-cli: +wp-cli: diff --git a/network/hipchat2/hipchat2.SlackBuild b/network/wp-cli/wp-cli.SlackBuild index b218763b71..ac1e8df938 100644 --- a/network/hipchat2/hipchat2.SlackBuild +++ b/network/wp-cli/wp-cli.SlackBuild @@ -1,14 +1,10 @@ #!/bin/sh - -# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST -# Copyright 2009, 2010, 2011, 2012, 2013 Eric Hameleers, Eindhoven, Netherlands -# Slackware build script for hipchat2 -# Written by Lionel Young <lionelyoung@gmail.com> -# Based on http://slackbuilds.org/template.SlackBuild -# Maintained by Ryan P.C. McQuen <ryanpcmcquen@member.fsf.org> 2014-2017 - -# Alan Dingeldein | Canyon Lake, TX | kd5zex@gmail.com - +# +# Slackware build script for wp-cli +# +# Copyright 2016-2020 Corrado Franco (https://corradofranco.it) +# All rights reserved. +# # 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 @@ -26,21 +22,16 @@ # 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/>. +# + +CWD=$(pwd) -PRGNAM=hipchat2 -VERSION=${VERSION:-2.2.1388} +PRGNAM=wp-cli +VERSION=${VERSION:-2.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCNAM=hipchat - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i686 ;; - arm*) export ARCH=arm ;; - *) export ARCH=$( uname -m ) ;; - esac -fi +ARCH=noarch CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -50,30 +41,19 @@ OUTPUT=${OUTPUT:-/tmp} set -e rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT - -tar xvf $CWD/$SRCNAM-$VERSION-$ARCH.pkg.tar.xz -C $PKG -chown -R root:root $PKG - -# Create missing symlink for cert -mkdir -p $PKG/etc/ssl/certs -ln -s DigiCert_High_Assurance_EV_Root_CA.pem $PKG/etc/ssl/certs/81b9768f.0 - -# Fix permissions on libraries -find $PKG -name "*\.so*" -type f -exec chmod 0755 {} \; +mkdir -p $PKG $OUTPUT -# Remove some cruft -rm -f $PKG/.PKGINFO +install -Dm755 $CWD/$PRGNAM-$VERSION.phar $PKG/usr/bin/wp -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 bash completion +install -Dm644 $CWD/files/wp-completion.bash $PKG/etc/bash_completion.d/wp mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $CWD/files/LICENSE $PKG/usr/doc/$PRGNAM-$VERSION || true 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/network/wp-cli/wp-cli.info b/network/wp-cli/wp-cli.info new file mode 100644 index 0000000000..fbe573dcfa --- /dev/null +++ b/network/wp-cli/wp-cli.info @@ -0,0 +1,10 @@ +PRGNAM="wp-cli" +VERSION="2.4.0" +HOMEPAGE="http://wp-cli.org/" +DOWNLOAD="https://github.com/wp-cli/wp-cli-bundle/releases/download/v2.4.0/wp-cli-2.4.0.phar" +MD5SUM="dedd5a662b80cda66e9e25d44c23b25c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="composer" +MAINTAINER="Corrado Franco" +EMAIL="conraid (at) linux (dot) it" diff --git a/network/wsdd2/README b/network/wsdd2/README new file mode 100644 index 0000000000..f5e8736ab7 --- /dev/null +++ b/network/wsdd2/README @@ -0,0 +1,31 @@ +wsdd2 (WSD/LLMNR Descovery/Name Service Daemon) + +Provides samba share descovery for clients who don't support netbios +or are running ip6 (which netbios does not support). +Effectively this allows modern windows computers to find samba +shares, and allows you to avoid smb1/smb2 for which there are many +exploits in the wild. This is based on the NETGEAR implimentation. + +NOTE: make sure you allow local ip6 connections in your samba config +otherwise there will be no shares found. if you use "hosts allow" +then add fc00::/7 fe80::/64 ::1 +to the list of your local ip4 addresses so that local ip6 pcs can +use your shares. + +NOTE2: make sure ports 5357 (tcp) and 3702 (udp) are open if you +are using a firewall. + +to get wsdd2 to run automatically on startup add the following lines +in /etc/rc.d/rc.local + +#start wsdd2 daemon if samba is configured +if [ -x /etc/rc.d/rc.wsdd2 ]; then + /etc/rc.d/rc.wsdd2 start +fi + +and to stop it on shutdown, add the following to +samba section in /etc/rc.d/rc.local_shutdown + +if [ -x /etc/rc.d/rc.wsdd2 ]; then + /etc/rc.d/rc.wsdd2 stop +fi diff --git a/network/wsdd2/README.allowip6 b/network/wsdd2/README.allowip6 new file mode 100644 index 0000000000..85009e9325 --- /dev/null +++ b/network/wsdd2/README.allowip6 @@ -0,0 +1,17 @@ +It may be obvious, but its easy to forget; to access samba shares +using ip6 you need to allow ip6 addresses access to the server. If +you want to limit access to local ip6 addresses and you are using +the "hosts allow" option in smb.conf then add the following +address/masks to the end of any ip4 addresses you alread have listed + + fc00::/7 fe80::/64 ::1 + +this will allow link-local, unique-local, and local loop ip6 addresses + +Even if a machine has a public ip6 address, it will also have a +link-local one for ip6 sublayer operations of the Neighbor Discovery +Protocol as well as for some other protocols such as DHCPv6 + +if you are using a firewall, don't forget to allow access to port +5357 (tcp) and 3702 (udp) otherwise wsdd2 will not work. + diff --git a/network/wsdd2/doinst.sh b/network/wsdd2/doinst.sh new file mode 100644 index 0000000000..194630ea25 --- /dev/null +++ b/network/wsdd2/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 + chmod +x $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.wsdd2.new diff --git a/network/wsdd2/rc.wsdd2 b/network/wsdd2/rc.wsdd2 new file mode 100644 index 0000000000..594e1faab5 --- /dev/null +++ b/network/wsdd2/rc.wsdd2 @@ -0,0 +1,58 @@ +#!/bin/sh +# +# /etc/rc.d/rc.wsdd2 +# +# start/stop/restart the wsdd2 daemon. +# +# To make wsdd2 start automatically at boot make sure this +# file is executable, and add the following entry to rc.local +# after the samba test (uncommented) + +# if [ -x /etc/rc.d/rc.wsdd2 ]; then +# /etc/rc.d/rc.wsdd2 start +# fi + +# you may also add the following entry to rc.local_shutdown +# (uncommented) + +# if [ -x /etc/rc.d/rc.wsdd2 ]; then +# /etc/rc.d/rc.wsdd2 stop +# fi + +wsdd2_start() { + if [ -r /etc/samba/smb.conf -a -x /etc/rc.d/rc.samba -a -x /usr/sbin/wsdd2 ]; then + echo "Starting wsdd2: /usr/bin/wsdd2 -d" + /usr/sbin/wsdd2 -d + elif [ ! -r /etc/samba/smb.conf ]; then + echo "ERROR: samba not configured, so wsdd2 has no service to advertise" + fi +} +wsdd2_stop() { + #check something is running before trying to kill it. + if [ "x`ps -A|grep ' wsdd2'|wc -l`" != "x0" ]; then + killall wsdd2 + fi +} +wsdd2_restart() { + wsdd2_stop + sleep 1 + wsdd2_start +} +case "$1" in +'start') + #we don't want to run this more than once, + #so kill off any instance already running + wsdd2_stop + wsdd2_start + ;; +'stop') + wsdd2_stop + ;; +'restart') + wsdd2_restart + ;; +*) + # default is start + wsdd2_start +esac + diff --git a/network/wsdd2/slack-desc b/network/wsdd2/slack-desc new file mode 100644 index 0000000000..31fade9c60 --- /dev/null +++ b/network/wsdd2/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------------------------------------------------------| +wsdd2: wsdd2 (WSD/LLMNR Descovery/Name Service Daemon) +wsdd2: +wsdd2: Provides samba share browsing for clients who don't support netbios +wsdd2: or are running ip6 (which netbios does not support). +wsdd2: Effectively this allows modern windows computers to find samba +wsdd2: shares, and allows you to avoid smb1/smb2 for which there are many +wsdd2: exploits in the wild. This is based on the NETGEAR implimentation. +wsdd2: +wsdd2: Don't forget to allow local ip6 connections in your smb.conf file. +wsdd2: +wsdd2: Home Page https://github/Andy2244/wsdd2 diff --git a/network/wsdd2/wsdd2.SlackBuild b/network/wsdd2/wsdd2.SlackBuild new file mode 100644 index 0000000000..deff03a691 --- /dev/null +++ b/network/wsdd2/wsdd2.SlackBuild @@ -0,0 +1,99 @@ +#!/bin/sh + +# Slackware build script for wsdd2 + +# 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=wsdd2 +VERSION=${VERSION:-1.8.3.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 {} \; + +#we are going to have to fix Makefile as we don't want systemd stuff +sed -i "/systemd/d" Makefile + +make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" +make install DESTDIR=$PKG MANINSTALLDIR="usr/man" INSTALLPREFIX="usr" + +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 + +#copy over the rc file +mkdir -p $PKG/etc/rc.d +cp -a $CWD/rc.${PRGNAM} $PKG/etc/rc.d/rc.${PRGNAM}.new +chown root:root $PKG/etc/rc.d/rc.${PRGNAM}.new +# now for docs +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/README.allowip6 > $PKG/usr/doc/$PRGNAM-$VERSION/README.allowip6 +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/network/wsdd2/wsdd2.info b/network/wsdd2/wsdd2.info new file mode 100644 index 0000000000..1fbfb16814 --- /dev/null +++ b/network/wsdd2/wsdd2.info @@ -0,0 +1,10 @@ +PRGNAM="wsdd2" +VERSION="1.8.3.2" +HOMEPAGE="https://github.com/Andy2244/wsdd2" +DOWNLOAD="https://github.com/Andy2244/wsdd2/archive/1.8.3.2/wsdd2-1.8.3.2.tar.gz" +MD5SUM="6ddc3411776bf102309f8edcde34115a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README%" +MAINTAINER="Tim Dickson" +EMAIL="dickson.tim@googlemail.com" diff --git a/network/xaric/README b/network/xaric/README new file mode 100644 index 0000000000..ec0d41cd8f --- /dev/null +++ b/network/xaric/README @@ -0,0 +1,5 @@ +xaric (simple colorful IRC client) + +Xaric is a UNIX irc client similar to (and forked from) BitchX and +ircII. The purpose of xaric is to remove all of the bogus, broken crap +and silly features from BitchX and have a nice colorful client. diff --git a/network/xaric/doinst.sh b/network/xaric/doinst.sh new file mode 100644 index 0000000000..9424ce43ff --- /dev/null +++ b/network/xaric/doinst.sh @@ -0,0 +1,13 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/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/network/xaric/slack-desc b/network/xaric/slack-desc new file mode 100644 index 0000000000..adabe1fb53 --- /dev/null +++ b/network/xaric/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------------------------------------------------------| +xaric: xaric (simple colorful IRC client) +xaric: +xaric: Xaric is a UNIX irc client similar to (and forked from) BitchX and +xaric: ircII. The purpose of xaric is to remove all of the bogus, broken crap +xaric: and silly features from BitchX and have a nice colorful client. +xaric: +xaric: +xaric: +xaric: +xaric: +xaric: diff --git a/network/xaric/xaric.SlackBuild b/network/xaric/xaric.SlackBuild new file mode 100644 index 0000000000..c729e5fbd8 --- /dev/null +++ b/network/xaric/xaric.SlackBuild @@ -0,0 +1,97 @@ +#!/bin/sh + +# Slackware build script for xaric + +# Written by B. Watson (yalhcru@gmail.com) + +# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. + +# 20201122 bkw: BUILD=2, install icons to the right place. + +PRGNAM=xaric +VERSION=${VERSION:-0.13.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} + +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 {} \+ + +sed -i 's,/usr/local,/usr,' $PRGNAM.1 + +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/man1/$PRGNAM.1 + +# .desktop file ripped off (from hexchat.desktop) by SlackBuild +# author. Normally I don't do these for purely console applications, +# but upstream provided a nice icon, so might as well make use of it. +mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps +cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop +cp -a $PRGNAM.xpm $PKG/usr/share/pixmaps +for i in 16 32 48; do + dir=$PKG/usr/share/icons/hicolor/${i}x${i}/apps + mkdir -p $dir + convert $PRGNAM.xpm -resize ${i}x${i}! $dir/$PRGNAM.png +done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +# Don't need 2 copies of the GPL +rm -f $PKG/usr/share/$PRGNAM/help/copying +ln -s ../../../doc/$PRGNAM-$VERSION/COPYING $PKG/usr/share/$PRGNAM/help/copying + +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/network/xaric/xaric.desktop b/network/xaric/xaric.desktop new file mode 100644 index 0000000000..d8bafcd7c5 --- /dev/null +++ b/network/xaric/xaric.desktop @@ -0,0 +1,55 @@ +[Desktop Entry] +Name=Xaric +GenericName=IRC Client +Comment=Chat with other people online +Comment[ca]=Parla amb altres persones en línia. +Comment[cs]=Chatujte online s ostatními lidmi +Comment[da]=Chat med andre personer online +Comment[de]=Online mit anderen Menschen chatten +Comment[en_GB]=Chat with other people online +Comment[es]=Chatea con otras personas en línea +Comment[et]=Vestle teiste kasutajatega internetis +Comment[fi]=Keskustele muiden kanssa verkossa +Comment[fr]=Parlez avec d'autres personnes en ligne +Comment[id]=Mengobrol dengan orang lain daring +Comment[it]=Chiacchiera con altri utenti online +Comment[ja_JP]=他の人とオンラインチャットをします +Comment[ko]=온라인에 있는 사람들과 대화합니다 +Comment[lt]=Kalbėkite su kitais prisijungusiais žmonėmis +Comment[nb]=Prat med andre folk på nettet +Comment[pl]=Rozmawiaj z innymi ludźmi przez internet +Comment[pt]=Conversa com outras pessoas online +Comment[pt_BR]=Converse com outras pessoas na rede +Comment[sq]=Bisedoni në linjë me persona të tjerë +Comment[sr]=Ћаскајте са пријатељима онлајн +Comment[sv]=Chatta med andra människor online +Comment[zh_CN]=与其他人在线聊天 +Keywords=IM;Chat; +Keywords[ca]=MI;Xat; +Keywords[da]=IM;Chat; +Keywords[de]=IM;Chat; +Keywords[en_GB]=IM;Chat; +Keywords[es]=IM;Chat; +Keywords[eu]=IM;Chat;Txat; +Keywords[fi]=IM;Chat;pikaviestin;keskustelu; +Keywords[fr]=IM;Chat; +Keywords[id]=IM;Obrolan; +Keywords[it]=IM;Chat;Messaggistica Istantanea;IRC; +Keywords[ko]=IM;인스턴트 메신저;Chat;대화; +Keywords[lt]=IM;Pokalbiai; +Keywords[nb]=IM;Chat; +Keywords[pl]=IM;Chat; +Keywords[pt]=IM;Chat; +Keywords[pt_BR]=IM;Chat; +Keywords[ru]=IM;Чат; +Keywords[sq]=IM;Fjalosje; +Keywords[sr]=ИМ;Ћаскање; +Keywords[sv]=IM;Chatt; +Keywords[zh_CN]=IM;聊天; +Exec=xaric +Icon=xaric +Terminal=true +Type=Application +Categories=Network;IRCClient; +StartupNotify=false +MimeType=x-scheme-handler/irc;x-scheme-handler/ircs; diff --git a/network/xaric/xaric.info b/network/xaric/xaric.info new file mode 100644 index 0000000000..2472aa7845 --- /dev/null +++ b/network/xaric/xaric.info @@ -0,0 +1,10 @@ +PRGNAM="xaric" +VERSION="0.13.7" +HOMEPAGE="https://xaric.org/" +DOWNLOAD="http://xaric.org/software/xaric/releases/xaric-0.13.7.tar.gz" +MD5SUM="46f4460dfab17819dd6d7e543be75206" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/network/xdman/xdman.SlackBuild b/network/xdman/xdman.SlackBuild index 62cc10ba4e..3e7e25c0d8 100644 --- a/network/xdman/xdman.SlackBuild +++ b/network/xdman/xdman.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for xdman. # -# 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 diff --git a/network/xdman/xdman.info b/network/xdman/xdman.info index d2c01872c5..ebd90cd3b8 100644 --- a/network/xdman/xdman.info +++ b/network/xdman/xdman.info @@ -6,5 +6,5 @@ MD5SUM="e4c83df8298682def2fa44944b183d0e" DOWNLOAD_x86_64="https://sourceforge.net/projects/xdman/files/xdm-2018-x64.tar.xz" MD5SUM_x86_64="a92cf4d15fa79964b8480f44e6bd93fd" REQUIRES="jdk p7zip" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/network/xl2tpd/xl2tpd.info b/network/xl2tpd/xl2tpd.info index ae33ca09ef..83b8a78347 100644 --- a/network/xl2tpd/xl2tpd.info +++ b/network/xl2tpd/xl2tpd.info @@ -6,5 +6,5 @@ MD5SUM="d1e44ad0055a02ac89a32b2a6eeb0719" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="gshep" -EMAIL="shepelev.georgy@googlemail.com" +MAINTAINER="Mario Preksavec" +EMAIL="mario at slackware dot hr" diff --git a/network/yadifa/README b/network/yadifa/README index 718a975704..6eace606e7 100644 --- a/network/yadifa/README +++ b/network/yadifa/README @@ -1,15 +1,16 @@ -Lightweight authoritative Name Server with DNSSEC capabilities. Developed by -the passionate people behind the .eu top-level domain, YADIFA has been built -from scratch to face today’s DNS challenges, with no compromise on security, -speed and stability, to offer a better and safer Internet experience. +Lightweight authoritative Name Server with DNSSEC +capabilities. Developed by the passionate people behind the .eu +top-level domain, YADIFA has been built from scratch to face today’s +DNS challenges, with no compromise on security, speed and stability, +to offer a better and safer Internet experience. -Package binaries and shared objects linked here dynamically, but by-default -configure script links it statically, for performance consideration. Static -linking makes sence only on heavy loaded environment (10+ Mbit DNS traffic, -5000+ queries/second per server). +Package binaries and shared objects linked here dynamically, but +by-default configure script links it statically, for performance +consideration. Static linking makes sence only on heavy loaded +environment (10+ Mbit DNS traffic, 5000+ queries/second per server). -YADIFA requires its own user in order to run securely. It is not advised to -run services as root user without special reason. +YADIFA requires its own user in order to run securely. It is not +advised to run services as root user without special reason. To add yadifa user in system run as root: @@ -24,14 +25,14 @@ if [ -x /etc/rc.d/rc.yadifa ]; then /etc/rc.d/rc.yadifa start fi -By default this package compiles as shared binaries, but if required it is -possible to build it statically. YADIFA' source by default links staticaly, -because of performance considerations, but in pracatice it takes less effort -to support shared linked binaries. But if you really need it just set -environment variable and run SlackBuild: +By default this package compiles as shared binaries, but if required +it is possible to build it statically. YADIFA's source by default links +statically, because of performance considerations, but in practice it +takes less effort to support shared linked binaries. But if you really +need it just set environment variable and run SlackBuild: USESTATIC=yes ./yadifa.SlackBuild -In case of using static build of YADIFA, you should re-build and re-install -yadifa package each time openssl recieves update to keep your installation -secure.
\ No newline at end of file +If you use a static build of YADIFA, you should re-build and +re-install the yadifa package each time openssl recieves an update, +to keep your installation secure. diff --git a/network/yadifa/slack-desc b/network/yadifa/slack-desc index a665097633..ef719c6b91 100644 --- a/network/yadifa/slack-desc +++ b/network/yadifa/slack-desc @@ -10,7 +10,7 @@ yadifa: yadifa (Yet Another DNS Implementation For All) yadifa: yadifa: yadifa is a lightweight authoritative Name Server with DNSSEC yadifa: capabilities. Developed by the passionate people behind the .eu -yadifa: top-level domain, yadifa has been built from scratch to face today’s +yadifa: top-level domain, yadifa has been built from scratch to face today's yadifa: DNS challenges, with no compromise on security, speed and stability, yadifa: to offer a better and safer Internet experience. yadifa: diff --git a/network/yadifa/yadifa.SlackBuild b/network/yadifa/yadifa.SlackBuild index 0b27ad7745..717dea1e5e 100644 --- a/network/yadifa/yadifa.SlackBuild +++ b/network/yadifa/yadifa.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for YADIFA, Authoritative DNS server -# Copyright (c) 2016, Sergey Fedosov <eleksir@gmail.com> +# Copyright (c) 2016-2020 Sergey Fedosov <eleksir@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yadifa -VERSION=${VERSION:-2.3.8} -VSUFFIX=${VSUFFIX:-7713} +VERSION=${VERSION:-2.4.0} +VSUFFIX=${VSUFFIX:-9809} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCVERSION=$(echo $VERSION-$VSUFFIX | tr _ -) + if ! grep -q "^yadifa:" /etc/group; then echo "$0: Error: $PRGNAM group (yadifa) doesn't exist." echo "$0: Try creating one with:" @@ -84,9 +86,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf yadifa-$VERSION-${VSUFFIX} -tar xvf $CWD/yadifa-$VERSION-${VSUFFIX}.tar.gz || tar xvf $CWD/$VERSION-${VSUFFIX}.tar.gz -cd yadifa-$VERSION-${VSUFFIX} +rm -rf yadifa-$SRCVERSION +tar xvf $CWD/yadifa-$SRCVERSION.tar.gz || tar xvf $CWD/$SRCVERSION.tar.gz +cd yadifa-$SRCVERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -100,7 +102,7 @@ find -L . \ --libdir=/usr/lib/yadifa \ --localstatedir=/var/lib/yadifa \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION-${VSUFFIX} \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-logdir=/var/log/yadifa \ --enable-silent-rules \ --enable-shared=$SHARED \ @@ -115,8 +117,9 @@ 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-${VSUFFIX} -install --mode=644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION-${VSUFFIX}/$PRGNAM.SlackBuild +find $PKG/usr/man -type f -exec gzip -9 {} \+ +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +install --mode=644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install install --mode=644 $CWD/slack-desc $PKG/install/slack-desc @@ -146,4 +149,4 @@ install --mode=644 $CWD/yadifa.logrotate $PKG/etc/logrotate.d/yadifa.new rm -rf $PKG/etc/yadifa/yadifad.conf cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_${VSUFFIX}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/yadifa/yadifa.info b/network/yadifa/yadifa.info index 14fc0d9ea8..a160056cfe 100644 --- a/network/yadifa/yadifa.info +++ b/network/yadifa/yadifa.info @@ -1,8 +1,8 @@ PRGNAM="yadifa" -VERSION="2.3.8-7713" -HOMEPAGE="https://www.yadifa.eu/home" -DOWNLOAD="https://cdn.yadifa.eu/sites/default/files/releases/yadifa-2.3.8-7713.tar.gz" -MD5SUM="90c67ebf2f4eb6add43191be93610b2f" +VERSION="2.4.0" +HOMEPAGE="https://www.yadifa.eu" +DOWNLOAD="https://www.yadifa.eu/sites/default/files/releases/yadifa-2.4.0-9809.tar.gz" +MD5SUM="af12001a6169533bc546aa7bfdac9c29" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/yandex-browser-beta/yandex-browser-beta.SlackBuild b/network/yandex-browser-beta/yandex-browser-beta.SlackBuild index a5176350cc..662a11f5d0 100644 --- a/network/yandex-browser-beta/yandex-browser-beta.SlackBuild +++ b/network/yandex-browser-beta/yandex-browser-beta.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for yandex-browser-beta. # -# Copyright 2017-2019 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=yandex-browser-beta -VERSION=${VERSION:-19.6.2.594} +VERSION=${VERSION:-19.12.3.332} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/yandex-browser-beta/yandex-browser-beta.info b/network/yandex-browser-beta/yandex-browser-beta.info index 47aaa29c39..741e564b42 100644 --- a/network/yandex-browser-beta/yandex-browser-beta.info +++ b/network/yandex-browser-beta/yandex-browser-beta.info @@ -1,10 +1,10 @@ PRGNAM="yandex-browser-beta" -VERSION="19.6.2.594" +VERSION="19.12.3.332" HOMEPAGE="https://browser.yandex.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://repo.yandex.ru/yandex-browser/deb/pool/main/y/yandex-browser-beta/yandex-browser-beta_19.6.2.594-1_amd64.deb" -MD5SUM_x86_64="47db3402492c3b0210daa9143285e4fc" +DOWNLOAD_x86_64="http://repo.yandex.ru/yandex-browser/deb/pool/main/y/yandex-browser-beta/yandex-browser-beta_19.12.3.332-1_amd64.deb" +MD5SUM_x86_64="f8f4be3913abaf37d2eb45530ebe177c" REQUIRES="" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" +MAINTAINER="orphaned - no maintainer" +EMAIL="nobody@nowhere" diff --git a/network/yle-dl/README b/network/yle-dl/README index c38646071b..9e7a4d78cc 100644 --- a/network/yle-dl/README +++ b/network/yle-dl/README @@ -1,5 +1,5 @@ yle-dl is a tool for downloading media files from the video streaming services of the Finnish national broadcasting company Yle. -rtmpdump is an optional dependency. It's needed for downloading some Elävä -Arkisto streams. +Dependencies python-configargparse and python-requests need to be built with +Python 3 support. diff --git a/network/yle-dl/yle-dl.SlackBuild b/network/yle-dl/yle-dl.SlackBuild index cb440c0a5c..91299e4d50 100644 --- a/network/yle-dl/yle-dl.SlackBuild +++ b/network/yle-dl/yle-dl.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yle-dl -VERSION=${VERSION:-20191022} +VERSION=${VERSION:-20210212} 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/network/yle-dl/yle-dl.info b/network/yle-dl/yle-dl.info index bf93c246ac..4445a4ab55 100644 --- a/network/yle-dl/yle-dl.info +++ b/network/yle-dl/yle-dl.info @@ -1,10 +1,10 @@ PRGNAM="yle-dl" -VERSION="20191022" +VERSION="20210212" HOMEPAGE="https://aajanki.github.io/yle-dl/" -DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20191022/yle-dl-20191022.tar.gz" -MD5SUM="cf0df22f86dfeaffe1dfeb836e559496" +DOWNLOAD="https://github.com/aajanki/yle-dl/archive/20210212/yle-dl-20210212.tar.gz" +MD5SUM="afe636dc51baa133fa79c17c231c99e0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="attrs ffmpeg lxml mini-amf pycryptodome python-configargparse python-future python-requests" +REQUIRES="ffmpeg lxml python3 python3-attrs python-configargparse python-requests" MAINTAINER="Markus Rinne" EMAIL="markus.ka.rinne@gmail.com" diff --git a/network/you-get/you-get.SlackBuild b/network/you-get/you-get.SlackBuild index eca0ac883f..ad58723991 100644 --- a/network/you-get/you-get.SlackBuild +++ b/network/you-get/you-get.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for you-get -# Copyright 2014-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-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=you-get -VERSION=${VERSION:-0.4.1355} +VERSION=${VERSION:-0.4.1500} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/you-get/you-get.info b/network/you-get/you-get.info index 1af7fc72a2..8331c1e6fd 100644 --- a/network/you-get/you-get.info +++ b/network/you-get/you-get.info @@ -1,8 +1,8 @@ PRGNAM="you-get" -VERSION="0.4.1355" +VERSION="0.4.1500" HOMEPAGE="http://www.soimort.org/you-get/" -DOWNLOAD="https://files.pythonhosted.org/packages/9f/41/b2bb0bb994b6511f3bb306f237dbd56b9920b331d6db48e7ce7d473e68f7/you-get-0.4.1355.tar.gz" -MD5SUM="0d77679e86c3e5c19c526f046cf9e31f" +DOWNLOAD="https://files.pythonhosted.org/packages/b3/eb/e24fa3352fa27e1be3b7f8b3d158a3b12f6ee294c09614eb61b5d85fa054/you-get-0.4.1500.tar.gz" +MD5SUM="f1145217fc4a4f9407d24aa25a4828e8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="python3" diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild index d8000f7b45..161b33d8ec 100644 --- a/network/youtube-dl/youtube-dl.SlackBuild +++ b/network/youtube-dl/youtube-dl.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for youtube-dl # Copyright 2010 GPLeo <gpleomail@gmail.com> # Copyright 2010-2012 byteframe <byteframe@gmail.com> -# Copyright 2015-2019 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2015-2021 Dimitris Zlatanidis Orestiada, Greece # 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=youtube-dl -VERSION=${VERSION:-2019.10.22} +VERSION=${VERSION:-2021.02.22} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/youtube-dl/youtube-dl.info b/network/youtube-dl/youtube-dl.info index 6c314eaca0..fbfcde50a9 100644 --- a/network/youtube-dl/youtube-dl.info +++ b/network/youtube-dl/youtube-dl.info @@ -1,8 +1,8 @@ PRGNAM="youtube-dl" -VERSION="2019.10.22" +VERSION="2021.02.22" HOMEPAGE="http://www.yt-dl.org/" -DOWNLOAD="https://yt-dl.org/downloads/2019.10.22/youtube-dl-2019.10.22.tar.gz" -MD5SUM="49346e6d978b61039e0ab229730fd8e4" +DOWNLOAD="https://yt-dl.org/downloads/2021.02.22/youtube-dl-2021.02.22.tar.gz" +MD5SUM="a9136b338055166a233a753e149095f6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/youtube-upload/README b/network/youtube-upload/README index fae729bbbe..30973b3c00 100644 --- a/network/youtube-upload/README +++ b/network/youtube-upload/README @@ -1,2 +1,2 @@ Youtube-upload is a command line Python script that uploads videos -to Youtube using the YouTube APIv3.
\ No newline at end of file +to Youtube using the YouTube APIv3. diff --git a/network/zabbix_agentd/zabbix_agentd.SlackBuild b/network/zabbix_agentd/zabbix_agentd.SlackBuild index 2a68604788..cd9b8c58d9 100644 --- a/network/zabbix_agentd/zabbix_agentd.SlackBuild +++ b/network/zabbix_agentd/zabbix_agentd.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zabbix_agentd -VERSION=${VERSION:-4.0.4} +VERSION=${VERSION:-4.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/zabbix_agentd/zabbix_agentd.info b/network/zabbix_agentd/zabbix_agentd.info index 3aba67d4d9..61da085d68 100644 --- a/network/zabbix_agentd/zabbix_agentd.info +++ b/network/zabbix_agentd/zabbix_agentd.info @@ -1,10 +1,10 @@ PRGNAM="zabbix_agentd" -VERSION="4.0.4" -HOMEPAGE="https://www.zabbix.com/" -DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz" -MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f" +VERSION="4.4.7" +HOMEPAGE="https://www.zabbix.com" +DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz" +MD5SUM="24e5a166694db45ebb461757074fb02d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="jdk" MAINTAINER="zux" EMAIL="zux@pie-dabas.net" diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild index 32e9dd2d89..7c8b0784cc 100644 --- a/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild +++ b/network/zabbix_java_gateway/zabbix_java_gateway.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zabbix_java_gateway -VERSION=${VERSION:-4.0.4} +VERSION=${VERSION:-4.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/zabbix_java_gateway/zabbix_java_gateway.info b/network/zabbix_java_gateway/zabbix_java_gateway.info index 70410d7d77..a7ba6ccf87 100644 --- a/network/zabbix_java_gateway/zabbix_java_gateway.info +++ b/network/zabbix_java_gateway/zabbix_java_gateway.info @@ -1,10 +1,10 @@ PRGNAM="zabbix_java_gateway" -VERSION="4.0.4" -HOMEPAGE="https://www.zabbix.com/" -DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz" -MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f" +VERSION="4.4.7" +HOMEPAGE="https://www.zabbix.com" +DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz" +MD5SUM="24e5a166694db45ebb461757074fb02d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="iksemel jdk" +REQUIRES="jdk" MAINTAINER="zux" EMAIL="zux@pie-dabas.net" diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild index 4393bb7bc4..e756aa423d 100644 --- a/network/zabbix_proxy/zabbix_proxy.SlackBuild +++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zabbix_proxy -VERSION=${VERSION:-4.0.4} +VERSION=${VERSION:-4.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -99,7 +99,6 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-proxy \ --with-mysql \ - --with-jabber \ --with-libcurl \ --with-net-snmp \ --with-ssh2 \ diff --git a/network/zabbix_proxy/zabbix_proxy.info b/network/zabbix_proxy/zabbix_proxy.info index 4704e28f2e..da13ccd813 100644 --- a/network/zabbix_proxy/zabbix_proxy.info +++ b/network/zabbix_proxy/zabbix_proxy.info @@ -1,10 +1,10 @@ PRGNAM="zabbix_proxy" -VERSION="4.0.4" +VERSION="4.4.7" HOMEPAGE="https://www.zabbix.com" -DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz" -MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f" +DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz" +MD5SUM="24e5a166694db45ebb461757074fb02d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="iksemel jdk" +REQUIRES="jdk" MAINTAINER="zux" EMAIL="zux@pie-dabas.net" diff --git a/network/zabbix_server/zabbix_server.SlackBuild b/network/zabbix_server/zabbix_server.SlackBuild index ae8e62db4d..b157f3d0b8 100644 --- a/network/zabbix_server/zabbix_server.SlackBuild +++ b/network/zabbix_server/zabbix_server.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zabbix_server -VERSION=${VERSION:-4.0.4} +VERSION=${VERSION:-4.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -103,7 +103,6 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-server \ --with-mysql \ - --with-jabber \ --with-libcurl \ --with-net-snmp \ --with-ssh2 \ diff --git a/network/zabbix_server/zabbix_server.info b/network/zabbix_server/zabbix_server.info index 4d46eafd4f..29456fc927 100644 --- a/network/zabbix_server/zabbix_server.info +++ b/network/zabbix_server/zabbix_server.info @@ -1,10 +1,10 @@ PRGNAM="zabbix_server" -VERSION="4.0.4" +VERSION="4.4.7" HOMEPAGE="https://www.zabbix.com" -DOWNLOAD="https://downloads.sourceforge.net/zabbix/zabbix-4.0.4.tar.gz" -MD5SUM="46fdb83d4b24e13127a20a3e874b1d8f" +DOWNLOAD="https://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/4.4.7/zabbix-4.4.7.tar.gz" +MD5SUM="24e5a166694db45ebb461757074fb02d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="iksemel" +REQUIRES="" MAINTAINER="zux" EMAIL="zux@pie-dabas.net" diff --git a/network/zeek/README b/network/zeek/README index 02323c5758..da3cea66cd 100644 --- a/network/zeek/README +++ b/network/zeek/README @@ -2,3 +2,7 @@ Zeek (Bro) is an open source intrusion detection system (IDS). It is different from traditional IDS tools in that it is focused on network analysis. In other words, it is used to monitor traffic traversing a network to identify anomalies. + +This is the last version of zeek supported by GCC v5.5.0 + +Zeek v3.1.0 and newer requires GCC v7 for C++17 support. diff --git a/network/zeek/slack-desc b/network/zeek/slack-desc index 2b0f45921b..20f6a2e36d 100644 --- a/network/zeek/slack-desc +++ b/network/zeek/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -zeek: zeek (The Zeek Network Security Monitor) +zeek: Zeek (The Zeek Network Security Monitor) zeek: zeek: Zeek (Bro) is an open source intrusion detection system (IDS). zeek: It is different from traditional IDS tools in that it is diff --git a/network/zeek/zeek.SlackBuild b/network/zeek/zeek.SlackBuild index 6ce082a95f..f8456abe99 100644 --- a/network/zeek/zeek.SlackBuild +++ b/network/zeek/zeek.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Zeek -# Copyright 2018-2019 Michael Edie Orlando, FL USA +# Copyright 2018-2021 Michael Edie Orlando, FL 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=zeek -VERSION=${VERSION:-3.0.0} +VERSION=${VERSION:-3.0.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -99,3 +99,4 @@ 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/network/zeek/zeek.info b/network/zeek/zeek.info index 15c90fa18e..db3ca5dc9a 100644 --- a/network/zeek/zeek.info +++ b/network/zeek/zeek.info @@ -1,8 +1,8 @@ PRGNAM="zeek" -VERSION="3.0.0" +VERSION="3.0.13" HOMEPAGE="https://www.zeek.org" -DOWNLOAD="https://www.zeek.org/downloads/zeek-3.0.0.tar.gz" -MD5SUM="6f952bac75a8b5299d45361da93fd9e9" +DOWNLOAD="https://download.zeek.org/zeek-3.0.13.tar.gz" +MD5SUM="1c331fabaef8376d1fd741b8b4cfec06" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/znc/znc.SlackBuild b/network/znc/znc.SlackBuild index 0294cafe18..c2e5d583c6 100644 --- a/network/znc/znc.SlackBuild +++ b/network/znc/znc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for ZNC # Copyright 2007-2013 Sean Donner (sean.donner@gmail.com) -# Copyright 2017, 2018 Mario Preksavec, Zagreb, Croatia +# Copyright 2017, 2018, 2020 Mario Preksavec, Zagreb, Croatia # 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=znc -VERSION=${VERSION:-1.6.6} +VERSION=${VERSION:-1.7.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -162,7 +162,7 @@ sed -e "s/@ZNC_USER@/$ZNC_USER/g" -e "s/@VERSION@/$VERSION/g" $CWD/rc.znc \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS LICENSE* README* \ + CONTRIBUTING* ChangeLog* LICENSE* NOTICE README* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild sed "s/@ZNC_USER@/$ZNC_USER/g" $CWD/README.SLACKWARE > \ diff --git a/network/znc/znc.info b/network/znc/znc.info index cd98172a3f..f5e72f4b13 100644 --- a/network/znc/znc.info +++ b/network/znc/znc.info @@ -1,8 +1,8 @@ PRGNAM="znc" -VERSION="1.6.6" +VERSION="1.7.5" HOMEPAGE="https://wiki.znc.in/ZNC" -DOWNLOAD="https://znc.in/releases/archive/znc-1.6.6.tar.gz" -MD5SUM="50f60f473df3b11f26b38bad21728879" +DOWNLOAD="https://znc.in/releases/archive/znc-1.7.5.tar.gz" +MD5SUM="7df60c25e8aa61866b5be54994a78e2a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/zoom-linux/doinst.sh b/network/zoom-linux/doinst.sh index 408a29c514..f355da8d41 100644 --- a/network/zoom-linux/doinst.sh +++ b/network/zoom-linux/doinst.sh @@ -1,6 +1,3 @@ -( cd usr/bin ; rm -rf zoom-linux ) -( cd usr/bin ; ln -sf /opt/zoom-linux/ZoomLauncher zoom-linux ) - if [ -x /usr/bin/xdg-mime ]; then /usr/bin/xdg-mime install /usr/share/mime/packages/zoom-linux.xml fi diff --git a/network/zoom-linux/zoom-linux.SlackBuild b/network/zoom-linux/zoom-linux.SlackBuild index 1abda9036a..d28d59e439 100644 --- a/network/zoom-linux/zoom-linux.SlackBuild +++ b/network/zoom-linux/zoom-linux.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for zoom-linux # -# Copyright 2018, 2019 Ebben Aries <e@dscp.org> +# Copyright 2018-2020 Ebben Aries <slackbuilds@dscp.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=zoom-linux +VERSION=${VERSION:-5.6.13632.0328} # may be overridden by source! SRCNAM=zoom -VERSION=${VERSION:-3.0.317369.1110} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,6 +57,8 @@ case "$ARCH" in ;; esac +VERSION=$(tar JxOf $SRC.tar.xz zoom/version.txt) + set -e rm -rf $PKG @@ -75,6 +77,10 @@ find -L . \ mkdir -p $PKG/opt/$PRGNAM cp -a * $PKG/opt/$PRGNAM +mkdir -p $PKG/usr/bin +cd $PKG/usr/bin +ln -sf /opt/zoom-linux/ZoomLauncher zoom-linux + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/zoom-linux/zoom-linux.desktop b/network/zoom-linux/zoom-linux.desktop index c67baa031b..78f2426252 100644 --- a/network/zoom-linux/zoom-linux.desktop +++ b/network/zoom-linux/zoom-linux.desktop @@ -2,7 +2,7 @@ Name=Zoom Comment=Zoom Video Conference Exec=/usr/bin/zoom-linux %U -Icon=Zoom.png +Icon=zoom-linux Terminal=false Type=Application Encoding=UTF-8 diff --git a/network/zoom-linux/zoom-linux.info b/network/zoom-linux/zoom-linux.info index 49b159e301..2375c3f896 100644 --- a/network/zoom-linux/zoom-linux.info +++ b/network/zoom-linux/zoom-linux.info @@ -1,10 +1,10 @@ PRGNAM="zoom-linux" -VERSION="3.0.317369.1110" +VERSION="5.6.13632.0328" HOMEPAGE="https://www.zoom.us/" -DOWNLOAD="https://www.zoom.us/client/3.0.317369.1110/zoom_i686.tar.xz" -MD5SUM="a7351d47c7e921935372c7a803a74150" -DOWNLOAD_x86_64="https://www.zoom.us/client/3.0.317369.1110/zoom_x86_64.tar.xz" -MD5SUM_x86_64="301518a9f7869cb7c6e96a1c60085caf" +DOWNLOAD="UNSUPPORTED" +MD5SUM="" +DOWNLOAD_x86_64="https://d11yldzmag5yn.cloudfront.net/prod/5.6.13632.0328/zoom_x86_64.tar.xz" +MD5SUM_x86_64="22c42ad1549f4f3f9c2ac57ddeca52b6" REQUIRES="" MAINTAINER="Ebben Aries" -EMAIL="e@dscp.org" +EMAIL="slackbuilds@dscp.org" |
