[csw-devel] SF.net SVN: gar:[8062] csw/mgar/pkg/bashdb/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Jan 18 08:50:23 CET 2010
Revision: 8062
http://gar.svn.sourceforge.net/gar/?rev=8062&view=rev
Author: dmichelsen
Date: 2010-01-18 07:50:23 +0000 (Mon, 18 Jan 2010)
Log Message:
-----------
bashdb: Commit patched form upstream
Modified Paths:
--------------
csw/mgar/pkg/bashdb/trunk/Makefile
csw/mgar/pkg/bashdb/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch
csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch
csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch
csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch
Modified: csw/mgar/pkg/bashdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bashdb/trunk/Makefile 2010-01-18 07:49:09 UTC (rev 8061)
+++ csw/mgar/pkg/bashdb/trunk/Makefile 2010-01-18 07:50:23 UTC (rev 8062)
@@ -1,5 +1,5 @@
GARNAME = bashdb
-GARVERSION = 0_gitcurrent
+GARVERSION = 4.0-0.4
# PATCHLEVEL = 75eadce
CATEGORIES = utils
@@ -9,14 +9,22 @@
endef
# MASTER_SITES = http://cloud.github.com/downloads/rocky/bashdb/
-GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb
-GIT_USE_PROXY = 1
+# GIT_REPOS = git://bashdb.git.sourceforge.net/gitroot/bashdb/bashdb/
+# GIT_USE_PROXY = 1
# GIT_TREEISH_zshdb.git = $(PATCHLEVEL)
-# DISTFILES = $(DISTNAME).tar.gz
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES = $(DISTNAME).tar.bz2
+# PATCHFILES = $(notdir $(wildcard $(FILEDIR)/*.patch))
+# PATCHFILES = 0001-sf-Piwik-analytics.patch
+PATCHFILES += 0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
+PATCHFILES += 0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
+PATCHFILES += 0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch
+# PATCHFILES += 0005-Administrivia.patch
+PATCHFILES += 0006-sig-SunOS.right-is-same-as-sig-41.right.patch
# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
REQUIRED_PKGS = CSWbash
@@ -28,6 +36,6 @@
include gar/category.mk
-post-extract-isa-sparcv8:
- cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash
- @$(MAKECOOKIE)
+#post-extract-isa-sparcv8:
+# cd $(WORKSRC) && ./autogen.sh --with-bash=/opt/csw/bin/bash
+# @$(MAKECOOKIE)
Modified: csw/mgar/pkg/bashdb/trunk/checksums
===================================================================
--- csw/mgar/pkg/bashdb/trunk/checksums 2010-01-18 07:49:09 UTC (rev 8061)
+++ csw/mgar/pkg/bashdb/trunk/checksums 2010-01-18 07:50:23 UTC (rev 8062)
@@ -1 +1,6 @@
-faab06bdb35626033fd795d9c1ccfd41 zshdb-0.04.tar.gz
+ff1262d4ab1f61ac1223cb21c7887b88 0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
+028815125c41c1b37a77c38c3ca684f3 0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
+4b47af8460ffdfec3101aac858296373 0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch
+79335104890385a5b0d8f0f47a7261b3 0005-Administrivia.patch
+4d2b0f7d3999219d4aa29968d08e3eef 0006-sig-SunOS.right-is-same-as-sig-41.right.patch
+eb411b64d27ccbd0093789e9e945a589 bashdb-4.0-0.4.tar.bz2
Added: csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch
===================================================================
--- csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch (rev 0)
+++ csw/mgar/pkg/bashdb/trunk/files/0001-sf-Piwik-analytics.patch 2010-01-18 07:50:23 UTC (rev 8062)
@@ -0,0 +1,86 @@
+From 5079f62fe84e27158aca58e6850cadd4b1b859ca Mon Sep 17 00:00:00 2001
+From: rocky <rocky at gnu.org>
+Date: Tue, 27 Oct 2009 04:29:43 +0000
+Subject: [PATCH 1/6] sf Piwik analytics.
+
+---
+ ChangeLog | 4 ++++
+ htdocs/index.html | 39 +++++++++++++++++++++++++--------------
+ 2 files changed, 29 insertions(+), 14 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index fa08646..85754af 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,9 @@
+ 2009-10-27 rocky <rocky at gnu.org>
+
++ * ChangeLog, NEWS: See previous
++
++2009-10-27 rocky <rocky at gnu.org>
++
+ * ChangeLog, NEWS: One more change noted
+
+ 2009-10-27 rocky <rocky at gnu.org>
+diff --git a/htdocs/index.html b/htdocs/index.html
+index da63b85..dd30324 100644
+--- a/htdocs/index.html
++++ b/htdocs/index.html
+@@ -129,6 +129,18 @@ tt
+
+ <body alink="#FF0000" bgcolor="#FFFFFF" link="#1F00FF" text=
+ "#000000" vlink="#9900DD">
++<!-- Piwik -->
++<script type="text/javascript">
++var pkBaseURL = (("https:" == document.location.protocol) ? "https://sourceforge.net/apps/piwik/bashdb/" : "http://sourceforge.net/apps/piwik/bashdb/");
++document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
++</script><script type="text/javascript">
++piwik_action_name = '';
++piwik_idsite = 1;
++piwik_url = pkBaseURL + "piwik.php";
++piwik_log(piwik_action_name, piwik_idsite, piwik_url);
++</script>
++<object><noscript><p><img src="http://sourceforge.net/apps/piwik/bashdb/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
++<!-- End Piwik Tag -->
+ <div id="container">
+ <h1>BASH Debugger</h1>
+
+@@ -196,22 +208,21 @@ repository</a></li>
+
+ <p>
+
+-<p class="credit">$Id: index.html,v 1.2 2009/03/02 02:52:28 rockyb Exp $</p>
+- <p>
+- <a href="http://validator.w3.org/check?uri=referer">
++<p>
++ <a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0"
+- src="http://www.w3.org/Icons/valid-html401-blue"
+- alt="Valid HTML 4.01 Transitional" height="31" width="88"></a>
+- <a href="http://jigsaw.w3.org/css-validator/check?uri=referer">
++ src="http://www.w3.org/Icons/valid-html401-blue"
++ alt="Valid HTML 4.01 Transitional" height="31" width="88"></a>
++ <a href="http://jigsaw.w3.org/css-validator/check?uri=referer">
+ <img style="border:0;width:88px;height:31px"
+- src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+- alt="Valid CSS!">
+- </a>
+- <a href="http://sourceforge.net/">
+- <img src="sflogo.png" alt="SourceForge Logo"
+- border="0" height="31" width="88">
+- </a>
+- </p>
++ src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
++ alt="Valid CSS!">
++ </a>
++ <a href="http://sourceforge.net/">
++ <img src="sflogo.png" alt="SourceForge Logo"
++ border="0" height="31" width="88">
++ </a>
++</p>
+ </div>
+ </body>
+ </html>
+--
+1.6.2.1
+
Added: csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
===================================================================
--- csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch (rev 0)
+++ csw/mgar/pkg/bashdb/trunk/files/0002-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch 2010-01-18 07:50:23 UTC (rev 8062)
@@ -0,0 +1,350 @@
+From 146bf13599cb835e8efdb8a4402286ac46ffe8c7 Mon Sep 17 00:00:00 2001
+From: rocky <rocky at gnu.org>
+Date: Sun, 20 Dec 2009 18:25:07 +0100
+Subject: [PATCH 2/6] Tolerance for Solaris and older sed, sh and whatnot
+
+---
+ configure.ac | 4 ++
+ test/data/sig-SunOS.right | 63 +++++++++++++++++++++++++++++++++++
+ test/integration/check-common.sh.in | 2 +-
+ test/integration/settrace.tests | 4 +-
+ test/integration/test-interrupt | 7 +++-
+ test/integration/test-misc | 6 ++--
+ test/integration/test-misc.in | 35 +++++++++++++++++++
+ test/integration/test-multi | 2 +-
+ test/integration/test-parm | 2 +-
+ test/integration/test-setshow | 6 ++--
+ test/integration/test-setshow.in | 26 ++++++++++++++
+ test/integration/test-settrace | 2 +-
+ test/integration/test-sig | 2 +
+ test/integration/test-subshell | 2 +-
+ test/integration/test-tbreak | 2 +-
+ test/integration/test-trace | 2 +-
+ 16 files changed, 151 insertions(+), 16 deletions(-)
+ create mode 100644 test/data/sig-SunOS.right
+ create mode 100755 test/integration/test-misc.in
+ create mode 100755 test/integration/test-setshow.in
+
+diff --git a/configure.ac b/configure.ac
+index 15ddaf5..fa151e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -242,6 +242,10 @@ AC_CONFIG_FILES([test/unit/test-save-restore.sh],
+ AC_CONFIG_FILES([test/unit/test-set0.sh], [chmod +x test/unit/test-set0.sh])
+ AC_CONFIG_FILES([test/unit/test-sort.sh],
+ [chmod +x test/unit/test-sort.sh])
++AC_CONFIG_FILES([test/integration/test-misc],
++ [chmod +x test/integration/test-misc])
++AC_CONFIG_FILES([test/integration/test-setshow],
++ [chmod +x test/integration/test-setshow])
+
+ AC_CONFIG_FILES([ \
+ bashdb-main.inc \
+diff --git a/test/data/sig-SunOS.right b/test/data/sig-SunOS.right
+new file mode 100644
+index 0000000..4656d84
+--- /dev/null
++++ b/test/data/sig-SunOS.right
+@@ -0,0 +1,63 @@
++(sig.sh:7):
++7: if [[ "$1"x != x ]] ; then
+++# Test that debugged program's signals are saved and restored across
+++# debug calls.
+++### Testing that we have our signal set up...
+++info signals
++Signal Stop Print Stack Value
++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
++SIGINT stop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT
++SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT
++SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL
++SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP
++SIGTERM stop print showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM
+++### Testing handle command...
+++handle TERM nostack
+++handle foo
++Bad signal name: foo
+++handle 1000
++Bad signal number: 1000
+++handle TERM bogus
++Need to give a command: stop, nostop, stack, nostack, print, noprint
+++eval kill -TERM $$
++Program received signal SIGTERM (15)...
+++### Should not have printed a stack trace above...
+++handle TERM noprint
+++handle TERM stack
+++handle INT nostop
+++eval kill -TERM $$
+++info signals
++Signal Stop Print Stack Value
++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
++EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
++SIGINT nostop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT
++SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT
++SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL
++SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP
++SIGTERM stop noprint showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM
+++continue
++Program received signal SIGTERM (15)...
++->0 in file `eval.sh' at line 1
++##1 _Dbg_do_eval("kill", "-TERM", "$$") called from file `processor.sh' at line 402
++##2 _Dbg_onecmd("eval", "kill -TERM $$") called from file `processor.sh' at line 167
++##3 _Dbg_process_commands() called from file `hook.sh' at line 188
++##4 _Dbg_debug_trap_handler("0", "[[ "$1"x != x ]]") called from file `sig.sh' at line 7
++##5 source("sig.sh") called from file `bashdb' at line 157
++##6 main() called from file `bashdb' at line 0
+++### Should have printed a stack trace above...
+++continue
+++where 1
++->0 in file `sig.sh' at line 1
+++continue
++Program received signal SIGINT (2)...
++->0 in file `sig.sh' at line 1
++##1 source("sig.sh") called from file `bashdb' at line 157
++##2 main() called from file `bashdb' at line 0
++Program received signal SIGINT (2)...
++->0 in file `sig.sh' at line 1
++##1 source("sig.sh") called from file `bashdb' at line 157
++##2 main() called from file `bashdb' at line 0
++Debugged program terminated normally. Use q to quit or R to restart.
+++kill
++sig.tests: line 12: 28364 Killed $SH ${top_builddir}/bashdb -B -q -L $top_builddir -x $cmdfile $debugged_script
+diff --git a/test/integration/check-common.sh.in b/test/integration/check-common.sh.in
+index c5d8053..c5c1532 100644
+--- a/test/integration/check-common.sh.in
++++ b/test/integration/check-common.sh.in
+@@ -3,7 +3,7 @@
+
+ srcdir=@srcdir@
+ builddir=@builddir@
+-[ -z "$SH" ] && SH=@SH_PROG@
++[ -z "$SH" ] && export SH=@SH_PROG@
+
+ export top_builddir=@abs_top_builddir@
+ export top_srcdir=@abs_top_srcdir@
+diff --git a/test/integration/settrace.tests b/test/integration/settrace.tests
+index 2f741cc..8c25943 100755
+--- a/test/integration/settrace.tests
++++ b/test/integration/settrace.tests
+@@ -1,10 +1,10 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # -*- shell-script -*-
+ #$Id: settrace.tests,v 1.1 2008/08/22 19:25:06 rockyb Exp $
+
+ [ -z "$srcdir" ] && export srcdir=$PWD
+ [ -z "$builddir" ] && export builddir=$PWD
+-[ -z "$top_builddir" ] && export top_builddir=$builddir/..
++[ -z "$top_builddir" ] && export top_builddir=$builddir/../..
+
+ cmdfile=${top_builddir}/test/data/settrace.cmd
+ debugged_script="$top_builddir/test/example/settrace.sh"
+diff --git a/test/integration/test-interrupt b/test/integration/test-interrupt
+index 9977a68..2a6f63d 100755
+--- a/test/integration/test-interrupt
++++ b/test/integration/test-interrupt
+@@ -5,7 +5,12 @@
+
+ . ${builddir}/check-common.sh
+
+-[[ $host_os == cygwin ]] || [[ $host_os = darwin* ]] && exit 77
++case $host_os in
++ cygwin | darwin* | solaris* )
++ exit ;;
++ * )
++ break ;;
++esac
+
+ TEST_NAME=interrupt
+ TEST_FILE="$builddir/${TEST_NAME}.check"
+diff --git a/test/integration/test-misc b/test/integration/test-misc
+index 818f56d..80f387a 100755
+--- a/test/integration/test-misc
++++ b/test/integration/test-misc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/opt/csw/bin/bash
+ # -*- shell-script -*-
+ #$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $
+
+@@ -16,8 +16,8 @@ debugged_script="$top_builddir/test/example/dbg-test2.sh"
+
+ # Different OS's handle ARGV differently, and "info args" may come out
+ # differently depending on that.
+-cat ${TEST_FILE} | sed -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \
+-| sed -e 's:record the command history is .*:record the command history is: ' \
++cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \
++| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \
+ > ${TEST_FILTERED_FILE}
+
+ if (( BASH_VERSINFO[0] > 4 || \
+diff --git a/test/integration/test-misc.in b/test/integration/test-misc.in
+new file mode 100755
+index 0000000..84ad349
+--- /dev/null
++++ b/test/integration/test-misc.in
+@@ -0,0 +1,35 @@
++#!@SH_PROG@
++# -*- shell-script -*-
++#$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $
++
++[ -z "$srcdir" ] && export srcdir=$PWD
++[ -z "$builddir" ] && export builddir=$PWD
++[ -z "$top_builddir" ] && export top_builddir=$builddir/../..
++
++TEST_NAME='misc'
++
++. ${top_builddir}/test/integration/check-common.sh
++
++debugged_script="$top_builddir/test/example/dbg-test2.sh"
++
++(cd $srcdir && run_debugger $debugged_script 2>&1 >$TEST_FILE </dev/null)
++
++# Different OS's handle ARGV differently, and "info args" may come out
++# differently depending on that.
++cat ${TEST_FILE} | @SED@ -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \
++| @SED@ -e 's:record the command history is .*:record the command history is: ' \
++> ${TEST_FILTERED_FILE}
++
++if (( BASH_VERSINFO[0] > 4 || \
++ (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then
++ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-output-41.right"
++fi
++
++check_output $TEST_FILTERED_FILE $RIGHT_FILE
++rc=$?
++
++((0 != rc)) && exit $rc
++rm -f $TEST_FILE
++
++# Return code tells testing mechanism whether passed or not.
++exit 0
+diff --git a/test/integration/test-multi b/test/integration/test-multi
+index c9469e7..6443b66 100755
+--- a/test/integration/test-multi
++++ b/test/integration/test-multi
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # -*- shell-script -*-
+ #$Id: test-multi,v 1.2 2008/08/23 16:56:21 rockyb Exp $
+
+diff --git a/test/integration/test-parm b/test/integration/test-parm
+index c330c64..15d988e 100755
+--- a/test/integration/test-parm
++++ b/test/integration/test-parm
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # -*- shell-script -*-
+ #$Id: test-parm,v 1.2 2008/08/23 16:56:21 rockyb Exp $
+
+diff --git a/test/integration/test-setshow b/test/integration/test-setshow
+index 612a03b..deeb3ba 100755
+--- a/test/integration/test-setshow
++++ b/test/integration/test-setshow
+@@ -1,4 +1,4 @@
+-#!/bin/bash -f
++#!/opt/csw/bin/bash -f
+ # -*- shell-script -*-
+ #$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $
+
+@@ -12,8 +12,8 @@ TEST_NAME='setshow'
+
+ (cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null)
+
+-cat ${TEST_FILE} | sed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \
+-| sed -e 's:record the command history is .*:record the command history is: ' \
++cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \
++| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \
+ > ${TEST_FILTERED_FILE}
+
+ check_output $TEST_FILTERED_FILE $RIGHT_FILE
+diff --git a/test/integration/test-setshow.in b/test/integration/test-setshow.in
+new file mode 100755
+index 0000000..8be8546
+--- /dev/null
++++ b/test/integration/test-setshow.in
+@@ -0,0 +1,26 @@
++#!@SH_PROG@ -f
++# -*- shell-script -*-
++#$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $
++
++[ -z "$srcdir" ] && export srcdir=$PWD
++[ -z "$builddir" ] && export builddir=$PWD
++[ -z "$top_builddir" ] && export top_builddir=$builddir/../..
++
++TEST_NAME='setshow'
++
++. ${top_builddir}/test/integration/check-common.sh
++
++(cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null)
++
++cat ${TEST_FILE} | @SED@ -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \
++| @SED@ -e 's:record the command history is .*:record the command history is: ' \
++> ${TEST_FILTERED_FILE}
++
++check_output $TEST_FILTERED_FILE $RIGHT_FILE
++rc=$?
++
++((0 != rc)) && exit $rc
++rm -f $TEST_FILE
++
++# Return code tells testing mechanism whether passed or not.
++exit 0
+diff --git a/test/integration/test-settrace b/test/integration/test-settrace
+index a176850..f6b66f7 100755
+--- a/test/integration/test-settrace
++++ b/test/integration/test-settrace
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # -*- shell-script -*-
+ #$Id: test-settrace,v 1.2 2008/08/23 16:56:21 rockyb Exp $
+
+diff --git a/test/integration/test-sig b/test/integration/test-sig
+index f968e03..98b2359 100755
+--- a/test/integration/test-sig
++++ b/test/integration/test-sig
+@@ -15,6 +15,8 @@ if (( BASH_VERSINFO[0] > 4 || \
+ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-41.right"
+ elif [[ $(uname -s) == 'Darwin' ]] ; then
+ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-Darwin.right"
++elif [[ $(uname -s) == 'SunOS' ]] ; then
++ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-SunOS.right"
+ fi
+ FILTERED_TEST_FILE="/tmp/${TEST_NAME}-filtered.check"
+ FILTERED_RIGHT_FILE="/tmp/${TEST_NAME}-filtered.right"
+diff --git a/test/integration/test-subshell b/test/integration/test-subshell
+index 7144b20..7c92aa8 100755
+--- a/test/integration/test-subshell
++++ b/test/integration/test-subshell
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # -*- shell-script -*-
+ #$Id: test-subshell,v 1.3 2008/08/29 02:55:44 rockyb Exp $
+
+diff --git a/test/integration/test-tbreak b/test/integration/test-tbreak
+index f078829..7891c83 100755
+--- a/test/integration/test-tbreak
++++ b/test/integration/test-tbreak
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # -*- shell-script -*-
+ #$Id: test-tbreak,v 1.2 2008/08/23 16:56:21 rockyb Exp $
+
+diff --git a/test/integration/test-trace b/test/integration/test-trace
+index 409f597..85c8340 100755
+--- a/test/integration/test-trace
++++ b/test/integration/test-trace
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ # -*- shell-script -*-
+ #$Id: test-trace,v 1.2 2008/08/23 16:56:21 rockyb Exp $
+
+--
+1.6.2.1
+
Added: csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch
===================================================================
--- csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch (rev 0)
+++ csw/mgar/pkg/bashdb/trunk/files/0003-Tolerance-for-Solaris-and-older-sed-sh-and-whatnot.patch 2010-01-18 07:50:23 UTC (rev 8062)
@@ -0,0 +1,38 @@
+From 92da4be05ec48c9c07b19527fa26cad088e6ec3c Mon Sep 17 00:00:00 2001
+From: rocky <rocky at gnu.org>
+Date: Sun, 20 Dec 2009 18:27:17 +0100
+Subject: [PATCH 3/6] Tolerance for Solaris and older sed, sh and whatnot - forgot to add new files to distro
+
+---
+ test/data/Makefile.am | 1 +
+ test/integration/Makefile.am | 2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/test/data/Makefile.am b/test/data/Makefile.am
+index f44b617..071aaf1 100644
+--- a/test/data/Makefile.am
++++ b/test/data/Makefile.am
+@@ -69,6 +69,7 @@ check_DATA = \
+ sig.right \
+ sig-41.right \
+ sig-Darwin.right \
++ sig-SunOS.right \
+ skip.cmd \
+ skip.right \
+ sopts.right \
+diff --git a/test/integration/Makefile.am b/test/integration/Makefile.am
+index f64ab30..0708330 100644
+--- a/test/integration/Makefile.am
++++ b/test/integration/Makefile.am
+@@ -16,6 +16,8 @@ check_DATA = \
+ subshell2.tests \
+ subshell3.tests \
+ subshell4.tests \
++ test-misc.in \
++ test-setshow.in \
+ trace.tests \
+ trace2.tests
+
+--
+1.6.2.1
+
Added: csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch
===================================================================
--- csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch (rev 0)
+++ csw/mgar/pkg/bashdb/trunk/files/0004-Looks-like-sig-line-fixes-back-ported-to-bash-4.0.-N.patch 2010-01-18 07:50:23 UTC (rev 8062)
@@ -0,0 +1,177 @@
+From d2c95b0e62f91e3d47e8fd7e1300a00d332bd9a2 Mon Sep 17 00:00:00 2001
+From: rocky <rocky at gnu.org>
+Date: Sun, 20 Dec 2009 12:53:32 -0500
+Subject: [PATCH 4/6] Looks like sig line fixes back ported to bash 4.0. No need for a SunOS-specific file.
+
+test-misc and test-setshow are derived from .in files.
+---
+ test/data/sig-SunOS.right | 63 -----------------------------------------
+ test/integration/test-misc | 35 ----------------------
+ test/integration/test-setshow | 26 -----------------
+ test/integration/test-sig | 4 +--
+ 4 files changed, 1 insertions(+), 127 deletions(-)
+ delete mode 100644 test/data/sig-SunOS.right
+ delete mode 100755 test/integration/test-misc
+ delete mode 100755 test/integration/test-setshow
+
+diff --git a/test/data/sig-SunOS.right b/test/data/sig-SunOS.right
+deleted file mode 100644
+index 4656d84..0000000
+--- a/test/data/sig-SunOS.right
++++ /dev/null
+@@ -1,63 +0,0 @@
+-(sig.sh:7):
+-7: if [[ "$1"x != x ]] ; then
+-+# Test that debugged program's signals are saved and restored across
+-+# debug calls.
+-+### Testing that we have our signal set up...
+-+info signals
+-Signal Stop Print Stack Value
+-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
+-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
+-SIGINT stop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT
+-SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT
+-SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL
+-SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP
+-SIGTERM stop print showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM
+-+### Testing handle command...
+-+handle TERM nostack
+-+handle foo
+-Bad signal name: foo
+-+handle 1000
+-Bad signal number: 1000
+-+handle TERM bogus
+-Need to give a command: stop, nostop, stack, nostack, print, noprint
+-+eval kill -TERM $$
+-Program received signal SIGTERM (15)...
+-+### Should not have printed a stack trace above...
+-+handle TERM noprint
+-+handle TERM stack
+-+handle INT nostop
+-+eval kill -TERM $$
+-+info signals
+-Signal Stop Print Stack Value
+-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
+-EXIT stop noprint nostack trap -- '_Dbg_exit_handler "$BASH_COMMAND"' EXIT
+-SIGINT nostop print showstack trap -- '_Dbg_sig_handler 2 "$BASH_COMMAND" "$@"' SIGINT
+-SIGQUIT stop print showstack trap -- '_Dbg_sig_handler 3 "$BASH_COMMAND" "$@"' SIGQUIT
+-SIGILL stop print showstack trap -- '_Dbg_sig_handler 4 "$BASH_COMMAND" "$@"' SIGILL
+-SIGTRAP stop print showstack trap -- '_Dbg_sig_handler 5 "$BASH_COMMAND" "$@"' SIGTRAP
+-SIGTERM stop noprint showstack trap -- '_Dbg_sig_handler 15 "$BASH_COMMAND" "$@"' SIGTERM
+-+continue
+-Program received signal SIGTERM (15)...
+-->0 in file `eval.sh' at line 1
+-##1 _Dbg_do_eval("kill", "-TERM", "$$") called from file `processor.sh' at line 402
+-##2 _Dbg_onecmd("eval", "kill -TERM $$") called from file `processor.sh' at line 167
+-##3 _Dbg_process_commands() called from file `hook.sh' at line 188
+-##4 _Dbg_debug_trap_handler("0", "[[ "$1"x != x ]]") called from file `sig.sh' at line 7
+-##5 source("sig.sh") called from file `bashdb' at line 157
+-##6 main() called from file `bashdb' at line 0
+-+### Should have printed a stack trace above...
+-+continue
+-+where 1
+-->0 in file `sig.sh' at line 1
+-+continue
+-Program received signal SIGINT (2)...
+-->0 in file `sig.sh' at line 1
+-##1 source("sig.sh") called from file `bashdb' at line 157
+-##2 main() called from file `bashdb' at line 0
+-Program received signal SIGINT (2)...
+-->0 in file `sig.sh' at line 1
+-##1 source("sig.sh") called from file `bashdb' at line 157
+-##2 main() called from file `bashdb' at line 0
+-Debugged program terminated normally. Use q to quit or R to restart.
+-+kill
+-sig.tests: line 12: 28364 Killed $SH ${top_builddir}/bashdb -B -q -L $top_builddir -x $cmdfile $debugged_script
+diff --git a/test/integration/test-misc b/test/integration/test-misc
+deleted file mode 100755
+index 80f387a..0000000
+--- a/test/integration/test-misc
++++ /dev/null
+@@ -1,35 +0,0 @@
+-#!/opt/csw/bin/bash
+-# -*- shell-script -*-
+-#$Id: test-misc,v 1.3 2008/08/23 17:09:36 rockyb Exp $
+-
+-[ -z "$srcdir" ] && export srcdir=$PWD
+-[ -z "$builddir" ] && export builddir=$PWD
+-[ -z "$top_builddir" ] && export top_builddir=$builddir/../..
+-
+-TEST_NAME='misc'
+-
+-. ${top_builddir}/test/integration/check-common.sh
+-
+-debugged_script="$top_builddir/test/example/dbg-test2.sh"
+-
+-(cd $srcdir && run_debugger $debugged_script 2>&1 >$TEST_FILE </dev/null)
+-
+-# Different OS's handle ARGV differently, and "info args" may come out
+-# differently depending on that.
+-cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:1 = .*/dbg-test2.sh:1 = ./example/dbg-test2.sh:" \
+-| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \
+-> ${TEST_FILTERED_FILE}
+-
+-if (( BASH_VERSINFO[0] > 4 || \
+- (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then
+- RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-output-41.right"
+-fi
+-
+-check_output $TEST_FILTERED_FILE $RIGHT_FILE
+-rc=$?
+-
+-((0 != rc)) && exit $rc
+-rm -f $TEST_FILE
+-
+-# Return code tells testing mechanism whether passed or not.
+-exit 0
+diff --git a/test/integration/test-setshow b/test/integration/test-setshow
+deleted file mode 100755
+index deeb3ba..0000000
+--- a/test/integration/test-setshow
++++ /dev/null
+@@ -1,26 +0,0 @@
+-#!/opt/csw/bin/bash -f
+-# -*- shell-script -*-
+-#$Id: test-setshow,v 1.3 2008/08/23 17:09:36 rockyb Exp $
+-
+-[ -z "$srcdir" ] && export srcdir=$PWD
+-[ -z "$builddir" ] && export builddir=$PWD
+-[ -z "$top_builddir" ] && export top_builddir=$builddir/../..
+-
+-TEST_NAME='setshow'
+-
+-. ${top_builddir}/test/integration/check-common.sh
+-
+-(cd $srcdir && $SH ${srcdir}/${TEST_NAME}.tests > $TEST_FILE 2>&1 < /dev/null)
+-
+-cat ${TEST_FILE} | /opt/csw/bin/gsed -e "s:-L .* -x .*/data/setshow\.cmd .*/example/dbg-test2.sh:-L .. -x data/setshow.cmd example/dbg-test2.sh:" \
+-| /opt/csw/bin/gsed -e 's:record the command history is .*:record the command history is: ' \
+-> ${TEST_FILTERED_FILE}
+-
+-check_output $TEST_FILTERED_FILE $RIGHT_FILE
+-rc=$?
+-
+-((0 != rc)) && exit $rc
+-rm -f $TEST_FILE
+-
+-# Return code tells testing mechanism whether passed or not.
+-exit 0
+diff --git a/test/integration/test-sig b/test/integration/test-sig
+index 98b2359..1a69609 100755
+--- a/test/integration/test-sig
++++ b/test/integration/test-sig
+@@ -11,10 +11,8 @@ TEST_NAME='sig'
+ . ${top_builddir}/test/integration/check-common.sh
+
+ if (( BASH_VERSINFO[0] > 4 || \
+- (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 1) )) ; then
++ (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 0) )) ; then
+ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-41.right"
+-elif [[ $(uname -s) == 'Darwin' ]] ; then
+- RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-Darwin.right"
+ elif [[ $(uname -s) == 'SunOS' ]] ; then
+ RIGHT_FILE="${top_srcdir}/test/data/${TEST_NAME}-SunOS.right"
+ fi
+--
+1.6.2.1
+
Added: csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch
===================================================================
--- csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch (rev 0)
+++ csw/mgar/pkg/bashdb/trunk/files/0005-Administrivia.patch 2010-01-18 07:50:23 UTC (rev 8062)
@@ -0,0 +1,48 @@
+From af51c5aba3ecd33b36423ddfc524f621e29a3a87 Mon Sep 17 00:00:00 2001
+From: rocky <rocky at gnu.org>
+Date: Sun, 20 Dec 2009 12:57:11 -0500
+Subject: [PATCH 5/6] Administrivia
+
+---
+ .gitignore | 4 +++-
+ test/integration/.gitignore | 6 ++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index a91f589..8b0b39f 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,8 +1,11 @@
++/*~
+ /Makefile
+ /Makefile.in
+ /aclocal.m4
+ /autom4te.cache
+ /bashdb
++/bashdb-4.*tar.gz
++/bashdb-4.*tar.bz2
+ /bashdb-main.inc
+ /bashdb-trace
+ /compile
+@@ -20,4 +23,3 @@
+ /libtool
+ /missing
+ /stamp-h1
+-/*~
+diff --git a/test/integration/.gitignore b/test/integration/.gitignore
+index ff80915..45f7bb3 100644
+--- a/test/integration/.gitignore
++++ b/test/integration/.gitignore
+@@ -1,5 +1,7 @@
++/*.check
++/*~
+ /Makefile
+ /Makefile.in
+ /check-common.sh
+-/*.check
+-/*~
++/test-misc
++/test-setshow
+--
+1.6.2.1
+
Added: csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch
===================================================================
--- csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch (rev 0)
+++ csw/mgar/pkg/bashdb/trunk/files/0006-sig-SunOS.right-is-same-as-sig-41.right.patch 2010-01-18 07:50:23 UTC (rev 8062)
@@ -0,0 +1,24 @@
+From fe4012d2196d8b0ab2ef531e62616e13e479d1f2 Mon Sep 17 00:00:00 2001
+From: rocky <rocky at gnu.org>
+Date: Thu, 24 Dec 2009 22:54:12 -0500
+Subject: [PATCH 6/6] sig-SunOS.right is same as sig-41.right.
+
+---
+ test/data/Makefile.am | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/test/data/Makefile.am b/test/data/Makefile.am
+index 071aaf1..f44b617 100644
+--- a/test/data/Makefile.am
++++ b/test/data/Makefile.am
+@@ -69,7 +69,6 @@ check_DATA = \
+ sig.right \
+ sig-41.right \
+ sig-Darwin.right \
+- sig-SunOS.right \
+ skip.cmd \
+ skip.right \
+ sopts.right \
+--
+1.6.2.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list