From 91fa377cbb181fa9ab61f374f3022fea61bd08dfb4d9566a5b276abb43a8f84b Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Fri, 11 Jun 2021 01:38:09 +0000
Subject: [PATCH] Accepting request 892655 from home:pgajdos

- version update to 2.3.26
  * Log power state changes to syslog (Olaf Faaland, PR #37)
  * Fix default systemd unit file path for 'make distcheck'
  * Add etc/rancid-cisco-poe.dev (Daniel Rich, PR #28)
  * Add etc/openbmc.dev (Albert Chu, PR #33)
  * Add etc/kvm.dev & etc/kvm-ssh.dev (tisbeok, PR #8)
  * Fix misinterpretation of error strings in ipmipower.dev.
- fix [bsc#1185180] -- PIDFile under /run
- modified patches
  % service-dynamic-user-autofiles.patch (refreshed)
  % service-dynamic-user-configure.patch (refreshed)

OBS-URL: https://build.opensuse.org/request/show/892655
OBS-URL: https://build.opensuse.org/package/show/hardware/powerman?expand=0&rev=41
---
 powerman-2.3.24.tar.gz               |  3 --
 powerman-2.3.26.tar.gz               |  3 ++
 powerman.changes                     | 15 +++++++++
 powerman.spec                        | 15 +++++----
 service-dynamic-user-autofiles.patch | 49 +++++++++++++++++-----------
 service-dynamic-user-configure.patch | 40 ++++++++++++++---------
 6 files changed, 80 insertions(+), 45 deletions(-)
 delete mode 100644 powerman-2.3.24.tar.gz
 create mode 100644 powerman-2.3.26.tar.gz

diff --git a/powerman-2.3.24.tar.gz b/powerman-2.3.24.tar.gz
deleted file mode 100644
index 016c8de..0000000
--- a/powerman-2.3.24.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85d5d0e0aef05a1637a8efe58f436f1548d2411c98c90c1616d22ee79c19d275
-size 619601
diff --git a/powerman-2.3.26.tar.gz b/powerman-2.3.26.tar.gz
new file mode 100644
index 0000000..65102df
--- /dev/null
+++ b/powerman-2.3.26.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19e213127f468b835165b8e2082ff2dfff62d6832f3332160f2c6ba8b2d286ad
+size 703605
diff --git a/powerman.changes b/powerman.changes
index fd20499..233befb 100644
--- a/powerman.changes
+++ b/powerman.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu May 13 07:54:21 UTC 2021 - pgajdos@suse.com
+
+- version update to 2.3.26
+  * Log power state changes to syslog (Olaf Faaland, PR #37)
+  * Fix default systemd unit file path for 'make distcheck'
+  * Add etc/rancid-cisco-poe.dev (Daniel Rich, PR #28)
+  * Add etc/openbmc.dev (Albert Chu, PR #33)
+  * Add etc/kvm.dev & etc/kvm-ssh.dev (tisbeok, PR #8)
+  * Fix misinterpretation of error strings in ipmipower.dev.
+- fix [bsc#1185180] -- PIDFile under /run
+- modified patches
+  % service-dynamic-user-autofiles.patch (refreshed)
+  % service-dynamic-user-configure.patch (refreshed)
+
 -------------------------------------------------------------------
 Wed Apr 25 09:48:37 UTC 2018 - eich@suse.com
 
diff --git a/powerman.spec b/powerman.spec
index 489d30c..61d8704 100644
--- a/powerman.spec
+++ b/powerman.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package powerman
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -30,15 +30,16 @@
 %endif
 
 Name:           powerman
-Version:        2.3.24
+Version:        2.3.26
 Release:        0
 Summary:        Centralized Power Control for Clusters
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Clustering/HA
-Url:            https://github.com/chaos/powerman
+URL:            https://github.com/chaos/powerman
 Source0:        https://github.com/chaos/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
 Patch1:         service-dynamic-user-autofiles.patch
 Patch2:         service-dynamic-user-configure.patch
+BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
 BuildRequires:  pkg-config
@@ -97,8 +98,8 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{__mkdir} -p %{buildroot}%{_tmpfilesdir}
-cat >> %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
-d /var/run/powerman 0755 %{powerman_u} %{powerman_g} -
+cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
+d /run/powerman 0755 %{powerman_u} %{powerman_g} -
 EOF
 mv %{buildroot}%{_sysconfdir}/powerman/powerman.conf.example %{buildroot}%{_sysconfdir}/powerman/powerman.conf
 rm -r %{buildroot}%{_libdir}/stonith
diff --git a/service-dynamic-user-autofiles.patch b/service-dynamic-user-autofiles.patch
index ac6e6c1..e1a788a 100644
--- a/service-dynamic-user-autofiles.patch
+++ b/service-dynamic-user-autofiles.patch
@@ -1,8 +1,8 @@
-Index: powerman-2.3.24/scripts/powerman.service
+Index: powerman-2.3.26/scripts/powerman.service
 ===================================================================
---- powerman-2.3.24.orig/scripts/powerman.service
-+++ /dev/null
-@@ -1,16 +0,0 @@
+--- powerman-2.3.26.orig/scripts/powerman.service	2018-12-29 00:03:25.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,14 +0,0 @@
 -[Unit]
 -Description=PowerMan
 -After=syslog.target network.target
@@ -13,16 +13,14 @@ Index: powerman-2.3.24/scripts/powerman.service
 -User=daemon
 -Group=daemon
 -ExecStart=/usr/sbin/powermand
--RuntimeDirectory=powerman
--RuntimeDirectoryMode=0755
 -PIDFile=/var/run/powerman/powermand.pid
 -
 -[Install]
 -WantedBy=multi-user.target
-Index: powerman-2.3.24/scripts/powerman.service.in
+Index: powerman-2.3.26/scripts/powerman.service.in
 ===================================================================
---- /dev/null
-+++ powerman-2.3.24/scripts/powerman.service.in
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ powerman-2.3.26/scripts/powerman.service.in	2021-05-13 09:07:58.387942345 +0200
 @@ -0,0 +1,16 @@
 +[Unit]
 +Description=PowerMan
@@ -36,15 +34,15 @@ Index: powerman-2.3.24/scripts/powerman.service.in
 +ExecStart=/usr/sbin/powermand
 +RuntimeDirectory=powerman
 +RuntimeDirectoryMode=0755
-+PIDFile=/var/run/powerman/powermand.pid
++PIDFile=/run/powerman/powermand.pid
 +
 +[Install]
 +WantedBy=multi-user.target
-Index: powerman-2.3.24/configure.ac
+Index: powerman-2.3.26/configure.ac
 ===================================================================
---- powerman-2.3.24.orig/configure.ac
-+++ powerman-2.3.24/configure.ac
-@@ -91,7 +91,7 @@ AC_DEFINE(WITH_LSD_NOMEM_ERROR_FUNC, 1,
+--- powerman-2.3.26.orig/configure.ac	2020-02-18 20:56:01.000000000 +0100
++++ powerman-2.3.26/configure.ac	2021-05-13 09:07:58.387942345 +0200
+@@ -90,7 +90,7 @@ AC_DEFINE(WITH_LSD_NOMEM_ERROR_FUNC, 1,
  # whether to install pkg-config file for API
  AC_PKGCONFIG
  
@@ -53,18 +51,18 @@ Index: powerman-2.3.24/configure.ac
  AC_RUNAS
  
  ##
-@@ -112,6 +112,7 @@ AC_CONFIG_FILES( \
+@@ -111,6 +111,7 @@ AC_CONFIG_FILES( \
    etc/Makefile \
    scripts/Makefile \
    scripts/powerman \
 +  scripts/powerman.service \
+   scripts/tmpfiles.d/powerman.conf \
    heartbeat/Makefile \
    man/Makefile \
-   man/powerman.1 \
-Index: powerman-2.3.24/config/ac_runas.m4
+Index: powerman-2.3.26/config/ac_runas.m4
 ===================================================================
---- powerman-2.3.24.orig/config/ac_runas.m4
-+++ powerman-2.3.24/config/ac_runas.m4
+--- powerman-2.3.26.orig/config/ac_runas.m4	2018-12-29 00:02:57.000000000 +0100
++++ powerman-2.3.26/config/ac_runas.m4	2021-05-13 09:07:58.387942345 +0200
 @@ -1,6 +1,7 @@
  AC_DEFUN([AC_RUNAS],
  [
@@ -94,3 +92,16 @@ Index: powerman-2.3.24/config/ac_runas.m4
 +    AC_MSG_RESULT(${RUN_AS_GROUP})
 +    AC_SUBST(RUN_AS_GROUP)
  ])
+Index: powerman-2.3.26/config/systemd.m4
+===================================================================
+--- powerman-2.3.26.orig/config/systemd.m4	2020-02-18 20:56:01.000000000 +0100
++++ powerman-2.3.26/config/systemd.m4	2021-05-13 09:27:58.838707064 +0200
+@@ -33,7 +33,7 @@ AC_DEFUN([RRA_WITH_SYSTEMD_UNITDIR],
+     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
+         [Directory for systemd service files])],
+     [],
+-    [with_systemdsystemunitdir=\${prefix}$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
++    [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+  AS_IF([test x"$with_systemdsystemunitdir" != xno],
+     [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+  AM_CONDITIONAL([HAVE_SYSTEMD],
diff --git a/service-dynamic-user-configure.patch b/service-dynamic-user-configure.patch
index 79186cc..b666499 100644
--- a/service-dynamic-user-configure.patch
+++ b/service-dynamic-user-configure.patch
@@ -1,8 +1,8 @@
-Index: powerman-2.3.24/configure
+Index: powerman-2.3.26/configure
 ===================================================================
---- powerman-2.3.24.orig/configure
-+++ powerman-2.3.24/configure
-@@ -788,6 +788,7 @@ ac_subst_vars='am__EXEEXT_FALSE
+--- powerman-2.3.26.orig/configure	2021-05-13 09:27:08.014457823 +0200
++++ powerman-2.3.26/configure	2021-05-13 09:28:54.294979035 +0200
+@@ -633,6 +633,7 @@ ac_subst_vars='am__EXEEXT_FALSE
  am__EXEEXT_TRUE
  LTLIBOBJS
  LIBOBJS
@@ -10,7 +10,7 @@ Index: powerman-2.3.24/configure
  RUN_AS_USER
  pkgconfigdir
  WITH_PKG_CONFIG_FALSE
-@@ -970,6 +971,7 @@ with_ncurses
+@@ -818,6 +819,7 @@ with_ncurses
  with_tcp_wrappers
  with_pkgconfig_dir
  with_user
@@ -18,7 +18,7 @@ Index: powerman-2.3.24/configure
  '
        ac_precious_vars='build_alias
  host_alias
-@@ -1643,6 +1645,7 @@ Optional Packages:
+@@ -1501,6 +1503,7 @@ Optional Packages:
                            where to install pkg-config *.pc files
                            (EPREFIX/lib/pkgconfig)
    --with-user=username    user for powerman daemon (daemon)
@@ -26,7 +26,16 @@ Index: powerman-2.3.24/configure
  
  Some influential environment variables:
    CC          C compiler command
-@@ -15307,9 +15310,10 @@ fi
+@@ -13622,7 +13625,7 @@ fi
+ if test "${with_systemdsystemunitdir+set}" = set; then :
+   withval=$with_systemdsystemunitdir;
+ else
+-  with_systemdsystemunitdir=\${prefix}$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
++  with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
+ fi
+ 
+  if test x"$with_systemdsystemunitdir" != xno; then :
+@@ -14149,9 +14152,10 @@ fi
  
  
  
@@ -35,13 +44,13 @@ Index: powerman-2.3.24/configure
  
      RUN_AS_USER="daemon"
 +    RUN_AS_GROUP="daemon"
-     { $as_echo "$as_me:$LINENO: checking user to run as" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking user to run as" >&5
  $as_echo_n "checking user to run as... " >&6; }
  
-@@ -15333,11 +15337,34 @@ _ACEOF
+@@ -14174,12 +14178,33 @@ _ACEOF
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${RUN_AS_USER}" >&5
  $as_echo "${RUN_AS_USER}" >&6; }
  
- 
 +    { $as_echo "$as_me:$LINENO: checking group to run as" >&5
 +$as_echo_n "checking group to run as... " >&6; }
 +
@@ -63,22 +72,21 @@ Index: powerman-2.3.24/configure
 +
 +    { $as_echo "$as_me:$LINENO: result: ${RUN_AS_GROUP}" >&5
 +$as_echo "${RUN_AS_GROUP}" >&6; }
-+
-+
+ 
  
  ##
  # Epilogue.
  ##
--ac_config_files="$ac_config_files Makefile powerman.spec libpowerman/Makefile libpowerman/libpowerman.pc liblsd/Makefile libcommon/Makefile powerman/Makefile powermand/Makefile httppower/Makefile snmppower/Makefile plmpower/Makefile etc/Makefile scripts/Makefile scripts/powerman heartbeat/Makefile man/Makefile man/powerman.1 man/libpowerman.3 man/powerman.conf.5 man/powerman.dev.5 man/httppower.8 man/plmpower.8 man/powermand.8 man/vpcd.8 test/Makefile"
-+ac_config_files="$ac_config_files Makefile powerman.spec libpowerman/Makefile libpowerman/libpowerman.pc liblsd/Makefile libcommon/Makefile powerman/Makefile powermand/Makefile httppower/Makefile snmppower/Makefile plmpower/Makefile etc/Makefile scripts/Makefile scripts/powerman scripts/powerman.service heartbeat/Makefile man/Makefile man/powerman.1 man/libpowerman.3 man/powerman.conf.5 man/powerman.dev.5 man/httppower.8 man/plmpower.8 man/powermand.8 man/vpcd.8 test/Makefile"
+-ac_config_files="$ac_config_files Makefile examples/powerman_el72.spec libpowerman/Makefile libpowerman/libpowerman.pc liblsd/Makefile libcommon/Makefile powerman/Makefile powermand/Makefile httppower/Makefile snmppower/Makefile plmpower/Makefile etc/Makefile scripts/Makefile scripts/powerman scripts/tmpfiles.d/powerman.conf heartbeat/Makefile man/Makefile man/powerman.1 man/libpowerman.3 man/powerman.conf.5 man/powerman.dev.5 man/httppower.8 man/plmpower.8 man/powermand.8 man/vpcd.8 test/Makefile test/mcr.conf test/sierra.conf test/t07.conf test/t09.conf test/t10.conf test/t17.conf test/t18.conf test/t19.conf test/t20.conf test/t21.conf test/t22.conf test/t23.conf test/t24.conf test/t25.conf test/t26.conf test/t27.conf test/t28.conf test/t29.conf test/t30.conf test/t31.conf test/t32.conf test/t33.conf test/t34.conf test/t35.conf test/t36.conf test/t37.conf test/t38.conf test/t39.conf test/t40.conf test/t41.conf test/t42.conf test/t43.conf test/t44.conf test/t45.conf test/t46.conf test/t47.conf test/t48.conf test/t49.conf test/t50.conf test/t51.conf test/t53.conf test/t54.conf test/t55.conf test/t60.conf test/t61.conf test/test.conf test/test4.conf"
++ac_config_files="$ac_config_files Makefile examples/powerman_el72.spec libpowerman/Makefile libpowerman/libpowerman.pc liblsd/Makefile libcommon/Makefile powerman/Makefile powermand/Makefile httppower/Makefile snmppower/Makefile plmpower/Makefile etc/Makefile scripts/Makefile scripts/powerman scripts/powerman.service scripts/tmpfiles.d/powerman.conf heartbeat/Makefile man/Makefile man/powerman.1 man/libpowerman.3 man/powerman.conf.5 man/powerman.dev.5 man/httppower.8 man/plmpower.8 man/powermand.8 man/vpcd.8 test/Makefile test/mcr.conf test/sierra.conf test/t07.conf test/t09.conf test/t10.conf test/t17.conf test/t18.conf test/t19.conf test/t20.conf test/t21.conf test/t22.conf test/t23.conf test/t24.conf test/t25.conf test/t26.conf test/t27.conf test/t28.conf test/t29.conf test/t30.conf test/t31.conf test/t32.conf test/t33.conf test/t34.conf test/t35.conf test/t36.conf test/t37.conf test/t38.conf test/t39.conf test/t40.conf test/t41.conf test/t42.conf test/t43.conf test/t44.conf test/t45.conf test/t46.conf test/t47.conf test/t48.conf test/t49.conf test/t50.conf test/t51.conf test/t53.conf test/t54.conf test/t55.conf test/t60.conf test/t61.conf test/test.conf test/test4.conf"
  
  
  cat >confcache <<\_ACEOF
-@@ -16282,6 +16309,7 @@ do
+@@ -15231,6 +15256,7 @@ do
      "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
      "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
      "scripts/powerman") CONFIG_FILES="$CONFIG_FILES scripts/powerman" ;;
 +    "scripts/powerman.service") CONFIG_FILES="$CONFIG_FILES scripts/powerman.service" ;;
+     "scripts/tmpfiles.d/powerman.conf") CONFIG_FILES="$CONFIG_FILES scripts/tmpfiles.d/powerman.conf" ;;
      "heartbeat/Makefile") CONFIG_FILES="$CONFIG_FILES heartbeat/Makefile" ;;
      "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-     "man/powerman.1") CONFIG_FILES="$CONFIG_FILES man/powerman.1" ;;