rpms/squid/F-12 .cvsignore, 1.55, 1.56 sources, 1.58, 1.59 squid.spec, 1.156, 1.157 squid-3.1.0.16-assert.patch, 1.1, NONE
Henrik Nordström
hno at fedoraproject.org
Sat Feb 6 23:32:47 UTC 2010
Author: hno
Update of /cvs/pkgs/rpms/squid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18190
Modified Files:
.cvsignore sources squid.spec
Removed Files:
squid-3.1.0.16-assert.patch
Log Message:
upstream respun corrected 3.1.0.16 release, same version...
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore 1 Feb 2010 14:39:54 -0000 1.55
+++ .cvsignore 6 Feb 2010 23:32:46 -0000 1.56
@@ -1,4 +1,2 @@
squid-3.1.0.16.tar.bz2
squid-3.1.0.16.tar.bz2.asc
-squid-3.1-9876.patch
-squid-3.1-9877.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources 1 Feb 2010 14:39:54 -0000 1.58
+++ sources 6 Feb 2010 23:32:46 -0000 1.59
@@ -1,4 +1,2 @@
-e193368e286b6f22b6463b8062a70e04 squid-3.1.0.16.tar.bz2
-afa3f729532f9d313a09568a026d6632 squid-3.1.0.16.tar.bz2.asc
-eb9595a3074065976a0924875b10d2df squid-3.1-9876.patch
-d1280743295fbe979f375a8db9a9ba00 squid-3.1-9877.patch
+e795d79cf37ec91f59d09c6804a2555b squid-3.1.0.16.tar.bz2
+454d2e4205e1b3d4444b057fa417973b squid-3.1.0.16.tar.bz2.asc
Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/squid.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- squid.spec 6 Feb 2010 13:31:32 -0000 1.156
+++ squid.spec 6 Feb 2010 23:32:47 -0000 1.157
@@ -4,7 +4,7 @@
Name: squid
Version: 3.1.0.16
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2+
@@ -21,8 +21,7 @@ Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh
# Upstream patches
-Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9876.patch
-Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9877.patch
+#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXX.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@@ -32,7 +31,6 @@ Patch202: squid-3.1.0.9-location.patch
Patch204: squid-3.0.STABLE1-perlpath.patch
Patch205: squid-3.1.0.15-smb-path.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)
Requires: bash >= 2.0
@@ -71,15 +69,13 @@ lookup program (dnsserver), a program fo
%prep
%setup -q
-%patch001 -p0 -b .3.1-9876
-%patch002 -p0 -b .3.1-9877
+#patch001 -p0 -b .3.1-XXXX
%patch201 -p1 -b .config
%patch202 -p1 -b .location
%patch204 -p1 -b .perlpath
%patch205 -p1 -b .smb-path
%patch208 -p1 -b .from_manpg
-%patch209 -p1 -b .assert
%build
export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -260,7 +256,10 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
-* Sat Feb 06 2010 Jiri Skala <jskala at redhat.com> 7:3.1.0.16-4
+* Sun Feb 07 2010 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.16-5
+- Rebuild 3.1.0.16 with corrected upstream release.
+
+* Sat Feb 06 2010 Jiri Skala <jskala at redhat.com> - 7:3.1.0.16-4
- fixes assertion during start up
* Mon Feb 01 2010 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.1.0.16-3
--- squid-3.1.0.16-assert.patch DELETED ---
More information about the scm-commits
mailing list