Use target for drivers in Linux systemd (updated) and SMF instances for drivers in new Solaris-like systems (and bring AIX initscript into better shape)

.gitignore

@@ -9,6 +9,7 @@
 .deps/
 .libs/
 .inst/
+/_install_pkgprotodir/
 Makefile
 Makefile.in
 ## Parent directory only
@@ -19,6 +20,7 @@ Makefile.in
 /config.log
 /config.status
 /config.sub
+/config.cache
 /configure
 /cscope.*
 /depcomp
@@ -33,6 +35,10 @@ common/.dirstamp
 # Dist
 /nut-*.*.*/
 /nut-*.tar.gz
+/nut*.rpm
+/NUT*.local.gz
+/NUT*.p5i
+/NUT*.depot
 
 # Official dist
 /nut-*.tar.gz.md5

Makefile.am

@@ -121,7 +121,7 @@ install-dirs:
 	@echo "Warning: 'make install-dirs' is deprecated."
 	@echo "Use 'make installdirs' instead."
 	@echo $(WARN)
-	make installdirs
+	$(MAKE) installdirs
 cgi build-cgi install-cgi install-cgi-dir install-cgi-bin \
 install-cgi-man install-cgi-conf install-cgi-html: 
 	@echo "Error: 'make $@' no longer exists."
@@ -137,23 +137,30 @@ snmp build-snmp install-snmp install-snmp-mgr install-snmp-man:
 	@echo "Use './configure --with-snmp' instead."
 setver:
 	@echo "Error: 'make setver' no longer exists."
-	@echo "Edit configure.in to set version number."
+	@echo "Edit configure.ac to set version number."
 package:
-	if test `uname -s` = "HP-UX"; then \
-		cd scripts/HP-UX; \
-		make package; \
-		mv NUT_HPUX_package.depot NUT_HPUX_package@PACKAGE_VERSION@.depot; \
-	elif test `uname -s` = "SunOS"; then \
-		make; \
-		rm -rf @prefix@; \
-		make install; \
-		cd scripts/Solaris; \
-		make package; \
-		make uninstall; \
-		rm -rf @prefix@; \
-	elif test `uname -s` = "AIX"; then \
-		make dist; \
-		cp scripts/Aix/nut-aix.spec /usr/src/packages/SPECS; \
-		cp scripts/Aix/nut.init nut-@PACKAGE_VERSION@.tar.gz /usr/src/packages/SOURCES; \
-		rpm -ba /usr/src/packages/SPECS/nut-aix.spec; \
-	fi;
+	DESTDIR="$(abs_builddir)/_install_pkgprotodir" ; export DESTDIR; \
+	rm -rf "$$DESTDIR"; \
+	case "`uname -s`" in \
+	"HP-UX") \
+		( cd scripts/HP-UX && \
+		  $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$DESTDIR" package && \
+		  mv NUT_HPUX_package.depot $(abs_top_builddir)/NUT_HPUX_package@PACKAGE_VERSION@.depot ) ;; \
+	"SunOS") \
+		$(MAKE) $(AM_MAKEFLAGS) && \
+		$(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$DESTDIR" install && \
+		( cd scripts/Solaris && \
+		  $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$DESTDIR" package ) && \
+		$(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$DESTDIR" uninstall && \
+		rm -rf "$$DESTDIR" || \
+		{ echo "FAILED to produce SunOS packages, inspect '$$DESTDIR' for clues" >&2 ; exit 1; } ;; \
+	"AIX") \
+		if test -d /usr/src/packages/SPECS -a -w /usr/src/packages/SPECS ; then : ; else echo "Can not write to /usr/src/packages/SPECS" >&2 ; exit 1; fi ; \
+		if test -d /usr/src/packages/SOURCES -a -w /usr/src/packages/SOURCES ; then : ; else echo "Can not write to /usr/src/packages/SOURCES" >&2 ; exit 1; fi ; \
+		$(MAKE) $(AM_MAKEFLAGS) dist && \
+		cp scripts/Aix/nut-aix.spec /usr/src/packages/SPECS && \
+		cp scripts/Aix/nut.init nut-@PACKAGE_VERSION@.tar.gz /usr/src/packages/SOURCES && \
+		rpm -ba /usr/src/packages/SPECS/nut-aix.spec && \
+		mv /usr/src/packages/RPMS/nut*rpm $(abs_top_builddir)/ ;; \
+	*)	echo "Unsupported OS for 'make $@' (no recipe bound)" >&2; exit 1;; \
+	esac

