oasis

commit: 11c964add35b6e9a5d6593f8f54e218688abc400
parent 2159e1536fcb0e26a457eb7ed7bfba4ab92a21f7
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 25 Sep 2020 12:18:18 -0700

mblaze: Update to latest git

Diffstat:
M
.gitmodules
1
-
D
pkg/mblaze/patch/0001-include-strings.h-for-str-n-casecmp.patch
66
------------------------------------------------------------------
D
pkg/mblaze/patch/0002-mpick-use-function-pointer-type-for-callback.patch
28
----------------------------
M
pkg/mblaze/ver
2
+-

4 files changed, 1 insertion(+), 96 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -181,7 +181,6 @@
 [submodule "pkg/mblaze/src"]
 	path = pkg/mblaze/src
 	url = https://github.com/leahneukirchen/mblaze.git
-	ignore = all
 [submodule "pkg/mc/src"]
 	path = pkg/mc/src
 	url = https://github.com/oridb/mc
diff --git a/pkg/mblaze/patch/0001-include-strings.h-for-str-n-casecmp.patch b/pkg/mblaze/patch/0001-include-strings.h-for-str-n-casecmp.patch
@@ -1,66 +0,0 @@
-From bd0ea24cf77efc683f103b037d446b0e5644364e Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 17 Sep 2020 12:16:34 -0700
-Subject: [PATCH] include strings.h for str(n)casecmp
-
-These POSIX functions are declared in strings.h, so include this
-header explicitly instead of relying on the libc's default feature-test
-macros to include it through string.h.
----
- magrep.c   | 1 +
- mdeliver.c | 1 +
- mflow.c    | 1 +
- mhdr.c     | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/magrep.c b/magrep.c
-index 6f93a57..72ce1bb 100644
---- a/magrep.c
-+++ b/magrep.c
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
- #include <unistd.h>
- 
- #include "blaze822.h"
-diff --git a/mdeliver.c b/mdeliver.c
-index 161cea5..27c4b9c 100644
---- a/mdeliver.c
-+++ b/mdeliver.c
-@@ -10,6 +10,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
- #include <unistd.h>
- 
- #include "blaze822.h"
-diff --git a/mflow.c b/mflow.c
-index af6755d..1013da5 100644
---- a/mflow.c
-+++ b/mflow.c
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
- #include <unistd.h>
- 
- #include "blaze822.h"
-diff --git a/mhdr.c b/mhdr.c
-index d434d1d..83bed02 100644
---- a/mhdr.c
-+++ b/mhdr.c
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
- #include <unistd.h>
- 
- #include "blaze822.h"
--- 
-2.28.0
-
diff --git a/pkg/mblaze/patch/0002-mpick-use-function-pointer-type-for-callback.patch b/pkg/mblaze/patch/0002-mpick-use-function-pointer-type-for-callback.patch
@@ -1,28 +0,0 @@
-From 52fe8d766c7709e93f4ee2f57b2eab61287a2470 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 17 Sep 2020 12:24:08 -0700
-Subject: [PATCH] mpick: use function pointer type for callback
-
-Though POSIX requires this conversion to work correctly (for dlsym),
-it is not valid in ISO C, so it is better to just uses the appropriate
-function pointer type.
----
- mpick.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mpick.c b/mpick.c
-index 379200d..3b11e67 100644
---- a/mpick.c
-+++ b/mpick.c
-@@ -1466,7 +1466,7 @@ main(int argc, char *argv[])
- 
- 	xpledge("stdio rpath wpath cpath proc exec", 0);
- 
--	void *cb = need_thr ? collect : oneline;
-+	void (*cb)(char *) = need_thr ? collect : oneline;
- 	if (argc == optind && isatty(0))
- 		i = blaze822_loop1(":", cb);
- 	else
--- 
-2.28.0
-
diff --git a/pkg/mblaze/ver b/pkg/mblaze/ver
@@ -1 +1 @@
-1.0 r0
+1.0-3-g02e4cf4 r0