wok rev 10793

squid: use --with-logdir=, install errors templates, touch cache.log and chown -R in post_install (Thanks for the report Allan)
author Christophe Lincoln <pankso@slitaz.org>
date Thu Jun 02 17:33:12 2011 +0200 (2011-06-02)
parents 54ff302c0222
children eee1f5c39887
files squid/receipt
line diff
     1.1 --- a/squid/receipt	Thu Jun 02 04:26:35 2011 +0200
     1.2 +++ b/squid/receipt	Thu Jun 02 17:33:12 2011 +0200
     1.3 @@ -10,61 +10,67 @@
     1.4  WGET_URL="${WEB_SITE}Versions/v3/3.1/$TARBALL"
     1.5  CONFIG_FILES="/etc/squid"
     1.6  DEPENDS="libsasl libldap libssl libltdl"
     1.7 -BUILD_DEPENDS="perl openssl-dev libldap openldap-dev cyrus-sasl cyrus-sasl-dev"
     1.8 +BUILD_DEPENDS="perl openssl-dev openldap-dev cyrus-sasl-dev"
     1.9  SUGGESTED="iptables"
    1.10  
    1.11  # Rules to configure and make the package.
    1.12  compile_rules()
    1.13  {
    1.14  	cd $src
    1.15 -	./configure --prefix=/usr \
    1.16 -	--infodir=/usr/share/info \
    1.17 -	--sysconfdir=/etc/squid \
    1.18 -	--datadir=/usr/share/squid \
    1.19 -	--libexecdir=/usr/lib/squid \
    1.20 -	--localstatedir=/var \
    1.21 -    --disable-poll \
    1.22 -    --disable-snmp \
    1.23 -    --disable-icmp \
    1.24 -    --enable-http-violations \
    1.25 -    --disable-ident-lookups \
    1.26 -    --enable-storeio="aufs,diskd,ufs" \
    1.27 -    --enable-ssl \
    1.28 -	--enable-underscores \
    1.29 -    --enable-ntlm-fail-open \
    1.30 -    --enable-removal-policies="heap,lru" \
    1.31 -    --enable-delay-pools \
    1.32 -    --enable-linux-netfilter \
    1.33 -    --enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP" \
    1.34 -    --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    1.35 -    --enable-useragent-log \
    1.36 -    --enable-referer-log \
    1.37 -    --with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \
    1.38 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    1.39 -	make -j 4 &&
    1.40 -	make DESTDIR=$PWD/_pkg install
    1.41 +	./configure \
    1.42 +		--prefix=/usr \
    1.43 +		--sysconfdir=/etc/squid \
    1.44 +		--datadir=/usr/share/squid \
    1.45 +		--libexecdir=/usr/lib/squid \
    1.46 +		--localstatedir=/var \
    1.47 +		--with-logdir=/var/log/squid \
    1.48 +		--disable-poll \
    1.49 +		--disable-snmp \
    1.50 +		--disable-icmp \
    1.51 +		--enable-http-violations \
    1.52 +		--disable-ident-lookups \
    1.53 +		--enable-storeio="aufs,diskd,ufs" \
    1.54 +		--enable-ssl \
    1.55 +		--enable-underscores \
    1.56 +		--enable-ntlm-fail-open \
    1.57 +		--enable-removal-policies="heap,lru" \
    1.58 +		--enable-delay-pools \
    1.59 +		--enable-linux-netfilter \
    1.60 +		--enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP" \
    1.61 +		--enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
    1.62 +		--enable-useragent-log \
    1.63 +		--enable-referer-log \
    1.64 +		--with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \
    1.65 +		$CONFIGURE_ARGS &&
    1.66 +	make -j 4 && make install
    1.67  }
    1.68  
    1.69  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.70  genpkg_rules()
    1.71  {
    1.72  	mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid $fs/var/log/squid \
    1.73 -	 $fs/usr/lib/squid
    1.74 -	 
    1.75 +		$fs/usr/lib/squid
    1.76 +	
    1.77 +	touch $fs/var/log/squid/cache.log
    1.78 +	
    1.79  	cp -a $_pkg/etc $fs
    1.80  	rm -rf $fs/etc/squid/*.default
    1.81 -	cp -a stuff/etc $fs
    1.82 +	cp -a $stuff/etc $fs
    1.83 +	
    1.84  	cp -a $_pkg/var $fs
    1.85  	cp -a $_pkg/usr/bin $fs/usr
    1.86  	cp -a $_pkg/usr/sbin $fs/usr
    1.87  	cp -a $_pkg/usr/lib/squid/*kd $fs/usr/lib/squid
    1.88  	cp -a $_pkg/usr/lib/squid/*.cgi $fs/usr/lib/squid
    1.89 +	
    1.90  	cp -a $_pkg/usr/share/squid/mib.txt $fs/usr/share/squid
    1.91  	cp -a $_pkg/usr/share/squid/icons $fs/usr/share/squid
    1.92 +	cp -a $_pkg/usr/share/squid/errors/templates $fs/usr/share/squid/errors
    1.93  	cp -a $_pkg/usr/share/squid/errors/en* $fs/usr/share/squid/errors
    1.94  	cp -a $_pkg/usr/share/squid/errors/fr* $fs/usr/share/squid/errors
    1.95 -	rm -f $fs/etc/*conf*
    1.96 -	sed -i -e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
    1.97 +	
    1.98 +	sed -i \
    1.99 +		-e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
   1.100  		-e 's|^access_log /var/logs|access_log /var/log/squid|' \
   1.101  		-e 's|^# cache_store_log /var/logs|cache_store_log /var/cache/squid|' \
   1.102  		-e 's|^# cache_log /var/logs|cache_log /var/cache/squid|' \
   1.103 @@ -80,7 +86,7 @@
   1.104  {
   1.105  	local root
   1.106  	root=$1
   1.107 -	chown nobody.nogroup $root/var/cache/squid $root/var/log/squid
   1.108 +	chown -R nobody.nogroup $root/var/cache/squid $root/var/log/squid
   1.109  	cat <<EOF
   1.110  ----
   1.111  To start $PACKAGE server you can run :