# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1289198129 0
# Node ID 8a50526671d52c7f080db5a3bd80b5437608010b
# Parent  84c341d9a9bcddcfd8c27f3baea4eabb35357986
Up: squid to 3.1.9. Up: squid-custom-errors to 1.1.

diff -r 84c341d9a9bc -r 8a50526671d5 squid-auth-helpers/receipt
--- a/squid-auth-helpers/receipt	Mon Nov 08 05:39:24 2010 +0000
+++ b/squid-auth-helpers/receipt	Mon Nov 08 06:35:29 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="squid-auth-helpers"
-VERSION="3.0.STABLE25"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="Web/ftp proxy."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -10,8 +10,6 @@
 WANTED="squid"
 DEPENDS="squid libldap cyrus-sasl openssl libcrypto libkrb5 libcomerr3"
 
-
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r 84c341d9a9bc -r 8a50526671d5 squid-custom-errors/receipt
--- a/squid-custom-errors/receipt	Mon Nov 08 05:39:24 2010 +0000
+++ b/squid-custom-errors/receipt	Mon Nov 08 06:35:29 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="squid-custom-errors"
-VERSION="1.0"
+VERSION="1.1"
 CATEGORY="misc"
 SHORT_DESC="squid error messages customized fro SliTaz"
 MAINTAINER="erjo@oslitaz.org"
@@ -21,7 +21,7 @@
 	mkdir -p $fs/usr/share/squid/errors \
 		$fs/var/www
 		
-	cp -a $PACKAGE-$VERSION/French $fs/usr/share/squid/errors
+	cp -a $PACKAGE-$VERSION/fr $fs/usr/share/squid/errors
 	cp -a $PACKAGE-$VERSION/wwwroot/* $fs/var/www
 }
 
diff -r 84c341d9a9bc -r 8a50526671d5 squid-custom-errors/stuff/squid-custom-errors-1.0.tar.gz
Binary file squid-custom-errors/stuff/squid-custom-errors-1.0.tar.gz has changed
diff -r 84c341d9a9bc -r 8a50526671d5 squid-custom-errors/stuff/squid-custom-errors-1.1.tar.gz
Binary file squid-custom-errors/stuff/squid-custom-errors-1.1.tar.gz has changed
diff -r 84c341d9a9bc -r 8a50526671d5 squid-langpack/receipt
--- a/squid-langpack/receipt	Mon Nov 08 05:39:24 2010 +0000
+++ b/squid-langpack/receipt	Mon Nov 08 06:35:29 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="squid-langpack"
-VERSION="3.0.STABLE25"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="Web/ftp proxy language pack."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -14,7 +14,7 @@
 {
 	mkdir -p $fs/usr/share
 	cp -a $_pkg/usr/share/squid/errors $fs/usr/share
-	rm -rf $fs/usr/share/squid/errors/English
-	rm -rf $fs/usr/share/squid/errors/French
+	rm -rf $fs/usr/share/squid/errors/en*
+	rm -rf $fs/usr/share/squid/errors/fr*
 }
 
diff -r 84c341d9a9bc -r 8a50526671d5 squid/receipt
--- a/squid/receipt	Mon Nov 08 05:39:24 2010 +0000
+++ b/squid/receipt	Mon Nov 08 06:35:29 2010 +0000
@@ -1,13 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="squid"
-VERSION="3.0.STABLE25"
+VERSION="3.1.9"
 CATEGORY="network"
 SHORT_DESC="Web/ftp proxy."
 MAINTAINER="pascal.bellard@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.squid-cache.org/"
-WGET_URL="${WEB_SITE}Versions/v3/3.0/$TARBALL"
+WGET_URL="${WEB_SITE}Versions/v3/3.1/$TARBALL"
 CONFIG_FILES="/etc/squid"
 DEPENDS="cyrus-sasl libldap openssl"
 BUILD_DEPENDS="perl openssl-dev libldap openldap-dev cyrus-sasl cyrus-sasl-dev"
@@ -35,8 +35,8 @@
     --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-basic-auth-helpers="NCSA,SMB,MSNT,LDAP" \
+    --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
     --enable-useragent-log \
     --enable-referer-log \
     --with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \
@@ -61,8 +61,8 @@
 	cp -a $_pkg/usr/lib/squid/*.cgi $fs/usr/lib/squid
 	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
+	cp -a $_pkg/usr/share/squid/errors/en* $fs/usr/share/squid/errors
+	cp -a $_pkg/usr/share/squid/errors/fr* $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|' \
@@ -73,11 +73,6 @@
 		-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-*)
-	do
-		tazwok genpkg $i
-	done
 }
 
 # Pre and post install commands for Tazpkg.