mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
Merge pull request #9805 from champtar/monit-ipv6
monit: enable / fix IPv6 detection during build
This commit is contained in:
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=monit
|
PKG_NAME:=monit
|
||||||
PKG_VERSION:=5.25.2
|
PKG_VERSION:=5.25.2
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://mmonit.com/monit/dist
|
PKG_SOURCE_URL:=https://mmonit.com/monit/dist
|
||||||
@@ -63,6 +63,7 @@ endef
|
|||||||
|
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
--without-pam \
|
--without-pam \
|
||||||
|
ac_cv_ipv6=$(if $(CONFIG_IPV6),yes,no) \
|
||||||
libmonit_cv_setjmp_available=yes \
|
libmonit_cv_setjmp_available=yes \
|
||||||
libmonit_cv_vsnprintf_c99_conformant=yes
|
libmonit_cv_vsnprintf_c99_conformant=yes
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
--- a/src/ssl/Ssl.c
|
||||||
+++ b/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)
|
#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
|||||||
Reference in New Issue
Block a user