sysutils/nut*: Fix configure when user uses the uucp user account

Users wanting to use the uucp user account will experience configure
faiures because uucp is baked into the configure script. We make the
configure script default to "nothing" to address this edge case. The
default user (nut) is already set by the port and ports plumbing.

PR:	294350
This commit is contained in:
Cy Schubert
2026-04-13 13:34:27 -07:00
parent 9ec5a9b18d
commit c8196a0791
2 changed files with 33 additions and 17 deletions
+15 -5
View File
@@ -1,6 +1,8 @@
--- configure.ac.orig 2025-11-17 08:11:32.054205000 -0800
+++ configure.ac 2025-11-17 08:19:12.634169000 -0800
@@ -509,13 +509,6 @@
diff --git a/configure.ac.orig b/configure.ac
index 8919d01..9f454f9 100644
--- a/configure.ac.orig
+++ b/configure.ac
@@ -531,13 +531,6 @@ AS_IF([test -n "`${PROBE_OS_GROUP} nogroup`" && test -z "`${PROBE_OS_GROUP} \"${
[RUN_AS_GROUP="nogroup"]
)
@@ -14,7 +16,15 @@
dnl NOTE: NUT legacy default, keep as is for least surprise
dnl Distributions are however welcome to specify the option to use tmpfs
AS_CASE([${target_os}],
@@ -2844,7 +2837,7 @@
@@ -1965,7 +1958,6 @@ AC_CHECK_DECLS(uu_lock, [
AC_DEFINE(HAVE_UU_LOCK, 1, [Use uu_lock for locking (FreeBSD)])
SERLIBS="-lutil"
dnl put in some better defaults for FreeBSD
- RUN_AS_USER="uucp"
], [
SERLIBS=""
], [
@@ -2940,7 +2932,7 @@ NUT_CHECK_LIBGLIB
dnl A Python GUI client application for the sysadmin desktop
dnl (not necessarily on the NUT server itself):
@@ -23,7 +33,7 @@
NUT_ARG_WITH([pynut], [install the PyNUT module files (yes, no, app, auto)], [auto])
dnl Note: we did NUT_CHECK_PYTHON2 NUT_CHECK_PYTHON3 etc above,
dnl and if at all possible, we generate the files from .in templates
@@ -3534,7 +3527,7 @@
@@ -3675,7 +3667,7 @@ if test x"${nut_with_nut_monitor}" != xno ; then
dnl Can we satisfy any NUT-Monitor installation request?
if test -n "${nut_with_nut_monitor_py2gtk2}${nut_with_nut_monitor_py3qt5}${nut_with_nut_monitor_py3qt6}" ; then
case "${nut_with_nut_monitor}" in
+18 -12
View File
@@ -1,11 +1,8 @@
--- configure.orig 2026-04-09 09:46:14.395464000 -0700
+++ configure 2026-04-09 10:04:59.108399000 -0700
@@ -9339,20 +9339,8 @@
if test -n "`${PROBE_OS_GROUP} nogroup`" && test -z "`${PROBE_OS_GROUP} \"${RUN_AS_GROUP}\"`"
then :
RUN_AS_GROUP="nogroup"
-
-fi
--- configure.orig 2026-04-13 13:26:29.248587000 -0700
+++ configure 2026-04-13 13:31:28.601276000 -0700
@@ -9342,18 +9342,6 @@
fi
-for TOKEN in upsmon nutmon ups nut; do
- if test -n "`${PROBE_OS_USER} ${TOKEN}`"
@@ -15,13 +12,22 @@
- if test -n "`${PROBE_OS_GROUP} ${TOKEN}`"
-then :
- RUN_AS_GROUP="${TOKEN}"
fi
-fi
-done
-unset TOKEN
-
case ${target_os} in #(
*mingw*) :
@@ -41472,7 +41460,7 @@
POWERDOWNFLAG="C:\\\\killpower" ;; #(
@@ -22556,7 +22544,6 @@
printf "%s\n" "#define HAVE_UU_LOCK 1" >>confdefs.h
SERLIBS="-lutil"
- RUN_AS_USER="uucp"
else $as_nop
@@ -41472,7 +41459,7 @@
then :
withval=$with_nut_monitor; nut_with_nut_monitor="${withval}"
else $as_nop
@@ -30,7 +36,7 @@
fi
@@ -47583,7 +47571,7 @@
@@ -47583,7 +47570,7 @@
fi
if test -n "${nut_with_nut_monitor_py2gtk2}${nut_with_nut_monitor_py3qt5}${nut_with_nut_monitor_py3qt6}" ; then
case "${nut_with_nut_monitor}" in