diff options
| -rw-r--r-- | system/ksh-openbsd/ksh-openbsd.SlackBuild | 6 | ||||
| -rw-r--r-- | system/ksh-openbsd/ksh-openbsd.info | 10 | ||||
| -rw-r--r-- | system/ksh-openbsd/patches/06-ksh-remove-backslashes-in-filenames-using-lex.diff | 118 | ||||
| -rw-r--r-- | system/ksh-openbsd/slack-desc | 10 |
4 files changed, 13 insertions, 131 deletions
diff --git a/system/ksh-openbsd/ksh-openbsd.SlackBuild b/system/ksh-openbsd/ksh-openbsd.SlackBuild index aba659fa83..60eab211a9 100644 --- a/system/ksh-openbsd/ksh-openbsd.SlackBuild +++ b/system/ksh-openbsd/ksh-openbsd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2010, 2011, 2012 Daniel LEVAI +# Copyright (c) 2010-2013 LEVAI Daniel # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,7 +28,7 @@ # Build script for the Linux port of OpenBSD's ksh PRGNAM=ksh-openbsd -VERSION=20120910 +VERSION=20130311 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,7 +65,7 @@ rm -Rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -Rf $PRGNAM -tar xvf $CWD/$PRGNAM.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM chown -R root:root . find . \ diff --git a/system/ksh-openbsd/ksh-openbsd.info b/system/ksh-openbsd/ksh-openbsd.info index b1faec9ee6..d45763ddde 100644 --- a/system/ksh-openbsd/ksh-openbsd.info +++ b/system/ksh-openbsd/ksh-openbsd.info @@ -1,10 +1,10 @@ PRGNAM="ksh-openbsd" -VERSION="20120910" -HOMEPAGE="http://leva.ecentrum.hu/slackbuilds/distfiles/ksh-openbsd.tar.gz" -DOWNLOAD="http://leva.ecentrum.hu/slackbuilds/distfiles/ksh-openbsd.tar.gz" -MD5SUM="079311fe4e4065695d85a1bb5a8d6b41" +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" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libbsd" -MAINTAINER="Daniel LEVAI" +MAINTAINER="LEVAI Daniel" EMAIL="leva@ecentrum.hu" diff --git a/system/ksh-openbsd/patches/06-ksh-remove-backslashes-in-filenames-using-lex.diff b/system/ksh-openbsd/patches/06-ksh-remove-backslashes-in-filenames-using-lex.diff deleted file mode 100644 index 04ca29f6f1..0000000000 --- a/system/ksh-openbsd/patches/06-ksh-remove-backslashes-in-filenames-using-lex.diff +++ /dev/null @@ -1,118 +0,0 @@ -From 458d69d8f10d582fd7a546eabc1b555bb7337627 Mon Sep 17 00:00:00 2001 -From: Alexander Polakov <polachok@gmail.com> -Date: Sun, 29 May 2011 16:05:58 +0400 -Subject: [PATCH 6/8] ksh: remove backslashes in filenames using lex. - - * this also removes the check for matching pattern and - returned filename. if it returns 1 name, then it must - be the filename of an existing file, right? i think - so. - - * change stat() to lstat() to complete broken links - (from LEVAI Daniel). - - Why: - - * less ugly code - * working completion for special characters like [], () and so - * suggested by martynas ---- - edit.c | 31 +++++++------------------------ - lex.c | 4 ++++ - lex.h | 1 + - 3 files changed, 12 insertions(+), 24 deletions(-) - -diff --git edit.c edit.c -index 9cdcc6d..01c2fe6 100644 ---- edit.c -+++ edit.c -@@ -351,7 +351,7 @@ x_file_glob(int flags, const char *str, int slen, char ***wordsp) - { - char *toglob; - char **words; -- int nwords, i, idx, escaping; -+ int nwords; - XPtrV w; - struct source *s, *sold; - -@@ -360,20 +360,6 @@ x_file_glob(int flags, const char *str, int slen, char ***wordsp) - - toglob = add_glob(str, slen); - -- /* remove all escaping backward slashes */ -- escaping = 0; -- for (i = 0, idx = 0; toglob[i]; i++) { -- if (toglob[i] == '\\' && !escaping) { -- escaping = 1; -- continue; -- } -- -- toglob[idx] = toglob[i]; -- idx++; -- if (escaping) escaping = 0; -- } -- toglob[idx] = '\0'; -- - /* - * Convert "foo*" (toglob) to an array of strings (words) - */ -@@ -381,7 +367,7 @@ x_file_glob(int flags, const char *str, int slen, char ***wordsp) - s = pushs(SWSTR, ATEMP); - s->start = s->str = toglob; - source = s; -- if (yylex(ONEWORD) != LWORD) { -+ if (yylex(ONEWORD|RMBKSLSH) != LWORD) { - source = sold; - internal_errorf(0, "fileglob: substitute error"); - return 0; -@@ -397,15 +383,12 @@ x_file_glob(int flags, const char *str, int slen, char ***wordsp) - if (nwords == 1) { - struct stat statb; - -- /* Check if globbing failed (returned glob pattern), -- * but be careful (E.g. toglob == "ab*" when the file -- * "ab*" exists is not an error). -- * Also, check for empty result - happens if we tried -- * to glob something which evaluated to an empty -- * string (e.g., "$FOO" when there is no FOO, etc). -+ /* Check if file exists, also, check for empty -+ * result - happens if we tried to glob something -+ * which evaluated to an empty string (e.g., -+ * "$FOO" when there is no FOO, etc). - */ -- if ((strcmp(words[0], toglob) == 0 && -- stat(words[0], &statb) < 0) || -+ if((lstat(words[0], &statb) < 0) || - words[0][0] == '\0') { - x_free_words(nwords, words); - words = NULL; -diff --git lex.c lex.c -index ef741c6..fe3d91d 100644 ---- lex.c -+++ lex.c -@@ -299,6 +299,10 @@ yylex(int cf) - } - /* FALLTHROUGH */ - default: -+ if (cf & RMBKSLSH) { -+ *wp++ = QCHAR, *wp++ = c; -+ break; -+ } - Xcheck(ws, wp); - if (c) { /* trailing \ is lost */ - *wp++ = CHAR, *wp++ = '\\'; -diff --git lex.h lex.h -index 0904fbd..6a0dbf9 100644 ---- lex.h -+++ lex.h -@@ -113,6 +113,7 @@ typedef union { - #define CMDWORD BIT(8) /* parsing simple command (alias related) */ - #define HEREDELIM BIT(9) /* parsing <<,<<- delimiter */ - #define HEREDOC BIT(10) /* parsing heredoc */ -+#define RMBKSLSH BIT(11) /* remove backslashes */ - - #define HERES 10 /* max << in line */ - --- -1.7.5 - diff --git a/system/ksh-openbsd/slack-desc b/system/ksh-openbsd/slack-desc index 06d323e849..3a18a7bc7b 100644 --- a/system/ksh-openbsd/slack-desc +++ b/system/ksh-openbsd/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| ksh-openbsd: ksh-openbsd (OpenBSD ksh ported to Linux) |