Received: by mail.netbsd.org (Postfix, from userid 605) id 3F10384ED9; Fri, 2 Dec 2022 09:18:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6C85284D4E for ; Fri, 2 Dec 2022 09:18:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id dN3fLXabtz0e for ; Fri, 2 Dec 2022 09:17:59 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 84C2184CDC for ; Fri, 2 Dec 2022 09:17:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 73BB0FA90; Fri, 2 Dec 2022 09:17:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1669972679114850" MIME-Version: 1.0 Date: Fri, 2 Dec 2022 09:17:59 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/archivers/xz To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20221202091759.73BB0FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1669972679114850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Dec 2 09:17:59 UTC 2022 Modified Files: pkgsrc/archivers/xz: Makefile builtin.mk distinfo Log Message: xz: updated to 5.2.9 5.2.9 (2022-11-30) * liblzma: - Fixed an infinite loop in LZMA encoder initialization if dict_size >= 2 GiB. (The encoder only supports up to 1536 MiB.) - Fixed two cases of invalid free() that can happen if a tiny allocation fails in encoder re-initialization or in lzma_filters_update(). These bugs had some similarities with the bug fixed in 5.2.7. - Fixed lzma_block_encoder() not allowing the use of LZMA_SYNC_FLUSH with lzma_code() even though it was documented to be supported. The sync-flush code in the Block encoder was already used internally via lzma_stream_encoder(), so this was just a missing flag in the lzma_block_encoder() API function. - GNU/Linux only: Don't put symbol versions into static liblzma as it breaks things in some cases (and even if it didn't break anything, symbol versions in static libraries are useless anyway). The downside of the fix is that if the configure options --with-pic or --without-pic are used then it's not possible to build both shared and static liblzma at the same time on GNU/Linux anymore; with those options --disable-static or --disable-shared must be used too. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 pkgsrc/archivers/xz/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/archivers/xz/builtin.mk cvs rdiff -u -r1.25 -r1.26 pkgsrc/archivers/xz/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1669972679114850 Content-Disposition: inline Content-Length: 3551 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/xz/Makefile diff -u pkgsrc/archivers/xz/Makefile:1.33 pkgsrc/archivers/xz/Makefile:1.34 --- pkgsrc/archivers/xz/Makefile:1.33 Thu Nov 17 17:29:47 2022 +++ pkgsrc/archivers/xz/Makefile Fri Dec 2 09:17:59 2022 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2022/11/17 17:29:47 adam Exp $ +# $NetBSD: Makefile,v 1.34 2022/12/02 09:17:59 adam Exp $ -DISTNAME= xz-5.2.8 +DISTNAME= xz-5.2.9 CATEGORIES= archivers MASTER_SITES= https://tukaani.org/xz/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/archivers/xz/builtin.mk diff -u pkgsrc/archivers/xz/builtin.mk:1.9 pkgsrc/archivers/xz/builtin.mk:1.10 --- pkgsrc/archivers/xz/builtin.mk:1.9 Wed Aug 24 06:58:13 2022 +++ pkgsrc/archivers/xz/builtin.mk Fri Dec 2 09:17:59 2022 @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.9 2022/08/24 06:58:13 adam Exp $ +# $NetBSD: builtin.mk,v 1.10 2022/12/02 09:17:59 adam Exp $ BUILTIN_PKG:= xz @@ -25,7 +25,7 @@ MAKEVARS+= IS_BUILTIN.xz ### If there is a built-in implementation, then set BUILTIN_PKG. to ### a package name to represent the built-in package. ### -.if !defined(BUILTIN_PKG.xz) && ${IS_BUILTIN.xz:M[yY][eE][sS]} +.if !defined(BUILTIN_PKG.xz) && ${IS_BUILTIN.xz:tl} == yes BUILTIN_VERSION.xz!= \ ${AWK} 'BEGIN { M = "0" } \ /\#define[ ]+LZMA_VERSION_MAJOR/ { M = $$3 } \ @@ -52,10 +52,10 @@ MAKEVARS+= BUILTIN_PKG.xz USE_BUILTIN.xz= no . else USE_BUILTIN.xz= ${IS_BUILTIN.xz} -. if defined(BUILTIN_PKG.xz) && ${IS_BUILTIN.xz:M[yY][eE][sS]} +. if defined(BUILTIN_PKG.xz) && ${IS_BUILTIN.xz:tl} == yes USE_BUILTIN.xz= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.xz} -. if ${USE_BUILTIN.xz:M[yY][eE][sS]} +. if ${USE_BUILTIN.xz:tl} == yes USE_BUILTIN.xz!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xz}; then \ ${ECHO} yes; \ @@ -79,7 +79,7 @@ MAKEVARS+= USE_BUILTIN.xz # implementation. # .if defined(USE_XZ) -. if ${IS_BUILTIN.xz:M[nN][oO]} +. if ${IS_BUILTIN.xz:tl} == no USE_BUILTIN.xz= no . endif .endif @@ -90,15 +90,15 @@ USE_BUILTIN.xz= no ### CHECK_BUILTIN.xz?= no -.if ${CHECK_BUILTIN.xz:M[nN][oO]} +.if ${CHECK_BUILTIN.xz:tl} == no -. if ${USE_BUILTIN.xz:M[yY][eE][sS]} +. if ${USE_BUILTIN.xz:tl} == yes BUILDLINK_FILES.xz+= lib/pkgconfig/liblzma.pc . endif # Fake pkg-config for builtin xz on NetBSD -. if ${USE_BUILTIN.xz:M[yY][eE][sS]} +. if ${USE_BUILTIN.xz:tl} == yes . if !empty(USE_TOOLS:C/:.*//:Mpkg-config) do-configure-pre-hook: override-liblzma-pkgconfig Index: pkgsrc/archivers/xz/distinfo diff -u pkgsrc/archivers/xz/distinfo:1.25 pkgsrc/archivers/xz/distinfo:1.26 --- pkgsrc/archivers/xz/distinfo:1.25 Thu Nov 17 17:29:47 2022 +++ pkgsrc/archivers/xz/distinfo Fri Dec 2 09:17:59 2022 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.25 2022/11/17 17:29:47 adam Exp $ +$NetBSD: distinfo,v 1.26 2022/12/02 09:17:59 adam Exp $ -BLAKE2s (xz-5.2.8.tar.bz2) = 1388a81907c07e0b69e3ff5c636a213909aec4e8b9a6405bb19dc623fdbb70d5 -SHA512 (xz-5.2.8.tar.bz2) = 1dafc4219acb73be018d3fc36c38de9a1c677e6c0b0a3fdef3f47896956211d9cff533bcbc7c90e51aa9473b4bb89957a5ef144aa9f8bbc9528a81a2eebd1526 -Size (xz-5.2.8.tar.bz2) = 1648658 bytes +BLAKE2s (xz-5.2.9.tar.bz2) = a422db133724952317588c4eb888384a9da9cf48af17c1b1a28131164b1a9d23 +SHA512 (xz-5.2.9.tar.bz2) = aa0d216c55e4782864626a04c2f2ea76d6fce14c7ff524655b6f53382b3652ea64e67a3fe1dc370c25f943e9a07d610934ce673e7b53459b466769a42b1cb768 +Size (xz-5.2.9.tar.bz2) = 1643304 bytes SHA1 (patch-src_xz_Makefile.in) = b9360c7b2b34159028fb8b84339aa2faf3922287 --_----------=_1669972679114850--