From 3e6ff47344f0c71329eb4ea3e092d1f3dbff42c2 Mon Sep 17 00:00:00 2001 From: Yaroslav Petrov Date: Thu, 3 Aug 2023 23:43:52 +0200 Subject: [PATCH 1/4] 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 --- admin/monit/Makefile | 16 +++++++++------ .../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 +PKG_MAINTAINER:=Yaroslav Petrov 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]) From 379946951c22ea774e4e22b4379571da604ded4b Mon Sep 17 00:00:00 2001 From: "Leon M. Busch-George" Date: Sun, 11 Jun 2023 20:39:06 +0200 Subject: [PATCH 2/4] wget: use pcre2 Pcre (1) is unmaintained and reached its end of life in 2021. The base system provides pcre2 exclusively since May. Signed-off-by: Leon M. Busch-George --- net/wget/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/wget/Makefile b/net/wget/Makefile index 006399312..f70c0def7 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.21.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk define Package/wget/Default SECTION:=net CATEGORY:=Network - DEPENDS:=+libpcre +zlib + DEPENDS:=+libpcre2 +zlib SUBMENU:=File Transfer TITLE:=Non-interactive network downloader URL:=https://www.gnu.org/software/wget/index.html @@ -73,7 +73,6 @@ endef CONFIGURE_ARGS+= \ --disable-rpath \ --disable-iri \ - --disable-pcre2 \ --with-included-libunistring \ --without-libuuid \ --without-libpsl From 60ce4c6970336a0caacaba5de24796fb773dd9b2 Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Sun, 13 Aug 2023 17:22:29 +0800 Subject: [PATCH 3/4] smartdns: bump to 1.2023.43 Signed-off-by: Nick Peng --- net/smartdns/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/smartdns/Makefile b/net/smartdns/Makefile index 9ce5466ec..c0097fc2d 100644 --- a/net/smartdns/Makefile +++ b/net/smartdns/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smartdns -PKG_VERSION:=1.2023.42 +PKG_VERSION:=1.2023.43 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git -PKG_SOURCE_VERSION:=ed102cda03c56e9c63040d33d4a391b56491493e -PKG_MIRROR_HASH:=366e98b92c3d22844ff5fc52c35f65c3b01e1b92fc9dc14c474823f0cc3ed11a +PKG_SOURCE_VERSION:=1ba6ee7cb98b5b6448bc2a2be318eb3518d4de79 +PKG_MIRROR_HASH:=a31c1d79ffb253507a1a8e0bb8e6d93fa65efef22a3cdd098400157187bbfe20 PKG_MAINTAINER:=Nick Peng PKG_LICENSE:=GPL-3.0-or-later From 0985b4004d309ed7b72494342aa9afdc3c0d4072 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Mon, 14 Aug 2023 19:35:58 +0300 Subject: [PATCH 4/4] xz: Update to 5.4.4 Update xz to match the version in tools/ Signed-off-by: Hannu Nyman --- utils/xz/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/xz/Makefile b/utils/xz/Makefile index 834bfdbc7..8d83b154e 100644 --- a/utils/xz/Makefile +++ b/utils/xz/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz -PKG_VERSION:=5.4.2 +PKG_VERSION:=5.4.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/lzmautils -PKG_HASH:=aa49909cbd9028c4666a35fa4975f9a6203ed98154fbb8223ee43ef9ceee97c3 +PKG_HASH:=0b6fcde1ac38e90433a2556f500c065950b9bcd2d602006efc334782bdfe6296 PKG_MAINTAINER:= PKG_LICENSE:=Public-Domain LGPL-2.1-or-later GPL-2.0-or-later GPL-3.0-or-later