last patch clean-up, new one from upstream

This commit is contained in:
Martin Stransky 2005-12-19 09:49:37 +00:00
parent 65d8690736
commit 732c128cc3

View File

@ -5,7 +5,7 @@
Summary: The Squid proxy caching server. Summary: The Squid proxy caching server.
Name: squid Name: squid
Version: 2.5.STABLE12 Version: 2.5.STABLE12
Release: 2.1 Release: 3
Epoch: 7 Epoch: 7
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -20,6 +20,7 @@ Source98: perl-requires-squid.sh
# Upstream patches # Upstream patches
Patch100: squid-2.5.STABLE12-setenv.patch Patch100: squid-2.5.STABLE12-setenv.patch
Patch101: squid-2.5.STABLE12-SMB_BadFetch.patch
# Local patches # Local patches
# Applying upstream patches first makes it less likely that local patches # Applying upstream patches first makes it less likely that local patches
@ -32,6 +33,7 @@ Patch205: squid-2.5.STABLE5-pipe.patch
Patch206: squid-2.5.STABLE12-libbind.patch Patch206: squid-2.5.STABLE12-libbind.patch
Patch207: squid-2.5.STABLE12-64bit.patch Patch207: squid-2.5.STABLE12-64bit.patch
Patch208: squid-2.5.STABLE12-fd-config.patch Patch208: squid-2.5.STABLE12-fd-config.patch
Patch209: squid-2.5.STABLE12-fd-config-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: /sbin/chkconfig logrotate shadow-utils Prereq: /sbin/chkconfig logrotate shadow-utils
@ -55,6 +57,7 @@ lookup program (dnsserver), a program for retrieving FTP data
%setup -q %setup -q
%patch100 -p1 %patch100 -p1
%patch101 -p1
%patch201 -p1 -b .config %patch201 -p1 -b .config
%patch202 -p1 -b .location %patch202 -p1 -b .location
@ -64,6 +67,7 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch206 -p1 -b .libbind %patch206 -p1 -b .libbind
%patch207 -p1 -b .stat %patch207 -p1 -b .stat
%patch208 -p1 -b .fdc %patch208 -p1 -b .fdc
%patch209 -p1 -b .fdc
%build %build
export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
@ -313,6 +317,10 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
%changelog %changelog
* Mon Dec 19 2005 Martin Stransky <stransky@redhat.com> 7:2.5.STABLE12-3
- fd-config.patch clean-up
- SMB_BadFetch patch from upstream
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com> * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt - rebuilt