From d740c1436e1ac04907030ab7d5f354e174089326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 28 Aug 2023 20:12:07 +0700
Subject: [PATCH] nrpe: drop libressl patches

Also move -I./../include to be the first CFLAGS.
---
 .../patches/force-local-include-first.patch   | 11 ++++
 .../nrpe/patches/nrpe-4.0.2-libressl.patch    | 50 -------------------
 srcpkgs/nrpe/template                         |  4 +-
 3 files changed, 14 insertions(+), 51 deletions(-)
 create mode 100644 srcpkgs/nrpe/patches/force-local-include-first.patch
 delete mode 100644 srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch

diff --git a/srcpkgs/nrpe/patches/force-local-include-first.patch b/srcpkgs/nrpe/patches/force-local-include-first.patch
new file mode 100644
index 00000000000..db0fd32ba0f
--- /dev/null
+++ b/srcpkgs/nrpe/patches/force-local-include-first.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -14,7 +14,7 @@ CFG_INCLUDE=../include
+ # DESTDIR=
+ 
+ CC=@CC@
+-CFLAGS=@CFLAGS@ @DEFS@ -I $(CFG_INCLUDE) -I $(SRC_INCLUDE)
++CFLAGS= -I$(SRC_INCLUDE) @CFLAGS@ @DEFS@ -I $(CFG_INCLUDE) -I $(SRC_INCLUDE)
+ LDFLAGS=@LDFLAGS@ @LIBS@
+ SOCKETLIBS=@SOCKETLIBS@
+ LIBWRAPLIBS=@LIBWRAPLIBS@
diff --git a/srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch b/srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch
deleted file mode 100644
index 5bcccc32fcb..00000000000
--- a/srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/src/nrpe.c	2020-03-11 11:40:10.000000000 -0400
-+++ b/src/nrpe.c.new	2020-03-18 19:29:00.770969682 -0400
-@@ -147,7 +147,7 @@
- 	ClntCerts client_certs;
- 	SslLogging log_opts;
- } sslprm = {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- NULL, NULL, NULL, "ALL:!MD5:@STRENGTH:@SECLEVEL=0", TLSv1_plus, TRUE, 0, SSL_NoLogging
- #else
- NULL, NULL, NULL, "ALL:!MD5:@STRENGTH", TLSv1_plus, TRUE, 0, SSL_NoLogging
-@@ -356,11 +356,11 @@
- 
- 	switch(sslprm.ssl_proto_ver) {
- 		case TLSv1_3:
--#if OPENSSL_VERSION_NUMBER >= 0x10101000
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
- 			SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
- #endif
- 		case TLSv1_3_plus:
--#if OPENSSL_VERSION_NUMBER >= 0x10101000
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
- 			SSL_CTX_set_min_proto_version(ctx, TLS1_3_VERSION);
- 			break;
- #endif
-@@ -463,7 +463,7 @@
- 	} else {
- 		/* use anonymous DH ciphers */
- 		if (sslprm.allowDH == 2) {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- 			strncpy(sslprm.cipher_list, "ADH@SECLEVEL=0", MAX_FILENAME_LENGTH - 1);
- #else
- 			strncpy(sslprm.cipher_list, "ADH", MAX_FILENAME_LENGTH - 1);
---- a/src/check_nrpe.c	2020-03-11 11:40:10.000000000 -0400
-+++ b/src/check_nrpe.c.new	2020-03-18 19:52:05.734304117 -0400
-@@ -905,11 +905,11 @@
- 
- 	switch(sslprm.ssl_proto_ver) {
- 		case TLSv1_3:
--#if OPENSSL_VERSION_NUMBER >= 0x10101000
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
- 			SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
- #endif
- 		case TLSv1_3_plus:
--#if OPENSSL_VERSION_NUMBER >= 0x10101000
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
- 			SSL_CTX_set_min_proto_version(ctx, TLS1_3_VERSION);
- 			break;
- #endif
diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index 785d0c8f60e..f6f016ee026 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -7,6 +7,8 @@ build_helper="qemu"
 configure_args="--with-pkgsysconfdir=/etc/nagios
  --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
  --with-nagios-group=_nagios --with-nrpe-user=_nagios --with-nrpe-group=_nagios
+ --with-opsys=linux --with-init-type=unknown --with-dist-type=void
+ --with-inetd-type=unknown
  --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
 make_build_args="nrpe"
 make_install_args="install-daemon install-config"
@@ -22,7 +24,7 @@ changelog="https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md"
 distfiles="https://github.com/NagiosEnterprises/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
 checksum=a1f14aa8aaf935b576cc55ab5d77b7cb9c920d7702aff44c9d18c4c841ef8ecc
 system_accounts="_nagios"
-broken="https://build.voidlinux.org/builders/aarch64_builder/builds/45067/steps/shell_3/logs/stdio"
+# broken="https://build.voidlinux.org/builders/aarch64_builder/builds/45067/steps/shell_3/logs/stdio"
 
 post_install() {
 	vsv nrpe