monit: enable / fix IPv6 detection during build

thanks to @val-kulkov for noticing

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index 0a28fbaf1a71cdbad96038e1de18de7b178aa9b4..346b092a50238a0b6d6bc8885b5cf397964070f6 100644 (file)
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=monit
 PKG_VERSION:=5.25.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://mmonit.com/monit/dist
@@ -63,6 +63,7 @@ endef
 
 CONFIGURE_ARGS += \
        --without-pam \
+       ac_cv_ipv6=$(if $(CONFIG_IPV6),yes,no) \
        libmonit_cv_setjmp_available=yes \
        libmonit_cv_vsnprintf_c99_conformant=yes
 

diff --git a/admin/monit/patches/010-openssl-thread-api.patch b/admin/monit/patches/010-openssl-thread-api.patch
index ea5e9d314cc351a68ce0bded091b47fb89b25216..d67b6cc633f1d52ca1664535c34675b10f4e6674 100644 (file)
--- a/admin/monit/patches/010-openssl-thread-api.patch
+++ b/admin/monit/patches/010-openssl-thread-api.patch
@@ -1,8 +1,6 @@
-diff --git a/src/ssl/Ssl.c b/src/ssl/Ssl.c
-index 6501f25..9c24ad5 100644
 --- a/src/ssl/Ssl.c
 +++ b/src/ssl/Ssl.c
-@@ -302,8 +302,8 @@ static boolean_t _retry(int socket, int *timeout, int (*callback)(int socket, ti
+@@ -302,8 +302,8 @@ static boolean_t _retry(int socket, int
  
  
  #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)