summaryrefslogtreecommitdiff
path: root/pkg/bzip2
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2019-06-27 18:59:06 -0700
committerMichael Forney <mforney@mforney.org>2019-06-27 18:59:45 -0700
commit4cc171750f1cdd6ba771899b3ffe8e808cd82b55 (patch)
tree6746a3f7ab869cef96cf0a96f9ac1c48253e17fc /pkg/bzip2
parent34ae59d8f4e3dd74784e9e43547f21d3617c144f (diff)
bzip2: Update to 1.0.7
Diffstat (limited to 'pkg/bzip2')
-rw-r--r--pkg/bzip2/gen.lua2
-rw-r--r--pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch34
m---------pkg/bzip2/src0
-rw-r--r--pkg/bzip2/ver2
4 files changed, 2 insertions, 36 deletions
diff --git a/pkg/bzip2/gen.lua b/pkg/bzip2/gen.lua
index d4b56ee6..1f205773 100644
--- a/pkg/bzip2/gen.lua
+++ b/pkg/bzip2/gen.lua
@@ -12,7 +12,7 @@ lib('libbz2.a', {
exe('bzip2', {'bzip2.c', 'libbz2.a'})
file('bin/bzip2', '755', '$outdir/bzip2')
-man{'man/bzip2.1'}
+man{'bzip2.1'}
sym('bin/bzcat', 'bzip2')
fetch 'git'
diff --git a/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch b/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch
deleted file mode 100644
index 7b322a21..00000000
--- a/pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 00cc7127e58adeeba4485fab901215b6df6184f6 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 10 Dec 2016 23:37:57 -0800
-Subject: [PATCH] Remove unused nread variable
-
----
- bzip2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bzip2.c b/bzip2.c
-index 6de9d1d..1dd5424 100644
---- a/bzip2.c
-+++ b/bzip2.c
-@@ -554,7 +554,7 @@ static
- Bool testStream ( FILE *zStream )
- {
- BZFILE* bzf = NULL;
-- Int32 bzerr, bzerr_dummy, ret, nread, streamNo, i;
-+ Int32 bzerr, bzerr_dummy, ret, streamNo, i;
- UChar obuf[5000];
- UChar unused[BZ_MAX_UNUSED];
- Int32 nUnused;
-@@ -577,7 +577,7 @@ Bool testStream ( FILE *zStream )
- streamNo++;
-
- while (bzerr == BZ_OK) {
-- nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
-+ BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
- if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
- }
- if (bzerr != BZ_STREAM_END) goto errhandler;
---
-2.11.0
-
diff --git a/pkg/bzip2/src b/pkg/bzip2/src
-Subproject ad723d6558718e9bbaca930e7e715c9ee754e90
+Subproject f319b98aade2a337c74b9a3b48c6daffb7809cd
diff --git a/pkg/bzip2/ver b/pkg/bzip2/ver
index 75d58d76..7d4e6f67 100644
--- a/pkg/bzip2/ver
+++ b/pkg/bzip2/ver
@@ -1 +1 @@
-ad723d6558 r0
+1.0.7 r0