diff options
| author | Etienne Champetier <champetier.etienne@gmail.com> | 2019-08-22 18:03:50 -0700 |
|---|---|---|
| committer | Etienne Champetier <champetier.etienne@gmail.com> | 2019-08-22 18:26:28 -0700 |
| commit | 7cc74e4d8bfcd1af7aaa18ce2f8fd40dc9a14c14 (patch) | |
| tree | 20da92a185821ee871cd51b52cf90984c7a15a56 | |
| parent | 665ec53cd8bc616ae132b2957dac4f30e072a909 (diff) | |
monit: enable / fix IPv6 detection during build
thanks to @val-kulkov for noticing
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
| -rw-r--r-- | admin/monit/Makefile | 3 | ||||
| -rw-r--r-- | admin/monit/patches/010-openssl-thread-api.patch | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/admin/monit/Makefile b/admin/monit/Makefile index 0a28fbaf1..346b092a5 100644 --- 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 ea5e9d314..d67b6cc63 100644 --- 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) |