README

@@ -120,8 +120,9 @@ The entry in `ups.conf` looks like this:
 		driver = apcsmart
 		port = /dev/ttyS1
 
-To start and stop drivers, use upsdrvctl.  By default, it will start or
-stop every UPS in the config file:
+To start and stop drivers, use upsdrvctl of upsdrvsvcctl (installed on
+operating systems with a service management framework supported by NUT).
+By default, it will start or stop every UPS in the config file:
 
 	/usr/local/ups/sbin/upsdrvctl start
 	/usr/local/ups/sbin/upsdrvctl stop
@@ -131,6 +132,17 @@ However, you can also just start or stop one by adding its name:
 	/usr/local/ups/sbin/upsdrvctl start sparky
 	/usr/local/ups/sbin/upsdrvctl stop sparky
 
+On operating systems with a supported service management framework,
+you might wrap your NUT drivers into individual services instances
+with:
+
+	/usr/local/ups/sbin/upsdrvsvcctl resync
+
+and then manage those service instances with commands like:
+
+	/usr/local/ups/sbin/upsdrvsvcctl start sparky
+	/usr/local/ups/sbin/upsdrvsvcctl stop sparky
+
 To find the driver name for your device, refer to the section below
 called "HARDWARE SUPPORT TABLE".
 

common/Makefile.am

@@ -12,6 +12,6 @@ libparseconf_la_SOURCES = parseconf.c
 libcommon_la_SOURCES = common.c state.c str.c upsconf.c
 libcommonclient_la_SOURCES = common.c state.c str.c
 # ensure inclusion of local implementation of missing systems functions
-# using LTLIBOBJS. Refer to configure.in -> AC_REPLACE_FUNCS
+# using LTLIBOBJS. Refer to configure.in/.ac -> AC_REPLACE_FUNCS
 libcommon_la_LIBADD = libparseconf.la @LTLIBOBJS@
 libcommonclient_la_LIBADD = libparseconf.la @LTLIBOBJS@

configure.ac

@@ -328,13 +328,14 @@ dnl Solaris 10/11 USB handling (need librt and libusb runtime path)
 dnl HPUX, since v11, needs an explicit activation of pthreads
 case ${target_os} in
    solaris2.1* )
-      echo Checking for Solaris 10 / 11 specific configuration for usb drivers
+      AC_MSG_CHECKING([for Solaris 10 / 11 specific configuration for usb drivers])
       AC_SEARCH_LIBS(nanosleep, rt)
       LIBUSB_LIBS="-R/usr/sfw/lib ${LIBUSB_LIBS}"
       dnl FIXME: Sun's libusb doesn't support timeout (so blocks notification)
       dnl and need to call libusb close upon reconnection
       AC_DEFINE(SUN_LIBUSB, 1, [Define to 1 for Sun version of the libusb.])
       SUN_LIBUSB=1
+      AC_MSG_RESULT([${LIBUSB_LIBS}])
       ;;
     hpux11*)
       CFLAGS="${CFLAGS} -lpthread"
@@ -1197,6 +1198,90 @@ else
 fi
 AM_CONDITIONAL(WITH_PKG_CONFIG, test -n "${pkgconfigdir}")
 
