Added code so that "objcopy" picks an appropriate target architecture when

building for ARM.

diff --git a/Makefile.am b/Makefile.am
index 6cd5a2ba0ebc1a84d7e68f142fd90d817737a711..e185878b02d6f6c88ae6d7b47b4f48f1551991a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,30 @@ shellinaboxd_LDADD   = liblogging.la                                          \
                        libhttp.la
 shellinaboxd_LDFLAGS = -static
 
+objcopyflags         = case "$(host_cpu)" in                                  \
+                         i[0-9]86) echo '-O elf32-i386 -B i386';;             \
+                         x86_64)   echo '-O elf64-x86-64 -B i386:x86-64';;    \
+                         arm*)     echo '-O elf32-littlearm -B arm';;         \
+                       esac
+
+renamesymbols        =                                                        \
+  sed -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                           \
+      -e 't0'                                                                 \
+      -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                                     \
+      -e 't0'                                                                 \
+      -e 's/.*/&=& /'                                                         \
+      -e ':0'                                                                 \
+      -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'         \
+      -e ':1'                                                                 \
+      -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'                \
+      -e 't1'                                                                 \
+      -e 's/.\{53\}$$//'                                                      \
+      -e 's/[/.]/_/g'                                                         \
+      -e 's/^/--redefine-sym _binary_/'                                       \
+      -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                               \
+      -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                           \
+      -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'
+
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck
 
@@ -144,80 +168,17 @@ clean-local:
 
 .css.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 .html.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 .ico.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
@@ -229,57 +190,15 @@ shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
                     -e d "$<"`"                                              \
             -e "s/^#/\/\/ #/"                                                \
             -e "s/VERSION/\"@VERSION@ (revision @VCS_REVISION@)\"/g"         \
-                                                           "$<" >"$@"
+            "$<" >"$@"
 
 .js.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo $(host_cpu) |                                       \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2.js=\2 /'                    \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 .wav.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 

diff --git a/Makefile.in b/Makefile.in
index 4b99cb1a6610b87bf9edda09ecd16fe84d0967cb..f19a145271eb054ee80b861d0eed8d752e480389 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,6 +331,30 @@ shellinaboxd_LDADD = liblogging.la                                          \
                        libhttp.la
 
 shellinaboxd_LDFLAGS = -static
+objcopyflags = case "$(host_cpu)" in                                  \
+                         i[0-9]86) echo '-O elf32-i386 -B i386';;             \
+                         x86_64)   echo '-O elf64-x86-64 -B i386:x86-64';;    \
+                         arm*)     echo '-O elf32-littlearm -B arm';;         \
+                       esac
+
+renamesymbols = \
+  sed -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                           \
+      -e 't0'                                                                 \
+      -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                                     \
+      -e 't0'                                                                 \
+      -e 's/.*/&=& /'                                                         \
+      -e ':0'                                                                 \
+      -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'         \
+      -e ':1'                                                                 \
+      -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'                \
+      -e 't1'                                                                 \
+      -e 's/.\{53\}$$//'                                                      \
+      -e 's/[/.]/_/g'                                                         \
+      -e 's/^/--redefine-sym _binary_/'                                       \
+      -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                               \
+      -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                           \
+      -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'
+
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1058,80 +1082,17 @@ clean-local:
 
 .css.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 .html.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 .ico.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
@@ -1143,58 +1104,16 @@ shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
                     -e d "$<"`"                                              \
             -e "s/^#/\/\/ #/"                                                \
             -e "s/VERSION/\"@VERSION@ (revision @VCS_REVISION@)\"/g"         \
-                                                           "$<" >"$@"
+            "$<" >"$@"
 
 .js.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo $(host_cpu) |                                       \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2.js=\2 /'                    \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 
 .wav.o:
        @echo objcopy "$<" "$@"
-       @objcopy                                                              \
-         -I binary `echo "$(host_cpu)" |                                     \
-                    grep -q '^i[0-9]86$$' &&                                 \
-                    echo ' -O elf32-i386 -B i386' ||                         \
-                    echo ' -O elf64-x86-64 -B i386:x86-64'`                  \
-         `echo "$<" | sed                                                    \
-           -e 's/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /'                     \
-           -e 't0'                                                           \
-           -e 's/\([^.]*\)\([.].*\)/\1\2=\1 /'                               \
-           -e 't0'                                                           \
-           -e 's/.*/&=& /'                                                   \
-           -e ':0'                                                           \
-           -e 's/$$/aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ/'   \
-           -e ':1'                                                           \
-           -e 's/\(=[^_]*\)_\([a-z]\)\([^ ]* .*\2\)\(.\)/\1\4\3\4/'          \
-           -e 't1'                                                           \
-           -e 's/.\{53\}$$//'                                                \
-           -e 's/[/.]/_/g'                                                   \
-           -e 's/^/--redefine-sym _binary_/'                                 \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_end\2End/'                         \
-           -e 's/\([^=]*\)\(=[^ ]*\)/& \1_start\2Start/'                     \
-           -e 's/[^ ]*\([^=]*\)=[^ ]*/-N\1_size/'`                           \
+       @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/config.h b/config.h
index 9e4a64fbc7738e85eb0514f319a6efbfbf5a09a4..00cdb473711137ea3152e9ea1282b74bd70392ee 100644 (file)
--- a/config.h
+++ b/config.h
@@ -132,7 +132,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "123"
+#define VCS_REVISION "124"
 
 /* Version number of package */
 #define VERSION "2.8"

diff --git a/configure b/configure
index c7363a33a5d0fc29231add66cb11b4711dd13dfc..f91b6f00e6b16490462770dfb7893c4d234b7a53 100755 (executable)
--- a/configure
+++ b/configure
@@ -2037,7 +2037,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=123
+VCS_REVISION=124
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 097c11ab947be3f8fa8216dd107bcebd807b21cc..5417270c781499469e1a10a85d9af704f33f10ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.8, markus@shellinabox.com)
-VCS_REVISION=123
+VCS_REVISION=124
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/demo/vt100.js b/demo/vt100.js
index 4bbc7b7a2b4fc706caa1d59936d08fc563af7d4d..24a015410c0c2461e8233424d2740f5afeebb7a9 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.8 (revision 123)" +
+  alert("VT100 Terminal Emulator " + "2.8 (revision 124)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 51435ae123ba9fdbeafd98f23df12b18821a74ea..81c9a231ba8a2105e88c2e4476b3adddbf5eb14e 100644 (file)
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.8 (revision 123)" +
+  alert("Shell In A Box version " + "2.8 (revision 124)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 4bbc7b7a2b4fc706caa1d59936d08fc563af7d4d..24a015410c0c2461e8233424d2740f5afeebb7a9 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.8 (revision 123)" +
+  alert("VT100 Terminal Emulator " + "2.8 (revision 124)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };