summaryrefslogtreecommitdiff
path: root/sysutils/nut-devel
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/nut-devel')
-rw-r--r--sysutils/nut-devel/Makefile4
-rw-r--r--sysutils/nut-devel/distinfo6
-rw-r--r--sysutils/nut-devel/files/patch-configure.ac24
-rw-r--r--sysutils/nut-devel/files/patch-scripts_Makefile11
-rw-r--r--sysutils/nut-devel/files/patch-scripts_Makefile.am11
-rw-r--r--sysutils/nut-devel/pkg-plist4
6 files changed, 36 insertions, 24 deletions
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index 24102fa0b68c..cc9cd6b0e1ad 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -18,8 +18,8 @@ CONFLICTS= nut-[0-9]*
USE_GITHUB= yes
GH_ACCOUNT= networkupstools
-GH_TAGNAME= 87008cfc7
-NUT_COMMIT_DATE= 2025.09.23
+GH_TAGNAME= 41daedfab
+NUT_COMMIT_DATE= 2025.11.17
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/nut-devel/distinfo b/sysutils/nut-devel/distinfo
index 1b2179759efa..d69c73036e17 100644
--- a/sysutils/nut-devel/distinfo
+++ b/sysutils/nut-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1758737801
-SHA256 (networkupstools-nut-2025.09.23-87008cfc7_GH0.tar.gz) = c7c119de155c56044c5d018cee46cf54f36ad0e69c63de495fd0f17992c8c2e2
-SIZE (networkupstools-nut-2025.09.23-87008cfc7_GH0.tar.gz) = 5028328
+TIMESTAMP = 1763394301
+SHA256 (networkupstools-nut-2025.11.17-41daedfab_GH0.tar.gz) = 3ad7a29ebc7721d0092e2b2f7f5e343ddd8b496a8a8c8b9785c8fa2006bdf46f
+SIZE (networkupstools-nut-2025.11.17-41daedfab_GH0.tar.gz) = 5143254
diff --git a/sysutils/nut-devel/files/patch-configure.ac b/sysutils/nut-devel/files/patch-configure.ac
index 86db2cd40761..f4ba07af7082 100644
--- a/sysutils/nut-devel/files/patch-configure.ac
+++ b/sysutils/nut-devel/files/patch-configure.ac
@@ -1,6 +1,20 @@
---- configure.ac.orig 2022-08-25 15:32:21.256937000 -0700
-+++ configure.ac 2022-08-25 15:37:36.166445000 -0700
-@@ -802,7 +802,7 @@
+--- 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 @@
+ [RUN_AS_GROUP="nogroup"]
+ )
+
+-dnl Last hit wins, user and groups accounts separately
+-for TOKEN in upsmon nutmon ups nut; do
+- AS_IF([test -n "`${PROBE_OS_USER} ${TOKEN}`"], [RUN_AS_USER="${TOKEN}"])
+- AS_IF([test -n "`${PROBE_OS_GROUP} ${TOKEN}`"], [RUN_AS_GROUP="${TOKEN}"])
+-done
+-unset TOKEN
+-
+ 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 @@
dnl A Python GUI client application for the sysadmin desktop
dnl (not necessarily on the NUT server itself):
@@ -9,9 +23,9 @@
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
-@@ -1301,7 +1301,7 @@
+@@ -3534,7 +3527,7 @@
dnl Can we satisfy any NUT-Monitor installation request?
- if test -n "${nut_with_nut_monitor_py2gtk2}${nut_with_nut_monitor_py3qt5}" ; then
+ 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
- "auto") nut_with_nut_monitor="yes" ;;
+ "auto") nut_with_nut_monitor="no" ;;
diff --git a/sysutils/nut-devel/files/patch-scripts_Makefile b/sysutils/nut-devel/files/patch-scripts_Makefile
deleted file mode 100644
index 2bb9e47afe06..000000000000
--- a/sysutils/nut-devel/files/patch-scripts_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Makefile.am.orig 2025-09-23 07:29:43.000000000 -0700
-+++ scripts/Makefile.am 2025-09-24 11:18:33.361330000 -0700
-@@ -30,7 +30,7 @@
- valgrind/valgrind.sh.in \
- Windows/halt.c
-
--SUBDIRS = augeas devd hotplug installer python systemd udev ufw Solaris Windows upsdrvsvcctl external_apis
-+SUBDIRS = augeas devd hotplug installer python udev ufw Solaris upsdrvsvcctl external_apis
-
- SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc valgrind/README.adoc
-
diff --git a/sysutils/nut-devel/files/patch-scripts_Makefile.am b/sysutils/nut-devel/files/patch-scripts_Makefile.am
new file mode 100644
index 000000000000..067768646757
--- /dev/null
+++ b/sysutils/nut-devel/files/patch-scripts_Makefile.am
@@ -0,0 +1,11 @@
+--- scripts/Makefile.am.orig 2025-11-17 05:13:21.000000000 -0800
++++ scripts/Makefile.am 2025-11-17 07:46:55.934951000 -0800
+@@ -30,7 +30,7 @@
+ valgrind/valgrind.sh.in \
+ Windows/halt.c
+
+-SUBDIRS = augeas devd hotplug installer obs python systemd udev ufw Solaris Windows upsdrvsvcctl external_apis
++SUBDIRS = augeas devd hotplug installer obs python udev ufw Solaris Windows upsdrvsvcctl external_apis
+
+ SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc valgrind/README.adoc obs/README.adoc
+
diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist
index dade65c5907c..80b3d42ca0c8 100644
--- a/sysutils/nut-devel/pkg-plist
+++ b/sysutils/nut-devel/pkg-plist
@@ -54,8 +54,6 @@ lib/libnutscan.a
lib/libnutscan.so
lib/libnutscan.so.4
lib/libnutscan.so.4.0.0
-%%PYTHON_SITELIBDIR%%/PyNUT.py
-%%PYTHON_SITELIBDIR%%/test_nutclient.py
%%DEV%%libdata/pkgconfig/libnutclient.pc
%%DEV%%libdata/pkgconfig/libnutscan.pc
%%DEV%%libdata/pkgconfig/libupsclient.pc
@@ -234,7 +232,7 @@ lib/libnutscan.so.4.0.0
%%MANPAGES%%share/man/man8/nutconf.8.gz
%%MANPAGES%%%%USB%%share/man/man8/nutdrv_atcl_usb.8.gz
%%MANPAGES%%%%USB%%share/man/man8/nutdrv_qx.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens_sitop.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens-sitop.8.gz
%%MANPAGES%%share/man/man8/nutupsdrv.8.gz
%%MANPAGES%%%%USB%%share/man/man8/powervar_cx_usb.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz