diff --git a/.checkpackageignore b/.checkpackageignore index 5303a8f3d8..d8d3970b3d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1594,7 +1594,6 @@ package/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch Upstream package/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch Upstream package/ympd/0001-only-c-language.patch Upstream package/ympd/0002-added-forward-declarations.patch Upstream -package/ytree/0001-fix-musl.patch Upstream package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch Upstream package/zabbix/0002-fix-build-with-libressl-3.5.0.patch Upstream package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch Upstream diff --git a/package/ytree/0001-fix-musl.patch b/package/ytree/0001-fix-musl.patch deleted file mode 100644 index 0a24744669..0000000000 --- a/package/ytree/0001-fix-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix musl build - -Fixes - - match.c.text+0x9c): undefined reference to `re_comp' - match.c.text+0xca): undefined reference to `re_exec' - -by forcing to use the 'modern' regex methods implementation instead of -the obsolete re_comp/re_exec ([1]) one? - -[1] http://man7.org/linux/man-pages/man3/re_comp.3.html - -Signed-off-by: Bernd Kuhls - -diff -uNr ytree-1.99pl2.orig/match.c ytree-1.99pl2/match.c ---- ytree-1.99pl2.orig/match.c 2019-09-29 12:37:57.000000000 +0200 -+++ ytree-1.99pl2/match.c 2019-10-01 19:46:56.193815327 +0200 -@@ -10,7 +10,7 @@ - #include "ytree.h" - - #if defined( sun ) || defined( linux ) || defined( __NeXT__ ) || defined( OSF1 ) || defined( __OpenBSD__ ) || defined(__NetBSD__) || defined( __FreeBSD__ ) || defined( __GNU__ ) --#define HAS_REGEX -+#define HAS_REGCOMP - #endif - - #ifdef linux diff --git a/package/ytree/ytree.hash b/package/ytree/ytree.hash index 88ca8282bf..f3fbba8673 100644 --- a/package/ytree/ytree.hash +++ b/package/ytree/ytree.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6e7a8b7f68efe6d365abe33a1d06d739ad85f22a3d54ddd0aec24a3478d66642 ytree-2.04.tar.gz +sha256 8cf8b151e4913b5b7f7a91dffd5c7306106a42477ec44e71d62c75f66ab61a57 ytree-2.05.tar.gz sha256 eb6bf7204569b4fe8eaf9d4dffc57e44047c5efb5deba1b2d99069ddbc99d031 COPYING diff --git a/package/ytree/ytree.mk b/package/ytree/ytree.mk index a64ebe83ed..1bd2df46b6 100644 --- a/package/ytree/ytree.mk +++ b/package/ytree/ytree.mk @@ -4,7 +4,7 @@ # ################################################################################ -YTREE_VERSION = 2.04 +YTREE_VERSION = 2.05 YTREE_SITE = https://www.han.de/~werner YTREE_LICENSE = GPL-2.0+ YTREE_LICENSE_FILES = COPYING