[squid] applied corrections of unused patch (Ismail Dönmez)
Jiri Skala
jskala at fedoraproject.org
Wed May 4 18:52:32 UTC 2011
commit e34d3a9840a48692d7d91cb7606a8f5f6da8234f
Author: Jiri Skala <jskala at redhat.com>
Date: Wed May 4 20:52:08 2011 +0200
applied corrections of unused patch (Ismail Dönmez)
squid-3.1.11-unused.patch | 158 +++++++++++++++++++++-----------------------
squid.spec | 5 +-
2 files changed, 79 insertions(+), 84 deletions(-)
---
diff --git a/squid-3.1.11-unused.patch b/squid-3.1.11-unused.patch
index 698ce5f..61ad70b 100644
--- a/squid-3.1.11-unused.patch
+++ b/squid-3.1.11-unused.patch
@@ -1,7 +1,7 @@
-diff -up squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c
---- squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused 2011-02-10 10:04:50.422205003 +0100
-+++ squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c 2011-02-10 10:05:48.020204424 +0100
-@@ -219,7 +219,6 @@ main(int argc, char **argv)
+diff -ur squid-3.1.12/helpers/external_acl/ldap_group/squid_ldap_group.c squid-3.1.12-fixed/helpers/external_acl/ldap_group/squid_ldap_group.c
+--- squid-3.1.12/helpers/external_acl/ldap_group/squid_ldap_group.c 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/helpers/external_acl/ldap_group/squid_ldap_group.c 2011-05-03 15:47:49.120934481 +0200
+@@ -219,7 +219,6 @@
int use_extension_dn = 0;
int strip_nt_domain = 0;
int strip_kerberos_realm = 0;
@@ -9,7 +9,7 @@ diff -up squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused
setbuf(stdout, NULL);
-@@ -602,7 +601,6 @@ error:
+@@ -602,7 +601,6 @@
tryagain = 1;
}
}
@@ -17,10 +17,10 @@ diff -up squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused
}
if (ld)
ldap_unbind(ld);
-diff -up squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
---- squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused 2011-02-10 09:57:56.170205002 +0100
-+++ squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-02-10 09:58:39.039205002 +0100
-@@ -141,7 +141,6 @@ ntlmMakeChallenge(struct ntlm_challenge
+diff -ur squid-3.1.12/helpers/ntlm_auth/fakeauth/fakeauth_auth.c squid-3.1.12-fixed/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
+--- squid-3.1.12/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-05-03 15:47:49.121934482 +0200
+@@ -141,7 +141,6 @@
{
static unsigned hash;
int r;
@@ -28,7 +28,7 @@ diff -up squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused squid-3.
int i;
debug("ntlmMakeChallenge: flg %08x\n", flags);
-@@ -158,7 +157,6 @@ ntlmMakeChallenge(struct ntlm_challenge
+@@ -158,7 +157,6 @@
chal->flags = flags;
chal->unknown[6] = htole16(0x003a);
@@ -36,10 +36,10 @@ diff -up squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused squid-3.
i = 0;
if (authenticate_ntlm_domain != NULL)
-diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/src/auth/negotiate/auth_negotiate.cc
---- squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused 2011-02-10 07:57:04.293205769 +0100
-+++ squid-3.1.11/src/auth/negotiate/auth_negotiate.cc 2011-02-10 07:58:22.643205463 +0100
-@@ -544,7 +544,6 @@ AuthNegotiateUserRequest::module_start(R
+diff -ur squid-3.1.12/src/auth/negotiate/auth_negotiate.cc squid-3.1.12-fixed/src/auth/negotiate/auth_negotiate.cc
+--- squid-3.1.12/src/auth/negotiate/auth_negotiate.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/auth/negotiate/auth_negotiate.cc 2011-05-03 15:47:49.121934482 +0200
+@@ -544,7 +544,6 @@
{
authenticateStateData *r = NULL;
static char buf[MAX_AUTHTOKEN_LEN];
@@ -47,7 +47,7 @@ diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/s
AuthUser *auth_user = user();
assert(data);
-@@ -552,8 +551,6 @@ AuthNegotiateUserRequest::module_start(R
+@@ -552,8 +551,6 @@
assert(auth_user);
assert(auth_user->auth_type == AUTH_NEGOTIATE);
@@ -56,7 +56,7 @@ diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/s
debugs(29, 8, "AuthNegotiateUserRequest::module_start: auth state is '" << auth_state << "'");
if (negotiateConfig.authenticate == NULL) {
-@@ -655,12 +652,10 @@ AuthNegotiateUserRequest::authenticate(H
+@@ -655,12 +652,10 @@
/** \todo rename this!! */
AuthUser *local_auth_user;
@@ -69,10 +69,10 @@ diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/s
assert (this);
/** Check that we are in the client side, where we can generate
-diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/ntlm/auth_ntlm.cc
---- squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused 2011-02-10 08:07:21.181205066 +0100
-+++ squid-3.1.11/src/auth/ntlm/auth_ntlm.cc 2011-02-10 08:08:52.188204812 +0100
-@@ -460,7 +460,6 @@ AuthNTLMUserRequest::module_start(RH * h
+diff -ur squid-3.1.12/src/auth/ntlm/auth_ntlm.cc squid-3.1.12-fixed/src/auth/ntlm/auth_ntlm.cc
+--- squid-3.1.12/src/auth/ntlm/auth_ntlm.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/auth/ntlm/auth_ntlm.cc 2011-05-03 15:47:49.121934482 +0200
+@@ -460,7 +460,6 @@
{
authenticateStateData *r = NULL;
static char buf[8192];
@@ -80,7 +80,7 @@ diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/nt
AuthUser *auth_user = user();
assert(data);
-@@ -468,8 +467,6 @@ AuthNTLMUserRequest::module_start(RH * h
+@@ -468,8 +467,6 @@
assert(auth_user);
assert(auth_user->auth_type == AUTH_NTLM);
@@ -89,7 +89,7 @@ diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/nt
debugs(29, 8, "AuthNTLMUserRequest::module_start: auth state is '" << auth_state << "'");
if (ntlmConfig.authenticate == NULL) {
-@@ -572,12 +569,10 @@ AuthNTLMUserRequest::authenticate(HttpRe
+@@ -572,12 +569,10 @@
/* TODO: rename this!! */
AuthUser *local_auth_user;
@@ -102,10 +102,10 @@ diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/nt
assert (this);
/* Check that we are in the client side, where we can generate
-diff -up squid-3.1.11/src/auth/User.cc.unused squid-3.1.11/src/auth/User.cc
---- squid-3.1.11/src/auth/User.cc.unused 2011-02-10 08:14:08.623207125 +0100
-+++ squid-3.1.11/src/auth/User.cc 2011-02-10 08:14:52.305205340 +0100
-@@ -158,13 +158,11 @@ AuthUser::CachedACLsReset()
+diff -ur squid-3.1.12/src/auth/User.cc squid-3.1.12-fixed/src/auth/User.cc
+--- squid-3.1.12/src/auth/User.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/auth/User.cc 2011-05-03 15:47:49.122934483 +0200
+@@ -158,13 +158,11 @@
*/
AuthUserHashPointer *usernamehash;
AuthUser *auth_user;
@@ -119,10 +119,10 @@ diff -up squid-3.1.11/src/auth/User.cc.unused squid-3.1.11/src/auth/User.cc
/* free cached acl results */
aclCacheMatchFlush(&auth_user->proxy_match_cache);
-diff -up squid-3.1.11/src/client_side_reply.cc.unused squid-3.1.11/src/client_side_reply.cc
---- squid-3.1.11/src/client_side_reply.cc.unused 2011-02-10 08:28:52.861205280 +0100
-+++ squid-3.1.11/src/client_side_reply.cc 2011-02-10 08:37:22.530205334 +0100
-@@ -1056,14 +1056,6 @@ clientReplyContext::storeNotOKTransferDo
+diff -ur squid-3.1.12/src/client_side_reply.cc squid-3.1.12-fixed/src/client_side_reply.cc
+--- squid-3.1.12/src/client_side_reply.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/client_side_reply.cc 2011-05-03 15:47:49.122934483 +0200
+@@ -1056,14 +1056,6 @@
/* haven't found end of headers yet */
return 0;
@@ -137,7 +137,7 @@ diff -up squid-3.1.11/src/client_side_reply.cc.unused squid-3.1.11/src/client_si
/*
* Figure out how much data we are supposed to send.
* If we are sending a body and we don't have a content-length,
-@@ -2028,13 +2020,10 @@ clientReplyContext::sendMoreData (StoreI
+@@ -2029,13 +2021,10 @@
char *buf = next()->readBuffer.data;
@@ -151,33 +151,22 @@ diff -up squid-3.1.11/src/client_side_reply.cc.unused squid-3.1.11/src/client_si
}
#if USE_ZPH_QOS
-diff -up squid-3.1.11/src/comm.cc.unused squid-3.1.11/src/comm.cc
---- squid-3.1.11/src/comm.cc.unused 2011-02-10 08:20:37.942204904 +0100
-+++ squid-3.1.11/src/comm.cc 2011-02-10 08:21:43.940205003 +0100
-@@ -706,7 +706,6 @@ comm_openex(int sock_type,
- {
- int new_socket;
- fde *F = NULL;
-- int tos = 0;
- struct addrinfo *AI = NULL;
-
- PROF_start(comm_open);
-@@ -756,11 +755,6 @@ comm_openex(int sock_type,
-
- debugs(50, 3, "comm_openex: Opened socket FD " << new_socket << " : family=" << AI->ai_family << ", type=" << AI->ai_socktype << ", protocol=" << AI->ai_protocol );
+Only in squid-3.1.12-fixed/src: client_side_reply.cc.orig
+diff -ur squid-3.1.12/src/comm.cc squid-3.1.12-fixed/src/comm.cc
+--- squid-3.1.12/src/comm.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/comm.cc 2011-05-03 15:48:48.638934477 +0200
+@@ -759,6 +759,7 @@
+ /* set TOS if needed */
+ if (TOS && comm_set_tos(new_socket, TOS) ) {
+ tos = TOS;
++ (void)tos;
+ }
-- /* set TOS if needed */
-- if (TOS && comm_set_tos(new_socket, TOS) ) {
-- tos = TOS;
-- }
--
if ( Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && addr.IsIPv6() )
- comm_set_v6only(new_socket, 1);
-
-diff -up squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc
---- squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused 2011-02-10 09:42:07.029205002 +0100
-+++ squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc 2011-02-10 09:42:37.171205594 +0100
-@@ -123,7 +123,6 @@ AIODiskIOStrategy::callback()
+diff -ur squid-3.1.12/src/DiskIO/AIO/AIODiskIOStrategy.cc squid-3.1.12-fixed/src/DiskIO/AIO/AIODiskIOStrategy.cc
+--- squid-3.1.12/src/DiskIO/AIO/AIODiskIOStrategy.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/DiskIO/AIO/AIODiskIOStrategy.cc 2011-05-03 15:47:49.123934483 +0200
+@@ -123,7 +123,6 @@
void *cbdata;
int callback_valid;
void *buf;
@@ -185,7 +174,7 @@ diff -up squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused squid-3.1.11/sr
async_queue_entry_t *aqe;
async_queue_entry_type_t type;
-@@ -148,7 +147,6 @@ AIODiskIOStrategy::callback()
+@@ -148,7 +147,6 @@
/* Get the callback parameters */
freefunc = aqe->aq_e_free;
buf = aqe->aq_e_buf;
@@ -193,10 +182,10 @@ diff -up squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused squid-3.1.11/sr
type = aqe->aq_e_type;
callback_valid = cbdataReferenceValidDone(aqe->aq_e_callback_data, &cbdata);
AIODiskFile * theFile = NULL;
-diff -up squid-3.1.11/src/dns_internal.cc.unused squid-3.1.11/src/dns_internal.cc
---- squid-3.1.11/src/dns_internal.cc.unused 2011-02-10 09:15:50.096204636 +0100
-+++ squid-3.1.11/src/dns_internal.cc 2011-02-10 09:16:39.951205440 +0100
-@@ -1360,8 +1360,6 @@ idnsInit(void)
+diff -ur squid-3.1.12/src/dns_internal.cc squid-3.1.12-fixed/src/dns_internal.cc
+--- squid-3.1.12/src/dns_internal.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/dns_internal.cc 2011-05-03 15:49:31.198934469 +0200
+@@ -1376,8 +1376,6 @@
CBDATA_INIT_TYPE(idns_query);
if (DnsSocketA < 0 && DnsSocketB < 0) {
@@ -205,23 +194,25 @@ diff -up squid-3.1.11/src/dns_internal.cc.unused squid-3.1.11/src/dns_internal.c
IpAddress addrA; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own.
if (!Config.Addrs.udp_outgoing.IsNoAddr())
-@@ -1397,12 +1395,10 @@ idnsInit(void)
+@@ -1413,12 +1411,12 @@
* statement. Doing so messes up the internal Debug::level
*/
if (DnsSocketB >= 0) {
- port = comm_local_port(DnsSocketB);
++ comm_local_port(DnsSocketB);
debugs(78, 1, "DNS Socket created at " << addrB << ", FD " << DnsSocketB);
commSetSelect(DnsSocketB, COMM_SELECT_READ, idnsRead, NULL, 0);
}
if (DnsSocketA >= 0) {
- port = comm_local_port(DnsSocketA);
++ comm_local_port(DnsSocketA);
debugs(78, 1, "DNS Socket created at " << addrA << ", FD " << DnsSocketA);
commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0);
}
-diff -up squid-3.1.11/src/errorpage.cc.unused squid-3.1.11/src/errorpage.cc
---- squid-3.1.11/src/errorpage.cc.unused 2011-02-10 08:42:44.965205002 +0100
-+++ squid-3.1.11/src/errorpage.cc 2011-02-10 08:43:50.597205002 +0100
-@@ -515,7 +515,6 @@ int
+diff -ur squid-3.1.12/src/errorpage.cc squid-3.1.12-fixed/src/errorpage.cc
+--- squid-3.1.12/src/errorpage.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/errorpage.cc 2011-05-03 15:47:49.123934483 +0200
+@@ -515,7 +515,6 @@
ErrorState::Dump(MemBuf * mb)
{
MemBuf str;
@@ -229,7 +220,7 @@ diff -up squid-3.1.11/src/errorpage.cc.unused squid-3.1.11/src/errorpage.cc
char ntoabuf[MAX_IPSTRLEN];
str.reset();
-@@ -570,10 +569,6 @@ ErrorState::Dump(MemBuf * mb)
+@@ -570,10 +569,6 @@
packerToMemInit(&pck, &str);
request->header.packInto(&pck);
packerClean(&pck);
@@ -240,10 +231,10 @@ diff -up squid-3.1.11/src/errorpage.cc.unused squid-3.1.11/src/errorpage.cc
}
str.Printf("\r\n");
-diff -up squid-3.1.11/src/fqdncache.cc.unused squid-3.1.11/src/fqdncache.cc
---- squid-3.1.11/src/fqdncache.cc.unused 2011-02-10 09:29:50.426205631 +0100
-+++ squid-3.1.11/src/fqdncache.cc 2011-02-10 09:30:57.407204865 +0100
-@@ -497,10 +497,8 @@ fqdncacheHandleReply(void *data, char *r
+diff -ur squid-3.1.12/src/fqdncache.cc squid-3.1.12-fixed/src/fqdncache.cc
+--- squid-3.1.12/src/fqdncache.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/fqdncache.cc 2011-05-03 15:49:55.533934460 +0200
+@@ -497,10 +497,9 @@
fqdncacheHandleReply(void *data, rfc1035_rr * answers, int na, const char *error_message)
#endif
{
@@ -251,13 +242,14 @@ diff -up squid-3.1.11/src/fqdncache.cc.unused squid-3.1.11/src/fqdncache.cc
fqdncache_entry *f;
static_cast<generic_cbdata *>(data)->unwrap(&f);
- n = ++FqdncacheStats.replies;
++ ++FqdncacheStats.replies;
const int age = f->age();
statHistCount(&statCounter.dns.svc_time, age);
#if USE_DNSSERVERS
-diff -up squid-3.1.11/src/ftp.cc.unused squid-3.1.11/src/ftp.cc
---- squid-3.1.11/src/ftp.cc.unused 2011-02-10 09:22:52.118205001 +0100
-+++ squid-3.1.11/src/ftp.cc 2011-02-10 09:23:56.324205001 +0100
-@@ -2453,7 +2453,6 @@ ftpReadEPSV(FtpStateData* ftpState)
+diff -ur squid-3.1.12/src/ftp.cc squid-3.1.12-fixed/src/ftp.cc
+--- squid-3.1.12/src/ftp.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/ftp.cc 2011-05-03 15:47:49.124934483 +0200
+@@ -2453,7 +2453,6 @@
{
int code = ftpState->ctrl.replycode;
char h1, h2, h3, h4;
@@ -265,7 +257,7 @@ diff -up squid-3.1.11/src/ftp.cc.unused squid-3.1.11/src/ftp.cc
u_short port;
IpAddress ipa_remote;
int fd = ftpState->data.fd;
-@@ -2521,7 +2520,7 @@ ftpReadEPSV(FtpStateData* ftpState)
+@@ -2521,7 +2520,7 @@
buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "(");
@@ -274,10 +266,10 @@ diff -up squid-3.1.11/src/ftp.cc.unused squid-3.1.11/src/ftp.cc
if (h1 != h2 || h1 != h3 || h1 != h4) {
debugs(9, DBG_IMPORTANT, "Invalid EPSV reply from " <<
-diff -up squid-3.1.11/src/neighbors.cc.unused squid-3.1.11/src/neighbors.cc
---- squid-3.1.11/src/neighbors.cc.unused 2011-02-10 09:36:24.432205185 +0100
-+++ squid-3.1.11/src/neighbors.cc 2011-02-10 09:36:51.359204616 +0100
-@@ -827,7 +827,6 @@ neighborsDigestSelect(HttpRequest * requ
+diff -ur squid-3.1.12/src/neighbors.cc squid-3.1.12-fixed/src/neighbors.cc
+--- squid-3.1.12/src/neighbors.cc 2011-04-04 03:24:06.000000000 +0200
++++ squid-3.1.12-fixed/src/neighbors.cc 2011-05-03 15:51:08.221934455 +0200
+@@ -832,7 +832,6 @@
peer *best_p = NULL;
#if USE_CACHE_DIGESTS
@@ -285,12 +277,12 @@ diff -up squid-3.1.11/src/neighbors.cc.unused squid-3.1.11/src/neighbors.cc
int best_rtt = 0;
int choice_count = 0;
int ichoice_count = 0;
-@@ -838,8 +837,6 @@ neighborsDigestSelect(HttpRequest * requ
+@@ -843,7 +842,7 @@
if (!request->flags.hierarchical)
return NULL;
- key = storeKeyPublicByRequest(request);
--
++ storeKeyPublicByRequest(request);
+
for (i = 0, p = first_ping; i++ < Config.npeers; p = p->next) {
lookup_t lookup;
-
diff --git a/squid.spec b/squid.spec
index 85857fc..a137077 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
Name: squid
Version: 3.1.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code
@@ -270,6 +270,9 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
+* Thu May 04 2011 Jiri Skala <jskala at redhat.com> - 7:3.1.12-2
+- applied corrections of unused patch (Ismail Dönmez)
+
* Thu Apr 15 2011 Jiri Skala <jskala at redhat.com> - 7:3.1.12-1
- Update to 3.1.12 upstream release
More information about the scm-commits
mailing list