Hello community,
here is the log from the commit of package squid
checked in at Tue Jan 9 18:41:49 CET 2007.
--------
--- squid/squid.changes 2006-12-12 13:40:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/squid/squid.changes 2007-01-09 18:38:21.524898000 +0100
@@ -1,0 +2,6 @@
+Tue Jan 9 18:37:14 CET 2007 - kssingvo@suse.de
+
+- fixed gnu ftpserver name mangling (bugzilla#230751)
+- fixed pidfile removal issue (bugzilla#223067)
+
+-------------------------------------------------------------------
New:
----
squid-2.6.STABLE6-ftp_name_fix.patch
squid-2.6.STABLE6-pidfile_remove.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid.spec ++++++
--- /var/tmp/diff_new_pack.h15689/_old 2007-01-09 18:41:41.000000000 +0100
+++ /var/tmp/diff_new_pack.h15689/_new 2007-01-09 18:41:41.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package squid (Version 2.6.STABLE6)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -17,7 +17,7 @@
%endif
Summary: Squid WWW proxy server
Version: 2.6.STABLE6
-Release: 1
+Release: 11
License: GNU General Public License (GPL)
URL: http://www.squid-cache.org
Group: Productivity/Networking/Web/Proxy
@@ -108,6 +108,8 @@
Patch100: squid_ldapauth-%{squid_ldapauth_version}.dif
Patch101: %{name}-2.5.STABLE10-64bit.patch
Patch102: %{name}-2.6.STABLE2-ldflags.patch
+Patch200: squid-2.6.STABLE6-ftp_name_fix.patch
+Patch201: squid-2.6.STABLE6-pidfile_remove.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define squidconfdir /etc/squid
@@ -196,6 +198,8 @@
)
%patch101 -p1
%patch102 -p1
+%patch200 -p0
+%patch201 -p0
%build
%{?suse_update_config:%{suse_update_config}}
@@ -399,6 +403,9 @@
%doc README.ip_user
%changelog -n squid
+* Tue Jan 09 2007 - kssingvo@suse.de
+- fixed gnu ftpserver name mangling (bugzilla#230751)
+- fixed pidfile removal issue (bugzilla#223067)
* Tue Dec 12 2006 - kssingvo@suse.de
- upgrade to 2.6.STABLE5:
* Whitespace cleanup
++++++ squid-2.6.STABLE6-ftp_name_fix.patch ++++++
Index: src/ftp.c
===================================================================
RCS file: /cvsroot/squid/squid/src/ftp.c,v
retrieving revision 1.340
diff -u -p -r1.340 ftp.c
--- src/ftp.c 18 Sep 2006 23:03:36 -0000 1.340
+++ src/ftp.c 1 Jan 2007 21:35:03 -0000
@@ -434,7 +434,7 @@ ftpListingFinish(FtpStateData * ftpState
ftpState->flags.dir_slash ? rfc1738_escape_part(ftpState->old_filepath) : ".");
} else if (ftpState->typecode == 'D') {
const char *path = ftpState->flags.dir_slash ? ftpState->filepath : ".";
- storeAppendPrintf(e, "[As extended directory]</A>\n", html_quote(path));
+ storeAppendPrintf(e, "[As extended directory]</A>\n", rfc1738_escape_part(path));
}
storeAppendPrintf(e, "
\n");
storeAppendPrintf(e, "<ADDRESS>\n");
@@ -682,8 +682,8 @@ ftpHtmlifyListEntry(const char *line, Ft
snprintf(html, 8192, "%s\n", line);
return html;
}
- if (ftpState->flags.dir_slash)
- snprintf(prefix, sizeof(prefix), "%s/", rfc1738_escape_part(ftpState->dirpath));
+ if (ftpState->flags.dir_slash && ftpState->dirpath && ftpState->typecode != 'D' )
+ snprintf(prefix, 2048, "%s/", rfc1738_escape_part(ftpState->dirpath));
else
prefix[0] = '\0';
/* Handle builtin <dirup> */
++++++ squid-2.6.STABLE6-pidfile_remove.patch ++++++
? bootstrap
Index: src/main.c
===================================================================
RCS file: /cvsroot/squid/squid/src/main.c,v
retrieving revision 1.392
diff -u -p -r1.392 main.c
--- src/main.c 23 Oct 2006 11:22:21 -0000 1.392
+++ src/main.c 9 Jan 2007 16:55:47 -0000
@@ -1114,6 +1114,11 @@ SquidShutdown(void *unused)
#endif
storeDirSync(); /* Flush log close */
storeFsDone();
+ if (Config.pidFilename && strcmp(Config.pidFilename, "none") != 0) {
+ enter_suid();
+ safeunlink(Config.pidFilename, 0);
+ leave_suid();
+ }
#if LEAK_CHECK_MODE
configFreeMemory();
storeFreeMemory();
@@ -1147,11 +1152,6 @@ SquidShutdown(void *unused)
#if MEM_GEN_TRACE
log_trace_done();
#endif
- if (Config.pidFilename && strcmp(Config.pidFilename, "none") != 0) {
- enter_suid();
- safeunlink(Config.pidFilename, 0);
- leave_suid();
- }
debug(1, 1) ("Squid Cache (Version %s): Exiting normally.\n",
version_string);
if (debug_log)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org