UPDATE: sysutils/monit 5.33.0

[Caspar Schutijser]

Hi all,

Below is a diff that updates sysutils/monit to 5.33.0. Tested on amd64.
Comments or OKs?

Caspar


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.73
diff -u -p -r1.73 Makefile
--- Makefile29 Mar 2022 07:44:13 -  1.73
+++ Makefile25 Apr 2023 09:06:54 -
@@ -1,6 +1,6 @@
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.32.0
+DISTNAME=  monit-5.33.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.49
diff -u -p -r1.49 distinfo
--- distinfo29 Mar 2022 07:44:13 -  1.49
+++ distinfo25 Apr 2023 09:06:54 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.32.0.tar.gz) = EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY=
-SIZE (monit-5.32.0.tar.gz) = 1480629
+SHA256 (monit-5.33.0.tar.gz) = Gs6InAGDRzqdcBYN9lM7tuEzjcE1T1koUHgD4eKoY7U=
+SIZE (monit-5.33.0.tar.gz) = 1502487
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2022 19:57:42 -  1.7
+++ patches/patch-Makefile_in   25 Apr 2023 09:06:54 -
@@ -5,7 +5,7 @@ Using the "define" directive is a GNUmak
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1296,11 +1296,6 @@ uninstall-man: uninstall-man1
+@@ -1303,11 +1303,6 @@ uninstall-man: uninstall-man1
  .PRECIOUS: Makefile
  
  
@@ -17,7 +17,7 @@ Index: Makefile.in
  # ---
  # Targets
  # ---
-@@ -1335,7 +1330,7 @@ cleanall: clean distclean
+@@ -1342,7 +1337,7 @@ cleanall: clean distclean
-git clean -fxd
  
  monit.1: doc/monit.pod
@@ -26,7 +26,7 @@ Index: Makefile.in
-rm -f pod2*
  
  # -
-@@ -1346,14 +1341,14 @@ src/y.tab.c src/y.tab.h: run-yacc
+@@ -1353,14 +1348,14 @@ src/y.tab.c src/y.tab.h: run-yacc
  
  .INTERMEDIATE: run-yacc
  run-yacc: src/p.y
Index: patches/patch-src_ssl_Ssl_c
===
RCS file: patches/patch-src_ssl_Ssl_c
diff -N patches/patch-src_ssl_Ssl_c
--- patches/patch-src_ssl_Ssl_c 11 Mar 2022 19:57:42 -  1.6
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-Index: src/ssl/Ssl.c
 src/ssl/Ssl.c.orig
-+++ src/ssl/Ssl.c
-@@ -429,7 +429,7 @@ static int _verifyClientCertificates(int preverify_ok,
- return 0;
- }
- }
--#if (OPENSSL_VERSION_NUMBER < 0x1010L) || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x1010L)
- X509_OBJECT found_cert;
- if (X509_STORE_CTX_get_error_depth(ctx) == 0 && 
X509_STORE_get_by_subject(ctx, X509_LU_X509, 
X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)), _cert) != 1) 
{
- #else
-@@ -438,12 +438,12 @@ static int _verifyClientCertificates(int preverify_ok,
- #endif
- Log_error("SSL: no matching certificate found -- %s\n", 
SSLERROR);
- X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
--#if OPENSSL_VERSION_NUMBER >= 0x1010L && ! 
defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L
- X509_OBJECT_free(found_cert);
- #endif
- return 0;
- }
--#if OPENSSL_VERSION_NUMBER >= 0x1010L && ! 
defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x1010L
- X509_OBJECT_free(found_cert);
- #endif
- return 1;

UPDATE: sysutils/monit 5.32.0

[Caspar Schutijser]

Hi ports@,

The diff below updates sysutils/monit to 5.32.0. Tested on amd64.
It's not a big release, it consists of a couple of bug fixes.
Release notes: https://mmonit.com/monit/changes/#5.32.0

Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile11 Mar 2022 19:57:42 -  1.72
+++ Makefile29 Mar 2022 04:53:30 -
@@ -1,6 +1,6 @@
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.31.0
+DISTNAME=  monit-5.32.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo23 Feb 2022 16:25:48 -  1.48
+++ distinfo29 Mar 2022 04:53:30 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.31.0.tar.gz) = 6ucfKJQftmPux0waWbaVRsZZUpeWVQvZwMVE6bUqwFU=
-SIZE (monit-5.31.0.tar.gz) = 1479644
+SHA256 (monit-5.32.0.tar.gz) = EHcFLUxOhIrEfRT5s3dU1GQZrsvoyaB+H4ackU+vMhY=
+SIZE (monit-5.32.0.tar.gz) = 1480629

UPDATE: sysutils/monit 5.31.0

[Caspar Schutijser]

Hi ports@,

The diff below updates sysutils/monit to 5.31.0. I've tested on amd64
for some days. Release notes: https://mmonit.com/monit/changes/#5.31.0

Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile23 Jan 2022 14:42:16 -  1.70
+++ Makefile20 Feb 2022 16:14:53 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.30.0
+DISTNAME=  monit-5.31.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo23 Jan 2022 14:42:16 -  1.47
+++ distinfo20 Feb 2022 16:14:53 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.30.0.tar.gz) = 6FZJ36hYb0/N00oClcVd3Wmw7abPvaxHEFomc9ELEAg=
-SIZE (monit-5.30.0.tar.gz) = 1476979
+SHA256 (monit-5.31.0.tar.gz) = 6ucfKJQftmPux0waWbaVRsZZUpeWVQvZwMVE6bUqwFU=
+SIZE (monit-5.31.0.tar.gz) = 1479644

UPDATE: sysutils/monit 5.30.0

[Caspar Schutijser]

Hi ports@,

The diff below updates sysutils/monit to 5.30.0. Tested on amd64 for
a week or so. Release notes: https://mmonit.com/monit/changes/#5.30.0

I also reworked pkg/DESCR a bit.

Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile31 Oct 2021 17:34:51 -  1.69
+++ Makefile21 Jan 2022 18:45:39 -
@@ -2,8 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.29.0
-REVISION=  0
+DISTNAME=  monit-5.30.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo1 Sep 2021 20:40:14 -   1.46
+++ distinfo21 Jan 2022 18:45:39 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.29.0.tar.gz) = 9mXm3R8mp0tWgomah3k0Fn3islguBIZS7PA2MYR3iF8=
-SIZE (monit-5.29.0.tar.gz) = 1476102
+SHA256 (monit-5.30.0.tar.gz) = 6FZJ36hYb0/N00oClcVd3Wmw7abPvaxHEFomc9ELEAg=
+SIZE (monit-5.30.0.tar.gz) = 1476979
Index: pkg/DESCR
===
RCS file: /cvs/ports/sysutils/monit/pkg/DESCR,v
retrieving revision 1.4
diff -u -p -r1.4 DESCR
--- pkg/DESCR   10 Nov 2017 21:08:56 -  1.4
+++ pkg/DESCR   21 Jan 2022 18:45:39 -
@@ -1,22 +1,22 @@
-monit is an utility for monitoring and managing daemons or similar
+monit is a utility for monitoring and managing daemons or similar
 programs running on a Unix system. It will start specified programs
 if they are not running and restart programs not responding.
 
 monit supports:
  * Daemon mode - poll programs at a specified interval
