pristine-tar (1.46)
[PTS] [DDPO]
NEW: VCS has unreleased changes: 1.47 > 1.46
- Git: https://salsa.debian.org/debian/pristine-tar.git
-
- Branch: master
- Path: debian/changelog
- Browser: https://salsa.debian.org/debian/pristine-tar
- Last scan: 2019-04-23 07:58:17+00
- Next scan: 2019-04-24 11:03:00+00
- Merge requests: 1
- CI pipeline status: success
- Debian changelog in Git:
pristine-tar (1.47) UNRELEASED; urgency=medium
[ Tomasz Buchert ]
* d/control: move suggested dependencies to actual dependencies
* drop "Restrictions: needs-recommends" from tests
* d/control: add pixz as a dependency
[ Kevin Locke ]
* pristine-xz: Improve multi-thread detection and utilization
* pristine-xz: Detect pixz compression (Closes: #892029, #913218)
* pristine-xz: Check program before params
* pristine-xz: Handle pixz tar index
* pristine-xz: Set threads based on CPU affinity
-- Tomasz Buchert <tomasz@debian.org> Sun, 27 Jan 2019 11:03:37 +0100
- This branch is 14 commits ahead of tag 1.46
- Git log:
commit d3cc2e94084017e1ee68db8f7986b91b53dfbf1d
Author: Antonio Terceiro <terceiro@debian.org>
Date: Mon Apr 8 09:02:11 2019 -0300
gitlab-ci: drop pipeline no stable
Several changes in the packaging makes pristine-tar not directly
usable/buildable in stable.
commit 8f490831df477313879565c51d63d2dab77b698d
Author: Antonio Terceiro <terceiro@debian.org>
Date: Sun Apr 7 22:37:11 2019 -0300
debian/control: add missing Build dependency
commit aa2cde882d769282969f312f97511fbc4d18ce8b
Author: Antonio Terceiro <terceiro@debian.org>
Date: Sun Apr 7 22:37:00 2019 -0300
pristine-tar.spec: bump version number
commit 7dcd16508ca4f44ce78eb4ca2d01767a9c30eae6
Author: Antonio Terceiro <terceiro@debian.org>
Date: Sun Apr 7 22:32:15 2019 -0300
test.pl: fix exit status with test failures
commit da693958d71ed1a305d9804f873b9ac8a0630118
Author: Tomasz Buchert <tomasz@debian.org>
Date: Sun Jan 27 11:04:59 2019 +0100
pre-release
commit cd6391cba9ce8d6fa54553f598b097d898166e62
Merge: 6310160 ca6d112
Author: Tomasz Buchert <tomasz@debian.org>
Date: Sun Jan 27 11:03:16 2019 +0100
Merge branch 'kevinoid-guest/pristine-tar-multithreading-and-pixz'
commit ca6d11218d63b77c0342f39bf51df798cbdadd3d
Author: Kevin Locke <kevin@kevinlocke.name>
Date: Sat Jan 26 11:19:50 2019 -0700
pristine-xz: Set threads based on CPU affinity
Instead of using only 2 threads for multi-threaded processing, use the
number of CPUs available to the process (based on CPU affinity, as xz
does for -T0) with a minimum of 2 to ensure sizes are set in block
headers.
Note: Sys::CpuAffinity::getAffinity($$) is used instead of
Sys::CpuAffinity::getNumCpus(), which was suggested in #873229, because
using more CPUs than the configured affinity would be counter-productive
(the threads would only be scheduled on the CPUs with affinity, causing
contention).
Fixes: #873229
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
commit cb5a0a07b67bcc795bde2073c8c4c4eb4a140744
Author: Kevin Locke <kevin@kevinlocke.name>
Date: Sun Dec 2 22:23:56 2018 -0700
pristine-xz: Handle pixz tar index
When compressing a tar file, unless the `-t` option is passed, `pixz`
adds a data block to the end of the xz stream which contains an index of
the tar file contents. During decompression, `xz` assumes the data
block contains file data and appends the decompressed data to the output
file. This confuses pristine-xz, since there is no way to compress the
data+index such that it matches the original. To avoid this, use `pixz`
to decompress, when available.
When a pixz tar index is present (detected using `pixz -l`), skip
compression testing with `xz`, since we know it won't work. This saves
significant time for large archives.
Fixes the xz-related portion of #859303.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
commit 74f6b99fa46f70c5592fba22cee8320a89e49564
Author: Kevin Locke <kevin@kevinlocke.name>
Date: Sun Dec 2 21:38:23 2018 -0700
pristine-xz: Check program before params
If the program check would fail, a parameter error is likely to be
misleading. Check program first to avoid this.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
commit 4ff745f2d3e905d88718b5e57bc6b4baf479f55b
Author: Kevin Locke <kevin@kevinlocke.name>
Date: Sun Dec 2 21:15:22 2018 -0700
pristine-xz: Detect pixz compression
There are at least 2 cases where `pixz` produces output which differs
from `xz --check=crc32 -T2`:
- When `pixz` compresses a `.tar` file and `-t` is not given it produces
an extra xz data block which contains an index of the tar contents.
- For blocks where the uncompressed size is significantly less than the
expected block size, `xz` overestimates the block heading size, which
results in >= 4 bytes of padding while `pixz` does not. Examples:
* https://mirrors.edge.kernel.org/pub/software/network/iw/iw-4.14.tar.xz
* https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.26.tar.xz
* http://snapshot.debian.org/archive/debian/20180220T215051Z/pool/main/k/kexec-tools/kexec-tools_2.0.16.orig.tar.xz
All are compressed using `pixz` and have a 16-byte block header.
Recompressing with `xz` gives a 20-byte block header with 4 pad bytes.
Due to these differences, use of `pixz` instead of `xz` is sometimes
necessary, which is why this commit introduces these checks.
Closes: #892029
Closes: #913218
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
commit 558cf61b20e1eaba82a6869015a4d0d8e2ccc5c2
Author: Kevin Locke <kevin@kevinlocke.name>
Date: Sun Dec 2 19:00:33 2018 -0700
pristine-xz: Improve multi-thread detection and utilization
The previous implementation only detected multi-threading when there are
multiple blocks (and, as far as I can tell, always, since the block sum
is always equal with or without threading in my tests).
Instead, use the presence of the compressed/uncompressed size in the
block header. xz always omits these values when operating in
single-threaded mode and always includes them in multi-threaded mode,
regardless of the number of blocks or the presence of the --block-size
and --block-list options.
Only test -T2, since -T6 produces the same output. Would like to use
-T0, but it behaves the same as -T1 (and -T not specified) on
single-core systems (or when invoked with single-core affinity).
This also fixes an issue with git_2.13.1.orig.tar.xz which is compressed
with -T0 -9.
Fixes: #865573
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
commit 631016070d9d35314525c26a022f174ec2b66406
Author: Tomasz Buchert <tomasz@debian.org>
Date: Fri Jan 25 23:12:05 2019 +0100
d/control: add pixz as a dependency
commit 23946b426912dfe4d80a768c1cb952a661365b4d
Author: Tomasz Buchert <tomasz@debian.org>
Date: Wed Jan 23 23:43:39 2019 +0100
drop "Restrictions: needs-recommends" from tests
commit 77d4be23fb47c2164bdfffccb6aafac1c5a6bf6b
Author: Tomasz Buchert <tomasz@debian.org>
Date: Wed Jan 23 23:39:39 2019 +0100
move suggested dependencies to actual dependencies
