- rediff patch, rebuild with openssl 3.0.0, rel 2

diff --git a/config.patch b/config.patch
index ef114dbadf47591225433eb22f8889472d6475bd..d227fd1a3716adbe5711cada6c59e44c7eb17df2 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,8 +1,9 @@
---- monit-5.9/monitrc  2014-10-27 17:33:09.741090635 +0200
-+++ monit-5.9/monitrc  2014-10-27 17:35:35.171362348 +0200
-@@ -51,7 +51,8 @@
- ## specified using a comma separator. If the first mail server fails, Monit 
- # will use the second mail server in the list and so on. By default Monit uses 
+diff -urNp -x '*.orig' monit-5.25.2.org/monitrc monit-5.25.2/monitrc
+--- monit-5.25.2.org/monitrc   2018-05-29 21:03:45.000000000 +0200
++++ monit-5.25.2/monitrc       2021-10-05 22:43:27.407462292 +0200
+@@ -76,7 +76,8 @@ set log syslog
+ ## specified using a comma separator. If the first mail server fails, Monit
+ # will use the second mail server in the list and so on. By default Monit uses
  # port 25 - it is possible to override this with the PORT option.
 -#
 +
@@ -10,9 +11,9 @@
  # set mailserver mail.bar.baz,               # primary mailserver
  #                backup.bar.baz port 10025,  # backup mailserver on port 10025
  #                localhost                   # fallback relay
-@@ -108,9 +109,9 @@
- ## You can set alert recipients whom will receive alerts if/when a 
- ## service defined in this file has errors. Alerts may be restricted on 
+@@ -137,9 +138,9 @@ set log syslog
+ ## You can set alert recipients whom will receive alerts if/when a
+ ## service defined in this file has errors. Alerts may be restricted on
  ## events by using a filter as in the second example below.
 -#
 -# set alert sysadm@foo.bar                       # receive all alerts
@@ -23,7 +24,10 @@
  ## Do not alert when Monit starts, stops or performs a user initiated action.
  ## This filter is recommended to avoid getting alerts for trivial cases.
  #
-@@ -256,3 +257,2 @@
+@@ -300,6 +301,5 @@ set httpd port 2812 and
+ ##
+ ## It is possible to include additional configuration parts from other files or
+ ## directories.
 -#
 -#  include /etc/monit.d/*
 -#

diff --git a/monit.spec b/monit.spec
index 6b9a2a69797ca238dbf47de29fd6eefbc1652965..aa0838f1394c966c373d1b8cac074f5d5b822256 100644 (file)
--- a/monit.spec
+++ b/monit.spec
@@ -12,7 +12,7 @@ Summary:      Process monitor and restart utility
 Summary(pl.UTF-8):     Narzędzie do monitorowania procesów i ich restartowania
 Name:          monit
 Version:       5.25.2
-Release:       1
+Release:       2
 License:       AGPL v3
 Group:         Daemons
 Source0:       http://mmonit.com/monit/dist/%{name}-%{version}.tar.gz