autofs-5.0.4 - fix dumb libxml2 check

From: Ian Kent <raven@themaw.net>

The workaround for libxml2 not deleting its thread specific data
key at library unload has become broken. It was foolish of me to
think that the libxml2 folks would fix this in any reasonable time.
This patch changes the version check to 99 for the major and minor
revisions, the same as the check for the revision to ensure that
the workaround is always used and adds the setting to the build
information produced by the -V option.
---

 aclocal.m4         |    4 ++--
 configure          |    4 ++--
 daemon/automount.c |   10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)


--- autofs-5.0.3.orig/aclocal.m4
+++ autofs-5.0.3/aclocal.m4
@@ -201,10 +201,10 @@ else
   XML_FLAGS=`$XML_CONFIG --cflags`
   XML_VER=`$XML_CONFIG --version`
   XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
-  if test $XML_MAJOR -le 2
+  if test $XML_MAJOR -le 99
   then
     XML_MINOR=`echo $XML_VER|cut -d\. -f2`
-    if test $XML_MINOR -le 6
+    if test $XML_MINOR -le 99
     then
       XML_REV=`echo $XML_VER|cut -d\. -f3`
       if test $XML_REV -le 99; then
--- autofs-5.0.3.orig/configure
+++ autofs-5.0.3/configure
@@ -2564,10 +2564,10 @@ echo "${ECHO_T}yes" >&6; }
   XML_FLAGS=`$XML_CONFIG --cflags`
   XML_VER=`$XML_CONFIG --version`
   XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
-  if test $XML_MAJOR -le 2
+  if test $XML_MAJOR -le 99
   then
     XML_MINOR=`echo $XML_VER|cut -d\. -f2`
-    if test $XML_MINOR -le 6
+    if test $XML_MINOR -le 99
     then
       XML_REV=`echo $XML_VER|cut -d\. -f3`
       if test $XML_REV -le 99; then
--- autofs-5.0.3.orig/daemon/automount.c
+++ autofs-5.0.3/daemon/automount.c
@@ -1776,6 +1776,16 @@ static void show_build_info(void)
 #ifdef WITH_DMALLOC
 	printf("WITH_DMALLOC ");
 	count = count + 13;
+
+	if (count > 60) {
+		printf("\n  ");
+		count = 0;
+	}
+#endif
+
+#ifdef LIBXML2_WORKAROUND
+	printf("LIBXML2_WORKAROUND ");
+	count = count + 19;
 #endif
 
 	printf("\n\n");