# HG changeset patch # User Eric Joseph-Alexandre # Date 1236639498 -3600 # Node ID 782c0191b0aed8fd0cb4f60e5d29c6183d8ab1b3 # Parent 9e3903881e370e11f17514eb4e201a78ea761042 squid: Add auth support. Move squid stuff to /usr/share/squid diff -r 9e3903881e37 -r 782c0191b0ae squid/receipt --- a/squid/receipt Mon Mar 09 22:39:44 2009 +0100 +++ b/squid/receipt Mon Mar 09 23:58:18 2009 +0100 @@ -10,14 +10,35 @@ WGET_URL="${WEB_SITE}Versions/v3/3.0/$TARBALL" CONFIG_FILES="/etc/squid" #DEPENDS="iptables" -BUILD_DEPENDS="perl" +BUILD_DEPENDS="perl openssl-dev libldap openldap-dev cyrus-sasl cyrus-sasl-dev" # Rules to configure and make the package. compile_rules() { cd $src - ./configure --prefix=/usr --infodir=/usr/share/info \ - --sysconfdir=/etc/squid --localstatedir=/var \ + ./configure --prefix=/usr \ + --infodir=/usr/share/info \ + --sysconfdir=/etc/squid \ + --datadir=/usr/share/squid \ + --libexecdir=/usr/libexec/squid \ + --localstatedir=/var \ + --disable-poll \ + --disable-snmp \ + --disable-icmp \ + --disable-http-violations \ + --disable-ident-lookups \ + --enable-storeio="aufs,diskd,ufs" \ + --enable-ssl \ + --enable-underscores \ + --enable-ntlm-fail-open \ + --enable-removal-policies="heap,lru" \ + --enable-delay-pools \ + --enable-linux-netfilter \ + --enable-basic-auth-helpers="NCSA,SMB,MSNT LDAP" \ + --enable-ntlm-auth-helpers="SMB" \ + --enable-useragent-log \ + --enable-referer-log \ + --with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \ --mandir=/usr/share/man $CONFIGURE_ARGS && make && make DESTDIR=$PWD/_pkg install @@ -26,7 +47,7 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share/errors $fs/var/cache/squid $fs/var/log/squid + mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid $fs/var/log/squid cp -a $_pkg/etc $fs rm -rf $fs/etc/squid/*.default cp -a stuff/etc $fs @@ -34,10 +55,10 @@ cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/sbin $fs/usr cp -a $_pkg/usr/libexec $fs/usr - cp -a $_pkg/usr/share/mib.txt $fs/usr/share - cp -a $_pkg/usr/share/icons $fs/usr/share - cp -a $_pkg/usr/share/errors/English $fs/usr/share/errors - cp -a $_pkg/usr/share/errors/French $fs/usr/share/errors + cp -a $_pkg/usr/share/squid/mib.txt $fs/usr/share/squid + cp -a $_pkg/usr/share/squid/icons $fs/usr/share/squid + cp -a $_pkg/usr/share/squid/errors/English $fs/usr/share/squid/errors + cp -a $_pkg/usr/share/squid/errors/French $fs/usr/share/squid/errors rm -f $fs/etc/*conf* sed -i -e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \ -e 's|^access_log /var/logs|access_log /var/log/squid|' \ @@ -46,6 +67,7 @@ -e 's|^# cache_dir ufs /var/cache|cache_dir ufs /var/cache/squid|' \ -e 's|^# pid_filename /var/logs|pid_filename /var/run|' \ -e 's|^coredump_dir /var/logs|coredump_dir /var/cache/squid|' \ + -e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \ $fs/etc/squid/squid.conf # Package all squid pkgs for i in $(cd $WOK; ls -d squid-*) @@ -68,3 +90,11 @@ ---- EOF } + +post_remove() +{ + echo "Removing stalled files..." + test -d /var/cache/squid && rm -rf /var/cache/squid + test -d /var/log/squid && rm -rf /var/log/squid + test -d /usr/share/squid && rm -rf /usr/share/squid +}