diff --git a/.gitignore b/.gitignore index f983003..cdd53c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,49 +1,3 @@ -squid-3.1.5.tar.bz2 -squid-3.1.5.tar.bz2.asc -squid-3.1-10017.patch -squid-3.1-10018.patch -squid-3.1-10019.patch -squid-3.1-10021.patch -/squid-3.1.6.tar.bz2 -/squid-3.1.6.tar.bz2.asc -/squid-3.1.7.tar.bz2 -/squid-3.1.7.tar.bz2.asc -/squid-3.1.8.tar.bz2 -/squid-3.1.8.tar.bz2.asc -/squid-3.1.9.tar.bz2 -/squid-3.1.9.tar.bz2.asc -/squid-3.1.10.tar.bz2 -/squid-3.1.10.tar.bz2.asc -/squid-3.1.11.tar.bz2 -/squid-3.1.11.tar.bz2.asc -/squid-3.1.12.tar.bz2 -/squid-3.1.12.tar.bz2.asc -/squid-3.2.0.9-1.fc16.src.rpm -/squid-3.2.0.9.tar.bz2 -/squid-3.2.0.10.tar.bz2 -/squid-3.2.0.10.tar.bz2.asc -/squid-3.2.0.11.tar.bz2 -/squid-3.2.0.11.tar.bz2.asc -/squid-3.2.0.12.tar.bz2 -/squid-3.2.0.12.tar.bz2.asc -/squid-3.2.0.13.tar.bz2 -/squid-3.2.0.13.tar.bz2.asc -/squid-3.2.0.14.tar.bz2 -/squid-3.2.0.14.tar.bz2.asc -/squid-3.2-11480.patch -/squid-3.2-11494.patch -/squid-3.2-11496.patch -/squid-3.2.0.15.tar.bz2 -/squid-3.2.0.15.tar.bz2.asc -/squid-3.2.0.16.tar.bz2 -/squid-3.2.0.16.tar.bz2.asc -/squid-3.2.1.tar.bz2 -/squid-3.2.2.tar.bz2 -/squid-3.2.2.tar.bz2.asc -/squid-3.2.3.tar.bz2 -/squid-3.2.3.tar.bz2.asc -/squid-3.2.5.tar.bz2 -/squid-3.2.7.tar.bz2 -/squid-3.2.8.tar.bz2 -/squid-3.2.9.tar.bz2 -/squid-3.3.4.tar.bz2 +/*.asc +/*.xz +/squid-3.3-12542.patch diff --git a/sources b/sources index bd034d2..19655bf 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -0ef8e63a980389c62130fa639079fb54 squid-3.3.4.tar.bz2 +9b2b9a05e33c35e848ef0f50a67762da squid-3.3.4.tar.xz +3f38bfdf24565420f8fa5192d21ff48b squid-3.3.4.tar.xz.asc +dc20b7ea1e6cfb0bec1d7a5a172f298b squid-3.3-12542.patch diff --git a/squid-3.3.4-empty-pod2man.patch b/squid-3.3.4-empty-pod2man.patch new file mode 100644 index 0000000..cc5ce63 --- /dev/null +++ b/squid-3.3.4-empty-pod2man.patch @@ -0,0 +1,33 @@ +diff -up squid-3.3.4/helpers/basic_auth/DB/config.test~ squid-3.3.4/helpers/basic_auth/DB/config.test +--- squid-3.3.4/helpers/basic_auth/DB/config.test~ 2013-04-27 06:34:48.000000000 +0300 ++++ squid-3.3.4/helpers/basic_auth/DB/config.test 2013-05-08 15:24:08.234985038 +0300 +@@ -2,6 +2,6 @@ + + ## Test: do we have perl to build the helper scripts? + ## Test: do we have pod2man to build the manual? +-perl --version >/dev/null && echo | pod2man >/dev/null ++perl --version >/dev/null && echo =pod | pod2man >/dev/null + + exit $? +diff -up squid-3.3.4/helpers/external_acl/SQL_session/config.test~ squid-3.3.4/helpers/external_acl/SQL_session/config.test +--- squid-3.3.4/helpers/external_acl/SQL_session/config.test~ 2013-04-27 06:34:48.000000000 +0300 ++++ squid-3.3.4/helpers/external_acl/SQL_session/config.test 2013-05-08 15:23:49.237640257 +0300 +@@ -2,6 +2,6 @@ + + ## Test: do we have perl to build the helper scripts? + ## Test: do we have pod2man to build the manual? +-perl --version >/dev/null && echo | pod2man >/dev/null ++perl --version >/dev/null && echo =pod | pod2man >/dev/null + + exit $? +diff -up squid-3.3.4/helpers/log_daemon/DB/config.test~ squid-3.3.4/helpers/log_daemon/DB/config.test +--- squid-3.3.4/helpers/log_daemon/DB/config.test~ 2013-04-27 06:34:48.000000000 +0300 ++++ squid-3.3.4/helpers/log_daemon/DB/config.test 2013-05-08 15:23:26.402225335 +0300 +@@ -2,6 +2,6 @@ + + ## Test: do we have perl to build the helper scripts? + ## Test: do we have pod2man to build the manual? +-perl --version >/dev/null && echo | pod2man >/dev/null ++perl --version >/dev/null && echo =pod | pod2man >/dev/null + + exit $? diff --git a/squid.spec b/squid.spec index b8f88c5..f097104 100644 --- a/squid.spec +++ b/squid.spec @@ -4,15 +4,15 @@ Name: squid Version: 3.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code License: GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain) Group: System Environment/Daemons URL: http://www.squid-cache.org -Source0: http://www.squid-cache.org/Versions/v3/3.2/squid-%{version}.tar.bz2 -Source1: http://www.squid-cache.org/Versions/v3/3.2/squid-%{version}.tar.bz2.asc +Source0: http://www.squid-cache.org/Versions/v3/3.3/squid-%{version}.tar.xz +Source1: http://www.squid-cache.org/Versions/v3/3.3/squid-%{version}.tar.xz.asc Source2: squid.init Source3: squid.logrotate Source4: squid.sysconfig @@ -24,7 +24,7 @@ Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh # Upstream patches -#Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11480.patch +Patch001: http://www.squid-cache.org/Versions/v3/3.3/changesets/squid-3.3-12542.patch # Backported patches #Patch101: squid-3.2-mem_node.patch @@ -37,6 +37,7 @@ Patch202: squid-3.1.0.9-location.patch Patch203: squid-3.0.STABLE1-perlpath.patch Patch204: squid-3.2.0.9-fpic.patch Patch205: squid-3.1.9-ltdl.patch +Patch206: squid-3.3.4-empty-pod2man.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: bash >= 2.0 @@ -93,7 +94,7 @@ The squid-sysvinit contains SysV initscritps support. %setup -q # Upstream patches -#patch001 -p0 +%patch001 -p0 # Backported patches #patch101 -p1 -b .mem_node @@ -104,6 +105,7 @@ The squid-sysvinit contains SysV initscritps support. %patch203 -p1 -b .perlpath %patch204 -p1 -b .fpic %patch205 -p1 -b .ltdl +%patch206 -p1 -b .empty-pod2man %build %ifarch sparcv9 sparc64 s390 s390x @@ -307,6 +309,11 @@ fi /sbin/chkconfig --add squid >/dev/null 2>&1 || : %changelog +* Wed May 8 2013 Ville Skyttä - 7:3.3.4-2 +- Fix basic auth and log daemon DB helper builds. +- Use xz compressed tarball, fix source URLs. +- Fix bogus dates in %%changelog. + * Fri May 3 2013 Michal Luscon - 7:3.3.4-1 - Rebase to latest upstream version 3.3.4 @@ -446,10 +453,10 @@ fi * Wed May 18 2011 Jiri Skala - 7:3.1.12-3 - enabled eCAP support -* Thu May 04 2011 Jiri Skala - 7:3.1.12-2 +* Wed May 04 2011 Jiri Skala - 7:3.1.12-2 - applied corrections of unused patch (Ismail Dönmez) -* Thu Apr 15 2011 Jiri Skala - 7:3.1.12-1 +* Fri Apr 15 2011 Jiri Skala - 7:3.1.12-1 - Update to 3.1.12 upstream release * Thu Feb 10 2011 Jiri Skala - 7:3.1.11-1 @@ -459,7 +466,7 @@ fi * Wed Feb 09 2011 Fedora Release Engineering - 7:3.1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Thu Jan 05 2011 Jiri Skala - 7:3.1.10-1 +* Thu Jan 06 2011 Jiri Skala - 7:3.1.10-1 - Update to 3.1.10 upstream release * Fri Nov 05 2010 Jiri Skala - 7:3.1.9-5 @@ -504,13 +511,13 @@ fi - Various IPv6 related issues fixed, making tcp_outgoing_address behave as expected and no commResetFD warnings when using tproxy setups. -* Sat May 02 2010 Henrik Nordstrom - 7:3.1.3-1 +* Sun May 02 2010 Henrik Nordstrom - 7:3.1.3-1 - Update to 3.1.3 Upstream bugfix release, fixing WCCPv1 * Mon Apr 19 2010 Henrik Nordstrom - 7:3.1.1-4 - Bug #583489: Adjust logrotate script to changes in logrotate package. -* Fri Apr 19 2010 Jiri Skala +* Mon Apr 19 2010 Jiri Skala - fixes #548903 - "comm_open: socket failure: (97) Address family not supported by protocol" if IPv6 disabled * Tue Mar 30 2010 Henrik Nordstrom - 7:3.1.1-2 @@ -696,7 +703,7 @@ fi - add %%{optflags} to make - remove warnings about unused return values -* Tue Mar 13 2008 Martin Nagy - 7:3.0.STABLE2-1 +* Thu Mar 13 2008 Martin Nagy - 7:3.0.STABLE2-1 - upgrade to latest upstream 3.0.STABLE2 - check config file before starting (#428998) - whitespace unification of init script @@ -751,10 +758,10 @@ fi * Mon Nov 6 2006 Martin Stransky - 7:2.6.STABLE5-1 - update to the latest upstream -* Tue Oct 26 2006 Martin Stransky - 7:2.6.STABLE4-4 +* Thu Oct 26 2006 Martin Stransky - 7:2.6.STABLE4-4 - added fix for #205568 - marked cachemgr.conf as world readable -* Tue Oct 25 2006 Martin Stransky - 7:2.6.STABLE4-3 +* Wed Oct 25 2006 Martin Stransky - 7:2.6.STABLE4-3 - added fix for #183869 - squid can abort when getting status - added upstream fixes: * Bug #1796: Assertion error HttpHeader.c:914: "str" @@ -791,13 +798,13 @@ fi - the latest stable upstream - reworked fd config patch -* Wed Jul 25 2006 Martin Stransky - 7:2.6.STABLE1-3 +* Tue Jul 25 2006 Martin Stransky - 7:2.6.STABLE1-3 - the latest CVS upstream snapshot * Wed Jul 19 2006 Martin Stransky - 7:2.6.STABLE1-2 - the latest CVS snapshot -* Mon Jul 18 2006 Martin Stransky - 7:2.6.STABLE1-1 +* Tue Jul 18 2006 Martin Stransky - 7:2.6.STABLE1-1 - new upstream + the latest CVS snapshot from 2006/07/18 - updated fd config patch - enabled epoll @@ -807,7 +814,7 @@ fi * Wed Jul 12 2006 Jesse Keating - 7:2.5.STABLE14-2.1 - rebuild -* Tue Jun 8 2006 Martin Stransky - 7:2.5.STABLE14-2 +* Thu Jun 8 2006 Martin Stransky - 7:2.5.STABLE14-2 - fix for squid BZ#1511 - assertion failed: HttpReply.c:105: "rep" * Tue May 30 2006 Martin Stransky - 7:2.5.STABLE14-1 @@ -891,7 +898,7 @@ fi * Fri Jul 15 2005 Martin Stransky 7:2.5.STABLE10-2 - pam_auth and ncsa_auth have setuid (#162660) -* Fri Jul 7 2005 Martin Stransky 7:2.5.STABLE10-1 +* Thu Jul 7 2005 Martin Stransky 7:2.5.STABLE10-1 - new upstream version - enabled fakeauth utility (#154020) - enabled digest authentication scheme (#155882)