diff options
| author | Michael Forney <mforney@mforney.org> | 2016-11-20 18:42:41 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-11-20 21:19:18 -0800 |
| commit | ac83096a6d89e772857c0b91c1b02c9775aafc4f (patch) | |
| tree | 306d1902773fd962c27ddeec13661a4eddb0dc2d | |
| parent | 421f1188fb1b3b65d929cb6ba5933172765971c9 (diff) | |
pigz: Handle -n option like gzip does
Otherwise, when we compress files with -n in the oasis build, we'll get
timestamps with pigz, and no timestamps with gzip. We can't apply the
pigz-specific -T flag because then it doesn't work with GNU gzip.
| -rw-r--r-- | .gitmodules | 1 | ||||
| -rw-r--r-- | core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch | 39 | ||||
| -rw-r--r-- | core/pigz/rev | 2 |
3 files changed, 41 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 2b998f95..7f2f3bc3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,6 +38,7 @@ [submodule "core/pigz/src"] path = core/pigz/src url = https://github.com/madler/pigz + ignore = all [submodule "core/plan9port/src"] path = core/plan9port/src url = https://github.com/9fans/plan9port diff --git a/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch b/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch new file mode 100644 index 00000000..50ced245 --- /dev/null +++ b/core/pigz/patch/0001-Handle-n-option-like-gzip-does.patch @@ -0,0 +1,39 @@ +From d9642e90c3ece95407627c005dee51d193305398 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sun, 20 Nov 2016 18:41:36 -0800 +Subject: [PATCH] Handle -n option like gzip does + +--- + pigz.1 | 2 +- + pigz.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pigz.1 b/pigz.1 +index 9679e40..4e5d9f0 100644 +--- a/pigz.1 ++++ b/pigz.1 +@@ -156,7 +156,7 @@ Display the + license and quit. + .TP + .B -n --no-name +-Do not store or restore file name in/from header. ++Do not store or restore file name and mod time in/from header. + .TP + .B -N --name + Store/restore file name and mod time in/from header. +diff --git a/pigz.c b/pigz.c +index a35a645..cf53623 100644 +--- a/pigz.c ++++ b/pigz.c +@@ -4028,7 +4028,7 @@ local int option(char *arg) + case 'i': g.setdict = 0; break; + case 'k': g.keep = 1; break; + case 'l': g.list = 1; break; +- case 'n': g.headis &= ~5; break; ++ case 'n': g.headis &= ~0xf; break; + case 'p': get = 2; break; + case 'q': g.verbosity = 0; break; + case 'r': g.recurse = 1; break; +-- +2.10.2 + diff --git a/core/pigz/rev b/core/pigz/rev index 0cfbf088..00750edc 100644 --- a/core/pigz/rev +++ b/core/pigz/rev @@ -1 +1 @@ -2 +3 |