patch configure to correctly find libxml2
(cherry picked from commit 7b2c2521f79bb680afb64af07759b1096a9aa4a8)
Switching to masterfiles inventory_os.description for attribute_name OS for portability

(cherry picked from commit 090a3a7f93d1d608dc4159a800f3d0284f9c1778)
improve verbose message for package_list_command
Instead of only list arg[0] list while command, eg:
old: Reading package list from /usr/bin/env
new: Reading package list from '/usr/bin/env DEBIAN_FRONTEND=noninteractive LC_ALL=C PATH=/bin:/sbin/:/usr/bin:/usr/sbin /usr/bin/dpkg -l
see discussion in: https://groups.google.com/forum/#!topic/help-cfengine/nH6bR-n2x_c
(cherry picked from commit 1d0a8c19c4ea6af44ed990cb99d762f2a1bbcf4f)
also adjust message for old log format
(cherry picked from commit 0ad62f91bfaa0e7fcf45dedf5f1747d576e1713f)
Redmine #6441: Fix software_packages.csv being regenerated every time.

Do not allow '\r' to make it into the package string. If the package
manager puts '\r' at the end of the lines, it will cause later
comparisons to fail, so make sure to filter it out.
(cherry picked from commit 6b3e4608cff3624592ea7e0e901a0f0634f31a2b)
Fix memory leak in IsProcessNameRunning().

When it finds a matching row, it breaks out of the loop over rows;
otherwise, it free()s the fragments into which it parsed the line that
just failed.  The matching line's fragments need free()d just as much.

(cherry picked from commit 54f1e64a5c284da152e71b7edbcc552de085e5a7)
Redmine #6370: Discard call collect connection.

Instead of sending "BAD: Unspecified server refusal
(see verbose server output)" message to the call collected client
which is not having access to call collect simply refuse connection.

Message sent to the client is interpreted as a call collect queue
length and client assumes that connection is valid.

(cherry picked from commit 9a5e8c5b1cc65a3f681d6acfced407612673be95)
Redmine #6434: Fix AIX missing a lot of log output.

It happens because we list a static library as a dependency for
libpromises, and then we list the same static library as a dependency
for a binary that depends on libpromises. Then the symbol will be
included both in the library and in the binary.

Exactly how the symbols are resolved appears to be platform dependent,
but what can happen is this: At any point, when you call a duplicate
symbol, depending on where you call it from, you will either call the
version in the binary or in the library. This is fine, since they both
contain exactly the same code. However, they do not refer to the same
global symbols. They each have their own set. This means that
something that was initialized in the binary may not be initialized in
the library, even though the symbol name is the same. This has weird
effects, like a symbol suddenly switching from a valid value to zero
when the stack trace crosses a library boundary.

The problem was observed on AIX, where the log level randomly switches
between verbose and non-verbose, depending on where the Log() function
was called from.

(cherry picked from commit da7d7457b8f14f11f71fb4ea345688b311418742)
Redmine #4716: Lots of fixes to dirname(), esp. on Windows.

These problems were fixed:
* AddSlash() always adds Unix slash when argument is empty.
* DeleteSlash() removes root slash.
* DeleteSlash() does not handle repeated path separators.
* FirstFileSeparator() returns NULL on all relative Unix paths, even
  if it has a file separator.
* ChopLastNode() gives empty string when removing last directory
  component of a relative path. It should give '.'.
* ChopLastNode() does not handle Windows drive letters.
* ChopLastNode() does not handle repeated path separators.
* IsAbsoluteFileName() does not handle absolute paths on Windows that
  don't start with a drive letter. Both types are considered absolute
  paths.

This also fixes a Windows issue where creating a directory in policy
would lead to an error message about not being able to chdir into a
directory with the name ''. This was due to the final root slash not
being preserved.

(cherry picked from commit 1b6ac94a576b13dfc5dd5b2e5b12ccce655101f6)
Revert "Remove uninitialized buffers as source of entropy."

This reverts commit 570724e752cf131132bb88e65a031f700b0ac424.

The reason is that in a chroot testing environment, there isn't enough
entropy available to satisfy OpenSSL, so it will bail out. Reverting
is not the correct fix for the problem, but right now we need tests to
pass, so postponing this for later.

Conflicts:

	libpromises/crypto.c

(cherry picked from commit f0865c7682036ef78bb4b3ac27ea0d6a898b7958)
the detection of the package manager was wrong

(cherry picked from commit b68b49fe53540c1d9b9edebdd1d205bb8094b921)
the cache file is now valid, so we only have one package match

(cherry picked from commit 71af0b96568db065be5e7caa667f891aeddebd6f)
re-enable acceptance tests which now pass on solaris

(cherry picked from commit b2dc9eb028ced32ff350d60e7f80034876f2cd26)
redmine6476: Aborting on low entropy is too drastic.

Rather than reverting the whole commit involved, keep what we can of
it and Log() instead of UnexpectedError(), at least until Jimis can
invent some better way to respond to this.

(cherry picked from commit e7f0dc7983ff1242df8c9b602a0db08190097ae3)
Pass the path to pcre.h to the compiler

(cherry picked from commit a8d82ab6d737100dea7992f1fcd9fe759cd14adc)
Correct return from BusyWith functions after ReceiveCollectCall().

Forwarding its return to our caller wasn't smart: we should return
false either way, because cf-serverd's side of the connection got
closed whether it succeeded (handed off to cf-hub) or failed
(abandoned).  Returning true was leading the caller to call the
BusyWith function again, producing a distracting TLS_Read failure.

In addition, on failure, BusyWithClassicConnection() would - due to a
misguided fall-through - wrongly report an unexpected command, if we
ever let it support call-collect.  Now it returns false.

(cherry picked from commit b1735f77faf3936230580b2b842a2cd99e3422db)
Assert known constraints, log debug on any success.

ServerTLSPeek() would log the data it peeked, but only when deciding
it has TLS; I'd like to be able to see it also for classic.

As recv() definitely shouldn't return more than the buffer size it was
given, assert this, tweak the first check (any negative is failure,
not just -1, albeit only -1 should happen) and simplify the rest.  The
TLS case wasn't checking got == peek_size (as the CAUTH case did), but
can take this for granted (given the assertions) now.

(cherry picked from commit 0c10b9e0c00ac4a2db9f44d69bf4433abcc8e717)
Restructure ServerEntryPoint() to avoid duplication of tidy-up.

I'm about to complicate that tidy-up and I'd rather do it in one place
than five.

(cherry picked from commit c2be570c9fac109bc84d8b45f69f9addeeddb60c)
Don't mark call-collect as processed until it is.

In cf-serverd's StartServer, we were calling CollectCallMarkProcessed
right after the call to ServerEntryPoint; but that merely spawns a
thread to do the work, it doesn't wait for it to complete.  So mark
the connection info object and move the CollectCallMarkProcessed to
where that gets destroyed - when we've finished delivering our report,
or when we abandon the attempt for whatever reason.

(cherry picked from commit 07b76834628ed1dc99127a9dce5391fbdb8cf304)
Set policy_server everywhere we set am_policy_hub.

The recent change to replace am_policy_hub with policy_server broke
various things because cf-serverd wasn't seeing the new class defined.
So fix the places that set am_policy_hub without setting its
replacement also.  Also, various of those weren't using the right
metadata, so add a function that sets both classes, to be called by
all the places that used to set am_policy_hub, so that they all use
the right attributes and also set policy_server.

(cherry picked from commit ed7035e4b2459614f2a09f51686bbb7dfb410f45)