Fri Mar 29 18:19:31 2024 UTC (55d)
xz: call this 5.6.1nb100 despite it being 5.4.6

For easier "upgrades" to a non-backdoored version.

Note it in COMMENT and DESCR.


(wiz)
diff -r1.1.1.1 -r1.2 pkgsrc/archivers/xz/DESCR
diff -r1.47 -r1.48 pkgsrc/archivers/xz/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/archivers/xz/DESCR (expand / switch to unified diff)

--- pkgsrc/archivers/xz/DESCR 2009/07/07 11:08:52 1.1.1.1
+++ pkgsrc/archivers/xz/DESCR 2024/03/29 18:19:30 1.2
@@ -10,13 +10,16 @@ of the most popular existing compression @@ -10,13 +10,16 @@ of the most popular existing compression
10XZ Utils consist of a few relatively separate parts: 10XZ Utils consist of a few relatively separate parts:
11 * liblzma is an encoder/decoder library with support for several 11 * liblzma is an encoder/decoder library with support for several
12 filters (algorithm implementations). The primary filter is 12 filters (algorithm implementations). The primary filter is
13 LZMA. 13 LZMA.
14 * libzfile (or whatever the name will be) enables reading from 14 * libzfile (or whatever the name will be) enables reading from
15 and writing to gzip, bzip2 and LZMA compressed and uncompressed 15 and writing to gzip, bzip2 and LZMA compressed and uncompressed
16 files with an API similar to the standard ANSI-C file I/O. 16 files with an API similar to the standard ANSI-C file I/O.
17 [ NOTE: libzfile is not implemented yet. ] 17 [ NOTE: libzfile is not implemented yet. ]
18 * xz command line tool has almost identical syntax than gzip 18 * xz command line tool has almost identical syntax than gzip
19 and bzip2. It makes LZMA easy for average users, but also 19 and bzip2. It makes LZMA easy for average users, but also
20 provides advanced options to finetune the compression settings. 20 provides advanced options to finetune the compression settings.
21 * A few shell scripts make diffing and grepping LZMA compressed 21 * A few shell scripts make diffing and grepping LZMA compressed
22 files easy. The scripts were adapted from gzip and bzip2. 22 files easy. The scripts were adapted from gzip and bzip2.
 23
 24Due to backdoor in 5.6.*, this package is currently called 5.6* but
 25contains 5.4.*.
cvs diff -r1.47 -r1.48 pkgsrc/archivers/xz/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/xz/Makefile 2024/03/28 22:24:08 1.47
+++ pkgsrc/archivers/xz/Makefile 2024/03/29 18:19:30 1.48
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile,v 1.47 2024/03/28 22:24:08 wiz Exp $ 1# $NetBSD: Makefile,v 1.48 2024/03/29 18:19:30 wiz Exp $
2 2
3DISTNAME= xz-5.4.6 3DISTNAME= xz-5.4.6
 4PKGNAME= xz-5.6.1
 5PKGREVISION= 100
4CATEGORIES= archivers 6CATEGORIES= archivers
5MASTER_SITES= ${MASTER_SITE_GITHUB:=tukaani-project/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=tukaani-project/}
6GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
7EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
8 10
9MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://tukaani.org/xz/ 12HOMEPAGE= https://tukaani.org/xz/
11COMMENT= General-purpose data compression software 13COMMENT= General-purpose data compression software (5.4)
12LICENSE= public-domain AND gnu-gpl-v2 14LICENSE= public-domain AND gnu-gpl-v2
13 15
14USE_LIBTOOL= yes 16USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
16PKGCONFIG_OVERRIDE= src/liblzma/liblzma.pc.in 18PKGCONFIG_OVERRIDE= src/liblzma/liblzma.pc.in
17TEST_TARGET= check 19TEST_TARGET= check
18 20
19CONFLICTS= lzma-[0-9]* lzma-utils-[0-9]* lzmalib-[0-9]* 21CONFLICTS= lzma-[0-9]* lzma-utils-[0-9]* lzmalib-[0-9]*
20 22
21.include "../../mk/compiler.mk" 23.include "../../mk/compiler.mk"
22 24
23.if !empty(PKGSRC_COMPILER:Msunpro) 25.if !empty(PKGSRC_COMPILER:Msunpro)
24CONFIGURE_ARGS+= --disable-assembler 26CONFIGURE_ARGS+= --disable-assembler