rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest upstream version 3.2.7

Browse Source
This commit is contained in:
Michal Luscon 2013-02-07 15:23:30 +01:00
parent 45b9819170
commit 788b388c98
6 changed files with 27 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -43,3 +43,4 @@ squid-3.1-10021.patch
/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

85
CVE-2013-0189.patch
View File

@ -1,85 +0,0 @@
------------------------------------------------------------
revno: 11743
revision-id: squid3@treenet.co.nz-20130101052914-r4lk62270w4sh498
parent: squid3@treenet.co.nz-20121230074717-y9oekp0bfabt6szv
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Mon 2012-12-31 22:29:14 -0700
message:
Additional pieces of SQUID-2012:1
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130101052914-r4lk62270w4sh498
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_2
# testament_sha1: 3cf80543cf33a78ae27d5178a8e9958854350ca3
# timestamp: 2013-01-01 05:35:26 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20121230074717-\
# y9oekp0bfabt6szv
#
# Begin patch
=== modified file 'tools/cachemgr.cc'
--- ./tools/cachemgr.cc 2012-11-29 11:15:32 +0000
+++ ./tools/cachemgr.cc 2013-01-01 05:29:14 +0000
@@ -980,10 +980,10 @@
// limit the input to something reasonable.
// 4KB should be enough for the GET/POST data length, but may be extended.
- size_t bufLen = (len >= 4096 ? len : 4095);
+ size_t bufLen = (len < 4096 ? len : 4095);
char *buf = (char *)xmalloc(bufLen + 1);
- size_t readLen = fread(buf, bufLen, 1, stdin);
+ size_t readLen = fread(buf, 1, bufLen, stdin);
if (readLen == 0) {
xfree(buf);
return NULL;
@@ -994,7 +994,7 @@
// purge the remainder of the request entity
while (len > 0) {
char temp[65535];
- readLen = fread(temp, 65535, 1, stdin);
+ readLen = fread(temp, 1, 65535, stdin);
len -= readLen;
}
------------------------------------------------------------
revno: 11744
revision-id: squid3@treenet.co.nz-20130108224018-5g5t67qy79rnboih
parent: squid3@treenet.co.nz-20130101052914-r4lk62270w4sh498
author: Eygene Ryabinkin <rea@freebsd.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.2
timestamp: Tue 2013-01-08 15:40:18 -0700
message:
Another piece of SQUID-2012:1
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130108224018-5g5t67qy79rnboih
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_2
# testament_sha1: 0e05b63f51b67c2f34ddd5955b266c06fca288db
# timestamp: 2013-01-08 22:45:41 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20130101052914-\
# r4lk62270w4sh498
#
# Begin patch
=== modified file 'tools/cachemgr.cc'
--- ./tools/cachemgr.cc 2013-01-01 05:29:14 +0000
+++ ./tools/cachemgr.cc 2013-01-08 22:40:18 +0000
@@ -992,7 +992,7 @@
len -= readLen;
// purge the remainder of the request entity
- while (len > 0) {
+ while (len > 0 && readLen) {
char temp[65535];
readLen = fread(temp, 1, 65535, stdin);
len -= readLen;

2
sources
View File

@ -1 +1 @@
ddb329f92056aa58a56db6a2eeea0c02 squid-3.2.5.tar.bz2
3e4d21b24c39d5066791017919866a64 squid-3.2.7.tar.bz2

20
squid-3.2.5.tar.bz2.asc
View File

@ -1,20 +0,0 @@
File: squid-3.2.5.tar.bz2
Date: Mon Dec 10 10:16:15 UTC 2012
Size: 2893104
MD5 : ddb329f92056aa58a56db6a2eeea0c02
SHA1: 6b945d41a9c0e993b978186b846035a241e79a7e
Key : 0xFF5CF463 <squid3@treenet.co.nz>
fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463
keyring = http://www.squid-cache.org/pgp.asc
keyserver = subkeys.pgp.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAABAgAGBQJQxcSsAAoJELJo5wb/XPRjikEIANGXmlZFreiKJm7GjCf3FIOT
Relj7MfKAY6smt0RqZVFoOSnNRf59NQbkkHkDlXKOkUWwtbWRb0U0YQo5Zi0BHlf
yw4xtkw1kbTLR5TCayLvuViBjMajC0Rjca22YnK0CttijG7qQOmTtX0JVYMZZHBl
WTKv9rckXz9fmeLTCH57TGz1H1ekAzC2gmY/AzYqmlgDvuioZPnhgiQUgfqsnmII
pxwUXNldZ0eK/WOwKGi+ReyWSgR4P/nlko3K28/yomADWYSH/al1xFmVWxeJPdoq
ejzYCA1KYg4jYszscLOuUW/2ajnzXpxl3a2R7oilg6hRir22j+QZiGnbU/DItTo=
=0bG7
-----END PGP SIGNATURE-----

20
squid-3.2.7.tar.bz2.asc Normal file
View File

@ -0,0 +1,20 @@
File: squid-3.2.7.tar.bz2
Date: Fri Feb 1 11:24:08 UTC 2013
Size: 2893325
MD5 : 3e4d21b24c39d5066791017919866a64
SHA1: 3e22bd64258a4232c51d7bfd0344a6c54522cab5
Key : 0xFF5CF463 <squid3@treenet.co.nz>
fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463
keyring = http://www.squid-cache.org/pgp.asc
keyserver = subkeys.pgp.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAABAgAGBQJRC6h9AAoJELJo5wb/XPRjuWsH/iX7FNcwSuMihU1Lf4tMjpzF
XnvpVsfidTTdYXW8YBT6+sSD3ocBfCv+/fnUlYzUCovTxapZmratuLRCcSed9/UM
7yZIpI05R+WDMBDQMv807JF/MKIIo83aRGcfkY+8n5k0mLIFdyx2KWZLg2q7Ngou
/5n9vxqr2afak3DODKBHG28BG3McdjJ+oiFaYb7jHuiLkBafRdvhoGm4yVJCP2gY
Znf0VXqGD0DdlTFWh3uUX8hDSZbTdiyTTl93KJdrnujUbx6zhTNMRZcaSclK8pIO
veqb4jFMawNgZDn2mXXea5lStYB2h5u4KcnZRIOW0DpCd0Ylud6EbAQMSbRdhF4=
=j8x/
-----END PGP SIGNATURE-----

9
squid.spec
View File

@ -3,8 +3,8 @@
## % define __find_requires %{SOURCE99}
Name: squid
Version: 3.2.5
Release: 2%{?dist}
Version: 3.2.7
Release: 1%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code
@ -37,7 +37,6 @@ 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: CVE-2013-0189.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: bash >= 2.0
@ -105,7 +104,6 @@ The squid-sysvinit contains SysV initscritps support.
%patch203 -p1 -b .perlpath
%patch204 -p1 -b .fpic
%patch205 -p1 -b .ltdl
%patch206 -p1 -b .CVE-2013-0189
%build
%ifarch sparcv9 sparc64 s390 s390x
@ -309,6 +307,9 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog
* Thu Feb 07 2013 Michal Luscon <mluscon@redhat.com> - 7:3.2.7-1
- Update to latest upstream version 3.2.7
* Thu Jan 24 2013 Michal Luscon <mluscon@redhat.com> - 7:3.2.5-2
- CVE-2013-0189: Incomplete fix for the CVE-2012-5643