+AC_MSG_CHECKING(whether to install Solaris SMF files)
+solarissmf="auto"
+AC_ARG_WITH([solaris-smf],
+	AS_HELP_STRING([--with-solaris-smf=(yes|auto|no)], [Enable installation of NUT scripts and manifests for Solaris Service Management Framework (auto)]),
+[
+	case "${withval}" in
+	auto|"")
+		solarissmf="auto"
+		;;
+	yes|no)
+		solarissmf="${withval}"
+		;;
+	*)
+		AC_MSG_ERROR([Unexpected argument for --with-solaris-smf=${withval}])
+		;;
+	esac
+], [])
+
+if test x"$solarissmf" = xauto ; then
+	if test -x /usr/sbin/svcadm && test -x /usr/sbin/svccfg && test -x /usr/bin/svcs ; then
+		solarissmf="yes"
+	else
+		solarissmf="no"
+	fi
+fi
+AC_MSG_RESULT([${solarissmf}])
+AM_CONDITIONAL(WITH_SOLARIS_SMF, test x"$solarissmf" = x"yes")
+
+AC_MSG_CHECKING(whether to make Solaris SVR4 packages)
+solarispkg_svr4="auto"
+AC_ARG_WITH([solaris-pkg-svr4],
+	AS_HELP_STRING([--with-solaris-pkg-svr4=(yes|auto|no)], [Enable construction of Solaris SVR4 packages (auto)]),
+[
+	case "${withval}" in
+	auto|"")
+		solarispkg_svr4="auto"
+		;;
+	yes|no)
+		solarispkg_svr4="${withval}"
+		;;
+	*)
+		AC_MSG_ERROR([Unexpected argument for --with-solaris-pkg-svr4=${withval}])
+		;;
+	esac
+], [])
+
+if test x"$solarispkg_svr4" = xauto ; then
+	if test -x /usr/bin/pkgtrans && test -x /usr/bin/pkgmk && test -x /usr/bin/pkgproto ; then
+		solarispkg_svr4="yes"
+	else
+		solarispkg_svr4="no"
+	fi
+fi
+AC_MSG_RESULT([${solarispkg_svr4}])
+AM_CONDITIONAL(WITH_SOLARIS_PKG_SVR4, test x"$solarispkg_svr4" = x"yes")
+
+AC_MSG_CHECKING(whether to make Solaris IPS packages)
+solarispkg_ips="auto"
+AC_ARG_WITH([solaris-pkg-ips],
+	AS_HELP_STRING([--with-solaris-pkg-ips=(yes|auto|no)], [Enable construction of Solaris IPS packages (auto)]),
+[
+	case "${withval}" in
+	auto|"")
+		solarispkg_ips="auto"
+		;;
+	yes|no)
+		solarispkg_ips="${withval}"
+		;;
+	*)
+		AC_MSG_ERROR([Unexpected argument for --with-solaris-pkg-ips=${withval}])
+		;;
+	esac
+], [])
+
+if test x"$solarispkg_ips" = xauto ; then
+	if test -x /usr/bin/pkg && test -x /usr/bin/pkgmogrify && test -x /usr/bin/pkgdepend ; then
+		solarispkg_ips="yes"
+	else
+		solarispkg_ips="no"
+	fi
+fi
+AC_MSG_RESULT([${solarispkg_ips}])
+AM_CONDITIONAL(WITH_SOLARIS_PKG_IPS, test x"$solarispkg_ips" = x"yes")
+
 AC_MSG_CHECKING(whether to install systemd files)
 AC_ARG_WITH([systemdsystemunitdir],
 	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files (auto)]),
@@ -1473,7 +1558,9 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-dnl expand ${sysconfdir} and write it out
+dnl expand ${sysconfdir} and write it out - note that most packages
+dnl override it to be /etc/nut, /etc/ups or similar, while the
+dnl autotools default would be $prefix/etc
 conftemp="${sysconfdir}"
 eval conftemp=\"${conftemp}\"
 eval conftemp=\"${conftemp}\"
