rpms/squid/FC-4 squid-2.5.STABLE11-CACHE_HTTP_PORT.patch, NONE, 1.1 squid-2.5.STABLE11-CNAME.patch, NONE, 1.1 squid-2.5.STABLE11-delaypools_truncated.patch, NONE, 1.1 squid-2.5.STABLE11-ldap_auth.patch, NONE, 1.1 squid-2.5.STABLE11-tcp_outgoing_xxx.patch, NONE, 1.1 squid-2.5.STABLE11.accel_single_host_pconn.patch, NONE, 1.1 squid.spec, 1.35, 1.36
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Sep 29 12:41:53 UTC 2005
- Previous message (by thread): rpms/grep/devel grep-2.5.1-egf-speedup.patch, 1.15, 1.16 grep.spec, 1.54, 1.55
- Next message (by thread): rpms/squid/FC-3 squid-2.5.STABLE11-CACHE_HTTP_PORT.patch, NONE, 1.1 squid-2.5.STABLE11-CNAME.patch, NONE, 1.1 squid-2.5.STABLE11-delaypools_truncated.patch, NONE, 1.1 squid-2.5.STABLE11-ldap_auth.patch, NONE, 1.1 squid-2.5.STABLE11-tcp_outgoing_xxx.patch, NONE, 1.1 squid-2.5.STABLE11.accel_single_host_pconn.patch, NONE, 1.1 squid.spec, 1.34, 1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stransky
Update of /cvs/dist/rpms/squid/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2389
Modified Files:
squid.spec
Added Files:
squid-2.5.STABLE11-CACHE_HTTP_PORT.patch
squid-2.5.STABLE11-CNAME.patch
squid-2.5.STABLE11-delaypools_truncated.patch
squid-2.5.STABLE11-ldap_auth.patch
squid-2.5.STABLE11-tcp_outgoing_xxx.patch
squid-2.5.STABLE11.accel_single_host_pconn.patch
Log Message:
added patch for delay pools and some minor fixes
squid-2.5.STABLE11-CACHE_HTTP_PORT.patch:
configure | 2 ++
configure.in | 2 ++
src/Makefile.am | 4 ++++
src/Makefile.in | 6 ++++++
src/cf.data.pre | 4 !!!!
5 files changed, 14 insertions(+), 4 modifications(!)
--- NEW FILE squid-2.5.STABLE11-CACHE_HTTP_PORT.patch ---
Index: squid/configure.in
diff -c squid/configure.in:1.251.2.101 squid/configure.in:1.251.2.102
*** squid/configure.in:1.251.2.101 Thu Sep 22 02:15:05 2005
--- squid/configure.in Wed Sep 28 14:50:25 2005
***************
*** 68,74 ****
--- 68,76 ----
dnl Substitutions
AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT)
+ AC_SUBST(CACHE_HTTP_PORT)
AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT)
+ AC_SUBST(CACHE_ICP_PORT)
AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host")
Index: squid/src/Makefile.am
diff -c squid/src/Makefile.am:1.16.2.11 squid/src/Makefile.am:1.16.2.12
*** squid/src/Makefile.am:1.16.2.11 Fri Apr 22 19:32:27 2005
--- squid/src/Makefile.am Wed Sep 28 14:50:25 2005
***************
*** 272,277 ****
--- 272,279 ----
cachemgr.conf \
mime.conf.default
+ DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
+ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
DEFAULT_PREFIX = $(prefix)
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
***************
*** 325,330 ****
--- 327,334 ----
## depend on the Makefile.
cf.data: cf.data.pre Makefile
sed "\
+ s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
+ s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
Index: squid/src/cf.data.pre
diff -c squid/src/cf.data.pre:1.245.2.100 squid/src/cf.data.pre:1.245.2.101
*** squid/src/cf.data.pre:1.245.2.100 Wed Sep 28 06:29:45 2005
--- squid/src/cf.data.pre Wed Sep 28 14:50:25 2005
***************
*** 56,62 ****
NAME: http_port ascii_port
TYPE: sockaddr_in_list
DEFAULT: none
! DEFAULT_IF_NONE: 3128
LOC: Config.Sockaddr.http
DOC_START
Usage: port
--- 56,62 ----
NAME: http_port ascii_port
TYPE: sockaddr_in_list
DEFAULT: none
! DEFAULT_IF_NONE: @DEFAULT_HTTP_PORT@
LOC: Config.Sockaddr.http
DOC_START
Usage: port
***************
*** 145,151 ****
NAME: icp_port udp_port
TYPE: ushort
! DEFAULT: 3130
LOC: Config.Port.icp
DOC_START
The port number where Squid sends and receives ICP queries to
--- 145,151 ----
NAME: icp_port udp_port
TYPE: ushort
! DEFAULT: @DEFAULT_ICP_PORT@
LOC: Config.Port.icp
DOC_START
The port number where Squid sends and receives ICP queries to
Index: squid/configure
diff -c squid/configure:1.248.2.103 squid/configure:1.248.2.104
*** squid/configure:1.248.2.103 Thu Sep 22 02:15:26 2005
--- squid/configure Wed Sep 28 14:57:13 2005
***************
*** 9055,9060 ****
--- 9057,9064 ----
s%@CGIEXT@%$CGIEXT%g
s%@ENABLE_WIN32SPECIFIC_TRUE@%$ENABLE_WIN32SPECIFIC_TRUE%g
s%@ENABLE_WIN32SPECIFIC_FALSE@%$ENABLE_WIN32SPECIFIC_FALSE%g
+ s%@CACHE_HTTP_PORT@%$CACHE_HTTP_PORT%g
+ s%@CACHE_ICP_PORT@%$CACHE_ICP_PORT%g
s%@LIBDLMALLOC@%$LIBDLMALLOC%g
s%@LIB_MALLOC@%$LIB_MALLOC%g
s%@STORE_OBJS@%$STORE_OBJS%g
Index: squid/src/Makefile.in
diff -c squid/src/Makefile.in:1.225.2.24 squid/src/Makefile.in:1.225.2.25
*** squid/src/Makefile.in:1.225.2.24 Sat Apr 23 18:12:08 2005
--- squid/src/Makefile.in Wed Sep 28 14:57:21 2005
***************
*** 73,78 ****
--- 73,80 ----
AUTH_OBJS = @AUTH_OBJS@
AWK = @AWK@
BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@
+ CACHE_HTTP_PORT = @CACHE_HTTP_PORT@
+ CACHE_ICP_PORT = @CACHE_ICP_PORT@
CC = @CC@
CGIEXT = @CGIEXT@
CPP = @CPP@
***************
*** 375,380 ****
--- 377,384 ----
mime.conf.default
+ DEFAULT_HTTP_PORT = @CACHE_HTTP_PORT@
+ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
DEFAULT_PREFIX = $(prefix)
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
***************
*** 1144,1149 ****
--- 1148,1155 ----
cf.data: cf.data.pre Makefile
sed "\
+ s%@DEFAULT_HTTP_PORT@%$(DEFAULT_HTTP_PORT)%g;\
+ s%@DEFAULT_ICP_PORT@%$(DEFAULT_ICP_PORT)%g;\
s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
squid-2.5.STABLE11-CNAME.patch:
include/rfc1035.h | 1 +
src/fqdncache.c | 21 ----!!!!!!!!!!!!!!!!!
src/ipcache.c | 15 ------!!!!!!!!!
3 files changed, 1 insertion(+), 10 deletions(-), 26 modifications(!)
--- NEW FILE squid-2.5.STABLE11-CNAME.patch ---
Index: squid/include/rfc1035.h
diff -c squid/include/rfc1035.h:1.6.2.2 squid/include/rfc1035.h:1.6.2.3
*** squid/include/rfc1035.h:1.6.2.2 Tue May 10 05:48:20 2005
--- squid/include/rfc1035.h Wed Sep 28 15:47:58 2005
***************
*** 100,105 ****
--- 100,106 ----
extern const char *rfc1035_error_message;
#define RFC1035_TYPE_A 1
+ #define RFC1035_TYPE_CNAME 5
#define RFC1035_TYPE_PTR 12
#define RFC1035_CLASS_IN 1
Index: squid/src/fqdncache.c
diff -c squid/src/fqdncache.c:1.149.2.7 squid/src/fqdncache.c:1.149.2.8
*** squid/src/fqdncache.c:1.149.2.7 Mon Feb 21 09:59:45 2005
--- squid/src/fqdncache.c Wed Sep 28 15:47:58 2005
***************
*** 299,317 ****
debug(35, 3) ("fqdncacheParse: %d answers for '%s'\n", nr, name);
assert(answers);
for (k = 0; k < nr; k++) {
- if (answers[k].type != RFC1035_TYPE_PTR)
- continue;
if (answers[k].class != RFC1035_CLASS_IN)
continue;
! if (!answers[k].rdata[0]) {
! debug(35, 2) ("fqdncacheParse: blank PTR record for '%s'\n", name);
! continue;
! }
! if (strchr(answers[k].rdata, ' ')) {
! debug(35, 2) ("fqdncacheParse: invalid PTR record '%s' for '%s'\n", answers[k].rdata, name);
continue;
- }
- f->names[f->name_count++] = xstrdup(answers[k].rdata);
if (ttl == 0 || answers[k].ttl < ttl)
ttl = answers[k].ttl;
if (f->name_count >= FQDN_MAX_NAMES)
--- 299,318 ----
debug(35, 3) ("fqdncacheParse: %d answers for '%s'\n", nr, name);
assert(answers);
for (k = 0; k < nr; k++) {
if (answers[k].class != RFC1035_CLASS_IN)
continue;
! if (answers[k].type == RFC1035_TYPE_PTR) {
! if (!answers[k].rdata[0]) {
! debug(35, 2) ("fqdncacheParse: blank PTR record for '%s'\n", name);
! continue;
! }
! if (strchr(answers[k].rdata, ' ')) {
! debug(35, 2) ("fqdncacheParse: invalid PTR record '%s' for '%s'\n", answers[k].rdata, name);
! continue;
! }
! f->names[f->name_count++] = xstrdup(answers[k].rdata);
! } else if (answers[k].type != RFC1035_TYPE_CNAME)
continue;
if (ttl == 0 || answers[k].ttl < ttl)
ttl = answers[k].ttl;
if (f->name_count >= FQDN_MAX_NAMES)
Index: squid/src/ipcache.c
diff -c squid/src/ipcache.c:1.236.2.6 squid/src/ipcache.c:1.236.2.7
*** squid/src/ipcache.c:1.236.2.6 Sat Feb 12 22:53:56 2005
--- squid/src/ipcache.c Wed Sep 28 15:47:58 2005
***************
*** 353,370 ****
i->addrs.in_addrs = xcalloc(na, sizeof(struct in_addr));
i->addrs.bad_mask = xcalloc(na, sizeof(unsigned char));
for (j = 0, k = 0; k < nr; k++) {
- if (answers[k].type != RFC1035_TYPE_A)
- continue;
if (answers[k].class != RFC1035_CLASS_IN)
continue;
! if (answers[k].rdlength != 4)
continue;
if (ttl == 0 || ttl > answers[k].ttl)
ttl = answers[k].ttl;
- xmemcpy(&i->addrs.in_addrs[j++], answers[k].rdata, 4);
- debug(14, 3) ("ipcacheParse: #%d %s\n",
- j - 1,
- inet_ntoa(i->addrs.in_addrs[j - 1]));
}
i->addrs.count = (unsigned char) na;
if (ttl == 0 || ttl > Config.positiveDnsTtl)
--- 353,371 ----
i->addrs.in_addrs = xcalloc(na, sizeof(struct in_addr));
i->addrs.bad_mask = xcalloc(na, sizeof(unsigned char));
for (j = 0, k = 0; k < nr; k++) {
if (answers[k].class != RFC1035_CLASS_IN)
continue;
! if (answers[k].type == RFC1035_TYPE_A) {
! if (answers[k].rdlength != 4)
! continue;
! xmemcpy(&i->addrs.in_addrs[j++], answers[k].rdata, 4);
! debug(14, 3) ("ipcacheParse: #%d %s\n",
! j - 1,
! inet_ntoa(i->addrs.in_addrs[j - 1]));
! } else if (answers[k].type != RFC1035_TYPE_CNAME)
continue;
if (ttl == 0 || ttl > answers[k].ttl)
ttl = answers[k].ttl;
}
i->addrs.count = (unsigned char) na;
if (ttl == 0 || ttl > Config.positiveDnsTtl)
squid-2.5.STABLE11-delaypools_truncated.patch:
delay_pools.c | 5 +!!!!
1 files changed, 1 insertion(+), 4 modifications(!)
--- NEW FILE squid-2.5.STABLE11-delaypools_truncated.patch ---
Index: squid/src/delay_pools.c
diff -c squid/src/delay_pools.c:1.19.2.9 squid/src/delay_pools.c:1.19.2.10
*** squid/src/delay_pools.c:1.19.2.9 Sat Sep 10 19:49:53 2005
--- squid/src/delay_pools.c Tue Sep 27 16:25:30 2005
***************
*** 676,683 ****
d = sc->delay_id;
}
}
! if (jmax >= 0 && jmax < (int) *read_sz)
*read_sz = (size_t) jmax;
return d;
}
--- 676,686 ----
d = sc->delay_id;
}
}
! if (jmax >= 0 && jmax < (int) *read_sz) {
! if (jmax == 0)
! jmax = 1;
*read_sz = (size_t) jmax;
+ }
return d;
}
squid-2.5.STABLE11-ldap_auth.patch:
squid_ldap_auth.8 | 2 !!
squid_ldap_auth.c | 24 ++++++++++-!!!!!!!!!!!!!
2 files changed, 10 insertions(+), 1 deletion(-), 15 modifications(!)
--- NEW FILE squid-2.5.STABLE11-ldap_auth.patch ---
Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.8
diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.9 squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.10
*** squid/helpers/basic_auth/LDAP/squid_ldap_auth.8:1.7.2.9 Sun Jan 30 12:28:56 2005
--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.8 Wed Sep 28 12:33:42 2005
***************
*** 199,205 ****
a user DN and password to log in as to perform the searches, as in the
following complex Active Directory example
.IP
! squid_ldap_auth -p -R -b "dc=your,dc=domain" -D "cn=squid,cn=users,dc=your,dc=domain" -w "secretsquidpassword" -f "(&(userPrincipalName=%s)(objectClass=Person))" activedirectoryserver
.
.SH NOTES
.
--- 199,205 ----
a user DN and password to log in as to perform the searches, as in the
following complex Active Directory example
.IP
! squid_ldap_auth -P -R -b "dc=your,dc=domain" -D "cn=squid,cn=users,dc=your,dc=domain" -w "secretsquidpassword" -f "(&(userPrincipalName=%s)(objectClass=Person))" activedirectoryserver
.
.SH NOTES
.
Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c
diff -c squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.23 squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.24
*** squid/helpers/basic_auth/LDAP/squid_ldap_auth.c:1.21.2.23 Sat Sep 10 18:53:23 2005
--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c Wed Sep 28 12:33:42 2005
***************
*** 187,193 ****
else
ld->ld_options &= ~LDAP_OPT_REFERRALS;
}
! static void
squid_ldap_set_timelimit(LDAP * ld, int timelimit)
{
ld->ld_timelimit = timelimit;
--- 187,193 ----
else
ld->ld_options &= ~LDAP_OPT_REFERRALS;
}
! static void
squid_ldap_set_timelimit(LDAP * ld, int timelimit)
{
ld->ld_timelimit = timelimit;
***************
*** 259,265 ****
}
if (use_tls) {
#ifdef LDAP_OPT_X_TLS
! if (version != LDAP_VERSION3) {
fprintf(stderr, "TLS requires LDAP version 3\n");
exit(1);
} else if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
--- 259,265 ----
}
if (use_tls) {
#ifdef LDAP_OPT_X_TLS
! if (version != LDAP_VERSION3) {
fprintf(stderr, "TLS requires LDAP version 3\n");
exit(1);
} else if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS) {
***************
*** 282,293 ****
static int
validUsername(const char *user)
{
! const unsigned char *p = (const unsigned char *)user;
/* Leading whitespace? */
if (isspace(p[0]))
return 0;
! while(p[0] && p[1]) {
if (isspace(p[0])) {
/* More than one consequitive space? */
if (isspace(p[1]))
--- 282,293 ----
static int
validUsername(const char *user)
{
! const unsigned char *p = (const unsigned char *) user;
/* Leading whitespace? */
if (isspace(p[0]))
return 0;
! while (p[0] && p[1]) {
if (isspace(p[0])) {
/* More than one consequitive space? */
if (isspace(p[1]))
***************
*** 581,597 ****
--- 581,603 ----
return n;
}
+ /* Check the userid & password.
+ * Return 0 on success, 1 on failure
+ */
static int
checkLDAP(LDAP * persistent_ld, const char *userid, const char *password, const char *ldapServer, int port)
{
char dn[256];
int ret = 0;
LDAP *bind_ld = NULL;
+ int rc;
if (!*password) {
/* LDAP can't bind with a blank password. Seen as "anonymous"
* and always granted access
*/
+ if (debug)
+ fprintf(stderr, "Blank password given\n");
return 1;
}
if (searchfilter) {
***************
*** 599,607 ****
char escaped_login[256];
LDAPMessage *res = NULL;
LDAPMessage *entry;
! char *searchattr[] = {LDAP_NO_ATTRS, NULL};
char *userdn;
- int rc;
LDAP *search_ld = persistent_ld;
if (!search_ld)
--- 605,613 ----
char escaped_login[256];
LDAPMessage *res = NULL;
LDAPMessage *entry;
! char *searchattr[] =
! {LDAP_NO_ATTRS, NULL};
char *userdn;
LDAP *search_ld = persistent_ld;
if (!search_ld)
***************
*** 625,630 ****
--- 631,638 ----
/* Everything is fine. This is expected when referrals
* are disabled.
*/
+ if (debug)
+ fprintf(stderr, "noreferrals && rc == LDAP_PARTIAL_RESULTS\n");
} else {
fprintf(stderr, PROGRAM_NAME ": WARNING, LDAP search error '%s'\n", ldap_err2string(rc));
#if defined(NETSCAPE_SSL)
***************
*** 639,644 ****
--- 647,654 ----
}
entry = ldap_first_entry(search_ld, res);
if (!entry) {
+ if (debug)
+ fprintf(stderr, "Ldap search returned nothing\n");
ret = 1;
goto search_done;
}
***************
*** 690,696 ****
return ret;
}
! int
readSecret(const char *filename)
{
char buf[BUFSIZ];
--- 700,706 ----
return ret;
}
! int
readSecret(const char *filename)
{
char buf[BUFSIZ];
squid-2.5.STABLE11-tcp_outgoing_xxx.patch:
cf.data.pre | 10 ++++++++++
1 files changed, 10 insertions(+)
--- NEW FILE squid-2.5.STABLE11-tcp_outgoing_xxx.patch ---
Index: squid/src/cf.data.pre
diff -c squid/src/cf.data.pre:1.245.2.99 squid/src/cf.data.pre:1.245.2.100
*** squid/src/cf.data.pre:1.245.2.99 Tue Sep 13 07:44:35 2005
--- squid/src/cf.data.pre Wed Sep 28 06:29:45 2005
***************
*** 2359,2364 ****
--- 2359,2369 ----
Processing proceeds in the order specified, and stops at first fully
matching line.
+
+ Note: The use of this directive using client dependent ACLs is
+ incompatible with the use of server side persistent connetions. To
+ ensure correct results it is best to set server_persisten_connections
+ to off when using this directive in such configurations.
DOC_END
NAME: tcp_outgoing_address
***************
*** 2385,2390 ****
--- 2390,2400 ----
Processing proceeds in the order specified, and stops at first fully
matching line.
+
+ Note: The use of this directive using client dependent ACLs is
+ incompatible with the use of server side persistent connetions. To
+ ensure correct results it is best to set server_persisten_connections
+ to off when using this directive in such configurations.
DOC_END
NAME: reply_header_max_size
squid-2.5.STABLE11.accel_single_host_pconn.patch:
http.c | 5 !!!!!
1 files changed, 5 modifications(!)
--- NEW FILE squid-2.5.STABLE11.accel_single_host_pconn.patch ---
Index: squid/src/http.c
diff -c squid/src/http.c:1.384.2.32 squid/src/http.c:1.384.2.33
*** squid/src/http.c:1.384.2.32 Sat Sep 10 19:49:54 2005
--- squid/src/http.c Wed Sep 28 14:48:19 2005
***************
*** 738,744 ****
#endif
comm_remove_close_handler(fd, httpStateFree, httpState);
fwdUnregister(fd, httpState->fwd);
! pconnPush(fd, request->host, request->port);
fwdComplete(httpState->fwd);
httpState->fd = -1;
httpStateFree(fd, httpState);
--- 738,747 ----
#endif
comm_remove_close_handler(fd, httpStateFree, httpState);
fwdUnregister(fd, httpState->fwd);
! if (request->flags.accelerated && Config.Accel.single_host && Config.Accel.host)
! pconnPush(fd, Config.Accel.host, Config.Accel.port);
! else
! pconnPush(fd, request->host, request->port);
fwdComplete(httpState->fwd);
httpState->fd = -1;
httpStateFree(fd, httpState);
Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-4/squid.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- squid.spec 23 Sep 2005 11:54:53 -0000 1.35
+++ squid.spec 29 Sep 2005 12:41:50 -0000 1.36
@@ -5,7 +5,7 @@
Summary: The Squid proxy caching server.
Name: squid
Version: 2.5.STABLE11
-Release: 1.FC4
+Release: 2.FC4
Epoch: 7
License: GPL
Group: System Environment/Daemons
@@ -18,6 +18,13 @@
Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh
+Patch100: squid-2.5.STABLE11-delaypools_truncated.patch
+Patch101: squid-2.5.STABLE11-tcp_outgoing_xxx.patch
+Patch102: squid-2.5.STABLE11-ldap_auth.patch
+Patch103: squid-2.5.STABLE11.accel_single_host_pconn.patch
+Patch104: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch
+Patch105: squid-2.5.STABLE11-CNAME.patch
+
# Local patches
# Applying upstream patches first makes it less likely that local patches
# will break upstream ones.
@@ -49,6 +56,13 @@
%prep
%setup -q
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+
%patch201 -p1 -b .config
%patch202 -p1 -b .location
%patch203 -p1 -b .build
@@ -278,6 +292,9 @@
chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
%changelog
+* Thu Sep 29 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-2.FC4
+- added patch for delay pools and some minor fixes
+
* Fri Sep 23 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-1.FC4
- update to STABLE11
- Previous message (by thread): rpms/grep/devel grep-2.5.1-egf-speedup.patch, 1.15, 1.16 grep.spec, 1.54, 1.55
- Next message (by thread): rpms/squid/FC-3 squid-2.5.STABLE11-CACHE_HTTP_PORT.patch, NONE, 1.1 squid-2.5.STABLE11-CNAME.patch, NONE, 1.1 squid-2.5.STABLE11-delaypools_truncated.patch, NONE, 1.1 squid-2.5.STABLE11-ldap_auth.patch, NONE, 1.1 squid-2.5.STABLE11-tcp_outgoing_xxx.patch, NONE, 1.1 squid-2.5.STABLE11.accel_single_host_pconn.patch, NONE, 1.1 squid.spec, 1.34, 1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list