From 8e55767a3a66ffc145f4b33ee06e003714c6d67c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:57:06 +0000 Subject: [PATCH 01/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 5767004..2a2a10c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 27%{?dist} +Release: 28%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 3.14.14-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Aug 02 2022 Jason L Tibbitts III - 3.14.14-27 - Depend on libusb-compat-0.1-devel to avoid build breakage. From e5f84212579025f443e32a650cf9bdd2f5601155 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:32:21 +0000 Subject: [PATCH 02/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 2a2a10c..ce677f7 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 28%{?dist} +Release: 29%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.14.14-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 3.14.14-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5d22797bc118e9a7e18d2a8ee1e2244d1d7f8aa7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:19:45 +0000 Subject: [PATCH 03/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index ce677f7..912cc00 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 29%{?dist} +Release: 30%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.14.14-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.14.14-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 325ee1c78cf644ecc630bd7523de6a7718c0a4dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:16:48 +0000 Subject: [PATCH 04/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 912cc00..1c19a81 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 30%{?dist} +Release: 31%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 3.14.14-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.14.14-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8aca3335ef24503e6868e8fd82317537f0bded3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:14:30 +0000 Subject: [PATCH 05/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1c19a81..8936186 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 31%{?dist} +Release: 32%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -166,6 +166,9 @@ rm examples/*.in %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.14.14-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 3.14.14-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c5aa870a6eaf67b8bbea3123fb4faa5ade11f972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 10:11:30 +0200 Subject: [PATCH 06/17] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- apcupsd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 8936186..41fb2b2 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,10 +4,11 @@ Name: apcupsd Version: 3.14.14 -Release: 32%{?dist} +Release: 33%{?dist} Summary: APC UPS Power Control Daemon -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: http://www.apcupsd.com Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz Source1: apcupsd.service @@ -166,6 +167,9 @@ rm examples/*.in %changelog +* Mon Jul 29 2024 Miroslav Suchý - 3.14.14-33 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 3.14.14-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 42e9efbb5fd488f604675679eb1e779b51126aae Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Fri, 8 Nov 2024 16:57:51 +0100 Subject: [PATCH 07/17] Adds disable_nologin.patch --- apcupsd.spec | 22 ++++++++-------------- disable_nologin.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 disable_nologin.patch diff --git a/apcupsd.spec b/apcupsd.spec index 41fb2b2..932f5c6 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,11 +4,10 @@ Name: apcupsd Version: 3.14.14 -Release: 33%{?dist} +Release: 31%{?dist} Summary: APC UPS Power Control Daemon -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +License: GPLv2 URL: http://www.apcupsd.com Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz Source1: apcupsd.service @@ -20,9 +19,10 @@ Source5: apcupsd64x64.png # fix crash in gui, rhbz#578276 Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 -Patch1: apcupsd-3.14.4-shutdown.patch +#Patch1: apcupsd-3.14.4-shutdown.patch # Fix format-security error so we can enable the checks Patch2: patch-format-security +Patch3: disable_nologin.patch BuildRequires: gcc-c++ @@ -167,17 +167,11 @@ rm examples/*.in %changelog -* Mon Jul 29 2024 Miroslav Suchý - 3.14.14-33 -- convert license to SPDX +* Fri Nov 08 2024 Germano Massullo - 3.14.14-31 +- Adds disable_nologin.patch -* Wed Jul 17 2024 Fedora Release Engineering - 3.14.14-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 3.14.14-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.14.14-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Sun Jan 07 2024 Germano Massullo - 3.14.14-30 +- disables apcupsd-3.14.4-shutdown.patch * Wed Jul 19 2023 Fedora Release Engineering - 3.14.14-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/disable_nologin.patch b/disable_nologin.patch new file mode 100644 index 0000000..81fefc7 --- /dev/null +++ b/disable_nologin.patch @@ -0,0 +1,18 @@ +diff -urNr apcupsd-3.14.14-orig/src/action.c apcupsd-3.14.14/src/action.c +--- apcupsd-3.14.14-orig/src/action.c 2015-03-20 04:59:41.000000000 +0100 ++++ apcupsd-3.14.14/src/action.c 2024-11-08 16:48:46.095910557 +0100 +@@ -189,13 +189,7 @@ + + static void prohibit_logins(UPSINFO *ups) + { +- if (ups->nologin_file) +- return; /* already done */ +- +- logonfail(ups, 0); +- ups->nologin_file = true; +- +- log_event(ups, LOG_ALERT, "User logins prohibited"); ++ return; + } + + static void do_shutdown(UPSINFO *ups, int cmdtype) From 063db992f5e7adc0660be8876b129f5bd324de92 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Fri, 8 Nov 2024 17:39:36 +0100 Subject: [PATCH 08/17] release bump --- apcupsd.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 932f5c6..1a9e42d 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 31%{?dist} +Release: 33%{?dist} Summary: APC UPS Power Control Daemon License: GPLv2 @@ -19,7 +19,7 @@ Source5: apcupsd64x64.png # fix crash in gui, rhbz#578276 Patch0: apcupsd-3.14.9-fixgui.patch # Halt without powering off, rhbz#1442577 -#Patch1: apcupsd-3.14.4-shutdown.patch +Patch1: apcupsd-3.14.4-shutdown.patch # Fix format-security error so we can enable the checks Patch2: patch-format-security Patch3: disable_nologin.patch @@ -167,6 +167,12 @@ rm examples/*.in %changelog +* Fri Nov 08 2024 Germano Massullo - 3.14.14-33 +- release bump + +* Fri Nov 08 2024 Germano Massullo - 3.14.14-32 +- release bump + * Fri Nov 08 2024 Germano Massullo - 3.14.14-31 - Adds disable_nologin.patch From 289b8ada59cb2b13f8e233d85c9146c9be67cd31 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Fri, 8 Nov 2024 19:41:45 +0100 Subject: [PATCH 09/17] Adds distinction between Fedora and EL <= 9 for BuildRequires: libusb --- apcupsd.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 1a9e42d..b0fd249 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -27,7 +27,13 @@ Patch3: disable_nologin.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel -BuildRequires: net-snmp-devel, libusb-compat-0.1-devel +%if %{defined fedora} +BuildRequires: libusb-compat-0.1-devel +%endif +%if (%{defined rhel} && 0%{?rhel} <= 9) +BuildRequires: libusb-devel +%endif +BuildRequires: net-snmp-devel, BuildRequires: gtk2-devel, GConf2-devel, desktop-file-utils # /sbin/shutdown is required to be present when building # Somehow in F36 systemd is installed in mock but not in koji @@ -168,7 +174,7 @@ rm examples/*.in %changelog * Fri Nov 08 2024 Germano Massullo - 3.14.14-33 -- release bump +- Adds distinction between Fedora and EL <= 9 for BuildRequires: libusb * Fri Nov 08 2024 Germano Massullo - 3.14.14-32 - release bump From cb14d73ce6da55f3ca655ada1688f55f43f2f97a Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 11 Nov 2024 12:50:14 +0100 Subject: [PATCH 10/17] fixed license format --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index b0fd249..4156a27 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -7,7 +7,7 @@ Version: 3.14.14 Release: 33%{?dist} Summary: APC UPS Power Control Daemon -License: GPLv2 +License: GPL-2.0-only URL: http://www.apcupsd.com Source0: https://downloads.sourceforge.net/apcupsd/apcupsd-%version.tar.gz Source1: apcupsd.service From cb33d36eae5e35185768b797e63dc31954e4e913 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:19:42 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 4156a27..46448cb 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 33%{?dist} +Release: 34%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -173,6 +173,9 @@ rm examples/*.in %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.14.14-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 08 2024 Germano Massullo - 3.14.14-33 - Adds distinction between Fedora and EL <= 9 for BuildRequires: libusb From 89ca1eea99b91c1b612e6c5b0df01abaf79dc875 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Wed, 9 Apr 2025 12:38:58 +0200 Subject: [PATCH 12/17] Adds 99-apcupsd-xfer-glitch.patch --- 99-apcupsd-xfer-glitch.patch | 61 ++++++++++++++++++++++++++++++++++++ apcupsd.spec | 11 +++++-- 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 99-apcupsd-xfer-glitch.patch diff --git a/99-apcupsd-xfer-glitch.patch b/99-apcupsd-xfer-glitch.patch new file mode 100644 index 0000000..2b2898d --- /dev/null +++ b/99-apcupsd-xfer-glitch.patch @@ -0,0 +1,61 @@ +diff -aruN apcupsd-3.14.14.orig/src/drivers/usb/usb.c apcupsd-3.14.14/src/drivers/usb/usb.c +--- apcupsd-3.14.14.orig/src/drivers/usb/usb.c 2024-02-24 20:22:42.007641242 +0100 ++++ apcupsd-3.14.14/src/drivers/usb/usb.c 2024-02-24 20:23:03.824987965 +0100 +@@ -42,7 +42,9 @@ + UpsDriver(ups), + _quirk_old_backups_pro(false), + _prev_time((struct timeval){0}), +- _bpcnt(0) ++ _bpcnt(0), ++ _bacnt(0), ++ _brcnt(0) + { + } + +@@ -410,8 +412,13 @@ + break; + + case CI_NeedReplacement: +- if (uval->iValue) +- _ups->set_replacebatt(uval->iValue); ++ if (uval->iValue) { ++ if (_brcnt++) { ++ _ups->set_replacebatt(uval->iValue); ++ } ++ } else { ++ _brcnt = 0; ++ } + Dmsg(200, "ReplaceBatt=%d\n", uval->iValue); + break; + +@@ -569,11 +576,15 @@ + * delayed. C'est la vie. + */ + if (uval->iValue) { +- if (_bpcnt++) ++ if (_bpcnt++) { ++ _bacnt = 0; + _ups->set_battpresent(); ++ } + } else { +- _bpcnt = 0; +- _ups->clear_battpresent(); ++ if (_bacnt++) { ++ _bpcnt = 0; ++ _ups->clear_battpresent(); ++ } + } + Dmsg(200, "BatteryPresent=%d\n", uval->iValue); + break; +diff -aruN apcupsd-3.14.14.orig/src/drivers/usb/usb.h apcupsd-3.14.14/src/drivers/usb/usb.h +--- apcupsd-3.14.14.orig/src/drivers/usb/usb.h 2024-02-24 20:22:42.007641242 +0100 ++++ apcupsd-3.14.14/src/drivers/usb/usb.h 2024-02-24 20:23:01.754956355 +0100 +@@ -86,6 +86,8 @@ + bool _quirk_old_backups_pro; + struct timeval _prev_time; + int _bpcnt; ++ int _bacnt; ++ int _brcnt; + }; + + /* Max rate to update volatile data */ diff --git a/apcupsd.spec b/apcupsd.spec index 46448cb..ae63fd3 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 34%{?dist} +Release: 35%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -23,7 +23,11 @@ Patch1: apcupsd-3.14.4-shutdown.patch # Fix format-security error so we can enable the checks Patch2: patch-format-security Patch3: disable_nologin.patch - +# fixes "increasing NUMXFERS" bug: +# https://sourceforge.net/p/apcupsd/mailman/apcupsd-users/thread/ad9afb27-30f9-443f-a9fb-982c41ad1325%40okazoo.eu/ +# https://www.reddit.com/r/homelab/comments/1c3eo9n/apcupsd_and_proxmox_frequent_battery_disconnected/ +# patch source: https://sourceforge.net/p/apcupsd/mailman/message/58741334/ +Patch4: 99-apcupsd-xfer-glitch.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel @@ -173,6 +177,9 @@ rm examples/*.in %changelog +* Wed Apr 09 2025 Germano Massullo - 3.14.14-35 +- Adds 99-apcupsd-xfer-glitch.patch + * Thu Jan 16 2025 Fedora Release Engineering - 3.14.14-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8a2cf41162dd6c1dce851b774aaf61aa5c3c0660 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 23 Apr 2025 14:15:16 -0700 Subject: [PATCH 13/17] Fix libusb conditional to make it build on EPEL 10 --- apcupsd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index ae63fd3..42ae7cd 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 35%{?dist} +Release: 36%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -31,7 +31,7 @@ Patch4: 99-apcupsd-xfer-glitch.patch BuildRequires: gcc-c++ BuildRequires: glibc-devel, gd-devel -%if %{defined fedora} +%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} > 9) BuildRequires: libusb-compat-0.1-devel %endif %if (%{defined rhel} && 0%{?rhel} <= 9) @@ -177,6 +177,10 @@ rm examples/*.in %changelog +* Wed Apr 23 2025 Davide Cavalca - 3.14.14-36 +- Fix libusb conditional to make it build on EPEL 10 + Fixes: RHBZ#2337139 + * Wed Apr 09 2025 Germano Massullo - 3.14.14-35 - Adds 99-apcupsd-xfer-glitch.patch From 583cb0b03b5c595616c18c36e6581e77bf3a680d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 9 May 2025 15:00:02 -0500 Subject: [PATCH 14/17] Move binaries to bin --- apcupsd.service | 2 +- apcupsd.spec | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apcupsd.service b/apcupsd.service index 614fec2..2e199ff 100644 --- a/apcupsd.service +++ b/apcupsd.service @@ -5,7 +5,7 @@ After=network-online.target [Service] ExecStartPre=-/bin/rm -f /etc/apcupsd/powerfail -ExecStart=/sbin/apcupsd -b -f /etc/apcupsd/apcupsd.conf +ExecStart=/usr/bin/apcupsd -b -f /etc/apcupsd/apcupsd.conf KillMode=process [Install] diff --git a/apcupsd.spec b/apcupsd.spec index 42ae7cd..a19abc1 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 36%{?dist} +Release: 37%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -87,7 +87,7 @@ printf 'install:\n\techo skipped\n' > platforms/redhat/Makefile %configure \ --sysconfdir="/etc/apcupsd" \ --with-cgi-bin="/var/www/apcupsd" \ - --sbindir=/sbin \ + --sbindir=%{_bindir} \ --enable-cgi \ --enable-pthreads \ --enable-net \ @@ -144,7 +144,11 @@ rm examples/*.in %config(noreplace) /etc/apcupsd/onbattery %config(noreplace) /etc/logrotate.d/apcupsd /usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi -%attr(0755,root,root) /sbin/* +%{_bindir}/apcaccess +%{_bindir}/apctest +%{_bindir}/apcupsd +%{_bindir}/smtp + %{_mandir}/*/* %files cgi @@ -177,6 +181,9 @@ rm examples/*.in %changelog +* Fri May 09 2025 Gwyn Ciesla - 3.14.14-37 +- Move binaries from sbin to bin, 2365293. + * Wed Apr 23 2025 Davide Cavalca - 3.14.14-36 - Fix libusb conditional to make it build on EPEL 10 Fixes: RHBZ#2337139 From c2ac98a5855e73adaf38bded247acf6ffae8b530 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 22 May 2025 14:25:42 -0500 Subject: [PATCH 15/17] Don't ship /usr/bin/smtp --- apcupsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index a19abc1..451ab87 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 37%{?dist} +Release: 38%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -147,7 +147,7 @@ rm examples/*.in %{_bindir}/apcaccess %{_bindir}/apctest %{_bindir}/apcupsd -%{_bindir}/smtp +%exclude %{_bindir}/smtp %{_mandir}/*/* @@ -181,6 +181,9 @@ rm examples/*.in %changelog +* Thu May 22 2025 Gwyn Ciesla - 3.14.14-38 +- Don't ship /usr/bin/smtp, not used, conflicts with opensmtpd. + * Fri May 09 2025 Gwyn Ciesla - 3.14.14-37 - Move binaries from sbin to bin, 2365293. From f2445acf011ab003c57fc1fb27dc3854ffaad723 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:07:44 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 451ab87..116113b 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 38%{?dist} +Release: 39%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -181,6 +181,9 @@ rm examples/*.in %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.14.14-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 22 2025 Gwyn Ciesla - 3.14.14-38 - Don't ship /usr/bin/smtp, not used, conflicts with opensmtpd. From d71ed2aa541a78a6e5c525a485c3e34d9169c6cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:48:55 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 116113b..dde0ac9 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -4,7 +4,7 @@ Name: apcupsd Version: 3.14.14 -Release: 39%{?dist} +Release: 40%{?dist} Summary: APC UPS Power Control Daemon License: GPL-2.0-only @@ -181,6 +181,9 @@ rm examples/*.in %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 3.14.14-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 3.14.14-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild