monit: update to 5.34.0

Compile tested: x86_64, PC Engines APU4, OpenWrt 22.03.5/main
Run tested: x86_64, PC Engines APU4, OpenWrt 22.03.5/main, div. tests

* update from 5.33.0 to 5.34.0 (See changelog: https://mmonit.com/monit/changes/)
* remove upstream (obsolete) patch

Signed-off-by: Yaroslav Petrov <info@lank.me>

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index ae684f4a8ebf6c95dd2d3d468272114402879f87..dd97f312c776a0b8b2b9a394f108ef306b7a5586 100644 (file)
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=monit
-PKG_VERSION:=5.33.0
+PKG_VERSION:=5.34.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://bitbucket.org/tildeslash/monit/downloads/
-PKG_HASH:=1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5
+PKG_HASH:=37f514cd8973bbce104cb8517ff3fc504052a083703eee0d0e873db26b919820
 
 PKG_MAINTAINER:=Yaroslav Petrov <info@lank.me>
 PKG_LICENSE:=AGPL-3.0
@@ -61,6 +61,7 @@ $(call Package/monit/Default/description)
 endef
 
 CONFIGURE_ARGS += \
+       --with-piddir="/var/run" \
        --without-pam \
        ac_cv_ipv6=$(if $(CONFIG_IPV6),yes,no) \
        libmonit_cv_setjmp_available=yes \

diff --git a/admin/monit/patches/001-fix-default-piddir.patch b/admin/monit/patches/001-fix-default-piddir.patch
deleted file mode 100644 (file)
index 8cac4c7..0000000
--- a/admin/monit/patches/001-fix-default-piddir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -477,14 +477,7 @@ AC_ARG_WITH(ipv6,
- 
- # Find the right directory to put the root-mode PID file in
- AC_MSG_CHECKING([pid file location])
--if test -d "/run"
--then
--      piddir="/run"
--elif test -d "/var/run"; then
--        piddir="/var/run"
--elif test -d "/etc"; then
--        piddir="/etc"
--fi
-+piddir="/var/run"
- 
- AC_DEFINE_UNQUOTED([PIDDIR], "$piddir",
-         [Define to the pid storage directory.])