oasis

commit: 4cc171750f1cdd6ba771899b3ffe8e808cd82b55
parent 34ae59d8f4e3dd74784e9e43547f21d3617c144f
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 27 Jun 2019 18:59:06 -0700

bzip2: Update to 1.0.7

Diffstat:
M
.gitmodules
3
+--
M
pkg/bzip2/gen.lua
2
+-
D
pkg/bzip2/patch/0001-Remove-unused-nread-variable.patch
34
----------------------------------
M
pkg/bzip2/ver
2
+-

4 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -22,8 +22,7 @@
 	ignore = all
 [submodule "pkg/bzip2/src"]
 	path = pkg/bzip2/src
-	url = https://gitlab.com/federicomenaquintero/bzip2.git
-	ignore = all
+	url = git://sourceware.org/git/bzip2.git
 [submodule "pkg/cmark/src"]
 	path = pkg/cmark/src
 	url = https://github.com/commonmark/cmark
diff --git 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
@@ -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/ver b/pkg/bzip2/ver
@@ -1 +1 @@
-ad723d6558 r0
+1.0.7 r0