Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2013-01-14 09:49:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2013-01-03 08:44:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2013-01-14 09:49:46.000000000 +0100 @@ -1,0 +2,13 @@ +Sun Jan 13 20:09:22 UTC 2013 - [email protected] + +- Changes to squid-3.2.6 (09 Jan 2013): + - Regression Bug 3731: TOS setsockopt() requires int value + - Regression Bug 3712: Rotating logs overwrites the previous log + - Bug 3727: LLVM compile errors in kerberos_ldap_group + - Bug 3650: Negotiate auth missing challenge token + - Additional fixes for CVE-2012-5643 / SQUID:2012-1 + * http://www.squid-cache.org/Advisories/SQUID-2012_1.txt + * http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5643 +- rebase nobuilddates, config patches + +------------------------------------------------------------------- Old: ---- squid-3.2.5.tar.bz2 squid-3.2.5.tar.bz2.asc New: ---- squid-3.2.6.tar.bz2 squid-3.2.6.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.Xk0Z7R/_old 2013-01-14 09:49:48.000000000 +0100 +++ /var/tmp/diff_new_pack.Xk0Z7R/_new 2013-01-14 09:49:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package squid # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Summary: Squid Version 3.2 WWW Proxy Server License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Version: 3.2.5 +Version: 3.2.6 Release: 0 Url: http://www.squid-cache.org/Versions/v3/3.2 Source0: http://www.squid-cache.org/Versions/v3/3.2/%{name}-%{version}.tar.bz2 @@ -135,8 +135,8 @@ * Cache Manager access changes First STABLE release Date: 02 Aug 2010 - Latest Release: 3.2.5 - Latest Release Date: 10 Dec 2012 + Latest Release: 3.2.6 + Latest Release Date: 08 Jan 2013 %prep %gpg_verify %{S:1} ++++++ RELEASENOTES.html ++++++ --- /var/tmp/diff_new_pack.Xk0Z7R/_old 2013-01-14 09:49:48.000000000 +0100 +++ /var/tmp/diff_new_pack.Xk0Z7R/_new 2013-01-14 09:49:48.000000000 +0100 @@ -2,10 +2,10 @@ <HTML> <HEAD> <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.66"> - <TITLE>Squid 3.2.5 release notes</TITLE> + <TITLE>Squid 3.2.6 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 3.2.5 release notes</H1> +<H1>Squid 3.2.6 release notes</H1> <H2>Squid Developers</H2> <HR> @@ -72,7 +72,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.2.5 for +<P>The Squid Team are pleased to announce the release of Squid-3.2.6 for testing.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v3/3.2/";>http://www.squid-cache.org/Versions/v3/3.2/</A> or the ++++++ squid-3.2.5.tar.bz2 -> squid-3.2.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/ChangeLog new/squid-3.2.6/ChangeLog --- old/squid-3.2.5/ChangeLog 2012-12-10 10:53:26.000000000 +0100 +++ new/squid-3.2.6/ChangeLog 2013-01-09 02:41:51.000000000 +0100 @@ -1,3 +1,11 @@ +Changes to squid-3.2.6 (09 Jan 2013): + + - Regression Bug 3731: TOS setsockopt() requires int value + - Regression Bug 3712: Rotating logs overwrites the previous log + - Bug 3727: LLVM compile errors in kerberos_ldap_group + - Bug 3650: Negotiate auth missing challenge token + - Additional fixes for CVE-2012-5643 / SQUID:2012-1 + Changes to squid-3.2.5 (10 Dec 2012): - Bug 3698: Add missing include of errno.h @@ -451,6 +459,10 @@ - ... and a great many testing improvements - ... and many documentation updates +Changes to squid-3.1.23 (09 Jan 2013): + + - Additional fixes for CVE-2012-5643 / SQUID:2012-1 + Changes to squid-3.1.22 (03 Dec 2012): - Bug 3685: Squid hangs in Delay Pools ClassCBucket::update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/RELEASENOTES.html new/squid-3.2.6/RELEASENOTES.html --- old/squid-3.2.5/RELEASENOTES.html 2012-12-10 11:15:13.000000000 +0100 +++ new/squid-3.2.6/RELEASENOTES.html 2013-01-09 03:06:07.000000000 +0100 @@ -2,10 +2,10 @@ <HTML> <HEAD> <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.66"> - <TITLE>Squid 3.2.5 release notes</TITLE> + <TITLE>Squid 3.2.6 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 3.2.5 release notes</H1> +<H1>Squid 3.2.6 release notes</H1> <H2>Squid Developers</H2> <HR> @@ -72,7 +72,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.2.5 for +<P>The Squid Team are pleased to announce the release of Squid-3.2.6 for testing.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v3/3.2/";>http://www.squid-cache.org/Versions/v3/3.2/</A> or the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/configure new/squid-3.2.6/configure --- old/squid-3.2.5/configure 2012-12-10 10:54:50.000000000 +0100 +++ new/squid-3.2.6/configure 2013-01-09 02:42:47.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.2.5. +# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.2.6. # # Report bugs to <http://bugs.squid-cache.org/>. # @@ -575,8 +575,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.2.5' -PACKAGE_STRING='Squid Web Proxy 3.2.5' +PACKAGE_VERSION='3.2.6' +PACKAGE_STRING='Squid Web Proxy 3.2.6' PACKAGE_BUGREPORT='http://bugs.squid-cache.org/' PACKAGE_URL='' @@ -1571,7 +1571,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Squid Web Proxy 3.2.5 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1641,7 +1641,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.2.5:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.2.6:";; esac cat <<\_ACEOF @@ -2019,7 +2019,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.2.5 +Squid Web Proxy configure 3.2.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -3115,7 +3115,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Squid Web Proxy $as_me 3.2.5, which was +It was created by Squid Web Proxy $as_me 3.2.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3934,7 +3934,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.2.5' + VERSION='3.2.6' cat >>confdefs.h <<_ACEOF @@ -30894,7 +30894,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Squid Web Proxy $as_me 3.2.5, which was +This file was extended by Squid Web Proxy $as_me 3.2.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30960,7 +30960,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Squid Web Proxy config.status 3.2.5 +Squid Web Proxy config.status 3.2.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/configure.ac new/squid-3.2.6/configure.ac --- old/squid-3.2.5/configure.ac 2012-12-10 10:54:50.000000000 +0100 +++ new/squid-3.2.6/configure.ac 2013-01-09 02:42:47.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([Squid Web Proxy],[3.2.5],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.2.6],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/helpers/basic_auth/DB/basic_db_auth.8 new/squid-3.2.6/helpers/basic_auth/DB/basic_db_auth.8 --- old/squid-3.2.5/helpers/basic_auth/DB/basic_db_auth.8 2012-12-10 11:13:05.000000000 +0100 +++ new/squid-3.2.6/helpers/basic_auth/DB/basic_db_auth.8 2013-01-09 03:05:47.000000000 +0100 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_DB_AUTH 1" -.TH BASIC_DB_AUTH 1 "2012-12-10" "perl v5.10.1" "User Contributed Perl Documentation" +.TH BASIC_DB_AUTH 1 "2013-01-08" "perl v5.10.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_ldap.cc new/squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_ldap.cc --- old/squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2012-12-10 10:53:26.000000000 +0100 +++ new/squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_ldap.cc 2013-01-09 02:41:51.000000000 +0100 @@ -109,9 +109,6 @@ void *params) { struct ldap_creds *cp = (struct ldap_creds *) params; - url = url; - request = request; - msgid = msgid; return tool_sasl_bind(ld, cp->dn, cp->pw); } #endif @@ -127,9 +124,6 @@ void *params) { struct ldap_creds *cp = (struct ldap_creds *) params; - url = url; - request = request; - msgid = msgid; return ldap_bind_s(ld, cp->dn, cp->pw, LDAP_AUTH_SIMPLE); } @@ -192,9 +186,6 @@ void *params) { struct ldap_creds *cp = (struct ldap_creds *) params; - url = url; - request = request; - msgid = msgid; return tool_sasl_bind(ld, cp->dn, cp->pw); } #endif @@ -211,9 +202,6 @@ { struct ldap_creds *cp = (struct ldap_creds *) params; - url = url; - request = request; - msgid = msgid; return ldap_bind_s(ld, cp->dn, cp->pw, LDAP_AUTH_SIMPLE); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_sasl.cc new/squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_sasl.cc --- old/squid-3.2.5/helpers/external_acl/kerberos_ldap_group/support_sasl.cc 2012-12-10 10:53:26.000000000 +0100 +++ new/squid-3.2.6/helpers/external_acl/kerberos_ldap_group/support_sasl.cc 2013-01-09 02:41:51.000000000 +0100 @@ -136,7 +136,6 @@ { const char *dflt = interact->defresult; - flags = flags; switch (interact->id) { case SASL_CB_GETREALM: if (defaults) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 new/squid-3.2.6/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 --- old/squid-3.2.5/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2012-12-10 11:13:17.000000000 +0100 +++ new/squid-3.2.6/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2013-01-09 03:05:51.000000000 +0100 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "EXT_WBINFO_GROUP_ACL.PL.IN 1" -.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2012-12-10" "perl v5.10.1" "User Contributed Perl Documentation" +.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2013-01-08" "perl v5.10.1" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/helpers/log_daemon/file/log_file_daemon.cc new/squid-3.2.6/helpers/log_daemon/file/log_file_daemon.cc --- old/squid-3.2.5/helpers/log_daemon/file/log_file_daemon.cc 2012-12-10 10:53:26.000000000 +0100 +++ new/squid-3.2.6/helpers/log_daemon/file/log_file_daemon.cc 2013-01-09 02:41:51.000000000 +0100 @@ -61,8 +61,8 @@ fprintf(stderr, "WARNING: remove '%s' failure: %s\n", to, xstrerror()); } #endif - if (rename(path, to) < 0 && errno != ENOENT) { - fprintf(stderr, "WARNING: rename '%s' to '%s' failure: %s\n", path, to, xstrerror()); + if (rename(from, to) < 0 && errno != ENOENT) { + fprintf(stderr, "WARNING: rename '%s' to '%s' failure: %s\n", from, to, xstrerror()); } } if (rotate_count > 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/include/version.h new/squid-3.2.6/include/version.h --- old/squid-3.2.5/include/version.h 2012-12-10 10:54:51.000000000 +0100 +++ new/squid-3.2.6/include/version.h 2013-01-09 02:42:47.000000000 +0100 @@ -9,7 +9,7 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1355133201 +#define SQUID_RELEASE_TIME 1357695708 #endif #ifndef APP_SHORTNAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/src/auth/negotiate/auth_negotiate.cc new/squid-3.2.6/src/auth/negotiate/auth_negotiate.cc --- old/squid-3.2.5/src/auth/negotiate/auth_negotiate.cc 2012-12-10 10:53:26.000000000 +0100 +++ new/squid-3.2.6/src/auth/negotiate/auth_negotiate.cc 2013-01-09 02:41:51.000000000 +0100 @@ -67,9 +67,6 @@ static int authnegotiate_initialised = 0; /// \ingroup AuthNegotiateInternal -Auth::Negotiate::Config negotiateConfig; - -/// \ingroup AuthNegotiateInternal static hash_table *proxy_auth_cache = NULL; /* @@ -293,7 +290,7 @@ Auth::UserRequest::Pointer Auth::Negotiate::Config::decode(char const *proxy_auth) { - Auth::Negotiate::User *newUser = new Auth::Negotiate::User(&negotiateConfig); + Auth::Negotiate::User *newUser = new Auth::Negotiate::User(Auth::Config::Find("negotiate")); Auth::UserRequest *auth_user_request = new Auth::Negotiate::UserRequest(); assert(auth_user_request->user() == NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/src/ip/Qos.cci new/squid-3.2.6/src/ip/Qos.cci --- old/squid-3.2.5/src/ip/Qos.cci 2012-12-10 10:53:26.000000000 +0100 +++ new/squid-3.2.6/src/ip/Qos.cci 2013-01-09 02:41:51.000000000 +0100 @@ -4,8 +4,13 @@ int Ip::Qos::setSockTos(const Comm::ConnectionPointer &conn, tos_t tos) { -#ifdef IP_TOS - int x = setsockopt(conn->fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos_t)); +#if defined(IP_TOS) + // Bug 3731: FreeBSD produces 'invalid option' + // unless we pass it a 32-bit variable storing 8-bits of data. + // NP: it is documented as 'int' for all systems, even those like Linux which accept 8-bit char + // so we convert to a int before setting. + int bTos = tos; + int x = setsockopt(conn->fd, IPPROTO_IP, IP_TOS, &bTos, sizeof(bTos)); if (x < 0) debugs(50, 2, "Ip::Qos::setSockTos: setsockopt(IP_TOS) on " << conn << ": " << xstrerror()); return x; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/squid-3.2.5/tools/cachemgr.cc new/squid-3.2.6/tools/cachemgr.cc --- old/squid-3.2.5/tools/cachemgr.cc 2012-12-10 10:53:26.000000000 +0100 +++ new/squid-3.2.6/tools/cachemgr.cc 2013-01-09 02:41:51.000000000 +0100 @@ -980,10 +980,10 @@ // limit the input to something reasonable. // 4KB should be enough for the GET/POST data length, but may be extended. - size_t bufLen = (len >= 4096 ? len : 4095); + size_t bufLen = (len < 4096 ? len : 4095); char *buf = (char *)xmalloc(bufLen + 1); - size_t readLen = fread(buf, bufLen, 1, stdin); + size_t readLen = fread(buf, 1, bufLen, stdin); if (readLen == 0) { xfree(buf); return NULL; @@ -992,9 +992,9 @@ len -= readLen; // purge the remainder of the request entity - while (len > 0) { + while (len > 0 && readLen) { char temp[65535]; - readLen = fread(temp, 65535, 1, stdin); + readLen = fread(temp, 1, 65535, stdin); len -= readLen; } ++++++ squid-3.2.5.tar.bz2.asc -> squid-3.2.6.tar.bz2.asc ++++++ --- /work/SRC/openSUSE:Factory/squid/squid-3.2.5.tar.bz2.asc 2013-01-03 08:44:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new/squid-3.2.6.tar.bz2.asc 2013-01-14 09:49:46.000000000 +0100 @@ -1,8 +1,8 @@ -File: squid-3.2.5.tar.bz2 -Date: Mon Dec 10 10:16:15 UTC 2012 -Size: 2893104 -MD5 : ddb329f92056aa58a56db6a2eeea0c02 -SHA1: 6b945d41a9c0e993b978186b846035a241e79a7e +File: squid-3.2.6.tar.bz2 +Date: Wed Jan 9 02:06:27 UTC 2013 +Size: 2893158 +MD5 : 87915ad83aebafc7af6871c770b23339 +SHA1: 00d6020959bc2ebb5ce1e1037211bb143c6ec1e4 Key : 0xFF5CF463 <[email protected]> fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 keyring = http://www.squid-cache.org/pgp.asc @@ -10,11 +10,11 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) -iQEcBAABAgAGBQJQxcSsAAoJELJo5wb/XPRjikEIANGXmlZFreiKJm7GjCf3FIOT -Relj7MfKAY6smt0RqZVFoOSnNRf59NQbkkHkDlXKOkUWwtbWRb0U0YQo5Zi0BHlf -yw4xtkw1kbTLR5TCayLvuViBjMajC0Rjca22YnK0CttijG7qQOmTtX0JVYMZZHBl -WTKv9rckXz9fmeLTCH57TGz1H1ekAzC2gmY/AzYqmlgDvuioZPnhgiQUgfqsnmII -pxwUXNldZ0eK/WOwKGi+ReyWSgR4P/nlko3K28/yomADWYSH/al1xFmVWxeJPdoq -ejzYCA1KYg4jYszscLOuUW/2ajnzXpxl3a2R7oilg6hRir22j+QZiGnbU/DItTo= -=0bG7 +iQEcBAABAgAGBQJQ7NRJAAoJELJo5wb/XPRjRe4H/RHn9uno3yFoGdGvUKISB9rK +q458KYXJpSNi5PgUjykS9p/lfqFYPaDVRjhlcwReLdVepE0TqNSB2c9sAHmjNWDv +kWT3FORiWcDe69LuYZx1q88MMJ95vBZI/c91zTFDfCMi0tq8lopfDOfU9sFhkeaB ++8vGVFOx+IF79SZCq8mqdrjGpQPapuRA9Tx0Yj49iYsyVVTkwqJafjTfTyCk0udA +GivODIFZcjvz4zDRMwsI4z7LkOsQuyfYM7jiUCOc2O9JI6WqVkor5b01CxdPtZdt +UnGfBaGMOPed6kWy45fiiTx2qLaCcwoIvXv20yFQErSfIukSwx5h5CkuGll5EpU= +=hlS1 -----END PGP SIGNATURE----- ++++++ squid-config.patch ++++++ --- /var/tmp/diff_new_pack.Xk0Z7R/_old 2013-01-14 09:49:49.000000000 +0100 +++ /var/tmp/diff_new_pack.Xk0Z7R/_new 2013-01-14 09:49:49.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/cf.data.pre.orig +++ src/cf.data.pre -@@ -1073,6 +1073,8 @@ http_access deny CONNECT !SSL_ports +@@ -1081,6 +1081,8 @@ http_access deny CONNECT !SSL_ports # Adapt localnet in the ACL section to list your (internal) IP networks # from where browsing should be allowed http_access allow localnet @@ -11,7 +11,7 @@ http_access allow localhost # And finally deny all other access to this proxy -@@ -2774,6 +2776,10 @@ DOC_START +@@ -2782,6 +2784,10 @@ DOC_START Instead, if you want Squid to use the entire disk drive, subtract 20% and use that value. @@ -22,7 +22,7 @@ 'L1' is the number of first-level subdirectories which will be created under the 'Directory'. The default is 16. -@@ -2888,7 +2894,7 @@ DOC_START +@@ -2896,7 +2902,7 @@ DOC_START NOCOMMENT_START # Uncomment and adjust the following to add a disk cache directory. @@ -31,7 +31,7 @@ NOCOMMENT_END DOC_END -@@ -3395,7 +3401,7 @@ DOC_END +@@ -3407,7 +3413,7 @@ DOC_END NAME: logfile_rotate TYPE: int ++++++ squid-nobuilddates.patch ++++++ --- /var/tmp/diff_new_pack.Xk0Z7R/_old 2013-01-14 09:49:49.000000000 +0100 +++ /var/tmp/diff_new_pack.Xk0Z7R/_new 2013-01-14 09:49:49.000000000 +0100 @@ -37,7 +37,7 @@ =================================================================== --- helpers/external_acl/LM_group/ext_lm_group_acl.cc.orig +++ helpers/external_acl/LM_group/ext_lm_group_acl.cc -@@ -545,8 +545,7 @@ main(int argc, char *argv[]) +@@ -546,8 +546,7 @@ main(int argc, char *argv[]) if (!DefaultDomain) DefaultDomain = xstrdup(machinedomain); } @@ -90,7 +90,7 @@ =================================================================== --- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc.orig +++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc -@@ -680,7 +680,7 @@ manage_request() +@@ -683,7 +683,7 @@ manage_request() int main(int argc, char *argv[]) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
