From 22c3736755d7cf033731d7ac59d4c6a471122230 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Jul 07 2005 10:52:58 +0000
Subject: - new upstream version

- enabled fakeauth utility (#154020)
- enabled digest authentication scheme (#155882)
- all error pages marked as config (#127836)
- patch for 64bit statvfs interface (#153274)
- added httpd config file for cachemgr.cgi (#112725)

---

diff --git a/.cvsignore b/.cvsignore
index a4ad31f..418ac1a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 squid-2.5.STABLE9.tar.bz2
+squid-2.5.STABLE10.tar.bz2
diff --git a/sources b/sources
index 8dcbaac..f916a5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a34a303dcab8851c7ab20e24af69b61  squid-2.5.STABLE9.tar.bz2
+e6db8bdfc783b3baed7de803c9a39e55  squid-2.5.STABLE10.tar.bz2
diff --git a/squid.spec b/squid.spec
index 9155453..a9576a5 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.5.STABLE9
-Release: 7
+Version: 2.5.STABLE10
+Release: 1
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,49 +19,7 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-setcookie.patch
-Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ftp_EPLF.patch
-Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ftp_base_href.patch
-Patch103: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-acl_error.patch
-Patch104: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-date.patch
-Patch105: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-reload_into_ims.patch
-Patch106: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-delay_access_doc.patch
-Patch107: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-config_overflow.patch
-Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-bzero.patch
-Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-pid_t.patch
-Patch110: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ctype.patch
-Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-defer_digest_fetch.patch
-Patch112: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dup_content_length.patch
-Patch113: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-excess_data.patch
-Patch114: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs.patch
-Patch115: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-long_basic_auth.patch
-Patch116: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-CONNECT_truncated.patch
-Patch117: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-LDAP_SUN_SDK.patch
-Patch118: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-disable_hostname_checks.patch
-Patch119: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs_shutdown.patch
-Patch120: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-2GB.patch
-Patch121: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-rename_cleanup.patch
-Patch122: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-cachemgr_objects.patch
-Patch123: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-extaclauth.patch
-Patch124: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-syslog.patch
-Patch125: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-errpage_user.patch
-Patch126: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-debug_newlines.patch
-Patch127: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-transparent_port.patch
-Patch128: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-squid_k_nohostname.patch
-Patch129: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-config_CRLF.patch
-Patch130: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-forwardcc.patch
-Patch131: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-authinfo.patch
-Patch132: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-chroot_pidfile.patch
-Patch133: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-cachemgr_conf.patch
-Patch134: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs_improvement.patch
-Patch135: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9_2GB-hot_cache.patch
-Patch136: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-diskd.patch
-Patch137: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-snmp.patch
-Patch138: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-arpacl.patch
-Patch139: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dstdomain_ip.patch
-Patch140: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dns_query-5.patch
-Patch141: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-2GB_assert.patch
-Patch142: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-always_direct_documentation.patch
+
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -71,7 +29,8 @@ Patch202: squid-2.5.STABLE4-location.patch
 Patch203: squid-2.5.STABLE7-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE5-pipe.patch
-Patch206: squid-2.5.STABLE9-libbind.patch
+Patch206: squid-2.5.STABLE10-libbind.patch
+Patch207: squid-2.5.STABLE10-64bit.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -94,56 +53,13 @@ lookup program (dnsserver), a program for retrieving FTP data
 %prep
 %setup -q
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch121 -p1
-%patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch128 -p1
-%patch129 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
-%patch134 -p1
-%patch135 -p1
-%patch136 -p1
-%patch137 -p1
-%patch138 -p1
-%patch139 -p1
-%patch140 -p1
-%patch141 -p1
-%patch142 -p1
-
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .pipe
 %patch206 -p1 -b .libbind
+%patch207 -p1 -b .statvfs
 
 %build
  export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
@@ -162,9 +78,10 @@ lookup program (dnsserver), a program for retrieving FTP data
    --enable-delay-pools \
    --enable-linux-netfilter \
    --with-pthreads \
-   --enable-ntlm-auth-helpers="SMB,winbind" \
+   --enable-ntlm-auth-helpers="SMB,winbind,fakeauth" \
    --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group,winbind_group" \
-   --enable-auth="basic,ntlm" \
+   --enable-auth="basic,digest,ntlm" \
+   --enable-digest-auth-helpers="password" \
    --with-winbind-auth-challenge \
    --enable-useragent-log \
    --enable-referer-log \
@@ -194,6 +111,22 @@ rm -rf $RPM_BUILD_ROOT
 	bindir=$RPM_BUILD_ROOT/%{_sbindir} \
 	libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
 
+echo "
+#
+# This is /etc/httpd/conf.d/squid.conf
+#
+
+ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
+
+# Only allow access from localhost by default
+<Location /Squid/cgi-bin/cachemgr.cgi>
+ order allow,deny
+ allow from localhost.localdomain
+ # Add additional allowed hosts as needed
+ # allow from .example.com
+</Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
+
+
 ln -s %{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
 ln -s %{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
 
@@ -201,15 +134,18 @@ mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
+install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf
 mkdir -p $RPM_BUILD_ROOT/var/log/squid
 mkdir -p $RPM_BUILD_ROOT/var/spool/squid
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
+rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -224,6 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
 %attr(644,root,root) /etc/pam.d/squid
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/cachemgr.conf
 %config(noreplace) /etc/squid/mime.conf
@@ -233,9 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/squid/msntauth.conf.default
 /etc/squid/squid.conf.default
 /etc/squid/mime.conf.default
-%config(noreplace) /etc/squid/errors
 
-%{_datadir}/squid
+%config(noreplace) %{_datadir}/squid/errors
+%{_datadir}/squid/icons
 %{_sbindir}/squid
 %{_sbindir}/squidclient
 %config(noreplace) /etc/squid/icons
@@ -364,6 +301,14 @@ fi
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Fri Jul 7 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE10-1
+- new upstream version
+- enabled fakeauth utility (#154020)
+- enabled digest authentication scheme (#155882)
+- all error pages marked as config (#127836)
+- patch for 64bit statvfs interface (#153274)
+- added httpd config file for cachemgr.cgi (#112725)
+
 * Mon May 16 2005 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE9-7
 - Upgrade the upstream -dns_query patch from -4 to -5