monit: Update to 5.25.2

Added PKG_BUILD_PARALLEL to speed up compilation times.

Added PKG_CPE_ID for proper CVE tracking.

A few other cosmetic changes.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index 3c6bf6352f31a94a53e2adf14b06fc07963cddc4..2ab481e44ec410575441a1e5968f4e34bf66c2d0 100644 (file)
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -8,17 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=monit
-PKG_VERSION:=5.24.0
+PKG_VERSION:=5.25.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=754d1f0e165e5a26d4639a6a83f44ccf839e381f2622e0946d5302fa1f2d2414
 PKG_SOURCE_URL:=https://mmonit.com/monit/dist
+PKG_HASH:=aa0ce6361d1155e43e30a86dcff00b2003d434f221c360981ced830275abc64a
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:tildeslash:monit
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/admin/monit/patches/001-fix-default-piddir.patch b/admin/monit/patches/001-fix-default-piddir.patch
index 6382f6f40af7fcf0359d3e88c9e08425c622cfdc..f379b777079e7e0631657548f76551bf555e9a7a 100644 (file)
--- a/admin/monit/patches/001-fix-default-piddir.patch
+++ b/admin/monit/patches/001-fix-default-piddir.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -13852,14 +13852,7 @@ fi
+@@ -14390,14 +14390,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; }