Hello community,
here is the log from the commit of package squid3 for openSUSE:Factory
checked in at Tue Jul 5 15:19:56 CEST 2011.
--------
--- squid3/squid3.changes 2011-05-03 19:58:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/squid3/squid3.changes 2011-07-04 23:16:49.000000000 +0200
@@ -1,0 +2,73 @@
+Mon Jul 4 22:05:17 UTC 2011 - chris@computersalat.de
+
+- update to 3.1.14
+ - Regression Bug 3261: Could not create a DNS socket and exit
+- 3.1.13
+ - Regression Bug 3239: problems with myip/myport upgrade
+ - Bug 3153: hung ICAP RESPMOD transactions
+ - Update ssl_crtd to use 'OK' status inline with other helpers
+- remove obsolete upstream patches (10319,10320)
+
+-------------------------------------------------------------------
+Mon Jun 27 13:42:53 UTC 2011 - chris@computersalat.de
+
+- add upstream patches
+ o 10319, SourceFormat Enforcemen
+ o 10320, Bug 3153: additional compile fixes
+
+-------------------------------------------------------------------
+Sun Jun 19 18:37:40 UTC 2011 - chris@computersalat.de
+
+- update to 3.1.12.3
+ - Bug 3236: Port of %oa, % 3.1.12.3
+ o nobuilddates 3.1.12 -> 3.1.12.3
+- remove obsolete patches
+ o 3.1.11-unused
+ o 3.1.12-no-sslv2
+
+-------------------------------------------------------------------
+Thu Jun 2 14:33:36 UTC 2011 - chris@computersalat.de
+
+- update to 3.1.12.2
+ - Bug 3226: Tags from external ACLs do not correctly expire
+ - Bug 3215: Malformed IPv6 DNS reverse lookup
+ - Bug 3209: ssl-bumped requests forwarded unencrypted to the parent proxies/caches
+ - Bug 3205: SSL-bump starts then hangs
+ - Bug 3178: gcc-4.6 complains unused variables
+ - Bug 3122: Unknown record type in WCCPv2 Packet (6)
+ - Bug 2965 (partial): Compile errors on MinGW
+ - Fix to only ssl-bump CONNECT requests if they are about to be tunneled
+ - Fix cache manager display of -i/+i in regex ACL config display
+ - Fix cache manager display of cache_peer options userhash and sourcehash
+ - Fix URL re-writer loosing many transaction details
+ - Fix always-true comparison in ICAP for some 32-bit platforms
+ - Support for 'slow' group ACLs in ssl_bump access control
+ - Support OpenSSL 1.0.0 built without SSLv2
+ - Support GCC 4.6 and binutils-gold
+ - Add CSS id attribute to BODY tag of generated error pages.
+ - Display WARNING and ERROR when max_filedescriptors has failed
+
+-------------------------------------------------------------------
+Thu May 5 19:27:36 UTC 2011 - chris@computersalat.de
+
+- update to 3.1.12.1
+ - Port from 3.2: Dynamic SSL Certificate generation
+ - Bug 3194: selinux may prevent ntlm_smb_lm_auth from using /tmp
+ - Bug 3185: 3.1.11 fails to compile on OpenBSD 4.8 and 4.9
+ - Bug 3183: Invalid URL accepted with url host part of only '@'
+ - Display ERROR in cache.log for invalid configured paths
+ - Cache Manager: send User-Agent header from cachemgr.cgi
+ - ... and many portability compile fixes for non-GCC systems.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
squid-3.1.10-swapdir.patch
squid-3.1.11-unused.patch
squid-3.1.12-no-sslv2.patch
squid-3.1.12-nobuilddates.patch
squid-3.1.12.tar.bz2
New:
----
squid-3.1.12.3-nobuilddates.patch
squid-3.1.12.3-swapdir.patch
squid-3.1.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid3.spec ++++++
--- /var/tmp/diff_new_pack.rCxG1L/_old 2011-07-05 14:56:54.000000000 +0200
+++ /var/tmp/diff_new_pack.rCxG1L/_new 2011-07-05 14:56:54.000000000 +0200
@@ -21,8 +21,8 @@
Name: squid3
Summary: Squid Version 3 WWW Proxy Server
-Version: 3.1.12
-Release: 7
+Version: 3.1.14
+Release: 1
License: GPLv2+
Group: Productivity/Networking/Web/Proxy
AutoReqProv: on
@@ -45,18 +45,14 @@
# 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/
#
-#Patch0: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9107.patch
+#Patch0: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10319.patch
#
# some useful defaults for squid
Patch100: squid-3.1.12-config.patch
# FIX SWAPDIR - make it a configure option
-Patch101: squid-3.1.10-swapdir.patch
-# FIX for insecure SSLv2 - allow build without SSLv2
-Patch102: squid-3.1.12-no-sslv2.patch
+Patch101: squid-3.1.12.3-swapdir.patch
# make build compare happy - remove build dates
-Patch103: squid-3.1.12-nobuilddates.patch
-# PATCH-FIX-UPSTREAM squid-3.1.11-unused.patch idoenmez@suse.de -- Remove write-only variables to fix gcc 4.6 compilation
-Patch104: squid-3.1.11-unused.patch
+Patch102: squid-3.1.12.3-nobuilddates.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq
@@ -102,7 +98,7 @@
%setup -q -n squid-%{version}
%{__cp} %{S:10} .
# upstream patches after RELEASE
-#%patch0 -p0
+#patch0 -p0
##### other patches
%patch100 -p1
%if 0%{suse_version} > 1010
@@ -110,9 +106,7 @@
%endif
perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find -name "*.pl"`
chmod a-x CREDITS
-%patch102
-%patch103
-%patch104 -p1
+%patch102 -p1
%build
%if 0%{suse_version} > 1010
++++++ RELEASENOTES.html ++++++
--- /var/tmp/diff_new_pack.rCxG1L/_old 2011-07-05 14:56:54.000000000 +0200
+++ /var/tmp/diff_new_pack.rCxG1L/_new 2011-07-05 14:56:54.000000000 +0200
@@ -2,10 +2,10 @@
<HTML>
<HEAD>
<META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.66">
- <TITLE>Squid 3.1.12 release notes</TITLE>
+ <TITLE>Squid 3.1.14 release notes</TITLE>
</HEAD>
<BODY>
-<H1>Squid 3.1.12 release notes</H1>
+<H1>Squid 3.1.14 release notes</H1>
<H2>Squid Developers</H2>
<HR>
@@ -31,9 +31,10 @@
<LI><A NAME="toc2.5">2.5</A> <A HREF="#ss2.5">Connection Pinning (for NTLM Auth Passthrough)</A>
<LI><A NAME="toc2.6">2.6</A> <A HREF="#ss2.6">Quality of Service (QoS) Flow support</A>
<LI><A NAME="toc2.7">2.7</A> <A HREF="#ss2.7">SSL Bump (for HTTPS Filtering and Adaptation)</A>
-<LI><A NAME="toc2.8">2.8</A> <A HREF="#ss2.8">eCAP Adaptation Module support</A>
-<LI><A NAME="toc2.9">2.9</A> <A HREF="#ss2.9">ICAP Bypass and Retry enhancements</A>
-<LI><A NAME="toc2.10">2.10</A> <A HREF="#ss2.10">ICY streaming protocol support</A>
+<LI><A NAME="toc2.8">2.8</A> <A HREF="#ss2.8">Dynamic SSL Certificate Generation</A>
+<LI><A NAME="toc2.9">2.9</A> <A HREF="#ss2.9">eCAP Adaptation Module support</A>
+<LI><A NAME="toc2.10">2.10</A> <A HREF="#ss2.10">ICAP Bypass and Retry enhancements</A>
+<LI><A NAME="toc2.11">2.11</A> <A HREF="#ss2.11">ICY streaming protocol support</A>
</UL>
<P>
<H2><A NAME="toc3">3.</A> <A HREF="#s3">Changes to squid.conf since Squid-3.0</A></H2>
@@ -70,7 +71,7 @@
<HR>
<H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2>
-<P>The Squid Team are pleased to announce the release of Squid-3.1.12</P>
+<P>The Squid Team are pleased to announce the release of Squid-3.1.14</P>
<P>This new release is available for download from
<A HREF="http://www.squid-cache.org/Versions/v3/3.1/">http://www.squid-cache.org/Versions/v3/3.1/</A> or the
<A HREF="http://www.squid-cache.org/Mirrors/http-mirrors.html">mirrors</A>.</P>
@@ -98,6 +99,7 @@
<UL>
<LI>Windows support is still largely missing.</LI>
<LI>AIX support for building with the IBM compiler is broken.</LI>
+<LI>OpenSSL 1.0.0 support is incomplete.</LI>
</UL>
</P>
@@ -124,6 +126,7 @@
<LI>eCAP Adaptation Module support</LI>
<LI>ICAP Bypass and Retry enhancements</LI>
<LI>ICY streaming protocol support</LI>
+<LI>Dynamic SSL Certificate Generation (3.1.12.1 and later)</LI>
</UL>
</P>
<P>Most user-facing changes are reflected in squid.conf (see below).</P>
@@ -306,7 +309,7 @@
</H2>
<P>Details in
-<A HREF="http://wiki.squid-cache.org/Features/ConnPinn">The Squid wiki</A></P>
+<A HREF="http://wiki.squid-cache.org/Features/ConnPin">The Squid wiki</A></P>
<P>Squid 3.1 includes the much asked for Connection Pinning feature from Squid 2.6.</P>
@@ -371,8 +374,30 @@
configuration. Use of interception for port 443 is not officially supported, despite
being known to work under certain limited networking circumstances.</P>
+<H2><A NAME="ss2.8">2.8</A> <A HREF="#toc2.8">Dynamic SSL Certificate Generation</A>
+</H2>
+
+<P> SslBump users know how many certificate warnings a single complex site
+(using dedicated image, style, and/or advertisement servers for embedded content)
+can generate. The warnings are legitimate and are caused by Squid-provided site
+certificate. Two things may be wrong with that certificate:
+<UL>
+<LI> Squid certificate is not signed by a trusted authority.</LI>
+<LI> Squid certificate name does not match the site domain name.</LI>
+</UL>
+
+Squid can do nothing about (A), but in most targeted environments, users will
+trust the "man in the middle" authority and install the corresponding root
+certificate.</P>
+
+<P>To avoid mismatch (B), the DynamicSslCert feature concentrates on generating
+site certificates that match the requested site domain name. Please note that
+the browser site name check does not really add much security in an SslBump
+environment where the user already trusts the "man in the middle". The check
+only adds warnings and creates page rendering problems in browsers that try to
+reduce the number of warnings by blocking some embedded content.</P>
-<H2><A NAME="ss2.8">2.8</A> <A HREF="#toc2.8">eCAP Adaptation Module support</A>
+<H2><A NAME="ss2.9">2.9</A> <A HREF="#toc2.9">eCAP Adaptation Module support</A>
</H2>
<P>Details in
@@ -384,7 +409,7 @@
<P>Currently known and available eCAP modules are listed in the wiki feature page on eCAP.</P>
-<H2><A NAME="ss2.9">2.9</A> <A HREF="#toc2.9">ICAP Bypass and Retry enhancements</A>
+<H2><A NAME="ss2.10">2.10</A> <A HREF="#toc2.10">ICAP Bypass and Retry enhancements</A>
</H2>
<P>Details in
@@ -446,7 +471,7 @@
environments yet may be small enough to limit side-effects of loops.</P>
-<H2><A NAME="ss2.10">2.10</A> <A HREF="#toc2.10">ICY streaming protocol support</A>
+<H2><A NAME="ss2.11">2.11</A> <A HREF="#toc2.11">ICY streaming protocol support</A>
</H2>
<P>Squid-3.1 adds native support for streaming protocol ICY.
@@ -1047,6 +1072,12 @@
</PRE>
</P>
+<DT><B>sslcrtd_program</B><DD>
+<P>Specify the location and options of the executable for ssl_crtd process.</P>
+
+<DT><B>sslcrtd_children</B><DD>
+<P> Configures the number of sslcrtd processes to spawn</P>
+
<DT><B>sslproxy_cert_error</B><DD>
<P>New Access Control to selectively bypass server certificate validation errors.
DEFAULT: None bypassed.
@@ -1239,6 +1270,9 @@
<DT><B>debug_options rotate=</B><DD>
<P>New parameter rotate=N to control number of cache.log rotations independent of other logs.</P>
+<DT><B>deny_info</B><DD>
+<P>Support 307 status for redirecting CONNECT tunnels with HTTPS traffic.</P>
+
<DT><B>external_acl_type</B><DD>
<P>New options 'ipv4' and 'ipv6' are added to set the IPv4/v6 protocol between Squid and its helpers.
Please be aware of some limits to these options. These options only affet the transport protocol used
@@ -1278,7 +1312,7 @@
X-Forwarded-For header.
If set to "truncate", Squid will remove all existing
- X-Forwarded-For entries, and place itself as the sole entry.
+ X-Forwarded-For entries, and place the client IP as the sole entry.
</PRE>
</P>
@@ -1376,10 +1410,12 @@
<P>No longer controls cache.log rotation. Use debug_options rotate=N instead.</P>
<DT><B>logformat</B><DD>
-<P>New log format tag sets %icap::* %adapt::* for adaptation information.
-%Hs tag deprecated and replaced by request/reply specific >Hs and <Hs
-new %>ha option to log HTTP request headers after adaptation and redirection.
-HTTP request/reply format tags may now be optionally prefixed with http::.
+<P>New log format tag sets %icap::* %adapt::* for adaptation information.</P>
+<P>%Hs tag deprecated and replaced by request/reply specific >Hs and <Hs</P>
+<P>New <EM>%<la</EM> Local IP address of the last server or peer connection. Ported from 2.7 where it is called <EM>%oa</EM>.</P>
+<P>New <EM>%<lp</EM> Local port number of the last server or peer connection.</P>
+<P>New <EM>%>ha</EM> to log HTTP request headers after adaptation and redirection.</P>
+<P>HTTP request/reply format tags may now be optionally prefixed with http::.
Old forms will be deprecated in some as yet undecided future release.
<PRE>
dt Total time spent making DNS lookups (milliseconds)
@@ -1575,6 +1611,10 @@
original or indirect client when a request has been forwarded through other
proxies.</P>
+<DT><B>--enable-ssl-crtd</B><DD>
+<P>Prevent Squid from direct generation of SSL private key and
+certificate request and instead enables the <EM>ssl_crtd</EM> processes.</P>
+
<DT><B>--enable-zph-qos</B><DD>
<P>Build with support for ZPH Quality of Service controls</P>
@@ -1604,27 +1644,6 @@
<P>A copy of the latest translated files can instead be downloaded from
<A HREF="http://www.squid-cache.org/Versions/langpack/">http://www.squid-cache.org/Versions/langpack/</A></P>
-<DT><B>--with-dns-cname</B><DD>
-<P>Enable CNAME recursion within the Internal DNS resolver stub squid uses.
-This has no effect on the external DNS helper.</P>
-<P>Please note this extension is still experimental and may encounter problems.
-To see if it is actually needed you can run squid without it for a period and
-check the CNAME-Only Requests statistics squid maintains.</P>
-<P>If it produces ongoing serious problems the external helper may be needed
-but please report the bugs anyway.</P>
-
-<DT><B>--with-libexpat / --without-libexpat</B><DD>
-<P>Require libexpat XML parser to be built into Squid for ESI parsing.
-Build will fail if this option is used and the library is not present.
-Default is to auto-detect it when using ESI and ignore if not present.
-Use --without-libexpat to prevent it being auto-detected.</P>
-
-<DT><B>--with-libxml2 / --without-libxml2</B><DD>
-<P>Require libxml2 XML parser to be built into Squid for ESI parsing.
-Build will fail if this option is used and the library is not present.
-Default is to auto-detect it when building with ESI.
-Use --without-libxml2 to prevent it being auto-detected.</P>
-
<DT><B>--with-logdir=PATH</B><DD>
<P>Allow build-time configuration of Default location for Squid logs.</P>
@@ -1735,6 +1754,9 @@
<DT><B>incoming_rate</B><DD>
<P>Obsolete.</P>
+<DT><B>logformat</B><DD>
+<P><EM>%oa</EM> tag replaced by <EM>%<la</EM></P>
+
<DT><B>redirector_bypass</B><DD>
<P>Replaced by <EM>url_rewrite_bypass</EM></P>
@@ -1912,7 +1934,6 @@
<P>Not yet ported from 2.7.</P>
<DT><B>logformat</B><DD>
-<P><EM>%oa</EM> tag not yet ported from 2.7</P>
<P><EM>%sn</EM> tag not yet ported from 2.7</P>
<DT><B>max_stale</B><DD>
++++++ squid-3.1.12-nobuilddates.patch -> squid-3.1.12.3-nobuilddates.patch ++++++
--- squid3/squid-3.1.12-nobuilddates.patch 2011-04-11 05:04:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/squid3/squid-3.1.12.3-nobuilddates.patch 2011-06-19 20:02:51.000000000 +0200
@@ -1,6 +1,19 @@
---- helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c.orig
-+++ helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c
-@@ -430,8 +430,7 @@ main(int argc, char *argv[])
+diff -ruN squid-3.1.12.3-orig/helpers/basic_auth/mswin_sspi/mswin_auth.c squid-3.1.12.3/helpers/basic_auth/mswin_sspi/mswin_auth.c
+--- squid-3.1.12.3-orig/helpers/basic_auth/mswin_sspi/mswin_auth.c 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/helpers/basic_auth/mswin_sspi/mswin_auth.c 2011-06-19 20:28:24.000000000 +0200
+@@ -118,7 +118,7 @@
+ my_program_name = argv[0];
+ 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_BASIC, NTLM_PACKAGE_NAME) == NULL) {
+ fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n");
+diff -ruN squid-3.1.12.3-orig/helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c squid-3.1.12.3/helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c
+--- squid-3.1.12.3-orig/helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c 2011-06-19 20:28:24.000000000 +0200
+@@ -430,8 +430,7 @@
if (!DefaultDomain)
DefaultDomain = xstrdup(machinedomain);
}
@@ -10,9 +23,10 @@
if (use_global)
debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain);
if (use_case_insensitive_compare)
---- helpers/external_acl/mswin_lm_group/win32_check_group.c.orig
-+++ helpers/external_acl/mswin_lm_group/win32_check_group.c
-@@ -546,8 +546,7 @@ main(int argc, char *argv[])
+diff -ruN squid-3.1.12.3-orig/helpers/external_acl/mswin_lm_group/win32_check_group.c squid-3.1.12.3/helpers/external_acl/mswin_lm_group/win32_check_group.c
+--- squid-3.1.12.3-orig/helpers/external_acl/mswin_lm_group/win32_check_group.c 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/helpers/external_acl/mswin_lm_group/win32_check_group.c 2011-06-19 20:28:24.000000000 +0200
+@@ -546,8 +546,7 @@
if (!DefaultDomain)
DefaultDomain = xstrdup(machinedomain);
}
@@ -22,20 +36,22 @@
if (use_global)
debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain);
if (use_case_insensitive_compare)
---- helpers/ntlm_auth/mswin_sspi/ntlm_auth.c.orig
-+++ helpers/ntlm_auth/mswin_sspi/ntlm_auth.c
-@@ -381,7 +381,7 @@ main(int argc, char *argv[])
+diff -ruN squid-3.1.12.3-orig/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c squid-3.1.12.3/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c
+--- squid-3.1.12.3-orig/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/helpers/negotiate_auth/mswin_sspi/negotiate_auth.c 2011-06-19 20:28:24.000000000 +0200
+@@ -299,7 +299,7 @@
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) {
+ if (LoadSecurityDll(SSP_NTLM, NEGOTIATE_PACKAGE_NAME) == NULL) {
fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n");
---- helpers/ntlm_auth/fakeauth/fakeauth_auth.c.orig
-+++ helpers/ntlm_auth/fakeauth/fakeauth_auth.c
-@@ -389,7 +389,7 @@ main(int argc, char *argv[])
+diff -ruN squid-3.1.12.3-orig/helpers/ntlm_auth/fakeauth/fakeauth_auth.c squid-3.1.12.3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
+--- squid-3.1.12.3-orig/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-06-19 20:28:24.000000000 +0200
+@@ -387,7 +387,7 @@
process_options(argc, argv);
@@ -44,36 +60,28 @@
while (fgets(buf, BUFFER_SIZE, stdin) != NULL) {
user[0] = '\0'; /*no usercode */
---- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c.orig
-+++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c
-@@ -461,7 +461,7 @@ manage_request()
- int
- main(int argc, char *argv[])
- {
-- debug("ntlm_auth build " __DATE__ ", " __TIME__ " starting up...\n");
-+ debug("ntlm_auth starting up...\n");
- #ifdef DEBUG
- debug("changing dir to /tmp\n");
- if (chdir("/tmp") != 0) {
---- helpers/negotiate_auth/mswin_sspi/negotiate_auth.c.orig
-+++ helpers/negotiate_auth/mswin_sspi/negotiate_auth.c
-@@ -299,7 +299,7 @@ main(int argc, char *argv[])
+diff -ruN squid-3.1.12.3-orig/helpers/ntlm_auth/mswin_sspi/ntlm_auth.c squid-3.1.12.3/helpers/ntlm_auth/mswin_sspi/ntlm_auth.c
+--- squid-3.1.12.3-orig/helpers/ntlm_auth/mswin_sspi/ntlm_auth.c 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/helpers/ntlm_auth/mswin_sspi/ntlm_auth.c 2011-06-19 20:28:24.000000000 +0200
+@@ -381,7 +381,7 @@
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) {
+ if (LoadSecurityDll(SSP_NTLM, NTLM_PACKAGE_NAME) == NULL) {
fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n");
---- helpers/basic_auth/mswin_sspi/mswin_auth.c.orig
-+++ helpers/basic_auth/mswin_sspi/mswin_auth.c
-@@ -118,7 +118,7 @@ main(int argc, char **argv)
+diff -ruN squid-3.1.12.3-orig/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c squid-3.1.12.3/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c
+--- squid-3.1.12.3-orig/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c 2011-06-19 20:29:54.000000000 +0200
+@@ -461,7 +461,7 @@
+ 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);
-
-- debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name);
-+ debug("%s starting up...\n", my_program_name);
-
- if (LoadSecurityDll(SSP_BASIC, NTLM_PACKAGE_NAME) == NULL) {
- fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n");
+Dateien squid-3.1.12.3-orig/helpers/ntlm_auth/smb_lm/.ntlm_smb_lm_auth.c.rej.swp und squid-3.1.12.3/helpers/ntlm_auth/smb_lm/.ntlm_smb_lm_auth.c.rej.swp sind verschieden.
++++++ squid-3.1.10-swapdir.patch -> squid-3.1.12.3-swapdir.patch ++++++
--- squid3/squid-3.1.10-swapdir.patch 2011-01-04 12:53:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/squid3/squid-3.1.12.3-swapdir.patch 2011-06-19 20:02:51.000000000 +0200
@@ -1,6 +1,6 @@
-diff -ruN squid-3.1.10-orig/configure.ac squid-3.1.10/configure.ac
---- squid-3.1.10-orig/configure.ac 2010-12-22 06:48:27.000000000 +0100
-+++ squid-3.1.10/configure.ac 2011-01-04 12:47:51.000000000 +0100
+diff -ruN squid-3.1.12.3-orig/configure.ac squid-3.1.12.3/configure.ac
+--- squid-3.1.12.3-orig/configure.ac 2011-06-18 11:05:11.000000000 +0200
++++ squid-3.1.12.3/configure.ac 2011-06-19 20:14:38.000000000 +0200
@@ -198,6 +198,21 @@
)
AC_SUBST(DEFAULT_LOG_DIR)
@@ -23,27 +23,27 @@
DEFAULT_PIDFILE="$localstatedir/run/squid.pid"
AC_ARG_WITH(pidfile,
AS_HELP_STRING([--with-pidfile=PATH],[Default location for squid PID file. default: PREFIX/var/run/squid.pid]),
-diff -ruN squid-3.1.10-orig/src/Makefile.am squid-3.1.10/src/Makefile.am
---- squid-3.1.10-orig/src/Makefile.am 2010-12-22 06:46:56.000000000 +0100
-+++ squid-3.1.10/src/Makefile.am 2011-01-04 12:46:29.000000000 +0100
-@@ -721,7 +721,7 @@
+diff -ruN squid-3.1.12.3-orig/src/Makefile.am squid-3.1.12.3/src/Makefile.am
+--- squid-3.1.12.3-orig/src/Makefile.am 2011-06-18 11:02:56.000000000 +0200
++++ squid-3.1.12.3/src/Makefile.am 2011-06-19 20:16:00.000000000 +0200
+@@ -729,7 +729,7 @@
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_SWAP_DIR = $(DEFAULT_SWAPDIR)
+ DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
-diff -ruN squid-3.1.10-orig/src/Makefile.in squid-3.1.10/src/Makefile.in
---- squid-3.1.10-orig/src/Makefile.in 2010-12-22 06:47:54.000000000 +0100
-+++ squid-3.1.10/src/Makefile.in 2011-01-04 12:46:29.000000000 +0100
-@@ -2026,7 +2026,7 @@
+diff -ruN squid-3.1.12.3-orig/src/Makefile.in squid-3.1.12.3/src/Makefile.in
+--- squid-3.1.12.3-orig/src/Makefile.in 2011-06-18 11:04:27.000000000 +0200
++++ squid-3.1.12.3/src/Makefile.in 2011-06-19 20:16:37.000000000 +0200
+@@ -2061,7 +2061,7 @@
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
DEFAULT_PID_FILE = $(DEFAULT_PIDFILE)
DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
-DEFAULT_SWAP_DIR = $(localstatedir)/cache
+DEFAULT_SWAP_DIR = $(DEFAULT_SWAPDIR)
+ DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
++++++ squid-3.1.12.tar.bz2 -> squid-3.1.14.tar.bz2 ++++++
++++ 23793 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org