Hello community,
here is the log from the commit of package squid3
checked in at Mon Oct 6 17:13:12 CEST 2008.
--------
--- squid3/squid3.changes 2008-09-10 12:44:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/squid3/squid3.changes 2008-10-02 14:36:16.708055000 +0200
@@ -1,0 +2,12 @@
+Thu Oct 2 14:36:14 CEST 2008 - kssingvo@suse.de
+
+- added official patches:
+ * assertion fix in forward.cc
+ * bad links in ./configure due to website changes
+ * define DEFAULT_CACHEMGR_CONFIG before its first use
+ * don't strcmp Config.Log.store if it's NULL in storeLogOpen
+ * workaround: When dns_error_message value is lost
+ * ftp put gives bad gateway but put is correct
+ * fix of a compilation error
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
b8898.patch
b8900.patch
b8902.patch
b8904.patch
b8905.patch
b8906.patch
b8907.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid3.spec ++++++
--- /var/tmp/diff_new_pack.H12341/_old 2008-10-06 17:12:56.000000000 +0200
+++ /var/tmp/diff_new_pack.H12341/_new 2008-10-06 17:12:56.000000000 +0200
@@ -22,7 +22,7 @@
BuildRequires: openldap2-devel opensp-devel pam-devel sharutils
Summary: Squid Version 3 WWW Proxy Server
Version: 3.0.STABLE9
-Release: 1
+Release: 4
License: GPL v2 or later
Url: http://www.squid-cache.org/Versions/v3
Group: Productivity/Networking/Web/Proxy
@@ -51,13 +51,13 @@
# please read every file if there is interest about what the patch changes
# or just visit: http://www.squid-cache.org/Versions/v3/3.0/changesets/
#
-# Patch01: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8733.patch
-# Patch02: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8734.patch
-# Patch03: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8735.patch
-# Patch04: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8736.patch
-# Patch05: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8737.patch
-# Patch06: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8738.patch
-# Patch07: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8739.patch
+Patch01: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8898.patch
+Patch02: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8900.patch
+Patch03: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8902.patch
+Patch04: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8904.patch
+Patch05: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8905.patch
+Patch06: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8906.patch
+Patch07: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8907.patch
# Patch08: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8741.patch
# Patch09: http://www.squid-cache.org/Versions/v3/3.0/changesets/b8742.patch
# Patch10: http://www.squid-cache.org/Versions/v3/3.0/changesets/
@@ -160,13 +160,13 @@
%prep
%setup -q -n squid-%{version}
%patch -p1
-# %patch1 -p0
-# %patch2 -p0
-# %patch3 -p0
-# %patch4 -p0
-# %patch5 -p0
-# %patch6 -p0
-# %patch7 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
# %patch8 -p0
# %patch9 -p0
# %patch10 -p1
@@ -471,6 +471,15 @@
#%doc squid_ldapauth.conf
%changelog
+* Thu Oct 02 2008 kssingvo@suse.de
+- added official patches:
+ * assertion fix in forward.cc
+ * bad links in ./configure due to website changes
+ * define DEFAULT_CACHEMGR_CONFIG before its first use
+ * don't strcmp Config.Log.store if it's NULL in storeLogOpen
+ * workaround: When dns_error_message value is lost
+ * ftp put gives bad gateway but put is correct
+ * fix of a compilation error
* Wed Sep 10 2008 kssingvo@suse.de
- new version 3.0.STABLE9:
* Correct HTCP stats
++++++ b8898.patch ++++++
------------------------------------------------------------
revno: 8898
revision-id: squid3@treenet.co.nz-20080918100444-pkt82pkdk0khnzhe
parent: squid3@treenet.co.nz-20080911110239-w461xyjzo6y6l7rk
committer: Amos Jeffries
branch nick: SQUID_3_0
timestamp: Thu 2008-09-18 22:04:44 +1200
message:
Bug 2391: assertion failed: forward.cc:1209: "(fs->code == HIER_DIRECT) == !fs->_peer"
assert was wrong.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20080918100444-pkt82pkdk0khnzhe
# target_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0/
# testament_sha1: 2f50e9be3440180a191036c97eb1851fc5dfbf1e
# timestamp: 2008-09-18 10:50:24 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0
# base_revision_id: squid3@treenet.co.nz-20080911110239-\
# w461xyjzo6y6l7rk
#
# Begin patch
=== modified file 'src/forward.cc'
--- src/forward.cc 2008-08-15 11:13:20 +0000
+++ src/forward.cc 2008-09-18 10:04:44 +0000
@@ -1205,12 +1205,9 @@
FwdServer *fs = servers;
assert(fs);
- // some callers use one condition, some use the other; are they the same?
- assert((fs->code == HIER_DIRECT) == !fs->_peer);
-
const char *nextHop = NULL;
- if (fs->_peer) {
+ if (fs->_peer) {
// went to peer, log peer host name
nextHop = fs->_peer->name;
} else {
@@ -1221,7 +1218,7 @@
nextHop = fd_table[server_fd].ipaddr;
if (!Config.onoff.log_ip_on_direct || !nextHop[0])
nextHop = request->host; // domain name
- }
+ }
assert(nextHop);
hierarchyNote(&request->hier, fs->code, nextHop);
++++++ b8900.patch ++++++
------------------------------------------------------------
revno: 8900
revision-id: squid3@treenet.co.nz-20080919040851-o329qmeyxwvvftul
parent: squid3@treenet.co.nz-20080918103948-rh04ejvq5c2t2jw6
committer: Amos Jeffries
branch nick: SQUID_3_0
timestamp: Fri 2008-09-19 16:08:51 +1200
message:
Author: Francois Cami
Bug 2466: bad links in ./configure due to website changes
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20080919040851-o329qmeyxwvvftul
# target_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0/
# testament_sha1: bafd913c15dd08c267b6750cf2b258b0dcddb86a
# timestamp: 2008-09-19 04:50:24 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0
# base_revision_id: squid3@treenet.co.nz-20080918103948-\
# rh04ejvq5c2t2jw6
#
# Begin patch
=== modified file 'configure.in'
--- configure.in 2008-09-09 14:53:44 +0000
+++ configure.in 2008-09-19 04:08:51 +0000
@@ -935,7 +935,7 @@
AC_ARG_ENABLE(cache-digests,
[ --enable-cache-digests Use Cache Digests
- see http://www.squid-cache.org/FAQ/FAQ-16.html],
+ see http://wiki.squid-cache.org/SquidFaq/CacheDigests],
[ if test "$enableval" = "yes" ; then
echo "USE_CACHE_DIGESTS enabled"
AC_DEFINE(USE_CACHE_DIGESTS,1,[Use Cache Digests for locating objects in neighbor caches. This code is still semi-experimental.])
@@ -3051,7 +3051,7 @@
if test "$SQUID_MAXFD" -lt 512 ; then
echo "WARNING: $SQUID_MAXFD may not be enough filedescriptors if your"
echo " cache will be very busy. Please see the FAQ page"
- echo " http://www.squid-cache.org/FAQ/FAQ-11.html#filedescriptors"
+ echo " http://wiki.squid-cache.org/SquidFaq/TroubleShooting"
echo " on how to increase your filedescriptor limit"
sleep 10
fi
++++++ b8902.patch ++++++
------------------------------------------------------------
revno: 8902
revision-id: amosjeffries@squid-cache.org-20080920092448-s3rsllhf4nrmeqrm
parent: squidadm@squid-cache.org-20080920001448-wgnvdt4st8wd06nd
committer: Amos Jeffries
branch nick: SQUID_3_0
timestamp: Sat 2008-09-20 03:24:48 -0600
message:
Author: Luigi Gangitano
Define DEFAULT_CACHEMGR_CONFIG before its first use.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: amosjeffries@squid-cache.org-20080920092448-\
# s3rsllhf4nrmeqrm
# target_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0/
# testament_sha1: 926c099a6914ae1b4c1b489f8c95cf55ddea62cf
# timestamp: 2008-09-20 09:50:41 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0
# base_revision_id: squidadm@squid-cache.org-20080920001448-\
# wgnvdt4st8wd06nd
#
# Begin patch
=== modified file 'tools/Makefile.am'
--- tools/Makefile.am 2008-05-19 05:24:50 +0000
+++ tools/Makefile.am 2008-09-20 09:24:48 +0000
@@ -23,6 +23,8 @@
libexec_PROGRAMS = \
cachemgr$(CGIEXT)
+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
+
squidclient_SOURCES = squidclient.cc
cachemgr__CGIEXT__SOURCES = cachemgr.cc
cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS)
@@ -32,8 +34,6 @@
EXTRA_DIST = \
cachemgr.conf
-DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
-
$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
install-data-local:
++++++ b8904.patch ++++++
------------------------------------------------------------
revno: 8904
revision-id: amosjeffries@squid-cache.org-20080926135031-q1ms2gsnq1sx6o80
parent: squidadm@squid-cache.org-20080921001423-mn64qhwj95tul4cj
committer: Amos Jeffries
branch nick: SQUID_3_0
timestamp: Fri 2008-09-26 07:50:31 -0600
message:
Author: Benno Rice
Don't strcmp Config.Log.store if it's NULL in storeLogOpen.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: amosjeffries@squid-cache.org-20080926135031-\
# q1ms2gsnq1sx6o80
# target_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0/
# testament_sha1: db63091ae79c41eb740fb8676afa73183102621d
# timestamp: 2008-09-26 14:50:16 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0
# base_revision_id: squidadm@squid-cache.org-20080921001423-\
# mn64qhwj95tul4cj
#
# Begin patch
=== modified file 'src/store_log.cc'
--- src/store_log.cc 2007-08-13 23:20:50 +0000
+++ src/store_log.cc 2008-09-26 13:50:31 +0000
@@ -127,7 +127,7 @@
void
storeLogOpen(void)
{
- if (strcmp(Config.Log.store, "none") == 0) {
+ if (Config.Log.store == NULL || strcmp(Config.Log.store, "none") == 0) {
debugs(20, 1, "Store logging disabled");
return;
}
++++++ b8905.patch ++++++
------------------------------------------------------------
revno: 8905
revision-id: squid3@treenet.co.nz-20080927100605-m9d2j5gtfs4whshl
parent: amosjeffries@squid-cache.org-20080926135031-q1ms2gsnq1sx6o80
committer: Amos Jeffries
branch nick: SQUID_3_0
timestamp: Sat 2008-09-27 22:06:05 +1200
message:
Author: Alex Rousskov
Bug #2459 workaround: When dns_error_message value is lost,
use "lost DNS error" text and log at level 1 to inform the administrator
about the internal error.
This temporary hack does not fix the incorrect DNS error value problem, only
the lost one.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20080927100605-m9d2j5gtfs4whshl
# target_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0/
# testament_sha1: 9c56e173e6c27312f4f1bbe8500ffae52e49143c
# timestamp: 2008-09-27 10:50:25 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0
# base_revision_id: amosjeffries@squid-cache.org-20080926135031-\
# q1ms2gsnq1sx6o80
#
# Begin patch
=== modified file 'src/forward.cc'
--- src/forward.cc 2008-09-18 10:04:44 +0000
+++ src/forward.cc 2008-09-27 10:06:05 +0000
@@ -697,7 +697,7 @@
ErrorState *anErr = errorCon(ERR_DNS_FAIL, HTTP_SERVICE_UNAVAILABLE, request);
- anErr->dnsserver_msg = xstrdup(dns_error_message);
+ anErr->dnsserver_msg = xstrdup(dns_error_message_safe());
fail(anErr);
=== modified file 'src/fqdncache.cc'
--- src/fqdncache.cc 2007-10-13 06:02:28 +0000
+++ src/fqdncache.cc 2008-09-27 10:06:05 +0000
@@ -823,3 +823,14 @@
}
#endif /*SQUID_SNMP */
+
+/// XXX: a hack to work around the missing DNS error info
+// see http://www.squid-cache.org/bugs/show_bug.cgi?id=2459
+const char *
+dns_error_message_safe()
+{
+ if (dns_error_message)
+ return dns_error_message;
+ debugs(35,DBG_IMPORTANT, "Internal error: lost DNS error info");
+ return "lost DNS error";
+}
=== modified file 'src/protos.h'
--- src/protos.h 2008-07-17 13:02:33 +0000
+++ src/protos.h 2008-09-27 10:06:05 +0000
@@ -135,6 +135,8 @@
SQUIDCEXTERN void dnsInit(void);
extern void dnsRegisterWithCacheManager(CacheManager & manager);
SQUIDCEXTERN void dnsSubmit(const char *lookup, HLPCB * callback, void *data);
+/// XXX: a temporary hack to work around the missing DNS error info
+const char *dns_error_message_safe();
/* dns_internal.c */
SQUIDCEXTERN void idnsInit(void);
=== modified file 'src/tunnel.cc'
--- src/tunnel.cc 2008-05-12 02:31:23 +0000
+++ src/tunnel.cc 2008-09-27 10:06:05 +0000
@@ -568,7 +568,7 @@
debugs(26, 4, "tunnelConnect: Unknown host: " << tunnelState->host);
err = errorCon(ERR_DNS_FAIL, HTTP_NOT_FOUND, request);
*tunnelState->status_ptr = HTTP_NOT_FOUND;
- err->dnsserver_msg = xstrdup(dns_error_message);
+ err->dnsserver_msg = xstrdup(dns_error_message_safe());
err->callback = tunnelErrorComplete;
err->callback_data = tunnelState;
errorSend(tunnelState->client.fd(), err);
++++++ b8906.patch ++++++
------------------------------------------------------------
revno: 8906
revision-id: squid3@treenet.co.nz-20080927102013-x67gvk6c7yxeo5ok
parent: squid3@treenet.co.nz-20080927100605-m9d2j5gtfs4whshl
committer: Amos Jeffries
branch nick: SQUID_3_0
timestamp: Sat 2008-09-27 22:20:13 +1200
message:
Bug 2433: Ftp put gives bad gateway but put is correct
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20080927102013-x67gvk6c7yxeo5ok
# target_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0/
# testament_sha1: 7a2325deb7634cc712e7aef87d9f718f0035ac0e
# timestamp: 2008-09-27 10:50:31 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0
# base_revision_id: squid3@treenet.co.nz-20080927100605-\
# m9d2j5gtfs4whshl
#
# Begin patch
=== modified file 'src/ftp.cc'
--- src/ftp.cc 2007-09-27 20:34:06 +0000
+++ src/ftp.cc 2008-09-27 10:20:13 +0000
@@ -3352,8 +3352,12 @@
void
FtpStateData::doneSendingRequestBody()
{
- debugs(9,3,HERE << "doneSendingRequestBody");
- ftpWriteTransferDone(this);
+ debugs(9,3,HERE);
+ dataComplete();
+/* NP: RFC 959 3.3. DATA CONNECTION MANAGEMENT
+ * if transfer type is 'stream' call dataComplete()
+ * otherwise leave open. (reschedule control channel read?)
+ */
}
// a hack to ensure we do not double-complete on the forward entry.
++++++ b8907.patch ++++++
------------------------------------------------------------
revno: 8907
revision-id: squid3@treenet.co.nz-20080927133220-oc98mr1am6ngaz6s
parent: squid3@treenet.co.nz-20080927102013-x67gvk6c7yxeo5ok
committer: Amos Jeffries
branch nick: SQUID_3_0
timestamp: Sun 2008-09-28 01:32:20 +1200
message:
Compile errors.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20080927133220-oc98mr1am6ngaz6s
# target_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0/
# testament_sha1: a9987fbd6f35b6ebeaa927e8eea36f8c0d9418cf
# timestamp: 2008-09-27 13:50:16 +0000
# source_branch: http://www.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_0
# base_revision_id: squid3@treenet.co.nz-20080927102013-\
# x67gvk6c7yxeo5ok
#
# Begin patch
=== modified file 'src/fqdncache.cc'
--- src/fqdncache.cc 2008-09-27 10:06:05 +0000
+++ src/fqdncache.cc 2008-09-27 13:32:20 +0000
@@ -831,6 +831,6 @@
{
if (dns_error_message)
return dns_error_message;
- debugs(35,DBG_IMPORTANT, "Internal error: lost DNS error info");
+ debugs(35,1, "Internal error: lost DNS error info");
return "lost DNS error";
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org