- update to latest upstream 2.6.STABLE12
- Resolves: #233913: squid: unowned directory
This commit is contained in:
Martin Bacovsky
parent
00167f858d
commit
6af29dd185
@ -1 +1 @@
|
||||
squid-2.6.STABLE9.tar.bz2
|
||||
squid-2.6.STABLE12.tar.bz2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
95997d6cb38fdb562ecb790c553f9cfc squid-2.6.STABLE9.tar.bz2
|
||||
a830ccc95cb39cdfa5e5b773add0bb0d squid-2.6.STABLE12.tar.bz2
|
||||
|
||||
59
squid.spec
59
squid.spec
@ -2,19 +2,20 @@
|
||||
%define __perl_requires %{SOURCE98}
|
||||
## % define __find_requires %{SOURCE99}
|
||||
|
||||
Summary: The Squid proxy caching server.
|
||||
Name: squid
|
||||
Version: 2.6.STABLE9
|
||||
Release: 1%{?dist}
|
||||
Epoch: 7
|
||||
License: GPL
|
||||
Group: System Environment/Daemons
|
||||
Source: http://www.squid-cache.org/Squid/Versions/v2/2.5/squid-%{version}.tar.bz2
|
||||
Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
|
||||
Source2: squid.init
|
||||
Source3: squid.logrotate
|
||||
Source4: squid.sysconfig
|
||||
Source5: squid.pam
|
||||
Summary: The Squid proxy caching server
|
||||
Name: squid
|
||||
Version: 2.6.STABLE12
|
||||
Release: 1%{?dist}
|
||||
Epoch: 7
|
||||
License: GPL
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.squid-cache.org
|
||||
Source: http://www.squid-cache.org/Squid/Versions/v2/2.6/squid-%{version}.tar.bz2
|
||||
Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
|
||||
Source2: squid.init
|
||||
Source3: squid.logrotate
|
||||
Source4: squid.sysconfig
|
||||
Source5: squid.pam
|
||||
Source98: perl-requires-squid.sh
|
||||
## Source99: filter-requires-squid.sh
|
||||
|
||||
@ -161,7 +162,7 @@ rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%defattr(-,root,root,-)
|
||||
%doc faq/* README ChangeLog QUICKSTART doc/*
|
||||
%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
|
||||
|
||||
@ -181,11 +182,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%config(noreplace) /etc/sysconfig/squid
|
||||
%config(noreplace) /etc/squid/msntauth.conf
|
||||
%config(noreplace) /etc/squid/mib.txt
|
||||
/etc/squid/msntauth.conf.default
|
||||
/etc/squid/squid.conf.default
|
||||
/etc/squid/mime.conf.default
|
||||
%config /etc/squid/msntauth.conf.default
|
||||
%config /etc/squid/squid.conf.default
|
||||
%config /etc/squid/mime.conf.default
|
||||
|
||||
%config(noreplace) /etc/squid/errors
|
||||
%dir %{_datadir}/squid
|
||||
%config(noreplace) %{_datadir}/squid/errors
|
||||
%config(noreplace) /etc/squid/icons
|
||||
%config(noreplace) /etc/rc.d/init.d/squid
|
||||
@ -320,11 +322,18 @@ if [ "$1" -ge "1" ] ; then
|
||||
fi
|
||||
|
||||
%triggerin -- samba-common
|
||||
/usr/sbin/usermod -a -G winbind squid >/dev/null 2>&1 || \
|
||||
/usr/sbin/usermod -a -G wbpriv squid >/dev/null 2>&1 || \
|
||||
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
|
||||
|
||||
%changelog
|
||||
* Mon Jan 29 2007 Martin Bacovsky <mbacovsk@redhat.com> - 7:2.6.STABLE9-1.fc7
|
||||
* Tue Mar 27 2007 Martin Bacovsky <mbacovsk@redhat.com> - 7:2.6.STABLE12-1
|
||||
- update to latest upstream 2.6.STABLE12
|
||||
- Resolves: #233913: squid: unowned directory
|
||||
|
||||
* Mon Feb 19 2007 Martin Bacovsky <mbacovsk@redhat.com> - 7:2.6.STABLE9-2
|
||||
- Resolves: #226431: Merge Review: squid
|
||||
|
||||
* Mon Jan 29 2007 Martin Bacovsky <mbacovsk@redhat.com> - 7:2.6.STABLE9-1
|
||||
- update to the latest upstream
|
||||
|
||||
* Sun Jan 14 2007 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE7-1
|
||||
@ -577,7 +586,7 @@ fi
|
||||
so we shouldn't.
|
||||
- Remove the problematic triggerpostun trigger, since is's broken, and FC2
|
||||
never shipped with that old version.
|
||||
- add %{?_smp_mflags} to make line.
|
||||
- add %%{?_smp_mflags} to make line.
|
||||
|
||||
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
@ -586,7 +595,7 @@ fi
|
||||
- Use ':' instead of '.' as separator for chown.
|
||||
|
||||
* Fri Feb 20 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE4-3
|
||||
- Clean up the spec file to work on 64-bit platforms (use %{_libdir}
|
||||
- Clean up the spec file to work on 64-bit platforms (use %%{_libdir}
|
||||
instead of /usr/lib, etc)
|
||||
- Make the release number in the changelog section agree with reality.
|
||||
- use -fPIE rather than -fpie. s390 fails with just -fpie
|
||||
@ -698,7 +707,7 @@ fi
|
||||
* Fri Mar 2 2001 Nalin Dahyabhai <nalin@redhat.com>
|
||||
- rebuild in new environment
|
||||
|
||||
* Tue Feb 6 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
* Tue Feb 6 2001 Trond Eivind Glomsrød <teg@redhat.com>
|
||||
- improve i18n
|
||||
- make the initscript use the standard OK/FAILED
|
||||
|
||||
@ -776,7 +785,7 @@ fi
|
||||
- buildprereq jade, sgmltools
|
||||
|
||||
* Sun Mar 26 2000 Florian La Roche <Florian.LaRoche@redhat.com>
|
||||
- make %pre more portable
|
||||
- make %%pre more portable
|
||||
|
||||
* Thu Mar 16 2000 Bill Nottingham <notting@redhat.com>
|
||||
- bugfix patches
|
||||
@ -865,10 +874,10 @@ fi
|
||||
- add a serial number
|
||||
|
||||
* Tue Mar 30 1999 Bill Nottingham <notting@redhat.com>
|
||||
- add an adduser in %pre, too
|
||||
- add an adduser in %%pre, too
|
||||
|
||||
* Thu Mar 25 1999 Bill Nottingham <notting@redhat.com>
|
||||
- oog. chkconfig must be in %preun, not %postun
|
||||
- oog. chkconfig must be in %%preun, not %%postun
|
||||
|
||||
* Wed Mar 24 1999 Bill Nottingham <notting@redhat.com>
|
||||
- switch to using group squid
|
||||
|
||||
Loading…
Reference in New Issue
Block a user