--- dash-0.5.3.orig/debian/diff/0001-EVAL-Make-eval-with-empty-arguments-return-0.diff +++ dash-0.5.3/debian/diff/0001-EVAL-Make-eval-with-empty-arguments-return-0.diff @@ -0,0 +1,149 @@ +From e5f903b9451c6e6a79eee939fcf6558a0b93cf8e Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Thu, 12 Jan 2006 21:02:26 +1100 +Subject: [PATCH] [EVAL] Make eval with empty arguments return 0 + +On Tue, Jan 10, 2006 at 10:56:23AM +0000, Gerrit Pape wrote: +> tags 347232 + patch +> quit +> +> On Mon, Jan 09, 2006 at 04:29:19PM +0100, Marco Nenciarini wrote: +> > The problem is here: +> > +> > # Set the kernel 2.6 option only for fresh install +> > test -z "$(GetMenuOpt "kopt" "")" && kopt_2_6="root=$root_device_2_6 ro" +> > +> > # Extract options for specific kernels +> > eval $(ExtractMenuOpts "\(kopt_[a-zA-Z0-9_]\+\)") +> > +> > If the first test fails and the eval argument is empty then dash +> > terminate with exitcode 1. +> +> > This is a simple testcase: +> > tm:~# bash -c "set -e ;/bin/false && : ; eval ''; echo 'END'"; echo $? +> > END +> > 0 +> > tm:~# dash -c "set -e ;/bin/false && : ; eval ''; echo 'END'"; echo $? +> > 1 +> > +> > if you insert any command with successfull exit status before the +> > empty eval, all work ok: +> > tm:~# bash -c "set -e ;/bin/false && : ; : ; eval ''; echo 'END'"; echo $? +> > END +> > 0 +> > tm:~# dash -c "set -e ;/bin/false && : ; : ; eval ''; echo 'END'"; echo $? +> > END +> > 0 +> +> Yes, I can confirm this is a bug in dash. The standard says +> +> EXIT STATUS +> +> If there are no arguments, or only null arguments, eval shall +> return a zero exit status; otherwise, it shall return the exit +> status of the command defined by the string of concatenated +> arguments separated by s. +> +> Hi Herbert, please see http://bugs.debian.org/347232 + +Changed evalstring to return the exit status instead of evalskip. This +allows us to return zero if the string is empty. +--- + ChangeLog | 4 ++++ + src/eval.c | 18 ++++++++---------- + src/trap.c | 9 ++++----- + 3 files changed, 16 insertions(+), 15 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 9f87e4e..02b966c 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++2006-01-12 Herbert Xu ++ ++ * Fixed eval exit status with empty arguments. ++ + 2005-11-26 Herbert Xu + + * Release 0.5.3. +diff --git a/src/eval.c b/src/eval.c +index f8f6f0a..07e7ee2 100644 +--- a/src/eval.c ++++ b/src/eval.c +@@ -150,10 +150,9 @@ evalcmd(int argc, char **argv) + STPUTC('\0', concat); + p = grabstackstr(concat); + } +- evalstring(p, ~SKIPEVAL); +- ++ return evalstring(p, ~SKIPEVAL); + } +- return exitstatus; ++ return 0; + } + + +@@ -166,24 +165,23 @@ evalstring(char *s, int mask) + { + union node *n; + struct stackmark smark; +- int skip; ++ int status; + + setinputstring(s); + setstackmark(&smark); + +- skip = 0; ++ status = 0; + while ((n = parsecmd(0)) != NEOF) { + evaltree(n, 0); ++ status = exitstatus; + popstackmark(&smark); +- skip = evalskip; +- if (skip) ++ if (evalskip) + break; + } + popfile(); + +- skip &= mask; +- evalskip = skip; +- return skip; ++ evalskip &= mask; ++ return status; + } + + +diff --git a/src/trap.c b/src/trap.c +index bbff81a..eae6186 100644 +--- a/src/trap.c ++++ b/src/trap.c +@@ -295,7 +295,6 @@ dotrap(void) + char *q; + int i; + int savestatus; +- int skip = 0; + + savestatus = exitstatus; + pendingsigs = 0; +@@ -309,13 +308,13 @@ dotrap(void) + p = trap[i + 1]; + if (!p) + continue; +- skip = evalstring(p, SKIPEVAL); ++ evalstring(p, SKIPEVAL); + exitstatus = savestatus; +- if (skip) +- break; ++ if (evalskip) ++ return evalskip; + } + +- return skip; ++ return 0; + } + + +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/diff/0002-PARSER-Removed-useless-parsebackquote-flag.diff +++ dash-0.5.3/debian/diff/0002-PARSER-Removed-useless-parsebackquote-flag.diff @@ -0,0 +1,84 @@ +From 503a0b8da8ed299a00ac95fa24d1fc37c3e831d3 Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Wed, 29 Mar 2006 07:35:34 +1100 +Subject: [PATCH] [PARSER] Removed useless parsebackquote flag + +The parsebackquote flag is only used in a test where it always has the +value zero. So we can remove it altogether. +--- + ChangeLog | 4 ++++ + src/parser.c | 8 +------- + 2 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 02b966c..5dd6d40 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++2006-03-29 Herbert Xu ++ ++ * Removed useless parsebackquote flag. ++ + 2006-01-12 Herbert Xu + + * Fixed eval exit status with empty arguments. +diff --git a/src/parser.c b/src/parser.c +index c62a950..375fd54 100644 +--- a/src/parser.c ++++ b/src/parser.c +@@ -76,7 +76,6 @@ struct heredoc { + + + struct heredoc *heredoclist; /* list of here documents to read */ +-int parsebackquote; /* nonzero if we are inside backquotes */ + int doprompt; /* if set, prompt the user */ + int needprompt; /* true if interactive and at start of line */ + int lasttoken; /* last token read */ +@@ -1019,7 +1018,7 @@ quotemark: + endword: + if (syntax == ARISYNTAX) + synerror("Missing '))'"); +- if (syntax != BASESYNTAX && ! parsebackquote && eofmark == NULL) ++ if (syntax != BASESYNTAX && eofmark == NULL) + synerror("Unterminated quoted string"); + if (varnest != 0) { + startlinno = plinno; +@@ -1263,7 +1262,6 @@ badsub: synerror("Bad substitution"); + + parsebackq: { + struct nodelist **nlpp; +- int savepbq; + union node *n; + char *volatile str; + struct jmploc jmploc; +@@ -1274,11 +1272,9 @@ #ifdef __GNUC__ + (void) &saveprompt; + #endif + +- savepbq = parsebackquote; + if (setjmp(jmploc.loc)) { + if (str) + ckfree(str); +- parsebackquote = 0; + handler = savehandler; + longjmp(handler->loc, 1); + } +@@ -1360,7 +1356,6 @@ done: + nlpp = &(*nlpp)->next; + *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); + (*nlpp)->next = NULL; +- parsebackquote = oldstyle; + + if (oldstyle) { + saveprompt = doprompt; +@@ -1396,7 +1391,6 @@ done: + str = NULL; + INTON; + } +- parsebackquote = savepbq; + handler = savehandler; + if (arinest || dblquote) + USTPUTC(CTLBACKQ | CTLQUOTE, out); +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/diff/0003-PARSER-Use-alloca-to-get-rid-of-setjmp.diff +++ dash-0.5.3/debian/diff/0003-PARSER-Use-alloca-to-get-rid-of-setjmp.diff @@ -0,0 +1,106 @@ +From bd35d8ee1cce3e06db6f44fe9772ea3c154bb0ce Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Wed, 29 Mar 2006 07:47:18 +1100 +Subject: [PATCH] [PARSER] Use alloca to get rid of setjmp + +Now that the only thing protected by setjmp/longjmp is the saved string, +we can allocate it on the stack to get rid of the jump. +--- + ChangeLog | 1 + + src/parser.c | 38 +++----------------------------------- + 2 files changed, 4 insertions(+), 35 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 5dd6d40..6295fe9 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,6 +1,7 @@ + 2006-03-29 Herbert Xu + + * Removed useless parsebackquote flag. ++ * Use alloca to get rid of setjmp in parse.c. + + 2006-01-12 Herbert Xu + +diff --git a/src/parser.c b/src/parser.c +index 375fd54..4362f6a 100644 +--- a/src/parser.c ++++ b/src/parser.c +@@ -32,6 +32,7 @@ + * SUCH DAMAGE. + */ + ++#include + #include + + #include "shell.h" +@@ -846,19 +847,6 @@ readtoken1(int firstc, char const *synta + int dqvarnest; /* levels of variables expansion within double quotes */ + int oldstyle; + char const *prevsyntax; /* syntax before arithmetic */ +-#if __GNUC__ +- /* Avoid longjmp clobbering */ +- (void) &out; +- (void) "ef; +- (void) &dblquote; +- (void) &varnest; +- (void) &arinest; +- (void) &parenlevel; +- (void) &dqvarnest; +- (void) &oldstyle; +- (void) &prevsyntax; +- (void) &syntax; +-#endif + + startlinno = plinno; + dblquote = 0; +@@ -1263,31 +1251,16 @@ badsub: synerror("Bad substitution"); + parsebackq: { + struct nodelist **nlpp; + union node *n; +- char *volatile str; +- struct jmploc jmploc; +- struct jmploc *volatile savehandler; ++ char *str; + size_t savelen; + int saveprompt; +-#ifdef __GNUC__ +- (void) &saveprompt; +-#endif + +- if (setjmp(jmploc.loc)) { +- if (str) +- ckfree(str); +- handler = savehandler; +- longjmp(handler->loc, 1); +- } +- INTOFF; + str = NULL; + savelen = out - (char *)stackblock(); + if (savelen > 0) { +- str = ckmalloc(savelen); ++ str = alloca(savelen); + memcpy(str, stackblock(), savelen); + } +- savehandler = handler; +- handler = &jmploc; +- INTON; + if (oldstyle) { + /* We must read until the closing backquote, giving special + treatment to some slashes, and then push the string and +@@ -1386,12 +1359,7 @@ done: + if (str) { + memcpy(out, str, savelen); + STADJUST(savelen, out); +- INTOFF; +- ckfree(str); +- str = NULL; +- INTON; + } +- handler = savehandler; + if (arinest || dblquote) + USTPUTC(CTLBACKQ | CTLQUOTE, out); + else +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/diff/0004-PARSER-Only-use-signed-char-for-syntax-arrays.diff +++ dash-0.5.3/debian/diff/0004-PARSER-Only-use-signed-char-for-syntax-arrays.diff @@ -0,0 +1,491 @@ +From d8014392bc291504997c65b3b44a7f21a60b0e07 Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Sun, 23 Apr 2006 16:01:05 +1000 +Subject: [PATCH] [PARSER] Only use signed char for syntax arrays + +The existing scheme of using the native char for syntax array indicies +makes cross-compiling difficult. Therefore it makes sense to choose +one specific sign for everyone. + +Since signed chars are native to most platforms and i386, it makes more +sense to use that if we are to choose one type for everyone. +--- + ChangeLog | 1 + + src/expand.c | 32 ++++++++-------- + src/input.c | 4 +- + src/input.h | 3 +- + src/jobs.c | 3 +- + src/mksyntax.c | 108 +++++++------------------------------------------------ + src/parser.c | 2 +- + src/parser.h | 20 +++++----- + src/show.c | 4 +- + 9 files changed, 50 insertions(+), 127 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 6295fe9..7e71afc 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -2,6 +2,7 @@ + + * Removed useless parsebackquote flag. + * Use alloca to get rid of setjmp in parse.c. ++ * Only use signed char for syntax arrays. + + 2006-01-12 Herbert Xu + +diff --git a/src/expand.c b/src/expand.c +index dafb51f..cf64921 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -171,7 +171,7 @@ STATIC size_t + esclen(const char *start, const char *p) { + size_t esc = 0; + +- while (p > start && *--p == CTLESC) { ++ while (p > start && *--p == (char)CTLESC) { + esc++; + } + return esc; +@@ -296,7 +296,7 @@ argstr(char *p, int flag) + flag &= ~EXP_TILDE; + tilde: + q = p; +- if (*q == CTLESC && (flag & EXP_QWORD)) ++ if (*q == (char)CTLESC && (flag & EXP_QWORD)) + q++; + if (*q == '~') + p = exptilde(p, q, flag); +@@ -305,7 +305,7 @@ start: + startloc = expdest - (char *)stackblock(); + for (;;) { + length += strcspn(p + length, reject); +- c = p[length]; ++ c = (signed char)p[length]; + if (c && (!(c & 0x80) || c == CTLENDARI)) { + /* c == '=' || c == ':' || c == CTLENDARI */ + length++; +@@ -352,9 +352,9 @@ start: + if ( + !inquotes && + !memcmp(p, dolatstr, DOLATSTRLEN) && +- (p[4] == CTLQUOTEMARK || ( +- p[4] == CTLENDVAR && +- p[5] == CTLQUOTEMARK ++ (p[4] == (char)CTLQUOTEMARK || ( ++ p[4] == (char)CTLENDVAR && ++ p[5] == (char)CTLQUOTEMARK + )) + ) { + p = evalvar(p + 1, flag) + 1; +@@ -394,7 +394,7 @@ breakloop: + STATIC char * + exptilde(char *startp, char *p, int flag) + { +- char c; ++ signed char c; + char *name; + const char *home; + int quotes = flag & QUOTES_ESC; +@@ -503,7 +503,7 @@ expari(int quotes) + do { + int esc; + +- while (*p != CTLARI) { ++ while (*p != (char)CTLARI) { + p--; + #ifdef DEBUG + if (p < start) { +@@ -626,7 +626,7 @@ scanleft( + *loc2 = c; + if (match) + return loc; +- if (quotes && *loc == CTLESC) ++ if (quotes && *loc == (char)CTLESC) + loc++; + loc++; + loc2++; +@@ -860,7 +860,7 @@ end: + if (subtype != VSNORMAL) { /* skip to end of alternative */ + int nesting = 1; + for (;;) { +- if ((c = *p++) == CTLESC) ++ if ((c = (signed char)*p++) == CTLESC) + p++; + else if (c == CTLBACKQ || c == (CTLBACKQ|CTLQUOTE)) { + if (varlen >= 0) +@@ -892,7 +892,7 @@ memtodest(const char *p, size_t len, con + q = makestrspace(len * 2, expdest); + + do { +- int c = (unsigned char)*p++; ++ int c = (signed char)*p++; + if (c) { + if ((quotes & QUOTES_ESC) && + (syntax[c] == CCTL || syntax[c] == CBACK)) +@@ -1078,7 +1078,7 @@ ifsbreakup(char *string, struct arglist + ifsspc = 0; + while (p < string + ifsp->endoff) { + q = p; +- if (*p == CTLESC) ++ if (*p == (char)CTLESC) + p++; + if (strchr(ifs, *p)) { + if (!nulonly) +@@ -1101,7 +1101,7 @@ ifsbreakup(char *string, struct arglist + break; + } + q = p; +- if (*p == CTLESC) ++ if (*p == (char)CTLESC) + p++; + if (strchr(ifs, *p) == NULL ) { + p = q; +@@ -1658,7 +1658,7 @@ _rmescapes(char *str, int flag) + globbing = flag & RMESCAPE_GLOB; + notescaped = globbing; + while (*p) { +- if (*p == CTLQUOTEMARK) { ++ if (*p == (char)CTLQUOTEMARK) { + inquotes = ~inquotes; + p++; + notescaped = globbing; +@@ -1669,7 +1669,7 @@ _rmescapes(char *str, int flag) + notescaped = 0; + goto copy; + } +- if (*p == CTLESC) { ++ if (*p == (char)CTLESC) { + p++; + if (notescaped && inquotes && *p != '/') { + *q++ = '\\'; +@@ -1734,7 +1734,7 @@ varunset(const char *end, const char *va + tail = nullstr; + msg = "parameter not set"; + if (umsg) { +- if (*end == CTLENDVAR) { ++ if (*end == (char)CTLENDVAR) { + if (varflags & VSNUL) + tail = " or null"; + } else +diff --git a/src/input.c b/src/input.c +index 639c023..057da71 100644 +--- a/src/input.c ++++ b/src/input.c +@@ -263,7 +263,7 @@ #endif + } + popstring(); + if (--parsenleft >= 0) +- return (*parsenextc++); ++ return (signed char)*parsenextc++; + } + if (unlikely(parsenleft == EOF_NLEFT || parsefile->buf == NULL)) + return PEOF; +@@ -346,7 +346,7 @@ #endif + + *q = savec; + +- return *parsenextc++; ++ return (signed char)*parsenextc++; + } + + /* +diff --git a/src/input.h b/src/input.h +index 7675653..1ed9ddf 100644 +--- a/src/input.h ++++ b/src/input.h +@@ -64,4 +64,5 @@ void popfile(void); + void popallfiles(void); + void closescript(void); + +-#define pgetc_macro() (--parsenleft >= 0? *parsenextc++ : preadbuffer()) ++#define pgetc_macro() \ ++ (--parsenleft >= 0 ? (signed char)*parsenextc++ : preadbuffer()) +diff --git a/src/jobs.c b/src/jobs.c +index 0113354..9e28adb 100644 +--- a/src/jobs.c ++++ b/src/jobs.c +@@ -1357,8 +1357,9 @@ STATIC void + cmdputs(const char *s) + { + const char *p, *str; +- char c, cc[2] = " "; ++ char cc[2] = " "; + char *nextc; ++ signed char c; + int subtype = 0; + int quoted = 0; + static const char vstype[VSTYPE + 1][4] = { +diff --git a/src/mksyntax.c b/src/mksyntax.c +index 5e65bdd..7a8a9ae 100644 +--- a/src/mksyntax.c ++++ b/src/mksyntax.c +@@ -92,34 +92,20 @@ static char writer[] = "\ + static FILE *cfile; + static FILE *hfile; + static char *syntax[513]; +-static int base; +-static int size; /* number of values which a char variable can have */ +-static int nbits; /* number of bits in a character */ +-static int digit_contig;/* true if digits are contiguous */ + + static void filltable(char *); + static void init(void); + static void add(char *, char *); + static void print(char *); +-static void output_type_macros(int); +-static void digit_convert(void); ++static void output_type_macros(void); + int main(int, char **); + + int + main(int argc, char **argv) + { +-#ifdef TARGET_CHAR +- TARGET_CHAR c; +- TARGET_CHAR d; +-#else +- char c; +- char d; +-#endif +- int sign; + int i; + char buf[80]; + int pos; +- static char digit[] = "0123456789"; + + /* Create output files */ + if ((cfile = fopen("syntax.c", "w")) == NULL) { +@@ -133,32 +119,6 @@ #endif + fputs(writer, hfile); + fputs(writer, cfile); + +- /* Determine the characteristics of chars. */ +- c = -1; +- if (c <= 0) +- sign = 1; +- else +- sign = 0; +- for (nbits = 1 ; ; nbits++) { +- d = (1 << nbits) - 1; +- if (d == c) +- break; +- } +- printf("%s %d bit chars\n", sign? "signed" : "unsigned", nbits); +- if (nbits > 9) { +- fputs("Characters can't have more than 9 bits\n", stderr); +- exit(2); +- } +- size = (1 << nbits) + 1; +- base = 2; +- if (sign) +- base += 1 << (nbits - 1); +- digit_contig = 1; +- for (i = 0 ; i < 10 ; i++) { +- if (digit[i] != '0' + i) +- digit_contig = 0; +- } +- + fputs("#include \n", hfile); + fputs("\n", hfile); + fputs("#ifdef CEOF\n", hfile); +@@ -185,16 +145,16 @@ #endif + fprintf(hfile, "/* %s */\n", is_entry[i].comment); + } + putc('\n', hfile); +- fprintf(hfile, "#define SYNBASE %d\n", base); +- fprintf(hfile, "#define PEOF %d\n\n", -base); +- fprintf(hfile, "#define PEOA %d\n\n", -base + 1); ++ fprintf(hfile, "#define SYNBASE %d\n", 130); ++ fprintf(hfile, "#define PEOF %d\n\n", -130); ++ fprintf(hfile, "#define PEOA %d\n\n", -129); + putc('\n', hfile); + fputs("#define BASESYNTAX (basesyntax + SYNBASE)\n", hfile); + fputs("#define DQSYNTAX (dqsyntax + SYNBASE)\n", hfile); + fputs("#define SQSYNTAX (sqsyntax + SYNBASE)\n", hfile); + fputs("#define ARISYNTAX (arisyntax + SYNBASE)\n", hfile); + putc('\n', hfile); +- output_type_macros(sign); /* is_digit, etc. */ ++ output_type_macros(); /* is_digit, etc. */ + putc('\n', hfile); + + /* Generate the syntax tables. */ +@@ -248,8 +208,6 @@ #endif + add("_", "ISUNDER"); + add("#?$!-*@", "ISSPECL"); + print("is_type"); +- if (! digit_contig) +- digit_convert(); + exit(0); + /* NOTREACHED */ + } +@@ -265,7 +223,7 @@ filltable(char *dftval) + { + int i; + +- for (i = 0 ; i < size ; i++) ++ for (i = 0 ; i < 257; i++) + syntax[i] = dftval; + } + +@@ -283,11 +241,7 @@ init(void) + syntax[0] = "CEOF"; + syntax[1] = "CIGN"; + for (ctl = CTL_FIRST; ctl <= CTL_LAST; ctl++ ) +-#ifdef TARGET_CHAR +- syntax[base + (TARGET_CHAR)ctl ] = "CCTL"; +-#else +- syntax[base + ctl] = "CCTL"; +-#endif /* TARGET_CHAR */ ++ syntax[130 + ctl] = "CCTL"; + } + + +@@ -299,7 +253,7 @@ static void + add(char *p, char *type) + { + while (*p) +- syntax[*p++ + base] = type; ++ syntax[(signed char)*p++ + 130] = type; + } + + +@@ -315,9 +269,9 @@ print(char *name) + int col; + + fprintf(hfile, "extern const char %s[];\n", name); +- fprintf(cfile, "const char %s[%d] = {\n", name, size); ++ fprintf(cfile, "const char %s[%d] = {\n", name, 257); + col = 0; +- for (i = 0 ; i < size ; i++) { ++ for (i = 0 ; i < 257; i++) { + if (i == 0) { + fputs(" ", cfile); + } else if ((i & 03) == 0) { +@@ -342,7 +296,7 @@ print(char *name) + */ + + static char *macro[] = { +- "#define is_digit(c)\t((is_type+SYNBASE)[(signed char)(c)] & ISDIGIT)\n", ++ "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)\n", + "#define is_alpha(c)\tisalpha((unsigned char)(c))\n", + "#define is_name(c)\t((c) == '_' || isalpha((unsigned char)(c)))\n", + "#define is_in_name(c)\t((c) == '_' || isalnum((unsigned char)(c)))\n", +@@ -351,45 +305,11 @@ static char *macro[] = { + }; + + static void +-output_type_macros(int sign) ++output_type_macros(void) + { + char **pp; + +- if (digit_contig) +- macro[0] = "#define is_digit(c)\t((unsigned)((c) - '0') <= 9)\n"; + for (pp = macro ; *pp ; pp++) +- fprintf(hfile, *pp, sign ? "char" : "unsigned char"); +- if (digit_contig) +- fputs("#define digit_val(c)\t((c) - '0')\n", hfile); +- else +- fputs("#define digit_val(c)\t(digit_value[(unsigned char)(c)])\n", hfile); +-} +- +- +- +-/* +- * Output digit conversion table (if digits are not contiguous). +- */ +- +-static void +-digit_convert(void) +-{ +- int maxdigit; +- static char digit[] = "0123456789"; +- char *p; +- int i; +- +- maxdigit = 0; +- for (p = digit ; *p ; p++) +- if (*p > maxdigit) +- maxdigit = *p; +- fputs("extern const char digit_value[];\n", hfile); +- fputs("\n\nconst char digit_value[] = {\n", cfile); +- for (i = 0 ; i <= maxdigit ; i++) { +- for (p = digit ; *p && *p != i ; p++); +- if (*p == '\0') +- p = digit; +- fprintf(cfile, " %ld,\n", (long)(p - digit)); +- } +- fputs("};\n", cfile); ++ fputs(*pp, hfile); ++ fputs("#define digit_val(c)\t((c) - '0')\n", hfile); + } +diff --git a/src/parser.c b/src/parser.c +index 4362f6a..deea702 100644 +--- a/src/parser.c ++++ b/src/parser.c +@@ -1414,7 +1414,7 @@ STATIC int + noexpand(char *text) + { + char *p; +- char c; ++ signed char c; + + p = text; + while ((c = *p++) != '\0') { +diff --git a/src/parser.h b/src/parser.h +index fa58ed7..d0cf440 100644 +--- a/src/parser.h ++++ b/src/parser.h +@@ -35,17 +35,17 @@ + */ + + /* control characters in argument strings */ +-#define CTL_FIRST '\201' /* first 'special' character */ +-#define CTLESC '\201' /* escape next character */ +-#define CTLVAR '\202' /* variable defn */ +-#define CTLENDVAR '\203' +-#define CTLBACKQ '\204' ++#define CTL_FIRST -127 /* first 'special' character */ ++#define CTLESC -127 /* escape next character */ ++#define CTLVAR -126 /* variable defn */ ++#define CTLENDVAR -125 ++#define CTLBACKQ -124 + #define CTLQUOTE 01 /* ored with CTLBACKQ code if in quotes */ +-/* CTLBACKQ | CTLQUOTE == '\205' */ +-#define CTLARI '\206' /* arithmetic expression */ +-#define CTLENDARI '\207' +-#define CTLQUOTEMARK '\210' +-#define CTL_LAST '\210' /* last 'special' character */ ++/* CTLBACKQ | CTLQUOTE == 133 */ ++#define CTLARI -122 /* arithmetic expression */ ++#define CTLENDARI -121 ++#define CTLQUOTEMARK -120 ++#define CTL_LAST -120 /* last 'special' character */ + + /* variable substitution byte (follows CTLVAR) */ + #define VSTYPE 0x0f /* type of variable substitution */ +diff --git a/src/show.c b/src/show.c +index 05af328..1b58de1 100644 +--- a/src/show.c ++++ b/src/show.c +@@ -165,7 +165,7 @@ sharg(union node *arg, FILE *fp) + } + bqlist = arg->narg.backquote; + for (p = arg->narg.text ; *p ; p++) { +- switch (*p) { ++ switch ((signed char)*p) { + case CTLESC: + putc(*++p, fp); + break; +@@ -306,7 +306,7 @@ trstring(char *s) + return; + putc('"', tracefile); + for (p = s ; *p ; p++) { +- switch (*p) { ++ switch ((signed char)*p) { + case '\n': c = 'n'; goto backslash; + case '\t': c = 't'; goto backslash; + case '\r': c = 'r'; goto backslash; +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/diff/0005-BUILD-Added-with-libedit-option-to-configure.diff +++ dash-0.5.3/debian/diff/0005-BUILD-Added-with-libedit-option-to-configure.diff @@ -0,0 +1,64 @@ +From 13537aaa484b1f3ea914c0dc4f71070602003880 Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov +Date: Tue, 23 May 2006 20:52:23 +1000 +Subject: [PATCH] [BUILD] Added --with-libedit option to configure + +Add to the configure.ac new option: +--with-libedit - Compile with libedit support. +--- + ChangeLog | 4 ++++ + configure.ac | 13 +++++++++++++ + src/Makefile.am | 2 +- + 3 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 7e71afc..9970489 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++2006-05-23 Alexey Gladkov ++ ++ * Added --with-libedit option to configure. ++ + 2006-03-29 Herbert Xu + + * Removed useless parsebackquote flag. +diff --git a/configure.ac b/configure.ac +index 9bd021b..01cac17 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,5 +42,18 @@ AC_CHECK_FUNC(stat64,, [ + AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit]) + ]) + ++AC_ARG_WITH(libedit, AS_HELP_STRING(--with-libedit, [Compile with libedit support])) ++use_libedit= ++if test "$with_libedit" = "yes"; then ++ AC_CHECK_LIB(edit, history_init, [ ++ AC_CHECK_HEADER([histedit.h], [use_libedit="yes"], ++ AC_MSG_ERROR( ++ [Can't find required header files.]))]) ++fi ++if test "$use_libedit" != "yes"; then ++ AC_DEFINE([SMALL], 1, [Define if you build with -DSMALL]) ++else ++ export LIBS="$LIBS -ledit" ++fi + AC_CONFIG_FILES([Makefile src/Makefile]) + AC_OUTPUT +diff --git a/src/Makefile.am b/src/Makefile.am +index 0fe4db1..37d6d3c 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -3,7 +3,7 @@ AM_YFLAGS = -d + COMMON_CFLAGS = -Wall + COMMON_CPPFLAGS = \ + -include $(top_builddir)/config.h \ +- -DBSD=1 -DSMALL -DSHELL \ ++ -DBSD=1 -DSHELL \ + -DGLOB_BROKEN -DFNMATCH_BROKEN -DIFS_BROKEN + + AM_CFLAGS = $(COMMON_CFLAGS) +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/diff/0006-EXPAND-Fixed-inverted-char-class-matching.diff +++ dash-0.5.3/debian/diff/0006-EXPAND-Fixed-inverted-char-class-matching.diff @@ -0,0 +1,30 @@ +From 1adfb341436bdde325d89e01a0b96ebc13d5856b Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Wed, 4 Oct 2006 17:44:31 +1000 +Subject: [PATCH] [EXPAND] Fixed inverted char class matching + +The return value of ccmatch was being treated as 0 or 1 but +it's actually zero or non-zero. This broke inverted character +class matching. + +Reported by Alexander Skwar. +--- + src/expand.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/expand.c b/src/expand.c +index cf64921..db67c7c 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -1581,7 +1581,7 @@ pmatch(const char *pattern, const char * + if (c == '[') { + const char *r; + +- found |= ccmatch(p, chr, &r); ++ found |= !!ccmatch(p, chr, &r); + if (r) { + p = r; + continue; +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/diff/0007-SYSTEM-Check-return-code-for-getgroups-and-fwrite.diff +++ dash-0.5.3/debian/diff/0007-SYSTEM-Check-return-code-for-getgroups-and-fwrite.diff @@ -0,0 +1,66 @@ +From 1a33ea8ff7736fc63f0c7be2c3a8b488e572694d Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov +Date: Fri, 13 Oct 2006 22:58:46 +1000 +Subject: [PATCH] [SYSTEM] Check return code for getgroups and fwrite + +Check getgroups() and fwrite() return code, required to build with +-D_FORTIFY_SOURCE=2. +--- + ChangeLog | 8 ++++++++ + src/bltin/test.c | 3 ++- + src/mkinit.c | 9 ++++++--- + 3 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 9970489..a4db7de 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,11 @@ ++2006-10-13 Alexey Gladkov ++ ++ * Check return code for getgroups and fwrite. ++ ++2006-10-04 Herbert Xu ++ ++ * Fixed inverted char class matching. ++ + 2006-05-23 Alexey Gladkov + + * Added --with-libedit option to configure. +diff --git a/src/bltin/test.c b/src/bltin/test.c +index 9b09094..f16c819 100644 +--- a/src/bltin/test.c ++++ b/src/bltin/test.c +@@ -489,7 +489,8 @@ bash_group_member(gid_t gid) + + ngroups = getgroups(0, NULL); + group_array = stalloc(ngroups * sizeof(gid_t)); +- getgroups(ngroups, group_array); ++ if ((getgroups(ngroups, group_array)) != ngroups) ++ return (0); + + /* Search through the list looking for GID. */ + for (i = 0; i < ngroups; i++) +diff --git a/src/mkinit.c b/src/mkinit.c +index e803751..9714bee 100644 +--- a/src/mkinit.c ++++ b/src/mkinit.c +@@ -427,9 +427,12 @@ writetext(struct text *text, FILE *fp) + struct block *bp; + + if (text->start != NULL) { +- for (bp = text->start ; bp != text->last ; bp = bp->next) +- fwrite(bp->text, sizeof (char), BLOCKSIZE, fp); +- fwrite(bp->text, sizeof (char), BLOCKSIZE - text->nleft, fp); ++ for (bp = text->start ; bp != text->last ; bp = bp->next) { ++ if ((fwrite(bp->text, sizeof (char), BLOCKSIZE, fp)) != BLOCKSIZE) ++ error("Can't write data\n"); ++ } ++ if ((fwrite(bp->text, sizeof (char), BLOCKSIZE - text->nleft, fp)) != (BLOCKSIZE - text->nleft)) ++ error("Can't write data\n"); + } + } + +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/diff/0008-BUILTIN-Fixed-command-v-segmentation-fault.diff +++ dash-0.5.3/debian/diff/0008-BUILTIN-Fixed-command-v-segmentation-fault.diff @@ -0,0 +1,61 @@ +From 7035bdb3cfd26abe25c09b6845e2ea691ad82ccc Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Sun, 22 Oct 2006 19:55:00 +1000 +Subject: [PATCH] [BUILTIN] Fixed command -v segmentation fault + +On Sat, Oct 21, 2006 at 02:19:18PM +0000, Gerrit Pape wrote: +> Hi Herbert, please see +> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=387458 +> +> On Thu, Sep 14, 2006 at 03:50:02PM +0200, Julien Danjou wrote: +> > I just found this bug which is easily reproductible: +> > +> > % dash -c 'command -v' +> > zsh: segmentation fault dash -c 'command -v' + +Since bash's behaviour is minimalist here, I've decided to adopt its +behaviour here as well which is to return success silently. +--- + ChangeLog | 4 ++++ + src/exec.c | 6 ++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index a4db7de..ecaff93 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++2006-10-22 Gerrit Pape ++ ++ * Fixed command -v segmentation fault. ++ + 2006-10-13 Alexey Gladkov + + * Check return code for getgroups and fwrite. +diff --git a/src/exec.c b/src/exec.c +index 417ba8a..c55683d 100644 +--- a/src/exec.c ++++ b/src/exec.c +@@ -846,6 +846,7 @@ commandcmd(argc, argv) + int argc; + char **argv; + { ++ char *cmd; + int c; + enum { + VERIFY_BRIEF = 1, +@@ -862,8 +863,9 @@ #ifdef DEBUG + abort(); + #endif + +- if (verify) +- return describe_command(out1, *argptr, verify - VERIFY_BRIEF); ++ cmd = *argptr; ++ if (verify && cmd) ++ return describe_command(out1, cmd, verify - VERIFY_BRIEF); + + return 0; + } +-- +1.4.3.1 + --- dash-0.5.3.orig/debian/po/POTFILES.in +++ dash-0.5.3/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] dash.templates.in --- dash-0.5.3.orig/debian/po/cs.po +++ dash-0.5.3/debian/po/cs.po @@ -0,0 +1,35 @@ +# Czech translation of dash templates +# +msgid "" +msgstr "" +"Project-Id-Version: dash\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2007-01-29 08:45+0100\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Nainstalovat dash jako /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"V Debianu je jako výchozí /bin/sh nastaven bash. Protože však naše politika " +"vyžaduje, aby byly všechny shellové skripty využívající /bin/sh kompatibilní " +"s POSIXem, můžete jako /bin/sh použít jakýkoliv shell splňující normu POSIX. " +"Protože dash tuto normu splňuje, může být použit jako /bin/sh, což stojí za " +"vyzkoušení, protože dash je rychlejší a menší než bash." --- dash-0.5.3.orig/debian/po/da.po +++ dash-0.5.3/debian/po/da.po @@ -0,0 +1,38 @@ +# translation of dash_0.4.21_templates.po to Danish +# +# Claus Hindsgaul , 2004. +# Claus Hindsgaul , 2006. +msgid "" +msgstr "" +"Project-Id-Version: dash_0.4.21_templates\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2006-11-15 15:01+0100\n" +"Last-Translator: Claus Hindsgaul \n" +"Language-Team: Danish\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Installér dash som /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Bash er som udgangspunkt /bin/sh på et Debiansystem. Men da det er Debians " +"politik, at skalskripter, der benytter /bin/sh skal overholde POSIX-" +"standarden, vil enhver skal, der overholder POSIX kunne fungere som /bin/sh. " +"Siden dash er overholder POSIX, kan den benyttes som /bin/sh. Det kan være " +"en fordel at gøre dette, fordi dash er hurtigere og mindre end bash." --- dash-0.5.3.orig/debian/po/de.po +++ dash-0.5.3/debian/po/de.po @@ -0,0 +1,47 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: dash \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2006-11-09 21:26+0100\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Dash als /bin/sh installieren?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Bash ist die Standard-Shell (/bin/sh) auf einem Debian-System. Da die Debian-" +"Richtlinien allerdings von allen Shellskripten, die /bin/sh benutzen, POSIX-" +"Kompatibilitt verlangt, kann fr /bin/sh jede POSIX-kompatible Shell " +"benutzt werden. Da Dash POSIX-kompatibel ist, kann sie daher als /bin/sh " +"verwendet werden. Eventuell wollen Sie Dash verwenden, da Dash schneller und " +"kleiner als Bash ist." --- dash-0.5.3.orig/debian/po/es.po +++ dash-0.5.3/debian/po/es.po @@ -0,0 +1,35 @@ +# +msgid "" +msgstr "" +"Project-Id-Version: dash 0.4.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2006-12-08 23:49+0100\n" +"Last-Translator: Fernando Cerezal Lpez \n" +"Language-Team: Debian L10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Instalar dash como /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Bash es el intrprete de rdenes /bin/sh predeterminado de los sistemas " +"Debian. Sin embargo, dado que nuestras normas obligan a que todos los " +"scripts para el intrprete de rdenes se atengan a las normas POSIX, " +"cualquier intrprete compatible con POSIX puede servir como /bin/sh. Puesto " +"que dash lo es, puede usarse como /bin/sh, con la ventaja de ser ms rpido " +"y pequeo que bash." --- dash-0.5.3.orig/debian/po/fr.po +++ dash-0.5.3/debian/po/fr.po @@ -0,0 +1,48 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Denis Barbier , 2003-2006 +msgid "" +msgstr "" +"Project-Id-Version: dash 0.4.17\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2006-10-27 09:40+0200\n" +"Last-Translator: Cyril Brulebois \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Faut-il mettre en place un lien de /bin/sh vers dash?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Sur un systme Debian, /bin/sh est, par dfaut, un lien vers bash. " +"Cependant, comme la charte Debian impose que tous les scripts utilisant /bin/" +"sh soient conformes la norme POSIX, /bin/sh peut tre n'importe quel " +"interprteur de commandes (shell) conforme cette norme. Puisque dash " +"l'est, il peut tre utilis en tant que /bin/sh. La taille rduite et la " +"rapidit de dash sont deux bonnes raisons pour choisir cette option." --- dash-0.5.3.orig/debian/po/gl.po +++ dash-0.5.3/debian/po/gl.po @@ -0,0 +1,37 @@ +# Galician translation of dash's debconf templates +# This file is distributed under the same license as the dash package. +# Jacobo Tarrio , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: dash\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2007-01-22 15:37+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "¿Instalar dash coma /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Bash é o /bin/sh por defecto nos sistemas Debian. Nembargantes, como a " +"normativa de Debian require que tódolos scripts que empreguen /bin/sh sexan " +"compatibles con POSIX, calquera shell que siga POSIX pode servir coma /bin/" +"sh. Xa que dash cumpre con POSIX, pódese empregar coma /bin/sh. Pode ser " +"unha boa idea facelo, xa que dash é máis rápido e máis pequeno que bash." --- dash-0.5.3.orig/debian/po/it.po +++ dash-0.5.3/debian/po/it.po @@ -0,0 +1,38 @@ +# dash -- Italian debconf messages +# This file is distributed under the same license as the dash package. +# Andrea Bolognani , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: dash 0.5.3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2006-03-01 14:28+0200\n" +"Last-Translator: Andrea Bolognani \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Installare dash come /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +#, fuzzy +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Bash la shell di default in un sistema Debian. Tuttavia, dal momento che " +"la nostra policy richiede che gli script della shell che usano /bin/sh siano " +"conformi a POSIX, ogni shell che sia conforme a POSIX pu essere usata come /" +"bin/sh. Siccome dash conforme a POSIX, pu essere usata come /bin/sh. " +"Potresti volerla usare perch pi piccola e veloce di bash." --- dash-0.5.3.orig/debian/po/ja.po +++ dash-0.5.3/debian/po/ja.po @@ -0,0 +1,47 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: dash\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2004-04-30 21:51+1000\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "dash /bin/sh Ȥƥ󥹥ȡ뤷ޤ?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +#, fuzzy +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Debian ƥǤ bash ǥեȤ /bin/sh ǤDebian Υݥ" +"ˤäơ/bin/sh ѤƤΥ륹ץȤ POSIX ǤʤФ" +"ʤᡢPOSIX ϤɤǤ /bin/sh Ȥʤ뤳ȤǤޤ" +"dash POSIX ǤΤǡ/bin/sh ȤƻȤ ȤǤޤdash bash " +"®ƾΤǡȻפ ⤷ޤ" --- dash-0.5.3.orig/debian/po/nl.po +++ dash-0.5.3/debian/po/nl.po @@ -0,0 +1,47 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: dash 0.4.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2007-01-29 22:12+0100\n" +"Last-Translator: Tim Dijkstra \n" +"Language-Team: Debian Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "dash als /bin/sh installeren?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Bash is de standaard /bin/sh op een Debian-systeem. Debian-beleid eist " +"echter dat alle shell-scripts die /bin/sh gebruiken moeten voldoen aan de " +"POSIX-standaard, dus elke shell die zich conformeert aan POSIX kan dienst " +"doen als /bin/sh. Omdat dash zich conformeert aan POSIX, kan het dus " +"gebruikt worden als /bin/sh. Een reden om dat inderdaad te doen is dat dash " +"sneller en kleiner is dan bash." --- dash-0.5.3.orig/debian/po/pt.po +++ dash-0.5.3/debian/po/pt.po @@ -0,0 +1,47 @@ +# translation of dash_0.4.18_pt.po to Portuguese +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Bruno Rodrigues , 2003-2007. +# +msgid "" +msgstr "" +"Project-Id-Version: dash_0.4.18_pt\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2007-01-29 13:21+0100\n" +"Last-Translator: Bruno Rodrigues \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.0.2\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Instalar dash como /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"A Bash é a shell por omissão nos sistemas Debian. Porém, como as regras da " +"Debian obrigam a que todos os scripts que usem a /bin/sh sejam compatíveis " +"POSIX, quaisquer shells que sejam conforme as normas POSIX podem ser usadas " +"como substituto da /bin/sh, o que é o caso da Dash. Visto que a Dash é mais " +"rápida e consome menos recursos que a Bash, poderá optar por usar a Dash." \ No newline at end of file --- dash-0.5.3.orig/debian/po/pt_BR.po +++ dash-0.5.3/debian/po/pt_BR.po @@ -0,0 +1,47 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: dash\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2006-12-19 21:23-0200\n" +"Last-Translator: André Luís Lopes \n" +"Language-Team: Debian-BR Project \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Instalar dash como /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"O bash é o /bin/sh padrão em um sistema Debian. Porém, uma vez que nossa " +"política requer que todos os scripts shell usando /bin/sh sejam compatíveis " +"com o padrão POSIX, qualquer shell que esteja em conformidade com o padrão " +"POSIX pode servir como /bin/sh. Uma vez que o dash é compatível com o padrão " +"POSIX, o mesmo pode ser usado como /bin/sh. Você pode desejar usar o dash " +"devido ao mesmo ser mais rápido e menor que o bash." --- dash-0.5.3.orig/debian/po/ru.po +++ dash-0.5.3/debian/po/ru.po @@ -0,0 +1,51 @@ +# translation of dash_0.5.3-6.1_debconf_ru.po to Russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Ilgiz Kalmetev , 2003. +# Yuri Kozlov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: 0.5.3-6.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2007-01-29 21:38+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Настроить символическую ссылку /bin/sh на dash?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"В системе Debian по умолчанию символическая ссылка /bin/sh указывает на " +"bash. Однако, так как политика Debian требует, чтобы все сценарии оболочки, " +"использующие /bin/sh, были совместимы с POSIX, то /bin/sh может указывать " +"на любую оболочку, совместимую с POSIX. Так как dash совместим с POSIX, то " +"/bin/sh может указывать на него. Если сравнивать c bash, то основными " +"преимуществами dash являются скорость и размер." + --- dash-0.5.3.orig/debian/po/sv.po +++ dash-0.5.3/debian/po/sv.po @@ -0,0 +1,46 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: dash 0.5.2-7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2005-09-27 15:43-0700\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Installera dash som /bin/sh?" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +#, fuzzy +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" +"Bash r standard fr /bin/sh p ett Debian-system. Eftersom vr policy " +"krver att alla script som anvnder /bin/sh mste vara POSIX-kompatibla, kan " +"vilket POSIX-kompatibelt skal som helst vara /bin/sh. D dash r POSIX-" +"kompatibelt kan det anvndas som /bin/sh. Du kanske nskar detta eftersom " +"dash r snabbare och mindre n bash." --- dash-0.5.3.orig/debian/po/templates.pot +++ dash-0.5.3/debian/po/templates.pot @@ -0,0 +1,42 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "" + +#. Type: boolean +#. Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "" --- dash-0.5.3.orig/debian/po/vi.po +++ dash-0.5.3/debian/po/vi.po @@ -0,0 +1,33 @@ +# Vietnamese translation for dash. +# Copyright © 2007 Free Software Foundation, Inc. +# Clytie Siddall , 2005-7. +# +msgid "" +"" +msgstr "Project-Id-Version: dash 0.5.2-5\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-29 07:27+0100\n" +"PO-Revision-Date: 2007-01-30 18:27+1030\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#.Type: boolean +#.Description +#: ../dash.templates.in:1001 +msgid "Install dash as /bin/sh?" +msgstr "Cài đặt trình dash chạy « /bin/sh » không?" + +#.Type: boolean +#.Description +#: ../dash.templates.in:1001 +msgid "" +"Bash is the default /bin/sh on a Debian system. However, since the Debian " +"policy requires all shell scripts using /bin/sh to be POSIX compliant, any " +"shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX " +"compliant, it can be used as /bin/sh. You may wish to do this because dash " +"is faster and smaller than bash." +msgstr "Trình bash là trình bao (« /bin/sh ») mặc định trong hệ thống Debian. Tuy nhiên, vì chính sách Debian cần thiết mọi văn lệnh trình bao có dùng « /bin/sh » chỉ tuân theo POSIX, bất cứ trình bao nào cũng tuân theo POSIX có thể chạy « /bin/sh ». Vì trình dash có phải tuân theo POSIX, bạn có thể sử dụng nó là « /bin/sh ». Bạn có lẽ sẽ muốn làm như thế vì trình dash chạy nhanh hơn, là chương trình nhỏ hơn trình bash." --- dash-0.5.3.orig/debian/README.Debian.diet +++ dash-0.5.3/debian/README.Debian.diet @@ -0,0 +1,15 @@ +Building with the diet libc +--------------------------- + +This package optionally can be built with the diet libc instead of the +glibc to provide small statically linked programs. The resulting package +has no dependency on any other package. + +To use the diet libc, make sure the latest versions of the dietlibc-dev +package is installed, and set DEB_BUILD_OPTIONS=diet in the environment +when building the package, e.g.: + + # apt-get install dietlibc-dev + $ DEB_BUILD_OPTIONS=diet fakeroot apt-get source -b dash + + -- Gerrit Pape , Wed, 23 Jun 2004 05:11:20 +0000 --- dash-0.5.3.orig/debian/ash.postinst +++ dash-0.5.3/debian/ash.postinst @@ -0,0 +1,52 @@ +#!/bin/sh +# +# post-install script for the Debian GNU/Linux ash package +# +# $Id: ash.postinst,v 1.9 2002/10/26 11:27:48 herbert Exp $ + +set -e + +check_divert() { + div=$(dpkg-divert --list $1) + distrib=${3:-$1.distrib} + case $div in + '' | *by\ dash) + ;; + *by\ ash) + dst=${div% by ash} + dst=${dst##* to } + + # Work around dpkg-divert bug. + if [ -e "$dst" ]; then + mv "$dst" "$dst.ash-tmp" + fi + dpkg-divert --remove $1 + if [ -e "$dst.ash-tmp" ]; then + mv "$dst.ash-tmp" "$dst" + fi + + dpkg-divert --package dash --divert $distrib --add $1 + if [ "$dst" != $distrib ] && [ -e "$dst" ]; then + mv "$dst" $distrib + fi + ln -sf $2 $1 + ;; + *) + d=${1%/*} + if + [ -h $1 ] && [ -f $1 ] && [ -f $d/$4 ] && + cmp $1 $d/$4 + then + ln -sf $2 $1 + fi + ;; + esac +} + +dcv='dpkg --compare-versions' + +if [ "$1" = configure ] && [ -n "$2" ] && $dcv "$2" lt 0.4.3; then + check_divert /bin/sh dash '' ash + check_divert /usr/share/man/man1/sh.1.gz dash.1.gz \ + /usr/share/man/man1/sh.distrib.1.gz ash.1.gz +fi --- dash-0.5.3.orig/debian/ash.postrm +++ dash-0.5.3/debian/ash.postrm @@ -0,0 +1,9 @@ +#!/bin/sh +# $Id: ash.postrm,v 1.1 2003/11/21 08:47:16 herbert Exp $ + +set -e + +if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge +fi --- dash-0.5.3.orig/debian/changelog +++ dash-0.5.3/debian/changelog @@ -0,0 +1,1250 @@ +dash (0.5.3-7) unstable; urgency=medium + + * Debconf translation updates (thx Christian Perrier for the patch): + - Czech updated (thx Miroslav Kure; closes: #407828). + - Galician added (thx Jacobo Tarrio; closes: #407952). + - Portuguese updated + - Russian updated + - Galician updated + - Dutch updated + - Vietnamese updated + - Swedish updated + * run debconf-updatepo to update PO files about debconf templates. + + -- Gerrit Pape Fri, 2 Feb 2007 07:03:36 +0000 + +dash (0.5.3-6) unstable; urgency=medium + + * debian/po/es: [INTL:es] Spanish po-debconf translation (thx Fernando + Cerezal; closes: #402981). + * debian/po/pt_BR: [INTL:pt_BR] updating the Brazilian Portuguese + translation (thx Andre Luis Lopes; closes: #403831). + + -- Gerrit Pape Sun, 31 Dec 2006 12:24:03 +0000 + +dash (0.5.3-5) unstable; urgency=low + + * debian/po/da.po: [INTL:da] Updated Danish debconf translation (thx Claus + Hindsgaul; closes: #398779). + * debian/po/de.po: [INTL:de] Update German debconf translation (thx Helge + Kreutzmann; closes: #397825). + * debian/po/fr.po: French debconf templates translation update (thx Cyril + Brulebois; closes: #397013). + + -- Gerrit Pape Tue, 21 Nov 2006 13:48:33 +0000 + +dash (0.5.3-4) unstable; urgency=low + + * debian/diff/0001-EVAL-Make-eval-with-empty-arguments-return-0.diff: new + from upstream git; replaces debian/diff/eval-exit-status.diff. + * debian/diff/0004-PARSER-Only-use-signed-char-for-syntax-arrays.diff: new + from upstream git; replaces debian/diff/dash-signed-char-syntax.diff. + * 0002-PARSER-Removed-useless-parsebackquote-flag.diff, + 0003-PARSER-Use-alloca-to-get-rid-of-setjmp.diff, + 0005-BUILD-Added-with-libedit-option-to-configure.diff, + 0006-EXPAND-Fixed-inverted-char-class-matching.diff, + 0007-SYSTEM-Check-return-code-for-getgroups-and-fwrite.diff, + 0008-BUILTIN-Fixed-command-v-segmentation-fault.diff (closes: #387458): + new from upstream git. + * debian/dash.templates.in: fix glitch in debconf message (thx Christian + Perrier, closes: #366099), + * debian/control: Standards-Version: 3.7.2.2. + + -- Gerrit Pape Mon, 23 Oct 2006 20:38:54 +0000 + +dash (0.5.3-3) unstable; urgency=low + + * debian/rules: target configure, configure-udeb: add --host option to + configure (adds the ability to cross-compile, patch from Pjotr + Kourzanov; closes: #355132, #355124). + * debian/po/it.po: new: initial Italian debconf translation (thx Andrea + Bolognani; closes: #355011). + * debian/diff/dash-signed-char-syntax.diff: new: patch from upstream: + don't remove special chars on expansion (closes: 349855). + * debian/implicit: update to revision 1.11. + + -- Gerrit Pape Sun, 16 Apr 2006 13:09:08 +0000 + +dash (0.5.3-2) unstable; urgency=low + + * debian/diff/eval-exit-status.diff: new; patch from upstream; fix exit + status of eval with null arguments (closes: #347232). + * debian/rules: new target patch: apply diffs from debian/diff/, + reverse-apply in target clean:. + + -- Gerrit Pape Tue, 17 Jan 2006 05:37:48 +0000 + +dash (0.5.3-1) unstable; urgency=low + + * new upstream version. + * Fix \c spillage across echo commands (closes: #337294). + * debian/copyright: adapt copyright notice. + * debian/rules: remove workaround for udeb build failure with dietlibc + on 64bit archs; fixed upstream. + + -- Gerrit Pape Mon, 28 Nov 2005 12:18:30 +0000 + +dash (0.5.2-8) unstable; urgency=low + + * src/input.c: apply patch from upstream (handle NUL characters + gracefully, closes: #317516). + * debian/po/sv.po: update Swedish translation (thx Daniel Nylander, + closes: #330315). + + -- Gerrit Pape Wed, 5 Oct 2005 13:24:33 +0000 + +dash (0.5.2-7) unstable; urgency=low + + * debian/rules: work around udeb build failure with dietlibc on 64bit + archs (closes: #318607). + + -- Gerrit Pape Fri, 5 Aug 2005 17:12:31 +0000 + +dash (0.5.2-6) unstable; urgency=low + + * debian/po/vi.po: new; initial Vietnamese debconf translation (closes: + #313502, thx Clytie Siddall). + * debian/rules: install dash menu file into /usr/share/menu/; build + dash.udeb against dietlibc on archs !m68k. + * debian/control: Build-Depends: dietlibc-dev [archs]; Standards-Version: + 3.6.2.0. + + -- Gerrit Pape Fri, 8 Jul 2005 16:17:00 +0000 + +dash (0.5.2-5) unstable; urgency=low + + * debian/po/cs.po: new; initial Czech debconf translation (closes: + #308043, thx Martin Sin, Miroslav Kure). + + -- Gerrit Pape Wed, 11 May 2005 14:01:40 +0000 + +dash (0.5.2-4) unstable; urgency=medium + + * debian/dash.postrm: fix typo in options to dpkg (in or list). + + -- Gerrit Pape Sat, 2 Apr 2005 18:04:39 +0000 + +dash (0.5.2-3) unstable; urgency=low + + * apply patch from upstream bk: + * src/var.c: add trailing equal sign in setvar for variables set to null + (closes: #299639). + * debian/dash.menu: new. + * debian/rules: install debian/dash.menu file (closes: #296297). + * debian/dash.postinst: conditionally run update-menus on configure. + * debian/dash.postrm: conditionally run update-menus on remove and upgrade + (actually downgrade). + + -- Gerrit Pape Mon, 28 Mar 2005 17:15:22 +0000 + +dash (0.5.2-2) unstable; urgency=high + + * debian/control: no longer Build-Depends: bison. + * apply patch from upstream: + * src/eval.c, src/eval.h: don't errexit on builtin in if condition and + or list (closes: #276964). + * src/dash.1: fix grammar, typo (thx A Costa, closes: #296396, #296545). + + -- Gerrit Pape Tue, 1 Mar 2005 21:14:37 +0000 + +dash (0.5.2-1) unstable; urgency=low + + * new upstream release. + * Fixed spelling errors in manual page; Spell behaviour consistently in + manual page (closes: #281803). + * Corrected manual entry about ENV and non-interactive shells (closes: + #292501). + + -- Gerrit Pape Mon, 31 Jan 2005 20:12:08 +0000 + +dash (0.5.1-3) unstable; urgency=low + + * apply patch from upstream bk: + * src/jobs.c: allow negative pid argument to kill(1). + * apply patch from upstream: + * src/expand.c: fix $@ expansion when leading argument is null (closes: + #266082). + + -- Gerrit Pape Sun, 22 Aug 2004 15:48:47 +0000 + +dash (0.5.1-2) unstable; urgency=low + + * apply patch from upstream: + * src/cd.c: fix cd - when OLDPWD is unset (closes: #263159). + + -- Gerrit Pape Thu, 5 Aug 2004 08:17:18 +0000 + +dash (0.5.1-1) unstable; urgency=low + + * new upstream release. + * debian/rules: reorganize; stop using debhelper, use implicit rules. + * debian/implicit: new; implicit Makefile rules. + * debian/control: no longer Build-Depends: debhelper, pmake; + Build-Depends: po-debconf. + * debian/copyright: adapt. + * debian/ash.dirs, debian/bsdyacc, debian/compat, debian/dash-udeb.dirs, + debian/dash.dirs, debian/dash.templates.merged: remove; obsolete. + * debian/dash.templates: rename to debian/dash.templates.in. + * debian/dash.postrm: new; run db_purge on purge if debconf is available. + * debian/ash.postinst, debian/ash.postrm, debian/dash.postinst, + debian/dash.prerm: remove "#DEBHELPER#". + * src/mystring.c, src/var.c, src/bltin/printf.c: #include "system.h" (for + diet libc). + + -- Gerrit Pape Fri, 9 Jul 2004 19:21:26 +0000 + +dash (0.4.26-3) unstable; urgency=low + + * apply patch approved by upstream: + * error.c, error.h, mystring.c, mystring.h, bltin/printf.c: optionally + compile with the diet libc. + * debian/README.Debian.diet, debian/dash.docs: new; how to build dash + with the diet libc. + * debian/rules: support "diet" in DEB_BUILD_OPTIONS to easily build the + packages with the diet libc instead of glibc. + + -- Gerrit Pape Sat, 26 Jun 2004 12:26:19 +0000 + +dash (0.4.26-2) unstable; urgency=low + + * apply patch from upstream: + * expand.c: add support for character classes to pmatch(), glibc's + fnmatch() still is broken (closes: #250499, works around: #243885). + + -- Gerrit Pape Tue, 1 Jun 2004 05:53:39 +0000 + +dash (0.4.26-1) unstable; urgency=low + + * new maintainer. + * add debian_revision to upstream_version, package no longer is debian + native, upstream is Herbert Xu. + * apply patch from upstream: + * Fixed vstype trim operator ordering in cmdputs. + * Fixed quote for CTLENDVAR in cmdputs. + * Fixed VSLENGTH crash in cmdputs (closes: #250855). + + -- Gerrit Pape Fri, 28 May 2004 18:40:53 +0000 + +dash (0.4.26) unstable; urgency=low + + * Disabled fnmatch code again (closes: #240887). + * Updated copyright. + * Updated German debconf translation (Florian Ernst, closes: #244507). + * Fixed obstack corruption in setprompt (closes: #246635). + + -- Herbert Xu Fri, 30 Apr 2004 21:48:52 +1000 + +dash (0.4.25) unstable; urgency=low + + * Fixed use-after-free bug in setvareq (Vladimir N. Oleynik). + * Fixed value of expdest after _STPUTC in expandarg (closes: #238265). + + -- Herbert Xu Thu, 18 Mar 2004 20:55:57 +1100 + +dash (0.4.24) unstable; urgency=low + + * Fixed segmentation fault when PWD is undefined. + + -- Herbert Xu Tue, 9 Mar 2004 19:58:41 +1100 + +dash (0.4.23) unstable; urgency=low + + * Verify PWD before using it. + + -- Herbert Xu Mon, 8 Mar 2004 20:12:27 +1100 + +dash (0.4.22) unstable; urgency=low + + * Read PWD from environment (closes: #228659). + * Added Danish debconf translation (Claus Hindsgaul, closes: #233756). + * Added check_gcc to support gcc 2.95 (closes: #235933). + * Perform here-doc expansion on PS1/PS2/PS4 (closes: #230858). + + -- Herbert Xu Sun, 7 Mar 2004 21:50:04 +1100 + +dash (0.4.21) unstable; urgency=low + + * Fixed typo that broke ulimit (GCS, closes: #228369). + + -- Herbert Xu Mon, 19 Jan 2004 19:02:32 +1100 + +dash (0.4.20) unstable; urgency=low + + * Added Dutch debconf translation (Tim Dijkstra, closes: #218904). + * Check existence RLIMIT symbols for ulimit. + * Removed table lookup in errmsg. + * Restored NULL check in cmdtxt. + * Restored ash postrm to purge debconf entries (closes: #221913). + * Fixed exit status of exit in EXIT trap (closes: #227734). + * Updated Brazilian debconf translation (Andre Luis Lopes, closes: #228095). + * Restored goodname check in prehash. + + -- Herbert Xu Sat, 17 Jan 2004 09:57:14 +1100 + +dash (0.4.19) unstable; urgency=low + + * Fixed handling of evalskip in dotcmd (closes: #212975). + * Updated Russian debconf translation (Ilgiz Kalmetev, closes: #214333). + * Added Portugese debconf translation (Bruno Rodrigues, closes: #216214). + * Updated Spanish debconf translation (Carlos Valdivia, closes: #216338). + * Fixed length expansion of special variables (closes: #216767). + * Replaced umask builtin with pdksh version. + * Reverted bogus eval change in 0.3.1-20. + * Added vmemory/locks support in ulimit. + * Call install -D instead of cp for merged template. + + -- Herbert Xu Wed, 29 Oct 2003 22:14:22 +1100 + +dash (0.4.18) unstable; urgency=low + + * Fixed boundary checks in getopts. + * Updated Japanese debconf template (Tomohiro KUBOTA, closes: #192382). + * Use -falign-* instead -malign-*. + * Use strtoll for parsing integers in arith expansion. + * Added support for add-shell/remove-shell (closes: #163131). + * Fixed JOBS ifdefs in sprint_status (closes: #211009). + * Fixed bit-wise or in arith expansion (Mototoshi KONDO, closes: #212825). + * Print PS4 on previous stderr. + * Converted debconf templates to gettext (Christian Perrier, + closes: #200112). + + -- Herbert Xu Sat, 27 Sep 2003 14:26:36 +1000 + +dash (0.4.17) unstable; urgency=low + + * Reset rehash when recylcing cmd entries. + * Fixed null arg0 segfault with -c (closes: #191687). + * Relocate job pointers in makejob (closes: #191595). + + -- Herbert Xu Sat, 3 May 2003 20:57:46 +1000 + +dash (0.4.16) unstable; urgency=low + + * Fixed printf so that exit status is cleared on entry. + * Call nextopt() in printf. + * Fixed command substitution corruption by grabbing expdest in expbackq + (closes: #187896). + + -- Herbert Xu Mon, 7 Apr 2003 21:21:30 +1000 + +dash (0.4.15) unstable; urgency=low + + * Fixed octal escapes in echo/printf (closes: #187827). + + -- Herbert Xu Sun, 6 Apr 2003 20:45:38 +1000 + +dash (0.4.14) unstable; urgency=low + + * Added missing newline when printing in dowait. + * Do not print status in dowait when stopped. + * Fixed job status display. + * Fixed current job setting. + * Fixed kill segfault with no arguments (closes: #187189). + * Fixed sorting of set output. + * Removed setvar builtin. + + -- Herbert Xu Thu, 3 Apr 2003 20:38:33 +1000 + +dash (0.4.13) unstable; urgency=low + + * Fixed precision type on 64 bit systems in showvars. + + -- Herbert Xu Wed, 26 Mar 2003 20:00:03 +1100 + +dash (0.4.12) unstable; urgency=low + + * Fixed dash_errno build problem with gcc 3.2. + + -- Herbert Xu Tue, 25 Mar 2003 22:28:50 +1100 + +dash (0.4.11) unstable; urgency=low + + * Removed unused pgrp field from job structure. + * Free jobs when calling wait with no arguments. + * Fixed build problem with bison. + * Merged changes from NetBSD 20030123. + . printf: + - Fixed mklong sefault. + - Fixed precision/field width with %b. + . Improved option parsing of command(1). + . Added rudimentary support for PS4. + * Moved builtin flags into builtins.def. + * Updated Spanish debconf template (Carlos Valdivia Yage, closes: #178359). + * Fixed ordering of redirection versus assignment substitution. + * Fixed potential setvareq memory leaks. + * Use bison instead of byacc. + * Fixed wait(1) race condition. + * Fixed alignment memory corruption bug in growstackblock(). + * Fixed potential memory corruption in parsing position parameters. + * Fixed getopts done check. + + -- Herbert Xu Mon, 24 Mar 2003 20:42:29 +1100 + +dash (0.4.10) unstable; urgency=low + + * Fixed redirection fd leak when execing. + + -- Herbert Xu Sun, 19 Jan 2003 13:25:41 +1100 + +dash (0.4.9) unstable; urgency=low + + * Reset exitstatus in evalsubshell if backgnd is true. + * Fixed glibc glob syntax error in expand.c. + + -- Herbert Xu Sat, 11 Jan 2003 16:04:02 +1100 + +dash (0.4.8) unstable; urgency=low + + * Removed backgnd flag from ncmd due to previous redirection change. + * Set lim after the stack stablises in updatepwd (closes: #173884). + * Do not clobber the exitstatus after redirection. + + -- Herbert Xu Mon, 23 Dec 2002 19:50:06 +1100 + +dash (0.4.7) unstable; urgency=low + + * Merged clearredir with reset code in redir.c. + * Redirect before command search in evalcommand (closes: #168862). + * Build binary-all packages in binary-indep (closes: #173191). + + -- Herbert Xu Sat, 21 Dec 2002 13:52:37 +1100 + +dash (0.4.6) unstable; urgency=low + + * Restored code for leaving job control. + + -- Herbert Xu Sun, 8 Dec 2002 15:21:58 +1100 + +dash (0.4.5) unstable; urgency=low + + * Optimised doformat so that vsnprintf is usually called only once. + * Reset redirlist in clearredir so that popredir can work (closes: #170247). + + -- Herbert Xu Sat, 23 Nov 2002 22:09:59 +1100 + +dash (0.4.4) unstable; urgency=low + + * Fixed duplicate define warnings in init.c. + * Set debhelper compat to 4. + * Vanishing mail boxes no longer elicit "you have mail" messages. + * Function redirection errors no longer abort the shell. + * Fixed potential memory leak in redirect. + * Only allocate memory if necessary in redirect. + * Reap dead here documents. + * Do not strdup default values of static shell variables. + * Removed unnecessary setprompt(0) calls. + * Read in BUFSIZ chunks rather than BUFSIZ - 1. + * Documented undefined escape behaviour for echo(1) (closes: #167893). + * Do va_copy when we use a va_list twice (closes: #169503). + + -- Herbert Xu Wed, 20 Nov 2002 19:48:31 +1100 + +dash (0.4.3) unstable; urgency=low + + * Added manual entry for PPID. + * Exporting an unset variable no longer causes it to be set. + * Fixed fd0 redirection in asynchronous lists. + * Only stat if necessary in cdcmd (see #42880). + * Removed extra newline in error message in arith lexer. + * Set heredoclist to 0 ASAP in parseheredoc. + * Removed BSD advertising clause from copyright file. + * Check non-ash diversions as well in dash.postinst. + * Duplicated diversion checking in ash.postinst (closes: #166441). + + -- Herbert Xu Sat, 26 Oct 2002 21:28:33 +1000 + +dash (0.4.2) unstable; urgency=low + + * Give benefits of dash in templates (closes: #161527). + * Fixed signed/unsigned on result of xwrite (closes: #161606). + * Removed support for SIG prefixes in kill and trap. + * Added -- processing in trap. + * Dropped use of unset in postinst (closes: 161868). + * Fixed printf(1) %* processing on bad integers and zero. + * Use stat64 in test(1). + * Allocate group_array with stalloc in test(1). + * Disabled alias checking after a pattern in a case statement. + * Wait now returns 128 + last trapped signal. + * Printf now keeps going after errors. + * Empty non-trivial parameter expansions are now removed correctly. + * Call reset() before exitshell() is called. This fixes the bug where + returning an error from a function running under set -e caused the exit + trap to be taken with evalskip set. + * Fixed quoting of empty strings in single_quote(). + * Show line numbers on all errors. + * Function names must be valid identifiers. + * Removed unused dependency on groff. + * Fixed race condition before entering a function. + * Fixed getopts initialisation for functions. + * Added memory barriers in INT macros. + * Banned empty compound lists in most places. + * Keep usage counters on functions (closes: #164234). + * Updated copyright file. + * Check evalskip in evalstring (closes: #165056). + * Merged changes from NetBSD 1.6: + . Added intmax support in printf(1). + . Implemented set -u. + + -- Herbert Xu Sat, 19 Oct 2002 14:23:11 +1000 + +dash (0.4.1) unstable; urgency=low + + * Removed extra new line in command -v output for aliases. + * Removed alais prefix in the output of alias. + * Recognise octal and hex numbers in arith expansion (closes: #151449). + * Added sh(1) entries for echo, printf and test (closes: #156446). + * Renamed to dash --- the Debian Almquist Shell. + * Cleaned up rules file (Matej Vela). + * Check mtime instead of size in chkmail per POSIX. + * Added support for LFS (closes: #157884). + * Added SuS options to cd and pwd (closes: #145828). + + -- Herbert Xu Fri, 13 Sep 2002 20:35:06 +1000 + +ash (0.3.8-38) unstable; urgency=low + + * Turned pre-dependency to dependency in udeb since the former is not allowed + (closes: #143749). + + -- Herbert Xu Sun, 28 Apr 2002 11:59:05 +1000 + +ash (0.3.8-37) unstable; urgency=low + + * Added Japanese debconf translation (Tomohiro KUBOTA, closes: #137431). + * Added missing escapes in manual page (Aaron Schrab, closes: #137966). + * Added Russian debconf translation (Ilgiz Kalmetev, closes: #137618). + * Fixed trap(1) documentation (closes: #140973). + * Do not abort if getcwd fails. + + -- Herbert Xu Wed, 3 Apr 2002 20:58:09 +1000 + +ash (0.3.8-36) unstable; urgency=low + + * Added library dependency for ash-udeb. + * Handle null case statements correctly. + * Fixed alias expansions in case statements (NetBSD). + * Disabled unused jobid command. + * Corrected documentation about shifting too much. + * Added French debconf translation (Denis Barbier, closes: #134625). + * Updated Spanish debconf translation (Carlos Valdivia, closes: #136366). + + -- Herbert Xu Sat, 2 Mar 2002 18:31:22 +1100 + +ash (0.3.8-35) unstable; urgency=low + + * Moved PWD initialisation into var.c (closes: #124032). + + -- Herbert Xu Mon, 24 Dec 2001 09:34:55 +1100 + +ash (0.3.8-34) unstable; urgency=low + + * NSEMI must be NOR + 1. + * Set exitstatus to zero before evaluating cases (closes: #124066). + * Explicitly set default answer of the ash/sh question to false so that + people whose debconf priority is set to low and who keeps banging on their + keyboards don't accidently end up with ash as /bin/sh. + + -- Herbert Xu Fri, 21 Dec 2001 20:30:49 +1100 + +ash (0.3.8-33) unstable; urgency=low + + * Added missing inclusion of bltin.h in bltin/times.c. + + -- Herbert Xu Thu, 13 Dec 2001 18:46:07 +1100 + +ash (0.3.8-32) unstable; urgency=low + + * Back slashes in expansions are now escaped (closes: #121516). + + -- Herbert Xu Wed, 28 Nov 2001 20:15:01 +1100 + +ash (0.3.8-31) unstable; urgency=low + + * Made sure all back slashes are escaped. + + -- Herbert Xu Mon, 26 Nov 2001 19:10:27 +1100 + +ash (0.3.8-30) unstable; urgency=low + + * Restored fnmatch(3) code. + * Treat escaped slashes correctly while globbing. + * Restored missing EV_EXIT check in evalcommand (closes: #120364). + * Fixed stack corruption in _rmescapes. + + -- Herbert Xu Sun, 25 Nov 2001 17:51:19 +1100 + +ash (0.3.8-29) unstable; urgency=low + + * Added missing va_end in fmtstr (NetBSD). + * Removed shellproc crap. + * Updated Swedish debconf translation (Mikael Hedin, closes: #116097). + * Updated German debconf translation (Andreas Metzler, closes: #117160). + * Break now treats illegal numbers according to SuS. + * Errors in special builtins now rise to the top. + * Normal redirection errors no longer abort the shell. + * Functions now have the same variable assignment properties as special + builtins. + + -- Herbert Xu Sat, 3 Nov 2001 11:36:36 +1100 + +ash (0.3.8-28) unstable; urgency=low + + * Local variables are now unset properly in shprocvar() (closes: #114917). + + -- Herbert Xu Sat, 13 Oct 2001 14:07:21 +1000 + +ash (0.3.8-27) unstable; urgency=low + + * Kill no longer aborts if it fails to kill someone. + + -- Herbert Xu Sun, 30 Sep 2001 22:20:36 +1000 + +ash (0.3.8-26) unstable; urgency=low + + * The sh.1.gz diversion now agrees with reality (closes: #113831). + + -- Herbert Xu Sat, 29 Sep 2001 08:43:27 +1000 + +ash (0.3.8-25) unstable; urgency=low + + * Only read ENV if the shell is interactive (closes: #110421). + + -- Herbert Xu Wed, 29 Aug 2001 19:18:53 +1000 + +ash (0.3.8-24) unstable; urgency=low + + * Handle SIGINT when waiting even if there is no trap (closes: #107699). + * Protect all makejob/forkshell/waitforjobs sequences from SIGINT. + * Work around gcc bug that generates bad ..ng references (closes: #107994). + + -- Herbert Xu Wed, 8 Aug 2001 20:28:28 +1000 + +ash (0.3.8-23) unstable; urgency=low + + * Fixed fence post error in scanleft (closes: #107229). + * Removed stunalloc in expname as it interferes with addfname. + * Fixed CTLESC skipping in scanright. + + -- Herbert Xu Thu, 2 Aug 2001 20:06:00 +1000 + +ash (0.3.8-22) unstable; urgency=low + + * Fixed trailing back slash bug in echo/printf (closes: #106693). + * Some quoted's are meant to be quotes. + * Added Brazilian translation (Andre Luis Lopes, closes: #107041). + + -- Herbert Xu Mon, 30 Jul 2001 20:21:52 +1000 + +ash (0.3.8-21) unstable; urgency=low + + * Fixed EV_EXIT/redirection bugs that caused core dumps. + + -- Herbert Xu Sat, 28 Jul 2001 17:03:28 +1000 + +ash (0.3.8-20) unstable; urgency=low + + * Don't save fd2 if job control is turned off. + * Don't push redirections when EV_EXIT is set. + * Fixed assignment recognition in the presence of back ticks. + * Combined checkkwd and checkalias. + + -- Herbert Xu Fri, 27 Jul 2001 22:29:41 +1000 + +ash (0.3.8-19) unstable; urgency=low + + * Recompute strings after growing in subevalvar (closes: #106050). + + -- Herbert Xu Mon, 23 Jul 2001 21:16:50 +1000 + +ash (0.3.8-18) unstable; urgency=low + + * Added more space optimisations for udeb on i386. + * Set stack mark in patmatch (closes: #106050). + * Fixed theoretical bug in expari. + + -- Herbert Xu Sat, 21 Jul 2001 20:08:15 +1000 + +ash (0.3.8-17) unstable; urgency=low + + * Don't complain about unknown escape codes in echo and printf + (closes: #105659). + * Updated build-time dependency on groff-base (closes: #105612). + + -- Herbert Xu Wed, 18 Jul 2001 19:33:20 +1000 + +ash (0.3.8-16) unstable; urgency=low + + * Fixed backslash bug in new pattern matching code. + + -- Herbert Xu Mon, 16 Jul 2001 21:47:39 +1000 + +ash (0.3.8-15) unstable; urgency=low + + * Added Swedish translation of templates (Martin Sjgren, closes: #103158). + * Restored escape code support in echo. + * Removed assignment builtins since it is at best undefined by the SuS and + also can't be implemented consistently. + * Removed extraneous volatile modifier (closes: #104518). + * General overhaul of word expansion (closes: #96588). + * Redirection prefixes no longer stop assignments from being recognised. + + -- Herbert Xu Sun, 15 Jul 2001 17:27:03 +1000 + +ash (0.3.8-14) unstable; urgency=low + + * Divert sh.1.gz to sh.distrib.1.gz (closes: #102251). + * Added HETIO support for ^D and ^U (Aaron Lehmann, closes: #102215). + * Added Spaniash translation of debconf templates (Carlos Valdivia Yage, + closes: #103040). + * Added versioned build-time dependency on groff. + + -- Herbert Xu Mon, 2 Jul 2001 19:32:03 +1000 + +ash (0.3.8-13) unstable; urgency=low + + * Fixed a bug where errors in pipelines which are part of andor lists were + not ignored when -e is in effect. + + -- Herbert Xu Mon, 25 Jun 2001 19:40:27 +1000 + +ash (0.3.8-12) unstable; urgency=low + + * Rewrote arith_lex.l in C (Aaron Lehmann, closes: #101741). + * && and || in arithmetic expansions now return either 0 or 1. + + -- Herbert Xu Sun, 24 Jun 2001 20:14:29 +1000 + +ash (0.3.8-11) unstable; urgency=low + + * Check for NULL argument in evaltree() (closes: #98865, #98867). + + -- Herbert Xu Sun, 27 May 2001 17:53:14 +1000 + +ash (0.3.8-10) unstable; urgency=low + + * Use /bin/ash in postinst to sidestep bugs in other shells (closes: #98739). + * Exit status is now tested on non-negated pipelines (closes: #98736). + + -- Herbert Xu Sat, 26 May 2001 23:56:07 +1000 + +ash (0.3.8-9) unstable; urgency=medium + + * IFS is now fetched using bltinlookup() again in read (closes: #98343). + * Divert sh(1) man page as well as /bin/sh (closes: #98525). + + -- Herbert Xu Fri, 25 May 2001 20:30:06 +1000 + +ash (0.3.8-8) unstable; urgency=low + + * Fixed diversion removal in prerm (duh, closes: #98031). + + -- Herbert Xu Mon, 21 May 2001 20:52:48 +1000 + +ash (0.3.8-7) unstable; urgency=low + + * Fixed diversion test in prerm (closes: #98031). + + -- Herbert Xu Sun, 20 May 2001 12:30:53 +1000 + +ash (0.3.8-6) unstable; urgency=low + + * Make sure that fd2 is closed when clearing redirects (closes: #96619). + * Fixed memory corruption in stunalloc(). + * The output of export/readonly/set is now correctly quoted. + * Fixed newline eating bug in expbackq(). + * Set OLDPWD. + * Removed ash-medium as neither bf or di uses it. + * Wait now waits for all its argument rather than the first one. + * Wait will exit with 129 when interrupted by a signal for a which a trap has + been set. + + -- Herbert Xu Fri, 18 May 2001 21:51:41 +1000 + +ash (0.3.8-5) unstable; urgency=low + + * Added German translation to template file (Sebastian Feltel, + closes: #96203). + * Added missing initialisation in setalias() (closes: #95433). + + -- Herbert Xu Fri, 4 May 2001 20:54:31 +1000 + +ash (0.3.8-4) unstable; urgency=low + + * Disabled fnmatch code as fnmatch(3) in glibc is broken. + * Fixed echo example in man page (Kalle Olavi Niemitalo, closes: #96014). + * Fixed trailing semicolon bug with eval (NetBSD). + * Fixed globbing inconsistency with broken symlinks (NetBSD). + + -- Herbert Xu Wed, 2 May 2001 22:57:16 +1000 + +ash (0.3.8-3) unstable; urgency=low + + * Work around broken autoconf scripts (closes: #95430). + + -- Herbert Xu Tue, 1 May 2001 18:27:50 +1000 + +ash (0.3.8-2) unstable; urgency=low + + * Save checkalias before calling xxreadtoken() (closes: #95628). + + -- Herbert Xu Sun, 29 Apr 2001 17:36:01 +1000 + +ash (0.3.8-1) unstable; urgency=low + + * NetBSD-current version as of 20010316. + * Removed code that sets IFS. + * Fixed memory leak with PWD. + * Set PPID. + * Fixed inconsistencies in alias expansion. + * Restored original output code. + * Enabled fnmatch code again. + * Added builtin printf. + * Offer to divert /bin/sh (closes: #70462). + + -- Herbert Xu Wed, 25 Apr 2001 22:32:39 +1000 + +ash (0.3.7-16) unstable; urgency=low + + * Fixed incorrect default IFS in readcmd (closes: #88950). + * Added missing return in hashcmd. + + -- Herbert Xu Fri, 9 Mar 2001 20:44:40 +1100 + +ash (0.3.7-15) unstable; urgency=low + + * Unknown escape codes are now prnted literally by echo (closes: #82869). + * Made hetio_read_input() fail if fd is not stdin. + * Some uses of VSQUOTE were really meant to be quotes (closes: #88777). + * Build different ashes in different subdirectories. + + -- Herbert Xu Thu, 8 Mar 2001 21:32:28 +1100 + +ash (0.3.7-14) unstable; urgency=low + + * Removed predependency from udeb (closes: #81995). + * Added /bin/sh symlink to udeb (closes: #81967). + + -- Herbert Xu Sat, 13 Jan 2001 15:23:21 +1100 + +ash (0.3.7-13) unstable; urgency=low + + * Renamed the udeb to ash-udeb. + + -- Herbert Xu Wed, 20 Dec 2000 19:32:34 +1100 + +ash (0.3.7-12) unstable; urgency=low + + * Added support for udebs (Randolph Chung, closes: #79237). + + -- Herbert Xu Sat, 16 Dec 2000 13:53:28 +1100 + +ash (0.3.7-11) unstable; urgency=low + + * Preserve the previous exit status upon entering a function + (closes: #78374). + + -- Herbert Xu Sun, 3 Dec 2000 13:34:27 +1100 + +ash (0.3.7-10) unstable; urgency=low + + * Merged changes for GNU from Igor Khavkine. + * Minimise the number of sigactions. + + -- Herbert Xu Fri, 3 Nov 2000 20:31:52 +1100 + +ash (0.3.7-9) unstable; urgency=low + + * Predepend on the libraries. + * Always save fd 2 when it is redirected (closes: #75302). + + -- Herbert Xu Sun, 22 Oct 2000 08:40:40 +1100 + +ash (0.3.7-8) unstable; urgency=high + + * More redirection fixes (closes: #73613). + + -- Herbert Xu Thu, 5 Oct 2000 18:22:17 +1100 + +ash (0.3.7-7) unstable; urgency=high + + * Added missing break in redirection code (closes: #72956). + + -- Herbert Xu Tue, 3 Oct 2000 07:58:04 +1100 + +ash (0.3.7-6) unstable; urgency=low + + * command -[vV] no longer displays an error message on stdout. + * Redirecting to /proc/self/fd/* now works (closes: #72852). + + -- Herbert Xu Sun, 1 Oct 2000 12:56:39 +1100 + +ash (0.3.7-5) unstable; urgency=low + + * Implemented set -a. + + -- Herbert Xu Sat, 30 Sep 2000 16:00:33 +1100 + +ash (0.3.7-4) unstable; urgency=low + + * Added build-time dependency on debhelper (closes: #69920). + * Extended maximum length of arithmetic expansions to match 32-bit integers. + + -- Herbert Xu Wed, 20 Sep 2000 14:28:16 +1100 + +ash (0.3.7-3) unstable; urgency=low + + * Switch to the old globbing code since glob(3) is hopelessly broken + (closes: #69455). + + -- Herbert Xu Mon, 21 Aug 2000 20:37:15 +1000 + +ash (0.3.7-2) unstable; urgency=low + + * Call glob(3) with GLOB_NOMAGIC (ouch). + + -- Herbert Xu Sun, 6 Aug 2000 17:47:08 +1000 + +ash (0.3.7-1) unstable; urgency=low + + * NetBSD-current version as of 20000729. + * Use fnmatch(3) and glob(3). + * Fixed the use of backslashes in the pattern in parameter substitutions, + hopefully for the last time. + * Applied HETIO patch and built ash.medium (closes: #50788). Will do ash.big + when readline is fixed so that it doesn't leak anymore. + + -- Herbert Xu Fri, 4 Aug 2000 21:36:44 +1000 + +ash (0.3.6-5) unstable; urgency=low + + * Fixed manpage entry for read with patch from Kevin Ryde (closes: #62500). + * Fixed a file descriptor leak for pipelines. + + -- Herbert Xu Wed, 19 Apr 2000 18:56:20 +1000 + +ash (0.3.6-4) unstable; urgency=low + + * Fixed the case of an empty command with redirections. + + -- Herbert Xu Fri, 7 Apr 2000 12:07:18 +1000 + +ash (0.3.6-3) unstable; urgency=low + + * ! is now recognised correctly. + * Ash is now more strict on the syntax, e.g., a lone ! is no longer accepted + as an alternative to ! true. + + -- Herbert Xu Fri, 7 Apr 2000 10:46:06 +1000 + +ash (0.3.6-2) unstable; urgency=low + + * Fixed a problem with fmtstr() which broke getopts. + + -- Herbert Xu Sun, 2 Apr 2000 10:49:26 +1000 + +ash (0.3.6-1) unstable; urgency=low + + * NetBSD-current version as of 20000326. + * Added a Build-Depends on groff (closes: #61041). + * Implemented noclobber (closes: #59028). + * Rewrote output.c to use stream IO. + + -- Herbert Xu Sat, 1 Apr 2000 19:24:31 +1000 + +ash (0.3.5-10) frozen unstable; urgency=low + + * Don't stat mail boxes in non-interactive mode (closes: #59213). + * Added an fflush(stdout) to the times builtin (closes: #59027). + * Documented the times builtin. + * Added source depends. + + -- Herbert Xu Sat, 18 Mar 2000 18:58:44 +1100 + +ash (0.3.5-9) unstable; urgency=low + + * Double quotes inside paramater substitutions inside double quotes are now + ignored as in bash (the originial behaviour was POSIX compliant too but + IMHO this one makes a little bit more sense). + This one broke mwm (but it was actually mwm's fault). + * Corrected backslash/CTLESC treatment for patterns in parameter + substitutions. + + -- Herbert Xu Sat, 6 Nov 1999 18:13:19 +1100 + +ash (0.3.5-8) unstable; urgency=low + + * Replaced use of echo -n in manual page with escape codes. + * Made FHS compliant (closes: #47978). + * Restored echo's option processing ability. + + -- Herbert Xu Fri, 22 Oct 1999 10:20:58 +1000 + +ash (0.3.5-7) unstable; urgency=low + + * echo no longer supports options. + * Don't quote patterns inside parameter substitutions enclosed by double + quotes (closes: #47842). + + -- Herbert Xu Wed, 20 Oct 1999 20:28:14 +1000 + +ash (0.3.5-6) unstable; urgency=low + + * Use getcwd() instead of /bin/pwd -- Zack Weinberg (closes: #46981). + + -- Herbert Xu Sun, 10 Oct 1999 16:31:49 +1000 + +ash (0.3.5-5) unstable; urgency=low + + * Only test for -e on simple commands (fixes #44559). + + -- Herbert Xu Wed, 8 Sep 1999 22:18:27 +1000 + +ash (0.3.5-4) unstable; urgency=low + + * Don't wait for stopped children if job control is disabled (fixes #42814). + * Allow an option '(' in a case statement (fixes #42364). + + -- Herbert Xu Thu, 12 Aug 1999 23:30:30 +1000 + +ash (0.3.5-3) unstable; urgency=low + + * OK, the fix to the esoteric problem in 0.3.5-1 actually breaks VSASSIGN + and VSQUESTION, they should work properly now (fixes #41327). + + -- Herbert Xu Thu, 15 Jul 1999 22:47:13 +1000 + +ash (0.3.5-2) unstable; urgency=low + + * PATH search and execution is now correct. + * hash no longer shows builtins. + * Added kill builtin. + * New description from James R. van Zandt reformatted by Josip Rodin. + + -- Herbert Xu Mon, 12 Jul 1999 18:51:42 +1000 + +ash (0.3.5-1) unstable; urgency=low + + * New upstream release. + * Adapted to new pmake (fixes #38737). + * Fixed behvaiour of backslashes preceding a closing brace for a parameter + substituion inside double quotes (even bash messes this one up :). + * Fixed command (fixes #34639). + * Fixed a pipe bug where stdin may be wrongly closed (fixes #35452). + * Revamped getopts (fixes #39694). + + -- Herbert Xu Sun, 4 Jul 1999 12:19:01 +1000 + +ash (0.3.4-7) unstable; urgency=low + + * Fixed a glibc 2.1 compatitibility problem. + * Fixed a PWD inconsistency that stuffed up the kernel compilation. + + -- Herbert Xu Mon, 17 May 1999 23:14:57 +1000 + +ash (0.3.4-6) unstable; urgency=low + + * Fixed incorrect -e test due to the last bug fix (fixes #26509). + + -- Herbert Xu Tue, 8 Sep 1998 10:02:46 +1000 + +ash (0.3.4-5) unstable; urgency=low + + * Use test_eaccess from bash instead of access(2) (fixes #26110). + + -- Herbert Xu Wed, 26 Aug 1998 21:22:49 +1000 + +ash (0.3.4-4) unstable; urgency=low + + * Only upload to unstable. + + -- Herbert Xu Tue, 5 May 1998 18:01:02 +1000 + +ash (0.3.4-3) frozen unstable; urgency=low + + * Applied sparc patch (fixes #21562). + + -- Herbert Xu Fri, 1 May 1998 19:48:13 +1000 + +ash (0.3.4-2) frozen unstable; urgency=low + + * Fixed the incorrect trap fixes (fixes #20363). + + -- Herbert Xu Thu, 16 Apr 1998 21:07:10 +1000 + +ash (0.3.4-1) unstable; urgency=low + + * New upstream release. + * Reverted word splitting change in 0.3.2-1 since the fix was broken and + major work (the quote removal is done too quickly at the moment) is needed + to fix it properly. + * Fixed more trap noncompliance. + + -- Herbert Xu Thu, 19 Mar 1998 22:59:12 +1100 + +ash (0.3.2-5) unstable; urgency=low + + * Fixed a bug when doing pattern matching in parameter expansions. + + -- Herbert Xu Tue, 10 Mar 1998 21:25:40 +1100 + +ash (0.3.2-4) unstable; urgency=low + + * Allow ] to be quoted in bracket expressions (fixes #17533). + * Move dh_fixperms to second last spot (fixes #18267). + * Don't do field splitting in evalfor. + + -- Herbert Xu Tue, 17 Feb 1998 13:32:09 +1100 + +ash (0.3.2-3) unstable; urgency=low + + * Fixed stupid core dump. + + -- Herbert Xu Wed, 11 Feb 1998 21:33:55 +1100 + +ash (0.3.2-2) unstable; urgency=low + + * Hack for special builtins (fixes #18055). + * Hack for command. + + -- Herbert Xu Wed, 11 Feb 1998 21:19:46 +1100 + +ash (0.3.2-1) unstable; urgency=low + + * NetBSD-current version as of 19980209. + * Fixed a word splitting problem after parameter expansion thanks to Alexey + Marinichev. + * Converted to debhelper (fixes #14612, #15005). + + -- Herbert Xu Mon, 9 Feb 1998 16:53:48 +1100 + +ash (0.3.1-20) unstable; urgency=low + + * Fixed -e problem with eval. + + -- Herbert Xu Sun, 7 Dec 1997 20:19:00 +1100 + +ash (0.3.1-19) unstable; urgency=low + + * Fixed -e problem with command substitution. + + -- Herbert Xu Sun, 7 Dec 1997 19:44:49 +1100 + +ash (0.3.1-18) unstable; urgency=low + + * Do not link with ncurses (#15485). + + -- Herbert Xu Sun, 30 Nov 1997 12:00:11 +1100 + +ash (0.3.1-17) unstable; urgency=low + + * Set PATH like bash (#15238). + + -- Herbert Xu Wed, 26 Nov 1997 16:17:27 +1100 + +ash (0.3.1-16) unstable; urgency=low + + * Fixed incorrect assignment builtin code. + + -- Herbert Xu Mon, 24 Nov 1997 16:19:10 +1100 + +ash (0.3.1-15) unstable; urgency=low + + * hash now returns error codes (needed by the Linux kernel). + + -- Herbert Xu Sun, 23 Nov 1997 21:37:08 +1100 + +ash (0.3.1-14) unstable; urgency=low + + * Disabled word-splitting for assignment builtins. + + -- Herbert Xu Sun, 23 Nov 1997 12:45:15 +1100 + +ash (0.3.1-13) unstable; urgency=low + + * ! is now recognised even after &&/||. + + -- Herbert Xu Fri, 21 Nov 1997 22:09:05 +1100 + +ash (0.3.1-12) unstable; urgency=low + + * More fixes to the handling of SIGINT when forking. + + -- Herbert Xu Fri, 14 Nov 1997 15:14:32 +1100 + +ash (0.3.1-11) unstable; urgency=low + + * Ignore SIGINT when forking non-interactively. + + -- Herbert Xu Mon, 3 Nov 1997 12:00:02 +1100 + +ash (0.3.1-10) unstable; urgency=low + + * echo now handles options correctly. + * echo nolonger returns 0 if erorrs occured while writing to stdout. + * New code from GNU echo merged. + * Error messages from test now work. + + -- Herbert Xu Wed, 8 Oct 1997 21:47:13 +1000 + +ash (0.3.1-9) unstable; urgency=low + + * ! is recognised at pipeline level like bash. + + -- Herbert Xu Mon, 15 Sep 1997 23:13:45 +1000 + +ash (0.3.1-8) unstable; urgency=medium + + * Old patch regarding SIGCHLD in again. + + -- Herbert Xu Sun, 31 Aug 1997 11:20:27 +1000 + +ash (0.3.1-7) unstable; urgency=low + + * /bin/sh -e is behaving even better now (for loops within conditionals). + + -- Herbert Xu Sat, 23 Aug 1997 22:08:19 +1000 + +ash (0.3.1-6) unstable; urgency=low + + * /bin/sh -e is behaving better now. + + -- Herbert Xu Sat, 23 Aug 1997 13:16:26 +1000 + +ash (0.3.1-5) unstable; urgency=low + + * hash -v /dir/command doesn't coredump anymore. + * type /dir/command now works correctly. + + -- Herbert Xu Fri, 1 Aug 1997 20:48:19 +1000 + +ash (0.3.1-4) unstable; urgency=low + + * trap now understands symbolic signal names. + + -- Herbert Xu Sat, 26 Jul 1997 14:04:46 +1000 + +ash (0.3.1-3) unstable; urgency=low + + * Added the builtin test command. + + -- Herbert Xu Sun, 20 Jul 1997 15:00:14 +1000 + +ash (0.3.1-2) unstable; urgency=medium + + * Fixed a coredump involving $*. + + -- Herbert Xu Sat, 19 Jul 1997 12:03:02 +1000 + +ash (0.3.1-1) unstable; urgency=medium + + * NetBSD-current version as of 19970715. + * Fixed a "use after free" bug (#11294). + + -- Herbert Xu Fri, 18 Jul 1997 13:48:09 +1000 + +ash (0.3-1) unstable; urgency=low + + * Initial Release. + + -- Herbert Xu Thu, 19 Jun 1997 19:29:16 +1000 + --- dash-0.5.3.orig/debian/control +++ dash-0.5.3/debian/control @@ -0,0 +1,53 @@ +Source: dash +Section: shells +Priority: optional +Maintainer: Gerrit Pape +Build-Depends: po-debconf, dietlibc-dev [alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc] +Standards-Version: 3.7.2.2 + +Package: dash +Architecture: any +Pre-Depends: ${shlibs:Depends} +Description: The Debian Almquist Shell + "dash" is a POSIX compliant shell that is much smaller than "bash". + We take advantage of that by making it the shell on the installation + root floppy, where space is at a premium. + . + It can be usefully installed as /bin/sh (because it executes scripts + somewhat faster than "bash"), or as the default shell either of root + or of a second user with a userid of 0 (because it depends on fewer + libraries, and is therefore less likely to be affected by an upgrade + problem or a disk failure). It is also useful for checking that a + script uses only POSIX syntax. + . + "bash" is a better shell for most users, since it has some nice + features absent from "dash", and is a required part of the system. + +Package: dash-udeb +Architecture: any +Depends: ${shlibs:Depends} +Section: debian-installer +Priority: extra +Description: The Debian Almquist Shell for boot floppies + "dash" is a POSIX compliant shell that is much smaller than "bash". + We take advantage of that by making it the shell on the installation + root floppy, where space is at a premium. + . + It can be usefully installed as /bin/sh (because it executes scripts + somewhat faster than "bash"), or as the default shell either of root + or of a second user with a userid of 0 (because it depends on fewer + libraries, and is therefore less likely to be affected by an upgrade + problem or a disk failure). It is also useful for checking that a + script uses only POSIX syntax. + . + "bash" is a better shell for most users, since it has some nice + features absent from "dash", and is a required part of the system. + +Package: ash +Architecture: all +Pre-Depends: dash +Description: Compatibility package for the Debian Almquist Shell + This package exists so that users of the "ash" package can upgrade to the + "dash" package which replaces the former. It includes the /bin/ash symlink. + You can remove this package if you do not use /bin/ash explicitly. + --- dash-0.5.3.orig/debian/copyright +++ dash-0.5.3/debian/copyright @@ -0,0 +1,46 @@ +This package was debianized by Mark W. Eichin eichin@kitten.gen.ma.us on +Mon, 24 Feb 1997 16:00:16 -0500. + +This package was re-ported from NetBSD and debianized by +Herbert Xu herbert@debian.org on Thu, 19 Jun 1997 19:29:16 +1000. + +This package was adopted by Gerrit Pape on +Fri, 28 May 2004 18:38:18 +0000. + +It was downloaded from http://gondor.apana.org.au/~herbert/dash/files/ + +Copyright: + +Copyright (c) 1989-1994 + The Regents of the University of California. All rights reserved. +Copyright (c) 1997 Christos Zoulas. All rights reserved. +Copyright (c) 1997-2005 + Herbert Xu . All rights reserved. + +This code is derived from software contributed to Berkeley by Kenneth Almquist. + +Please refer to /usr/share/common-licenses/BSD for details. + +mksignames.c: + +This file is not directly linked with dash. However, its output is. + +Copyright (C) 1992 Free Software Foundation, Inc. + +This file is part of GNU Bash, the Bourne Again SHell. + +Bash is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Bash is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License with +your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with the +Debian GNU/Linux hello source package as the file COPYING. If not, +write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, +Boston, MA 02111 USA. --- dash-0.5.3.orig/debian/dash.config +++ dash-0.5.3/debian/dash.config @@ -0,0 +1,39 @@ +#!/bin/sh +# +# debconf script for the Debian GNU/Linux ash package +# +# $Id: dash.config,v 1.1 2002/09/14 06:17:50 herbert Exp $ + +set -e + +. /usr/share/debconf/confmodule + +db_version 2.0 + +if [ "$1" = configure ] && [ -z "$2" ]; then + set +e + db_fget ash/sh seen + err=$? + set -e + + case $err in + 0) + if [ "$RET" = true ]; then + db_fset dash/sh seen true + db_get ash/sh + db_set dash/sh "$RET" + exit + fi + ;; + 10) + # ash/sh does not exist + ;; + *) + echo "db_fget exited with $err" >&2 + exit $err + ;; + esac +fi + +db_input low dash/sh || true +db_go --- dash-0.5.3.orig/debian/dash.docs +++ dash-0.5.3/debian/dash.docs @@ -0,0 +1 @@ +debian/README.Debian.diet --- dash-0.5.3.orig/debian/dash.menu +++ dash-0.5.3/debian/dash.menu @@ -0,0 +1,5 @@ +?package(dash): \ + title="Dash"\ + needs="text"\ + section="Apps/Shells"\ + command="/bin/dash -i" --- dash-0.5.3.orig/debian/dash.postinst +++ dash-0.5.3/debian/dash.postinst @@ -0,0 +1,90 @@ +#!/bin/sh +set -e + +check_divert() { + div=$(dpkg-divert --list $2) + distrib=${4:-$2.distrib} + case "$1" in + true) + if [ -z "$div" ]; then + dpkg-divert --package dash --divert $distrib --add $2 + cp -dp $2 $distrib + ln -sf $3 $2 + fi + ;; + false) + if [ -n "$div" ] && [ -z "${div%%*by dash}" ]; then + mv $distrib $2 + dpkg-divert --remove $2 + fi + ;; + ash) + case $div in + '') + ;; + *by\ ash) + dst=${div% by ash} + dst=${dst##* to } + + # Work around dpkg-divert bug. + if [ -e "$dst" ]; then + mv "$dst" "$dst.dash-tmp" + fi + dpkg-divert --remove $2 + if [ -e "$dst.dash-tmp" ]; then + mv "$dst.dash-tmp" "$dst" + fi + + dpkg-divert --package dash --divert $distrib --add $2 + if [ "$dst" != $distrib ] && [ -e "$dst" ]; then + mv "$dst" $distrib + fi + ln -sf $3 $2 + ;; + *) + d=${2%/*} + if + [ -h $2 ] && [ -f $2 ] && [ -f $d/$5 ] && + cmp $2 $d/$5 + then + ln -sf $3 $2 + fi + ;; + esac + esac +} + +add_shell() { + if ! type add-shell > /dev/null 2>&1; then + return + fi + + add-shell /bin/dash +} + +debconf= +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + debconf=yes +fi + +if [ "$1" = configure ] && [ -z "$2" ]; then + check_divert ash /bin/sh dash '' ash + check_divert ash /usr/share/man/man1/sh.1.gz dash.1.gz \ + /usr/share/man/man1/sh.distrib.1.gz ash.1.gz + add_shell +elif [ "$1" = configure ] && dpkg --compare-versions "$2" lt 0.4.18; then + add_shell +fi + +if [ $debconf ]; then + db_get dash/sh + check_divert "$RET" /bin/sh dash + check_divert "$RET" /usr/share/man/man1/sh.1.gz dash.1.gz \ + /usr/share/man/man1/sh.distrib.1.gz +fi + +test "$1" = 'configure' || exit 0 +test -x /usr/bin/update-menus || exit 0 +test -z "$2" || dpkg --compare-versions "$2" lt 0.5.2-3 || exit 0 +exec update-menus --- dash-0.5.3.orig/debian/dash.postrm +++ dash-0.5.3/debian/dash.postrm @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +test "$1" != 'upgrade' || dpkg --compare-versions "$2" ge 0.5.2-3 || \ + test ! -x /usr/bin/update-menus || exec update-menus +test "$1" != 'remove' || test ! -x /usr/bin/update-menus || exec update-menus +test "$1" = 'purge' || exit 0 +test -e /usr/share/debconf/confmodule || exit 0 +. /usr/share/debconf/confmodule +db_purge --- dash-0.5.3.orig/debian/dash.prerm +++ dash-0.5.3/debian/dash.prerm @@ -0,0 +1,34 @@ +#!/bin/sh +# +# pre-removal script for the Debian GNU/Linux ash package +# +# $Id: dash.prerm,v 1.2 2003/09/03 10:42:08 herbert Exp $ + +set -e + +remove_divert() { + div=$(dpkg-divert --list $1) + if [ -n "$div" ] && [ -z "${div%%*by dash}" ]; then + distrib=${div% by dash} + distrib=${distrib##* to } + mv $distrib $1 + dpkg-divert --remove $1 + fi +} + +remove_shell() { + if ! type remove-shell > /dev/null 2>&1; then + return + fi + + remove-shell /bin/dash +} + +if [ "$1" = remove ] || [ "$1" = deconfigure ]; then + remove_divert /bin/sh + remove_divert /usr/share/man/man1/sh.1.gz +fi + +if [ "$1" = remove ]; then + remove_shell +fi --- dash-0.5.3.orig/debian/dash.templates.in +++ dash-0.5.3/debian/dash.templates.in @@ -0,0 +1,9 @@ +Template: dash/sh +Type: boolean +Default: false +_Description: Install dash as /bin/sh? + Bash is the default /bin/sh on a Debian system. However, since the Debian + policy requires all shell scripts using /bin/sh to be POSIX compliant, any + shell that conforms to POSIX can serve as /bin/sh. Since dash is POSIX + compliant, it can be used as /bin/sh. You may wish to do this because + dash is faster and smaller than bash. --- dash-0.5.3.orig/debian/implicit +++ dash-0.5.3/debian/implicit @@ -0,0 +1,93 @@ +# $Id: implicit,v 1.11 2005/11/29 21:57:55 pape Exp $ + +.PHONY: deb-checkdir deb-checkuid + +deb-checkdir: + @test -e debian/control || sh -cx '! : wrong directory' +deb-checkuid: + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb: %.deb-docs %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-docs $*.deb-docs-base \ + $*.deb-docs-docs $*.deb-docs-examples $*.deb-DEBIAN \ + $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.udeb: %.deb-DEBIAN + @rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \ + $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums + +%.deb-checkdir: + @test -d debian/$* || sh -cx '! : directory debian/$* missing' + @test "`id -u`" -eq 0 || sh -cx '! : need root privileges' + +%.deb-docs-base: + : implicit + @rm -f debian/$*/usr/share/doc/$*/* || : + @install -d -m0755 debian/$*/usr/share/doc/$* + : debian/$*/usr/share/doc/$*/ + @sh -cx 'install -m0644 debian/copyright debian/$*/usr/share/doc/$*/' + @sh -cx 'install -m0644 debian/changelog \ + debian/$*/usr/share/doc/$*/changelog.Debian' + @test ! -r changelog || \ + sh -cx 'install -m0644 changelog debian/$*/usr/share/doc/$*/' + @test -r debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \ + debian/$*/usr/share/doc/$*/changelog' + @test -s debian/$*/usr/share/doc/$*/changelog || \ + sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog' + @gzip -9 debian/$*/usr/share/doc/$*/changelog* +%.deb-docs-docs: + @for i in `cat debian/$*.docs 2>/dev/null || :`; do \ + if test -d $$i; then \ + sh -cx "install -d -m0755 debian/$*/usr/share/doc/$*/$${i##*/}" && \ + for j in $$i/*; do \ + sh -cx "install -m0644 $$j \ + debian/$*/usr/share/doc/$*/$${i##*/}/" || exit 1; \ + done || exit 1; \ + continue; \ + fi; \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/" || exit 1; \ + done + @test ! -r debian/$*.README.Debian || \ + sh -cx 'install -m0644 debian/$*.README.Debian \ + debian/$*/usr/share/doc/$*/README.Debian' + @if test -r debian/$*.NEWS.Debian; then \ + sh -cx 'install -m0644 debian/$*.NEWS.Debian \ + debian/$*/usr/share/doc/$*/NEWS.Debian && \ + gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \ + fi +%.deb-docs-examples: + @rm -rf debian/$*/usr/share/doc/$*/examples + : debian/$*/usr/share/doc/$*/examples/ + @test ! -r debian/$*.examples || \ + install -d -m0755 debian/$*/usr/share/doc/$*/examples + @for i in `cat debian/$*.examples 2>/dev/null || :`; do \ + sh -cx "install -m0644 $$i debian/$*/usr/share/doc/$*/examples/" \ + || exit 1; \ + done +%.deb-docs: %.deb-checkdir %.deb-docs-base %.deb-docs-docs %.deb-docs-examples + : debian/$*/usr/share/doc/$*/ ok + +%.deb-DEBIAN-base: + @rm -rf debian/$*/DEBIAN + : debian/$*/DEBIAN/ + @install -d -m0755 debian/$*/DEBIAN + @for i in conffiles shlibs templates; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-scripts: + @for i in preinst prerm postinst postrm config; do \ + test ! -r debian/$*.$$i || \ + sh -cx "install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i" \ + || exit 1; \ + done +%.deb-DEBIAN-md5sums: + : debian/$*/DEBIAN/md5sums + @rm -f debian/$*/DEBIAN/md5sums + @cd debian/$* && find * -path 'DEBIAN' -prune -o \ + -type f -exec md5sum {} >>DEBIAN/md5sums \; +%.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \ + %.deb-DEBIAN-md5sums + : debian/$*/DEBIAN/ ok --- dash-0.5.3.orig/debian/rules +++ dash-0.5.3/debian/rules @@ -0,0 +1,121 @@ +#!/usr/bin/make -f + +CC =cc +CFLAGS =-g -O2 -Wall +CCUDEB =diet -v -Os gcc +CFLAGSUDEB =-nostdinc -g -DREALLY_SMALL -Wall +STRIP =strip + +DIET_ARCHS =alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc +ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH) +ifeq (,$(findstring $(ARCH),$(DIET_ARCHS))) + CCUDEB =$(CC) + CFLAGSUDEB =-g -Os -DREALLY_SMALL -Wall +endif +ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS))) + CC =diet -v -Os gcc + CFLAGS =-nostdinc -Wall +endif +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP =: strip +endif + +DIR =$(shell pwd)/debian/dash +DIRA =$(shell pwd)/debian/ash + +patch: deb-checkdir patch-stamp +patch-stamp: + for i in `ls -t debian/diff/*.diff || :`; do \ + patch -p1 <$$i || exit 1; \ + done + touch patch-stamp + +configure: deb-checkdir configure-stamp configure-udeb-stamp +configure-stamp: patch-stamp + mkdir -p build-tmp + (cd build-tmp && CC='$(CC)' CFLAGS='$(CFLAGS)' \ + exec ../configure --host='$(DEB_HOST_GNU_TYPE)') + touch configure-stamp +configure-udeb-stamp: patch-stamp + mkdir -p build-udeb-tmp + (cd build-udeb-tmp && CC='$(CCUDEB)' CFLAGS='$(CFLAGSUDEB)' \ + exec ../configure --host='$(DEB_HOST_GNU_TYPE)') + touch configure-udeb-stamp + +build: deb-checkdir build-stamp build-udeb-stamp +build-stamp: configure-stamp + -gcc -v + (cd build-tmp && exec $(MAKE) CFLAGS='$(CFLAGS)') + touch build-stamp +build-udeb-stamp: configure-udeb-stamp + -gcc -v + (cd build-udeb-tmp && exec $(MAKE) CFLAGS='$(CFLAGSUDEB)') + touch build-udeb-stamp + +po-templates: po-templates-stamp +po-templates-stamp: deb-checkdir + po2debconf debian/dash.templates.in >debian/dash.templates + touch po-templates-stamp + +clean: deb-checkdir deb-checkuid + rm -rf build-tmp build-udeb-tmp + test ! -e patch-stamp || \ + for i in `ls -tr debian/diff/*.diff || :`; do patch -p1 -R <$$i; done + rm -f configure-stamp configure-udeb-stamp patch-stamp build-stamp \ + build-udeb-stamp po-templates-stamp + rm -rf '$(DIR)' '$(DIR)'-udeb '$(DIRA)' + rm -f debian/files debian/substvars debian/dash.templates changelog + +install: install-indep install-arch +install-indep: deb-checkdir deb-checkuid + rm -rf '$(DIRA)' + install -d -m0755 '$(DIRA)'/bin + ln -s dash '$(DIRA)'/bin/ash + install -d -m0755 '$(DIRA)'/usr/share/man/man1/ + ln -s dash.1.gz '$(DIRA)'/usr/share/man/man1/ash.1.gz + # changelog + test -r changelog || ln -s ChangeLog changelog +install-arch: deb-checkdir deb-checkuid build-stamp build-udeb-stamp + # dash + rm -rf '$(DIR)' + install -d -m0755 '$(DIR)'/bin + install -m0755 build-tmp/src/dash '$(DIR)'/bin/dash + $(STRIP) -R .comment -R .note '$(DIR)'/bin/dash + install -d -m0755 '$(DIR)'/usr/share/man/man1/ + install -m0644 src/dash.1 '$(DIR)'/usr/share/man/man1/dash.1 + gzip -9 '$(DIR)'/usr/share/man/man1/dash.1 + install -d -m0755 '$(DIR)'/usr/share/menu + install -m0644 debian/dash.menu '$(DIR)'/usr/share/menu/dash + # dash-udeb + rm -rf '$(DIR)'-udeb + install -d -m0755 '$(DIR)'-udeb/bin + install -m0755 build-udeb-tmp/src/dash '$(DIR)'-udeb/bin/dash + $(STRIP) -R .comment -R .note '$(DIR)'-udeb/bin/dash + ln -s dash '$(DIR)'-udeb/bin/sh + # changelog + test -r changelog || ln -s ChangeLog changelog + +binary: binary-indep binary-arch +binary-indep: install-indep ash.deb + dpkg-gencontrol -isp -pash -P'$(DIRA)' + dpkg -b '$(DIRA)' .. +binary-arch: install-arch po-templates dash.deb dash-udeb.udeb + # dash + rm -f debian/substvars + test '$(CC)' != 'cc' || dpkg-shlibdeps '$(DIR)'/bin/dash + dpkg-gencontrol -isp -pdash -P'$(DIR)' + dpkg -b '$(DIR)' .. + # dash-udeb + rm -f debian/substvars + test '$(CCUDEB)' != 'cc' || dpkg-shlibdeps '$(DIR)'-udeb/bin/dash + dpkg-gencontrol -isp -pdash-udeb -P'$(DIR)'-udeb + dpkg -b '$(DIR)'-udeb .. + for i in ../dash-udeb_*.deb; do mv $$i $${i%deb}udeb; done + sed -e '/^[^ ]*\.udeb/d;s/^\(dash-udeb_[^ ]*\.\)deb/\1udeb/' \ + debian/files.new + mv debian/files.new debian/files + +.PHONY: configure build po-templates clean patch install install-indep \ + install-arch binary binary-indep binary-arch + +include debian/implicit