+ * Monitoring modes - active, passive or manual
  * Start, stop and restart of programs
- * Group- and manage groups of programs
- * Logging - syslog or own logfile
- * Configuration - comprehensive controlfile
- * Runtime and TCP/IP port checking (tcp and udp)
- * Unix domain socket checking
+ * Group and manage groups of programs
+ * Process dependency definition
+ * Logging to syslog or own logfile
+ * UNIX domain socket and IP port checking (TCP and UDP)
  * Process status and process timeout
- * Process memory usage and process cpu usage
- * Alert, stop or restart a process based on it's characteristics
- * Check the systems load average
- * MD5 checksum for programs started and stopped by monit
- * Alert notification for program timeout, restart,
-   checksum, stop and resource error
+ * Process cpu and memory usage
+ * Process zombie check
+ * Check the system's load average
+ * Check a file or directory timestamp
  * Flexible and customizable email alert messages
- * Protocol verification. HTTP, FTP, SMTP, POP, IMAP and NNTP
- * A http interface to make monit accessible from a Browser
+ * Protocol verification - HTTP, FTP, SMTP, POP, IMAP, NNTP, SSH, MySQL,
+   RSYNC, LDAPv3, WebSocket and more
+ * An HTTP interface with TLS support to make monit accessible from
+   a web browser

UPDATE: sysutils/monit 5.29.0

[Caspar Schutijser]

Hi all,

Below is a diff that updates sysutils/monit to 5.29.0. Tested for a few
days on amd64, works fine here.

Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile28 Apr 2021 15:52:09 -  1.67
+++ Makefile1 Sep 2021 16:44:12 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.28.0
+DISTNAME=  monit-5.29.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo28 Apr 2021 15:52:09 -  1.45
+++ distinfo1 Sep 2021 16:44:12 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.28.0.tar.gz) = n8Yof9lXCyWoXF1b+Yjui9TFTQ6eAf8EzEuTmKFZhJw=
-SIZE (monit-5.28.0.tar.gz) = 1480041
+SHA256 (monit-5.29.0.tar.gz) = 9mXm3R8mp0tWgomah3k0Fn3islguBIZS7PA2MYR3iF8=
+SIZE (monit-5.29.0.tar.gz) = 1476102

UPDATE: sysutils/monit 5.28.1

[Caspar Schutijser]

Hi ports@,

Below is a diff that updates sysutils/monit to 5.28.1. Tested for a
couple of days on amd64, works fine here.

Release notes: https://mmonit.com/monit/changes/#5.28.1

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile28 Apr 2021 15:52:09 -  1.67
+++ Makefile4 Aug 2021 06:34:13 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.28.0
+DISTNAME=  monit-5.28.1
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo28 Apr 2021 15:52:09 -  1.45
+++ distinfo4 Aug 2021 06:34:13 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.28.0.tar.gz) = n8Yof9lXCyWoXF1b+Yjui9TFTQ6eAf8EzEuTmKFZhJw=
-SIZE (monit-5.28.0.tar.gz) = 1480041
+SHA256 (monit-5.28.1.tar.gz) = V9iIX2bligpMpqln8rt+jBXtmIoltcprpnM/kZ7welw=
+SIZE (monit-5.28.1.tar.gz) = 1470342

UPDATE: sysutils/monit 5.28.0

[Caspar Schutijser]

Hi,

The diff below updates sysutils/monit to 5.28.0. I've been running this
on amd64 for some time now, works fine here.

Caspar


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile6 Feb 2021 21:40:58 -   1.66
+++ Makefile27 Apr 2021 19:40:46 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.27.2
+DISTNAME=  monit-5.28.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo6 Feb 2021 21:40:58 -   1.44
+++ distinfo27 Apr 2021 19:40:46 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.27.2.tar.gz) = 2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw=
-SIZE (monit-5.27.2.tar.gz) = 1463790
+SHA256 (monit-5.28.0.tar.gz) = n8Yof9lXCyWoXF1b+Yjui9TFTQ6eAf8EzEuTmKFZhJw=
+SIZE (monit-5.28.0.tar.gz) = 1480041
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in   13 Nov 2020 21:34:26 -  1.5
+++ patches/patch-Makefile_in   27 Apr 2021 19:40:46 -
@@ -7,7 +7,7 @@ Using the "define" directive is a GNUmak
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1292,11 +1292,6 @@ uninstall-man: uninstall-man1
+@@ -1296,11 +1296,6 @@ uninstall-man: uninstall-man1
  .PRECIOUS: Makefile
  
  
@@ -19,7 +19,7 @@ Index: Makefile.in
  # ---
  # Targets
  # ---
-@@ -1331,7 +1326,7 @@ cleanall: clean distclean
+@@ -1335,7 +1330,7 @@ cleanall: clean distclean
-git clean -fxd
  
  monit.1: doc/monit.pod
@@ -28,7 +28,7 @@ Index: Makefile.in
-rm -f pod2*
  
  # -
-@@ -1342,14 +1337,14 @@ src/y.tab.c src/y.tab.h: run-yacc
+@@ -1346,14 +1341,14 @@ src/y.tab.c src/y.tab.h: run-yacc
  
  .INTERMEDIATE: run-yacc
  run-yacc: src/p.y

UPDATE: sysutils/monit 5.27.2

[Caspar Schutijser]

Hi ports@,

Below is a diff that updates sysutils/monit to 5.27.2. Tested for a
while on amd64.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile13 Nov 2020 21:34:26 -  1.65
+++ Makefile6 Feb 2021 11:51:26 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.27.1
+DISTNAME=  monit-5.27.2
 
 CATEGORIES=sysutils
 
@@ -28,7 +28,7 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/monitrc
 
 post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/monit
${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo13 Nov 2020 21:34:26 -  1.43
+++ distinfo6 Feb 2021 11:51:26 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.27.1.tar.gz) = 9XQI0WGFaHUTo8TrPyu3Lu92MxrBYhDpZS6EblyE7VE=
-SIZE (monit-5.27.1.tar.gz) = 1459360
+SHA256 (monit-5.27.2.tar.gz) = 2ICceNXcHtenujKlpVxRFIVRMsxNpIBfjTqvjPRuqkw=
+SIZE (monit-5.27.2.tar.gz) = 1463790

Re: UPDATE: sysutils/monit 5.27.1

[Caspar Schutijser]

On Thu, Nov 12, 2020 at 08:43:29PM +, Stuart Henderson wrote:
> On 2020/11/12 19:42, Caspar Schutijser wrote:
> > -   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
> ..
> >  share/doc/monit/
> > -share/doc/monit/README
> 
> ${PREFIX}/share/doc/monit/ isn't doing anything useful any more

Thanks, good point! Fixed.

