# HG changeset patch # User Hans-G?nter Theisgen # Date 1658506245 -3600 # Node ID 6da7dbdbf74a4231d41de5fd2cef27a486b6e825 # Parent 7f7aa9a311bf253861610da0cdb5e1aca50c8b59 updated squid, squid-auth-helpers and squid-langpack (3.4.2 -> 5.6) diff -r 7f7aa9a311bf -r 6da7dbdbf74a squid-auth-helpers/receipt --- a/squid-auth-helpers/receipt Fri Jul 22 11:21:36 2022 +0000 +++ b/squid-auth-helpers/receipt Fri Jul 22 17:10:45 2022 +0100 @@ -1,21 +1,21 @@ # SliTaz package receipt. PACKAGE="squid-auth-helpers" -VERSION="3.4.2" +VERSION="5.6" CATEGORY="network" -SHORT_DESC="Web/ftp proxy." +SHORT_DESC="The Squid proxy caching server." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.squid-cache.org/" + +DEPENDS="libcomerr3 libcrypto libkrb5 libldap libsasl libssl squid" WANTED="squid" -DEPENDS="squid libldap libsasl libssl libcrypto libkrb5 libcomerr3" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib/squid - cp -a $install/usr/lib/squid/*_auth* $fs/usr/lib/squid + cp -a $install/usr/lib/squid/*_auth* $fs/usr/lib/squid } diff -r 7f7aa9a311bf -r 6da7dbdbf74a squid-langpack/receipt --- a/squid-langpack/receipt Fri Jul 22 11:21:36 2022 +0000 +++ b/squid-langpack/receipt Fri Jul 22 17:10:45 2022 +0100 @@ -1,22 +1,22 @@ # SliTaz package receipt. PACKAGE="squid-langpack" -VERSION="3.4.2" +VERSION="5.6" CATEGORY="network" -SHORT_DESC="Web/ftp proxy language pack." +SHORT_DESC="The Squid proxy caching server - language pack." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.squid-cache.org/" -WANTED="squid" DEPENDS="squid" +WANTED="squid" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share - cp -a $install/usr/share/squid/errors $fs/usr/share - rm -rf $fs/usr/share/squid/errors/en* - rm -rf $fs/usr/share/squid/errors/fr* + + cp -a $install/usr/share/squid/errors $fs/usr/share + rm -rf $fs/usr/share/squid/errors/en* + rm -rf $fs/usr/share/squid/errors/fr* } - diff -r 7f7aa9a311bf -r 6da7dbdbf74a squid/description.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/squid/description.txt Fri Jul 22 17:10:45 2022 +0100 @@ -0,0 +1,6 @@ +Squid is a caching proxy for the Web supporting HTTP, HTTPS, +FTP, and more. +It reduces bandwidth and improves response times by caching +and reusing frequently-requested web pages. +Squid has extensive access controls and makes a great server +accelerator. diff -r 7f7aa9a311bf -r 6da7dbdbf74a squid/receipt --- a/squid/receipt Fri Jul 22 11:21:36 2022 +0000 +++ b/squid/receipt Fri Jul 22 17:10:45 2022 +0100 @@ -1,20 +1,23 @@ # SliTaz package receipt. PACKAGE="squid" -VERSION="3.4.2" +VERSION="5.6" CATEGORY="network" -SHORT_DESC="Web/ftp proxy." +SHORT_DESC="The Squid proxy caching server." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.squid-cache.org/" -WGET_URL="${WEB_SITE}Versions/v3/${VERSION%.*}/$TARBALL" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="${WEB_SITE}Versions/v${VERSION%.*}/$TARBALL" + +SUGGESTED="iptables" +DEPENDS="expat gcc83-lib-base gnutls libldap libltdl libsasl libssl libxml2" +BUILD_DEPENDS="cyrus-sasl-dev expat-dev gcc83 gnutls-dev libcap-dev libdb + libxml2-dev openssl-dev openldap-dev perl" + CONFIG_FILES="/etc/squid" -DEPENDS="libsasl libldap libssl libltdl" -BUILD_DEPENDS="perl openssl-dev openldap-dev cyrus-sasl-dev libcap-dev libdb" -SUGGESTED="iptables" - current_version() { wget -O - $WEB_SITE/Versions 2>/dev/null | \ @@ -24,62 +27,70 @@ # Rules to configure and make the package. compile_rules() { - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/squid \ - --datadir=/usr/share/squid \ - --libexecdir=/usr/lib/squid \ - --localstatedir=/var \ - --with-logdir=/var/log/squid \ - --disable-poll \ - --disable-snmp \ - --disable-icmp \ - --enable-http-violations \ - --disable-ident-lookups \ - --enable-storeio="aufs,diskd,ufs" \ - --enable-ssl \ - --enable-ssl-crtd \ - --enable-underscores \ - --enable-ntlm-fail-open \ - --enable-removal-policies="heap,lru" \ - --enable-delay-pools \ - --enable-linux-netfilter \ + ./configure \ + CC=gcc-83 \ + CXX=g++-83 \ + --prefix=/usr \ + --sysconfdir=/etc/squid \ + --datadir=/usr/share/squid \ + --libexecdir=/usr/lib/squid \ + --localstatedir=/var \ + --with-logdir=/var/log/squid \ + --disable-icmp \ + --disable-ident-lookups \ + --disable-poll \ + --disable-snmp \ --enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP" \ + --enable-delay-pools \ + --enable-http-violations \ + --enable-icap-client \ + --enable-linux-netfilter \ --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \ - --enable-useragent-log \ - --enable-referer-log \ - --enable-icap-client \ + --enable-ntlm-fail-open \ + --enable-referer-log \ + --enable-removal-policies="heap,lru" \ + --enable-ssl \ + --enable-ssl-crtd \ + --enable-storeio="aufs,diskd,ufs" \ + --enable-underscores \ + --enable-useragent-log \ --with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \ + --with-openssl \ $CONFIGURE_ARGS && - make $MAKEFLAGS && make install + make $MAKEFLAGS && + make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid $fs/var/log/squid \ - $fs/usr/lib/squid $fs/etc/squid/conf.d + mkdir -p $fs/usr/share/squid/errors + mkdir -p $fs/var/cache/squid + mkdir -p $fs/var/log/squid + mkdir -p $fs/usr/lib/squid + mkdir -p $fs/etc/squid/conf.d + + touch $fs/var/log/squid/cache.log + + cp -a $install/etc $fs + rm -rf $fs/etc/squid/*.default + cp -a $stuff/etc $fs - touch $fs/var/log/squid/cache.log - - cp -a $install/etc $fs - rm -rf $fs/etc/squid/*.default - cp -a $stuff/etc $fs - - cp -a $install/var $fs - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/sbin $fs/usr - cp -a $install/usr/lib/squid/* $fs/usr/lib/squid + cp -a $install/var $fs + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/sbin $fs/usr + cp -a $install/usr/lib/squid/* $fs/usr/lib/squid # Remove auth libs - rm -f $fs/usr/lib/squid/*_auth* + rm -f $fs/usr/lib/squid/*_auth* - cp -a $install/usr/share/squid/mib.txt $fs/usr/share/squid - cp -a $install/usr/share/squid/icons $fs/usr/share/squid - cp -a $install/usr/share/squid/errors/templates $fs/usr/share/squid/errors + cp -a $install/usr/share/squid/mib.txt $fs/usr/share/squid + cp -a $install/usr/share/squid/icons $fs/usr/share/squid + cp -a $install/usr/share/squid/errors/templates \ + $fs/usr/share/squid/errors cp -a $install/usr/share/squid/errors/en* $fs/usr/share/squid/errors cp -a $install/usr/share/squid/errors/fr* $fs/usr/share/squid/errors - + sed -i \ -e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \ -e 's|^#cache_dir ufs /var/cache 100|cache_dir ufs /var/cache/squid 256|' \ @@ -88,7 +99,7 @@ -e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \ -e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \ $fs/etc/squid/squid.conf - + cat <>$fs/etc/squid/squid.conf cache_effective_user squid @@ -111,7 +122,8 @@ user=squid group=squid - if ! grep -q $user "$1/etc/passwd"; then + if ! grep -q $user "$1/etc/passwd" + then echo -n "Adding user/group $user..." chroot "$1/" addgroup -S $group chroot "$1/" adduser -S -D -H -G $group $user @@ -119,9 +131,9 @@ fi - # Set perms for files and directories - chroot "$1/" chown -R ${user}.${group} /var/log/squid \ - /var/cache/squid + # Set permissions for files and directories + chroot "$1/" chown -R ${user}.${group} /var/log/squid + chroot "$1/" chown -R ${user}.${group} /var/cache/squid cat <