oasis

commit: 1f24c29f1916fb234bbfbb311c5fcb38cfb28c00
parent 0edaaaea7200be79017ee0f3d44c7f5a81e07145
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  8 May 2020 14:04:16 -0700

oksh: Update to latest git to drop patch

Diffstat:
M
.gitmodules
1
-
D
pkg/oksh/patch/0001-Use-typedef-for-function-pointer.patch
55
-------------------------------------------------------
M
pkg/oksh/ver
2
+-

3 files changed, 1 insertion(+), 57 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -223,7 +223,6 @@
 [submodule "pkg/oksh/src"]
 	path = pkg/oksh/src
 	url = https://github.com/ibara/oksh.git
-	ignore = all
 [submodule "pkg/openssh/src"]
 	path = pkg/openssh/src
 	url = https://github.com/oasislinux/openssh.git
diff --git a/pkg/oksh/patch/0001-Use-typedef-for-function-pointer.patch b/pkg/oksh/patch/0001-Use-typedef-for-function-pointer.patch
@@ -1,55 +0,0 @@
-From 39e18e1c8b6979de2c56caa232795a645e37f6b2 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Apr 2020 20:43:09 -0700
-Subject: [PATCH] Use typedef for function pointer
-
----
- emacs.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/emacs.c b/emacs.c
-index 5a7edc0..b4fad8e 100644
---- a/emacs.c
-+++ b/emacs.c
-@@ -49,8 +49,10 @@ static	Area	aedit;
- #define	KEOL	1		/* ^M, ^J */
- #define	KINTR	2		/* ^G, ^C */
- 
-+typedef int (*kb_func)(int);
-+
- struct	x_ftab {
--	int		(*xf_func)(int c);
-+	kb_func		xf_func;
- 	const char	*xf_name;
- 	short		xf_flags;
- };
-@@ -869,7 +871,7 @@ x_eot_del(int c)
- 		return (x_del_char(c));
- }
- 
--static void *
-+static kb_func
- kb_find_hist_func(char c)
- {
- 	struct kb_entry		*k;
-@@ -1323,7 +1325,7 @@ kb_del(struct kb_entry *k)
- }
- 
- static struct kb_entry *
--kb_add_string(void *func, void *args, char *str)
-+kb_add_string(kb_func func, void *args, char *str)
- {
- 	unsigned int		ele, count;
- 	struct kb_entry		*k;
-@@ -1358,7 +1360,7 @@ kb_add_string(void *func, void *args, char *str)
- }
- 
- static struct kb_entry *
--kb_add(void *func, ...)
-+kb_add(kb_func func, ...)
- {
- 	va_list			ap;
- 	unsigned char		ch;
--- 
-2.26.0
-
diff --git a/pkg/oksh/ver b/pkg/oksh/ver
@@ -1 +1 @@
-6.7 r0
+6.7-2-gd5dc133 r0