commit 103b9b192f17f150fbfd13f18d2397d49e3661a7
Author: Jan Rękorajski <[email protected]>
Date: Tue Oct 5 21:32:51 2021 +0200
- rediff patches, rebuild with openssl 3.0.0, rel 11
nut-client.patch | 13 ++++---
nut-config.patch | 88 +++++++++++++++++++++---------------------
nut-matrix.patch | 9 +++--
nut-upssched-cmd-sysconf.patch | 19 ++++-----
nut.spec | 3 +-
5 files changed, 69 insertions(+), 63 deletions(-)
---
diff --git a/nut.spec b/nut.spec
index 7731375..e115d8a 100644
--- a/nut.spec
+++ b/nut.spec
@@ -14,7 +14,7 @@ Summary: Network UPS Tools
Summary(pl.UTF-8): Sieciowe narzędzie do UPS-ów
Name: nut
Version: 2.7.4
-Release: 10
+Release: 11
License: GPL v2+
Group: Applications/System
Source0:
http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz
@@ -218,6 +218,7 @@ Statyczne biblioteki NUT-a.
%{__autoconf}
%{__autoheader}
%{__automake}
+export CXXFLAGS="%{rpmcxxflags} -std=c++11"
%configure \
--datadir=%{_datadir}/%{name} \
--with-cgipath=/home/services/httpd/cgi-bin \
diff --git a/nut-client.patch b/nut-client.patch
index c593db7..7127715 100644
--- a/nut-client.patch
+++ b/nut-client.patch
@@ -1,11 +1,12 @@
---- nut-2.2.0/clients/Makefile.am.orig 2007-07-25 16:53:40.493327586 +0000
-+++ nut-2.2.0/clients/Makefile.am 2007-07-25 16:53:51.491649721 +0000
-@@ -7,7 +7,7 @@
- AM_CFLAGS = -I$(top_srcdir)/include $(LIBSSL_CFLAGS) $(LIBGD_CFLAGS)
+diff -urNp -x '*.orig' nut-2.7.4.org/clients/Makefile.am
nut-2.7.4/clients/Makefile.am
+--- nut-2.7.4.org/clients/Makefile.am 2015-12-29 13:08:34.000000000 +0100
++++ nut-2.7.4/clients/Makefile.am 2021-10-05 21:27:39.927311204 +0200
+@@ -18,7 +18,7 @@ if WITH_CGI
+ endif
bin_PROGRAMS = upsc upslog upsrw upscmd
-dist_bin_SCRIPTS = upssched-cmd
+dist_sbin_SCRIPTS = upssched-cmd
sbin_PROGRAMS = upsmon upssched
- if WITH_LIB
- lib_LTLIBRARIES = libupsclient.la
+ lib_LTLIBRARIES = libupsclient.la libnutclient.la
+ if WITH_DEV
diff --git a/nut-config.patch b/nut-config.patch
index 7efbc4e..e60aa73 100644
--- a/nut-config.patch
+++ b/nut-config.patch
@@ -1,6 +1,45 @@
-diff -Nuard nut-2.0.1.orig/conf/upssched.conf nut-2.0.1/conf/upssched.conf
---- nut-2.0.1.orig/conf/upssched.conf 2004-10-26 11:50:12.410074640 +0200
-+++ nut-2.0.1/conf/upssched.conf.sample.in 2004-10-26 11:50:23.295419816
+0200
+diff -urNp -x '*.orig' nut-2.7.4.org/clients/upssched-cmd
nut-2.7.4/clients/upssched-cmd
+--- nut-2.7.4.org/clients/upssched-cmd 2015-12-29 09:42:34.000000000 +0100
++++ nut-2.7.4/clients/upssched-cmd 2021-10-05 21:27:40.107312172 +0200
+@@ -14,6 +14,10 @@ case $1 in
+ upsgone)
+ logger -t upssched-cmd "The UPS has been gone for awhile"
+ ;;
++# EarlyShutdown)
++# logger -t upssched-cmd "The UPS is being shutdown by the master"
++# /usr/sbin/upsmon -c fsd
++# ;;
+ *)
+ logger -t upssched-cmd "Unrecognized command: $1"
+ ;;
+diff -urNp -x '*.orig' nut-2.7.4.org/conf/upsmon.conf.sample.in
nut-2.7.4/conf/upsmon.conf.sample.in
+--- nut-2.7.4.org/conf/upsmon.conf.sample.in 2015-12-29 13:08:34.000000000
+0100
++++ nut-2.7.4/conf/upsmon.conf.sample.in 2021-10-05 21:27:40.107312172
+0200
+@@ -126,7 +126,7 @@ SHUTDOWNCMD "/sbin/shutdown -h +0"
+ # information and ideas, see docs/scheduling.txt
+ #
+ # Example:
+-# NOTIFYCMD @BINDIR@/notifyme
++# NOTIFYCMD /usr/sbin/upssched
+
+ # --------------------------------------------------------------------------
+ # POLLFREQ <n>
+@@ -261,6 +261,12 @@ POWERDOWNFLAG /etc/killpower
+ # IGNORE - Don't do anything
+ #
+ # If you use IGNORE, don't use any other flags on the same line.
++# ==========================================================================
++#
++# NOTIFYFLAG ONLINE SYSLOG+EXEC
++# NOTIFYFLAG ONBATT SYSLOG+EXEC
++# NOTIFYFLAG COMMOK SYSLOG+EXEC
++# NOTIFYFLAG COMMBAD SYSLOG+EXEC
+
+ # --------------------------------------------------------------------------
+ # RBWARNTIME - replace battery warning time in seconds
+diff -urNp -x '*.orig' nut-2.7.4.org/conf/upssched.conf.sample.in
nut-2.7.4/conf/upssched.conf.sample.in
+--- nut-2.7.4.org/conf/upssched.conf.sample.in 2015-12-29 09:42:34.000000000
+0100
++++ nut-2.7.4/conf/upssched.conf.sample.in 2021-10-05 21:27:40.107312172
+0200
@@ -14,7 +14,7 @@
# A shell script with a big case..esac construct should work nicely for this.
# An example has been provided to help you get started.
@@ -10,7 +49,7 @@ diff -Nuard nut-2.0.1.orig/conf/upssched.conf
nut-2.0.1/conf/upssched.conf
# ============================================================================
#
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ CMDSCRIPT @BINDIR@/upssched-cmd
# This is commented out by default to make you visit this file and think
# about how your system works before potentially opening a hole.
#
@@ -19,7 +58,7 @@ diff -Nuard nut-2.0.1.orig/conf/upssched.conf
nut-2.0.1/conf/upssched.conf
# ============================================================================
#
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ CMDSCRIPT @BINDIR@/upssched-cmd
#
# You should put this in the same directory as PIPEFN.
#
@@ -28,7 +67,7 @@ diff -Nuard nut-2.0.1.orig/conf/upssched.conf
nut-2.0.1/conf/upssched.conf
# ============================================================================
#
-@@ -111,3 +111,10 @@
+@@ -111,3 +111,10 @@ CMDSCRIPT @BINDIR@/upssched-cmd
# 'ups-back-on-line' via CMDSCRIPT.
#
# AT ONLINE * EXECUTE ups-back-on-line
@@ -39,40 +78,3 @@ diff -Nuard nut-2.0.1.orig/conf/upssched.conf
nut-2.0.1/conf/upssched.conf
+# AT ONLINE * CANCEL-TIMER EarlyShutdown
+# AT COMMBAD * START-TIMER upsgone 10
+# AT COMMOK * CANCEL-TIMER upsgone
---- nut-2.2.0/conf/upsmon.conf.sample.orig 2007-07-26 11:15:08.152047877
+0000
-+++ nut-2.2.0/conf/upsmon.conf.sample.in 2007-07-26 11:17:20.131913520
+0000
-@@ -126,7 +126,7 @@
- # information and ideas, see pager.txt in the docs directory.
- #
- # Example:
--# NOTIFYCMD @BINDIR@/notifyme
-+# NOTIFYCMD /usr/sbin/upssched
-
- # --------------------------------------------------------------------------
- # POLLFREQ <n>
-@@ -241,6 +241,12 @@
- # IGNORE - Don't do anything
- #
- # If you use IGNORE, don't use any other flags on the same line.
-+# ==========================================================================
-+#
-+# NOTIFYFLAG ONLINE SYSLOG+EXEC
-+# NOTIFYFLAG ONBATT SYSLOG+EXEC
-+# NOTIFYFLAG COMMOK SYSLOG+EXEC
-+# NOTIFYFLAG COMMBAD SYSLOG+EXEC
-
- # --------------------------------------------------------------------------
- # RBWARNTIME - replace battery warning time in seconds
---- nut-2.2.0/clients/upssched-cmd.orig 2007-07-26 11:21:16.595839465
+0000
-+++ nut-2.2.0/clients/upssched-cmd 2007-07-26 11:23:45.573112047 +0000
-@@ -14,6 +14,10 @@
- upsgone)
- logger -t upssched-cmd "The UPS has been gone for awhile"
- ;;
-+# EarlyShutdown)
-+# logger -t upssched-cmd "The UPS is being shutdown by the master"
-+# /usr/sbin/upsmon -c fsd
-+# ;;
- *)
- logger -t upssched-cmd "Unrecognized command: $1"
- ;;
diff --git a/nut-matrix.patch b/nut-matrix.patch
index e3e2f28..b6d949c 100644
--- a/nut-matrix.patch
+++ b/nut-matrix.patch
@@ -1,7 +1,8 @@
---- nut-2.4.3/drivers/apcsmart-old.h~ 2010-07-15 09:48:38.358605322 +0200
-+++ nut-2.4.3/drivers/apcsmart-old.h 2010-07-15 09:49:46.457765191 +0200
-@@ -257,6 +257,7 @@
- /* APC Matrix */
+diff -urNp -x '*.orig' nut-2.7.4.org/drivers/apcsmart-old.h
nut-2.7.4/drivers/apcsmart-old.h
+--- nut-2.7.4.org/drivers/apcsmart-old.h 2021-10-05 21:27:40.590648101
+0200
++++ nut-2.7.4/drivers/apcsmart-old.h 2021-10-05 21:27:40.657315126 +0200
+@@ -258,6 +258,7 @@ struct {
+ { "0XM",
"789ABCDEFGKLMNOPQRSTUVWXYZcefgjklmnopqrsuwxz/<>\\^\014\026", 0 },
{ "0ZI", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz/<>", 0 },
{ "5UI", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz/<>", 0 },
+ { "5YI", "789ABCDEFGLMNOPQTUVWXYcefgjklmnopqrsuwxyz\\<>/", 0 },
diff --git a/nut-upssched-cmd-sysconf.patch b/nut-upssched-cmd-sysconf.patch
index 4c5b920..259d5f6 100644
--- a/nut-upssched-cmd-sysconf.patch
+++ b/nut-upssched-cmd-sysconf.patch
@@ -1,17 +1,18 @@
---- nut-2.2.0/clients/Makefile.am.orig 2007-07-25 16:53:40.493327586 +0000
-+++ nut-2.2.0/clients/Makefile.am 2007-07-25 16:53:51.491649721 +0000
-@@ -7,7 +7,7 @@
- AM_CFLAGS = -I$(top_srcdir)/include $(LIBSSL_CFLAGS) $(LIBGD_CFLAGS)
+diff -urNp -x '*.orig' nut-2.7.4.org/clients/Makefile.am
nut-2.7.4/clients/Makefile.am
+--- nut-2.7.4.org/clients/Makefile.am 2021-10-05 21:27:40.403980432 +0200
++++ nut-2.7.4/clients/Makefile.am 2021-10-05 21:27:40.473980806 +0200
+@@ -18,7 +18,7 @@ if WITH_CGI
+ endif
bin_PROGRAMS = upsc upslog upsrw upscmd
-dist_sbin_SCRIPTS = upssched-cmd
+dist_sysconf_DATA = upssched-cmd
sbin_PROGRAMS = upsmon upssched
- if WITH_LIB
- lib_LTLIBRARIES = libupsclient.la
-diff -Nuard nut-2.0.1.orig/conf/upssched.conf nut-2.0.1/conf/upssched.conf
---- nut-2.0.1.orig/conf/upssched.conf 2004-10-26 11:50:12.410074640 +0200
-+++ nut-2.0.1/conf/upssched.conf.sample.in 2004-10-26 11:50:23.295419816
+0200
+ lib_LTLIBRARIES = libupsclient.la libnutclient.la
+ if WITH_DEV
+diff -urNp -x '*.orig' nut-2.7.4.org/conf/upssched.conf.sample.in
nut-2.7.4/conf/upssched.conf.sample.in
+--- nut-2.7.4.org/conf/upssched.conf.sample.in 2021-10-05 21:27:40.403980432
+0200
++++ nut-2.7.4/conf/upssched.conf.sample.in 2021-10-05 21:27:40.473980806
+0200
@@ -14,7 +14,7 @@
# A shell script with a big case..esac construct should work nicely for this.
# An example has been provided to help you get started.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nut.git/commitdiff/103b9b192f17f150fbfd13f18d2397d49e3661a7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
