rpm/squid
SHA256
1
0
Fork 0
forked from pool/squid
Code Pull Requests Activity

Accepting request 317787 from server:proxy

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/317787
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squid?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2015-07-22 07:19:52 +00:00 committed by Git OBS Bridge
commit 5c51c5d502
7 changed files with 47 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
squid-3.5.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23793da6b23871765188becae59a6f4b6c3672c256ba9be90743b46a3c7921cf
size 2290016

20
squid-3.5.5.tar.xz.asc
View File

@ -1,20 +0,0 @@
File: squid-3.5.5.tar.xz
Date: Thu May 28 11:58:32 UTC 2015
Size: 2290016
MD5 : 9a323a97753143ddd935aed58a0193ae
SHA1: 2c168e8b13251ed8050d9e780127c4de016dcb61
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
iQEcBAABAgAGBQJVZwTYAAoJELJo5wb/XPRjGGMH/j81al1zE8X0nJdISJFvRt3K
/he7046bmlRKavlShiIcVulnAxgIwApV1cBz1sZffWwRB+o8nZ/RWThowwi0urv+
ofz6/jwV93VVWFFlXXsNP9Qj8PnZI4Zj4xHWs7ObPCdCLbY4mRx31lUcGyXRTFhI
1vXOMb2hE8hFWHwazlSvRLmXfCgt/Y6bRH8VD65G4n4G7u3jHl10nvISiUgB9rkr
cddv8zVztM+Ng948hO+eQnnjvtQBrjfKH1QXrJbgPNbKLpG0p97Txq767E3YEPm2
ax/mxIPPeV5ZT6g2YSSsTZ1NJvlyni7h9l/p/uxhpDo7kMxunAUrzxzoXnZmE9s=
=MtNr
-----END PGP SIGNATURE-----

3
squid-3.5.6.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5
size 2291152

20
squid-3.5.6.tar.xz.asc Normal file
View File

@ -0,0 +1,20 @@
File: squid-3.5.6.tar.xz
Date: Fri Jul 3 10:16:07 UTC 2015
Size: 2291152
MD5 : 93e18bd257857e35bb634ddb8a348563
SHA1: c5f3ab47e61a08fa6a8767d45befeffd7d26fd9f
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
iQEcBAABAgAGBQJVlmX5AAoJELJo5wb/XPRj2oMH/0iikz7b90VgI9W82+b20e8F
BcMqoSc0RvszVFgaZ1V7WOVDD86AeEMaqGlLsyL1Jvk1+dzHmTj4i5FmqrlSfj3i
CdbfLFeL2/dldKYf++FsklALtIySDdbHOHeb/ri8URrOwKcC73DXEkkVq0nr/PJc
4QwCNGU9z2xm8teqhHqtC58oRcvnktAFB3L03aiBO1VmMEpT9vhcKRfCIK6v4uYu
ZZtcRbVrg301VkWHuo+/Vi9DKTxonQ/Za5g5rXkQRDwcbVcI0e3adeUoXT7znmix
lCy9ddqFlLCCkQ/Bq/+qqKrExZ/hQRXIlQM8r/aSELq6X+bbXL6DnggkAdE/DTo=
=m7d2
-----END PGP SIGNATURE-----

124
squid-nobuilddates.patch
View File

