diff --git a/utils/xz/Makefile b/utils/xz/Makefile index c1ff4fa24a..f325c31fcc 100644 --- a/utils/xz/Makefile +++ b/utils/xz/Makefile @@ -9,12 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xz -PKG_VERSION:=5.6.2 -PKG_RELEASE:=2 +PKG_VERSION:=5.8.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/lzmautils -PKG_HASH:=e12aa03cbd200597bd4ce11d97be2d09a6e6d39a9311ce72c91ac7deacde3171 +PKG_SOURCE_URL:=https://github.com/tukaani-project/xz/releases/download/v$(PKG_VERSION) \ + @SF/lzmautils +PKG_HASH:=5965c692c4c8800cd4b33ce6d0f6ac9ac9d6ab227b17c512b6561bce4f08d47e PKG_MAINTAINER:= PKG_LICENSE:=Public-Domain LGPL-2.1-or-later 0BSD diff --git a/utils/xz/patches/010-libtool.patch b/utils/xz/patches/010-libtool.patch deleted file mode 100644 index dcb954914b..0000000000 --- a/utils/xz/patches/010-libtool.patch +++ /dev/null @@ -1,36 +0,0 @@ -# Fix shared library building in XZ Utils 5.2.13, 5.4.7, and 5.6.2 -# -# The releases were made with a development version of GNU Libtool -# (2.5.0+1+g38c166c8). The benefit is that there tend to be fixes that -# aren't in a stable release yet. At the same time there is a higher -# risk of new bugs. Unfortunately there was a bug that breaks building -# of shared libraries on some systems like mips64. -# -# This patch was made by taking the upstream commit to m4/libtool.m4 -# and then running "autoconf" to update the generated "configure". -# This patch only modifies "configure" so that the changed timestamps -# won't cause the build system to regenerate more files, which would -# only work if one has all Autotools packages installed. -# -# https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=9a4a02615c9e7cbcfd690ed31874822a7d6aaea2 -# https://lore.kernel.org/distributions/3299713.44csPzL39Z@pinacolada/ - ---- a/configure -+++ b/configure -@@ -9475,7 +9475,7 @@ do - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then -- ac_cv_prog_FILECMD=":" -+ ac_cv_prog_FILECMD="file" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -9483,6 +9483,7 @@ done - done - IFS=$as_save_IFS - -+ test -z "$ac_cv_prog_FILECMD" && ac_cv_prog_FILECMD=":" - fi ;; - esac - fi