auto-import squid-2.5.STABLE3-0 from squid-2.5.STABLE3-0.src.rpm

.cvsignore

@@ -1 +1 @@
-squid-2.5.STABLE1.tar.gz
+squid-2.5.STABLE3.tar.bz2

sources

@@ -1 +1 @@
-cd26774cd917842a689fee5f76c8d752  squid-2.5.STABLE1.tar.gz
+ed5eb7835d00fdecc7dd7c1837542df2  squid-2.5.STABLE3.tar.bz2

squid.spec

@@ -1,61 +1,33 @@
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.5.STABLE1
+Version: 2.5.STABLE3
-Release: 3.9
+Release: 0
-Epoch: 7
+Serial: 7
 License: GPL
 Group: System Environment/Daemons
-Source: http://www.squid-cache.org/Squid/v2/squid-%{version}.tar.gz
+Source: http://www.squid-cache.org/Squid/v2/squid-%{version}.tar.bz2
 Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
 Source2: squid.init
 Source3: squid.logrotate
 Source4: squid.sysconfig
-Patch1: squid-2.5-config.patch
+Patch1: squid-2.5.STABLE3-config.patch
 Patch2: squid-perlpath.patch
 Patch3: squid-location.patch
-Patch4: squid-2.5-build.patch
+Patch4: squid-2.5.STABLE3-build.patch
-Patch5: squid-2.5.STABLE4-00.patch
+#Patch5: squid-2.4.STABLE7-fdoverride.patch
-Patch6: squid-2.5.STABLE4-urllogin_acl.patch
 
 # Official upstream patches
-Patch100: squid-2.5.STABLE1-ldap_group.patch
+Patch100: squid-2.5.STABLE3-Lithuanian.patch
-Patch101: squid-2.5.STABLE1-relnote11.patch
+Patch101: squid-2.5.STABLE3-deny_info.patch
-Patch102: squid-2.5.STABLE1-aufs_reentrant.patch
+Patch102: squid-2.5.STABLE3-HttpHeaderTools.patch
-Patch103: squid-2.5.STABLE1-chroot.patch
+Patch103: squid-2.5.STABLE3-external_acl_ident.patch
-Patch104: squid-2.5.STABLE1-S.patch
+Patch104: squid-2.5.STABLE3-aufs-openingfds.patch
-Patch105: squid-2.5.STABLE1-offline_mode.patch
+Patch105: squid-2.5.STABLE3-gcc-3_3.patch
-Patch106: squid-2.5.STABLE1-rebuild_assert.patch
-Patch107: squid-2.5.STABLE1-RunCache.patch
-Patch108: squid-2.5.STABLE1-aufs_performance.patch
-Patch109: squid-2.5.STABLE1-ldap_group-compile.patch
-Patch110: squid-2.5.STABLE1-flags_open.patch
-Patch111: squid-2.5.STABLE1-spaces.patch
-Patch112: squid-2.5.STABLE1-dnsserver.patch
-Patch113: squid-2.5.STABLE1-auth-proxy.patch
-Patch114: squid-2.5.STABLE1-cachemgr.patch
-Patch115: squid-2.5.STABLE1-uninstall.patch
-Patch116: squid-2.5.STABLE1-ext_acl_exit.patch
-Patch117: squid-2.5.STABLE1-request_entity.patch
-Patch118: squid-2.5.STABLE1-ext_acl_comma.patch
-Patch119: squid-2.5.STABLE1-acl_leak.patch
-Patch120: squid-2.5.STABLE1-aufs.patch
-Patch121: squid-2.5.STABLE1-memstat.patch
-Patch122: squid-2.5.STABLE1-wccp.patch
-Patch123: squid-2.5.STABLE1-strwordtok.patch
-Patch124: squid-2.5.STABLE1-pthreads.patch
-Patch126: squid-2.5.STABLE1-ldap_auth.patch
-Patch127: squid-2.5.STABLE1-referer_log.patch
-Patch128: squid-2.5.STABLE1-load_icons.patch
-Patch129: squid-2.5.STABLE1-cache_dir_docs.patch
-Patch130: squid-2.5.STABLE1-max_user_ip.patch
-Patch131: squid-2.5.STABLE1-proxy_auth.patch
-Patch132: squid-2.5.STABLE1-disable-http-violations.patch
-Patch133: squid-2.5.STABLE1-disable-ident-lookups.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
 Requires: bash >= 2.0