> > -Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
> > +Using $< in a non-suffix rule context is a GNUmake idiom.
> > +
> > +Using the "define" directive is a GNUmake idiom.
> 
> I think this is ok though it would probably be better to switch to
> USE_GMAKE if it gets much more complex than this.

I was thinking/doubting about that as well. I'll indeed to that if more
patching is required in a next version.

An updated diff follows.

Caspar


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile14 Sep 2019 21:18:18 -  1.64
+++ Makefile13 Nov 2020 19:00:13 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.26.0
+DISTNAME=  monit-5.27.1
 
 CATEGORIES=sysutils
 
@@ -19,6 +19,9 @@ MASTER_SITES= ${HOMEPAGE}/dist/
 
 CONFIGURE_STYLE=gnu
 
+# Must specify C99 for base-gcc
+CFLAGS+=   -std=c99
+
 SUBST_VARS=LOCALSTATEDIR
 
 pre-configure:
@@ -26,7 +29,6 @@ pre-configure:
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo14 Sep 2019 21:18:18 -  1.42
+++ distinfo13 Nov 2020 19:00:13 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I=
-SIZE (monit-5.26.0.tar.gz) = 1371327
+SHA256 (monit-5.27.1.tar.gz) = 9XQI0WGFaHUTo8TrPyu3Lu92MxrBYhDpZS6EblyE7VE=
+SIZE (monit-5.27.1.tar.gz) = 1459360
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in   14 Sep 2019 21:18:18 -  1.4
+++ patches/patch-Makefile_in   13 Nov 2020 19:00:13 -
@@ -1,12 +1,26 @@
 $OpenBSD: patch-Makefile_in,v 1.4 2019/09/14 21:18:18 sthen Exp $
 
-Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
+Using $< in a non-suffix rule context is a GNUmake idiom.
+
+Using the "define" directive is a GNUmake idiom.
 
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1297,7 +1297,7 @@ cleanall: clean distclean
-   -rm -rf m4 config
+@@ -1292,11 +1292,6 @@ uninstall-man: uninstall-man1
+ .PRECIOUS: Makefile
+ 
+ 
+-define check-exit
+-|| exit 1
+-
+-endef
+-
+ # ---
+ # Targets
+ # ---
+@@ -1331,7 +1326,7 @@ cleanall: clean distclean
+   -git clean -fxd
  
  monit.1: doc/monit.pod
 -  $(POD2MAN) $(POD2MANFLAGS) $< > $@
@@ -14,3 +28,21 @@ Index: Makefile.in
-rm -f pod2*
  
  # -
+@@ -1342,14 +1337,14 @@ src/y.tab.c src/y.tab.h: run-yacc
+ 
+ .INTERMEDIATE: run-yacc
+ run-yacc: src/p.y
+-  $(YACC) $(YACCFLAGS) -o src/y.tab.c $<
++  $(YACC) $(YACCFLAGS) -o src/y.tab.c src/p.y
+ 
+ src/lex.yy.c: src/l.l
+-  $(FLEX) $(FLEXFLAGS) -o$@ $<
++  $(FLEX) $(FLEXFLAGS) -o$@ src/l.l
+ @WITH_CODESIGN_TRUE@all-local: $(bin_PROGRAMS)
+ @WITH_CODESIGN_TRUE@  $(foreach file, $(bin_PROGRAMS), \
+ @WITH_CODESIGN_TRUE@codesign -s $(CODESIGN_IDENTITY) -v 
--deep --timestamp --options runtime $(file) \
+-@WITH_CODESIGN_TRUE@$(check-exit))
++@WITH_CODESIGN_TRUE@|| exit 1)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/monit/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   1 May 2019 19:21:57 -   1.11
+++ pkg/PLIST   13 Nov 2020 19:00:13 -
@@ -2,8 +2,6 @@
 @rcscript ${RCDIR}/monit
 @bin bin/monit
 @man man/man1/monit.1
-share/doc/monit/
-share/doc/monit/README
 share/examples/monit/
 share/examples/monit/monitrc
 @mode 0600

Re: UPDATE: sysutils/monit 5.27.1

[Stuart Henderson]

On 2020/11/12 19:42, Caspar Schutijser wrote:
> - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
..
>  share/doc/monit/
> -share/doc/monit/README

${PREFIX}/share/doc/monit/ isn't doing anything useful any more

> -Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
> +Using $< in a non-suffix rule context is a GNUmake idiom.
> +
> +Using the "define" directive is a GNUmake idiom.

I think this is ok though it would probably be better to switch to
USE_GMAKE if it gets much more complex than this.

Re: UPDATE: sysutils/monit 5.27.1

[Caspar Schutijser]

Hi,

Here is a diff that updates sysutils/monit to 5.27.1. Tested on amd64.

Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile14 Sep 2019 21:18:18 -  1.64
+++ Makefile12 Nov 2020 18:40:35 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.26.0
+DISTNAME=  monit-5.27.1
 
 CATEGORIES=sysutils
 
@@ -19,6 +19,9 @@ MASTER_SITES= ${HOMEPAGE}/dist/
 
 CONFIGURE_STYLE=gnu
 
+# Must specify C99 for base-gcc
+CFLAGS+=   -std=c99
+
 SUBST_VARS=LOCALSTATEDIR
 
 pre-configure:
@@ -26,7 +29,6 @@ pre-configure:
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo14 Sep 2019 21:18:18 -  1.42
+++ distinfo12 Nov 2020 18:40:35 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I=
-SIZE (monit-5.26.0.tar.gz) = 1371327
+SHA256 (monit-5.27.1.tar.gz) = 9XQI0WGFaHUTo8TrPyu3Lu92MxrBYhDpZS6EblyE7VE=
+SIZE (monit-5.27.1.tar.gz) = 1459360
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in   14 Sep 2019 21:18:18 -  1.4
+++ patches/patch-Makefile_in   12 Nov 2020 18:40:35 -
@@ -1,12 +1,26 @@
 $OpenBSD: patch-Makefile_in,v 1.4 2019/09/14 21:18:18 sthen Exp $
 
-Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
+Using $< in a non-suffix rule context is a GNUmake idiom.
+
+Using the "define" directive is a GNUmake idiom.
 
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1297,7 +1297,7 @@ cleanall: clean distclean
-   -rm -rf m4 config
+@@ -1292,11 +1292,6 @@ uninstall-man: uninstall-man1
+ .PRECIOUS: Makefile
+ 
+ 
+-define check-exit
+-|| exit 1
+-
+-endef
+-
+ # ---
+ # Targets
+ # ---
+@@ -1331,7 +1326,7 @@ cleanall: clean distclean
+   -git clean -fxd
  
  monit.1: doc/monit.pod
 -  $(POD2MAN) $(POD2MANFLAGS) $< > $@
@@ -14,3 +28,21 @@ Index: Makefile.in
-rm -f pod2*
  
  # -
