correted 3.1.0.16 upstream release, respun with the same version number..
This commit is contained in:
parent
e7ee3bc4e4
commit
0307331404
@ -1,4 +1,2 @@
|
|||||||
squid-3.1.0.16.tar.bz2
|
squid-3.1.0.16.tar.bz2
|
||||||
squid-3.1.0.16.tar.bz2.asc
|
squid-3.1.0.16.tar.bz2.asc
|
||||||
squid-3.1-9876.patch
|
|
||||||
squid-3.1-9877.patch
|
|
||||||
|
6
sources
6
sources
@ -1,4 +1,2 @@
|
|||||||
e193368e286b6f22b6463b8062a70e04 squid-3.1.0.16.tar.bz2
|
e795d79cf37ec91f59d09c6804a2555b squid-3.1.0.16.tar.bz2
|
||||||
afa3f729532f9d313a09568a026d6632 squid-3.1.0.16.tar.bz2.asc
|
454d2e4205e1b3d4444b057fa417973b squid-3.1.0.16.tar.bz2.asc
|
||||||
eb9595a3074065976a0924875b10d2df squid-3.1-9876.patch
|
|
||||||
d1280743295fbe979f375a8db9a9ba00 squid-3.1-9877.patch
|
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
diff -up squid-3.1.0.16/src/peer_select.cc.assert squid-3.1.0.16/src/peer_select.cc
|
|
||||||
--- squid-3.1.0.16/src/peer_select.cc.assert 2010-02-01 05:02:27.000000000 +0100
|
|
||||||
+++ squid-3.1.0.16/src/peer_select.cc 2010-02-05 15:27:09.000000000 +0100
|
|
||||||
@@ -67,6 +67,7 @@ const char *hier_strings[] = {
|
|
||||||
"ANY_PARENT",
|
|
||||||
"USERHASH",
|
|
||||||
"SOURCEHASH",
|
|
||||||
+ "PINNED",
|
|
||||||
"INVALID CODE"
|
|
||||||
};
|
|
||||||
|
|
14
squid.spec
14
squid.spec
@ -11,6 +11,7 @@ License: GPLv2
|
|||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://www.squid-cache.org
|
URL: http://www.squid-cache.org
|
||||||
Source0: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2
|
Source0: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2
|
||||||
|
Source1: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
|
||||||
Source2: squid.init
|
Source2: squid.init
|
||||||
Source3: squid.logrotate
|
Source3: squid.logrotate
|
||||||
Source4: squid.sysconfig
|
Source4: squid.sysconfig
|
||||||
@ -20,8 +21,7 @@ Source98: perl-requires-squid.sh
|
|||||||
## Source99: filter-requires-squid.sh
|
## Source99: filter-requires-squid.sh
|
||||||
|
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9876.patch
|
#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXX.patch
|
||||||
Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9877.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
|
||||||
@ -31,7 +31,6 @@ Patch202: squid-3.1.0.9-location.patch
|
|||||||
Patch204: squid-3.0.STABLE1-perlpath.patch
|
Patch204: squid-3.0.STABLE1-perlpath.patch
|
||||||
Patch205: squid-3.1.0.15-smb-path.patch
|
Patch205: squid-3.1.0.15-smb-path.patch
|
||||||
Patch208: squid-3.0.STABLE7-from_manpg.patch
|
Patch208: squid-3.0.STABLE7-from_manpg.patch
|
||||||
Patch209: squid-3.1.0.16-assert.patch
|
|
||||||
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
Requires: bash >= 2.0
|
Requires: bash >= 2.0
|
||||||
@ -69,15 +68,13 @@ lookup program (dnsserver), a program for retrieving FTP data
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch001 -p0 -b .3.1-9876
|
#patch001 -p0 -b .3.1-XXXX
|
||||||
%patch002 -p0 -b .3.1-9877
|
|
||||||
|
|
||||||
%patch201 -p1 -b .config
|
%patch201 -p1 -b .config
|
||||||
%patch202 -p1 -b .location
|
%patch202 -p1 -b .location
|
||||||
%patch204 -p1 -b .perlpath
|
%patch204 -p1 -b .perlpath
|
||||||
%patch205 -p1 -b .smb-path
|
%patch205 -p1 -b .smb-path
|
||||||
%patch208 -p1 -b .from_manpg
|
%patch208 -p1 -b .from_manpg
|
||||||
%patch209 -p1 -b .assert
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
@ -262,7 +259,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Feb 03 2010 Jiri Skala <jskala@redhat.com> 7:3.1.0.16-4
|
* Sun Feb 07 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.16-4
|
||||||
|
- Rebuild 3.1.0.16 with corrected upstream release.
|
||||||
|
|
||||||
|
* Wed Feb 03 2010 Jiri Skala <jskala@redhat.com> - 7:3.1.0.16-4
|
||||||
- spec file modified to be fedora packaging guidline compliant
|
- spec file modified to be fedora packaging guidline compliant
|
||||||
- little shifting lines in init script header due to rpmlint complaint
|
- little shifting lines in init script header due to rpmlint complaint
|
||||||
- fixes assertion during start up
|
- fixes assertion during start up
|
||||||
|
Loading…
Reference in New Issue
Block a user