added follow-xff patch (#176055)
This commit is contained in:
parent
732c128cc3
commit
531e71779f
20
squid.spec
20
squid.spec
@ -5,7 +5,7 @@
|
||||
Summary: The Squid proxy caching server.
|
||||
Name: squid
|
||||
Version: 2.5.STABLE12
|
||||
Release: 3
|
||||
Release: 4
|
||||
Epoch: 7
|
||||
License: GPL
|
||||
Group: System Environment/Daemons
|
||||
@ -22,6 +22,9 @@ Source98: perl-requires-squid.sh
|
||||
Patch100: squid-2.5.STABLE12-setenv.patch
|
||||
Patch101: squid-2.5.STABLE12-SMB_BadFetch.patch
|
||||
|
||||
# External patches
|
||||
Patch150: squid-2.5.STABLE12-follow-xff.patch
|
||||
|
||||
# Local patches
|
||||
# Applying upstream patches first makes it less likely that local patches
|
||||
# will break upstream ones.
|
||||
@ -59,6 +62,8 @@ lookup program (dnsserver), a program for retrieving FTP data
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
|
||||
%patch150 -p1 -b .follow-xff
|
||||
|
||||
%patch201 -p1 -b .config
|
||||
%patch202 -p1 -b .location
|
||||
%patch203 -p1 -b .build
|
||||
@ -102,6 +107,7 @@ lookup program (dnsserver), a program for retrieving FTP data
|
||||
--enable-ident-lookups \
|
||||
--with-large-files \
|
||||
--enable-fd-config \
|
||||
--enable-follow-x-forwarded-for \
|
||||
|
||||
export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
|
||||
make %{?_smp_mflags}
|
||||
@ -172,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%attr(644,root,root) /etc/pam.d/squid
|
||||
%attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
|
||||
%attr(4750,root,squid) %{_libdir}/squid/pam_auth
|
||||
|
||||
%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
|
||||
@ -185,14 +192,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%config(noreplace) /etc/squid/errors
|
||||
%config(noreplace) %{_datadir}/squid/errors
|
||||
%{_datadir}/squid/icons
|
||||
%{_sbindir}/squid
|
||||
%{_sbindir}/squidclient
|
||||
%config(noreplace) /etc/squid/icons
|
||||
%config(noreplace) /etc/rc.d/init.d/squid
|
||||
%config(noreplace) /etc/logrotate.d/squid
|
||||
%doc faq/* README ChangeLog QUICKSTART doc/*
|
||||
#%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
|
||||
%{_datadir}/squid/icons
|
||||
%{_sbindir}/squid
|
||||
%{_sbindir}/squidclient
|
||||
%{_mandir}/man8/*
|
||||
%{_libdir}/squid/*
|
||||
|
||||
@ -317,6 +322,9 @@ fi
|
||||
chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
|
||||
|
||||
%changelog
|
||||
* Wed Dec 28 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE12-4
|
||||
- added follow-xff patch (#176055)
|
||||
|
||||
* Mon Dec 19 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE12-3
|
||||
- fd-config.patch clean-up
|
||||
- SMB_BadFetch patch from upstream
|
||||
|
Loading…
Reference in New Issue
Block a user