@@ -1485,6 +1572,7 @@ conftemp="${datadir}"
 eval conftemp=\"${conftemp}\"
 eval conftemp=\"${conftemp}\"
 DATADIR=${conftemp}
+NUT_DATADIR=${conftemp}
 AC_DEFINE_UNQUOTED(DATADIR, "${conftemp}", [Default path for data files])
 
 dnl same for bindir
@@ -1508,6 +1596,13 @@ eval conftemp=\"${conftemp}\"
 LIBDIR=${conftemp}
 AC_DEFINE_UNQUOTED(LIBDIR, "${conftemp}", [Default path for system libraries])
 
+dnl same for libexecdir
+conftemp="${libexecdir}"
+eval conftemp=\"${conftemp}\"
+eval conftemp=\"${conftemp}\"
+LIBEXECDIR=${conftemp}
+AC_DEFINE_UNQUOTED(LIBEXECDIR, "${conftemp}", [Default path for system exec-libraries])
+
 
 dnl checks related to --with-snmp enabled on command-line
 
@@ -1599,6 +1694,8 @@ AC_SUBST(STATEPATH)
 AC_SUBST(CONFPATH)
 AC_SUBST(BINDIR)
 AC_SUBST(LIBDIR)
+AC_SUBST(NUT_DATADIR, [`eval echo "${DATADIR}"`])
+AC_SUBST(NUT_LIBEXECDIR, [`eval echo "${LIBEXECDIR}"`])
 AC_SUBST(DRVPATH)
 AC_SUBST(SBINDIR)
 AC_SUBST(PORT)
@@ -1652,19 +1749,35 @@ AC_OUTPUT([
  scripts/devd/nut-usb.conf
  scripts/hotplug/Makefile
  scripts/hotplug/libhidups
+ scripts/Aix/nut.init
  scripts/HP-UX/nut.psf
  scripts/HP-UX/postinstall
  scripts/python/Makefile
+ scripts/upsdrvsvcctl/Makefile
+ scripts/upsdrvsvcctl/nut-driver-enumerator.sh
+ scripts/upsdrvsvcctl/upsdrvsvcctl
  scripts/systemd/Makefile
- scripts/systemd/nut-driver.service
+ scripts/systemd/nut-driver@.service
  scripts/systemd/nut-monitor.service
  scripts/systemd/nut-server.service
+ scripts/systemd/nut-driver-enumerator.service
+ scripts/systemd/nut-driver-enumerator.path
  scripts/systemd/nutshutdown
+ scripts/Solaris/nut-driver-enumerator.xml
+ scripts/Solaris/nut-driver.xml
+ scripts/Solaris/nut-monitor.xml
+ scripts/Solaris/nut-server.xml
+ scripts/Solaris/nut.xml
+ scripts/Solaris/svc-nut-server
+ scripts/Solaris/svc-nut-monitor
  scripts/Solaris/Makefile
  scripts/Solaris/pkginfo
+ scripts/Solaris/preinstall
  scripts/Solaris/postinstall
  scripts/Solaris/preremove
- scripts/Solaris/nut 
+ scripts/Solaris/postremove
+ scripts/Solaris/preproto.pl
+ scripts/Solaris/nut
  scripts/udev/Makefile
  scripts/udev/nut-ipmipsu.rules
  scripts/udev/nut-usbups.rules

docs/FAQ.txt

@@ -272,6 +272,12 @@ Note: if you jumped in with both feet and didn't follow the INSTALL.nut
 document, you probably started upsd by itself.  You have to run
 'upsdrvctl start' to start the drivers after configuring ups.conf.
 
+On operating systems with a supported service management framework,
+you might wrap your NUT drivers into individual services instances
+with 'upsdrvsvcctl resync' and then manage those with commands like
+'upsdrvsvcctl stop' and 'upsdrvsvcctl start' (note that on other
+systems this tool may be not pre-installed via packaging).
+
 == Why don't the pathnames in your documentation match the package I installed?
 
 Each distribution has conventions for where specific file types should be