Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package apcupsd for openSUSE:Factory checked in at 2024-07-19 15:28:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apcupsd (Old) and /work/SRC/openSUSE:Factory/.apcupsd.new.17339 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apcupsd" Fri Jul 19 15:28:27 2024 rev:74 rq:1188435 version:3.14.14 Changes: -------- --- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes 2023-03-29 23:27:13.607465590 +0200 +++ /work/SRC/openSUSE:Factory/.apcupsd.new.17339/apcupsd.changes 2024-07-19 15:28:32.702070721 +0200 @@ -1,0 +2,22 @@ +Thu Jul 11 09:14:41 UTC 2024 - Manfred Schwarb <[email protected]> + +- Revert SuSEfirewall2 removal (commit on Wed Jul 3 13:45:08 UTC 2019), + conditionally for SLE/Leap, to avoid possible regressions. +- Require systemd-sysvinit for SLE/Leap < 15.6 to have a /usr/sbin/shutdown + command available. For newer versions, it is included in the systemd package. + +------------------------------------------------------------------- +Wed Jul 10 10:44:28 UTC 2024 - Manfred Schwarb <[email protected]> + +- remove obsolete text concerning apcupsd-early-powerdown in README.SUSE +- do not use /sbin/service, call systemctl directly + +------------------------------------------------------------------- +Mon Jul 8 10:31:24 UTC 2024 - Manfred Schwarb <[email protected]> + +- Leap 15.6 also needs util-linux-tty-tools +- Patch configure to show correct GCC version (not configure.in, autoreconf fails) + * apcupsd-config.patch +- Use %make_build in spec file + +------------------------------------------------------------------- New: ---- apcupsd-config.patch apcupsd.firewall BETA DEBUG BEGIN: New:- Patch configure to show correct GCC version (not configure.in, autoreconf fails) * apcupsd-config.patch - Use %make_build in spec file BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apcupsd.spec ++++++ --- /var/tmp/diff_new_pack.D4NPED/_old 2024-07-19 15:28:33.498102394 +0200 +++ /var/tmp/diff_new_pack.D4NPED/_new 2024-07-19 15:28:33.498102394 +0200 @@ -1,7 +1,7 @@ # # spec file for package apcupsd # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,7 @@ Source7: apcupsd-httpd.conf Source8: https://sourceforge.net/projects/apcupsd/files/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig Source9: %{name}.keyring +Source10: %{name}.firewall # PATCH-FIX-OPENSUSE apcupsd-suse.patch [email protected] -- Do not perform halt script alternation on install. Patch0: apcupsd-suse.patch # PATCH-FEATURE-OPENSUSE apcupsd-hibernate.patch [email protected] -- Support for hibernation on powerfail. @@ -48,6 +49,8 @@ Patch11: apcupsd-3.14.8-systemd.patch # PATCH-FIX-OPENSUSE apcupsd-3.14.9-fixgui.patch rhbz#578276 [email protected] -- fix crash in gui Patch13: apcupsd-3.14.9-fixgui.patch +# PATCH-FIX-OPENSUSE apcupsd-config.patch +Patch14: apcupsd-config.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel BuildRequires: dos2unix @@ -66,9 +69,11 @@ Requires(post): sed Recommends: logrotate %{?systemd_requires} -%if 0%{?suse_version} > 1500 +%if 0%{?sle_version} >= 150600 || 0%{?suse_version} > 1500 BuildRequires: util-linux-tty-tools Requires: util-linux-tty-tools +%else +Requires: systemd-sysvinit %endif %if %{with gapcmon} BuildRequires: update-desktop-files @@ -136,7 +141,8 @@ --with-distname=suse \ %endif %{nil} -make %{?_smp_mflags} +# variable V is used in targets.mak for strange purposes, needs to be unset +%make_build V='' %install %make_install @@ -175,6 +181,11 @@ install -d %{buildroot}%{_sysconfdir}/apache2/conf.d/ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf +%if 0%{?suse_version} && 0%{?suse_version} <= 1500 +# firewall config +install -m 644 -D %{SOURCE10} %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%endif + %pre %service_add_pre %{name}.service @@ -224,6 +235,9 @@ %config(noreplace) %{_sysconfdir}/%{name}/offbattery %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%if 0%{?suse_version} && 0%{?suse_version} <= 1500 +%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%endif %attr(0755,root,root) %{_sysconfdir}/%{name}/apccontrol %{_mandir}/man?/*.* %{_fillupdir}/sysconfig.%{name} ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.D4NPED/_old 2024-07-19 15:28:33.534103827 +0200 +++ /var/tmp/diff_new_pack.D4NPED/_new 2024-07-19 15:28:33.538103986 +0200 @@ -24,27 +24,3 @@ - Use YaST Sysconfig editor and set Hardware->UPS->APCUPSD_POWERFAIL_BEHAVIOR to "hibernate". - -Environment with possible service timeouts - -In some environments, there is no guarantee, that the machine will -correctly shut down, either because other machines providing critical -services are already down or because some services (e. g. squid) are -stopping too long and battery power is not sufficient. In this case, -you can prefer incorrect but fast shutdown. - -To fix this problem, you need to do: - -- Copy apcupsd-early-powerdown script to your /etc/init.d/ directory. - -- Edit following lines: - - Replace "FIXME scripts which should not stop before powerdown" by an - appropriate init script list. - - Replace "FIXME scripts which should stop before powerdown" by an - appropriate init script list. - -- Start YaST Runlevel Editor and enable this meta-service in - runlevels, where you want to apply early shutdown. - ++++++ apcupsd-config.patch ++++++ --- apcupsd-3.14.14/configure.orig 2016-04-18 22:26:31.000000000 +0200 +++ apcupsd-3.14.14/configure 2024-07-08 14:34:09.108354615 +0200 @@ -14678,7 +14678,7 @@ $MAKE clean # A whole lot of hand springs to get the compiler version. # This is because gcc changed the output in version 3.0 # -CXXVERSION=`${CXX} --version | tr '\n' ' ' | cut -f 3 -d ' '` +CXXVERSION=`${CXX} --version | sed 's/([^)]*)//' | awk '{ print $2; exit }'` if test "x${CXXVERSION}" = "x" ; then CXXVERSION=`${CXX} --version | tr '\n' ' ' | cut -f 1 -d ' '` fi ++++++ apcupsd.firewall ++++++ # Do not edit this file as it's just a template and will be # overwritten on package updates! Copy to a new file instead. # Fill in the required variables and delete the unused ones. # If in doubt ask [email protected] # # Only the variables TCP, UDP, RPC, IP, BROADCAST, RELATED and # MODULES are allowed. More may be supported in the future. # # For a more detailed description of the individual variables see # the comments for FW_SERVICES_*_EXT in /etc/sysconfig/SuSEfirewall2 # ## Name: apcupsd ## Description: Opens port for apcupsd. # space separated list of allowed TCP ports TCP="apcupsd" # space separated list of allowed UDP ports UDP="" # space separated list of allowed RPC services RPC="" # space separated list of allowed IP protocols IP="" # space separated list of allowed UDP ports that accept broadcasts BROADCAST="" ### variables below are only needed in very special cases # space separated list of net,protocol[,sport[,dport]] # see FW_SERVICES_ACCEPT_RELATED_EXT # net 0/0 means IPv4 and IPv6. If this sevice should only work for # IPv4 use 0.0.0.0/0 RELATED="" # additional kernel modules needed for this service # see FW_LOAD_MODULES MODULES="" ++++++ apcupsd.hibernate ++++++ --- /var/tmp/diff_new_pack.D4NPED/_old 2024-07-19 15:28:33.622107329 +0200 +++ /var/tmp/diff_new_pack.D4NPED/_new 2024-07-19 15:28:33.622107329 +0200 @@ -3,7 +3,7 @@ # Always stop apcupsd before sleep, but do not initiate powerdown for hybrid-sleep. if [ "$1" = pre ] && ( [ "$2" = hibernate ] || [ "$2" = hybrid-sleep ] ) ; then - /sbin/service apcupsd.service stop + /usr/bin/systemctl stop apcupsd.service fi if [ "$1" = pre ] && [ "$2" = hibernate ] ; then # FIXME: All hibernate quirks are called in parallel. To be on a safest side, we should initiate powerdown grace period when they terminate. @@ -11,6 +11,6 @@ /etc/apcupsd/apccontrol killpower fi if [ "$1" = post ] && ( [ "$2" = hibernate ] || [ "$2" = hybrid-sleep ] ) ; then - /sbin/service apcupsd.service start + /usr/bin/systemctl start apcupsd.service fi
