diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-11 16:04:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch) | |
| tree | 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /pkg/loksh/patch | |
| parent | 9a506a6834df01a26795cea222b410f206efa9fa (diff) | |
Move to flat package hierarchy
Note to self: never try to move submodules again
To migrate your existing submodules (more or less):
set -x
set -e
mkdir .git/modules/pkg
for old in */*/src ; do
new="pkg/${old#*/}"
if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
continue
fi
git -C ".git/modules/$old" config core.worktree "../../../../../$new"
rmdir "$new"
mv "$old" "$new"
sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
mv "$new/.git.tmp" "$new/.git"
mkdir ".git/modules/${new%/src}"
mv ".git/modules/$old" ".git/modules/$new"
rm "${old%/src}"/*.ninja
mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
rmdir "${old%/src}" || true
done
sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
mv .git/config.tmp .git/config
Diffstat (limited to 'pkg/loksh/patch')
| -rw-r--r-- | pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch | 37 | ||||
| -rw-r--r-- | pkg/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch | 24 |
2 files changed, 61 insertions, 0 deletions
diff --git a/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch b/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch new file mode 100644 index 00000000..44f96f35 --- /dev/null +++ b/pkg/loksh/patch/0001-In-emacs-incremental-search-mode-R-make-commands-sta.patch @@ -0,0 +1,37 @@ +From 34a09675724c2d4f13f21b4f5663c098fe955090 Mon Sep 17 00:00:00 2001 +From: schwarze <schwarze@openbsd.org> +Date: Tue, 9 Aug 2016 11:04:46 +0000 +Subject: [PATCH] In emacs incremental search mode (^R), make commands starting + with the escape key (^[) work as documented. Long-standing bug, this time + reported by Dave minus Cohen dot com. OK natano@ halex@ + +--- + emacs.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/emacs.c b/emacs.c +index 51d1ab0..2f82b5b 100644 +--- a/emacs.c ++++ b/emacs.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: emacs.c,v 1.65 2016/01/26 17:39:31 mmcc Exp $ */ ++/* $OpenBSD: emacs.c,v 1.66 2016/08/09 11:04:46 schwarze Exp $ */ + + /* + * Emacs-like command line editing and history +@@ -893,9 +893,10 @@ x_search_hist(int c) + if ((c = x_e_getc()) < 0) + return KSTD; + f = kb_find_hist_func(c); +- if (c == CTRL('[')) ++ if (c == CTRL('[')) { ++ x_e_ungetc(c); + break; +- else if (f == x_search_hist) ++ } else if (f == x_search_hist) + offset = x_search(pat, 0, offset); + else if (f == x_del_back) { + if (p == pat) { +-- +2.10.1 + diff --git a/pkg/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch b/pkg/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch new file mode 100644 index 00000000..9225f6fd --- /dev/null +++ b/pkg/loksh/patch/0002-Add-missing-stdlib.h-include-for-mkstemp.patch @@ -0,0 +1,24 @@ +From abdea742e220edf3b7ba8b44260e75ca95c5c9da Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sat, 10 Dec 2016 19:30:09 -0800 +Subject: [PATCH] Add missing stdlib.h include for mkstemp + +--- + io.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/io.c b/io.c +index 16a0709..99fa0a8 100644 +--- a/io.c ++++ b/io.c +@@ -9,6 +9,7 @@ + #include <ctype.h> + #include <errno.h> + #include <fcntl.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + +-- +2.11.0 + |