wok-next diff squid/receipt @ rev 20762

Add leanify
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Jun 05 17:27:09 2018 +0300 (2018-06-05)
parents 757d032c55c7
children d5aab818505e
line diff
     1.1 --- a/squid/receipt	Fri Mar 30 19:31:50 2018 +0300
     1.2 +++ b/squid/receipt	Tue Jun 05 17:27:09 2018 +0300
     1.3 @@ -43,49 +43,50 @@
     1.4  		--enable-icap-client \
     1.5  		--with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \
     1.6  		$CONFIGURE_ARGS &&
     1.7 +	fix libtool &&
     1.8  	make $MAKEFLAGS &&
     1.9  	make install
    1.10  }
    1.11  
    1.12  genpkg_rules() {
    1.13  	case $PACKAGE in
    1.14 -	squid)
    1.15 -		CONFIG_FILES="/etc/squid"
    1.16 -		DEPENDS="libsasl libldap openssl libltdl"
    1.17 -		SUGGESTED="iptables"
    1.18 -		mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid \
    1.19 -			$fs/var/log/squid $fs/usr/lib/squid $fs/etc/squid/conf.d
    1.20 -	
    1.21 -		touch $fs/var/log/squid/cache.log
    1.22 -	
    1.23 -		cp -a $install/etc $fs
    1.24 -		rm -rf $fs/etc/squid/*.default
    1.25 -		cp -a $stuff/etc $fs
    1.26 -	
    1.27 -		cp -a $install/var $fs
    1.28 -		cp -a $install/usr/bin $fs/usr
    1.29 -		cp -a $install/usr/sbin $fs/usr
    1.30 -		cp -a $install/usr/lib/squid/* $fs/usr/lib/squid
    1.31 -	
    1.32 -		# Remove auth libs
    1.33 -		rm -f $fs/usr/lib/squid/*_auth*
    1.34 -	
    1.35 -		cp -a $install/usr/share/squid/mib.txt $fs/usr/share/squid
    1.36 -		cp -a $install/usr/share/squid/icons $fs/usr/share/squid
    1.37 -		cp -a $install/usr/share/squid/errors/templates $fs/usr/share/squid/errors
    1.38 -		cp -a $install/usr/share/squid/errors/en* $fs/usr/share/squid/errors
    1.39 -		cp -a $install/usr/share/squid/errors/fr* $fs/usr/share/squid/errors
    1.40 -	
    1.41 -		sed -i \
    1.42 -			-e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
    1.43 -			-e 's|^#cache_dir ufs /var/cache 100|cache_dir ufs /var/cache/squid 256|' \
    1.44 -			-e 's|^#pid_filename /var/logs|pid_filename /var/run/squid.pid|' \
    1.45 -			-e "s|^coredump_dir.*|coredump_dir /var/cache/squid|" \
    1.46 -			-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
    1.47 -			-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
    1.48 -				$fs/etc/squid/squid.conf
    1.49 -		
    1.50 -		cat <<EOF>>$fs/etc/squid/squid.conf
    1.51 +		squid)
    1.52 +			CONFIG_FILES="/etc/squid"
    1.53 +			DEPENDS="libsasl libldap openssl libltdl"
    1.54 +			SUGGESTED="iptables"
    1.55 +			mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid \
    1.56 +				$fs/var/log/squid $fs/usr/lib/squid $fs/etc/squid/conf.d
    1.57 +
    1.58 +			touch $fs/var/log/squid/cache.log
    1.59 +
    1.60 +			cp -a $install/etc $fs
    1.61 +			rm -rf $fs/etc/squid/*.default
    1.62 +			cp -a $stuff/etc $fs
    1.63 +
    1.64 +			cp -a $install/var $fs
    1.65 +			cp -a $install/usr/bin $fs/usr
    1.66 +			cp -a $install/usr/sbin $fs/usr
    1.67 +			cp -a $install/usr/lib/squid/* $fs/usr/lib/squid
    1.68 +
    1.69 +			# Remove auth libs
    1.70 +			rm -f $fs/usr/lib/squid/*_auth*
    1.71 +
    1.72 +			cp -a $install/usr/share/squid/mib.txt $fs/usr/share/squid
    1.73 +			cp -a $install/usr/share/squid/icons $fs/usr/share/squid
    1.74 +			cp -a $install/usr/share/squid/errors/templates $fs/usr/share/squid/errors
    1.75 +			cp -a $install/usr/share/squid/errors/en* $fs/usr/share/squid/errors
    1.76 +			cp -a $install/usr/share/squid/errors/fr* $fs/usr/share/squid/errors
    1.77 +
    1.78 +			sed \
    1.79 +				-e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
    1.80 +				-e 's|^#cache_dir ufs /var/cache 100|cache_dir ufs /var/cache/squid 256|' \
    1.81 +				-e 's|^#pid_filename /var/logs|pid_filename /var/run/squid.pid|' \
    1.82 +				-e "s|^coredump_dir.*|coredump_dir /var/cache/squid|" \
    1.83 +				-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
    1.84 +				-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
    1.85 +				-i $fs/etc/squid/squid.conf
    1.86 +
    1.87 +			cat <<EOF>>$fs/etc/squid/squid.conf
    1.88  	
    1.89  cache_effective_user squid
    1.90  cache_effective_group squid
    1.91 @@ -96,21 +97,21 @@
    1.92  
    1.93  include /etc/squid/conf.d/*.conf
    1.94  EOF
    1.95 -		;;
    1.96 -	squid-auth-helpers)
    1.97 -		CAT="network|Web/ftp proxy."
    1.98 -		DEPENDS="squid libldap libsasl openssl libkrb5 libcomerr3"
    1.99 -		mkdir -p $fs/usr/lib/squid
   1.100 -		cp -a $install/usr/lib/squid/*_auth* $fs/usr/lib/squid
   1.101 -		;;
   1.102 -	squid-langpack)
   1.103 -		CAT="network|Web/ftp proxy language pack."
   1.104 -		DEPENDS="squid"
   1.105 -		mkdir -p $fs/usr/share
   1.106 -		cp -a $install/usr/share/squid/errors $fs/usr/share
   1.107 -		rm -rf $fs/usr/share/squid/errors/en*
   1.108 -		rm -rf $fs/usr/share/squid/errors/fr*
   1.109 -		;;
   1.110 +			;;
   1.111 +		squid-auth-helpers)
   1.112 +			CAT="network|auth helpers"
   1.113 +			DEPENDS="squid libldap libsasl openssl libkrb5 libcomerr3"
   1.114 +			mkdir -p $fs/usr/lib/squid
   1.115 +			cp -a $install/usr/lib/squid/*_auth* $fs/usr/lib/squid
   1.116 +			;;
   1.117 +		squid-langpack)
   1.118 +			CAT="network|language pack"
   1.119 +			DEPENDS="squid"
   1.120 +			mkdir -p $fs/usr/share
   1.121 +			cp -a $install/usr/share/squid/errors $fs/usr/share
   1.122 +			rm -rf $fs/usr/share/squid/errors/en*
   1.123 +			rm -rf $fs/usr/share/squid/errors/fr*
   1.124 +			;;
   1.125  	esac
   1.126  }
   1.127