diff options
| author | Yaroslav Petrov <info@lank.me> | 2023-08-03 23:43:52 +0200 |
|---|---|---|
| committer | Yaroslav Petrov <info@lank.me> | 2023-08-05 23:02:09 +0200 |
| commit | 3e6ff47344f0c71329eb4ea3e092d1f3dbff42c2 (patch) | |
| tree | 9bba6e56759104a60a807354b38e6ec73a0ae3ab /admin | |
| parent | 03f78eff74a5e37a61314e27f428768aeddbba46 (diff) | |
monit: update to 5.33.0
Maintainer: me
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.26.0 to 5.33.0 (fixes a lot of bugs, defaults TLSv1.2 and TLSv1.3, new functions. See fullog: https://mmonit.com/monit/changes/)
* replace maintainer
* update piddir patch
* use maintainers bootstrap script instead PKG_FIXUP
Signed-off-by: Yaroslav Petrov <info@lank.me>
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/monit/Makefile | 16 | ||||
| -rw-r--r-- | admin/monit/patches/001-fix-default-piddir.patch | 20 |
2 files changed, 11 insertions, 25 deletions
diff --git a/admin/monit/Makefile b/admin/monit/Makefile index f6ab3a430..ae684f4a8 100644 --- a/admin/monit/Makefile +++ b/admin/monit/Makefile @@ -8,19 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=monit -PKG_VERSION:=5.26.0 -PKG_RELEASE:=2 +PKG_VERSION:=5.33.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://mmonit.com/monit/dist -PKG_HASH:=87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2 +PKG_SOURCE_URL:=https://bitbucket.org/tildeslash/monit/downloads/ +PKG_HASH:=1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5 -PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com> +PKG_MAINTAINER:=Yaroslav Petrov <info@lank.me> PKG_LICENSE:=AGPL-3.0 PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:tildeslash:monit -PKG_FIXUP:=libtool PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 @@ -78,6 +77,11 @@ ifeq ($(BUILD_VARIANT),nossl) --without-ssl endif +define Build/Prepare + $(Build/Prepare/Default) + (cd $(PKG_BUILD_DIR) && ./bootstrap) +endef + define Package/monit/conffiles /etc/monitrc endef diff --git a/admin/monit/patches/001-fix-default-piddir.patch b/admin/monit/patches/001-fix-default-piddir.patch index 571c432bb..8cac4c7d8 100644 --- a/admin/monit/patches/001-fix-default-piddir.patch +++ b/admin/monit/patches/001-fix-default-piddir.patch @@ -1,24 +1,6 @@ ---- a/configure -+++ b/configure -@@ -14436,14 +14436,7 @@ fi - # Find the right directory to put the root-mode PID file in - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pid file location" >&5 - $as_echo_n "checking pid file location... " >&6; } --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" - - - cat >>confdefs.h <<_ACEOF --- a/configure.ac +++ b/configure.ac -@@ -501,14 +501,7 @@ fi +@@ -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]) |