+@@ -1342,14 +1337,14 @@ src/y.tab.c src/y.tab.h: run-yacc
+ 
+ .INTERMEDIATE: run-yacc
+ run-yacc: src/p.y
+-  $(YACC) $(YACCFLAGS) -o src/y.tab.c $<
++  $(YACC) $(YACCFLAGS) -o src/y.tab.c src/p.y
+ 
+ src/lex.yy.c: src/l.l
+-  $(FLEX) $(FLEXFLAGS) -o$@ $<
++  $(FLEX) $(FLEXFLAGS) -o$@ src/l.l
+ @WITH_CODESIGN_TRUE@all-local: $(bin_PROGRAMS)
+ @WITH_CODESIGN_TRUE@  $(foreach file, $(bin_PROGRAMS), \
+ @WITH_CODESIGN_TRUE@codesign -s $(CODESIGN_IDENTITY) -v 
--deep --timestamp --options runtime $(file) \
+-@WITH_CODESIGN_TRUE@$(check-exit))
++@WITH_CODESIGN_TRUE@|| exit 1)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/monit/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   1 May 2019 19:21:57 -   1.11
+++ pkg/PLIST   12 Nov 2020 18:40:35 -
@@ -3,7 +3,6 @@
 @bin bin/monit
 @man man/man1/monit.1
 share/doc/monit/
-share/doc/monit/README
 share/examples/monit/
 share/examples/monit/monitrc
 @mode 0600

Re: UPDATE: sysutils/monit 5.27.0

[Caspar Schutijser]

On Sun, Sep 13, 2020 at 04:06:20PM +0200, Caspar Schutijser wrote:
> Hi,
> 
> On Sun, Jul 26, 2020 at 01:12:49PM +0200, Caspar Schutijser wrote:
> > Below is a diff that updates sysutils/monit to 5.27.0. Tested on amd64.
> > 
> > Some notes:
> > 
> > 1) I added a patch to make sure the -fcf-protection=full compiler option
> > is not used. If this option is used, the compiler emits
> > .note.gnu.property ELF section headers and as a result, the produced
> > binary does not run: some garbage is printed to the screen and the
> > output ends as follows if I try to run it:
> > /usr/local/bin/monit[2]:: not found
> > /usr/local/bin/monit[2]: L: not found
> > /usr/local/bin/monit[20]: syntax error: `(' unexpected
> > I don't know if just patching away the use of this compiler option is
> > the way to go or that something else would be better. Feedback on that
> > is appreciated.
> > 
> > jasper@ helped me figure out that the presence of the
> > .note.gnu.property section header was to blame, thanks for that.
> > 
> > 2) I made the use of C99 explicit by appending -std=c99 to CFLAGS since
> > at least C99 is required now. Borrowed from some commits I've seen
> > from kmos@.
> > 
> > 3) The tarball does not contain a README anymore so don't install it
> > in the post-install target.
> 
> Apparently the .note.gnu.property stuff (bullet point #1) is not
> necessary anymore. I don't know for a fact why that is but
> my first guess would be the recent upgrade to LLVM 10.

(Should've added this bit in my previous email, sorry)

In my previous email I only talk about LLVM (and as such, the
architectures where LLVM is used). As for other architectures that use
GCC: GCC 4.2.1 does not accept the -fcf-protection=full compiler option
so on those architectures, this problem did not exist in the first
place.

Thanks,
Caspar

Re: UPDATE: sysutils/monit 5.27.0

[Caspar Schutijser]

Hi,

On Sun, Jul 26, 2020 at 01:12:49PM +0200, Caspar Schutijser wrote:
> Below is a diff that updates sysutils/monit to 5.27.0. Tested on amd64.
> 
> Some notes:
> 
> 1) I added a patch to make sure the -fcf-protection=full compiler option
> is not used. If this option is used, the compiler emits
> .note.gnu.property ELF section headers and as a result, the produced
> binary does not run: some garbage is printed to the screen and the
> output ends as follows if I try to run it:
> /usr/local/bin/monit[2]:: not found
> /usr/local/bin/monit[2]: L: not found
> /usr/local/bin/monit[20]: syntax error: `(' unexpected
> I don't know if just patching away the use of this compiler option is
> the way to go or that something else would be better. Feedback on that
> is appreciated.
> 
> jasper@ helped me figure out that the presence of the
> .note.gnu.property section header was to blame, thanks for that.
> 
> 2) I made the use of C99 explicit by appending -std=c99 to CFLAGS since
> at least C99 is required now. Borrowed from some commits I've seen
> from kmos@.
> 
> 3) The tarball does not contain a README anymore so don't install it
> in the post-install target.

