Imported Upstream version 2.6.2

include/Makefile.in

@@ -44,6 +44,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 \
 	$(top_srcdir)/m4/nut_arg_with.m4 \
 	$(top_srcdir)/m4/nut_check_asciidoc.m4 \
+	$(top_srcdir)/m4/nut_check_libavahi.m4 \
+	$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
 	$(top_srcdir)/m4/nut_check_libgd.m4 \
 	$(top_srcdir)/m4/nut_check_libhal.m4 \
 	$(top_srcdir)/m4/nut_check_libneon.m4 \
@@ -110,10 +112,14 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
+LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
 LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
 LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
 LIBHAL_LIBS = @LIBHAL_LIBS@
+LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
+LIBIPMI_LIBS = @LIBIPMI_LIBS@
 LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
 LIBNEON_LIBS = @LIBNEON_LIBS@
 LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@@ -151,6 +157,10 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PORT = @PORT@
 RANLIB = @RANLIB@
 RUN_AS_GROUP = @RUN_AS_GROUP@
 RUN_AS_USER = @RUN_AS_USER@
@@ -215,6 +225,8 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+systemdsystemshutdowndir = @systemdsystemshutdowndir@
+systemdsystemunitdir = @systemdsystemunitdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@

include/config.h.in

@@ -36,6 +36,18 @@
 /* Define to 1 if you have the `atexit' function. */
 #undef HAVE_ATEXIT
 
+/* Define to 1 if you have the <avahi-client/client.h> header file. */
+#undef HAVE_AVAHI_CLIENT_CLIENT_H
+
+/* Define to 1 if you have the `avahi_client_new' function. */
+#undef HAVE_AVAHI_CLIENT_NEW
+
+/* Define to 1 if you have the <avahi-common/malloc.h> header file. */
+#undef HAVE_AVAHI_COMMON_MALLOC_H
+
+/* Define to 1 if you have the `avahi_free' function. */
+#undef HAVE_AVAHI_FREE
+
 /* Define to 1 if you have the `cfsetispeed' function. */
 #undef HAVE_CFSETISPEED
 
@@ -77,6 +89,9 @@
 /* Define to 1 if you have the `flock' function. */
 #undef HAVE_FLOCK
 
+/* Define to 1 if you have the <freeipmi/freeipmi.h> header file. */
+#undef HAVE_FREEIPMI_FREEIPMI_H
+
 /* Define to 1 if you have the <gdfontmb.h> header file. */
 #undef HAVE_GDFONTMB_H
 
@@ -86,6 +101,9 @@
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
+/* Define to 1 if you have the `getopt_long' function. */
+#undef HAVE_GETOPT_LONG
+
 /* Define to 1 if you have the `getpassphrase' function. */
 #undef HAVE_GETPASSPHRASE
 
@@ -101,6 +119,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <ipmi_monitoring.h> header file. */
+#undef HAVE_IPMI_MONITORING_H
+
 /* Define if you have Boutell's libgd installed */
 #undef HAVE_LIBGD
 
@@ -149,6 +170,9 @@
 /* Define to 1 if you have the `pm_connect' function. */
 #undef HAVE_PM_CONNECT
 
+/* Define to enable pthread support code */
+#undef HAVE_PTHREAD
+
 /* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
@@ -325,6 +349,18 @@
 /* Version number of package */
 #undef VERSION
 
+/* Define to enable avahi support */
+#undef WITH_AVAHI
+
+/* Define to enable IPMI support using FreeIPMI */
+#undef WITH_FREEIPMI
+
+/* Define to enable IPMI support */
+#undef WITH_IPMI
+
+/* Define to enable Neon XML/HTTP support */
+#undef WITH_NEON
+
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD

include/nut_version.h

@@ -1,3 +1,3 @@
 /* Autogenerated file. Do not change. */
 /* This file was generated by "make". */
-#define NUT_VERSION_MACRO "2.6.1-3015:3023"
+#define NUT_VERSION_MACRO "2.6.2-3235:3238"

include/parseconf.h

@@ -20,6 +20,8 @@
 #ifndef PARSECONF_H_SEEN
 #define PARSECONF_H_SEEN 1
 
+#include <stdio.h>
+
 #ifdef __cplusplus
 /* *INDENT-OFF* */
 extern "C" {