|
|
@@ -26,8 +26,7 @@
|
|
|
# package version
|
|
|
%define V_maj 2
|
|
|
%define V_min 5
|
|
|
-%define V_rev 6
|
|
|
-%define V_icap 20040913
|
|
|
+%define V_rev 7
|
|
|
|
|
|
# package information
|
|
|
Name: squid
|
|
|
@@ -40,36 +39,18 @@ Class: BASE
|
|
|
Group: Web
|
|
|
License: GPL
|
|
|
Version: %{V_maj}.%{V_min}.%{V_rev}
|
|
|
-Release: 20040913
|
|
|
+Release: 20041012
|
|
|
|
|
|
# package options
|
|
|
%option with_fsl yes
|
|
|
%option with_ssl no
|
|
|
%option with_snmp no
|
|
|
%option with_ntlm no
|
|
|
-%option with_icap no
|
|
|
|
|
|
# list of sources
|
|
|
Source0: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}.tar.gz
|
|
|
Source1: rc.squid
|
|
|
Source2: fsl.squid
|
|
|
-Patch0: ftp://ftp.openpkg.org/sources/CPY/squid/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-icap-%{V_icap}.patch
|
|
|
-Patch1: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-heap_segfault.patch
|
|
|
-Patch2: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-errorpage_quote.patch
|
|
|
-Patch3: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-ntlmtruncated.patch
|
|
|
-Patch4: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-client_db_gc.patch
|
|
|
-Patch5: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-active_requests_delaypool.patch
|
|
|
-Patch6: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-basic_auth_caseinsensitive.patch
|
|
|
-Patch7: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-ufs_create_error.patch
|
|
|
-Patch8: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-HEAD.patch
|
|
|
-Patch9: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-partial_hit_is_miss.patch
|
|
|
-Patch10: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-request_header_max_size.patch
|
|
|
-Patch11: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-concurrent_dns_lookups.patch
|
|
|
-Patch12: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-ldap_helpers.patch
|
|
|
-Patch13: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-ufs_no_valid_dir.patch
|
|
|
-Patch14: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-digest_crash.patch
|
|
|
-Patch15: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-ntlm_fetch_string.patch
|
|
|
-Patch16: http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-ntlm_noreuse_leak.patch
|
|
|
|
|
|
# build information
|
|
|
Prefix: %{l_prefix}
|
|
|
@@ -105,11 +86,6 @@ AutoReqProv: no
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n squid-%{V_maj}.%{V_min}.STABLE%{V_rev}
|
|
|
- %patch -p1 -P 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
|
|
|
-%if "%{with_icap}" == "yes"
|
|
|
- %patch -p0 -P 0
|
|
|
- find . -name "*.orig" -print | xargs rm -f
|
|
|
-%endif
|
|
|
%if "%{with_ntlm}" == "yes"
|
|
|
%{l_shtool} subst \
|
|
|
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
|
|
|
@@ -140,9 +116,6 @@ AutoReqProv: no
|
|
|
%if "%{with_snmp}" == "yes"
|
|
|
--enable-snmp \
|
|
|
%endif
|
|
|
-%if "%{with_icap}" == "yes"
|
|
|
- --enable-icap-support \
|
|
|
-%endif
|
|
|
%if "%{with_ntlm}" == "yes"
|
|
|
--enable-auth="ntlm basic digest" \
|
|
|
--enable-external-acl-helpers="wbinfo_group" \
|