@ -1,124 +0,0 @@
Index: helpers/basic_auth/fake/fake.cc
===================================================================
--- helpers/basic_auth/fake/fake.cc.orig
+++ helpers/basic_auth/fake/fake.cc
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
process_options(argc, argv);
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", program_name);
+ debug("%s starting up...\n", program_name);
while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) {
char *p;
@@ -115,7 +115,7 @@ main(int argc, char *argv[])
/* send 'OK' result back to Squid */
SEND_OK("");
}
- debug("%s build " __DATE__ ", " __TIME__ " shutting down...\n", program_name);
+ debug("%s shutting down...\n", program_name);
exit(0);
}
Index: helpers/external_acl/AD_group/ext_ad_group_acl.cc
===================================================================
--- helpers/external_acl/AD_group/ext_ad_group_acl.cc.orig
+++ helpers/external_acl/AD_group/ext_ad_group_acl.cc
@@ -801,8 +801,7 @@ main(int argc, char *argv[])
if (!DefaultDomain)
DefaultDomain = xstrdup(machinedomain);
}
- debug("External ACL win32 group helper build " __DATE__ ", " __TIME__
- " starting up...\n");
+ debug("External ACL win32 group helper build starting up...\n");
if (use_global)
debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain);
if (use_case_insensitive_compare)
Index: helpers/external_acl/LM_group/ext_lm_group_acl.cc
===================================================================
--- helpers/external_acl/LM_group/ext_lm_group_acl.cc.orig
+++ helpers/external_acl/LM_group/ext_lm_group_acl.cc
@@ -540,8 +540,7 @@ main(int argc, char *argv[])
if (!DefaultDomain)
DefaultDomain = xstrdup(machinedomain);
}
- debug("External ACL win32 group helper build " __DATE__ ", " __TIME__
- " starting up...\n");
+ debug("External ACL win32 group helper build starting up...\n");
if (use_global) {
debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain);
}
Index: helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
===================================================================
--- helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc.orig
+++ helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
@@ -281,7 +281,7 @@ main(int argc, char *argv[])
process_options(argc, argv);
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
+ debug("%s starting up...\n", my_program_name);
if (LoadSecurityDll(SSP_NTLM, NEGOTIATE_PACKAGE_NAME) == NULL) {
fprintf(stderr, "FATAL: %s: can't initialize SSPI, exiting.\n", argv[0]);
Index: helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
===================================================================
--- helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc.orig
+++ helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
@@ -619,7 +619,7 @@ main(int argc, char *argv[])
process_options(argc, argv);
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
+ debug("%s starting up...\n", my_program_name);
if (LoadSecurityDll(SSP_NTLM, NTLM_PACKAGE_NAME) == NULL) {
fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n");
Index: helpers/ntlm_auth/fake/ntlm_fake_auth.cc
===================================================================
--- helpers/ntlm_auth/fake/ntlm_fake_auth.cc.orig
+++ helpers/ntlm_auth/fake/ntlm_fake_auth.cc
@@ -141,7 +141,7 @@ main(int argc, char *argv[])
process_options(argc, argv);
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
+ debug("%s starting up...\n", my_program_name);
while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) {
user[0] = '\0'; /*no user code */
Index: helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
===================================================================
--- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc.orig
+++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
@@ -622,7 +622,7 @@ manage_request()
int
main(int argc, char *argv[])
{
- debug("ntlm_auth build " __DATE__ ", " __TIME__ " starting up...\n");
+ debug("ntlm_auth build starting up...\n");
my_program_name = argv[0];
process_options(argc, argv);
Index: helpers/url_rewrite/fake/fake.cc
===================================================================
--- helpers/url_rewrite/fake/fake.cc.orig
+++ helpers/url_rewrite/fake/fake.cc
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
process_options(argc, argv);
- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
+ debug("%s starting up...\n", my_program_name);
while (fgets(buf, HELPER_INPUT_BUFFER, stdin) != NULL) {
char *p;
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
fprintf(stdout, "%" PRId64 " ERR\n", channelId);
}
}
- debug("%s build " __DATE__ ", " __TIME__ " shutting down...\n", my_program_name);
+ debug("%s shutting down...\n", my_program_name);
return 0;
}

23
squid.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Jul 21 06:44:15 UTC 2015 - mpluskal@suse.com
- Update to 3.5.6
* Bug 4274: ssl_crtd.8 not being installed
* Bug 4193: memory leak on FTP listings
* Bug 4183: segfault when freeing https_port clientca on
reconfigure or exit
* Bug 3875: bad mimeLoadIconFile error handling
* Bug 3483: assertion failed store.cc:1866: 'isEmpty()'
* Bug 3329: pinned server connection is not closed properly
* TLS: Disable client-initiated renegotiation
* ext_edirectory_userip_acl: fix uninitialized variable
* Support custom OIDs in *_cert ACLs
* Fix CONNECT failover to IPv4 after trying broken IPv6 servers
* Use relative-URL in errorpage.css for SN.png
* Do not blindly forward cache peer CONNECT responses
* Fix assertion String.cc:221: "str"
* Fix assertion comm.cc:759: "Comm::IsConnOpen(conn)" in
ConnStateData::getSslContextDone
* Translations: add Spanish US dialect alias
- Drop no longer needed squid-nobuilddates.patch
-------------------------------------------------------------------
Thu Jun 4 22:31:30 UTC 2015 - mpluskal@suse.com

5
squid.spec
View File

@ -20,7 +20,7 @@
%define squidconfdir %{_sysconfdir}/squid
Name: squid
Version: 3.5.5
Version: 3.5.6
Release: 0
Summary: A fully featured HTTP/1.0 proxy
License: GPL-2.0+
@ -44,8 +44,6 @@ Source14: squid.init.rh
Source99: squid-rpmlintrc
# some useful defaults for squid
Patch100: %{name}-config.patch
# make build compare happy - remove build dates
Patch101: %{name}-nobuilddates.patch
# patch fixes kerberos principalname handling (http://bugs.squid-cache.org/show_bug.cgi?id=4042)
Patch103: squid-brokenad.patch
#patch fix SLE 11 target... BAD PATCH
@ -139,7 +137,6 @@ cp %{SOURCE10} .
%patch100
perl -p -i -e 's|%{_prefix}/local/bin/perl|%{_bindir}/perl|' `find -name "*.pl"`
chmod a-x CREDITS
%patch101
%patch103
%patch104