SliTaz Repositories

     1.1 --- a/squid-auth-helpers/receipt	Fri Jul 22 11:21:36 2022 +0000
     1.2 +++ b/squid-auth-helpers/receipt	Fri Jul 22 17:10:45 2022 +0100
     1.3 @@ -1,21 +1,21 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="squid-auth-helpers"
     1.7 -VERSION="3.4.2"
     1.8 +VERSION="5.6"
     1.9  CATEGORY="network"
    1.10 -SHORT_DESC="Web/ftp proxy."
    1.11 +SHORT_DESC="The Squid proxy caching server."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14  WEB_SITE="http://www.squid-cache.org/"
    1.15 +
    1.16 +DEPENDS="libcomerr3 libcrypto libkrb5 libldap libsasl libssl squid"
    1.17  WANTED="squid"
    1.18  
    1.19 -DEPENDS="squid libldap libsasl libssl libcrypto libkrb5 libcomerr3"
    1.20 -
    1.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.22  genpkg_rules()
    1.23  {
    1.24  	mkdir -p $fs/usr/lib/squid
    1.25  
    1.26 -	cp -a $install/usr/lib/squid/*_auth* $fs/usr/lib/squid
    1.27 +	cp -a $install/usr/lib/squid/*_auth*	$fs/usr/lib/squid
    1.28  }
    1.29  

     2.1 --- a/squid-langpack/receipt	Fri Jul 22 11:21:36 2022 +0000
     2.2 +++ b/squid-langpack/receipt	Fri Jul 22 17:10:45 2022 +0100
     2.3 @@ -1,22 +1,22 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="squid-langpack"
     2.7 -VERSION="3.4.2"
     2.8 +VERSION="5.6"
     2.9  CATEGORY="network"
    2.10 -SHORT_DESC="Web/ftp proxy language pack."
    2.11 +SHORT_DESC="The Squid proxy caching server - language pack."
    2.12  MAINTAINER="pascal.bellard@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14  WEB_SITE="http://www.squid-cache.org/"
    2.15 -WANTED="squid"
    2.16  
    2.17  DEPENDS="squid"
    2.18 +WANTED="squid"
    2.19  
    2.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.21  genpkg_rules()
    2.22  {
    2.23  	mkdir -p $fs/usr/share
    2.24 -	cp -a $install/usr/share/squid/errors $fs/usr/share
    2.25 -	rm -rf $fs/usr/share/squid/errors/en*
    2.26 -	rm -rf $fs/usr/share/squid/errors/fr*
    2.27 +
    2.28 +	cp -a $install/usr/share/squid/errors	$fs/usr/share
    2.29 +	rm -rf					$fs/usr/share/squid/errors/en*
    2.30 +	rm -rf					$fs/usr/share/squid/errors/fr*
    2.31  }
    2.32 -

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/squid/description.txt	Fri Jul 22 17:10:45 2022 +0100
     3.3 @@ -0,0 +1,6 @@
     3.4 +Squid is a caching proxy for the Web supporting HTTP, HTTPS,
     3.5 +FTP, and more.
     3.6 +It reduces bandwidth and improves response times by caching
     3.7 +and reusing frequently-requested web pages.
     3.8 +Squid has extensive access controls and makes a great server
     3.9 +accelerator.

     4.1 --- a/squid/receipt	Fri Jul 22 11:21:36 2022 +0000
     4.2 +++ b/squid/receipt	Fri Jul 22 17:10:45 2022 +0100
     4.3 @@ -1,20 +1,23 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="squid"
     4.7 -VERSION="3.4.2"
     4.8 +VERSION="5.6"
     4.9  CATEGORY="network"
    4.10 -SHORT_DESC="Web/ftp proxy."
    4.11 +SHORT_DESC="The Squid proxy caching server."
    4.12  MAINTAINER="pascal.bellard@slitaz.org"
    4.13  LICENSE="GPL2"
    4.14 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    4.15  WEB_SITE="http://www.squid-cache.org/"
    4.16 -WGET_URL="${WEB_SITE}Versions/v3/${VERSION%.*}/$TARBALL"
    4.17 +
    4.18 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    4.19 +WGET_URL="${WEB_SITE}Versions/v${VERSION%.*}/$TARBALL"
    4.20 +
    4.21 +SUGGESTED="iptables"
    4.22 +DEPENDS="expat gcc83-lib-base gnutls libldap libltdl libsasl libssl libxml2"
    4.23 +BUILD_DEPENDS="cyrus-sasl-dev expat-dev gcc83 gnutls-dev libcap-dev libdb
    4.24 +	libxml2-dev openssl-dev openldap-dev perl"
    4.25 +
    4.26  CONFIG_FILES="/etc/squid"
    4.27  
    4.28 -DEPENDS="libsasl libldap libssl libltdl"
    4.29 -BUILD_DEPENDS="perl openssl-dev openldap-dev cyrus-sasl-dev libcap-dev libdb"
    4.30 -SUGGESTED="iptables"
    4.31 -
    4.32  current_version()
    4.33  {
    4.34  	wget -O - $WEB_SITE/Versions 2>/dev/null | \
    4.35 @@ -24,62 +27,70 @@
    4.36  # Rules to configure and make the package.
    4.37  compile_rules()
    4.38  {
    4.39 -	./configure \
    4.40 -		--prefix=/usr \
    4.41 -		--sysconfdir=/etc/squid \
    4.42 -		--datadir=/usr/share/squid \
    4.43 -		--libexecdir=/usr/lib/squid \
    4.44 -		--localstatedir=/var \
    4.45 -		--with-logdir=/var/log/squid \
    4.46 -		--disable-poll \
    4.47 -		--disable-snmp \
    4.48 -		--disable-icmp \
    4.49 -		--enable-http-violations \
    4.50 -		--disable-ident-lookups \
    4.51 -		--enable-storeio="aufs,diskd,ufs" \
    4.52 -		--enable-ssl \
    4.53 -		--enable-ssl-crtd \
    4.54 -		--enable-underscores \
    4.55 -		--enable-ntlm-fail-open \
    4.56 -		--enable-removal-policies="heap,lru" \
    4.57 -		--enable-delay-pools \
    4.58 -		--enable-linux-netfilter \
    4.59 +	./configure					\
    4.60 +		CC=gcc-83				\
    4.61 +		CXX=g++-83				\
    4.62 +		--prefix=/usr				\
    4.63 +		--sysconfdir=/etc/squid			\
    4.64 +		--datadir=/usr/share/squid		\
    4.65 +		--libexecdir=/usr/lib/squid		\
    4.66 +		--localstatedir=/var			\
    4.67 +		--with-logdir=/var/log/squid		\
    4.68 +		--disable-icmp				\
    4.69 +		--disable-ident-lookups			\
    4.70 +		--disable-poll				\
    4.71 +		--disable-snmp				\
    4.72  		--enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP" \
    4.73 +		--enable-delay-pools			\
    4.74 +		--enable-http-violations		\
    4.75 +		--enable-icap-client			\
    4.76 +		--enable-linux-netfilter		\
    4.77  		--enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    4.78 -		--enable-useragent-log \
    4.79 -		--enable-referer-log \
    4.80 -		--enable-icap-client \
    4.81 +		--enable-ntlm-fail-open			\
    4.82 +		--enable-referer-log			\
    4.83 +		--enable-removal-policies="heap,lru"	\
    4.84 +		--enable-ssl				\
    4.85 +		--enable-ssl-crtd			\
    4.86 +		--enable-storeio="aufs,diskd,ufs"	\
    4.87 +		--enable-underscores			\
    4.88 +		--enable-useragent-log			\
    4.89  		--with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \
    4.90 +		--with-openssl				\
    4.91  		$CONFIGURE_ARGS &&
    4.92 -	make $MAKEFLAGS && make install
    4.93 +	make $MAKEFLAGS &&
    4.94 +	make install
    4.95  }
    4.96  
    4.97  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.98  genpkg_rules()
    4.99  {
   4.100 -	mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid $fs/var/log/squid \
   4.101 -		$fs/usr/lib/squid $fs/etc/squid/conf.d
   4.102 +	mkdir -p $fs/usr/share/squid/errors
   4.103 +	mkdir -p $fs/var/cache/squid
   4.104 +	mkdir -p $fs/var/log/squid
   4.105 +	mkdir -p $fs/usr/lib/squid
   4.106 +	mkdir -p $fs/etc/squid/conf.d
   4.107 +
   4.108 +	touch $fs/var/log/squid/cache.log
   4.109 +
   4.110 +	cp -a $install/etc		$fs
   4.111 +	rm -rf				$fs/etc/squid/*.default
   4.112 +	cp -a $stuff/etc		$fs
   4.113  	
   4.114 -	touch $fs/var/log/squid/cache.log
   4.115 -	
   4.116 -	cp -a $install/etc $fs
   4.117 -	rm -rf $fs/etc/squid/*.default
   4.118 -	cp -a $stuff/etc $fs
   4.119 -	
   4.120 -	cp -a $install/var $fs
   4.121 -	cp -a $install/usr/bin $fs/usr
   4.122 -	cp -a $install/usr/sbin $fs/usr
   4.123 -	cp -a $install/usr/lib/squid/* $fs/usr/lib/squid
   4.124 +	cp -a $install/var		$fs
   4.125 +	cp -a $install/usr/bin		$fs/usr
   4.126 +	cp -a $install/usr/sbin		$fs/usr
   4.127 +	cp -a $install/usr/lib/squid/*	$fs/usr/lib/squid
   4.128  	
   4.129  	# Remove auth libs
   4.130 -	rm -f $fs/usr/lib/squid/*_auth*
   4.131 +	rm -f				$fs/usr/lib/squid/*_auth*
   4.132  	
   4.133 -	cp -a $install/usr/share/squid/mib.txt $fs/usr/share/squid
   4.134 -	cp -a $install/usr/share/squid/icons $fs/usr/share/squid
   4.135 -	cp -a $install/usr/share/squid/errors/templates $fs/usr/share/squid/errors
   4.136 +	cp -a $install/usr/share/squid/mib.txt	$fs/usr/share/squid
   4.137 +	cp -a $install/usr/share/squid/icons	$fs/usr/share/squid
   4.138 +	cp -a $install/usr/share/squid/errors/templates \
   4.139 +						$fs/usr/share/squid/errors
   4.140  	cp -a $install/usr/share/squid/errors/en* $fs/usr/share/squid/errors
   4.141  	cp -a $install/usr/share/squid/errors/fr* $fs/usr/share/squid/errors
   4.142 -	
   4.143 +
   4.144  	sed -i \
   4.145  		-e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
   4.146  		-e 's|^#cache_dir ufs /var/cache 100|cache_dir ufs /var/cache/squid 256|' \
   4.147 @@ -88,7 +99,7 @@
   4.148  		-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
   4.149  		-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
   4.150  		$fs/etc/squid/squid.conf
   4.151 -		
   4.152 +
   4.153  	cat <<EOF>>$fs/etc/squid/squid.conf
   4.154  	
   4.155  cache_effective_user squid
   4.156 @@ -111,7 +122,8 @@
   4.157  	user=squid
   4.158  	group=squid
   4.159  	
   4.160 -	if ! grep -q $user "$1/etc/passwd"; then
   4.161 +	if ! grep -q $user "$1/etc/passwd"
   4.162 +	  then
   4.163  		echo -n "Adding user/group $user..."
   4.164  		chroot "$1/" addgroup -S $group
   4.165  		chroot "$1/" adduser -S -D -H -G $group $user
   4.166 @@ -119,9 +131,9 @@
   4.167  	fi
   4.168  	
   4.169  
   4.170 -	# Set perms for files and directories
   4.171 -	chroot "$1/" chown -R ${user}.${group} /var/log/squid \
   4.172 -		/var/cache/squid 
   4.173 +	# Set permissions for files and directories
   4.174 +	chroot "$1/" chown -R ${user}.${group}	/var/log/squid
   4.175 +	chroot "$1/" chown -R ${user}.${group}	/var/cache/squid 
   4.176  
   4.177  	cat <<EOF
   4.178  ----
   4.179 @@ -138,10 +150,13 @@
   4.180  post_remove()
   4.181  {
   4.182  	echo "Removing stalled files..."
   4.183 -	test -d /var/cache/squid && rm -rf /var/cache/squid
   4.184 -	test -d /var/log/squid && rm -rf /var/log/squid
   4.185 -	test -d /usr/share/squid && rm -rf /usr/share/squid
   4.186 +	test -d /var/cache/squid &&
   4.187 +	rm -rf /var/cache/squid
   4.188 +	test -d /var/log/squid &&
   4.189 +	rm -rf /var/log/squid
   4.190 +	test -d /usr/share/squid &&
   4.191 +	rm -rf /usr/share/squid
   4.192  	
   4.193 -	echo "Removing user/group squid"
   4.194 +	echo "Removing user and group squid"
   4.195  	deluser squid
   4.196  }