simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added fallback code that dynamically computes the correct commandline

Browse source 
arguments for "objcopy" if building for an otherwise unknown target
platform.

Fixed a lintian "informational" message.


git-svn-id: https://shellinabox.googlecode.com/svn/trunk@197 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com 2009-12-02 20:26:07 +00:00
parent bed8acc181
commit 5caa8b7288
14 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2009-12-02 Markus Gutschke <markus@shellinabox.com>
* Added fallback code that dynamically computes the correct commandline
arguments for "objcopy" if building for an otherwise unknown target
platform.
2009-12-01 Markus Gutschke <markus@shellinabox.com> 2009-12-01 Markus Gutschke <markus@shellinabox.com>
* Added some basic sanity checks to the commit script that now makes * Added some basic sanity checks to the commit script that now makes

9
Makefile.am
View file

@ -111,8 +111,13 @@ shellinaboxd_LDFLAGS = -static
objcopyflags = case "$(host_cpu)" in \ objcopyflags = case "$(host_cpu)" in \
i[0-9]86) echo '-O elf32-i386 -B i386';; \ i[0-9]86) echo '-O elf32-i386 -B i386';; \
x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \ x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \
arm*) echo '-O elf32-littlearm -B arm';; \ *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \
powerpc*) echo '-O elf32-powerpc -B powerpc';; \ $(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \
-o /tmp/probe$$$$.o /dev/null && \
objdump -f /tmp/probe$$$$.o | \
sed -e 's/.*file format */-O /;t; \
s/architecture: *\([^,]*\).*/-B \1/;t;\
d';; \
esac esac
renamesymbols = \ renamesymbols = \

9
Makefile.in
View file

@ -375,8 +375,13 @@ shellinaboxd_LDFLAGS = -static
objcopyflags = case "$(host_cpu)" in \ objcopyflags = case "$(host_cpu)" in \
i[0-9]86) echo '-O elf32-i386 -B i386';; \ i[0-9]86) echo '-O elf32-i386 -B i386';; \
x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \ x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \
arm*) echo '-O elf32-littlearm -B arm';; \ *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \
powerpc*) echo '-O elf32-powerpc -B powerpc';; \ $(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \
-o /tmp/probe$$$$.o /dev/null && \
objdump -f /tmp/probe$$$$.o | \
sed -e 's/.*file format */-O /;t; \
s/architecture: *\([^,]*\).*/-B \1/;t;\
d';; \
esac esac
renamesymbols = \ renamesymbols = \

2
commit
View file

@ -81,7 +81,7 @@ debian_package() {
trap '' EXIT trap '' EXIT
# Run lintian # Run lintian
lintian --verbose ${prj}_${ver}*_*.changes lintian --verbose -I ${prj}_${ver}*_*.changes
) || exit 1 ) || exit 1
# Revert any changes that might be pending in distributions/debian/* # Revert any changes that might be pending in distributions/debian/*

2
config.h
View file

@ -138,7 +138,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "196" #define VCS_REVISION "197"
/* Version number of package */ /* Version number of package */
#define VERSION "2.10" #define VERSION "2.10"

2
configure vendored
View file

@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=196 VCS_REVISION=197
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.10, markus@shellinabox.com) AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
VCS_REVISION=196 VCS_REVISION=197
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

2
debian/control vendored
View file

@ -8,8 +8,6 @@ Build-Depends: debhelper (>= 6.0.0), binutils, libssl-dev, libpam0g-dev,
Standards-Version: 3.8.3 Standards-Version: 3.8.3
Package: shellinabox Package: shellinabox
Section: web
Priority: optional
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, adduser, lsb-base Depends: ${shlibs:Depends}, adduser, lsb-base
Suggests: libssl0.9.8, libpam0g, openssl Suggests: libssl0.9.8, libpam0g, openssl

2
demo/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 196)" + alert("VT100 Terminal Emulator " + "2.10 (revision 197)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

BIN
distributions/debian/shellinabox_2.10-1.diff.gz
View file

Binary file not shown.

12
distributions/debian/shellinabox_2.10-1.dsc
View file

@ -8,11 +8,11 @@ Homepage: http://shellinabox.com
Standards-Version: 3.8.3 Standards-Version: 3.8.3
Build-Depends: debhelper (>= 7.0.0), binutils, libssl-dev, libpam0g-dev, zlib1g-dev Build-Depends: debhelper (>= 7.0.0), binutils, libssl-dev, libpam0g-dev, zlib1g-dev
Checksums-Sha1: Checksums-Sha1:
f99467ac5f4933bdeab273e2258cb0b259b079b3 516594 shellinabox_2.10.orig.tar.gz 1b8eb94ef2c406ae003be0be5559fc0e5a756edf 516851 shellinabox_2.10.orig.tar.gz
ab95601aa9722e03bae44986d4f09397ec12ebf2 6228 shellinabox_2.10-1.diff.gz 1e5f3a5c1853ff9d367fee390c6c11baa770d598 6226 shellinabox_2.10-1.diff.gz
Checksums-Sha256: Checksums-Sha256:
9307afdd0ba4e9f0b8e31d0834a78b27b83a1ba8708b1432f502a98e08ae19c3 516594 shellinabox_2.10.orig.tar.gz 24aa0ec647df827fdc2fc304fba30c94ab8e3418f96d1482fb0742ad6821f498 516851 shellinabox_2.10.orig.tar.gz
f1d023f558219ad58ac35b532ee2c3df44b1c8f8ff847632b4a531fa311f32b5 6228 shellinabox_2.10-1.diff.gz 9ed38840a398ba3fa91865300b567d74d8092ff35d11761bfd7c6bb360e3aa29 6226 shellinabox_2.10-1.diff.gz
Files: Files:
b7778268e7ca047e22de48d96ebedd9d 516594 shellinabox_2.10.orig.tar.gz d2cc6c24220d20ff17cc795526ceb94a 516851 shellinabox_2.10.orig.tar.gz
f7b4acce1664f574f7759534e831c737 6228 shellinabox_2.10-1.diff.gz 82f9394188f4605e79837ed23fb2064c 6226 shellinabox_2.10-1.diff.gz

BIN
distributions/debian/shellinabox_2.10.orig.tar.gz
View file

Binary file not shown.

2
shellinabox/shell_in_a_box.js
View file

@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { ShellInABox.prototype.about = function() {
alert("Shell In A Box version " + "2.10 (revision 196)" + alert("Shell In A Box version " + "2.10 (revision 197)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

2
shellinabox/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 196)" + alert("VT100 Terminal Emulator " + "2.10 (revision 197)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };