diff options
Diffstat (limited to 'network')
186 files changed, 3355 insertions, 19006 deletions
diff --git a/network/MEGAsync/MEGAsync.SlackBuild b/network/MEGAsync/MEGAsync.SlackBuild index d15a188abf..abc655a6c3 100644 --- a/network/MEGAsync/MEGAsync.SlackBuild +++ b/network/MEGAsync/MEGAsync.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=MEGAsync -VERSION=${VERSION:-3.7.1.0} -SDK=${SDK:-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df} +VERSION=${VERSION:-4.2.5.0} +SDK=${SDK:-3.6.2b} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,6 +73,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/fix-double-declaration-of-tgkill.patch + cd src/MEGASync/mega ./autogen.sh CFLAGS="$SLKCFLAGS" \ diff --git a/network/MEGAsync/MEGAsync.info b/network/MEGAsync/MEGAsync.info index dca63a1e20..cc4f6713ca 100644 --- a/network/MEGAsync/MEGAsync.info +++ b/network/MEGAsync/MEGAsync.info @@ -1,10 +1,10 @@ PRGNAM="MEGAsync" -VERSION="3.7.1.0" +VERSION="4.2.5.0" HOMEPAGE="https://github.com/meganz/MEGAsync/" -DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v3.7.1.0_Linux/MEGAsync-3.7.1.0_Linux.tar.gz \ - https://github.com/meganz/sdk/archive/ce7b5f0/sdk-ce7b5f0b390a02ffd1fbfbac741deb5294f7a5df.tar.gz" -MD5SUM="d44da5216693efc7f63ba85b477ea46c \ - e7716ddf00b1b3f0166cfb8f222d8550" +DOWNLOAD="https://github.com/meganz/MEGAsync/archive/v4.2.5.0_Linux/MEGAsync-4.2.5.0_Linux.tar.gz \ + https://github.com/meganz/sdk/archive/v3.6.2b/sdk-3.6.2b.tar.gz" +MD5SUM="19fc192b091d94e171e130443ad3bede \ + 205a78d8e98bb67ebfc7c840388ace73" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libuv libsodium cryptopp FreeImage c-ares libmediainfo" diff --git a/network/MEGAsync/fix-double-declaration-of-tgkill.patch b/network/MEGAsync/fix-double-declaration-of-tgkill.patch new file mode 100644 index 0000000000..beeea5d1b4 --- /dev/null +++ b/network/MEGAsync/fix-double-declaration-of-tgkill.patch @@ -0,0 +1,26 @@ +diff --git a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc +index 48f91682..1b7ed059 100644 +--- a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc ++++ b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc +@@ -103,12 +103,6 @@ + #define PR_SET_PTRACER 0x59616d61 + #endif + +-// A wrapper for the tgkill syscall: send a signal to a specific thread. +-static int tgkill(pid_t tgid, pid_t tid, int sig) { +- return syscall(__NR_tgkill, tgid, tid, sig); +- return 0; +-} +- + namespace google_breakpad { + + namespace { +@@ -347,7 +341,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { + // In order to retrigger it, we have to queue a new signal by calling + // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is + // due to the kernel sending a SIGABRT from a user request via SysRQ. +- if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { ++ if (sys_tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { + // If we failed to kill ourselves (e.g. because a sandbox disallows us + // to do so), we instead resort to terminating our process. This will + // result in an incorrect exit code. diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild index 4185c2c967..e1e2ea87b9 100644 --- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild +++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild @@ -87,6 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-libnm-glib \ --build=$ARCH-slackware-linux make diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild deleted file mode 100644 index 46b08ddac2..0000000000 --- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -# Slackware build script for NetworkManager-openvpn - -# Copyright 2010-2017 Robby Workman, Tuscaloosa, Alabama, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=NetworkManager-openvpn -VERSION=${VERSION:-1.2.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} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -# Bail out if user or group isn't valid on your system -# For slackbuilds.org, assigned nm-openvpn uid/gid are 320/320 -# See http://slackbuilds.org/uid_gid.txt -if ! getent group nm-openvpn 2>&1 > /dev/null; then - echo " You must have a \"nm-openvpn\" group to run this script." - echo " # groupadd -g 320 nm-openvpn" - exit 1 -elif ! getent passwd nm-openvpn 2>&1 > /dev/null; then - echo " You must have a \"nm-openvpn\" user to run this script." - echo " # useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn" - exit 1 -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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Create the chroot directory -# From src/nm-openvpn-service-defines.h -# /* User name and group to run nm-openvpn-service under */ -# #define NM_OPENVPN_USER "nm-openvpn" -# #define NM_OPENVPN_GROUP "nm-openvpn" -# #define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot" -mkdir -p $PKG/var/lib/openvpn/chroot - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info deleted file mode 100644 index 85a02339c8..0000000000 --- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="NetworkManager-openvpn" -VERSION="1.2.10" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" -DOWNLOAD="https://download.gnome.org/sources/NetworkManager-openvpn/1.2/NetworkManager-openvpn-1.2.10.tar.xz" -MD5SUM="f118226ed2bfbacfd64ac4d1e0bd0383" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/network/NetworkManager-openvpn/README b/network/NetworkManager-openvpn/README deleted file mode 100644 index f93df9233b..0000000000 --- a/network/NetworkManager-openvpn/README +++ /dev/null @@ -1,5 +0,0 @@ -NetworkManager-openvpn (OpenVPN Support for NetworkManager) - -You will need an "nm-openvpn" user and group to use this. Suggested: -# groupadd -g 320 nm-openvpn -# useradd -u 320 -g nm-openvpn -d /var/lib/openvpn/chroot -s /bin/false nm-openvpn diff --git a/network/NetworkManager-openvpn/slack-desc b/network/NetworkManager-openvpn/slack-desc deleted file mode 100644 index 2393b7b408..0000000000 --- a/network/NetworkManager-openvpn/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------------------------------------------------------| -NetworkManager-openvpn: NetworkManager-openvpn (OpenVPN Support for NetworkManager) -NetworkManager-openvpn: -NetworkManager-openvpn: OpenVPN support for NetworkManager -NetworkManager-openvpn: -NetworkManager-openvpn: -NetworkManager-openvpn: -NetworkManager-openvpn: -NetworkManager-openvpn: -NetworkManager-openvpn: -NetworkManager-openvpn: -NetworkManager-openvpn: diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild index 325758ed3b..5f83125cfd 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.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-20200716_382a8a2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,6 +72,9 @@ find -L . \ # Find the version number for pppd, used to specify the plugin directory: PPPD=$(echo /usr/lib${LIBDIRSUFFIX}/pppd/?.?.? | rev | cut -f 1 -d / | rev) +intltoolize --automake --copy +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -82,7 +85,6 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --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 a02a65fe28..d2a6ef0e1b 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.8" +VERSION="20200716_382a8a2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.8.tar.xz" -MD5SUM="305e31d6aac41813d735f27891fce6d8" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/NetworkManager-pptp-20200716_382a8a2.tar.xz" +MD5SUM="2991e9bdb94255c8215a02ebe590adc9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pptp" diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild index 139ccd3286..7f79571594 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-vpnc -VERSION=${VERSION:-1.2.4} +VERSION=${VERSION:-1.2.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --without-libnm-glib \ --build=$ARCH-slackware-linux make diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.info b/network/NetworkManager-vpnc/NetworkManager-vpnc.info index 1aa961eebb..5f7354fdae 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.info +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-vpnc" -VERSION="1.2.4" +VERSION="1.2.6" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.4.tar.xz" -MD5SUM="b482a231f25d3857fd320d7c0b25c785" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.6.tar.xz" +MD5SUM="4e88a3bde38e3921c2adb9983fb9d09f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vpnc" diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild index c9a7b6a33b..95866506e3 100644 --- a/network/aMule/aMule.SlackBuild +++ b/network/aMule/aMule.SlackBuild @@ -5,7 +5,7 @@ # Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmial.com PRGNAM=aMule -VERSION=${VERSION:-r11003} +VERSION=${VERSION:-r11055} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,62 +55,62 @@ fi if [ "$CMD" = "yes" ]; then AMULE_CMD="enable" - else +else AMULE_CMD="disable" fi if [ "$WEBSERVER" = "yes" ]; then AMULE_WEBSERVER="enable" - else +else AMULE_WEBSERVER="disable" fi if [ "$ALC" = "yes" ]; then AMULE_ALC="enable" - else +else AMULE_ALC="disable" fi if [ "$ALCC" = "yes" ]; then AMULE_ALCC="enable" - else +else AMULE_ALCC="disable" fi if [ "$XAS" = "yes" ]; then AMULE_XAS="enable" - else +else AMULE_XAS="disable" fi if [ "$GEOIP" = "yes" ]; then AMULE_GEOIP="enable" - else +else AMULE_GEOIP="disable" fi if [ "$MMAP" = "yes" ]; then AMULE_MMAP="enable" - else +else AMULE_MMAP="disable" fi if [ "$OPTIMIZE" = "yes" ]; then AMULE_OPTIMIZE="enable" - else +else AMULE_OPTIMIZE="disable" fi if [ "$PLASMAMULE" = "yes" ]; then AMULE_PLASMAMULE="enable" - else +else AMULE_PLASMAMULE="disable" fi if [ "$GUI" = "yes" ]; then - AMULE_GUI="enable" - else - AMULE_GUI="disable" + AMULE_GUI="enable" +else + AMULE_GUI="disable" fi diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info index 4bdfb50f66..aa193247bf 100644 --- a/network/aMule/aMule.info +++ b/network/aMule/aMule.info @@ -1,8 +1,8 @@ PRGNAM="aMule" -VERSION="r11003" +VERSION="r11055" HOMEPAGE="http://www.amule.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/aMule-r11003.tar.xz" -MD5SUM="83e46e574fc5355da4b531c369211a0a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/aMule-r11055.tar.xz" +MD5SUM="4d4dbf14b0eb29786ad2bc17c1276aec" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cryptopp wxPython" diff --git a/network/bip/bip.SlackBuild b/network/bip/bip.SlackBuild index 93d6aac4df..e4a191a06c 100644 --- a/network/bip/bip.SlackBuild +++ b/network/bip/bip.SlackBuild @@ -72,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 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=duplicate-decl-specifier" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/bitcoin/bitcoin.SlackBuild b/network/bitcoin/bitcoin.SlackBuild index d800b5c8c3..d594ceadc1 100644 --- a/network/bitcoin/bitcoin.SlackBuild +++ b/network/bitcoin/bitcoin.SlackBuild @@ -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 {} \; +sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/qt/trafficgraphwidget.cpp + # build bitcoin-core [ -f autogen.sh ] && sh autogen.sh CFLAGS="$SLKCFLAGS" \ diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild index e9eb39918c..80297935f6 100644 --- a/network/bwm-ng/bwm-ng.SlackBuild +++ b/network/bwm-ng/bwm-ng.SlackBuild @@ -70,6 +70,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks opensuse +patch -p0 < $CWD/fix_gcc7_inline.patch + CFLAGS="$SLKCFLAGS" \ ./autogen.sh \ --prefix=/usr \ diff --git a/network/bwm-ng/fix_gcc7_inline.patch b/network/bwm-ng/fix_gcc7_inline.patch new file mode 100644 index 0000000000..dec44a7d66 --- /dev/null +++ b/network/bwm-ng/fix_gcc7_inline.patch @@ -0,0 +1,40 @@ +--- src/bwm-ng.c.orig 2017-06-12 03:15:08.731964116 +0200 ++++ src/bwm-ng.c 2017-06-12 03:15:21.492001798 +0200 +@@ -26,7 +26,7 @@ + + /* handle interrupt signal */ + void sigint(int sig) FUNCATTR_NORETURN; +-inline void init(void); ++static inline void init(void); + + /* clear stuff and exit */ + #ifdef __STDC__ +@@ -98,7 +98,7 @@ + deinit(0, NULL); + } + +-inline void init(void) { ++static inline void init(void) { + if_count=0; + delay=500; + #if EXTENDED_STATS +--- src/options.c.orig 2017-06-12 03:11:33.659353656 +0200 ++++ src/options.c 2017-06-12 03:14:36.535870677 +0200 +@@ -34,7 +34,7 @@ + #if EXTENDED_STATS + inline int str2output_type(char *optarg); + #endif +-inline int str2out_method(char *optarg); ++static inline int str2out_method(char *optarg); + inline int str2in_method(char *optarg); + + #ifdef CONFIG_FILE +@@ -87,7 +87,7 @@ + } + #endif + +-inline int str2out_method(char *optarg) { ++static inline int str2out_method(char *optarg) { + if (optarg) { + if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; + #ifdef HAVE_CURSES diff --git a/network/ccnet/ccnet.SlackBuild b/network/ccnet/ccnet.SlackBuild index a357b3a0f4..c42b6cd7b9 100644 --- a/network/ccnet/ccnet.SlackBuild +++ b/network/ccnet/ccnet.SlackBuild @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ccnet -VERSION=${VERSION:-4.4.6} +VERSION=${VERSION:-6.1.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,9 +61,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-server -tar xvf $CWD/$PRGNAM-$VERSION-server.tar.gz -cd $PRGNAM-$VERSION-server +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 \ @@ -93,7 +93,7 @@ make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYRIGHT HACKING LICENCE.txt README.markdown \ +cp -a HACKING LICENSE.txt README.markdown \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/ccnet/ccnet.info b/network/ccnet/ccnet.info index a796b40262..524485246b 100644 --- a/network/ccnet/ccnet.info +++ b/network/ccnet/ccnet.info @@ -1,8 +1,8 @@ PRGNAM="ccnet" -VERSION="4.4.6" +VERSION="6.1.8" HOMEPAGE="http://seafile.com/" -DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.4.6-server/ccnet-4.4.6-server.tar.gz" -MD5SUM="bff067e61d0af043b761027fdd840314" +DOWNLOAD="https://github.com/haiwen/ccnet/archive/v6.1.8/ccnet-6.1.8.tar.gz" +MD5SUM="4bab2537f68070d5af226fc80b79c859" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libsearpc vala libzdb" diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild index ee57d2b98a..cf4dc146fb 100644 --- a/network/cherokee/cherokee.SlackBuild +++ b/network/cherokee/cherokee.SlackBuild @@ -5,13 +5,13 @@ # Written by Pablo Hernan Saro (pablosaro@gmail.com) PRGNAM=cherokee -VERSION=${VERSION:-20131105_d91c9c1} +VERSION=${VERSION:-20180709_9a75e65} 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 +22,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/cherokee/cherokee.info b/network/cherokee/cherokee.info index a3526ecc64..87c519de3a 100644 --- a/network/cherokee/cherokee.info +++ b/network/cherokee/cherokee.info @@ -1,8 +1,8 @@ PRGNAM="cherokee" -VERSION="20131105_d91c9c1" +VERSION="20180709_9a75e65" HOMEPAGE="http://www.cherokee-project.com" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20131105_d91c9c1.tar.xz" -MD5SUM="845ed7bdb3b038d277607a47288aaec1" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/cherokee-20180709_9a75e65.tar.xz" +MD5SUM="2f08188ca102fd6a7ad2ea3cc1c26f84" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/dobbscoin/dobbscoin.SlackBuild b/network/dobbscoin/dobbscoin.SlackBuild index defc639fc5..a3d5048c13 100644 --- a/network/dobbscoin/dobbscoin.SlackBuild +++ b/network/dobbscoin/dobbscoin.SlackBuild @@ -31,7 +31,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -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" @@ -83,6 +83,9 @@ patch -p1 < $CWD/miniupnpc-1.9-api.patch ./autogen.sh +export CC=clang +export CXX=clang++ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/dovecot/README b/network/dovecot/README deleted file mode 100644 index f81559ff43..0000000000 --- a/network/dovecot/README +++ /dev/null @@ -1,27 +0,0 @@ -dovecot (open source IMAP and POP3 server) - -Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like -systems, written with security primarily in mind. Dovecot is an excellent -choice for both small and large installations. It's fast, simple to set -up, requires no special administration and it uses very little memory. - -This script builds dovecot with support for SSL. As such, you must -have openssl installed - openssl-solibs is not enough in itself to meet -this requirement. - -By default, MySQL database is selected, switch to PostgreSQL with: - - DATABASE=pgsql ./dovecot.SlackBuild - -See the documentation in /usr/doc/dovecot-*/ to get started. - - -Groupnames and Usernames - -You must have both 'dovecot' and 'dovenull' users and groups to run this -script, for example: - - groupadd -g 202 dovecot - useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot - groupadd -g 248 dovenull - useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull diff --git a/network/dovecot/doinst.sh b/network/dovecot/doinst.sh deleted file mode 100644 index 03c21fc848..0000000000 --- a/network/dovecot/doinst.sh +++ /dev/null @@ -1,26 +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... -} - -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.dovecot.new - diff --git a/network/dovecot/dovecot.SlackBuild b/network/dovecot/dovecot.SlackBuild deleted file mode 100644 index a69de55eb3..0000000000 --- a/network/dovecot/dovecot.SlackBuild +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/sh - -# Copyright 2006, 2010 Alan Hicks, Lizella, GA -# Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mario Preksavec, Zagreb, Croatia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=dovecot -VERSION=${VERSION:-2.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} - -# Build with MySQL database support by default -case $DATABASE in - pgsql) : ;; - *) DATABASE=mysql ;; -esac - -bailout() { - echo " You must have both dovecot and dovenull users and groups:" - echo " # groupadd -g 202 dovecot" - echo " # useradd -d /dev/null -s /bin/false -u 202 -g 202 dovecot" - echo " # groupadd -g 248 dovenull" - echo " # useradd -d /dev/null -s /bin/false -u 248 -g 248 dovenull" - exit 1 -} - -# Bail if user isn't valid on your system -if ! getent group dovecot 1>/dev/null 2>/dev/null ; then - bailout -elif ! getent passwd dovecot 1>/dev/null 2>/dev/null ; then - bailout -fi - -set -e - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 {} \; - -# Add -ldl to LDFLAGS for sqlite -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-ldl" \ -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --mandir=/usr/man \ - --with-notify=inotify \ - --without-pam \ - --with-ldap=plugin \ - --with-lucene \ - --with-$DATABASE \ - --with-sqlite \ - --with-libcap \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/etc/rc.d -cat $CWD/rc.dovecot > $PKG/etc/rc.d/rc.dovecot.new -chmod 0755 $PKG/etc/rc.d/rc.dovecot.new - -gzip -9 $PKG/usr/man/man?/*.? - -cp -a \ - AUTHORS COPYING* ChangeLog NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION/ -cat $CWD/dovecot.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/dovecot.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/dovecot/dovecot.info b/network/dovecot/dovecot.info deleted file mode 100644 index eb0eb93f65..0000000000 --- a/network/dovecot/dovecot.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dovecot" -VERSION="2.3.4" -HOMEPAGE="http://www.dovecot.org/" -DOWNLOAD="http://www.dovecot.org/releases/2.3/dovecot-2.3.4.tar.gz" -MD5SUM="00eebc835a8793e8a167a616a78f4753" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Mario Preksavec" -EMAIL="mario at slackware dot hr" diff --git a/network/dovecot/rc.dovecot b/network/dovecot/rc.dovecot deleted file mode 100644 index 8d68312ab7..0000000000 --- a/network/dovecot/rc.dovecot +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# Copyright 2006, Alan Hicks, Lizella, GA -# 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. - -dovecot_start() -{ - echo "Firing up dovecot." - dovecot -} - -dovecot_stop() -{ - echo "Shutting down dovecot." - killall dovecot -} - -dovecot_restart() -{ - dovecot_stop - sleep 3 # Give it time to clean-up if it needs it. - dovecot_start -} - -case $1 in -'start') - dovecot_start - ;; -'stop') - dovecot_stop - ;; -'restart') - dovecot_restart - ;; -*) - echo "usage $0 start|stop|restart" -esac - diff --git a/network/dovecot/slack-desc b/network/dovecot/slack-desc deleted file mode 100644 index 29a273bade..0000000000 --- a/network/dovecot/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------------------------------------------------------| -dovecot: dovecot (open source IMAP and POP3 server) -dovecot: -dovecot: Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like -dovecot: systems, written with security primarily in mind. Although it's -dovecot: written in C, it uses several coding techniques to avoid most of the -dovecot: common pitfalls. -dovecot: Dovecot can work with standard mbox and Maildir formats and it's -dovecot: fully compatible with UW-IMAP and Courier IMAP servers' -dovecot: implementation of them, as well as mail clients accessing the -dovecot: mailboxes directly. -dovecot: diff --git a/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch b/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch new file mode 100644 index 0000000000..db7739ee34 --- /dev/null +++ b/network/dsniff/24_Fix-OpenSSL1.1.0-Build.patch @@ -0,0 +1,202 @@ +Description: Fix build with OpenSSL 1.1.0 +Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + + +--- a/ssh.c ++++ b/ssh.c +@@ -234,7 +234,10 @@ + u_char *p, cipher, cookie[8], msg[1024]; + u_int32_t num; + int i; +- ++ ++ const BIGNUM *servkey_e, *servkey_n; ++ const BIGNUM *hostkey_e, *hostkey_n; ++ + /* Generate anti-spoofing cookie. */ + RAND_bytes(cookie, sizeof(cookie)); + +@@ -243,11 +246,13 @@ + *p++ = SSH_SMSG_PUBLIC_KEY; /* type */ + memcpy(p, cookie, 8); p += 8; /* cookie */ + num = 768; PUTLONG(num, p); /* servkey bits */ +- put_bn(ssh->ctx->servkey->e, &p); /* servkey exponent */ +- put_bn(ssh->ctx->servkey->n, &p); /* servkey modulus */ ++ RSA_get0_key(ssh->ctx->servkey, &servkey_n, &servkey_e, NULL); ++ put_bn(servkey_e, &p); /* servkey exponent */ ++ put_bn(servkey_n, &p); /* servkey modulus */ + num = 1024; PUTLONG(num, p); /* hostkey bits */ +- put_bn(ssh->ctx->hostkey->e, &p); /* hostkey exponent */ +- put_bn(ssh->ctx->hostkey->n, &p); /* hostkey modulus */ ++ RSA_get0_key(ssh->ctx->hostkey, &hostkey_n, &hostkey_e, NULL); ++ put_bn(hostkey_e, &p); /* hostkey exponent */ ++ put_bn(hostkey_n, &p); /* hostkey modulus */ + num = 0; PUTLONG(num, p); /* protocol flags */ + num = ssh->ctx->encmask; PUTLONG(num, p); /* ciphers */ + num = ssh->ctx->authmask; PUTLONG(num, p); /* authmask */ +@@ -298,7 +303,7 @@ + SKIP(p, i, 4); + + /* Decrypt session key. */ +- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) > 0) { ++ if (BN_cmp(servkey_n, hostkey_n) > 0) { + rsa_private_decrypt(enckey, enckey, ssh->ctx->servkey); + rsa_private_decrypt(enckey, enckey, ssh->ctx->hostkey); + } +@@ -318,8 +323,8 @@ + BN_clear_free(enckey); + + /* Derive real session key using session id. */ +- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n, +- ssh->ctx->servkey->n)) == NULL) { ++ if ((p = ssh_session_id(cookie, hostkey_n, ++ servkey_n)) == NULL) { + warn("ssh_session_id"); + return (-1); + } +@@ -328,10 +333,8 @@ + } + /* Set cipher. */ + if (cipher == SSH_CIPHER_3DES) { +- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey)); +- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey)); +- ssh->encrypt = des3_encrypt; +- ssh->decrypt = des3_decrypt; ++ warnx("cipher 3des no longer supported"); ++ return (-1); + } + else if (cipher == SSH_CIPHER_BLOWFISH) { + ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey)); +@@ -357,7 +360,10 @@ + u_char *p, cipher, cookie[8], msg[1024]; + u_int32_t num; + int i; +- ++ ++ BIGNUM *servkey_n, *servkey_e; ++ BIGNUM *hostkey_n, *hostkey_e; ++ + /* Get public key. */ + if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) { + warn("SSH_recv"); +@@ -379,21 +385,23 @@ + + /* Get servkey. */ + ssh->ctx->servkey = RSA_new(); +- ssh->ctx->servkey->n = BN_new(); +- ssh->ctx->servkey->e = BN_new(); ++ servkey_n = BN_new(); ++ servkey_e = BN_new(); ++ RSA_set0_key(ssh->ctx->servkey, servkey_n, servkey_e, NULL); + + SKIP(p, i, 4); +- get_bn(ssh->ctx->servkey->e, &p, &i); +- get_bn(ssh->ctx->servkey->n, &p, &i); ++ get_bn(servkey_e, &p, &i); ++ get_bn(servkey_n, &p, &i); + + /* Get hostkey. */ + ssh->ctx->hostkey = RSA_new(); +- ssh->ctx->hostkey->n = BN_new(); +- ssh->ctx->hostkey->e = BN_new(); ++ hostkey_n = BN_new(); ++ hostkey_e = BN_new(); ++ RSA_set0_key(ssh->ctx->hostkey, hostkey_n, hostkey_e, NULL); + + SKIP(p, i, 4); +- get_bn(ssh->ctx->hostkey->e, &p, &i); +- get_bn(ssh->ctx->hostkey->n, &p, &i); ++ get_bn(hostkey_e, &p, &i); ++ get_bn(hostkey_n, &p, &i); + + /* Get cipher, auth masks. */ + SKIP(p, i, 4); +@@ -405,8 +413,8 @@ + RAND_bytes(ssh->sesskey, sizeof(ssh->sesskey)); + + /* Obfuscate with session id. */ +- if ((p = ssh_session_id(cookie, ssh->ctx->hostkey->n, +- ssh->ctx->servkey->n)) == NULL) { ++ if ((p = ssh_session_id(cookie, hostkey_n, ++ servkey_n)) == NULL) { + warn("ssh_session_id"); + return (-1); + } +@@ -422,7 +430,7 @@ + else BN_add_word(bn, ssh->sesskey[i]); + } + /* Encrypt session key. */ +- if (BN_cmp(ssh->ctx->servkey->n, ssh->ctx->hostkey->n) < 0) { ++ if (BN_cmp(servkey_n, hostkey_n) < 0) { + rsa_public_encrypt(bn, bn, ssh->ctx->servkey); + rsa_public_encrypt(bn, bn, ssh->ctx->hostkey); + } +@@ -470,10 +478,8 @@ + ssh->decrypt = blowfish_decrypt; + } + else if (cipher == SSH_CIPHER_3DES) { +- ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey)); +- ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey)); +- ssh->encrypt = des3_encrypt; +- ssh->decrypt = des3_decrypt; ++ warnx("cipher 3des no longer supported"); ++ return (-1); + } + /* Get server response. */ + if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) { +--- a/sshcrypto.c ++++ b/sshcrypto.c +@@ -28,10 +28,12 @@ + u_char iv[8]; + }; + ++#if 0 + struct des3_state { + des_key_schedule k1, k2, k3; + des_cblock iv1, iv2, iv3; + }; ++#endif + + void + rsa_public_encrypt(BIGNUM *out, BIGNUM *in, RSA *key) +@@ -39,10 +41,12 @@ + u_char *inbuf, *outbuf; + int len, ilen, olen; + +- if (BN_num_bits(key->e) < 2 || !BN_is_odd(key->e)) ++ const BIGNUM *n, *e; ++ RSA_get0_key(key, &n, &e, NULL); ++ if (BN_num_bits(e) < 2 || !BN_is_odd(e)) + errx(1, "rsa_public_encrypt() exponent too small or not odd"); + +- olen = BN_num_bytes(key->n); ++ olen = BN_num_bytes(n); + outbuf = malloc(olen); + + ilen = BN_num_bytes(in); +@@ -71,7 +75,9 @@ + u_char *inbuf, *outbuf; + int len, ilen, olen; + +- olen = BN_num_bytes(key->n); ++ const BIGNUM *n; ++ RSA_get0_key(key, &n, NULL, NULL); ++ olen = BN_num_bytes(n); + outbuf = malloc(olen); + + ilen = BN_num_bytes(in); +@@ -146,6 +152,7 @@ + swap_bytes(dst, dst, len); + } + ++#if 0 + /* XXX - SSH1's weirdo 3DES... */ + void * + des3_init(u_char *sesskey, int len) +@@ -194,3 +201,4 @@ + des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT); + des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT); + } ++#endif diff --git a/network/dsniff/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild index 3fe080fd8b..e1d017c37b 100644 --- a/network/dsniff/dsniff.SlackBuild +++ b/network/dsniff/dsniff.SlackBuild @@ -73,6 +73,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/24_Fix-OpenSSL1.1.0-Build.patch + zcat $CWD/dsniff_2.4b1+debian-18.diff.gz | patch -p1 for i in debian/patches/*.dpatch; do patch -N < "$i" diff --git a/network/ekiga/ekiga-4.0.1-boost-signals2.patch b/network/ekiga/ekiga-4.0.1-boost-signals2.patch new file mode 100644 index 0000000000..026495cdf5 --- /dev/null +++ b/network/ekiga/ekiga-4.0.1-boost-signals2.patch @@ -0,0 +1,2179 @@ +Patch by Robert Scheck <robert@fedoraproject.org> for Ekiga 4.0.1, which backports +the following upstream commits (with some minor downstream-only changes to get the +Ekiga building) for Boost.Signals2 support: + + - https://github.com/GNOME/ekiga/commit/12641b735a9886a080949465d4da6d4569822ed2 + - https://github.com/GNOME/ekiga/commit/44ef7c66d055d01bede6627a8b31e4135f54f807 + - https://github.com/GNOME/ekiga/commit/95e2daa3953355118abec5a30fb2642a105705b2 + - https://github.com/GNOME/ekiga/commit/aabf103dcf7f0e61ed1903bc4f37f1dd549fb2ef + - https://github.com/GNOME/ekiga/commit/b8ea1fe8c15a4fa6a8bfde5e8b51febc74f8e529 + +This backport makes sense, because unfortunately upstream didn't release anything +after Ekiga 4.0.1, while 8c954b8ab3a771900f125375ba652afaf1966d19 just immediately +ends with a segmentation fault (which is the latest Git commit as of writing). And +openSUSE uses 8c954b8ab3a771900f125375ba652afaf1966d19 from a few months after the +Ekiga 4.0.1 release, but with Boost.Signals2 support. While this Git commit leads +even to a starting Ekiga, a not picked up inbound ringing phone call leads sooner +or later to a segmentation fault (the caller needs to hit the correct point before +hanging up and it thus takes sometimes 2-3 tries until it crashes). Aside of that, +there are graphical glitches in the popup/dialog when actually having a call. And +finally quitting Ekiga sometimes also ends with yet another segmentation fault... + +While I fortunately didn't see any of the above mentioned issues with Ekiga 4.0.1 +and this Boost.Signals2 backport patch, any before existing old Ekiga 4.0.1 issues +will exist further on for sure... + +--- ekiga-4.0.1/configure.ac 2019-05-16 20:32:30.610373983 +0200 ++++ ekiga-4.0.1/configure.ac.boost-signals2 2019-05-16 22:11:08.958062692 +0200 +@@ -173,15 +173,16 @@ + dnl ############################### + dnl Mandatory BOOST support + dnl ############################### +-AX_BOOST_BASE([1.34]) +-AX_BOOST_SIGNALS ++AX_BOOST_BASE([1.53]) + +-if test "x${ax_cv_boost_signals}" == "xno"; then +- AC_MSG_ERROR([You need the boost signals library to compile Ekiga]) +-fi ++CPPFLAGS_save="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" ++AC_CHECK_HEADER(boost/signals2.hpp,, found_signals2=no) ++CPPFLAGS="$CPPFLAGS_save" + +-BOOST_LIBS="${BOOST_SIGNALS_LIB}" +-AC_SUBST(BOOST_LIBS) ++if test "x$found_signals2" = "xno"; then ++ AC_MSG_ERROR([Could not find BOOST signals2 headers]) ++fi + + + dnl ############################### +@@ -722,6 +723,13 @@ + AC_MSG_ERROR([You need ptlib expat support to compile ekiga]) + fi + ++# Make sure ptlib and opal don't force no-exceptions, ++# as we need them for boost's signals2 ++PTLIB_CFLAGS="$PTLIB_CFLAGS -fexceptions" ++AC_SUBST(PTLIB_CFLAGS) ++OPAL_CFLAGS="$OPAL_CFLAGS -fexceptions" ++AC_SUBST(OPAL_CFLAGS) ++ + SUFFIX= + AC_ARG_ENABLE([opal-debug], + [AS_HELP_STRING([--enable-opal-debug],[link to debug versions of opal and ptlib (opal_d and ptlib_d) (default is disabled)])], +--- ekiga-4.0.1/lib/engine/account/account-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/account/account-core.h.boost-signals2 2019-05-16 20:34:25.949622624 +0200 +@@ -106,26 +106,26 @@ + + /** This signal is emitted when a bank has been added to the core + */ +- boost::signal1<void, BankPtr> bank_added; ++ boost::signals2::signal<void(BankPtr)> bank_added; + + /** This signal is emitted when a bank has been removed from the core + */ +- boost::signal1<void, BankPtr> bank_removed; ++ boost::signals2::signal<void(BankPtr)> bank_removed; + + /** This signal is emitted when a account has been added to one of + * the banks + */ +- boost::signal2<void, BankPtr, AccountPtr> account_added; ++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_added; + + /** This signal is emitted when a account has been removed from one of + * the banks + */ +- boost::signal2<void, BankPtr, AccountPtr> account_removed; ++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed; + + /** This signal is emitted when a account has been updated in one of + * the banks + */ +- boost::signal2<void, BankPtr, AccountPtr> account_updated; ++ boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated; + + private: + +@@ -147,7 +147,7 @@ + /** This signal is emitted when the AccountCore Service has been + * updated. + */ +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + + + /** This chain allows the AccountCore to present forms to the user +--- ekiga-4.0.1/lib/engine/account/bank.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/account/bank.h.boost-signals2 2019-05-16 20:35:52.157810900 +0200 +@@ -74,15 +74,15 @@ + + /** This signal is emitted when a account has been added. + */ +- boost::signal1<void, AccountPtr> account_added; ++ boost::signals2::signal<void(AccountPtr)> account_added; + + /** This signal is emitted when a account has been removed. + */ +- boost::signal1<void, AccountPtr> account_removed; ++ boost::signals2::signal<void(AccountPtr)> account_removed; + + /** This signal is emitted when a account has been updated. + */ +- boost::signal1<void, AccountPtr> account_updated; ++ boost::signals2::signal<void(AccountPtr)> account_updated; + + /** This chain allows the BankImpl to present forms to the user + */ +--- ekiga-4.0.1/lib/engine/account/bank-impl.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/account/bank-impl.h.boost-signals2 2019-05-16 20:34:41.093655548 +0200 +@@ -74,7 +74,7 @@ + template<class AccountType = Account> + class BankImpl: + public Bank, +- public boost::signals::trackable, ++ public boost::signals2::trackable, + protected RefLister<AccountType> + { + +--- ekiga-4.0.1/lib/engine/addressbook/book.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/book.h.boost-signals2 2019-05-16 20:36:30.212894662 +0200 +@@ -92,17 +92,17 @@ + + /** This signal is emitted when a Contact has been added to the Book. + */ +- boost::signal1<void, ContactPtr > contact_added; ++ boost::signals2::signal<void(ContactPtr)> contact_added; + + + /** This signal is emitted when a Contact has been removed from the Book. + */ +- boost::signal1<void, ContactPtr > contact_removed; ++ boost::signals2::signal<void(ContactPtr)> contact_removed; + + + /** This signal is emitted when a Contact has been updated in the Book. + */ +- boost::signal1<void, ContactPtr > contact_updated; ++ boost::signals2::signal<void(ContactPtr)> contact_updated; + }; + + typedef boost::shared_ptr<Book> BookPtr; +--- ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/contact-core.cpp.boost-signals2 2019-05-16 21:26:27.190245510 +0200 +@@ -50,7 +50,7 @@ + + Ekiga::ContactCore::~ContactCore () + { +- for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter) ++ for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter) + iter->disconnect (); + } + +--- ekiga-4.0.1/lib/engine/addressbook/contact-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/contact-core.h.boost-signals2 2019-05-16 21:26:20.542228371 +0200 +@@ -118,37 +118,37 @@ + /** This signal is emitted when a Ekiga::Source has been + * added to the ContactCore Service. + */ +- boost::signal1<void, SourcePtr > source_added; ++ boost::signals2::signal<void(SourcePtr)> source_added; + + /** This signal is emitted when a book has been added to one of + * the sources + */ +- boost::signal2<void, SourcePtr, BookPtr > book_added; ++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_added; + + /** This signal is emitted when a book has been removed from one of + * the sources + */ +- boost::signal2<void, SourcePtr, BookPtr > book_removed; ++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed; + + /** This signal is emitted when a book has been updated in one of + * the sources + */ +- boost::signal2<void, SourcePtr, BookPtr > book_updated; ++ boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated; + + /** This signal is emitted when a contact has been added to one of + * the book of one of the sources + */ +- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added; ++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added; + + /** This signal is emitted when a contact has been removed from one of + * the book of one of the sources + */ +- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed; ++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed; + + /** This signal is emitted when a contact has been updated in one of + * the book of one of the sources + */ +- boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated; ++ boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated; + + private: + +@@ -174,7 +174,7 @@ + std::list<boost::shared_ptr<ContactDecorator> > contact_decorators; + + /*** Misc stuff ***/ +- std::list<boost::signals::connection> conns; ++ std::list<boost::signals2::connection> conns; + }; + + /** +--- ekiga-4.0.1/lib/engine/addressbook/source.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/addressbook/source.h.boost-signals2 2019-05-16 20:38:37.038176631 +0200 +@@ -63,32 +63,32 @@ + + /** This signal is emitted when a Book has been added to the Source. + */ +- boost::signal1<void, BookPtr > book_added; ++ boost::signals2::signal<void(BookPtr)> book_added; + + + /** This signal is emitted when a Book has been updated in the Source. + */ +- boost::signal1<void, BookPtr > book_updated; ++ boost::signals2::signal<void(BookPtr)> book_updated; + + + /** This signal is emitted when a Book has been removed in the Source. + */ +- boost::signal1<void, BookPtr > book_removed; ++ boost::signals2::signal<void(BookPtr)> book_removed; + + /** This signal is emitted when a Contact has been added to a book in + * this source. + */ +- boost::signal2<void, BookPtr, ContactPtr > contact_added; ++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added; + + /** This signal is emitted when a Contact has been removed from a book in + * this source. + */ +- boost::signal2<void, BookPtr, ContactPtr > contact_removed; ++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed; + + /** This signal is emitted when a Contact has been updated in a book in + * this source + */ +- boost::signal2<void, BookPtr, ContactPtr > contact_updated; ++ boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated; + }; + + typedef boost::shared_ptr<Source> SourcePtr; +--- ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audioinput/audioinput-core.h.boost-signals2 2019-05-16 20:39:25.511285526 +0200 +@@ -136,7 +136,7 @@ + /** This signal is emitted when a Ekiga::AudioInputManager has been + * added to the AudioInputCore Service. + */ +- boost::signal1<void, AudioInputManager &> manager_added; ++ boost::signals2::signal<void(AudioInputManager &)> manager_added; + + + /*** AudioInput Device Management ***/ +@@ -254,23 +254,23 @@ + + /** See audioinput-manager.h for the API + */ +- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened; +- boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed; +- boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened; ++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed; ++ boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> device_error; + + /** This signal is emitted when an audio device input has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio input device that was added. + */ +- boost::signal2<void, AudioInputDevice, bool> device_added; ++ boost::signals2::signal<void(AudioInputDevice, bool)> device_added; + + /** This signal is emitted when an audio input device has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio input device that was removed. + */ +- boost::signal2<void, AudioInputDevice, bool> device_removed; ++ boost::signals2::signal<void(AudioInputDevice, bool)> device_removed; + + private: + void on_set_device (const AudioInputDevice & device); +--- ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audioinput/audioinput-manager.h.boost-signals2 2019-05-16 20:40:06.093377163 +0200 +@@ -39,7 +39,7 @@ + #define __AUDIOINPUT_MANAGER_H__ + + #include <vector> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "audioinput-info.h" +@@ -148,18 +148,18 @@ + * @param device the audio input device that was opened. + * @param config the current audio input device configuration (current volume, etc.). + */ +- boost::signal2<void, AudioInputDevice, AudioInputSettings> device_opened; ++ boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened; + + /** This signal is emitted when an audio input device is closed. + * @param device the audio input device that was closed. + */ +- boost::signal1<void, AudioInputDevice> device_closed; ++ boost::signals2::signal<void(AudioInputDevice)> device_closed; + + /** This signal is emitted when an error occurs when opening a audio input device. + * @param device the audio input device that caused the error. + * @param error_code the audio input device error code. + */ +- boost::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error; + + + protected: +--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-core.h.boost-signals2 2019-05-16 20:40:58.822496863 +0200 +@@ -128,7 +128,7 @@ + /** This signal is emitted when a Ekiga::AudioOutputManager has been + * added to the AudioOutputCore Service. + */ +- boost::signal1<void, AudioOutputManager &> manager_added; ++ boost::signals2::signal<void(AudioOutputManager &)> manager_added; + + + /** Get a list of all devices supported by all managers registered to the core. +@@ -299,23 +299,23 @@ + + /** See audiooutput-manager.h for the API + */ +- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened; +- boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed; +- boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened; ++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed; ++ boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> device_error; + + /** This signal is emitted when an audio output device has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio output device that was added. + */ +- boost::signal2<void, AudioOutputDevice, bool> device_added; ++ boost::signals2::signal<void(AudioOutputDevice, bool)> device_added; + + /** This signal is emitted when an audio output device has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the audio output device that was removed. + */ +- boost::signal2<void, AudioOutputDevice, bool> device_removed; ++ boost::signals2::signal<void(AudioOutputDevice, bool)> device_removed; + + private: + void on_set_device (const AudioOutputDevice & device); +--- ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/audiooutput/audiooutput-manager.h.boost-signals2 2019-05-16 20:41:41.638594580 +0200 +@@ -39,7 +39,7 @@ + #define __AUDIOOUTPUT_MANAGER_H__ + + #include <vector> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "audiooutput-info.h" +@@ -152,20 +152,20 @@ + * @param device the audio output device that was opened. + * @param config the current audio output device configuration (current volume, etc.). + */ +- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened; ++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened; + + /** This signal is emitted when an audio output device is closed. + * @param prim whether the primary or secondary audio output device was closed. + * @param device the audio output device that was closed. + */ +- boost::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed; ++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed; + + /** This signal is emitted when an error occurs when opening an audio output device. + * @param prim whether the primary or secondary audio output device caused the error. + * @param device the audio output device that caused the error. + * @param error_code the audio output device error code. + */ +- boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error; ++ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error; + + protected: + typedef struct ManagerState { +--- ekiga-4.0.1/lib/engine/chat/chat-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/chat-core.h.boost-signals2 2019-05-16 20:42:03.614644914 +0200 +@@ -100,7 +100,7 @@ + /** This signal is emitted when an Ekiga::Dialect has been added to + * the ChatCore service. + */ +- boost::signal1<void, DialectPtr > dialect_added; ++ boost::signals2::signal<void(DialectPtr)> dialect_added; + + private: + +@@ -116,7 +116,7 @@ + + /** This signal is emitted when the ChatCore service has been updated. + */ +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + + /** This chain allows the ChatCore to present forms to the user + */ +--- ekiga-4.0.1/lib/engine/chat/chat.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/chat.h.boost-signals2 2019-05-16 20:42:45.038740118 +0200 +@@ -37,7 +37,7 @@ + #define __CHAT_H__ + + #include <string> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include <boost/smart_ptr.hpp> +@@ -113,15 +113,15 @@ + + /** This signal is emitted when the Chat has been updated. + */ +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + + /** This signal is emitted when the user requested to see this Chat + */ +- boost::signal0<void> user_requested; ++ boost::signals2::signal<void(void)> user_requested; + + /** This signal is emitted when the Chat has been removed. + */ +- boost::signal0<void> removed; ++ boost::signals2::signal<void(void)> removed; + + /** Feed possible actions on this Chat to the given MenuBuilder + * @param A MenuBuilder object to populate. +--- ekiga-4.0.1/lib/engine/chat/dialect.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/dialect.h.boost-signals2 2019-05-16 20:43:23.359828571 +0200 +@@ -72,12 +72,12 @@ + /** This signal is emitted when an Ekiga::SimpleChat has been added to + * the dialect. + */ +- boost::signal1<void, SimpleChatPtr> simple_chat_added; ++ boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added; + + /** This signal is emitted when an Ekiga::MultipleChat has been added to + * the dialect. + */ +- boost::signal1<void, MultipleChatPtr> multiple_chat_added; ++ boost::signals2::signal<void(MultipleChatPtr)> multiple_chat_added; + + /** This chain allows the Dialect to present forms to the user. + */ +--- ekiga-4.0.1/lib/engine/chat/dialect-impl.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/chat/dialect-impl.h.boost-signals2 2019-05-16 21:27:11.112358866 +0200 +@@ -47,7 +47,7 @@ + typename MultipleChatType = MultipleChat> + class DialectImpl: + public Dialect, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -75,10 +75,10 @@ + + /* More STL-like ways to access the chats within this Ekiga::DialectImpl + */ +- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator; +- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator; +- typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator; +- typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator; ++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator; ++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator; ++ typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator; ++ typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator; + + simple_iterator simple_begin (); + simple_iterator simple_end (); +@@ -116,8 +116,8 @@ + + private: + +- std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats; +- std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats; ++ std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats; ++ std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats; + + void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat); + +@@ -133,22 +133,22 @@ + template<typename SimpleChatType, typename MultipleChatType> + Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl () + { +- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin (); + iter != simple_chats.end (); + iter++) { + +- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin (); ++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + + conn_iter->disconnect (); + } + } +- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin (); + iter != multiple_chats.end (); + iter++) { + +- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin (); ++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + +@@ -163,7 +163,7 @@ + { + bool go_on = true; + +- for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = simple_chats.begin (); + go_on && iter != simple_chats.end (); + iter++) { + +@@ -177,7 +177,7 @@ + { + bool go_on = true; + +- for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin (); ++ for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin (); + go_on && iter != multiple_chats.end (); + iter++) { + +@@ -275,7 +275,7 @@ + void + Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat) + { +- for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin (); ++ for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin (); + iter != simple_chats[chat].end (); + ++iter) { + +@@ -288,7 +288,7 @@ + void + Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat) + { +- for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin (); ++ for (typename std::list<boost::signals2::connection>::iterator iter = multiple_chats[chat].begin (); + iter != multiple_chats[chat].end (); + ++iter) { + +--- ekiga-4.0.1/lib/engine/components/call-history/history-book.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/call-history/history-book.h.boost-signals2 2019-05-16 20:43:58.286909503 +0200 +@@ -53,7 +53,7 @@ + + class Book: + public Ekiga::Book, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -86,7 +86,7 @@ + + void clear (); + +- boost::signal0<void> cleared; ++ boost::signals2::signal<void(void)> cleared; + + private: + +--- ekiga-4.0.1/lib/engine/components/call-history/history-contact.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/call-history/history-contact.h.boost-signals2 2019-05-16 20:44:24.678970855 +0200 +@@ -61,7 +61,7 @@ + + class Contact: + public Ekiga::Contact, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/local-roster/local-cluster.h.boost-signals2 2019-05-16 20:45:18.111095580 +0200 +@@ -51,7 +51,7 @@ + class Cluster : + public Ekiga::ClusterImpl<Heap>, + public Ekiga::Trigger, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/local-roster/local-presentity.h.boost-signals2 2019-05-16 20:45:33.511131655 +0200 +@@ -162,7 +162,7 @@ + * This signal makes the Local::Heap know that the XML tree changed + * and hence should be saved + */ +- boost::signal0<void> trigger_saving; ++ boost::signals2::signal<void(void)> trigger_saving; + + + private: +--- ekiga-4.0.1/lib/engine/components/opal/opal-account.h 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/opal/opal-account.h.boost-signals2 2019-05-16 20:45:50.751172106 +0200 +@@ -153,7 +153,7 @@ + + const std::string as_string () const; + +- boost::signal0<void> trigger_saving; ++ boost::signals2::signal<void(void)> trigger_saving; + + /* + * This is because an opal account is an Ekiga::PresencePublisher +--- ekiga-4.0.1/lib/engine/components/opal/opal-call.h 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/opal/opal-call.h.boost-signals2 2019-05-16 20:46:08.255213249 +0200 +@@ -55,7 +55,7 @@ + class Call + : public OpalCall, + public Ekiga::Call, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + + public: +--- ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/components/opal/opal-gmconf-bridge.cpp.boost-signals2 2019-05-16 20:46:26.119255313 +0200 +@@ -35,7 +35,7 @@ + */ + + #include <iostream> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "config.h" +--- ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/chain-of-responsibility.h.boost-signals2 2019-05-16 21:15:28.782572221 +0200 +@@ -36,7 +36,7 @@ + #ifndef __CHAIN_OF_RESPONSIBILITY_H__ + #define __CHAIN_OF_RESPONSIBILITY_H__ + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + /* This code uses boost signals to implement the "chain of responsibility" +@@ -117,9 +117,8 @@ + + template<typename T_request> + struct ChainOfResponsibility: +- public boost::signal1<bool, +- T_request, +- responsibility_accumulator> ++ public boost::signals2::signal<bool(T_request), ++ responsibility_accumulator> + { + }; + }; +--- ekiga-4.0.1/lib/engine/framework/form-request-simple.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/form-request-simple.h.boost-signals2 2019-05-16 20:48:12.632507659 +0200 +@@ -36,7 +36,7 @@ + #ifndef __FORM_REQUEST_SIMPLE_H__ + #define __FORM_REQUEST_SIMPLE_H__ + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "form-builder.h" +--- ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/gmconf-bridge.h.boost-signals2 2019-05-16 20:48:33.432557242 +0200 +@@ -38,7 +38,7 @@ + #define __GMCONF_BRIDGE_H__ + + #include <vector> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "gmconf.h" +@@ -94,7 +94,7 @@ + * @param key is the GmConf key whose value changed + * @param entry is the new GmConf entry + */ +- boost::signal2<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed; ++ boost::signals2::signal<void(std::string /*key*/, GmConfEntry * /*entry*/)> property_changed; + + protected : + Ekiga::Service & service; +--- ekiga-4.0.1/lib/engine/framework/live-object.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/live-object.h.boost-signals2 2019-05-16 20:48:53.280604647 +0200 +@@ -62,12 +62,12 @@ + + /** This signal is emitted when the object has been updated. + */ +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + + + /** This signal is emitted when the object has been removed. + */ +- boost::signal0<void> removed; ++ boost::signals2::signal<void(void)> removed; + + /** This chain allows the object to present forms to the user + */ +--- ekiga-4.0.1/lib/engine/framework/menu-builder.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/menu-builder.h.boost-signals2 2019-05-16 20:49:09.399643212 +0200 +@@ -37,7 +37,7 @@ + #define __MENU_BUILDER_H__ + + #include <string> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + +--- ekiga-4.0.1/lib/engine/framework/personal-details.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/personal-details.h.boost-signals2 2019-05-16 20:49:31.152695349 +0200 +@@ -37,7 +37,7 @@ + #define __PERSONAL_DETAILS_H__ + + #include <string> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "services.h" +@@ -66,7 +66,7 @@ + virtual void set_presence_info (const std::string presence, + const std::string status) = 0; + +- boost::signal0<void> updated; ++ boost::signals2::signal<void(void)> updated; + }; + }; + +--- ekiga-4.0.1/lib/engine/framework/reflister.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/reflister.h.boost-signals2 2019-05-16 20:50:53.592893897 +0200 +@@ -37,7 +37,7 @@ + #ifndef __REFLISTER_H__ + #define __REFLISTER_H__ + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + #include <list> + +@@ -55,7 +55,7 @@ + { + protected: + +- typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals::connection> > container_type; ++ typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals2::connection> > container_type; + typedef Ekiga::map_key_iterator<container_type> iterator; + typedef Ekiga::map_key_const_iterator<container_type> const_iterator; + +@@ -66,7 +66,7 @@ + void add_object (boost::shared_ptr<ObjectType> obj); + + void add_connection (boost::shared_ptr<ObjectType> obj, +- boost::signals::connection connection); ++ boost::signals2::connection connection); + + void remove_object (boost::shared_ptr<ObjectType> obj); + +@@ -78,9 +78,9 @@ + const_iterator begin () const; + const_iterator end () const; + +- boost::signal1<void, boost::shared_ptr<ObjectType> > object_added; +- boost::signal1<void, boost::shared_ptr<ObjectType> > object_removed; +- boost::signal1<void, boost::shared_ptr<ObjectType> > object_updated; ++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_added; ++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_removed; ++ boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_updated; + + private: + container_type objects; +@@ -95,7 +95,7 @@ + iter != objects.end (); + ++iter) { + +- for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin (); ++ for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) { + +@@ -130,7 +130,7 @@ + template<typename ObjectType> + void + Ekiga::RefLister<ObjectType>::add_connection (boost::shared_ptr<ObjectType> obj, +- boost::signals::connection connection) ++ boost::signals2::connection connection) + { + objects[obj].push_back (connection); + } +@@ -139,8 +139,8 @@ + void + Ekiga::RefLister<ObjectType>::remove_object (boost::shared_ptr<ObjectType> obj) + { +- std::list<boost::signals::connection> connections = objects[obj]; +- for (std::list<boost::signals::connection>::iterator iter = connections.begin (); ++ std::list<boost::signals2::connection> connections = objects[obj]; ++ for (std::list<boost::signals2::connection>::iterator iter = connections.begin (); + iter != connections.end (); + ++iter) + iter->disconnect (); +--- ekiga-4.0.1/lib/engine/framework/runtime.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/runtime.h.boost-signals2 2019-05-16 21:15:48.437621428 +0200 +@@ -34,7 +34,7 @@ + * + */ + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #ifndef __RUNTIME_H__ +--- ekiga-4.0.1/lib/engine/framework/services.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/framework/services.h.boost-signals2 2019-05-16 20:51:40.904008518 +0200 +@@ -45,7 +45,7 @@ + + #include <list> + #include <string> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + namespace Ekiga +@@ -101,7 +101,7 @@ + + void dump (std::ostream &stream) const; + +- boost::signal1<void, ServicePtr> service_added; ++ boost::signals2::signal<void(ServicePtr)> service_added; + + private: + +--- ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-core/codecsbox.cpp.boost-signals2 2019-05-16 20:52:02.689061460 +0200 +@@ -38,6 +38,8 @@ + #include "config.h" + #include "codecsbox.h" + ++#include <sstream> ++ + #include "gmconf.h" + #include "codec-description.h" + +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/accounts-window.cpp.boost-signals2 2019-05-16 20:52:22.872110600 +0200 +@@ -62,7 +62,7 @@ + GtkAccelGroup *accel; + + Ekiga::ServiceCore &core; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + + std::string presence; + +@@ -502,7 +502,7 @@ + { + AccountsWindow *self = ACCOUNTS_WINDOW (obj); + +- for (std::vector<boost::signals::connection>::iterator iter ++ for (std::vector<boost::signals2::connection>::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -535,7 +535,7 @@ + { + AccountsWindow *self = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + GtkWidget *vbox = NULL; + GtkWidget *menu_bar = NULL; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/addressbook-window.cpp.boost-signals2 2019-05-16 20:52:40.184152821 +0200 +@@ -52,7 +52,7 @@ + _AddressBookWindowPrivate (Ekiga::ContactCore & _core):core (_core) { } + + Ekiga::ContactCore & core; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + GtkWidget *tree_view; + GtkWidget *notebook; + GtkTreeSelection *selection; +@@ -579,7 +579,7 @@ + { + AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj); + +- for (std::vector<boost::signals::connection>::iterator iter ++ for (std::vector<boost::signals2::connection>::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -613,7 +613,7 @@ + { + AddressBookWindow *self = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + GtkWidget *menu_bar = NULL; + GtkWidget *frame = NULL; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/book-view-gtk.cpp.boost-signals2 2019-05-16 21:25:50.824151811 +0200 +@@ -62,7 +62,7 @@ + GtkWidget *scrolled_window; + + Ekiga::BookPtr book; +- std::list<boost::signals::connection> connections; ++ std::list<boost::signals2::connection> connections; + }; + + +@@ -447,7 +447,7 @@ + + view = BOOK_VIEW_GTK (obj); + +- for (std::list<boost::signals::connection>::iterator iter ++ for (std::list<boost::signals2::connection>::iterator iter + = view->priv->connections.begin (); + iter != view->priv->connections.end (); + ++iter) +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp.boost-signals2 2019-05-16 20:53:08.385221735 +0200 +@@ -56,7 +56,7 @@ + boost::shared_ptr<History::Book> book; + GtkListStore* store; + GtkTreeView* tree; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + }; + + /* this is what we put in the view */ +@@ -229,7 +229,7 @@ + + view = CALL_HISTORY_VIEW_GTK (obj); + +- for (std::vector<boost::signals::connection>::iterator iter ++ for (std::vector<boost::signals2::connection>::iterator iter + = view->priv->connections.begin (); + iter != view->priv->connections.end (); + iter++) +@@ -314,7 +314,7 @@ + GtkCellRenderer *renderer = NULL; + GtkTreeSelection *selection = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + g_return_val_if_fail (book, (GtkWidget*)NULL); + +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/call-window.cpp.boost-signals2 2019-05-16 20:53:23.457258635 +0200 +@@ -181,7 +181,7 @@ + + GtkWidget *transfer_call_popup; + +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + }; + + /* properties */ +@@ -2207,7 +2207,7 @@ + static void + ekiga_call_window_connect_engine_signals (EkigaCallWindow *cw) + { +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw)); + +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-area.cpp.boost-signals2 2019-05-16 20:53:39.069296908 +0200 +@@ -58,7 +58,7 @@ + struct _ChatAreaPrivate + { + Ekiga::Chat* chat; +- boost::signals::connection connection; ++ boost::signals2::connection connection; + boost::shared_ptr<ChatAreaHelper> helper; + GmTextBufferEnhancer* enhancer; + GtkWidget* smiley_menu; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/chat-window.cpp.boost-signals2 2019-05-16 21:25:41.264127202 +0200 +@@ -54,7 +54,7 @@ + {} + + Ekiga::ServiceCore& core; +- std::list<boost::signals::connection> connections; ++ std::list<boost::signals2::connection> connections; + + GtkWidget* notebook; + }; +@@ -405,7 +405,7 @@ + + self = CHAT_WINDOW (obj); + +- for (std::list<boost::signals::connection>::iterator iter ++ for (std::list<boost::signals2::connection>::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + ++iter) +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/heap-view.cpp.boost-signals2 2019-05-16 20:53:55.041336117 +0200 +@@ -47,7 +47,7 @@ + struct _HeapViewPrivate + { + Ekiga::HeapPtr heap; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + + GtkTreeStore* store; + GtkTreeView* view; +@@ -454,7 +454,7 @@ + { + if (self->priv->heap) { + +- for (std::vector<boost::signals::connection>::iterator iter ++ for (std::vector<boost::signals2::connection>::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -465,7 +465,7 @@ + + if (heap) { + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + conn = heap->removed.connect (boost::bind (&on_heap_removed, self)); + self->priv->connections.push_back (conn); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/preferences-window.cpp.boost-signals2 2019-05-16 20:54:24.433408410 +0200 +@@ -88,7 +88,7 @@ + GtkWidget *iface; + GtkWidget *fsbutton; + Ekiga::ServiceCore *core; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + } GmPreferencesWindow; + + #define GM_PREFERENCES_WINDOW(x) (GmPreferencesWindow *) (x) +@@ -1357,7 +1357,7 @@ + + gm_window_hide_on_delete (window); + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + boost::shared_ptr<Ekiga::VideoInputCore> videoinput_core = core.get<Ekiga::VideoInputCore> ("videoinput-core"); + boost::shared_ptr<Ekiga::AudioInputCore> audioinput_core = core.get<Ekiga::AudioInputCore> ("audioinput-core"); + boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput_core = core.get<Ekiga::AudioOutputCore> ("audiooutput-core"); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/presentity-view.cpp.boost-signals2 2019-05-16 20:54:36.777438826 +0200 +@@ -40,8 +40,8 @@ + struct _PresentityViewPrivate + { + Ekiga::Presentity* presentity; +- boost::signals::connection updated_conn; +- boost::signals::connection removed_conn; ++ boost::signals2::connection updated_conn; ++ boost::signals2::connection removed_conn; + + /* we contain those, so no need to unref them */ + GtkWidget* presence_image; +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp.boost-signals2 2019-05-16 20:54:50.449472550 +0200 +@@ -60,7 +60,7 @@ + { + boost::shared_ptr<Ekiga::PresenceCore> core; + +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + GtkTreeStore *store; + GtkTreeView *tree_view; + GSList *folded_groups; +@@ -1382,7 +1382,7 @@ + { + if (self->priv->core) { + +- for (std::vector<boost::signals::connection>::iterator iter ++ for (std::vector<boost::signals2::connection>::iterator iter + = self->priv->connections.begin (); + iter != self->priv->connections.end (); + iter++) +@@ -1393,7 +1393,7 @@ + + if (core) { + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + conn = core->cluster_added.connect (boost::bind (&on_cluster_added, self, _1)); + self->priv->connections.push_back (conn); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.cpp.boost-signals2 2019-05-16 20:55:08.249516515 +0200 +@@ -68,7 +68,7 @@ + GtkWidget *popup_menu; + gboolean has_message; + +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + + int blink_id; + std::string status; +@@ -174,7 +174,7 @@ + if (self->priv->blink_image) + g_free (self->priv->blink_image); + +- for (std::vector<boost::signals::connection>::iterator iter = self->priv->connections.begin () ; ++ for (std::vector<boost::signals2::connection>::iterator iter = self->priv->connections.begin () ; + iter != self->priv->connections.end (); + iter++) + iter->disconnect (); +@@ -548,7 +548,7 @@ + if (!statusicon_should_run ()) + return self; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + self = STATUSICON (g_object_new (STATUSICON_TYPE, NULL)); + self->priv = new StatusIconPrivate (core); +--- ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/gui/gtk-frontend/statusicon.h.boost-signals2 2019-05-16 20:55:28.249565992 +0200 +@@ -42,7 +42,7 @@ + + #include <gtk/gtk.h> + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + G_BEGIN_DECLS +--- ekiga-4.0.1/lib/engine/hal/hal-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/hal/hal-core.h.boost-signals2 2019-05-16 20:56:59.929793841 +0200 +@@ -40,7 +40,7 @@ + + #include "services.h" + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include <set> +@@ -114,24 +114,24 @@ + /** This signal is emitted when an Ekiga::HalManager has been + * added to the HalCore Service. + */ +- boost::signal1<void, HalManager &> manager_added; ++ boost::signals2::signal<void(HalManager &)> manager_added; + + + /*** API to act on HAL events ***/ + + /** See hal-manager.h for the API + */ +- boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added; +- boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed; ++ boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_added; ++ boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_removed; + +- boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_added; +- boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed; ++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_added; ++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_removed; + +- boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added; +- boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed; ++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_added; ++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_removed; + +- boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_up; +- boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_down; ++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_up; ++ boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_down; + + private: + +--- ekiga-4.0.1/lib/engine/hal/hal-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/hal/hal-manager.h.boost-signals2 2019-05-16 20:58:32.322025169 +0200 +@@ -75,50 +75,50 @@ + * @param device the device name. + * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux). + */ +- boost::signal3<void, std::string, std::string, unsigned> videoinput_device_added; ++ boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_added; + + /** This signal is emitted when a video input device is removed from the system. + * @param source the video input framework (e.g. video4linux, etc.). + * @param device the device name. + * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux). + */ +- boost::signal3<void, std::string, std::string, unsigned> videoinput_device_removed; ++ boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_removed; + + /** This signal is emitted when an audio input device is added to the system. + * @param source the audio input framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2<void, std::string, std::string> audioinput_device_added; ++ boost::signals2::signal<void(std::string, std::string)> audioinput_device_added; + + /** This signal is emitted when an audio input device is removed from the system. + * @param source the audio input framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2<void, std::string, std::string> audioinput_device_removed; ++ boost::signals2::signal<void(std::string, std::string)> audioinput_device_removed; + + /** This signal is emitted when an audio output device is added to the system. + * @param source the audio output framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2<void, std::string, std::string> audiooutput_device_added; ++ boost::signals2::signal<void(std::string, std::string)> audiooutput_device_added; + + /** This signal is emitted when an audio output device is removed from the system. + * @param source the audio output framework (e.g. alsa, oss, etc.). + * @param device the device name. + */ +- boost::signal2<void, std::string, std::string> audiooutput_device_removed; ++ boost::signals2::signal<void(std::string, std::string)> audiooutput_device_removed; + + /** This signal is emitted when a network device comes up. + * @param interface_name the interface name (e.g. eth0, etc.). + * @param ip4_address the IPv4 address (e.g. "192.168.0.1"). + */ +- boost::signal2<void, std::string, std::string> network_interface_up; ++ boost::signals2::signal<void(std::string, std::string)> network_interface_up; + + /** This signal is emitted when a network device goes down. + * @param interface_name the interface name (e.g. eth0, etc.). + * @param ip4_address the IPv4 address (e.g. "192.168.0.1"). + */ +- boost::signal2<void, std::string, std::string> network_interface_down; ++ boost::signals2::signal<void(std::string, std::string)> network_interface_down; + }; + + /** +--- ekiga-4.0.1/lib/engine/notification/notification-core.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/notification/notification-core.h.boost-signals2 2019-05-16 20:58:55.762084125 +0200 +@@ -77,7 +77,7 @@ + void action_trigger () + { if (action_callback) action_callback (); } + +- boost::signal0<void> removed; ++ boost::signals2::signal<void(void)> removed; + + private: + +@@ -109,7 +109,7 @@ + void push_notification (boost::shared_ptr<Notification> notification) + { notification_added (notification); } + +- boost::signal1<void, boost::shared_ptr<Notification> > notification_added; ++ boost::signals2::signal<void(boost::shared_ptr<Notification>)> notification_added; + }; + }; + +--- ekiga-4.0.1/lib/engine/presence/cluster.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/cluster.h.boost-signals2 2019-05-16 20:59:44.537207148 +0200 +@@ -66,16 +66,16 @@ + * from the Cluster. + * @param The Heap in question. + */ +- boost::signal1<void, HeapPtr > heap_added; +- boost::signal1<void, HeapPtr > heap_removed; ++ boost::signals2::signal<void(HeapPtr)> heap_added; ++ boost::signals2::signal<void(HeapPtr)> heap_removed; + + /** Those signals are forwarded from the given Heap + * @param The Heap in question. + */ +- boost::signal1<void, HeapPtr > heap_updated; +- boost::signal2<void, HeapPtr , PresentityPtr > presentity_added; +- boost::signal2<void, HeapPtr , PresentityPtr > presentity_updated; +- boost::signal2<void, HeapPtr , PresentityPtr > presentity_removed; ++ boost::signals2::signal<void(HeapPtr)> heap_updated; ++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_added; ++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_updated; ++ boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_removed; + }; + + typedef boost::shared_ptr<Cluster> ClusterPtr; +--- ekiga-4.0.1/lib/engine/presence/heap.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/heap.h.boost-signals2 2019-05-16 21:00:10.299272312 +0200 +@@ -83,15 +83,15 @@ + + /** This signal is emitted when a Presentity has been added to the Heap. + */ +- boost::signal1<void, PresentityPtr > presentity_added; ++ boost::signals2::signal<void(PresentityPtr)> presentity_added; + + /** This signal is emitted when a Presentity has been updated in the Heap. + */ +- boost::signal1<void, PresentityPtr > presentity_updated; ++ boost::signals2::signal<void(PresentityPtr)> presentity_updated; + + /** This signal is emitted when a Presentity has been removed from the Heap. + */ +- boost::signal1<void, PresentityPtr > presentity_removed; ++ boost::signals2::signal<void(PresentityPtr)> presentity_removed; + }; + + typedef boost::shared_ptr<Heap> HeapPtr; +--- ekiga-4.0.1/lib/engine/presence/presence-core.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/presence-core.cpp.boost-signals2 2019-05-16 21:25:58.111170575 +0200 +@@ -49,7 +49,7 @@ + + Ekiga::PresenceCore::~PresenceCore () + { +- for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter) ++ for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter) + iter->disconnect (); + } + +--- ekiga-4.0.1/lib/engine/presence/presence-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/presence-core.h.boost-signals2 2019-05-16 21:26:09.582200124 +0200 +@@ -97,8 +97,8 @@ + * presence information about an uri it was required to handle. + * The information is given as a pair of strings (uri, data). + */ +- boost::signal2<void, std::string, std::string> presence_received; +- boost::signal2<void, std::string, std::string> status_received; ++ boost::signals2::signal<void(std::string, std::string)> presence_received; ++ boost::signals2::signal<void(std::string, std::string)> status_received; + }; + + class PresencePublisher +@@ -180,22 +180,22 @@ + /** This signal is emitted when an Ekiga::Cluster has been added + * to the PresenceCore Service. + */ +- boost::signal1<void, ClusterPtr > cluster_added; ++ boost::signals2::signal<void(ClusterPtr)> cluster_added; + + /** Those signals are forwarding the heap_added, heap_updated + * and heap_removed from the given Cluster. + * + */ +- boost::signal2<void, ClusterPtr , HeapPtr > heap_added; +- boost::signal2<void, ClusterPtr , HeapPtr > heap_updated; +- boost::signal2<void, ClusterPtr , HeapPtr > heap_removed; ++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_added; ++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_updated; ++ boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_removed; + + /** Those signals are forwarding the presentity_added, presentity_updated + * and presentity_removed from the given Heap of the given Cluster. + */ +- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_added; +- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_updated; +- boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_removed; ++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_added; ++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_updated; ++ boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_removed; + + private: + +@@ -256,8 +256,8 @@ + /** Those signals are emitted whenever information has been received + * about an uri ; the information is a pair of strings (uri, information). + */ +- boost::signal2<void, std::string, std::string> presence_received; +- boost::signal2<void, std::string, std::string> status_received; ++ boost::signals2::signal<void(std::string, std::string)> presence_received; ++ boost::signals2::signal<void(std::string, std::string)> status_received; + + private: + +@@ -321,7 +321,7 @@ + + private: + +- std::list<boost::signals::connection> conns; ++ std::list<boost::signals2::connection> conns; + }; + + /** +--- ekiga-4.0.1/lib/engine/presence/uri-presentity.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/presence/uri-presentity.h.boost-signals2 2019-05-16 21:01:39.841499790 +0200 +@@ -60,7 +60,7 @@ + */ + class URIPresentity: + public Ekiga::Presentity, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/lib/engine/protocol/call-core.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call-core.cpp.boost-signals2 2019-05-16 21:27:24.447393322 +0200 +@@ -48,7 +48,7 @@ + + CallCore::~CallCore () + { +- for (std::list<boost::signals::connection>::iterator iter = manager_connections.begin (); ++ for (std::list<boost::signals2::connection>::iterator iter = manager_connections.begin (); + iter != manager_connections.end (); + ++iter) + iter->disconnect (); +@@ -103,7 +103,7 @@ + + void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallManager> manager) + { +- std::list<boost::signals::connection> conns; ++ std::list<boost::signals2::connection> conns; + + conns.push_back (call->ringing.connect (boost::bind (&CallCore::on_ringing_call, this, call, manager))); + conns.push_back (call->setup.connect (boost::bind (&CallCore::on_setup_call, this, call, manager))); +@@ -124,7 +124,7 @@ + + void CallCore::remove_call (boost::shared_ptr<Call> call) + { +- for (std::list<boost::signals::connection>::iterator iter2 = call_connections [call->get_id ()].begin (); ++ for (std::list<boost::signals2::connection>::iterator iter2 = call_connections [call->get_id ()].begin (); + iter2 != call_connections [call->get_id ()].end (); + ++iter2) + iter2->disconnect (); +--- ekiga-4.0.1/lib/engine/protocol/call-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call-core.h.boost-signals2 2019-05-16 21:04:18.066905414 +0200 +@@ -45,7 +45,7 @@ + #include "call-protocol-manager.h" + #include <boost/smart_ptr.hpp> + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + #include <set> + #include <map> +@@ -126,7 +126,7 @@ + /** This signal is emitted when a Ekiga::CallManager has been + * added to the CallCore Service. + */ +- boost::signal1<void, boost::shared_ptr<CallManager> > manager_added; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_added; + + + /*** Call Management ***/ +@@ -141,21 +141,21 @@ + + /** See call.h for the API + */ +- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > ringing_call; +- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > setup_call; +- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > missed_call; +- boost::signal3<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string> cleared_call; +- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > established_call; +- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > held_call; +- boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > retrieved_call; +- boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_opened; +- boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_closed; +- boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_paused; +- boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_resumed; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> ringing_call; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> setup_call; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> missed_call; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string)> cleared_call; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> established_call; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> held_call; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> retrieved_call; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_opened; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_closed; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_paused; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_resumed; + + /*** Misc ***/ +- boost::signal1<void, boost::shared_ptr<CallManager> > manager_ready; +- boost::signal0<void> ready; ++ boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_ready; ++ boost::signals2::signal<void(void)> ready; + + /** This chain allows the CallCore to report errors to the user + */ +@@ -186,8 +186,8 @@ + + + std::set<boost::shared_ptr<CallManager> > managers; +- std::list<boost::signals::connection> manager_connections; +- std::map<std::string, std::list<boost::signals::connection> > call_connections; ++ std::list<boost::signals2::connection> manager_connections; ++ std::map<std::string, std::list<boost::signals2::connection> > call_connections; + unsigned nr_ready; + }; + +--- ekiga-4.0.1/lib/engine/protocol/call.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call.h.boost-signals2 2019-05-16 21:06:43.219275173 +0200 +@@ -38,7 +38,7 @@ + #ifndef __CALL_H__ + #define __CALL_H__ + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + #include <string> + +@@ -198,69 +198,69 @@ + + /* Signal emitted when the call is established + */ +- boost::signal0<void> established; ++ boost::signals2::signal<void(void)> established; + + /* Signal emitted when an established call is cleared + * @param: a string describing why the call was cleared + */ +- boost::signal1<void, std::string> cleared; ++ boost::signals2::signal<void(std::string)> cleared; + + /* Signal emitted when the call is missed, ie cleared + * without having been established + */ +- boost::signal0<void> missed; ++ boost::signals2::signal<void(void)> missed; + + /* Signal emitted when the call is forwarded + */ +- boost::signal0<void> forwarded; ++ boost::signals2::signal<void(void)> forwarded; + + /* Signal emitted when the call is held + */ +- boost::signal0<void> held; ++ boost::signals2::signal<void(void)> held; + + /* Signal emitted when the call is retrieved + */ +- boost::signal0<void> retrieved; ++ boost::signals2::signal<void(void)> retrieved; + + /* Signal emitted when the call is being setup + */ +- boost::signal0<void> setup; ++ boost::signals2::signal<void(void)> setup; + + /* Signal emitted when the remote party is ringing + */ +- boost::signal0<void> ringing; ++ boost::signals2::signal<void(void)> ringing; + + /* Signal emitted when a stream is opened + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal3<void, std::string, StreamType, bool> stream_opened; ++ boost::signals2::signal<void(std::string, StreamType, bool)> stream_opened; + + /* Signal emitted when a stream is closed + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal3<void, std::string, StreamType, bool> stream_closed; ++ boost::signals2::signal<void(std::string, StreamType, bool)> stream_closed; + + /* Signal emitted when a transmitted stream is paused + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal2<void, std::string, StreamType> stream_paused; ++ boost::signals2::signal<void(std::string, StreamType)> stream_paused; + + /* Signal emitted when a transmitted stream is resumed + * @param the stream name + * @param the stream type + * @param transmission or reception + */ +- boost::signal2<void, std::string, StreamType> stream_resumed; ++ boost::signals2::signal<void(std::string, StreamType)> stream_resumed; + + /** This signal is emitted when the Call is removed. + */ +- boost::signal0<void> removed; ++ boost::signals2::signal<void(void)> removed; + + }; + +--- ekiga-4.0.1/lib/engine/protocol/call-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/protocol/call-manager.h.boost-signals2 2019-05-16 21:04:48.498983953 +0200 +@@ -40,7 +40,7 @@ + #define __CALL_MANAGER_H__ + + #include <set> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include <boost/smart_ptr.hpp> +@@ -99,7 +99,7 @@ + /** This signal is emitted when a Ekiga::CallProtocolManager has been + * added to the CallManager. + */ +- boost::signal1<void, boost::shared_ptr<CallProtocolManager> > manager_added; ++ boost::signals2::signal<void(boost::shared_ptr<CallProtocolManager>)> manager_added; + + + /* +@@ -213,7 +213,7 @@ + /* + * MISC + */ +- boost::signal0<void> ready; ++ boost::signals2::signal<void(void)> ready; + + private: + std::set<boost::shared_ptr<CallProtocolManager> > managers; +--- ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h 2013-02-19 07:11:02.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videoinput/videoinput-core.h.boost-signals2 2019-05-16 21:07:34.924401112 +0200 +@@ -45,7 +45,7 @@ + #include "videoinput-manager.h" + #include "videoinput-gmconf-bridge.h" + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + #include <glib.h> + #include <set> +@@ -146,7 +146,7 @@ + /** This signal is emitted when a Ekiga::VideoInputManager has been + * added to the VideoInputCore Service. + */ +- boost::signal1<void, VideoInputManager &> manager_added; ++ boost::signals2::signal<void(VideoInputManager &)> manager_added; + + + /*** VideoInput Device Management ***/ +@@ -277,23 +277,23 @@ + + /** See videoinput-manager.h for the API + */ +- boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened; +- boost::signal2<void, VideoInputManager &, VideoInputDevice &> device_closed; +- boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error; ++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputSettings&)> device_opened; ++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &)> device_closed; ++ boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes)> device_error; + + /** This signal is emitted when a video input has been added to the system. + * This signal will be emitted if add_device was called with a device name and + * a manager claimed support for this device. + * @param device the video input device that was added. + */ +- boost::signal2<void, VideoInputDevice, bool> device_added; ++ boost::signals2::signal<void(VideoInputDevice, bool)> device_added; + + /** This signal is emitted when a video input has been removed from the system. + * This signal will be emitted if remove_device was called with a device name and + * a manager claimed support for this device. + * @param device the video input device that was removed. + */ +- boost::signal2<void, VideoInputDevice, bool> device_removed; ++ boost::signals2::signal<void(VideoInputDevice, bool)> device_removed; + + private: + void on_set_device (const VideoInputDevice & device); +--- ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videoinput/videoinput-manager.h.boost-signals2 2019-05-16 21:08:07.020479478 +0200 +@@ -39,7 +39,7 @@ + #define __VIDEOINPUT_MANAGER_H__ + + #include <vector> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "videoinput-info.h" +@@ -159,18 +159,18 @@ + * @param device the video input device that was opened. + * @param config the current video input device configuration (current brightness, colour, etc.). + */ +- boost::signal2<void, VideoInputDevice, VideoInputSettings> device_opened; ++ boost::signals2::signal<void(VideoInputDevice, VideoInputSettings)> device_opened; + + /** This signal is emitted when a video input device is closed. + * @param device the video input device that was closed. + */ +- boost::signal1<void, VideoInputDevice> device_closed; ++ boost::signals2::signal<void(VideoInputDevice)> device_closed; + + /** This signal is emitted when an error occurs when opening a video input device. + * @param device the video input device that caused the error. + * @param error_code the video input device error code. + */ +- boost::signal2<void, VideoInputDevice, VideoInputErrorCodes> device_error; ++ boost::signals2::signal<void(VideoInputDevice, VideoInputErrorCodes)> device_error; + + protected: + typedef struct ManagerState { +--- ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videooutput/videooutput-core.h.boost-signals2 2019-05-16 22:08:08.535773653 +0200 +@@ -42,7 +42,7 @@ + #include "videooutput-gmconf-bridge.h" + #include "videooutput-manager.h" + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + #include <set> + #include <map> +@@ -116,7 +116,7 @@ + /** This signal is emitted when a Ekiga::VideoOutputManager has been + * added to the VideoOutputCore Service. + */ +- boost::signal1<void, VideoOutputManager &> manager_added; ++ boost::signals2::signal<void(VideoOutputManager &)> manager_added; + + + /*** Videooutput Management ***/ +@@ -165,11 +165,11 @@ + + /** See videooutput-manager.h for the API + */ +- boost::signal6<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened; +- boost::signal1<void, VideoOutputManager &> device_closed; +- boost::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error; +- boost::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed; +- boost::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed; ++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened; ++ boost::signals2::signal<void(VideoOutputManager &)> device_closed; ++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputErrorCodes)> device_error; ++ boost::signals2::signal<void(VideoOutputManager &, VideoOutputFSToggle)> fullscreen_mode_changed; ++ boost::signals2::signal<void(VideoOutputManager &, unsigned, unsigned)> size_changed; + + + private: +--- ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h 2013-02-19 07:11:02.000000000 +0100 ++++ ekiga-4.0.1/lib/engine/videooutput/videooutput-manager.h.boost-signals2 2019-05-16 22:07:52.271747906 +0200 +@@ -38,7 +38,7 @@ + #ifndef __VIDEOOUTPUT_MANAGER_H__ + #define __VIDEOOUTPUT_MANAGER_H__ + +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + #include <boost/bind.hpp> + + #include "videooutput-info.h" +@@ -108,16 +108,16 @@ + * @param both_streams if a frame from both local and remote stream has been received. + * @param ext_stream if a frame from an extended video stream has been received. + */ +- boost::signal5<void, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened; ++ boost::signals2::signal<void(VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened; + + /** This signal is emitted when a video output device is closed. + */ +- boost::signal0<void> device_closed; ++ boost::signals2::signal<void(void)> device_closed; + + /** This signal is emitted when an error occurs when opening a video output device. + * @param error_code the video output device error code. + */ +- boost::signal1<void, VideoOutputErrorCodes> device_error; ++ boost::signals2::signal<void(VideoOutputErrorCodes)> device_error; + + /** This signal is emitted when a manager switches autonomously into or out of fullscreen mode. + * Some managers like DX and XV allow the user to switch between FS +@@ -127,7 +127,7 @@ + * or when it is being zoomed in or out. + * @param toggle VO_FS_ON or VO_FS_OFF depending on whether FS was activated or deactivated. + */ +- boost::signal1<void, VideoOutputFSToggle> fullscreen_mode_changed; ++ boost::signals2::signal<void(VideoOutputFSToggle)> fullscreen_mode_changed; + + /** This signal is emitted the video output size has changed. + * This signal is called whenever the size of the widget carrying the video signal +@@ -136,7 +136,7 @@ + * @param width the new width of the widget. + * @param height the new height of the widget. + */ +- boost::signal2<void, unsigned, unsigned> size_changed; ++ boost::signals2::signal<void(unsigned, unsigned)> size_changed; + + protected: + virtual void get_display_info (DisplayInfo &) { }; +--- ekiga-4.0.1/plugins/avahi/avahi-cluster.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/avahi/avahi-cluster.h.boost-signals2 2019-05-16 21:10:04.107766569 +0200 +@@ -53,7 +53,7 @@ + class Cluster: + public Ekiga::Service, + public Ekiga::ClusterImpl<Heap>, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/plugins/avahi/avahi-heap.h 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/avahi/avahi-heap.h.boost-signals2 2019-05-16 21:10:12.088786207 +0200 +@@ -60,7 +60,7 @@ + class Heap: + public Ekiga::PresenceFetcher, + public Ekiga::HeapImpl<Ekiga::URIPresentity>, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/plugins/ldap/ldap-book.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/ldap/ldap-book.h.boost-signals2 2019-05-16 21:10:28.275826062 +0200 +@@ -124,7 +124,7 @@ + + xmlNodePtr get_node (); + +- boost::signal0<void> trigger_saving; ++ boost::signals2::signal<void(void)> trigger_saving; + + bool is_ekiga_net_book () const; + +--- ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/plugins/libnotify/libnotify-main.cpp.boost-signals2 2019-05-16 21:10:54.060889621 +0200 +@@ -51,7 +51,7 @@ + + class LibNotify: + public Ekiga::Service, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +@@ -77,7 +77,7 @@ + boost::shared_ptr<Ekiga::Call> call); + void on_call_notification_closed (gpointer self); + +- typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > > container_type; ++ typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > > container_type; + container_type live; + }; + +@@ -234,10 +234,10 @@ + notify_action_cb, notification.get (), NULL); + + g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ()); +- boost::signals::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed, ++ boost::signals2::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed, + this, notification)); + +- live[notification] = std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref)); ++ live[notification] = std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref)); + + notify_notification_show (notif, NULL); + } +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-account.h.boost-signals2 2019-05-16 21:11:10.299929695 +0200 +@@ -70,7 +70,7 @@ + + xmlNodePtr get_node () const; + +- boost::signal0<void> trigger_saving; ++ boost::signals2::signal<void(void)> trigger_saving; + + const std::string get_name () const; + +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-heap-roster.h.boost-signals2 2019-05-16 21:11:24.771965439 +0200 +@@ -46,7 +46,7 @@ + class HeapRoster: + public Ekiga::HeapImpl<Presentity>, + public LM::Handler, +- public boost::signals::trackable ++ public boost::signals2::trackable + { + public: + +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-helpers.h.boost-signals2 2019-05-16 21:11:41.572006967 +0200 +@@ -37,7 +37,7 @@ + #define __LOUDMOUTH_HELPERS_H__ + + #include <boost/smart_ptr.hpp> +-#include <boost/signals.hpp> ++#include <boost/signals2.hpp> + + #include <loudmouth/loudmouth.h> + +--- ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/loudmouth/loudmouth-presentity.h.boost-signals2 2019-05-16 21:11:53.612036752 +0200 +@@ -78,7 +78,7 @@ + + bool has_chat; + +- boost::signal0<void> chat_requested; ++ boost::signals2::signal<void(void)> chat_requested; + + private: + LmConnection* connection; +--- ekiga-4.0.1/plugins/resource-list/rl-heap.cpp 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-heap.cpp.boost-signals2 2019-05-16 21:12:26.773118885 +0200 +@@ -185,7 +185,7 @@ + { + bool go_on = true; + +- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator ++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator + iter = presentities.begin (); + go_on && iter != presentities.end (); + ++iter) +@@ -254,7 +254,7 @@ + while ( !presentities.empty ()) { + + presentities.begin()->first->removed (); +- for (std::list<boost::signals::connection>::const_iterator iter2 ++ for (std::list<boost::signals2::connection>::const_iterator iter2 + = presentities.begin()->second.begin (); + iter2 != presentities.begin()->second.end (); + ++iter2) +@@ -366,7 +366,7 @@ + && xmlStrEqual (BAD_CAST ("entry"), child->name)) { + + PresentityPtr presentity(new Presentity (services, path, doc, child, writable)); +- std::list<boost::signals::connection> conns; ++ std::list<boost::signals2::connection> conns; + conns.push_back (presentity->updated.connect (boost::bind (boost::ref (presentity_updated), presentity))); + conns.push_back (presentity->removed.connect (boost::bind(boost::ref (presentity_removed),presentity))); + conns.push_back (presentity->trigger_reload.connect (boost::bind (&RL::Heap::refresh, this))); +@@ -381,7 +381,7 @@ + RL::Heap::push_presence (const std::string uri_, + const std::string presence) + { +- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator ++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator + iter = presentities.begin (); + iter != presentities.end (); + ++iter) { +@@ -395,7 +395,7 @@ + RL::Heap::push_status (const std::string uri_, + const std::string status) + { +- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator ++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator + iter = presentities.begin (); + iter != presentities.end (); + ++iter) { +@@ -514,7 +514,7 @@ + "contact on a remote server")); + + std::set<std::string> all_groups; +- for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator ++ for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator + iter = presentities.begin (); + iter != presentities.end (); + ++iter) { +--- ekiga-4.0.1/plugins/resource-list/rl-heap.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-heap.h.boost-signals2 2019-05-16 21:12:47.397170040 +0200 +@@ -90,7 +90,7 @@ + void push_status (const std::string uri, + const std::string status); + +- boost::signal0<void> trigger_saving; ++ boost::signals2::signal<void(void)> trigger_saving; + + private: + +@@ -106,7 +106,7 @@ + boost::shared_ptr<xmlDoc> doc; + xmlNodePtr list_node; + +- std::map<PresentityPtr, std::list<boost::signals::connection> > presentities; ++ std::map<PresentityPtr, std::list<boost::signals2::connection> > presentities; + + void refresh (); + +--- ekiga-4.0.1/plugins/resource-list/rl-list.cpp 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-list.cpp.boost-signals2 2019-05-16 21:13:38.853297909 +0200 +@@ -94,9 +94,9 @@ + + void publish () const; + +- boost::signal1<void, boost::shared_ptr<Entry> > entry_added; +- boost::signal1<void, boost::shared_ptr<Entry> > entry_updated; +- boost::signal1<void, boost::shared_ptr<Entry> > entry_removed; ++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added; ++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated; ++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed; + + + /* data for its children */ +@@ -104,7 +104,7 @@ + + std::list<ChildType> ordering; + std::list<boost::shared_ptr<List> > lists; +- std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > > entries; ++ std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > > entries; + }; + + +@@ -235,12 +235,12 @@ + (*iter)->flush (); + lists.clear (); + +- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::iterator iter = entries.begin (); ++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + + iter->first->removed (); +- for (std::list<boost::signals::connection>::iterator conn_iter ++ for (std::list<boost::signals2::connection>::iterator conn_iter + = iter->second.begin (); + conn_iter != iter->second.end (); + ++conn_iter) +@@ -342,10 +342,10 @@ + entry_pos, + display_name, + doc, child)); +- std::list<boost::signals::connection> conns; ++ std::list<boost::signals2::connection> conns; + conns.push_back (entry->updated.connect (boost::bind (boost::ref (entry_updated), entry))); + conns.push_back (entry->removed.connect (boost::bind (boost::ref (entry_removed), entry))); +- entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > (entry, conns)); ++ entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > (entry, conns)); + ordering.push_back (ENTRY); + entry_pos++; + entry_added (entry); +@@ -363,7 +363,7 @@ + ++iter) + (*iter)->push_presence (uri_, presence); + +- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin (); ++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +@@ -381,7 +381,7 @@ + ++iter) + (*iter)->push_status (uri_, status); + +- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin (); ++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +@@ -400,7 +400,7 @@ + ++iter) + go_on = (*iter)->visit_presentities (visitor); + +- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin (); ++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin (); + go_on && iter != entries.end (); + ++iter) { + +@@ -418,7 +418,7 @@ + ++iter) + (*iter)->publish (); + +- for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin (); ++ for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin (); + iter != entries.end (); + ++iter) { + +--- ekiga-4.0.1/plugins/resource-list/rl-list.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-list.h.boost-signals2 2019-05-16 21:14:05.516364301 +0200 +@@ -74,9 +74,9 @@ + + void publish () const; + +- boost::signal1<void, boost::shared_ptr<Entry> > entry_added; +- boost::signal1<void, boost::shared_ptr<Entry> > entry_updated; +- boost::signal1<void, boost::shared_ptr<Entry> > entry_removed; ++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added; ++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated; ++ boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed; + + /* this method orders the list to get rid of all its children */ + void flush (); +--- ekiga-4.0.1/plugins/resource-list/rl-presentity.h 2012-11-07 21:43:51.000000000 +0100 ++++ ekiga-4.0.1/plugins/resource-list/rl-presentity.h.boost-signals2 2019-05-16 21:14:16.140390781 +0200 +@@ -79,7 +79,7 @@ + + bool populate_menu (Ekiga::MenuBuilder &); + +- boost::signal0<void> trigger_reload; ++ boost::signals2::signal<void(void)> trigger_reload; + + private: + +--- ekiga-4.0.1/src/gui/assistant.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/src/gui/assistant.cpp.boost-signals2 2019-05-16 21:27:53.400468197 +0200 +@@ -95,7 +95,7 @@ + gint last_active_page; + + GtkListStore *summary_model; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + }; + + /* presenting the network connection type to the user */ +@@ -1679,7 +1679,7 @@ + g_signal_connect (assistant, "key-press-event", + G_CALLBACK (ekiga_assistant_key_press_cb), NULL); + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + assistant->priv->videoinput_core = service_core.get<Ekiga::VideoInputCore> ("videoinput-core"); + assistant->priv->audioinput_core = service_core.get<Ekiga::AudioInputCore> ("audioinput-core"); + assistant->priv->audiooutput_core = service_core.get<Ekiga::AudioOutputCore> ("audiooutput-core"); +--- ekiga-4.0.1/src/gui/main_window.cpp 2013-02-18 22:36:51.000000000 +0100 ++++ ekiga-4.0.1/src/gui/main_window.cpp.boost-signals2 2019-05-16 21:27:43.064441457 +0200 +@@ -129,7 +129,7 @@ + unsigned calling_state; + + gulong roster_selection_connection_id; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + }; + + /* properties */ +@@ -1706,7 +1706,7 @@ + static void + ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw) + { +- boost::signals::connection conn; ++ boost::signals2::connection conn; + + g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw)); + +--- ekiga-4.0.1/src/gui/statusmenu.cpp 2013-02-18 22:37:04.000000000 +0100 ++++ ekiga-4.0.1/src/gui/statusmenu.cpp.boost-signals2 2019-05-16 21:27:34.032418100 +0200 +@@ -51,7 +51,7 @@ + struct _StatusMenuPrivate + { + boost::shared_ptr<Ekiga::PersonalDetails> personal_details; +- std::vector<boost::signals::connection> connections; ++ std::vector<boost::signals2::connection> connections; + + GtkListStore *list_store; // List store storing the menu + GtkWindow *parent; // Parent window +@@ -796,7 +796,7 @@ + { + StatusMenu *self = NULL; + +- boost::signals::connection conn; ++ boost::signals2::connection conn; + GtkCellRenderer *renderer = NULL; + GSList *custom_status_array [NUM_STATUS_TYPES]; + diff --git a/network/ekiga/ekiga-4.0.1-libresolv.patch b/network/ekiga/ekiga-4.0.1-libresolv.patch new file mode 100644 index 0000000000..7754eeb185 --- /dev/null +++ b/network/ekiga/ekiga-4.0.1-libresolv.patch @@ -0,0 +1,13 @@ +diff -up ekiga-4.0.1/configure.ac.libresolv ekiga-4.0.1/configure.ac +--- ekiga-4.0.1/configure.ac.libresolv 2017-02-23 02:30:42.051227852 -0600 ++++ ekiga-4.0.1/configure.ac 2017-02-23 02:32:04.609519837 -0600 +@@ -324,7 +324,8 @@ if test "x$enable_ldap" = "xyes"; then + + dnl Checking for libresolv + if test ${gm_platform} = "linux" ; then +- AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([You need the libresolv library to compile Ekiga]), -lresolv) ++ # AC_CHECK_LIB(resolv, res_gethostbyaddr, [LIBS="-lresolv $LIBS"], AC_MSG_ERROR([You need the libresolv library to compile Ekiga]), -lresolv) ++ AC_WARNING([Just adding libresolv to LDAP_LIBS, without checking anything]) + LDAP_LIBS="${LDAP_LIBS} -lresolv" + fi + found_ldap="yes" diff --git a/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild index d22a4ee14d..a4a5bd1c9a 100644 --- a/network/ekiga/ekiga.SlackBuild +++ b/network/ekiga/ekiga.SlackBuild @@ -107,10 +107,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/ekiga-4.0.1-libresolv.patch +patch -p1 < $CWD/ekiga-4.0.1-boost-signals2.patch # Fix for -current (20150722 dbs) sed -e 's/gnome-icon-theme/adwaita-icon-theme/g' -i configure.ac -autoconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/network/emacs-w3m/emacs-w3m.SlackBuild b/network/emacs-w3m/emacs-w3m.SlackBuild index 622024e9ed..baca2f789c 100644 --- a/network/emacs-w3m/emacs-w3m.SlackBuild +++ b/network/emacs-w3m/emacs-w3m.SlackBuild @@ -5,7 +5,7 @@ # Written by Felix Pfeifer (pfeifer[dot]felix[at]googlemail[dot]com PRGNAM=emacs-w3m -VERSION=${VERSION:-cvs_1.4.400_0.20100725} +VERSION=${VERSION:-cvs_1.4.569_0.20170110} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,9 +41,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM -tar xvf $CWD/w3m-el-snapshot_1.4.400+0.20100725.orig.tar.gz -cd $PRGNAM +rm -rf w3m-el-snapshot-1.4.569+0.20170110.orig +tar xvf $CWD/w3m-el-snapshot_1.4.569+0.20170110.orig.tar.gz +cd w3m-el-snapshot-1.4.569+0.20170110.orig chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/network/emacs-w3m/emacs-w3m.info b/network/emacs-w3m/emacs-w3m.info index 92b7823263..10349a11bc 100644 --- a/network/emacs-w3m/emacs-w3m.info +++ b/network/emacs-w3m/emacs-w3m.info @@ -1,8 +1,8 @@ PRGNAM="emacs-w3m" -VERSION="cvs_1.4.400_0.20100725" +VERSION="cvs_1.4.569_0.20170110" HOMEPAGE="http://emacs-w3m.namazu.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/w3m-el-snapshot_1.4.400+0.20100725.orig.tar.gz" -MD5SUM="0c5da2a83ea6502bcf7b589b8c4daed8" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/w3m-el-snapshot_1.4.569+0.20170110.orig.tar.gz" +MD5SUM="f8bb143de0b009038d6fc73295af40c7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="w3m" diff --git a/network/falkon/falkon.SlackBuild b/network/falkon/falkon.SlackBuild index df6df2e5ae..89b55005c1 100644 --- a/network/falkon/falkon.SlackBuild +++ b/network/falkon/falkon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for falkon -# Copyright 2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2018,2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=falkon -VERSION=${VERSION:-3.0.1} +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/qt-5.14.patch +patch -p1 < $CWD/qt-5.15.patch + # Handling this directory requires the KDE5 Framework rm -fR po diff --git a/network/falkon/falkon.info b/network/falkon/falkon.info index 39afba46f1..08489ab024 100644 --- a/network/falkon/falkon.info +++ b/network/falkon/falkon.info @@ -1,8 +1,8 @@ PRGNAM="falkon" -VERSION="3.0.1" +VERSION="3.1.0" HOMEPAGE="https://www.falkon.org" -DOWNLOAD="https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz" -MD5SUM="c6fb6433ac0f228667e2f763c02317c5" +DOWNLOAD="https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz" +MD5SUM="9255fb335d3ba361dea44b7b297ddf7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="extra-cmake-modules qt5" diff --git a/network/falkon/qt-5.14.patch b/network/falkon/qt-5.14.patch new file mode 100644 index 0000000000..b87eb31fd3 --- /dev/null +++ b/network/falkon/qt-5.14.patch @@ -0,0 +1,24 @@ +From bbde5c6955c43bc744ed2c4024598495de908f2a Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Mon, 2 Dec 2019 13:30:36 +0100 +Subject: Add missing include in last qt5.14 + +--- + src/plugins/VerticalTabs/verticaltabsplugin.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp +index c1cfac4..d179bb1 100644 +--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp ++++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp +@@ -30,6 +30,7 @@ + #include "../config.h" + + #include <QSettings> ++#include <QFile> + + VerticalTabsPlugin::VerticalTabsPlugin() + : QObject() +-- +cgit v1.1 + diff --git a/network/falkon/qt-5.15.patch b/network/falkon/qt-5.15.patch new file mode 100644 index 0000000000..2b2bb38a26 --- /dev/null +++ b/network/falkon/qt-5.15.patch @@ -0,0 +1,26 @@ +From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Sun, 29 Mar 2020 12:53:00 +0200 +Subject: [PATCH] Fix build with Qt 5.15 + +QPainterPath is no longer included via qtransform.h (since +5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). +--- + src/lib/tools/qztools.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp +index 499b22503..04f19b715 100644 +--- a/src/lib/tools/qztools.cpp ++++ b/src/lib/tools/qztools.cpp +@@ -25,6 +25,7 @@ + #include <QByteArray> + #include <QPixmap> + #include <QPainter> ++#include <QPainterPath> + #include <QBuffer> + #include <QFile> + #include <QDir> +-- +GitLab + diff --git a/network/fcgiwrap/fcgiwrap.SlackBuild b/network/fcgiwrap/fcgiwrap.SlackBuild index 9d64052b68..b5e6f5b0a2 100644 --- a/network/fcgiwrap/fcgiwrap.SlackBuild +++ b/network/fcgiwrap/fcgiwrap.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; autoreconf -i -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough=" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/filezilla/filezilla.SlackBuild b/network/filezilla/filezilla.SlackBuild index 02ef99af3e..da75f5d132 100644 --- a/network/filezilla/filezilla.SlackBuild +++ b/network/filezilla/filezilla.SlackBuild @@ -21,7 +21,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=filezilla -VERSION=${VERSION:-3.42.1} +VERSION=${VERSION:-3.48.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -76,6 +76,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Needed for gcc >= 10.x +patch -p1 < $CWD/interface_Mainfrm_h_include_list.patch + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/filezilla/filezilla.info b/network/filezilla/filezilla.info index bcc1154e2f..e507474f4b 100644 --- a/network/filezilla/filezilla.info +++ b/network/filezilla/filezilla.info @@ -1,8 +1,8 @@ PRGNAM="filezilla" -VERSION="3.42.1" +VERSION="3.48.0" HOMEPAGE="https://filezilla-project.org/" -DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.42.1_src.tar.bz2" -MD5SUM="00e2f8ff0c1ad9802c0eed6488c3565a" +DOWNLOAD="https://download.filezilla-project.org/client/FileZilla_3.48.0_src.tar.bz2" +MD5SUM="3abc4b9f308587847f10070fbf860517" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxGTK3 libfilezilla" diff --git a/network/filezilla/interface_Mainfrm_h_include_list.patch b/network/filezilla/interface_Mainfrm_h_include_list.patch new file mode 100644 index 0000000000..3977ba657c --- /dev/null +++ b/network/filezilla/interface_Mainfrm_h_include_list.patch @@ -0,0 +1,12 @@ +Index: filezilla-3.47.2.1/src/interface/Mainfrm.h +=================================================================== +--- filezilla-3.47.2.1.orig/src/interface/Mainfrm.h ++++ filezilla-3.47.2.1/src/interface/Mainfrm.h +@@ -6,6 +6,7 @@ + #include "notification.h" + #include "serverdata.h" + ++#include <list> + #include <wx/timer.h> + + #ifndef __WXMAC__ diff --git a/network/fqterm/fqterm.SlackBuild b/network/fqterm/fqterm.SlackBuild index b90004e147..1af9f50ecf 100644 --- a/network/fqterm/fqterm.SlackBuild +++ b/network/fqterm/fqterm.SlackBuild @@ -5,14 +5,13 @@ # Written by vvoody <vvoodywang@gmail.com> PRGNAM=fqterm -VERSION=${VERSION:-0.9.8.2} -SVNVER=svn1076 +VERSION=${VERSION:-0.9.8.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 @@ -23,18 +22,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" 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 @@ -42,15 +37,15 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM -tar xvf $CWD/$PRGNAM-$VERSION-$SVNVER.tar.gz -cd $PRGNAM +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -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 {} \; mkdir build cd build @@ -58,17 +53,16 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX:PATH="/usr" \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. make make install DESTDIR=$PKG cd - -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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE INSTALL.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE INSTALL.txt 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/fqterm/fqterm.info b/network/fqterm/fqterm.info index 787760d96c..c948f08484 100644 --- a/network/fqterm/fqterm.info +++ b/network/fqterm/fqterm.info @@ -1,8 +1,8 @@ PRGNAM="fqterm" -VERSION="0.9.8.2" +VERSION="0.9.8.4" HOMEPAGE="https://github.com/mytbk/fqterm" -DOWNLOAD="http://ftp1.fr.freebsd.org/pub/frugalware/frugalware-stable/source/xlib-extra/fqterm/fqterm-0.9.8.2-svn1076.tar.gz" -MD5SUM="eaf7b51c1e3e0f13351f9f5678996d51" +DOWNLOAD="https://github.com/mytbk/fqterm/archive/0.9.8.4/fqterm-0.9.8.4.tar.gz" +MD5SUM="d7d9500806055def62456550fe33173e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild index 3b9edaa061..8b1386b761 100644 --- a/network/freerdp/freerdp.SlackBuild +++ b/network/freerdp/freerdp.SlackBuild @@ -85,7 +85,7 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0)" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0) -fcommon" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_CUPS=ON \ -DWITH_FFMPEG=$WITH_FFMPEG \ diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild index c4d09274d1..92f7490f77 100644 --- a/network/grsync/grsync.SlackBuild +++ b/network/grsync/grsync.SlackBuild @@ -71,7 +71,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild index 10f08e77c6..d685005449 100644 --- a/network/hping3/hping3.SlackBuild +++ b/network/hping3/hping3.SlackBuild @@ -88,7 +88,7 @@ MANPATH=/usr/man ./configure \ # From Arch Linux - Adds DESTDIR to Makefile patch -p1 --verbose < $CWD/patches/Makefile.patch -make CCOPT="$SLKCFLAGS -DUSE_TCL" +make CCOPT="$SLKCFLAGS -DUSE_TCL -fcommon" make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/network/httrack/httrack.SlackBuild b/network/httrack/httrack.SlackBuild index d5976ddd12..bfdbec4b74 100644 --- a/network/httrack/httrack.SlackBuild +++ b/network/httrack/httrack.SlackBuild @@ -9,7 +9,7 @@ # without any warranty. PRGNAM=httrack -VERSION=${VERSION:-3.47.21} +VERSION=${VERSION:-3.49.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/httrack/httrack.info b/network/httrack/httrack.info index 597ebcc033..07b38b7399 100644 --- a/network/httrack/httrack.info +++ b/network/httrack/httrack.info @@ -1,8 +1,8 @@ PRGNAM="httrack" -VERSION="3.47.21" +VERSION="3.49.2" HOMEPAGE="http://www.httrack.com" -DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.47.21.tar.gz" -MD5SUM="2296de7b3b0be24758d4bbea8c0ebb20" +DOWNLOAD="http://mirror.httrack.com/historical/httrack-3.49.2.tar.gz" +MD5SUM="1fd1ab9953432f0474a66b67a71d6381" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/hylafax/gcc.patch b/network/hylafax/gcc.patch new file mode 100644 index 0000000000..ed9817abfe --- /dev/null +++ b/network/hylafax/gcc.patch @@ -0,0 +1,12 @@ +diff -Naur hylafax-6.0.6.orig/libhylafax/FaxRecvInfo.c++ hylafax-6.0.6/libhylafax/FaxRecvInfo.c++ +--- hylafax-6.0.6.orig/libhylafax/FaxRecvInfo.c++ 2012-06-06 02:58:38.000000000 +0200 ++++ hylafax-6.0.6/libhylafax/FaxRecvInfo.c++ 2017-06-03 19:51:39.491707130 +0200 +@@ -112,7 +112,7 @@ + if (cp == NULL || cp[1] != ',' || cp[2] != '"') + return (false); + u_int i = 0; +- while (cp+2 != '\0') { ++ while (*(cp+2) != '\0') { + callid[i] = cp+3; // +1 for "/+1 for ,/+1 for " + if (*cp == '\"') break; + callid[i].resize(callid[i].next(0,'"')); diff --git a/network/hylafax/hylafax.SlackBuild b/network/hylafax/hylafax.SlackBuild index f2663427e6..e4abfd8ba7 100644 --- a/network/hylafax/hylafax.SlackBuild +++ b/network/hylafax/hylafax.SlackBuild @@ -73,6 +73,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/gcc.patch + # Copy our source for the correct configuration sed "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" \ < $CWD/config.local.in \ diff --git a/network/ifstatus/README b/network/ifstatus/README deleted file mode 100644 index 9dead8790d..0000000000 --- a/network/ifstatus/README +++ /dev/null @@ -1,10 +0,0 @@ -IFStatus was developed for Linux users that are usually in console mode. -It is a simple, easy to use program for displaying commonly needed / wanted -statistcs in real time about ingoing and outgoing traffic of multiple network -interfaces that is usually hard to find, with a simple and effecient view. - -The configuration file for IFStatus is automatically created in -~/.ifstatus/ifstatus.cfg - -Please read http://ifstatus.sourceforge.net/graphic/informations.html -for information on various configuration options. diff --git a/network/ifstatus/ifstatus.SlackBuild b/network/ifstatus/ifstatus.SlackBuild deleted file mode 100644 index 135ee6b9e8..0000000000 --- a/network/ifstatus/ifstatus.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# Slackware build script for cgdb - -# Copyright 2009-2010 Sean Donner (sean.donner@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=ifstatus -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION - -# 'v' needed due to poor tarball naming -tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz - -cd $PRGNAM -chown root:root . -R - -# This will not compile on gcc 4.3 or 4.4 without patch, -# as all .cc files are missing '#include <cstdlib>' -patch -p1 < $CWD/ifstatus.patch - -make \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" - -# We can't use the 'install' target in the Makefile as it -# hardcodes the destination directory to /usr/local/bin -install -D -m 0755 ./ifstatus $PKG/usr/bin/ifstatus -strip --strip-unneeded $PKG/usr/bin/ifstatus - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/ifstatus/ifstatus.info b/network/ifstatus/ifstatus.info deleted file mode 100644 index f4021d55cc..0000000000 --- a/network/ifstatus/ifstatus.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ifstatus" -VERSION="1.1.0" -HOMEPAGE="http://ifstatus.sourceforge.net" -DOWNLOAD="http://ifstatus.sourceforge.net/download/ifstatus-v1.1.0.tar.gz" -MD5SUM="f4d413f880754fd6677290160f8bc5d7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Sean Donner" -EMAIL="sean.donner@gmail.com" diff --git a/network/ifstatus/ifstatus.patch b/network/ifstatus/ifstatus.patch deleted file mode 100644 index 75bc3befd5..0000000000 --- a/network/ifstatus/ifstatus.patch +++ /dev/null @@ -1,66 +0,0 @@ -Patch by Robert Scheck <robert@fedoraproject.org> for ifstatus >= 1.1.0, -which adds a few missing #include lines to not violate the C++ standards -and to build successfully with G++ version 4.3 and 4.4. - ---- ifstatus/IFStatus.cc 2006-01-17 00:18:46.000000000 +0100 -+++ ifstatus/IFStatus.cc.gcc44 2009-04-14 00:42:04.000000000 +0200 -@@ -22,6 +22,7 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include <cstdlib> - #include "Main.h" - #include "IFStatus.h" - #include "Graph.h" ---- ifstatus/GraphDecorator.cc 2006-01-17 01:00:59.000000000 +0100 -+++ ifstatus/GraphDecorator.cc.gcc44 2009-04-14 00:41:38.000000000 +0200 -@@ -21,7 +21,8 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -- -+ -+#include <cstdlib> - #include "GraphDecorator.h" - #include "Config.h" - ---- ifstatus/Interface.cc 2006-01-17 02:48:27.000000000 +0100 -+++ ifstatus/Interface.cc.gcc44 2009-04-14 00:42:23.000000000 +0200 -@@ -22,6 +22,7 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include <cstdlib> - #include "Interface.h" - #include "Config.h" - ---- ifstatus/Config.cc 2005-02-26 12:54:51.000000000 +0100 -+++ ifstatus/Config.cc.gcc44 2009-04-14 00:40:13.000000000 +0200 -@@ -22,6 +22,7 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include <cstdlib> - #include "Main.h" - #include "Config.h" - #include "Util.h" ---- ifstatus/Email.cc 2005-02-26 12:54:51.000000000 +0100 -+++ ifstatus/Email.cc.gcc44 2009-04-14 00:40:44.000000000 +0200 -@@ -22,6 +22,7 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include <cstdlib> - #include "Email.h" - #include "Config.h" - ---- ifstatus/Interfaces.cc 2006-01-16 23:45:33.000000000 +0100 -+++ ifstatus/Interfaces.cc.gcc44 2009-04-14 00:42:45.000000000 +0200 -@@ -22,6 +22,7 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include <cstdlib> - #include "Interfaces.h" - #include "Config.h" - #include "Util.h" diff --git a/network/ifstatus/slack-desc b/network/ifstatus/slack-desc deleted file mode 100644 index a0f087dfc8..0000000000 --- a/network/ifstatus/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------------------------------------------------------| -ifstatus: ifstatus (A curses network traffic monitor) -ifstatus: -ifstatus: IFStatus was developed for Linux users that are usually in console -ifstatus: mode. It is a simple, easy to use program for displaying commonly -ifstatus: needed / wanted statistcs in real time about ingoing and outgoing -ifstatus: traffic of multiple network interfaces that is usually hard to find, -ifstatus: with a simple and effecient view. -ifstatus: -ifstatus: -ifstatus: -ifstatus: diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild index f8c40ab1e8..d4c970ca8b 100644 --- a/network/iperf/iperf.SlackBuild +++ b/network/iperf/iperf.SlackBuild @@ -8,13 +8,13 @@ # http://www.slackwiki.org/Writing_A_SlackBuild_Script PRGNAM=iperf -VERSION=${VERSION:-2.0.5} +VERSION=${VERSION:-2.0.8} 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 @@ -25,8 +25,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" @@ -49,10 +49,15 @@ 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 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Thanks fedora for these +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -68,13 +73,11 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( 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 AUTHORS ChangeLog COPYING INSTALL README doc/index.html $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/iperf/iperf.info b/network/iperf/iperf.info index fbb6e24fa4..730b096a3b 100644 --- a/network/iperf/iperf.info +++ b/network/iperf/iperf.info @@ -1,8 +1,8 @@ PRGNAM="iperf" -VERSION="2.0.5" +VERSION="2.0.8" HOMEPAGE="https://sourceforge.net/projects/iperf/" -DOWNLOAD="https://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz" -MD5SUM="44b5536b67719f4250faed632a3cd016" +DOWNLOAD="https://downloads.sourceforge.net/iperf2/iperf-2.0.8.tar.gz" +MD5SUM="e5887f799d8dc64a974c6c2f2e5cc339" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch new file mode 100644 index 0000000000..2a3ad246ee --- /dev/null +++ b/network/iperf/patches/0_iperf-2.0.8-debuginfo.patch @@ -0,0 +1,17 @@ +diff -NarpU5 iperf-2.0.8/configure.ac iperf-2.0.8.debuginfo/configure.ac +--- iperf-2.0.8/configure.ac 2015-04-02 16:51:48.000000000 -0400 ++++ iperf-2.0.8.debuginfo/configure.ac 2015-04-10 10:11:33.287445003 -0400 +@@ -42,13 +42,11 @@ AC_ARG_ENABLE(kalman, AC_HELP_STRING([-- + dnl =================================================================== + dnl Checks for programs + dnl =================================================================== + + AC_PROG_CXX +-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly + AC_PROG_CC +-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly + AC_ISC_POSIX + AC_PROG_INSTALL + AC_PROG_MAKE_SET + AC_PROG_RANLIB + AC_LANG(C) diff --git a/network/iperf/patches/1_iperf-2.0.8-bindfail.patch b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch new file mode 100644 index 0000000000..b18b2cffed --- /dev/null +++ b/network/iperf/patches/1_iperf-2.0.8-bindfail.patch @@ -0,0 +1,42 @@ +diff -NarpU5 iperf-2.0.8/src/Client.cpp iperf-2.0.8.bindfail/src/Client.cpp +--- iperf-2.0.8/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400 ++++ iperf-2.0.8.bindfail/src/Client.cpp 2015-04-10 10:05:38.279936555 -0400 +@@ -701,20 +701,20 @@ void Client::Connect( ) { + AF_INET + #endif + : AF_INET); + + mSettings->mSock = socket( domain, type, 0 ); +- WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" ); ++ FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings ); + + SetSocketOptions( mSettings ); + + SockAddr_localAddr( mSettings ); + if ( mSettings->mLocalhost != NULL ) { + // bind socket to local address + rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, + SockAddr_get_sizeof_sockaddr( &mSettings->local ) ); +- WARN_errno( rc == SOCKET_ERROR, "bind" ); ++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings ); + } + // connect socket + rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer, + SockAddr_get_sizeof_sockaddr( &mSettings->peer )); + FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings ); +diff -NarpU5 iperf-2.0.8/src/Listener.cpp iperf-2.0.8.bindfail/src/Listener.cpp +--- iperf-2.0.8/src/Listener.cpp 2015-04-02 16:51:48.000000000 -0400 ++++ iperf-2.0.8.bindfail/src/Listener.cpp 2015-04-10 10:06:23.279699885 -0400 +@@ -342,11 +342,11 @@ void Listener::Listen( ) { + WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" ); + } else + #endif + { + rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local ); +- WARN_errno( rc == SOCKET_ERROR, "bind" ); ++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings ); + } + // listen for connections (TCP only). + // default backlog traditionally 5 + if ( !isUDP( mSettings ) ) { + rc = listen( mSettings->mSock, 5 ); diff --git a/network/iperf/patches/2_iperf-2.0.8-math.patch b/network/iperf/patches/2_iperf-2.0.8-math.patch new file mode 100644 index 0000000000..1a943f5f2c --- /dev/null +++ b/network/iperf/patches/2_iperf-2.0.8-math.patch @@ -0,0 +1,75 @@ +diff -NarU5 a/include/headers.h b/include/headers.h +--- a/include/headers.h 2015-04-02 16:51:48.000000000 -0400 ++++ b/include/headers.h 2016-03-16 14:52:14.386853750 -0400 +@@ -80,11 +80,10 @@ + #include <assert.h> + #include <ctype.h> + #include <errno.h> + #include <string.h> + #include <time.h> +-#include <math.h> + #include <float.h> + #include <sys/types.h> + + #ifdef WIN32 + +diff -NarU5 a/src/Client.cpp b/src/Client.cpp +--- a/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400 ++++ b/src/Client.cpp 2016-03-16 14:52:14.387853701 -0400 +@@ -50,10 +50,11 @@ + * A client thread initiates a connect to the server and handles + * sending and receiving data, then closes the socket. + * ------------------------------------------------------------------- */ + + #include <time.h> ++#include <cmath> + #include "headers.h" + #include "Client.hpp" + #include "Thread.h" + #include "SocketAddr.h" + #include "PerfSocket.hpp" +diff -NarU5 a/src/ReportDefault.c b/src/ReportDefault.c +--- a/src/ReportDefault.c 2015-04-02 16:51:49.000000000 -0400 ++++ b/src/ReportDefault.c 2016-03-16 14:52:14.387853701 -0400 +@@ -47,10 +47,11 @@ + * ReportDefault.c + * by Kevin Gibbs <kgibbs@nlanr.net> + * + * ________________________________________________________________ */ + ++#include <math.h> + #include "headers.h" + #include "Settings.hpp" + #include "util.h" + #include "Reporter.h" + #include "report_default.h" +diff -NarU5 a/src/Reporter.c b/src/Reporter.c +--- a/src/Reporter.c 2015-04-02 16:51:49.000000000 -0400 ++++ b/src/Reporter.c 2016-03-16 14:52:14.388853652 -0400 +@@ -47,10 +47,11 @@ + * Reporter.c + * by Kevin Gibbs <kgibbs@nlanr.net> + * + * ________________________________________________________________ */ + ++#include <math.h> + #include "headers.h" + #include "Settings.hpp" + #include "util.h" + #include "Reporter.h" + #include "Thread.h" +diff -NarU5 a/src/Server.cpp b/src/Server.cpp +--- a/src/Server.cpp 2015-04-02 16:51:49.000000000 -0400 ++++ b/src/Server.cpp 2016-03-16 14:52:14.388853652 -0400 +@@ -52,10 +52,11 @@ + * Handles sending and receiving data, and then closes socket. + * Changes to this version : The server can be run as a daemon + * ------------------------------------------------------------------- */ + + #define HEADERS() ++#include <cmath> + #include "headers.h" + #include "Server.hpp" + #include "List.h" + #include "Extractor.h" + #include "Reporter.h" diff --git a/network/jigdo/jigdo-0.7.3-gcc7.patch b/network/jigdo/jigdo-0.7.3-gcc7.patch new file mode 100644 index 0000000000..d5f0c8a4d0 --- /dev/null +++ b/network/jigdo/jigdo-0.7.3-gcc7.patch @@ -0,0 +1,39 @@ +diff -Naur jigdo-0.7.3.orig/src/mkimage.cc jigdo-0.7.3/src/mkimage.cc +--- jigdo-0.7.3.orig/src/mkimage.cc 2005-07-09 21:14:46.000000000 +0200 ++++ jigdo-0.7.3/src/mkimage.cc 2017-02-17 14:47:12.884488507 +0100 +@@ -285,27 +285,27 @@ + //______________________________________________________________________ + + namespace { +- const int SIZE_WIDTH = 12; ++ const int size_width = 12; + } + + ostream& JigdoDesc::ImageInfo::put(ostream& s) const { +- s << "image-info " << setw(SIZE_WIDTH) << size() << " " ++ s << "image-info " << setw(size_width) << size() << " " + << md5() << ' ' << blockLength() << '\n'; + return s; + } + ostream& JigdoDesc::UnmatchedData::put(ostream& s) const { +- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' ' +- << setw(SIZE_WIDTH) << size() << '\n'; ++ s << "in-template " << setw(size_width) << offset() << ' ' ++ << setw(size_width) << size() << '\n'; + return s; + } + ostream& JigdoDesc::MatchedFile::put(ostream& s) const { +- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' ' +- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; ++ s << "need-file " << setw(size_width) << offset() << ' ' ++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n'; + return s; + } + ostream& JigdoDesc::WrittenFile::put(ostream& s) const { +- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' ' +- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; ++ s << "have-file " << setw(size_width) << offset() << ' ' ++ << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n'; + return s; + } + diff --git a/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild index 67e467dde2..ef17522f77 100644 --- a/network/jigdo/jigdo.SlackBuild +++ b/network/jigdo/jigdo.SlackBuild @@ -73,6 +73,9 @@ find -L . \ # apply some patches from debian zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1 +# Fic for gcc-7.x, thanks fedora! +patch -p1 < $CWD/jigdo-0.7.3-gcc7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/jitsi/jitsi.SlackBuild b/network/jitsi/jitsi.SlackBuild index dea951b97a..636e19af35 100644 --- a/network/jitsi/jitsi.SlackBuild +++ b/network/jitsi/jitsi.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jitsi -VERSION=${VERSION:-2.8} +VERSION=${VERSION:-5633} 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" @@ -60,8 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-src-$VERSION.5426.zip -mv $PRGNAM $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -70,8 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i "s/0.build.by.SVN/5426/g" src/net/java/sip/communicator/impl/version/NightlyBuildID.java - ant rebuild mkdir -p $PKG/usr/bin @@ -86,9 +83,9 @@ mkdir -p $PKG/usr/share/jitsi/lib/native cp resources/install/resources/splash.gif $PKG/usr/share/jitsi cp lib/{felix.client.run.properties,felix.jar,jitsi-defaults.properties,logging.properties} $PKG/usr/share/jitsi/lib if [ "$ARCH" = "x86_64" ]; then - cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native + cp -a lib/native/linux-64/*.so $PKG/usr/share/jitsi/lib/native else - cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native + cp -a lib/native/linux/*.so $PKG/usr/share/jitsi/lib/native fi cp lib/bundle/{commons-logging.jar,log4j.jar} $PKG/usr/share/jitsi/lib/bundle @@ -113,7 +110,6 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION -sed 's#_PACKAGE_NAME_#jitsi#' resources/install/debian/changelog.tmpl | sed 's#_VERSION_#2.8.5426-1#' | sed 's#_DATE_#Thu, 19 Mar 2015 02:20:44 -0400#' > $PKG/usr/doc/$PRGNAM-$VERSION/changelog cp resources/install/debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/jitsi/jitsi.info b/network/jitsi/jitsi.info index 8d2c254e97..bb50a7a694 100644 --- a/network/jitsi/jitsi.info +++ b/network/jitsi/jitsi.info @@ -1,10 +1,10 @@ PRGNAM="jitsi" -VERSION="2.8" +VERSION="5633" HOMEPAGE="https://jitsi.org/" -DOWNLOAD="https://download.jitsi.org/jitsi/src/jitsi-src-2.8.5426.zip" -MD5SUM="db86aa3c754e54e774257c09e7c474d2" +DOWNLOAD="https://github.com/jitsi/jitsi/archive/5633/jitsi-5633.tar.gz" +MD5SUM="0844dc46176c7940cdeac075559d38e6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="openjdk7" +REQUIRES="apache-ant jdk" MAINTAINER="Furry Monster" EMAIL="furrymonster at gmx dot com" diff --git a/network/kmess/README b/network/kmess/README deleted file mode 100644 index f04f2e181b..0000000000 --- a/network/kmess/README +++ /dev/null @@ -1,5 +0,0 @@ -KMess is an alternative Live Messenger chat client for Linux. -It allows Linux users to chat with friends who use Live Messenger in -Windows or Mac OS. The strength of KMess is it's integration with the -KDE desktop environment, it focus on Messenger-specific features, and -an easy-to-use interface. diff --git a/network/kmess/doinst.sh b/network/kmess/doinst.sh deleted file mode 100644 index 4a25de5e6f..0000000000 --- a/network/kmess/doinst.sh +++ /dev/null @@ -1,10 +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 [ -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/kmess/giflib-5.0.patch b/network/kmess/giflib-5.0.patch deleted file mode 100644 index cc568fdf8a..0000000000 --- a/network/kmess/giflib-5.0.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +0000 -+++ contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +0000 -@@ -249,7 +249,7 @@ - qWarning() << "Couldn't initialize GIF library!"; - } - -- DGifCloseFile( gifImage ); -+ DGifCloseFile( gifImage, NULL ); - gifData.close(); - */ - -@@ -484,12 +484,13 @@ - int width = isfImage.width(); - int numColors = 0; - bool gifError = true; -+ int gifErrCode; - - // Convert the image to GIF using libgif - - // Open the gif file - gifData.open( QIODevice::WriteOnly ); -- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); -+ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); - if( gifImage == 0 ) - { - qWarning() << "Couldn't initialize gif library!"; -@@ -503,7 +504,7 @@ - numColors = 256; - } - -- cmap = MakeMapObject( numColors, NULL ); -+ cmap = GifMakeMapObject( numColors, NULL ); - if( cmap == 0 && isfImage.numColors() > 1 ) - { - qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; -@@ -576,7 +577,7 @@ - else - { - // Write the extension -- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) - { - qWarning() << "EGifPutExtensionFirst failed!"; - goto writeError; -@@ -590,9 +591,9 @@ - // Write all the full data blocks - while( length >= MAX_GIF_BYTE ) - { -- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionNext failed!"; -+ qWarning() << "EGifPutExtensionBlock failed!"; - goto writeError; - } - -@@ -603,17 +604,17 @@ - // Write the last block - if( length > 0 ) - { -- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) -+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionLast (n) failed!"; -+ qWarning() << "EGifPutExtensionTrailer (n) failed!"; - goto writeError; - } - } - else - { -- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) -+ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) - { -- qWarning() << "EGifPutExtensionLast (0) failed!"; -+ qWarning() << "EGifPutExtensionTrailer (0) failed!"; - goto writeError; - } - } -@@ -623,13 +624,13 @@ - - writeError: - // Clean up the GIF converter etc -- EGifCloseFile( gifImage ); -- FreeMapObject( cmap ); -+ EGifCloseFile( gifImage, NULL ); -+ GifFreeMapObject( cmap ); - gifData.close(); - - if( gifError ) - { -- qWarning() << "GIF error code:" << GifLastError(); -+ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); - } - else - { diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild deleted file mode 100644 index 27c6a9e73b..0000000000 --- a/network/kmess/kmess.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for kmess - -# Copyright 2008-2009 Tarantino Antonino <metrofox9@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=kmess -VERSION=${VERSION:-2.0.6.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -fr $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Fix for building with new giflib (thanks to Arch) -patch -p1 contrib/isf-qt/src/isfqt.cpp < $CWD/giflib-5.0.patch - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog FEATURES INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -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 - -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/kmess/kmess.info b/network/kmess/kmess.info deleted file mode 100644 index 51a7e19d01..0000000000 --- a/network/kmess/kmess.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="kmess" -VERSION="2.0.6.2" -HOMEPAGE="http://kmess.org/" -DOWNLOAD="http://downloads.sourceforge.net/kmess/kmess-2.0.6.2.tar.bz2" -MD5SUM="a2e57911713308bef81b9347135cc5dd" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Tarantino Antonino" -EMAIL="metrofox9@gmail.com" diff --git a/network/kmess/slack-desc b/network/kmess/slack-desc deleted file mode 100644 index 7bced9d9c3..0000000000 --- a/network/kmess/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------------------------------------------------------| -kmess: kmess (MSN Messenger client) -kmess: -kmess: KMess is a MSN Messenger client for Linux. It enables Linux users -kmess: to chat with friends online who are using MSN Messenger in Windows -kmess: or Mac OS. The strength of KMess is it's integration with the KDE -kmess: desktop environment, focus on MSN Messenger specific features and -kmess: an easy-to-use interface. -kmess: -kmess: -kmess: -kmess: diff --git a/network/knock/knock.SlackBuild b/network/knock/knock.SlackBuild index eeb481a019..bc5a0d98b1 100644 --- a/network/knock/knock.SlackBuild +++ b/network/knock/knock.SlackBuild @@ -5,13 +5,13 @@ # Written by Joey Trungale joey@trungale.net PRGNAM=knock -VERSION=${VERSION:-0.5} +VERSION=${VERSION:-0.7} 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 +22,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" @@ -46,10 +46,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 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" \ @@ -63,16 +63,14 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( 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 README ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README.md ChangeLog TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $PKG/etc/knockd.conf > $PKG/usr/doc/$PRGNAM-$VERSION/knockd.conf mv $PKG/etc/knockd.conf $PKG/etc/knockd.conf.new diff --git a/network/knock/knock.info b/network/knock/knock.info index 8274f4fce1..6845299aa4 100644 --- a/network/knock/knock.info +++ b/network/knock/knock.info @@ -1,8 +1,8 @@ PRGNAM="knock" -VERSION="0.5" +VERSION="0.7" HOMEPAGE="http://www.zeroflux.org" -DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.5.tar.gz" -MD5SUM="ca09d61458974cff90a700aba6120891" +DOWNLOAD="http://www.zeroflux.org/proj/knock/files/knock-0.7.tar.gz" +MD5SUM="cb6373fd4ccb42eeca3ff406b7fdb8a7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/krb5/EXPORT b/network/krb5/EXPORT deleted file mode 100644 index d868a9e27e..0000000000 --- a/network/krb5/EXPORT +++ /dev/null @@ -1,13 +0,0 @@ -EXPORT LAW WARNINGS: - - * Export of this software from the United States of America may be -subject to the Export Administration Regulations of the United States -Department of Commerce, currently (October 2003) codified as Title 15 -CFR Parts 730-774. - * You are responsible for complying with all applicable export -regulations, including obtaining an export license if required. - * You may not download this software if you are located in, or are -a citizen or national of, any country for which the US government -prohibits the export of encryption source code, currently (October -2003) Cuba, Iran, Iraq, Libya, North Korea, Sudan, or Syria. (15 CFR -Sections 734(b)(3), 740.13(e)(4)) diff --git a/network/krb5/README b/network/krb5/README deleted file mode 100644 index 2058088316..0000000000 --- a/network/krb5/README +++ /dev/null @@ -1,10 +0,0 @@ -Kerberos is a network authentication protocol. It is designed to -provide strong authentication for client/server applications by using -secret-key cryptography. A free implementation of this protocol is -available from the Massachusetts Institute of Technology. Kerberos is -available in many commercial products as well. - -Note: -We provide 2 RC scripts that you can use for your own usage: -- rc.kadmind: Kerberos KADM5 administration server init script -- rc.krb5kdc: Kerberos V5 KDC init script diff --git a/network/krb5/README.krb5 b/network/krb5/README.krb5 deleted file mode 100644 index 72c522b6a7..0000000000 --- a/network/krb5/README.krb5 +++ /dev/null @@ -1,52 +0,0 @@ -Kerberos is a network authentication protocol. It is designed to -provide strong authentication for client/server applications by using -secret-key cryptography. A free implementation of this protocol is -available from the Massachusetts Institute of Technology. Kerberos is -available in many commercial products as well. - -The Internet is an insecure place. Many of the protocols used in the -Internet do not provide any security. Tools to "sniff" passwords off -of the network are in common use by malicious hackers. Thus, -applications which send an unencrypted password over the network are -extremely vulnerable. Worse yet, other client/server applications rely -on the client program to be "honest" about the identity of the user -who is using it. Other applications rely on the client to restrict its -activities to those which it is allowed to do, with no other -enforcement by the server. - -Some sites attempt to use firewalls to solve their network security -problems. Unfortunately, firewalls assume that "the bad guys" are on -the outside, which is often a very bad assumption. Most of the really -damaging incidents of computer crime are carried out by insiders. -Firewalls also have a significant disadvantage in that they restrict -how your users can use the Internet. (After all, firewalls are simply -a less extreme example of the dictum that there is nothing more secure -then a computer which is not connected to the network --- and powered -off!) In many places, these restrictions are simply unrealistic and -unacceptable. - -Kerberos was created by MIT as a solution to these network security -problems. The Kerberos protocol uses strong cryptography so that a -client can prove its identity to a server (and vice versa) across an -insecure network connection. After a client and server has used -Kerberos to prove their identity, they can also encrypt all of their -communications to assure privacy and data integrity as they go about -their business. - -Kerberos is freely available from MIT, under copyright permissions -very similar those used for the BSD operating system and the X Window -System. MIT provides Kerberos in source form so that anyone who wishes -to use it may look over the code for themselves and assure themselves -that the code is trustworthy. In addition, for those who prefer to -rely on a professionally supported product, Kerberos is available as a -product from many different vendors. - -In summary, Kerberos is a solution to your network security problems. -It provides the tools of authentication and strong cryptography over -the network to help you secure your information systems across your -entire enterprise. We hope you find Kerberos as useful as it has been -to us. At MIT, Kerberos has been invaluable to our -Information/Technology architecture. - -Additional information is available from the MIT Kerberos website: -http://web.mit.edu/kerberos/ diff --git a/network/krb5/doinst.sh b/network/krb5/doinst.sh deleted file mode 100644 index db0a05b7e2..0000000000 --- a/network/krb5/doinst.sh +++ /dev/null @@ -1,26 +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... -} - -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.krb5kdc.new -preserve_perms etc/rc.d/rc.kadmind.new diff --git a/network/krb5/krb5.info b/network/krb5/krb5.info deleted file mode 100644 index 4b1ee9202e..0000000000 --- a/network/krb5/krb5.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="krb5" -VERSION="1.18.2" -HOMEPAGE="http://web.mit.edu/kerberos/" -DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.18/krb5-1.18.2.tar.gz" -MD5SUM="fd9087eaa43589a2480c2e22da91a17e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/network/krb5/rc.kadmind b/network/krb5/rc.kadmind deleted file mode 100644 index 5a5633f1ee..0000000000 --- a/network/krb5/rc.kadmind +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Kerberos KADM5 administration server init script -# -# Copyright (C) 2017 Jason Graham <jgraha8@gmail.com> -# - -# Start kadmind: -kadmind_start() { - CMDLINE="/usr/sbin/kadmind" - echo -n "Starting kadmind: $CMDLINE" - $CMDLINE - echo -} - -# Stop kadmind: -kadmind_stop() { - echo "Stopping kadmind..." - killall -e -q kadmind -} - -# Restart kadmind: -kadmind_restart() { - kadmind_stop - sleep 1 - kadmind_start -} - -# Check if kadmind is running -kadmind_status() { - if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/kadmind)" ]; then - echo "kadmind is running." - else - echo "kadmind is stopped." - exit 1 - fi -} - -case "$1" in - 'start') - kadmind_start - ;; - 'stop') - kadmind_stop - ;; - 'restart') - kadmind_restart - ;; - 'status') - kadmind_status - ;; - *) - echo "usage $0 start|stop|restart|status" -esac diff --git a/network/krb5/rc.krb5kdc b/network/krb5/rc.krb5kdc deleted file mode 100644 index 6829e12ab5..0000000000 --- a/network/krb5/rc.krb5kdc +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Kerberos V5 KDC init script -# -# Copyright (C) 2017 Jason Graham <jgraha8@gmail.com> -# - -# Start krb5kdc: -krb5kdc_start() { - CMDLINE="/usr/sbin/krb5kdc" - echo -n "Starting krb5kdc: $CMDLINE" - $CMDLINE - echo -} - -# Stop krb5kdc: -krb5kdc_stop() { - echo "Stopping krb5kdc..." - killall -e -q krb5kdc -} - -# Restart krb5kdc: -krb5kdc_restart() { - krb5kdc_stop - sleep 1 - krb5kdc_start -} - -# Check if krb5kdc is running -krb5kdc_status() { - if [ ! -z "$(ps -e -o command | grep -E -w [/]usr/sbin/krb5kdc)" ]; then - echo "krb5kdc is running." - else - echo "krb5kdc is stopped." - exit 1 - fi -} - -case "$1" in - 'start') - krb5kdc_start - ;; - 'stop') - krb5kdc_stop - ;; - 'restart') - krb5kdc_restart - ;; - 'status') - krb5kdc_status - ;; - *) - echo "usage $0 start|stop|restart|status" -esac diff --git a/network/krb5/slack-desc b/network/krb5/slack-desc deleted file mode 100644 index 6b5ce3e43e..0000000000 --- a/network/krb5/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------------------------------------------------------| -krb5: krb5 (network authentication protocol) -krb5: -krb5: Kerberos is a network authentication protocol. It is designed to -krb5: provide strong authentication for client/server applications by using -krb5: secret-key cryptography. A free implementation of this protocol is -krb5: available from the Massachusetts Institute of Technology. Kerberos is -krb5: available in many commercial products as well. -krb5: -krb5: Homepage: http://web.mit.edu/kerberos/ -krb5: -krb5: diff --git a/network/leechcraft/README b/network/leechcraft/README deleted file mode 100644 index 22782597c3..0000000000 --- a/network/leechcraft/README +++ /dev/null @@ -1,26 +0,0 @@ -LeechCraft is a full-featured modular "Internet client" application, -currently including plugins for a web browser, news feed reader, -BitTorrent client, FTP client, and many more. Plugins are easily added -and integrated with each other with no effort. - -Currently it includes following plugins: -* Aggregator, news feed reader * BitTorrent, the BitTorrent client -* Chatter, the IRC client * CSTP, simple HTTP implementation -* DBusManager, D-Bus for the LeechCraft * DeadLyrics, LyricWiki.org API -* HistoryHolder, downloads history * LCFTP, FTP implementation client -* LMP, simple media player with streaming support -* NetworkMonitor, which monitors for HTTP requests -* Poshuku, the web browser * Poshuku CleanWeb, AdBlock+-compatible ad blocker -* Poshuku FileScheme, support for the file:// browsing -* Poshuku FUA, which allows to set fake user agents per domain -* SeekThru, client for OpenSearch-aware web sites - -The following variables default to ON, but you can disable building any of -them by passing NAME_OF_VARIABLE=OFF to the build script: - ENABLE_SUMMARY ENABLE_TORRENT ENABLE_AGGREGATOR ENABLE_POSHUKU ENABLE_HTTP - ENABLE_FTP ENABLE_LMP ENABLE_DBUSMANAGER ENABLE_DEADLYRICS ENABLE_SEEKTHRU - ENABLE_NETWORKMONITOR ENABLE_HISTORYHOLDER ENABLE_CHATTER ENABLE_YASD - ENABLE_DCMINATOR ENABLE_NEWLIFE ENABLE_ANHERO ENABLE_VGRABBER -As an example, you can do this: ENABLE_LMP=OFF ./leechcraft.SlackBuild - -An optional dependency is libtorrent-rasterbar. diff --git a/network/leechcraft/doinst.sh b/network/leechcraft/doinst.sh deleted file mode 100644 index f3f8604d5a..0000000000 --- a/network/leechcraft/doinst.sh +++ /dev/null @@ -1,22 +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 [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/icons/Pevzi/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/Pevzi >/dev/null 2>&1 - fi -fi - -if [ -e usr/share/icons/oxygen/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/oxygen >/dev/null 2>&1 - fi -fi - diff --git a/network/leechcraft/leechcraft.SlackBuild b/network/leechcraft/leechcraft.SlackBuild deleted file mode 100644 index 80b2acc607..0000000000 --- a/network/leechcraft/leechcraft.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Slackware build script for LeechCraft - -# Copyright 2009 rexim -# 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=leechcraft -VERSION=${VERSION:-0.3.65} -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="" - EXTRA_CMAKE_FLAGS="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - EXTRA_CMAKE_FLAGS="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - EXTRA_CMAKE_FLAGS="-DRESPECTLIB64=True" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build -cmake \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DENABLE_SUMMARY="${ENABLE_SUMMARY:-ON}" \ - -DENABLE_TORRENT="${ENABLE_TORRENT:-ON}" \ - -DENABLE_AGGREGATOR="${ENABLE_AGGREGATOR:-ON}" \ - -DENABLE_POSHUKU="${ENABLE_POSHUKU:-ON}" \ - -DENABLE_HTTP="${ENABLE_HTTP:-ON}" \ - -DENABLE_FTP="${ENABLE_FTP:-ON}" \ - -DENABLE_LMP="${ENABLE_LMP:-ON}" \ - -DENABLE_DBUSMANAGER="${ENABLE_DBUSMANAGER:-ON}" \ - -DENABLE_DEADLYRICS="${ENABLE_DEADLYRICS:-ON}" \ - -DENABLE_SEEKTHRU="${ENABLE_SEEKTHRU:-ON}" \ - -DENABLE_NETWORKMONITOR="${ENABLE_NETWORKMONITOR:-ON}" \ - -DENABLE_HISTORYHOLDER="${ENABLE_HISTORYHOLDER:-ON}" \ - -DENABLE_CHATTER="${ENABLE_CHATTER:-ON}" \ - -DENABLE_YASD="${ENABLE_YASD:-ON}" \ - -DENABLE_DCMINATOR="${ENABLE_DCMINATOR:-ON}" \ - -DENABLE_NEWLIFE="${ENABLE_NEWLIFE:-ON}" \ - -DENABLE_ANHERO="${ENABLE_ANHERO:-ON}" \ - -DENABLE_VGRABBER="${ENABLE_VGRABBER:-ON}" \ - $EXTRA_CMAKE_FLAGS \ - ../src/ - -make -make install DESTDIR=$PKG - -# Move the manual pages to the correct place -mv $PKG/usr/share/man $PKG/usr - -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/leechcraft/leechcraft.info b/network/leechcraft/leechcraft.info deleted file mode 100644 index 946c9060bd..0000000000 --- a/network/leechcraft/leechcraft.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="leechcraft" -VERSION="0.3.65" -HOMEPAGE="https://leechcraft.org/" -DOWNLOAD="https://downloads.sourceforge.net/leechcraft/leechcraft-0.3.65.tar.bz2" -MD5SUM="f410eae27731aa80b8921701477b15e7" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="rexim" -EMAIL="reximkut@gmail.com" diff --git a/network/leechcraft/slack-desc b/network/leechcraft/slack-desc deleted file mode 100644 index eddd124950..0000000000 --- a/network/leechcraft/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------------------------------------------------------| -leechcraft: leechcraft (modular internet client application) -leechcraft: -leechcraft: LeechCraft is a full-featured modular "Internet client" application, -leechcraft: currently including plugins for a web browser, news feed reader, -leechcraft: BitTorrent client, FTP client and many more. Plugins are easily added -leechcraft: and integrated with each other with no effort. -leechcraft: -leechcraft: Homepage: http://leechcraft.org/ -leechcraft: -leechcraft: -leechcraft: diff --git a/network/linuxdcpp/linuxdcpp.SlackBuild b/network/linuxdcpp/linuxdcpp.SlackBuild index e83b5a345b..bf57367f58 100644 --- a/network/linuxdcpp/linuxdcpp.SlackBuild +++ b/network/linuxdcpp/linuxdcpp.SlackBuild @@ -65,7 +65,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -fpermissive" \ +CXXFLAGS="$SLKCFLAGS -fpermissive -std=gnu++98" \ scons \ PREFIX=/usr \ FAKE_ROOT=$PKG \ diff --git a/network/memcached/memcached.SlackBuild b/network/memcached/memcached.SlackBuild index 404909ad39..833314e8d8 100644 --- a/network/memcached/memcached.SlackBuild +++ b/network/memcached/memcached.SlackBuild @@ -82,7 +82,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 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-overflow -Wno-error=format-truncation" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/midori/README b/network/midori/README index 16ec7ed18a..d8f163a4e0 100644 --- a/network/midori/README +++ b/network/midori/README @@ -1,7 +1,7 @@ Midori is a lightweight, webkit-based web browser. Features: - * Full integration with GTK+2 + * Full integration with GTK+3 * Fast rendering with WebKit * Tabs, windows and session management * Flexibly configurable Web Search. @@ -10,11 +10,3 @@ Features: * Customizable and extensible interface. * Extensions such as Adblock, form history, mouse gestures or cookie management. - -GTK3 support is disabled by default but can be enabled -by passing GTK3=yes to the script, e.g. - - GTK3=yes ./midori.SlackBuild - -If enabled then webkitgtk3 and libunique3 (instead of webkitgtk -and libunique) are required. diff --git a/network/midori/doinst.sh b/network/midori/doinst.sh index 8505e6eaff..4a25de5e6f 100644 --- a/network/midori/doinst.sh +++ b/network/midori/doinst.sh @@ -1,19 +1,3 @@ -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/xdg/midori/search.new -config etc/xdg/midori/extensions/adblock/config.new - 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/midori/midori.SlackBuild b/network/midori/midori.SlackBuild index 99efa991c7..8aeed3e3ed 100644 --- a/network/midori/midori.SlackBuild +++ b/network/midori/midori.SlackBuild @@ -5,7 +5,7 @@ # Copyright 2008 Andrew Brouwers <abrouwers@gmail.com> # Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # Copyright 2012-2013 Roberto Neri, Palermo, Italy -# Copyright 2013-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # # All rights reserved. # @@ -27,7 +27,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=midori -VERSION=${VERSION:-0.5.11} +SRCNAM=core +VERSION=${VERSION:-9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,22 +62,14 @@ else LIBDIRSUFFIX="" fi -# GTK3 support is disabled by default but can be enabled -# by passing GTK3=yes to the script -if [ "${GTK3:-no}" = "yes" ]; then - ENABLE_GTK3="ON" -else - ENABLE_GTK3="OFF" -fi - set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_${VERSION}_all_.tar.?z* -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$PRGNAM-$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 \ @@ -87,30 +80,20 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_FULL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_FULL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ - -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ - -DDATADIR=/usr/share/$PRGNAM \ - -DUSE_ZEITGEIST=OFF \ - -DUSE_GTK3="$ENABLE_GTK3" \ - -DHALF_BRO_INCOM_WEBKIT2=ON \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG + -DCMAKE_INSTALL_LIBDIR=/usr/lib$LIBDIRSUFFIX \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DVALA_CFLAGS="$SLKCFLAGS" \ + -G Ninja \ + .. + ninja + DESTDIR=$PKG ninja install cd .. -# Don't clobber existing configs -mv $PKG/etc/xdg/midori/search $PKG/etc/xdg/midori/search.new -mv $PKG/etc/xdg/midori/extensions/adblock/config $PKG/etc/xdg/midori/extensions/adblock/config.new - -# The other docs have been taken care by make install +rm -fR $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a HACKING TODO TRANSLATE \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -ln -s $PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/midori/midori.info b/network/midori/midori.info index a2abab3152..516e7ec757 100644 --- a/network/midori/midori.info +++ b/network/midori/midori.info @@ -1,10 +1,10 @@ PRGNAM="midori" -VERSION="0.5.11" -HOMEPAGE="http://midori-browser.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/midori_0.5.11_all_.tar.bz2" -MD5SUM="fcc03ef759fce4fe9f2446d9da4a065e" +VERSION="9.0" +HOMEPAGE="https://midori-browser.org/" +DOWNLOAD="https://github.com/midori-browser/core/archive/v9.0/midori-9.0.tar.gz" +MD5SUM="b39172aeb754e666f044d69828f82bcc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="vala webkit2gtk" +REQUIRES="libpeas webkit2gtk" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/network/midori/slack-desc b/network/midori/slack-desc index bddbb483ce..15edff5601 100644 --- a/network/midori/slack-desc +++ b/network/midori/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| midori: midori (simple web-browser) midori: -midori: midori is a simple web-browser, based on the webkit framework. +midori: midori is a simple web-browser, based on the webkit framework +midori: and gtk+3. midori: +midori: Homepage: https://midori-browser.org midori: midori: -midori: Homepage: http://midori-browser.org/ -midori: midori: midori: midori: diff --git a/network/mldonkey/mldonkey.SlackBuild b/network/mldonkey/mldonkey.SlackBuild index 5845ea64a1..8c7adeb4bd 100644 --- a/network/mldonkey/mldonkey.SlackBuild +++ b/network/mldonkey/mldonkey.SlackBuild @@ -26,13 +26,13 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mldonkey -VERSION=${VERSION:-3.1.5} +VERSION=${VERSION:-3.1.6} 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 @@ -45,8 +45,8 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} GUIOPT=${GUIOPT:-no} -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,10 +69,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # This avoids downloading tarballs when the SlackBuild is running mkdir -p patches @@ -105,7 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \ make -j1 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 if [ "$GUIOPT" = 'yes' ]; then @@ -116,7 +116,7 @@ fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - distrib/*.txt docs ChangeLog \ + distrib/*.txt docs \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/mldonkey/mldonkey.info b/network/mldonkey/mldonkey.info index f2de7a097c..8d2907a4bc 100644 --- a/network/mldonkey/mldonkey.info +++ b/network/mldonkey/mldonkey.info @@ -1,10 +1,10 @@ PRGNAM="mldonkey" -VERSION="3.1.5" +VERSION="3.1.6" HOMEPAGE="http://mldonkey.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/mldonkey/mldonkey-3.1.5.tar.bz2 \ +DOWNLOAD="https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2 \ http://caml.inria.fr/pub/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz \ http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/lablgtk-2.14.2.tar.gz" -MD5SUM="eca07c8ce88702dd437c72db531162d9 \ +MD5SUM="d73a925fb3559eed2c1d91fdeed1153a \ 3ba7cc65123c3579f14e7c726d3ee782 \ bad77680a72dab8b915cae99d1ec9b1f" DOWNLOAD_x86_64="" diff --git a/network/mosh/mosh.SlackBuild b/network/mosh/mosh.SlackBuild index ac040947a9..40ba6d2b63 100644 --- a/network/mosh/mosh.SlackBuild +++ b/network/mosh/mosh.SlackBuild @@ -53,7 +53,7 @@ find -L . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/museek+/README b/network/museek+/README deleted file mode 100644 index 350f3838de..0000000000 --- a/network/museek+/README +++ /dev/null @@ -1,23 +0,0 @@ -Museek+ is a file-sharing application for the Soulseek peer-to-peer network, -written in C++. It's an enhanced version of Hyriand's original Museek -(see http://museek.thegraveyard.org). It supports chat, transferring files, -searching, user-management, shares browsing and more. The new features are: -room searching, interests, buddy-only shares, banlists, icon themes, and -font/color selecting. - -Museek+ consists of museekd (daemon), muscan (shares scanning tool), muscand -(automated shares scanning tool), musetup (command-line configuration script), -musetup-gtk (PyGTK configuration app), museeq (QT GUI client), mucous (curses -python client), murmur (PyGTK client) and museekcontrol (command-line python -client). - -After installing museek+ follow these steps: - 1) Configure your settings with musetup: server, username, password, - interface password, download directory, shared directories. - 2) Run museekd. - 3) Run museeq, mucous, or museekcontrol. - 4) Login into museekd via the interface socket or host:port and the - interface password. - -An example init script (rc.museekd) for the museekd daemon is provided. -Feel free to modify it for your needs. Use it at your own risk. diff --git a/network/museek+/doinst.sh b/network/museek+/doinst.sh deleted file mode 100644 index 74a3bd3a48..0000000000 --- a/network/museek+/doinst.sh +++ /dev/null @@ -1,26 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Keep same perms on rc.museekd.new: -#if [ -e etc/rc.d/rc.museekd ]; then -# cp -a etc/rc.d/rc.museekd etc/rc.d/rc.museekd.new.incoming -# cat etc/rc.d/rc.museekd.new > etc/rc.d/rc.museekd.new.incoming -# mv etc/rc.d/rc.museekd.new.incoming etc/rc.d/rc.museekd.new -#fi -# -#config etc/rc.d/rc.museekd.new - -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 -fi - diff --git a/network/museek+/museek+.SlackBuild b/network/museek+/museek+.SlackBuild deleted file mode 100644 index 347b8903bf..0000000000 --- a/network/museek+/museek+.SlackBuild +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -# Slackware build script for museek+ -# Written by Iskar Enev <iskar.enev[@]gmail.com> -# Currently maintained by B. Watson <yalhcru@gmail.com> - -PRGNAM=museek+ -VERSION=${VERSION:-0.2} -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.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 {} \; - -# This patch fixes the python modules install path -# to be architecture aware -patch -p0 < $CWD/museek-python.diff - -cmake -DPREFIX=/usr \ - -DMANDIR=man \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ - -DSWIG_DIR:PATH=`swig -swiglib` \ - -DEVERYTHING=1 \ - -DTRAYICON=1 \ - -DBINRELOC=0 - -make VERBOSE=1 -make install VERBOSE=1 DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING CREDITS FILES LICENSE README TODO INSTALL \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/rc.museekd > $PKG/usr/doc/$PRGNAM-$VERSION/rc.museekd.new - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/museek+/museek+.info b/network/museek+/museek+.info deleted file mode 100644 index 8ee1bc1126..0000000000 --- a/network/museek+/museek+.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="museek+" -VERSION="0.2" -HOMEPAGE="http://museek-plus.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/museek-plus/museek+-0.2.tar.bz2" -MD5SUM="66d3eab341e1cd6642f83d329a18c3b5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libxml++" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/network/museek+/museek-python.diff b/network/museek+/museek-python.diff deleted file mode 100644 index 844d17d624..0000000000 --- a/network/museek+/museek-python.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- murmur/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300 -+++ murmur/CMakeLists.txt.1 2009-09-01 12:04:34.000000000 +0300 -@@ -25,7 +25,7 @@ - ${PYMURMUR_FILES} - ) - --EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) -+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) - - if (NOT sitepackages OR error) - MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error}) ---- mucous/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300 -+++ mucous/CMakeLists.txt.1 2009-09-01 12:04:55.000000000 +0300 -@@ -28,7 +28,7 @@ - ${PYMUCOUS_FILES} - ) - --EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) -+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) - - if (NOT sitepackages OR error) - MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error}) ---- python-bindings/CMakeLists.txt 2008-09-22 11:49:33.000000000 +0300 -+++ python-bindings/CMakeLists.txt.1 2009-09-01 12:04:15.000000000 +0300 -@@ -18,7 +18,7 @@ - museek/driver.py - ) - --EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) -+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) - - if (NOT sitepackages OR error) - MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error}) ---- Mucipher/PyMucipher/CMakeLists.txt 2008-10-07 19:58:27.000000000 +0300 -+++ Mucipher/PyMucipher/CMakeLists.txt.1 2009-09-01 12:05:46.000000000 +0300 -@@ -37,7 +37,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/mucipherc.py - ${CMAKE_CURRENT_BINARY_DIR}/_mucipherc.so - ) --EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) -+EXECUTE_PROCESS(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,0,'')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error) - - if (NOT sitepackages OR error) - MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error}) diff --git a/network/museek+/rc.museekd b/network/museek+/rc.museekd deleted file mode 100644 index 8c74eb95ab..0000000000 --- a/network/museek+/rc.museekd +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -# -# This shell script takes care of starting and stopping museekd. - -MUSEEKD=/usr/bin/museekd -MUSETUP=/usr/bin/musetup -MUSCAN=/usr/bin/muscan -MUSOCKET=/tmp/museekd.root -PIDFILE=/var/run/museekd.pid -DBDIR=/var/museek -CONFIG=$DBDIR/museekd.xml -CHOWNSOCKET=YES - -case "$1" in - start) - if [ ! -d $DBDIR ]; then - mkdir $DBDIR - fi - if [ ! -f $CONFIG ]; then - echo -n "Starting Museek Setup" - echo - if [ ! -d $DBDIR ]; then - mkdir $DBDIR - fi - $MUSETUP $CONFIG - echo - fi - if [ -f $PIDFILE ]; then - echo -n "Museek Daemon already running (or zombie pid file in /var/run/)" - echo - exit - fi - echo -n "Starting Museek Daemon" - $MUSEEKD -c $CONFIG &>/dev/null & - PID="$!" - sleep 2 - if kill -0 $PID # pid check - then - if [ $CHOWNSOCKET = YES ]; - then - if [ -e $MUSOCKET ]; then chmod 666 $MUSOCKET - # access the museekd socket from other users, may be a security risk on multiuser systems - fi - fi - echo $PID > $PIDFILE - echo - else - echo -n "Museekd isn't starting up properly. Check your Config file, \nor run 'museekd -c /var/museek/museekd.xml' for verbose messages." - echo - fi - ;; - stop) - echo -n "Stopping Museek Daemon" - echo - if [ -f $PIDFILE ]; then - kill -15 $(cat $PIDFILE) &>/dev/null - rm $PIDFILE - else - echo -n "Museek Daemon not running" - echo - exit - fi - ;; - reconnect) - if [ -f $PIDFILE ]; then - echo -n "Attempting to reconnect Museekd to the Server" - kill -ALRM $(cat $PIDFILE) &>/dev/null - echo - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - rescan) - echo -n "Starting Muscan, rescanning shared files" - echo - $MUSCAN -c $CONFIG -r -v - echo - $0 reload - ;; - setup) - echo -n "Starting Museek Setup" - echo - if [ ! -d $DBDIR ]; then - mkdir $DBDIR - fi - $MUSETUP $CONFIG - echo - ;; - reload) - if [ -f $PIDFILE ]; then - echo -n "Reloading Museek Daemon to update Shares" - kill -HUP $(cat $PIDFILE) - echo - else - echo -n "Museek Daemon not running, can't reload shares" - echo - fi - ;; - *) - echo "usage: $0 {start|stop|restart|rescan|reconnect|setup|reload}" - echo -n -esac diff --git a/network/museek+/slack-desc b/network/museek+/slack-desc deleted file mode 100644 index 58f0d98ace..0000000000 --- a/network/museek+/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------------------------------------------------------| -museek+: museek+ (file-sharing application) -museek+: -museek+: Museek+ is a file-sharing application for the Soulseek p2p network, -museek+: written in C++. It's an enhanced version of Hyriand's original Museek -museek+: (http://museek.thegraveyard.org). It supports chat, transferring -museek+: files, searching, user-management, sharing, banlists, interests -museek+: and more. Museek+ consists of museekd (daemon), muscan (shares -museek+: scanning tool), muscand (automated shares scanning tool), musetup -museek+: (command-line configuration script), musetup-gtk (PyGTK configuration -museek+: app), museeq (QT GUI client), mucous (curses python client), -museek+: museekcontrol (command-line python client) and murmur (PyGTK client). diff --git a/network/ncrack/ncrack.SlackBuild b/network/ncrack/ncrack.SlackBuild index e7fa0d50de..c99b3248a4 100644 --- a/network/ncrack/ncrack.SlackBuild +++ b/network/ncrack/ncrack.SlackBuild @@ -71,7 +71,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/nextcloud-server/nextcloud-server.SlackBuild b/network/nextcloud-server/nextcloud-server.SlackBuild index 1a139248f2..8276ac8a74 100644 --- a/network/nextcloud-server/nextcloud-server.SlackBuild +++ b/network/nextcloud-server/nextcloud-server.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=nextcloud-server SRCNAM=nextcloud -VERSION=${VERSION:-13.0.7} +VERSION=${VERSION:-18.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/nextcloud-server/nextcloud-server.info b/network/nextcloud-server/nextcloud-server.info index 4087894048..42fbb27b4b 100644 --- a/network/nextcloud-server/nextcloud-server.info +++ b/network/nextcloud-server/nextcloud-server.info @@ -1,8 +1,8 @@ PRGNAM="nextcloud-server" -VERSION="13.0.7" +VERSION="18.0.4" HOMEPAGE="https://nextcloud.com/" -DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-13.0.7.tar.bz2" -MD5SUM="ee0c0e53a1ac8e2feb3ce0fdfe27f9b2" +DOWNLOAD="https://download.nextcloud.com/server/releases/nextcloud-18.0.4.tar.bz2" +MD5SUM="d2f3c7bd402ef61d30a576d165fe7c1d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/nghttp2/README b/network/nghttp2/README deleted file mode 100644 index 3d05758f54..0000000000 --- a/network/nghttp2/README +++ /dev/null @@ -1,4 +0,0 @@ -nghttp2 is an implementation of HTTP/2 and its header compression -algorithm HPACK in C. -The framing layer of HTTP/2 is implemented as a form of reusable C -library. diff --git a/network/nghttp2/nghttp2.info b/network/nghttp2/nghttp2.info deleted file mode 100644 index 11476aa1b8..0000000000 --- a/network/nghttp2/nghttp2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nghttp2" -VERSION="1.16.1" -HOMEPAGE="https://nghttp2.org/" -DOWNLOAD="https://github.com/nghttp2/nghttp2/releases/download/v1.16.1/nghttp2-1.16.1.tar.xz" -MD5SUM="bde0dca3fd5da7bc5c7c8470ed0674b5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="jansson" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/network/opendkim/opendkim.SlackBuild b/network/opendkim/opendkim.SlackBuild index 85b2b88f4b..83b188ea96 100644 --- a/network/opendkim/opendkim.SlackBuild +++ b/network/opendkim/opendkim.SlackBuild @@ -104,6 +104,9 @@ else UNBOUND="" fi +patch -p1 < $CWD/openssl_1.1.0_compat.patch +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/opendkim/openssl_1.1.0_compat.patch b/network/opendkim/openssl_1.1.0_compat.patch new file mode 100644 index 0000000000..383990832a --- /dev/null +++ b/network/opendkim/openssl_1.1.0_compat.patch @@ -0,0 +1,90 @@ +Description: Build and work with either openssl 1.0.2 or 1.1.0 + * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466) + - Thanks to Sebastian Andrzej Siewior for the patch +Author: Sebastian Andrzej Siewior +Bug-Debian: http://bugs.debian.org/828466 +Origin: vendor +Forwarded: no +Reviewed-By: Scott Kitterman <scott@kitterman.com> +Last-Update: <YYYY-MM-DD> + +--- opendkim-2.11.0~alpha.orig/configure.ac ++++ opendkim-2.11.0~alpha/configure.ac +@@ -864,26 +864,28 @@ then + AC_SEARCH_LIBS([ERR_peek_error], [crypto], , + AC_MSG_ERROR([libcrypto not found])) + +- AC_SEARCH_LIBS([SSL_library_init], [ssl], , +- [ +- if test x"$enable_shared" = x"yes" +- then +- AC_MSG_ERROR([Cannot build shared opendkim +- against static openssl libraries. +- Configure with --disable-shared +- to get this working or obtain a +- shared libssl library for +- opendkim to use.]) +- fi + +- # avoid caching issue - last result of SSL_library_init +- # shouldn't be cached for this next check +- unset ac_cv_search_SSL_library_init +- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" +- AC_SEARCH_LIBS([SSL_library_init], [ssl], , +- AC_MSG_ERROR([libssl not found]), [-ldl]) +- ] +- ) ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], ++ [[SSL_library_init();]])], ++ [od_have_ossl="yes";], ++ [od_have_ossl="no";]) ++ if test x"$od_have_ossl" = x"no" ++ then ++ if test x"$enable_shared" = x"yes" ++ then ++ AC_MSG_ERROR([Cannot build shared opendkim ++ against static openssl libraries. ++ Configure with --disable-shared ++ to get this working or obtain a ++ shared libssl library for ++ opendkim to use.]) ++ fi ++ ++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" ++ AC_SEARCH_LIBS([SSL_library_init], [ssl], , ++ AC_MSG_ERROR([libssl not found]), [-ldl]) ++ fi + + AC_CHECK_DECL([SHA256_DIGEST_LENGTH], + AC_DEFINE([HAVE_SHA256], 1, +--- opendkim-2.11.0~alpha.orig/opendkim/opendkim-crypto.c ++++ opendkim-2.11.0~alpha/opendkim/opendkim-crypto.c +@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr) + { + assert(pthread_setspecific(id_key, ptr) == 0); + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ OPENSSL_thread_stop(); ++#else + ERR_remove_state(0); ++#endif + + free(ptr); + +@@ -392,11 +396,15 @@ dkimf_crypto_free(void) + { + if (crypto_init_done) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ OPENSSL_thread_stop(); ++#else + CRYPTO_cleanup_all_ex_data(); + CONF_modules_free(); + EVP_cleanup(); + ERR_free_strings(); + ERR_remove_state(0); ++#endif + + if (nmutexes > 0) + { diff --git a/network/opensmtpd/aliases b/network/opensmtpd/aliases index ea54878974..85cc8e71ac 100644 --- a/network/opensmtpd/aliases +++ b/network/opensmtpd/aliases @@ -1,23 +1,49 @@ -# See aliases(5) for more information +# Sample aliases file installed in /etc/opensmtpd/aliases +# +# Aliases in this file will NOT be expanded in the header from +# Mail, but WILL be visible over networks or from /usr/libexec/mail.local. +# +# >>>>>>>>>> The program "newaliases" must be run after +# >> NOTE >> this file is updated for any changes to +# >>>>>>>>>> show through to smtpd. +# + +# Person who should get root's mail. Don't receive mail as root! +#root: you # Basic system aliases -- these MUST be present MAILER-DAEMON: postmaster postmaster: root # General redirections for pseudo accounts -bin: root daemon: root named: root -nobody: root uucp: root www: root ftp-bugs: root +# Redirections for pseudo accounts that should not receive mail +bin: /dev/null +build: /dev/null +nobody: /dev/null +sshd: /dev/null + # Well-known aliases manager: root dumper: root operator: root -abuse: postmaster + +# RFC 2142: NETWORK OPERATIONS MAILBOX NAMES +abuse: root +# noc: root +security: root + +# RFC 2142: SUPPORT MAILBOX NAMES FOR SPECIFIC INTERNET SERVICES +# hostmaster: root +# usenet: root +# news: usenet +# webmaster: root +# ftp: root # trap decode to catch security attacks decode: root diff --git a/network/opensmtpd/fix-crash-on-authentication.patch b/network/opensmtpd/fix-crash-on-authentication.patch deleted file mode 100644 index c20b5e0a0e..0000000000 --- a/network/opensmtpd/fix-crash-on-authentication.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9b5f70b93e038df5446bd37a4adac5a0380748e7 Mon Sep 17 00:00:00 2001 -From: johannes <johannes.brechtmann@gmail.com> -Date: Wed, 21 Feb 2018 23:57:11 +0100 -Subject: [PATCH] crypt_checkpass: include HAVE_CRYPT_H definition, add NULL - check - ---- - openbsd-compat/crypt_checkpass.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/openbsd-compat/crypt_checkpass.c b/openbsd-compat/crypt_checkpass.c -index dafd2dae..d10b3a57 100644 ---- a/openbsd-compat/crypt_checkpass.c -+++ b/openbsd-compat/crypt_checkpass.c -@@ -1,5 +1,6 @@ - /* OPENBSD ORIGINAL: lib/libc/crypt/cryptutil.c */ - -+#include "includes.h" - #include <errno.h> - #ifdef HAVE_CRYPT_H - #include <crypt.h> -@@ -10,6 +11,8 @@ - int - crypt_checkpass(const char *pass, const char *goodhash) - { -+ char *c; -+ - if (goodhash == NULL) - goto fail; - -@@ -17,7 +20,11 @@ crypt_checkpass(const char *pass, const char *goodhash) - if (strlen(goodhash) == 0 && strlen(pass) == 0) - return 0; - -- if (strcmp(crypt(pass, goodhash), goodhash) == 0) -+ c = crypt(pass, goodhash); -+ if (c == NULL) -+ goto fail; -+ -+ if (strcmp(c, goodhash) == 0) - return 0; - - fail: diff --git a/network/opensmtpd/openbsd64-020-smtpd.patch b/network/opensmtpd/openbsd64-020-smtpd.patch deleted file mode 100644 index 8ce7178da8..0000000000 --- a/network/opensmtpd/openbsd64-020-smtpd.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - { - va_list ap; - int n; -- char buf[LINE_MAX], tmp[LINE_MAX]; -+ char buf[LINE_MAX*2], tmp[LINE_MAX*2]; - - va_start(ap, fmt); - n = vsnprintf(buf, sizeof buf, fmt, ap); - va_end(ap); -- if (n == -1 || n >= LINE_MAX) -- fatalx("smtp_reply: line too long"); -+ if (n < 0) -+ fatalx("smtp_reply: response format error"); - if (n < 4) - fatalx("smtp_reply: response too short"); -+ if (n >= (int)sizeof buf) { -+ /* only first three bytes are used by SMTP logic, -+ * so if _our_ reply does not fit entirely in the -+ * buffer, it's ok to truncate. -+ */ -+ } - - log_trace(TRACE_SMTP, "smtp: %p: >>> %s", s, buf); - diff --git a/network/opensmtpd/openbsd65-029-smptd-tls.patch b/network/opensmtpd/openbsd65-029-smptd-tls.patch deleted file mode 100644 index a2727decf8..0000000000 --- a/network/opensmtpd/openbsd65-029-smptd-tls.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index cd59f1d6fa..0000000000 --- a/network/opensmtpd/openbsd65-031-smtpd-envelope.patch +++ /dev/null @@ -1,199 +0,0 @@ -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 deleted file mode 100644 index 93ce19dcb1..0000000000 --- a/network/opensmtpd/openbsd66-019-smtpd-exec.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 54a4f8e4cf..afda7fedc1 100644 --- a/network/opensmtpd/opensmtpd.SlackBuild +++ b/network/opensmtpd/opensmtpd.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opensmtpd -VERSION=${VERSION:-6.0.3p1} -BUILD=${BUILD:-6} +VERSION=${VERSION:-6.6.4p1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -92,21 +92,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# fix 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 \ @@ -150,10 +135,16 @@ ln -s smtpctl $PKG/usr/sbin/makemap mkdir -p $PKG/etc/rc.d cat $CWD/rc.opensmtpd > $PKG/etc/rc.d/rc.opensmtpd.new -# Don't clobber the config file +# copy original smtpd.conf file +cp -p $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.upstream.default + +# Don't clobber the existing config file mv $PKG/etc/opensmtpd/smtpd.conf $PKG/etc/opensmtpd/smtpd.conf.new # and reflect the correct path to aliases file -sed -i "s,/etc/mail/,/etc/opensmtpd/,g" $PKG/etc/opensmtpd/smtpd.conf.new +# and use mbox instead of maildir +sed -i -e "s,/etc/mail/,/etc/opensmtpd/,g" \ + -e "s,maildir alias,mbox alias,g" \ + $PKG/etc/opensmtpd/smtpd.conf.new # Create (but don't clobber) the aliases file cat $CWD/aliases > $PKG/etc/opensmtpd/aliases.new @@ -176,7 +167,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 LICENSE README.md THANKS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a INSTALL LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.slackware cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/opensmtpd/opensmtpd.info b/network/opensmtpd/opensmtpd.info index 0930880299..b8753bc31d 100644 --- a/network/opensmtpd/opensmtpd.info +++ b/network/opensmtpd/opensmtpd.info @@ -1,8 +1,8 @@ PRGNAM="opensmtpd" -VERSION="6.0.3p1" +VERSION="6.6.4p1" HOMEPAGE="https://www.opensmtpd.org/" -DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-6.0.3p1.tar.gz" -MD5SUM="66e496bb0f3303d660744f4fa2178765" +DOWNLOAD="https://www.opensmtpd.org/archives/opensmtpd-6.6.4p1.tar.gz" +MD5SUM="4744943277f9a6dc942e7560dbdb5643" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libasr" diff --git a/network/owncloud-client/owncloud-client.SlackBuild b/network/owncloud-client/owncloud-client.SlackBuild index b5ab05a98d..f94a92ef0e 100644 --- a/network/owncloud-client/owncloud-client.SlackBuild +++ b/network/owncloud-client/owncloud-client.SlackBuild @@ -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 {} \; +sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/libsync/networkjobs.cpp + mkdir -p build cd build cmake \ diff --git a/network/phodav/phodav.SlackBuild b/network/phodav/phodav.SlackBuild index 1b3c1bcebc..6b597d6460 100644 --- a/network/phodav/phodav.SlackBuild +++ b/network/phodav/phodav.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for phodav -# Copyright 2016-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2016-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=phodav -VERSION=${VERSION:-2.2} +VERSION=${VERSION:-2.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,21 +73,15 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ +meson \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ - --localstatedir=/var \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux + build -make -make install DESTDIR=$PKG - -mkdir $PKG/lib -mv $PKG/usr/lib/udev $PKG/lib/ +ninja -C build +DESTDIR=$PKG ninja -C build 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 diff --git a/network/phodav/phodav.info b/network/phodav/phodav.info index 7b7b8d7050..5fc7a8b668 100644 --- a/network/phodav/phodav.info +++ b/network/phodav/phodav.info @@ -1,8 +1,8 @@ PRGNAM="phodav" -VERSION="2.2" +VERSION="2.3" HOMEPAGE="https://wiki.gnome.org/phodav" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.2/phodav-2.2.tar.xz" -MD5SUM="18dc8890ef3606f2a053054658dbf016" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/phodav/2.3/phodav-2.3.tar.xz" +MD5SUM="0f4bbe83181037577c808acea166b26a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild index 2307eb44cc..5a4ea68244 100644 --- a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild +++ b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild @@ -70,7 +70,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \ +CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations -Wno-error=expansion-to-defined -Wno-error=implicit-fallthrough= -Wno-error=format-truncation=" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/pidgin-sipe/pidgin-sipe.SlackBuild b/network/pidgin-sipe/pidgin-sipe.SlackBuild index e59c906f6e..c041a67d75 100644 --- a/network/pidgin-sipe/pidgin-sipe.SlackBuild +++ b/network/pidgin-sipe/pidgin-sipe.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pidgin-sipe -VERSION=${VERSION:-1.23.0} +VERSION=${VERSION:-1.24.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/pidgin-sipe/pidgin-sipe.info b/network/pidgin-sipe/pidgin-sipe.info index a2cc1045d7..31c45157f6 100644 --- a/network/pidgin-sipe/pidgin-sipe.info +++ b/network/pidgin-sipe/pidgin-sipe.info @@ -1,8 +1,8 @@ PRGNAM="pidgin-sipe" -VERSION="1.23.0" +VERSION="1.24.0" HOMEPAGE="http://sipe.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.23.0.tar.xz" -MD5SUM="75fb9417834bc78114786d78a41bcd37" +DOWNLOAD="http://downloads.sourceforge.net/sipe/pidgin-sipe-1.24.0.tar.xz" +MD5SUM="b91106d28c235b347a63dcb676f7b66a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/postfix/README b/network/postfix/README deleted file mode 100644 index 80840d5668..0000000000 --- a/network/postfix/README +++ /dev/null @@ -1,39 +0,0 @@ -Postfix is Wietse Venema's mailer that started life as an alternative to the -widely-used Sendmail program. It attempts to be fast, easy to administer, and -secure, while at the same time, being sendmail compatible enough to not upset -existing users. Thus, the outside has a sendmail-ish flavor, but the inside is -completely different. - -This script builds postfix with optional support for Dovecot SASL, Cyrus SASL -can be enabled with: - - SASL=cyrus ./postfix.SlackBuild - -You can also enable support for MySQL: - - DATABASE=mysql ./postfix.SlackBuild - -PostgreSQL support can be enabled with: - - DATABASE=pgsql ./postfix.SlackBuild - -On systems with multiple instances, add major version, eg: DATABASE=pgsql-9.5 - -This script will find support for BerkleyDB and PCRE automagically; TLS support -requires openssl package, openssl-solibs alone is not enough. Additionally, this -script doesn't add postfix user and groups, instead it offers sane defaults that -won't conflict with system users and groups, and other scripts from the SBo. - -Package created with this script will conflict with stock sendmail package, you -*should* remove sendmail before installing postfix, otherwise sendmail updates -could break your postfix instance. - -When upgrading from an older postfix version, make sure the variables such as -html_directory and readme_directory in /etc/postfix/main.cf point to the new -location. These can also be fixed later, afterwards make sure to run: - - postfix set-permissions - -Furthermore, many of the utilities in postfix have multiple manpages such as -postconf(5) and postconf(8). Use man -k to find them, and don't forget to -subscribe to the postfix-users mailing list! diff --git a/network/postfix/doinst.sh b/network/postfix/doinst.sh deleted file mode 100644 index 97e6510432..0000000000 --- a/network/postfix/doinst.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -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 -} - -find etc/postfix -type f -name '*.new' \ - | while read new ; do config $new ; done - -preserve_perms etc/rc.d/rc.postfix.new - -# This is an incompatability with the sendmail package -( cd usr/lib; rm -f sendmail ) -( cd usr/lib; ln -s /usr/sbin/sendmail sendmail) - -# This will set the permissions on all postfix files correctly -postfix set-permissions - -# Symlinks added by makepkg(8) - diff --git a/network/postfix/patches/postconf.diff b/network/postfix/patches/postconf.diff deleted file mode 100644 index c51c1822fe..0000000000 --- a/network/postfix/patches/postconf.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- postfix-3.0.3/postfix-install.orig 2015-01-29 23:15:30.000000000 +0100 -+++ postfix-3.0.3/postfix-install 2015-10-17 03:57:42.269896095 +0200 -@@ -248,7 +248,7 @@ - case "$junk" in - *MAIL_VERSION*) - case "$mail_version" in -- "") mail_version="`bin/postconf -dhx mail_version`" || exit 1 -+ "") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1 - esac - val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1 - case "$val" in -@@ -810,7 +810,7 @@ - # the wrong place when Postfix is being upgraded. - - case "$mail_version" in --"") mail_version="`bin/postconf -dhx mail_version`" || exit 1 -+"") mail_version="`bin/postconf -c conf -dhx mail_version`" || exit 1 - esac - - # Undo MAIL_VERSION expansion at the end of a parameter value. If ---- postfix-3.0.3/Makefile.in.orig 2014-09-25 21:16:29.000000000 +0200 -+++ postfix-3.0.3/Makefile.in 2015-10-17 04:01:27.170920308 +0200 -@@ -20,7 +20,7 @@ - EXPAND = sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \ - -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);" - SHLIB_DIR_OVERRIDE = \ -- $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`} -+ $${shlib_directory:-`$(SHLIB_ENV) bin/postconf -c conf -dhx shlib_directory`} - - default: update - diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild deleted file mode 100644 index 6bf3f38e2d..0000000000 --- a/network/postfix/postfix.SlackBuild +++ /dev/null @@ -1,199 +0,0 @@ -#!/bin/sh -# -# Copyright 2006, 2011 Alan Hicks, Lizella, GA -# Copyright 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mario Preksavec, Zagreb, Croatia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=postfix -VERSION=${VERSION:-3.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=""5 -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 - -# Build with dovecot sasl support by default -SASL=${SASL:-dovecot} -case "$SASL" in - dovecot) SASLARGS="-DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" - SASLLIBS="" ;; - cyrus) SASLARGS="-I/usr/include/sasl -DUSE_CYRUS_SASL" - SASLLIBS="-L/usr/lib${LIBDIRSUFFIX}/sasl2 -lsasl2" ;; - *) SASLARGS="" - SASLLIBS="" ;; -esac - -# Build without database support by default -DATABASE=${DATABASE:-none} -case "$DATABASE" in - mysql) DBARGS="-I/usr/include/mysql -DHAS_MYSQL" - DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/mysql -lmysqlclient -lz -lm" ;; - pgsql*) PGVER=${DATABASE/pgsql-} - [ "$PGVER" = "pgsql" ] && PGVER=$(ls /usr/lib${LIBDIRSUFFIX}/postgresql/) - [ -d "/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib" ] && { - DBARGS="-I/usr/include/postgresql -DHAS_PGSQL" - DBLIBS="-L/usr/lib${LIBDIRSUFFIX}/postgresql/$PGVER/lib -lpq -lz -lm" - } || echo "PostgreSQL not found" ;; - *) DBARGS="" - DBLIBS="" ;; -esac - -# Build without ldap support by default -LDAP=${LDAP:-no} -case "$LDAP" in - yes) LDAPARGS="-DUSE_LDAP_SASL -DHAS_LDAP" - LDAPLIBS="-lldap -llber" ;; - *) LDAPARGS="" - LDAPLIBS="" ;; -esac - -# MySQL compile hack -if [ $DATABASE == "mysql" ] && [ -f /usr/include/mysql/events.h ]; then - -cat << EOF - - Postfix will fail to compile with mysql support if a system-wide - events.h file is not removed (postfix has its own events.h). - Either disable mysql support or (re)move events.h, eg: - - # mv /usr/include/mysql/events.h /usr/include/mysql/events.h.bak - -EOF - - exit -fi - -# Bail if user or group isn't valid on your system -if ! grep ^postfix: /etc/passwd 2>&1 > /dev/null; then - -cat << EOF - - You must have a postfix user to run this script - - # groupadd -g 200 postfix - # useradd -u 200 -d /dev/null -s /bin/false -g postfix postfix - -EOF - - exit -elif ! grep ^postdrop: /etc/group 2>&1 > /dev/null; then - -cat << EOF - - You must have a postdrop group to run this script - - # groupadd -g 201 postdrop - -EOF - - exit -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 {} \; - -# Use config files from build tree, not system ones -# This should probably go to upstream... -patch -p1 <$CWD/patches/postconf.diff - -# Postfix does not use a ./configure script - -make makefiles shared=yes \ - CCARGS="-DUSE_SASL_AUTH -DUSE_TLS $SASLARGS $DBARGS $LDAPARGS" \ - AUXLIBS="-lssl -lcrypto $SASLLIBS $DBLIBS $LDAPLIBS" \ - OPT="$SLKCFLAGS" DEBUG="" - -make non-interactive-package \ - install_root=$PKG \ - tempdir=$TMP/$PRGNAM-temp \ - config_directory=/etc/postfix \ - daemon_directory=/usr/libexec/postfix \ - command_directory=/usr/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=/usr/sbin/sendmail \ - newaliases_path=/usr/bin/newaliases \ - mailq_path=/usr/bin/mailq \ - mail_owner=postfix \ - setgid_group=postdrop \ - html_directory=/usr/doc/$PRGNAM-$VERSION/html \ - manpage_directory=/usr/man \ - readme_directory=/usr/doc/$PRGNAM-$VERSION/README_FILES - -install -D -m 0644 -oroot -groot $CWD/rc.postfix $PKG/etc/rc.d/rc.postfix.new -find $PKG/etc/postfix -type f ! -name "*.default" ! -name "*.proto" ! -name "*.out" \ - ! -name "postfix-files" -exec mv {} {}.new \; - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -sed -i 's#\($manpage_directory/man[158]/.\+\.[158]\)\(:.*\)#\1.gz\2#' \ - $PKG/etc/postfix/postfix-files - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AAAREADME COMPATIBILITY COPYRIGHT HISTORY IPv6-ChangeLog LICENSE PORTING \ - RELEASE_NOTES TLS_ACKNOWLEDGEMENTS TLS_CHANGES TLS_LICENSE US_PATENT_6321267 \ - examples implementation-notes $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/postfix/postfix.info b/network/postfix/postfix.info deleted file mode 100644 index 9809f40eb0..0000000000 --- a/network/postfix/postfix.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="postfix" -VERSION="3.3.2" -HOMEPAGE="http://www.postfix.org/" -DOWNLOAD="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.3.2.tar.gz" -MD5SUM="4e6ed7056576e0c54cfce6040a0bb0ad" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Mario Preksavec" -EMAIL="mario at slackware dot hr" diff --git a/network/postfix/rc.postfix b/network/postfix/rc.postfix deleted file mode 100644 index 6e133ad9ec..0000000000 --- a/network/postfix/rc.postfix +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# Copyright 2006, Alan Hicks, Lizella, GA -# 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. -# - -postfix_start() -{ - /usr/sbin/postfix start -} - -postfix_stop() -{ - /usr/sbin/postfix stop -} - -postfix_restart() -{ - postfix_stop - postfix_start -} - -postfix_reload() -{ - /usr/sbin/postfix reload -} - -postfix_status() -{ - /usr/sbin/postfix status -} - -case $1 in -'start') - postfix_start - ;; -'stop') - postfix_stop - ;; -'restart') - postfix_restart - ;; -'reload') - postfix_reload - ;; -'status') - postfix_status - ;; -*) - echo "usage $0 start|stop|restart|reload|status" -esac diff --git a/network/postfix/slack-desc b/network/postfix/slack-desc deleted file mode 100644 index 0e8c796afc..0000000000 --- a/network/postfix/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------------------------------------------------------| -postfix: postfix (alternative to the widely-used Sendmail program) -postfix: -postfix: Postfix attempts to be fast, easy to administer, and secure, while at -postfix: the same time being sendmail compatible enough to not upset existing -postfix: users. Thus, the outside has a sendmail-ish flavor, but the inside is -postfix: completely different. -postfix: -postfix: Packaging script written by Alan Hicks <alan@lizella.net> -postfix: and the SlackBuilds.org Team <http://www.slackbuilds.org> -postfix: -postfix: diff --git a/network/pptp/pptp.SlackBuild b/network/pptp/pptp.SlackBuild index 0ea1de4b74..c6895c11e9 100644 --- a/network/pptp/pptp.SlackBuild +++ b/network/pptp/pptp.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pptp -VERSION=${VERSION:-1.8.0} +VERSION=${VERSION:-1.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/pptp/pptp.info b/network/pptp/pptp.info index 93fefabf34..c676283935 100644 --- a/network/pptp/pptp.info +++ b/network/pptp/pptp.info @@ -1,8 +1,8 @@ PRGNAM="pptp" -VERSION="1.8.0" +VERSION="1.10.0" HOMEPAGE="http://pptpclient.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.8.0.tar.gz" -MD5SUM="4efce9f263e2c3f38d79d9df222476de" +DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.10.0.tar.gz" +MD5SUM="8d25341352fdae5ad5b36b9f18254908" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild index 1fff74fa2d..c44cc94480 100644 --- a/network/qTox/qTox.SlackBuild +++ b/network/qTox/qTox.SlackBuild @@ -72,6 +72,8 @@ find -L . \ # gcc-7 fix #patch -p1 <$CWD/rawdatabase.h.diff +sed -e 's|-Werror||' -i CMakeLists.txt + mkdir -p build cd build cmake \ diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild index 7a89b06188..db15e08b4d 100644 --- a/network/remmina/remmina.SlackBuild +++ b/network/remmina/remmina.SlackBuild @@ -80,7 +80,7 @@ find -L . \ mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto -fcommon" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DWITH_AVAHI=${AVAHI} \ diff --git a/network/rtorrent/README b/network/rtorrent/README index 6c05b5620f..74e8064101 100644 --- a/network/rtorrent/README +++ b/network/rtorrent/README @@ -2,3 +2,5 @@ rtorrent is a BitTorrent client for ncurses, using the libtorrent library. The client and library is written in C++ with emphasis on speed and efficiency, while delivering equivalent features to those found in GUI based clients in an ncurses client. + +Optional dependency: xmlrpc-c diff --git a/network/rtorrent/rtorrent.SlackBuild b/network/rtorrent/rtorrent.SlackBuild index f5ee018aff..421bf99503 100644 --- a/network/rtorrent/rtorrent.SlackBuild +++ b/network/rtorrent/rtorrent.SlackBuild @@ -17,7 +17,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -28,8 +28,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -42,6 +42,8 @@ else LIBDIRSUFFIX="" fi +xmlrpcc="" ; [ -x /usr/bin/xmlrpc-c-config ] && xmlrpcc="--with-xmlrpc-c" + set -e rm -rf $PKG @@ -66,6 +68,8 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + $xmlrpcc \ + --disable-debug \ --build=$ARCH-slackware-linux make diff --git a/network/s-nail/README b/network/s-nail/README deleted file mode 100644 index c18e83c0f2..0000000000 --- a/network/s-nail/README +++ /dev/null @@ -1,16 +0,0 @@ -S-nail (mail sending and receiving utility) - -S-nail provides a simple and friendly environment for sending and -receiving mail. It is intended to provide the functionality of the -POSIX mailx command, but is MIME capable and optionally offers -extensions for line editing, S/MIME, SMTP and POP3, among others. It -divides incoming mail into its constituent messages and allows the -user to deal with them in any order. It offers many COMMANDS and -INTERNAL VARIABLES for manipulating messages and sending mail. It -offers simple editing capabilities, and increasingly powerful and -reliable non-interactive scripting capabilities. - -NOTE - -This package conflicts with Slackware's mailx package. You should -remove mailx before installing this package. diff --git a/network/s-nail/doinst.sh b/network/s-nail/doinst.sh deleted file mode 100644 index b541fb201d..0000000000 --- a/network/s-nail/doinst.sh +++ /dev/null @@ -1,13 +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/nail.rc.new diff --git a/network/s-nail/s-nail.SlackBuild b/network/s-nail/s-nail.SlackBuild deleted file mode 100644 index b50c566f5a..0000000000 --- a/network/s-nail/s-nail.SlackBuild +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/sh - -# Slackware build script for S-nail - -# Copyright 2008, 2009, 2010, 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2018 - 2020 Johannes Schoepfer, Germany -# 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=s-nail -VERSION=${VERSION:-14.9.17} -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.?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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -make \ - VAL_PREFIX=/usr \ - VAL_SYSCONFDIR=/etc \ - VAL_MANDIR=/usr/man \ - VAL_MAIL=/var/spool/mail \ - VAL_MTA=/usr/sbin/sendmail \ - OPT_AUTOCC=0 \ - VAL_SID= \ - VAL_MAILX=mailx \ - VAL_SYSCONFRC=nail.rc \ - VAL_RANDOM="libgetrandom,sysgetrandom,urandom" \ - config - -make build -make test -make install DESTDIR=$PKG - -# Tighten up the perms a bit: -chmod 4711 $PKG/usr/libexec/mailx-dotlock - -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 - -# We put symlinks in /bin since some things still expect '/bin/mail' or '/bin/Mail': -mkdir -p $PKG/bin -( cd $PKG/bin - ln -sf /usr/bin/mailx Mail - ln -sf /usr/bin/mailx mail - ln -sf /usr/bin/mailx nail -) - -# Likewise, we make some compat symlinks in /usr/bin: -( cd $PKG/usr/bin - ln -sf mailx Mail - ln -sf mailx mail - ln -sf mailx nail -) - -mv $PKG/etc/nail.rc $PKG/etc/nail.rc.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 - -# Manpage links: -( cd $PKG/usr/man/man1 - ln -sf mailx.1.gz mail.1.gz - ln -sf mailx.1.gz nail.1.gz - ln -sf mailx.1.gz Mail.1.gz -) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING* INSTALL* NEWS* README* THANKS* \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -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/s-nail/s-nail.info b/network/s-nail/s-nail.info deleted file mode 100644 index 5fa74b7f7a..0000000000 --- a/network/s-nail/s-nail.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="s-nail" -VERSION="14.9.17" -HOMEPAGE="https://www.sdaoden.eu/code.html" -DOWNLOAD="https://www.sdaoden.eu/downloads/s-nail-14.9.17.tar.xz" -MD5SUM="844524dee4c7c9b5255a2b0cf7159c7a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="%README%" -MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds@schoepfer.info" diff --git a/network/s-nail/slack-desc b/network/s-nail/slack-desc deleted file mode 100644 index ab63a8e702..0000000000 --- a/network/s-nail/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------------------------------------------------------| -s-nail: s-nail (mail sending and receiving utility) -s-nail: -s-nail: S-nail provides a simple and friendly environment for sending and -s-nail: receiving mail. It is intended to provide the functionality of the -s-nail: POSIX mailx command, but is MIME capable and optionally offers -s-nail: extensions for line editing, S/MIME, SMTP and POP3, among others. It -s-nail: divides incoming mail into its constituent messages and allows the -s-nail: user to deal with them in any order. It offers many COMMANDS and -s-nail: INTERNAL VARIABLES for manipulating messages and sending mail. It -s-nail: offers simple editing capabilities, and increasingly powerful and -s-nail: reliable non-interactive scripting capabilities. diff --git a/network/seafile-client/seafile-client.SlackBuild b/network/seafile-client/seafile-client.SlackBuild deleted file mode 100644 index 205c0af148..0000000000 --- a/network/seafile-client/seafile-client.SlackBuild +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Slackware build script for "seafile-client". - -# Copyright 2015 Marcel Saegebarth <marc@mos6581.de> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=seafile-client -SRCNAM=seafile -VERSION=${VERSION:-4.4.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/v$VERSION-server.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION-server.tar.gz -cd $SRCNAM-$VERSION-server -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -sh autogen.sh -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-client \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -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/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/seafile-client/seafile-client.info b/network/seafile-client/seafile-client.info deleted file mode 100644 index ef875c1f8f..0000000000 --- a/network/seafile-client/seafile-client.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="seafile-client" -VERSION="4.4.6" -HOMEPAGE="http://seafile.com/" -DOWNLOAD="https://github.com/haiwen/seafile/archive/v4.4.6-server.tar.gz" -MD5SUM="753db8ec00c8f4e43270afff097a23af" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ccnet libevhtp" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/network/seafile-client/slack-desc b/network/seafile-client/slack-desc deleted file mode 100644 index e41d278faa..0000000000 --- a/network/seafile-client/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------------------------------------------------------| -seafile-client: seafile-client (Cloud Storage System) -seafile-client: -seafile-client: Seafile is a next-generation open source cloud storage system with -seafile-client: advanced support for file syncing, privacy protection and teamwork. -seafile-client: -seafile-client: Homepage: http://seafile.com/ -seafile-client: -seafile-client: -seafile-client: -seafile-client: -seafile-client: diff --git a/network/seafile-client/README b/network/seafile/README index 937324eae1..937324eae1 100644 --- a/network/seafile-client/README +++ b/network/seafile/README diff --git a/network/nghttp2/nghttp2.SlackBuild b/network/seafile/seafile.SlackBuild index 39af89748f..63f62460ce 100644 --- a/network/nghttp2/nghttp2.SlackBuild +++ b/network/seafile/seafile.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for "nghttp2". +# Slackware build script for seafile -# Copyright 2016 Marcel Saegebarth <marc@mos6581.de> +# Copyright 2015 Marcel Saegebarth <marc@mos6581.de> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -24,8 +24,8 @@ # (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=nghttp2 -VERSION=${VERSION:-1.16.1} +PRGNAM=seafile +VERSION=${VERSION:-6.2.5} 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 xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -71,6 +71,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sh autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -80,21 +81,20 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-python-bindings \ - --with-jemalloc \ - --disable-static \ + --enable-client \ + --enable-static=no \ --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.txt README.markdown $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +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/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/seafile/seafile.info b/network/seafile/seafile.info new file mode 100644 index 0000000000..85067fd4fe --- /dev/null +++ b/network/seafile/seafile.info @@ -0,0 +1,10 @@ +PRGNAM="seafile" +VERSION="6.2.5" +HOMEPAGE="https://seafile.com" +DOWNLOAD="https://github.com/haiwen/seafile/archive/v6.2.5/seafile-6.2.5.tar.gz" +MD5SUM="220790c24a8cb1ff88bacc03e4e87976" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="ccnet libevhtp" +MAINTAINER="Marcel Saegebarth" +EMAIL="marc@mos6581.de" diff --git a/network/nghttp2/slack-desc b/network/seafile/slack-desc index a1d218da43..cad22d1bb6 100644 --- a/network/nghttp2/slack-desc +++ b/network/seafile/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -nghttp2: nghttp2 (HTTP/2 implementation) -nghttp2: -nghttp2: nghttp2 is an implementation of HTTP/2 and its header compression -nghttp2: algorithm HPACK in C. -nghttp2: The framing layer of HTTP/2 is implemented as a form of reusable C -nghttp2: library. -nghttp2: -nghttp2: Homepage: https://nghttp2.org/ -nghttp2: -nghttp2: -nghttp2: +seafile: seafile (Cloud Storage System) +seafile: +seafile: Seafile is a next-generation open source cloud storage system with +seafile: advanced support for file syncing, privacy protection and teamwork. +seafile: +seafile: Homepage: http://seafile.com/ +seafile: +seafile: +seafile: +seafile: +seafile: diff --git a/network/socat/README b/network/socat/README deleted file mode 100644 index 828012f25b..0000000000 --- a/network/socat/README +++ /dev/null @@ -1,12 +0,0 @@ -socat is a relay for bidirectional data transfer between two -independent data channels. Each of these data channels may be a file, -pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX, -IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection, -a file descriptor (stdin etc.), the GNU line editor (readline), -a program, or a combination of two of these. These modes include -generation of "listening" sockets, named pipes, and pseudo terminals. - -socat can use the OpenSSL FIPS module, if it is installed on your system. - -Upon install, you may want to read the SECURITY file in the documentation -directory. diff --git a/network/socat/slack-desc b/network/socat/slack-desc deleted file mode 100644 index b0e75054c5..0000000000 --- a/network/socat/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------------------------------------------------------| -socat: socat (multipurpose data relay) -socat: -socat: socat is a relay for bidirectional data transfer between two -socat: independent data channels. Each of these data channels may be a file, -socat: pipe, device (serial line etc. or a pseudo terminal), a socket (UNIX, -socat: IP4, IP6 - raw, UDP, TCP), an SSL socket, proxy CONNECT connection, -socat: a file descriptor (stdin etc.), the GNU line editor (readline), -socat: a program, or a combination of two of these. These modes include -socat: generation of "listening" sockets, named pipes, and pseudo terminals. -socat: -socat: Homepage: http://www.dest-unreach.org/socat diff --git a/network/socat/socat.SlackBuild b/network/socat/socat.SlackBuild deleted file mode 100644 index eddb6935dc..0000000000 --- a/network/socat/socat.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# Slackware build script for socat - -# Copyright 2009 Andrew Psaltis <ampsaltis@gmail.com> -# Copyright 2011 Grigorios Bouzakis <grbzks@imap.cc> -# Copyright 2014-2019 Larry Hajali <larryhaja[at]gmail[dot]com> -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for any purpose -# with or without fee is hereby granted, provided that the above copyright -# notice and this permission notice appear in all copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=socat -VERSION=${VERSION:-1.7.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.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - BUGREPORTS CHANGES COPYING* DEVELOPMENT EXAMPLES FAQ PORTING \ - README* SECURITY doc/*.{css,html} \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/socat/socat.info b/network/socat/socat.info deleted file mode 100644 index 08d3a5222e..0000000000 --- a/network/socat/socat.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="socat" -VERSION="1.7.3.3" -HOMEPAGE="http://www.dest-unreach.org/socat" -DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.3.3.tar.bz2" -MD5SUM="b2a032a47b8b89a18485697fa975154f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Larry Hajali" -EMAIL="larryhaja[at]gmail[dot]com" diff --git a/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild index 6561b22050..a006bfc9db 100644 --- a/network/spice-gtk/spice-gtk.SlackBuild +++ b/network/spice-gtk/spice-gtk.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh # Slackware build script for spice-gtk -# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org> Pisa, Italy + +# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org> Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spice-gtk -VERSION=${VERSION:-0.35} +VERSION=${VERSION:-0.37} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,7 +59,7 @@ if pkg-config --exists libusbredirhost; then usbredir="en"; else usbredir="dis"; if pkg-config --exists libcacard; then cacard="en"; else cacard="dis"; fi if pkg-config --exists libphodav-2.0; then phodav="en"; else phodav="dis"; fi -DOCS="AUTHORS COPYING NEWS README THANKS TODO" +DOCS="AUTHORS CHANGELOG.md COPYING README.md" set -e diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info index e17de616e8..4bb1378921 100644 --- a/network/spice-gtk/spice-gtk.info +++ b/network/spice-gtk/spice-gtk.info @@ -1,8 +1,8 @@ PRGNAM="spice-gtk" -VERSION="0.35" +VERSION="0.37" HOMEPAGE="https://www.spice-space.org" -DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.35.tar.bz2" -MD5SUM="a8c919ee4a48dfeab619deb70900d788" +DOWNLOAD="https://www.spice-space.org/download/gtk/spice-gtk-0.37.tar.bz2" +MD5SUM="f1554a2442817109d2bdc37d30336208" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opus spice vala" diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild index e887c96ddf..566a495b55 100644 --- a/network/spice/spice.SlackBuild +++ b/network/spice/spice.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spice -VERSION=${VERSION:-0.14.1} +VERSION=${VERSION:-0.14.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/spice/spice.info b/network/spice/spice.info index 04a4e89706..62370277dd 100644 --- a/network/spice/spice.info +++ b/network/spice/spice.info @@ -1,8 +1,8 @@ PRGNAM="spice" -VERSION="0.14.1" +VERSION="0.14.2" HOMEPAGE="https://www.spice-space.org" -DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.14.1.tar.bz2" -MD5SUM="1e2442b08605a5a17430d1aaa0912c24" +DOWNLOAD="https://www.spice-space.org/download/releases/spice-server/spice-0.14.2.tar.bz2" +MD5SUM="7ca431580b662e7c3cb8021983a3d387" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="opus pyparsing six spice-protocol" diff --git a/network/sqlrelay/sqlrelay.SlackBuild b/network/sqlrelay/sqlrelay.SlackBuild index aa56ae3355..434b548bdb 100644 --- a/network/sqlrelay/sqlrelay.SlackBuild +++ b/network/sqlrelay/sqlrelay.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sqlrelay -VERSION=${VERSION:-0.65.0} +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +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" diff --git a/network/sqlrelay/sqlrelay.info b/network/sqlrelay/sqlrelay.info index 99177781f8..260729b0fe 100644 --- a/network/sqlrelay/sqlrelay.info +++ b/network/sqlrelay/sqlrelay.info @@ -1,8 +1,8 @@ PRGNAM="sqlrelay" -VERSION="0.65.0" +VERSION="1.1.0" HOMEPAGE="http://sqlrelay.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-0.65.0.tar.gz" -MD5SUM="231cc46bc32f6c05dc372c2f04cdcd02" +DOWNLOAD="http://downloads.sourceforge.net/sqlrelay/sqlrelay-1.1.0.tar.gz" +MD5SUM="be726dd405aef7d5530fd22c0c146f98" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="rudiments" 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/sshfs-fuse/README b/network/sshfs-fuse/README deleted file mode 100644 index 4b484d5915..0000000000 --- a/network/sshfs-fuse/README +++ /dev/null @@ -1,12 +0,0 @@ -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, -the implementation makes use of the FUSE (Filesystem in Userspace) -kernel module. - -The practical effect of this is that the end user can seamlessly interact -with remote files being securely served over SSH just as if they were -local files on his/her computer. On the remote computer the SFTP subsystem -of SSH is used. diff --git a/network/sshfs-fuse/slack-desc b/network/sshfs-fuse/slack-desc deleted file mode 100644 index 7e342f6fac..0000000000 --- a/network/sshfs-fuse/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------------------------------------------------------| -sshfs-fuse: sshfs-fuse (ssh file system module for FUSE) -sshfs-fuse: -sshfs-fuse: This is a filesystem client based on the SSH File Transfer -sshfs-fuse: Protocol. Since most SSH servers already support this protocol it -sshfs-fuse: is very easy to set up: i.e. on the server side there's nothing -sshfs-fuse: to do. On the client side mounting the filesystem is as easy as -sshfs-fuse: logging into the server with ssh. -sshfs-fuse: -sshfs-fuse: -sshfs-fuse: -sshfs-fuse: diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild deleted file mode 100644 index 57cb03c150..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh - -# 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 -# 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. - -# Now maintained by B. Watson <yalhcru@gmail.com> - -# 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:-3.7.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ - \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ - -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 .. - -# 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 - -# 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* README* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info deleted file mode 100644 index fd6101a05a..0000000000 --- a/network/sshfs-fuse/sshfs-fuse.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="sshfs-fuse" -VERSION="3.7.0" -HOMEPAGE="https://github.com/libfuse/sshfs" -DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.7.0/sshfs-3.7.0.tar.xz" -MD5SUM="0a1414bfad323d9f3d7aaccdec671e06" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -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 differdeleted file mode 100644 index 182444d7a1..0000000000 --- a/network/sshfs-fuse/sshfs.1.gz +++ /dev/null diff --git a/network/synergy/030_openssl.diff b/network/synergy/030_openssl.diff new file mode 100644 index 0000000000..9aefa07d7d --- /dev/null +++ b/network/synergy/030_openssl.diff @@ -0,0 +1,11 @@ +--- src/lib/net/SecureSocket.cpp.orig 2020-05-06 17:55:18.744800427 -0500 ++++ src/lib/net/SecureSocket.cpp 2020-05-06 17:55:05.529584786 -0500 +@@ -807,7 +807,7 @@ + + // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release + // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead +- STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; ++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl); + if (cStack == NULL) { + LOG((CLOG_DEBUG1 "remote cipher list not available")); + } diff --git a/network/synergy/synergy.SlackBuild b/network/synergy/synergy.SlackBuild index 21d6a34f49..5dba4659ae 100644 --- a/network/synergy/synergy.SlackBuild +++ b/network/synergy/synergy.SlackBuild @@ -68,6 +68,7 @@ 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 +patch -p0 < $CWD/030_openssl.diff chown -R root:root . find -L . \ diff --git a/network/tor/rc.tor b/network/tor/rc.tor index 11daf8a95a..53ab0ed110 100644 --- a/network/tor/rc.tor +++ b/network/tor/rc.tor @@ -34,6 +34,8 @@ else fi tor_start() { + mkdir -p /var/run/tor + chown tor.tor /var/run/tor if [ -n "$MAX_FILEDESCRIPTORS" ]; then echo -n "Raising maximum number of filedescriptors (ulimit -n) to $MAX_FILEDESCRIPTORS" if ulimit -n "$MAX_FILEDESCRIPTORS" ; then diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild index f0d9d64035..910dbd409f 100644 --- a/network/vde2/vde2.SlackBuild +++ b/network/vde2/vde2.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch to build against openssl-1.1.x - thanks archlinux! +patch -p1 < $CWD/vde_cryptcab-compile-against-openssl-1.1.0.patch + EXPERIMENTAL=${EXPERIMENTAL:-false} OPTIONS="" diff --git a/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch new file mode 100644 index 0000000000..227312eabb --- /dev/null +++ b/network/vde2/vde_cryptcab-compile-against-openssl-1.1.0.patch @@ -0,0 +1,92 @@ +--- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000 ++++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000 +@@ -22,7 +22,7 @@ + exit(1); + } + +-static EVP_CIPHER_CTX ctx; ++static EVP_CIPHER_CTX *ctx; + static int ctx_initialized = 0; + static int encryption_disabled = 0; + static int nfd; +@@ -30,6 +30,10 @@ + static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700}; + static int verbose = 0; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x) ++#endif ++ + void vc_printlog(int priority, const char *format, ...) + { + va_list arg; +@@ -103,19 +107,21 @@ + } + + if (!ctx_initialized) { +- EVP_CIPHER_CTX_init (&ctx); ++ ctx = EVP_CIPHER_CTX_new (); ++ if (!ctx) ++ return -1; + ctx_initialized = 1; + } + +- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); +- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1) ++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1) + { + fprintf (stderr,"error in encrypt update\n"); + olen = -1; + goto cleanup; + } + +- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1) ++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1) + { + fprintf (stderr,"error in encrypt final\n"); + olen = -1; +@@ -124,7 +130,7 @@ + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_reset(ctx); + return olen; + } + +@@ -138,19 +144,21 @@ + } + + if (!ctx_initialized) { +- EVP_CIPHER_CTX_init (&ctx); ++ ctx = EVP_CIPHER_CTX_new (); ++ if (!ctx) ++ return -1; + ctx_initialized = 1; + } + +- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); +- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1) ++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1) + { + fprintf (stderr,"error in decrypt update\n"); + olen = -1; + goto cleanup; + } + +- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1) ++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1) + { + fprintf (stderr,"error in decrypt final\n"); + olen = -1; +@@ -159,7 +167,7 @@ + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_reset (ctx); + return olen; + } + diff --git a/network/verlihub/verlihub-gcc7.patch b/network/verlihub/verlihub-gcc7.patch new file mode 100644 index 0000000000..4b2ede4d42 --- /dev/null +++ b/network/verlihub/verlihub-gcc7.patch @@ -0,0 +1,18 @@ +diff -Naur verlihub-0.9.8e-r2.orig/src/script_api.cpp verlihub-0.9.8e-r2/src/script_api.cpp +--- verlihub-0.9.8e-r2.orig/src/script_api.cpp 2009-05-16 16:42:07.000000000 +0200 ++++ verlihub-0.9.8e-r2/src/script_api.cpp 2017-06-01 20:33:58.923440440 +0200 +@@ -218,12 +218,12 @@ + cServerDC *server = GetCurrentVerlihub(); + if(!server) { + cerr << "Server verlihub is unfortunately not running or not found." << endl; +- return false; ++ return NULL; + } + cUser *usr = GetUser((char *) server->mC.hub_security.c_str()); + printf("%p\n", usr); + printf("%p", usr->mxConn); +- if ((!usr) || (usr && !usr->mxConn)) return false; ++ if ((!usr) || (usr && !usr->mxConn)) return NULL; + cout << "here" << endl; + if (!server->mP.ParseForCommands(command_line, usr->mxConn)) { + // unknown command diff --git a/network/verlihub/verlihub.SlackBuild b/network/verlihub/verlihub.SlackBuild index 25c0729a42..e9d5f550c4 100644 --- a/network/verlihub/verlihub.SlackBuild +++ b/network/verlihub/verlihub.SlackBuild @@ -71,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# https://gcc.gnu.org/gcc-7/porting_to.html +patch -p1 < $CWD/verlihub-gcc7.patch + patch -p1 < $CWD/verlihub-header.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/network/x11spice/README b/network/x11spice/README new file mode 100644 index 0000000000..a273afe9a7 --- /dev/null +++ b/network/x11spice/README @@ -0,0 +1,16 @@ +x11spice connects a running X server as a Spice server. + +It owes a debt to the excellent x11vnc project, from the libvncserver +project. That project proved that this could be done, and done well. +Some of the logic, notably that of scan.c, was inspired by the code +in x11vnc. + +Example: launch a spice server on a remote pc (where x11spice is +installed) via ssh, redirect the output locally and connect to it with +spicy + + ssh $remote_host -L 5900:localhost:5900 "x11spice --allow-control --display :0 --password=whatever" + +and then locally + + spicy -h localhost -p 5900 diff --git a/network/x11spice/slack-desc b/network/x11spice/slack-desc new file mode 100644 index 0000000000..af47ca2f35 --- /dev/null +++ b/network/x11spice/slack-desc @@ -0,0 +1,11 @@ +x11spice: x11spice (export X via spice) +x11spice: +x11spice: x11spice connects a running X server as a Spice server. +x11spice: +x11spice: It owes a debt to the excellent x11vnc project, from the libvncserver +x11spice: project. That project proved that this could be done, and done well. +x11spice: Some of the logic, notably that of scan.c, was inspired by the code +x11spice: in x11vnc. +x11spice: +x11spice: homepage: https://gitlab.freedesktop.org/spice/x11spice +x11spice: diff --git a/network/krb5/krb5.SlackBuild b/network/x11spice/x11spice.SlackBuild index cce13e060f..5e984c8a70 100644 --- a/network/krb5/krb5.SlackBuild +++ b/network/x11spice/x11spice.SlackBuild @@ -1,9 +1,8 @@ #!/bin/sh -# Slackware build script for krb5 +# Slackware build script for x11spice -# Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA -# Copyright 2015-2020 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2018-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +22,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=krb5 -VERSION=${VERSION:-1.18.2} -BUILD=${BUILD:-2} +PRGNAM=x11spice +VERSION=${VERSION:-20190820_51d2a8b} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -55,35 +54,34 @@ else LIBDIRSUFFIX="" fi +DOCS="AUTHORS COPYING ChangeLog NEWS README" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -sed -i "/KRB5ROOT=/s/\/local//" src/util/ac_check_krb5.m4 +autoreconf -vi -cd src CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -CPPFLAGS+=" -I/usr/include/et" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --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 \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux make @@ -92,25 +90,15 @@ 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 -# Add init scripts -mkdir -p $PKG/etc/rc.d -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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $CWD/README $CWD/README.krb5 $CWD/EXPORT $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG/usr/doc -find $PKG/usr/doc -type f -exec chmod 0644 {} \; 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/x11spice/x11spice.info b/network/x11spice/x11spice.info new file mode 100644 index 0000000000..9d4d29bd7d --- /dev/null +++ b/network/x11spice/x11spice.info @@ -0,0 +1,10 @@ +PRGNAM="x11spice" +VERSION="20190820_51d2a8b" +HOMEPAGE="https://gitlab.freedesktop.org/spice/x11spice" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/x11spice-20190820_51d2a8b.tar.xz" +MD5SUM="ad1d8aea83a15a1e9130f347186fd4ef" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="spice" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/x2goserver/x2goserver.SlackBuild b/network/x2goserver/x2goserver.SlackBuild index ba82397547..be73d470eb 100644 --- a/network/x2goserver/x2goserver.SlackBuild +++ b/network/x2goserver/x2goserver.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=x2goserver -VERSION=${VERSION:-20190625_b3ec119} +VERSION=${VERSION:-20200228_c218264} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/x2goserver/x2goserver.info b/network/x2goserver/x2goserver.info index 9e20cd4df2..b15dfb3825 100644 --- a/network/x2goserver/x2goserver.info +++ b/network/x2goserver/x2goserver.info @@ -1,8 +1,8 @@ PRGNAM="x2goserver" -VERSION="20190625_b3ec119" +VERSION="20200228_c218264" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20190625_b3ec119.tar.xz" -MD5SUM="031e3d92dfd06f22de3052360c524367" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/x2goserver-20200228_c218264.tar.xz" +MD5SUM="e86b39106780f53a154d82520a60e024" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="nx-libs perl-Config-Simple perl-File-ReadBackwards perl-DBD-SQLite perl-Capture-Tiny perl-Try-Tiny perl-Unix-Syslog perl-file-basedir perl-Switch" diff --git a/network/zeek/zeek.SlackBuild b/network/zeek/zeek.SlackBuild index ccdf4107b9..83103239a5 100644 --- a/network/zeek/zeek.SlackBuild +++ b/network/zeek/zeek.SlackBuild @@ -69,11 +69,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +LIBS="-L/usr/lib$LIBDIRSUFFIX/openssl-1.0" \ +CPPFLAGS="/usr/include/openssl-1.0" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/opt/$PRGNAM +# Temporary fix until openssl-1.1 is supported +sed -i "s/^OPENSSL_CRYPTO_LIBRARY.*/OPENSSL_CRYPTO_LIBRARY:FILEPATH=\/usr\/lib$LIBDIRSUFFIX\/openssl-1.0\/libcrypto.so/" build/CMakeCache.txt +sed -i "s/^OPENSSL_INCLUDE_DIR.*/OPENSSL_INCLUDE_DIR:PATH=\/usr\/include\/openssl-1.0/" build/CMakeCache.txt +sed -i "s/^OPENSSL_SSL_LIBRARY.*/OPENSSL_SSL_LIBRARY:FILEPATH=\/usr\/lib$LIBDIRSUFFIX\/openssl-1.0\/libssl.so/" build/CMakeCache.txt + make make install DESTDIR=$PKG |