-BuildPrereq: openjade sgml-tools openldap-devel pam-devel
+BuildPrereq: openjade linuxdoc-tools openldap-devel pam-devel
 Obsoletes: squid-novm
 
 %description
@@ -76,8 +48,7 @@ lookup program (dnsserver), a program for retrieving FTP data
 #%patch2 -p1 -b .perlpath
 %patch3 -p1 -b .location
 %patch4 -p1 -b .build
-%patch5 -p1 -b .00
+#%patch5 -p1 -b .prefdoverride
-%patch6 -p1 -b .urllogin_acl
 
 %patch100 -p1
 %patch101 -p1
@@ -85,49 +56,35 @@ lookup program (dnsserver), a program for retrieving FTP data
 %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
-%patch126 -p1
-%patch127 -p1
-%patch128 -p1
-%patch129 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
 
 
 %build
+# export CFLAGS=-fpie ; export LDFLAGS=-pie ; 
 %configure \
-   --exec_prefix=/usr --bindir=/usr/sbin --libexecdir=/usr/lib/squid \
+   --exec_prefix=/usr \
-   --localstatedir=/var --sysconfdir=/etc/squid \
+   --bindir=/usr/sbin \
-   --enable-poll --enable-snmp --enable-removal-policies="heap,lru" \
+   --libexecdir=/usr/lib/squid \
-   --enable-storeio="aufs,coss,diskd,ufs" --enable-ssl \
+   --localstatedir=/var \
+   --sysconfdir=/etc/squid \
+   --enable-poll \
+   --enable-snmp \
+   --enable-removal-policies="heap,lru" \
+   --enable-storeio="aufs,coss,diskd,null,ufs" \
+   --enable-ssl \
    --with-openssl=/usr/kerberos \
-   --enable-delay-pools --enable-linux-netfilter \
+   --enable-delay-pools \
+   --enable-linux-netfilter \
    --with-pthreads \
    --enable-basic-auth-helpers="LDAP,NCSA,PAM,SMB,SASL,MSNT"  \
    --enable-ntlm-auth-helpers="SMB,winbind" \
    --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group,winbind_group" \
-   # --enable-icmp
+   --enable-auth="basic,ntlm" \
-   
+   --with-winbind-auth-challenge \
+   --enable-useragent-log \
+   --enable-referer-log \
+   # --enable-icmp \
+
+#export CFLAGS=-fpie ; export LDFLAGS=-pie ;
 make
 
 mkdir faq
@@ -309,10 +266,20 @@ if [ "$1" -ge "1" ] ; then
 fi
 
 %changelog
-* Tue Mar 9 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE1-3.9
+* Mon Jun 30 2003 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE3-0
-- Backport patch for %00 vulnerability
+- Spec file change to enable the nul storage module. bugzilla #74654
-- Backport patch to support the new urllogin acl type so squid can
+- Upgrade to 2.5STABLE3 with current official patches.
-  be configured to protect vulnerable Microsoft Internet Explorer users.
+- Added --enable-auth="basic,ntlm": closes bugzilla #90145
+- Added --with-winbind-auth-challenge: closes bugzilla #78691
+- Added --enable-useragent-log and --enable-referer-log, closes
+- bugzilla #91884
+# - Changed configure line to enable pie
+# (Disabled due to broken compilers on ia64 build machines)
+#- Patched to increase the maximum number of file descriptors #72896
+#- (disabled for now--needs more testing)
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
 
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt