aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/ksh-openbsd/ksh-openbsd.SlackBuild2
-rw-r--r--system/ksh-openbsd/ksh-openbsd.info8
-rw-r--r--system/ksh-openbsd/patches/02-remove_fp.diff12
-rw-r--r--system/ksh-openbsd/patches/06-ksh-vi-compensate-for-cursor-move-on-command-mode.diff (renamed from system/ksh-openbsd/patches/07-ksh-vi-compensate-for-cursor-move-on-command-mode.diff)0
-rw-r--r--system/ksh-openbsd/patches/07-Remove-from-the-list-of-characters-blocking-addition.diff (renamed from system/ksh-openbsd/patches/08-Remove-from-the-list-of-characters-blocking-addition.diff)0
-rw-r--r--system/ksh-openbsd/patches/08-new_history_implementation.diff (renamed from system/ksh-openbsd/patches/10-new_history_implementation.diff)0
-rw-r--r--system/ksh-openbsd/patches/09-escape_colon.diff11
-rw-r--r--system/ksh-openbsd/patches/09-nobeep_option.diff (renamed from system/ksh-openbsd/patches/11-nobeep_option.diff)0
8 files changed, 10 insertions, 23 deletions
diff --git a/system/ksh-openbsd/ksh-openbsd.SlackBuild b/system/ksh-openbsd/ksh-openbsd.SlackBuild
index 60eab211a938d..4a18364fb25b3 100644
--- a/system/ksh-openbsd/ksh-openbsd.SlackBuild
+++ b/system/ksh-openbsd/ksh-openbsd.SlackBuild
@@ -28,7 +28,7 @@
# Build script for the Linux port of OpenBSD's ksh
PRGNAM=ksh-openbsd
-VERSION=20130311
+VERSION=20130611
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/ksh-openbsd/ksh-openbsd.info b/system/ksh-openbsd/ksh-openbsd.info
index d45763ddde550..3540e0a5b22b0 100644
--- a/system/ksh-openbsd/ksh-openbsd.info
+++ b/system/ksh-openbsd/ksh-openbsd.info
@@ -1,8 +1,8 @@
PRGNAM="ksh-openbsd"
-VERSION="20130311"
-HOMEPAGE="http://leva.ecentrum.hu/slackbuilds/distfiles/ksh-openbsd-20130311.tar.gz"
-DOWNLOAD="http://leva.ecentrum.hu/slackbuilds/distfiles/ksh-openbsd-20130311.tar.gz"
-MD5SUM="c2856fe310627f7c3ad2f87985badc2d"
+VERSION="20130611"
+HOMEPAGE="http://leva.ecentrum.hu/slackbuilds/distfiles/ksh-openbsd-20130611.tar.gz"
+DOWNLOAD="http://leva.ecentrum.hu/slackbuilds/distfiles/ksh-openbsd-20130611.tar.gz"
+MD5SUM="788a91d47164f3cb87c0b3ca698f85b8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libbsd"
diff --git a/system/ksh-openbsd/patches/02-remove_fp.diff b/system/ksh-openbsd/patches/02-remove_fp.diff
index 25817d0a56a1e..06f586e5c8043 100644
--- a/system/ksh-openbsd/patches/02-remove_fp.diff
+++ b/system/ksh-openbsd/patches/02-remove_fp.diff
@@ -78,11 +78,10 @@ diff -u -p -r1.15 shf.c
if (!fmt)
return 0;
-@@ -946,134 +915,6 @@ shf_vfprintf(struct shf *shf, const char
- precision = len; /* no loss */
+@@ -922,134 +922,6 @@ shf_vfprintf(struct shf *shf, const char
}
break;
--
+
-#ifdef FP
- case 'e':
- case 'g':
@@ -102,7 +101,7 @@ diff -u -p -r1.15 shf.c
- /*
- * Assumes doubles are pushed on
- * the stack. If this is not so, then
-- * FL_LONG/FL_SHORT should be checked.
+- * FL_LLONG/FL_LONG/FL_SHORT should be checked.
- */
- fpnum = va_arg(args, double);
- s = fpbuf;
@@ -210,8 +209,7 @@ diff -u -p -r1.15 shf.c
- break;
- }
-#endif /* FP */
-
+-
case 's':
if (!(s = va_arg(args, char *)))
-
-
+ s = "(null %s)";
diff --git a/system/ksh-openbsd/patches/07-ksh-vi-compensate-for-cursor-move-on-command-mode.diff b/system/ksh-openbsd/patches/06-ksh-vi-compensate-for-cursor-move-on-command-mode.diff
index ce51064a01929..ce51064a01929 100644
--- a/system/ksh-openbsd/patches/07-ksh-vi-compensate-for-cursor-move-on-command-mode.diff
+++ b/system/ksh-openbsd/patches/06-ksh-vi-compensate-for-cursor-move-on-command-mode.diff
diff --git a/system/ksh-openbsd/patches/08-Remove-from-the-list-of-characters-blocking-addition.diff b/system/ksh-openbsd/patches/07-Remove-from-the-list-of-characters-blocking-addition.diff
index 9326e8072dcf1..9326e8072dcf1 100644
--- a/system/ksh-openbsd/patches/08-Remove-from-the-list-of-characters-blocking-addition.diff
+++ b/system/ksh-openbsd/patches/07-Remove-from-the-list-of-characters-blocking-addition.diff
diff --git a/system/ksh-openbsd/patches/10-new_history_implementation.diff b/system/ksh-openbsd/patches/08-new_history_implementation.diff
index d083b42554b43..d083b42554b43 100644
--- a/system/ksh-openbsd/patches/10-new_history_implementation.diff
+++ b/system/ksh-openbsd/patches/08-new_history_implementation.diff
diff --git a/system/ksh-openbsd/patches/09-escape_colon.diff b/system/ksh-openbsd/patches/09-escape_colon.diff
deleted file mode 100644
index 77145e1505e58..0000000000000
--- a/system/ksh-openbsd/patches/09-escape_colon.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- edit.c.orig 2012-10-31 19:21:31.742319303 +0100
-+++ edit.c 2012-10-31 19:21:44.031181937 +0100
-@@ -809,7 +809,7 @@
- int rval = 0;
-
- for (add = 0, wlen = len; wlen - add > 0; add++) {
-- if (strchr("\"#$&'()*;<=>?[\\]`{|}", s[add]) ||
-+ if (strchr("\"#$&'()*:;<=>?[\\]`{|}", s[add]) ||
- strchr(ifs, s[add])) {
- if (putbuf_func(s, add) != 0) {
- rval = -1;
diff --git a/system/ksh-openbsd/patches/11-nobeep_option.diff b/system/ksh-openbsd/patches/09-nobeep_option.diff
index d34a43d63426b..d34a43d63426b 100644
--- a/system/ksh-openbsd/patches/11-nobeep_option.diff
+++ b/system/ksh-openbsd/patches/09-nobeep_option.diff