Makefile.am                                                 |  5 +----

 QUICKSTART                                                  | 13 ++++++-------

 acinclude/pam.m4                                            |  8 ++++----

 .../external/eDirectory_userip/ext_edirectory_userip_acl.cc |  2 +-

 src/anyp/Uri.cc                                             |  2 +-

 src/auth/basic/SMB_LM/msntauth.cc                           |  4 ++--

 src/cf.data.pre                                             |  6 +++++-

 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am

index 3c26dfc79..8fbd943ac 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -6,11 +6,8 @@

 ##

 AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign

-DIST_SUBDIRS	= compat lib libltdl scripts icons errors contrib doc src test-suite tools

+DIST_SUBDIRS	= compat lib scripts icons errors contrib doc src test-suite tools

 SUBDIRS		= compat lib

-if ENABLE_LOADABLE_MODULES

-SUBDIRS += libltdl

-endif

 SUBDIRS += scripts icons errors doc src tools test-suite

 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*

diff --git a/QUICKSTART b/QUICKSTART

index 2808e4ce9..d73e1bc47 100644

--- a/QUICKSTART

+++ b/QUICKSTART

@@ -10,10 +10,9 @@ After you retrieved, compiled and installed the Squid software (see

 INSTALL in the same directory), you have to configure the squid.conf

 file. This is the list of the values you *need* to change, because no

 sensible defaults could be defined. Do not touch the other variables

-for now.  We assume you have installed Squid in the default location:

-/usr/local/squid

+for now.

-Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:

+Uncomment and edit the following lines in /etc/squid/squid.conf:

 ==============================================================================

@@ -52,7 +51,7 @@ cache_effective_user

     as after startup (typically "nobody" and "nogroup").  Do not use

     "root", for security reasons.

-cache_dir ufs /usr/local/squid/var/cache 100 16 256

+cache_dir ufs /var/spool/squid 100 16 256

     Add here (first number, here 100) the amount of hard disk space 

     (in megabytes) to devote to caching.

@@ -80,12 +79,12 @@ After editing squid.conf to your liking, run Squid from the command

 line TWICE:

 To create any disk cache_dir configured:

-    % /usr/local/squid/sbin/squid -z

+    % /usr/sbin/squid -z

 To start squid:

-    % /usr/local/squid/sbin/squid 

+    % /usr/sbin/squid 

-Check in the cache.log (/usr/local/squid/var/logs/cache.log) that

+Check in the cache.log (/var/log/squid/cache.log) that

 everything is all right.

 Once Squid created all its files (it can take several minutes on some

diff --git a/acinclude/pam.m4 b/acinclude/pam.m4

index 1f423403e..6ec781aa9 100644

--- a/acinclude/pam.m4

+++ b/acinclude/pam.m4

@@ -20,16 +20,16 @@ AC_DEFUN([CHECK_STRUCT_PAM_CONV], [

                   squid_cv_pam_conv_signature, [

     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

 #include <security/pam_appl.h>

-static int

-password_conversation(int, const struct pam_message **, struct pam_response **, void *) { return 0; }

+extern int

+password_conversation(int, const struct pam_message **, struct pam_response **, void *);

 static struct pam_conv conv = { &password_conversation, 0 };

 ]])], [

    squid_cv_pam_conv_signature=linux

 ],[

     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

 #include <security/pam_appl.h>

-static int

-password_conversation(int, struct pam_message **, struct pam_response **, void *) { return 0; }

+extern int

+password_conversation(int, struct pam_message **, struct pam_response **, void *);

 static struct pam_conv conv = { &password_conversation, 0 };

 ]])], [

   squid_cv_pam_conv_signature=solaris

diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc

index 3274609a5..eb9012f39 100644

--- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc

+++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc

@@ -1555,7 +1555,7 @@ MainSafe(int argc, char **argv)

         /* BINARY DEBUGGING *

                     local_printfx("while() -> bufa[%" PRIuSIZE "]: %s", k, bufa);

                     for (i = 0; i < k; ++i)

-                      local_printfx("%02X", bufa[i]);

+                      local_printfx("%02X", static_cast<unsigned int>(static_cast<unsigned char>(bufa[i])));

                     local_printfx("\n");

         * BINARY DEBUGGING */

         /* Check for CRLF */

diff --git a/src/anyp/Uri.cc b/src/anyp/Uri.cc

index e37293996..eca2c2357 100644

--- a/src/anyp/Uri.cc

+++ b/src/anyp/Uri.cc

@@ -71,7 +71,7 @@ AnyP::Uri::Encode(const SBuf &buf, const CharacterSet &ignore)

     while (!tk.atEnd()) {

         // TODO: Add Tokenizer::parseOne(void).

         const auto ch = tk.remaining()[0];

-        output.appendf("%%%02X", static_cast<unsigned int>(ch)); // TODO: Optimize using a table

+        output.appendf("%%%02X", static_cast<unsigned int>(static_cast<unsigned char>(ch))); // TODO: Optimize using a table

         (void)tk.skip(ch);

         if (tk.prefix(goodSection, ignore))

diff --git a/src/auth/basic/SMB_LM/msntauth.cc b/src/auth/basic/SMB_LM/msntauth.cc

index 48cf2770b..fcfe479b2 100644

--- a/src/auth/basic/SMB_LM/msntauth.cc

+++ b/src/auth/basic/SMB_LM/msntauth.cc

@@ -60,7 +60,7 @@ struct domaincontroller {

 typedef std::vector<domaincontroller> domaincontrollers_t;

 domaincontrollers_t domaincontrollers;

-bool

+static bool

 validate_user(char *username, char *password)

 {

     for (domaincontrollers_t::iterator dc = domaincontrollers.begin(); dc != domaincontrollers.end(); ++dc) {

@@ -74,7 +74,7 @@ validate_user(char *username, char *password)

 }

 static char instructions[] = "Usage instructions: basic_nsnt_auth <domainname>/<domaincontroller> [<domainname>/<domaincontroller> ...]";

-void

+static void

 display_usage_instructions()

 {

     using std::endl;

diff --git a/src/cf.data.pre b/src/cf.data.pre

index 44aa34d66..78d951a1c 100644

--- a/src/cf.data.pre

+++ b/src/cf.data.pre

@@ -5453,9 +5453,13 @@ DOC_END

 NAME: logfile_rotate

 TYPE: int

-DEFAULT: 10

+DEFAULT: 0

 LOC: Config.Log.rotateNumber

 DOC_START

+	ALT Linux is using the logrotate mechanism and therefore the

+	rotation is done externaly, which means a default of 0 is

+	required and therefore set. Modify /etc/logrotate.d/squid instead.

+

 	Specifies the default number of logfile rotations to make when you

 	type 'squid -k rotate'. The default is 10, which will rotate

 	with extensions 0 through 9. Setting logfile_rotate to 0 will