Apparently the .note.gnu.property stuff (bullet point #1) is not
necessary anymore. I don't know for a fact why that is but
my first guess would be the recent upgrade to LLVM 10. Below is
an updated diff.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile14 Sep 2019 21:18:18 -  1.64
+++ Makefile13 Sep 2020 13:58:36 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.26.0
+DISTNAME=  monit-5.27.0
 
 CATEGORIES=sysutils
 
@@ -19,6 +19,9 @@ MASTER_SITES= ${HOMEPAGE}/dist/
 
 CONFIGURE_STYLE=gnu
 
+# Must specify C99 for base-gcc
+CFLAGS+=   -std=c99
+
 SUBST_VARS=LOCALSTATEDIR
 
 pre-configure:
@@ -26,7 +29,6 @@ pre-configure:
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo14 Sep 2019 21:18:18 -  1.42
+++ distinfo13 Sep 2020 13:58:36 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I=
-SIZE (monit-5.26.0.tar.gz) = 1371327
+SHA256 (monit-5.27.0.tar.gz) = 2MDe72JPGTqVJQL+m6q/pm49jQV99XONpD+aN3kq/KQ=
+SIZE (monit-5.27.0.tar.gz) = 1455341
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in   14 Sep 2019 21:18:18 -  1.4
+++ patches/patch-Makefile_in   13 Sep 2020 13:58:36 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-Makefile_in,v 1.4 2019/09/14 21:18:18 sthen Exp $
 
-Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
+Using $< in a non-suffix rule context is a GNUmake idiom.
 
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1297,7 +1297,7 @@ cleanall: clean distclean
-   -rm -rf m4 config
+@@ -1326,7 +1326,7 @@ cleanall: clean distclean
+   -git clean -fxd
  
  monit.1: doc/monit.pod
 -  $(POD2MAN) $(POD2MANFLAGS) $< > $@
@@ -14,3 +14,16 @@ Index: Makefile.in
-rm -f pod2*
  
  # -
+@@ -1337,10 +1337,10 @@ src/y.tab.c src/y.tab.h: run-yacc
+ 
+ .INTERMEDIATE: run-yacc
+ run-yacc: src/p.y
+-  $(YACC) $(YACCFLAGS) -o src/y.tab.c $<
++  $(YACC) $(YACCFLAGS) -o src/y.tab.c src/p.y
+ 
+ src/lex.yy.c: src/l.l
+-  $(FLEX) $(FLEXFLAGS) -o$@ $<
++  $(FLEX) $(FLEXFLAGS) -o$@ src/l.l
+ @WITH_CODESIGN_TRUE@all-local: $(bin_PROGRAMS)
+ @WITH_CODESIGN_TRUE@  $(foreach file, $(bin_PROGRAMS), codesign -s 
$(CODESIGN_IDENTITY) -v --deep --timestamp --options runtime $(file))
+ 
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/monit/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   1 May 2019 19:21:57 -   1.11
+++ pkg/PLIST   13 Sep 2020 13:58:36 -
@@ -3,7 +3,6 @@
 @bin bin/monit
 @man man/man1/monit.1
 share/doc/monit/
-share/doc/monit/README
 share/examples/monit/
 share/examples/monit/monitrc
 @mode 0600

UPDATE: sysutils/monit 5.27.0

[Caspar Schutijser]

Hi ports@,

Below is a diff that updates sysutils/monit to 5.27.0. Tested on amd64.

Some notes:

1) I added a patch to make sure the -fcf-protection=full compiler option
is not used. If this option is used, the compiler emits
.note.gnu.property ELF section headers and as a result, the produced
binary does not run: some garbage is printed to the screen and the
output ends as follows if I try to run it:
/usr/local/bin/monit[2]:: not found
/usr/local/bin/monit[2]: L: not found
/usr/local/bin/monit[20]: syntax error: `(' unexpected
I don't know if just patching away the use of this compiler option is
the way to go or that something else would be better. Feedback on that
is appreciated.

jasper@ helped me figure out that the presence of the
.note.gnu.property section header was to blame, thanks for that.

2) I made the use of C99 explicit by appending -std=c99 to CFLAGS since
at least C99 is required now. Borrowed from some commits I've seen
from kmos@.

3) The tarball does not contain a README anymore so don't install it
in the post-install target.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile14 Sep 2019 21:18:18 -  1.64
+++ Makefile26 Jul 2020 11:05:17 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.26.0
+DISTNAME=  monit-5.27.0
 
 CATEGORIES=sysutils
 
@@ -19,6 +19,9 @@ MASTER_SITES= ${HOMEPAGE}/dist/
 
 CONFIGURE_STYLE=gnu
 
+# Must specify C99 for base-gcc
+CFLAGS+=   -std=c99
+
 SUBST_VARS=LOCALSTATEDIR
 
 pre-configure:
@@ -26,7 +29,6 @@ pre-configure:
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/monit
-   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/monit
${INSTALL_DATA} ${WRKSRC}/monitrc ${PREFIX}/share/examples/monit
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo14 Sep 2019 21:18:18 -  1.42
+++ distinfo26 Jul 2020 11:05:17 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I=
-SIZE (monit-5.26.0.tar.gz) = 1371327
+SHA256 (monit-5.27.0.tar.gz) = 2MDe72JPGTqVJQL+m6q/pm49jQV99XONpD+aN3kq/KQ=
+SIZE (monit-5.27.0.tar.gz) = 1455341
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in   14 Sep 2019 21:18:18 -  1.4
+++ patches/patch-Makefile_in   26 Jul 2020 11:05:17 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-Makefile_in,v 1.4 2019/09/14 21:18:18 sthen Exp $
 
-Using $< in a non-suffix rule context is a GNUmake idiom (Makefile:1279)
+Using $< in a non-suffix rule context is a GNUmake idiom.
 
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1297,7 +1297,7 @@ cleanall: clean distclean
-   -rm -rf m4 config
+@@ -1326,7 +1326,7 @@ cleanall: clean distclean
+   -git clean -fxd
  
  monit.1: doc/monit.pod
 -  $(POD2MAN) $(POD2MANFLAGS) $< > $@
@@ -14,3 +14,16 @@ Index: Makefile.in
-rm -f pod2*
  
  # -
+@@ -1337,10 +1337,10 @@ src/y.tab.c src/y.tab.h: run-yacc
+ 
+ .INTERMEDIATE: run-yacc
+ run-yacc: src/p.y
+-  $(YACC) $(YACCFLAGS) -o src/y.tab.c $<
++  $(YACC) $(YACCFLAGS) -o src/y.tab.c src/p.y
+ 
+ src/lex.yy.c: src/l.l
+-  $(FLEX) $(FLEXFLAGS) -o$@ $<
++  $(FLEX) $(FLEXFLAGS) -o$@ src/l.l
+ @WITH_CODESIGN_TRUE@all-local: $(bin_PROGRAMS)
+ @WITH_CODESIGN_TRUE@  $(foreach file, $(bin_PROGRAMS), codesign -s 
$(CODESIGN_IDENTITY) -v --deep --timestamp --options runtime $(file))
+ 
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure 26 Jul 2020 11:05:17 -
@@ -0,0 +1,51 @@
+$OpenBSD$
+
+Patch away the detection/use of -fcf-protection=full. This compiler option
+results in .note.gnu.property ELF section headers being emitted and (at least)
+ld.lld(1) does not like this section header.
+
+Index: configure
+--- configure.orig
 configure
+@@ -4473,41 +4473,6 @@ else
+   :
+ fi
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler 
accepts -fcf-protection=full" >&5
+-$as_echo_n "checking whether C compiler accepts -fcf-protection=full... " 
>&6; }
+-if ${ax_cv_check_cflags___fcf_protection_full+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-  ax_check_save_flags=$CFLAGS
+-  CFLAGS="$CFLAGS  -fcf-protection=full"
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-

Re: UPDATE: sysutils/monit 5.26.0

[Caspar Schutijser]

On Sat, Jul 06, 2019 at 08:29:45PM +0200, Caspar Schutijser wrote:
> Below is a diff that updates monit to 5.26.0. Tested on amd64.

ping.

Below is a regenerated diff; the previous diff included a
s/PERMIT_PACKAGE_CDROM/PERMIT_PACKAGE/ but that is not necessary
anymore.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile12 Jul 2019 20:49:46 -  1.63
+++ Makefile14 Sep 2019 08:32:00 -
@@ -2,8 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.25.3
-REVISION=  0
+DISTNAME=  monit-5.26.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo1 May 2019 19:21:57 -   1.41
+++ distinfo14 Sep 2019 08:32:00 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.25.3.tar.gz) = wQJYyIOdIIZNMDkOfL8v9eBICmem+4DAKqRX1uM5BWk=
-SIZE (monit-5.25.3.tar.gz) = 1355925
+SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I=
+SIZE (monit-5.26.0.tar.gz) = 1371327
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   10 Nov 2017 21:08:56 -  1.3
+++ patches/patch-Makefile_in   14 Sep 2019 08:32:00 -
@@ -5,7 +5,7 @@ Using $< in a non-suffix rule context is
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1294,7 +1294,7 @@ cleanall: clean distclean
+@@ -1297,7 +1297,7 @@ cleanall: clean distclean
-rm -rf m4 config
  
  monit.1: doc/monit.pod

UPDATE: sysutils/monit 5.26.0

[Caspar Schutijser]

Hi ports@,

Below is a diff that updates monit to 5.26.0. Tested on amd64.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile25 Jun 2019 20:25:22 -  1.62
+++ Makefile6 Jul 2019 13:57:29 -
@@ -2,8 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.25.3
-REVISION=  0
+DISTNAME=  monit-5.26.0
 
 CATEGORIES=sysutils
 
@@ -12,7 +11,7 @@ HOMEPAGE= https://www.mmonit.com/monit/
 MAINTAINER=Caspar Schutijser 
 
 # AGPLv3+
-PERMIT_PACKAGE_CDROM=  Yes
+PERMIT_PACKAGE=Yes
 
 WANTLIB += c crypto m kvm pthread ssl z
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo1 May 2019 19:21:57 -   1.41
+++ distinfo6 Jul 2019 13:57:29 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.25.3.tar.gz) = wQJYyIOdIIZNMDkOfL8v9eBICmem+4DAKqRX1uM5BWk=
-SIZE (monit-5.25.3.tar.gz) = 1355925
+SHA256 (monit-5.26.0.tar.gz) = h/xFaKOvmivokEDvsWnjouR7Ji+Z541d3emd2J8C88I=
+SIZE (monit-5.26.0.tar.gz) = 1371327
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   10 Nov 2017 21:08:56 -  1.3
+++ patches/patch-Makefile_in   6 Jul 2019 13:57:29 -
@@ -5,7 +5,7 @@ Using $< in a non-suffix rule context is
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1294,7 +1294,7 @@ cleanall: clean distclean
+@@ -1297,7 +1297,7 @@ cleanall: clean distclean
-rm -rf m4 config
  
  monit.1: doc/monit.pod

UPDATE: sysutils/monit 5.25.2

[Caspar Schutijser]

Hi ports@,

Below is a diff that updates sysutils/monit to 5.25.2. Tested on amd64.
The diff removes a patch as that patch was cherry-picked from upstream
git as that patch is now part of this release.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile1 Jun 2018 15:44:28 -   1.59
+++ Makefile9 Jun 2018 10:32:03 -
@@ -2,8 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.25.1
-REVISION=  2
+DISTNAME=  monit-5.25.2
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo19 Nov 2017 18:49:26 -  1.39
+++ distinfo9 Jun 2018 10:32:03 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.25.1.tar.gz) = S1wlzrEIJfHlQE8dinshUHcWuCvCDDWG+GYDaRw7gbw=
-SIZE (monit-5.25.1.tar.gz) = 1353855
+SHA256 (monit-5.25.2.tar.gz) = qgzmNh0RVeQ+MKhtz/ALIAPUNPIhw2CYHO2DAnWrxko=
+SIZE (monit-5.25.2.tar.gz) = 1354704
Index: patches/patch-src_process_ProcessTree_c
===
RCS file: patches/patch-src_process_ProcessTree_c
diff -N patches/patch-src_process_ProcessTree_c
--- patches/patch-src_process_ProcessTree_c 1 May 2018 08:43:28 -   
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_process_ProcessTree_c,v 1.1 2018/05/01 08:43:28 landry Exp 
$
-
-Backport 
https://bitbucket.org/tildeslash/monit/commits/4a48ff1f9adaa53946492b512347ebdf85fee3ee
 to avoid trigerring monit: vfprintf %s NULL in "%s" in syslog
-
-Index: src/process/ProcessTree.c
 src/process/ProcessTree.c.orig
-+++ src/process/ProcessTree.c
-@@ -304,7 +304,7 @@ boolean_t ProcessTree_updateProcess(Service_T s, pid_t
- s->inf.process->threads   = ptree[leaf].threads.self;
- s->inf.process->children  = 
ptree[leaf].children.total;
- s->inf.process->zombie= ptree[leaf].zombie;
--snprintf(s->inf.process->secattr, STRLEN, "%s", 
ptree[leaf].secattr);
-+snprintf(s->inf.process->secattr, STRLEN, "%s", 
NVLSTR(ptree[leaf].secattr));
- if (ptree[leaf].cpu.usage.self >= 0) {
- // compute only if initialized (delta between current 
and previous snapshot is available)
- s->inf.process->cpu_percent = 
_cpuUsage(ptree[leaf].cpu.usage.self, ptree[leaf].threads.self);

Re: UPDATE: sysutils/monit 5.25.1

[Jeremie Courreges-Anglas]

On Sat, Nov 18 2017, Caspar Schutijser  wrote:
> Hi ports@,
>
> Below a diff that updates sysutils/monit to 5.25.1. While there, change
> the HOMEPAGE to https.

Committed, thanks.

> Thanks,
> Caspar Schutijser
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/monit/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- Makefile  11 Nov 2017 11:46:05 -  1.55
> +++ Makefile  18 Nov 2017 16:32:16 -
> @@ -2,12 +2,11 @@
>  
>  COMMENT= monitoring and managing daemons utility
>  
> -DISTNAME=monit-5.25.0
> -REVISION=0
> +DISTNAME=monit-5.25.1
>  
>  CATEGORIES=  sysutils
>  
> -HOMEPAGE=http://www.mmonit.com/monit/
> +HOMEPAGE=https://www.mmonit.com/monit/
>  
>  MAINTAINER=  Caspar Schutijser 
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/monit/distinfo,v
> retrieving revision 1.38
> diff -u -p -r1.38 distinfo
> --- distinfo  10 Nov 2017 21:08:56 -  1.38
> +++ distinfo  18 Nov 2017 16:32:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (monit-5.25.0.tar.gz) = iUm5lxZYHFVQu7+xAJGQ8OcPhLgE05kC5VxcPQlcLDI=
> -SIZE (monit-5.25.0.tar.gz) = 1353674
> +SHA256 (monit-5.25.1.tar.gz) = S1wlzrEIJfHlQE8dinshUHcWuCvCDDWG+GYDaRw7gbw=
> +SIZE (monit-5.25.1.tar.gz) = 1353855
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

UPDATE: sysutils/monit 5.25.1

[Caspar Schutijser]

Hi ports@,

Below a diff that updates sysutils/monit to 5.25.1. While there, change
the HOMEPAGE to https.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile11 Nov 2017 11:46:05 -  1.55
+++ Makefile18 Nov 2017 16:32:16 -
@@ -2,12 +2,11 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.25.0
-REVISION=  0
+DISTNAME=  monit-5.25.1
 
 CATEGORIES=sysutils
 
-HOMEPAGE=  http://www.mmonit.com/monit/
+HOMEPAGE=  https://www.mmonit.com/monit/
 
 MAINTAINER=Caspar Schutijser 
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo10 Nov 2017 21:08:56 -  1.38
+++ distinfo18 Nov 2017 16:32:16 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.25.0.tar.gz) = iUm5lxZYHFVQu7+xAJGQ8OcPhLgE05kC5VxcPQlcLDI=
-SIZE (monit-5.25.0.tar.gz) = 1353674
+SHA256 (monit-5.25.1.tar.gz) = S1wlzrEIJfHlQE8dinshUHcWuCvCDDWG+GYDaRw7gbw=
+SIZE (monit-5.25.1.tar.gz) = 1353855

Re: UPDATE: sysutils/monit 5.25

[Jasper Lievisse Adriaanse]

On Fri, Nov 10, 2017 at 06:11:16PM +0100, Caspar Schutijser wrote:
> Hi ports@,
> 
> Below is a diff that updates sysutils/monit to 5.25. Tested for a couple
> of days on a amd64 machine, works fine there. The pkg/DESCR changes
> remove trailing whitespace.
> 
> Thanks,
> Caspar Schutijser

Committed, thanks for the update!

-- 
jasper

UPDATE: sysutils/monit 5.25

[Caspar Schutijser]

Hi ports@,

Below is a diff that updates sysutils/monit to 5.25. Tested for a couple
of days on a amd64 machine, works fine there. The pkg/DESCR changes
remove trailing whitespace.

Thanks,
Caspar Schutijser


Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile10 Jun 2017 11:19:41 -  1.53
+++ Makefile10 Nov 2017 17:05:24 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-5.23.0
+DISTNAME=  monit-5.25.0
 
 CATEGORIES=sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo10 Jun 2017 11:19:41 -  1.37
+++ distinfo10 Nov 2017 17:05:24 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.23.0.tar.gz) = 3Tn+OjecAkArqcRMIBs7qSXr3I8EIlkYggYHtsXVZxM=
-SIZE (monit-5.23.0.tar.gz) = 1298472
+SHA256 (monit-5.25.0.tar.gz) = iUm5lxZYHFVQu7+xAJGQ8OcPhLgE05kC5VxcPQlcLDI=
+SIZE (monit-5.25.0.tar.gz) = 1353674
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/monit/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in   10 Jun 2017 11:19:41 -  1.2
+++ patches/patch-Makefile_in   10 Nov 2017 17:05:24 -
@@ -5,7 +5,7 @@ Using $< in a non-suffix rule context is
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1281,7 +1281,7 @@ cleanall: clean distclean
+@@ -1294,7 +1294,7 @@ cleanall: clean distclean
-rm -rf m4 config
  
  monit.1: doc/monit.pod
Index: pkg/DESCR
===
RCS file: /cvs/ports/sysutils/monit/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR
--- pkg/DESCR   2 Nov 2003 16:12:00 -   1.3
+++ pkg/DESCR   10 Nov 2017 17:05:24 -
@@ -1,22 +1,22 @@
 monit is an utility for monitoring and managing daemons or similar
-programs running on a Unix system. It will start specified programs 
+programs running on a Unix system. It will start specified programs
 if they are not running and restart programs not responding.
 
-monit supports:
- * Daemon mode - poll programs at a specified interval  
+monit supports:
+ * Daemon mode - poll programs at a specified interval
  * Start, stop and restart of programs
  * Group- and manage groups of programs
- * Logging - syslog or own logfile 
+ * Logging - syslog or own logfile
  * Configuration - comprehensive controlfile
  * Runtime and TCP/IP port checking (tcp and udp)
  * Unix domain socket checking
  * Process status and process timeout
  * Process memory usage and process cpu usage
  * Alert, stop or restart a process based on it's characteristics
- * Check the systems load average
+ * Check the systems load average
  * MD5 checksum for programs started and stopped by monit
  * Alert notification for program timeout, restart,
-   checksum, stop and resource error 
- * Flexible and customizable email alert messages
+   checksum, stop and resource error
+ * Flexible and customizable email alert messages
  * Protocol verification. HTTP, FTP, SMTP, POP, IMAP and NNTP
  * A http interface to make monit accessible from a Browser

UPDATE: sysutils/monit

[Artur Pedziwilk]

Tested on amd64 with -current
OpenBSD 6.2-beta (GENERIC.MP) #105: Fri Sep 22 18:36:47 MDT 2017




diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index a4a02bcfabf..5d77ee3df04 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -2,7 +2,7 @@

 COMMENT=   monitoring and managing daemons utility

-DISTNAME=  monit-5.23.0
+DISTNAME=  monit-5.24.0

 CATEGORIES=sysutils

diff --git a/sysutils/monit/distinfo b/sysutils/monit/distinfo
index f18f68c5341..f0ab7b267cf 100644
--- a/sysutils/monit/distinfo
+++ b/sysutils/monit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (monit-5.23.0.tar.gz) = 3Tn+OjecAkArqcRMIBs7qSXr3I8EIlkYggYHtsXVZxM=
-SIZE (monit-5.23.0.tar.gz) = 1298472
+SHA256 (monit-5.24.0.tar.gz) = 
754d1f0e165e5a26d4639a6a83f44ccf839e381f2622e0946d5302fa1f2d2414
+SIZE (monit-5.24.0.tar.gz) = 1352660

Update: sysutils/monit 5.18

[Bryce Chidester]

A variety of upstream bug fixes and a few new features (
https://mmonit.com/monit/changes/). Just a simple version bump required.
I've been running it for a few hours now without issue.

-Bryce


diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile
index dca4aa1..6cec17d 100644
--- a/sysutils/monit/Makefile
+++ b/sysutils/monit/Makefile
@@ -2,7 +2,7 @@

 COMMENT=   monitoring and managing daemons utility

-DISTNAME=  monit-5.17.1
+DISTNAME=  monit-5.18

 CATEGORIES=sysutils

diff --git a/sysutils/monit/distinfo b/sysutils/monit/distinfo
index 19bf6e5..118d088 100644
--- a/sysutils/monit/distinfo
+++ b/sysutils/monit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (monit-5.17.1.tar.gz) = 9xoiz7a9kf9GSW5y4dGxAh7NZR53SBMc4PmVzDf/C0I=
-SIZE (monit-5.17.1.tar.gz) = 1231823
+SHA256 (monit-5.18.tar.gz) = dcy4X6KsH0TJyVxaa1OaJUsKHWThajbsnuuGdISk/K8=
+SIZE (monit-5.18.tar.gz) = 1239752

-- 
Regards,
Bryce Chidester
br...@cobryce.com

Update: sysutils/monit 5.16

[Bryce Chidester]

Update to sysutils/monit 5.16. Currently running in production on a number
of 5.8/amd64 system.
https://mmonit.com/monit/changes/

Regards,
Bryce Chidester
br...@cobryce.com


Index: distinfo
===
RCS file: /cvs/ports/sysutils/monit/distinfo,v
retrieving revision 1.28
diff -u -p -u -r1.28 distinfo
--- distinfo24 Oct 2015 11:16:28 -  1.28
+++ distinfo11 Feb 2016 05:55:32 -
@@ -1,2 +1,2 @@
-SHA256 (monit-5.15.tar.gz) = 3q2oFT3H6HVfVyvE15AUOpLHqGaNzLVjrk29c69WaXw=
-SIZE (monit-5.15.tar.gz) = 1218043
+SHA256 (monit-5.16.tar.gz) = W5mOeWETziRMi1ddoJ06YrrBsnZUhP5kFvIktLqPOR8=
+SIZE (monit-5.16.tar.gz) = 1226329
Index: Makefile
===
RCS file: /cvs/ports/sysutils/monit/Makefile,v
retrieving revision 1.43
diff -u -p -u -r1.43 Makefile
--- Makefile24 Oct 2015 11:16:28 -  1.43
+++ Makefile11 Feb 2016 05:55:32 -
@@ -2,7 +2,7 @@

 COMMENT=   monitoring and managing daemons utility

-DISTNAME=  monit-5.15
+DISTNAME=  monit-5.16

 CATEGORIES=sysutils

UPDATE: sysutils/monit

[Genadijus Paleckis]

update to latest version

comments ?
diff -urN /usr/ports/sysutils/monit/Makefile ./Makefile
--- /usr/ports/sysutils/monit/Makefile  Mon Dec 24 13:29:08 2007
+++ ./Makefile  Wed Jan  9 09:14:18 2008
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-4.9
+DISTNAME=  monit-4.10.1
 CATEGORIES=sysutils
 
 HOMEPAGE=  http://www.tildeslash.com/monit/
diff -urN /usr/ports/sysutils/monit/distinfo ./distinfo
--- /usr/ports/sysutils/monit/distinfo  Mon Dec 24 13:29:08 2007
+++ ./distinfo  Wed Jan  9 09:14:31 2008
@@ -1,5 +1,5 @@
-MD5 (monit-4.9.tar.gz) = vLqrd2pU0eNOOgV8kl3pyg==
-RMD160 (monit-4.9.tar.gz) = XJyaxI0i0yeBglMSJBjptMfxJYc=
-SHA1 (monit-4.9.tar.gz) = qRCwep7MfSgDNo19EU3wH04JFs0=
-SHA256 (monit-4.9.tar.gz) = aWMEb6l2toLSesjnjPcQfXbGkHrvJ7MPcl83HOZPtL8=
-SIZE (monit-4.9.tar.gz) = 573711
+MD5 (monit-4.10.1.tar.gz) = 0xQ7C715tT8bAZ0vwdrmVg==
+RMD160 (monit-4.10.1.tar.gz) = bFF7GbxD9AI9/KTeHfCScrQa8C0=
+SHA1 (monit-4.10.1.tar.gz) = yHqgxuCx0T9Gt+nYSTcZHiWpB6Y=
+SHA256 (monit-4.10.1.tar.gz) = 9qKTAGSDgVOKQD8kUG51uUFk4mxpxoYcoRLUJe3J0ZM=
+SIZE (monit-4.10.1.tar.gz) = 606273
diff -urN /usr/ports/sysutils/monit/pkg/PLIST ./pkg/PLIST
--- /usr/ports/sysutils/monit/pkg/PLIST Mon Dec 24 13:29:08 2007
+++ ./pkg/PLIST Wed Jan  9 09:16:06 2008
@@ -1,6 +1,8 @@
 @comment $OpenBSD: PLIST,v 1.6 2005/04/05 23:02:58 alek Exp $
 bin/monit
+man/cat3f/
 @man man/man1/monit.1
+man/man3f/
 share/doc/monit/
 share/doc/monit/FAQ.txt
 share/doc/monit/NOTES

Re: UPDATE: sysutils/monit

[Ben Lovett]

ok by me, been running this for the last couple days.

sorry for the timeout, work has been taking up the majority of my time.

my only question is why the update to PLIST? I get no such changes on  
my somewhat current machine (with current ports, however).


--ben

On Feb 1, 2008, at 1:28 PM, Genadijus Paleckis wrote:


oh... this is after 3week timeout from maintainer

Genadijus Paleckis wrote:

update to latest version
comments ?

Re: UPDATE: sysutils/monit

[Okan Demirmen]

On Fri 2008.02.01 at 13:37 -0800, Ben Lovett wrote:
 ok by me, been running this for the last couple days.

thanks for the ok.

 sorry for the timeout, work has been taking up the majority of my time.

 my only question is why the update to PLIST? I get no such changes on my 
 somewhat current machine (with current ports, however).

PLIST should not change.

Genadijus: please make sure you are running -current when sending in
diff's ;)

cheers,
okan

 --ben

 On Feb 1, 2008, at 1:28 PM, Genadijus Paleckis wrote:

 oh... this is after 3week timeout from maintainer

 Genadijus Paleckis wrote:
 update to latest version
 comments ?

Re: UPDATE: sysutils/monit

[Mike Erdely]

On Fri, Feb 01, 2008 at 01:37:54PM -0800, Ben Lovett wrote:
 my only question is why the update to PLIST? I get no such changes on my 
 somewhat current machine (with current ports, however).

Genadijus needs to update his mtree:
http://marc.info/?l=openbsd-portsm=118900677500696w=2

Re: UPDATE: sysutils/monit

[Genadijus Paleckis]

oh... this is after 3week timeout from maintainer

Genadijus Paleckis wrote:

update to latest version

comments ?

Re: UPDATE: sysutils/monit

[Genadijus Paleckis]

bad me..

fixed diff

Mike Erdely wrote:

On Fri, Feb 01, 2008 at 01:37:54PM -0800, Ben Lovett wrote:
my only question is why the update to PLIST? I get no such changes on my 
somewhat current machine (with current ports, however).


Genadijus needs to update his mtree:
http://marc.info/?l=openbsd-portsm=118900677500696w=2

diff -urN /usr/ports/sysutils/monit/Makefile ./Makefile
--- /usr/ports/sysutils/monit/Makefile  Mon Dec 24 13:29:08 2007
+++ ./Makefile  Wed Jan  9 09:14:18 2008
@@ -2,7 +2,7 @@
 
 COMMENT=   monitoring and managing daemons utility
 
-DISTNAME=  monit-4.9
+DISTNAME=  monit-4.10.1
 CATEGORIES=sysutils
 
 HOMEPAGE=  http://www.tildeslash.com/monit/
diff -urN /usr/ports/sysutils/monit/distinfo ./distinfo
--- /usr/ports/sysutils/monit/distinfo  Mon Dec 24 13:29:08 2007
+++ ./distinfo  Wed Jan  9 09:14:31 2008
@@ -1,5 +1,5 @@
-MD5 (monit-4.9.tar.gz) = vLqrd2pU0eNOOgV8kl3pyg==
-RMD160 (monit-4.9.tar.gz) = XJyaxI0i0yeBglMSJBjptMfxJYc=
-SHA1 (monit-4.9.tar.gz) = qRCwep7MfSgDNo19EU3wH04JFs0=
-SHA256 (monit-4.9.tar.gz) = aWMEb6l2toLSesjnjPcQfXbGkHrvJ7MPcl83HOZPtL8=
-SIZE (monit-4.9.tar.gz) = 573711
+MD5 (monit-4.10.1.tar.gz) = 0xQ7C715tT8bAZ0vwdrmVg==
+RMD160 (monit-4.10.1.tar.gz) = bFF7GbxD9AI9/KTeHfCScrQa8C0=
+SHA1 (monit-4.10.1.tar.gz) = yHqgxuCx0T9Gt+nYSTcZHiWpB6Y=
+SHA256 (monit-4.10.1.tar.gz) = 9qKTAGSDgVOKQD8kUG51uUFk4mxpxoYcoRLUJe3J0ZM=
+SIZE (monit-4.10.1.tar.gz) = 606273