diff --git a/ChangeLog b/ChangeLog index ee5b50c..efd7401 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-12-02 Markus Gutschke + + * 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 * Added some basic sanity checks to the commit script that now makes diff --git a/Makefile.am b/Makefile.am index 0cb1307..93ab34f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,8 +111,13 @@ 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';; \ - powerpc*) echo '-O elf32-powerpc -B powerpc';; \ + *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \ + $(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 renamesymbols = \ diff --git a/Makefile.in b/Makefile.in index f63e861..322bd58 100644 --- a/Makefile.in +++ b/Makefile.in @@ -375,8 +375,13 @@ 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';; \ - powerpc*) echo '-O elf32-powerpc -B powerpc';; \ + *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \ + $(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 renamesymbols = \ diff --git a/commit b/commit index 701f57e..5296648 100755 --- a/commit +++ b/commit @@ -81,7 +81,7 @@ debian_package() { trap '' EXIT # Run lintian - lintian --verbose ${prj}_${ver}*_*.changes + lintian --verbose -I ${prj}_${ver}*_*.changes ) || exit 1 # Revert any changes that might be pending in distributions/debian/* diff --git a/config.h b/config.h index ed342ef..590cf1d 100644 --- a/config.h +++ b/config.h @@ -138,7 +138,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "196" +#define VCS_REVISION "197" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index 3553aad..97374cf 100755 --- a/configure +++ b/configure @@ -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 -VCS_REVISION=196 +VCS_REVISION=197 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 22864c7..0b9e533 100644 --- 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.10, markus@shellinabox.com) -VCS_REVISION=196 +VCS_REVISION=197 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/debian/control b/debian/control index 3e490d7..4d3a31d 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,6 @@ Build-Depends: debhelper (>= 6.0.0), binutils, libssl-dev, libpam0g-dev, Standards-Version: 3.8.3 Package: shellinabox -Section: web -Priority: optional Architecture: any Depends: ${shlibs:Depends}, adduser, lsb-base Suggests: libssl0.9.8, libpam0g, openssl diff --git a/demo/vt100.js b/demo/vt100.js index 1c33cd9..ff48872 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = 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" + "For more information check http://shellinabox.com"); }; diff --git a/distributions/debian/shellinabox_2.10-1.diff.gz b/distributions/debian/shellinabox_2.10-1.diff.gz index 2e57ce7..08a8a44 100644 Binary files a/distributions/debian/shellinabox_2.10-1.diff.gz and b/distributions/debian/shellinabox_2.10-1.diff.gz differ diff --git a/distributions/debian/shellinabox_2.10-1.dsc b/distributions/debian/shellinabox_2.10-1.dsc index 60412e1..d413b5f 100644 --- a/distributions/debian/shellinabox_2.10-1.dsc +++ b/distributions/debian/shellinabox_2.10-1.dsc @@ -8,11 +8,11 @@ Homepage: http://shellinabox.com Standards-Version: 3.8.3 Build-Depends: debhelper (>= 7.0.0), binutils, libssl-dev, libpam0g-dev, zlib1g-dev Checksums-Sha1: - f99467ac5f4933bdeab273e2258cb0b259b079b3 516594 shellinabox_2.10.orig.tar.gz - ab95601aa9722e03bae44986d4f09397ec12ebf2 6228 shellinabox_2.10-1.diff.gz + 1b8eb94ef2c406ae003be0be5559fc0e5a756edf 516851 shellinabox_2.10.orig.tar.gz + 1e5f3a5c1853ff9d367fee390c6c11baa770d598 6226 shellinabox_2.10-1.diff.gz Checksums-Sha256: - 9307afdd0ba4e9f0b8e31d0834a78b27b83a1ba8708b1432f502a98e08ae19c3 516594 shellinabox_2.10.orig.tar.gz - f1d023f558219ad58ac35b532ee2c3df44b1c8f8ff847632b4a531fa311f32b5 6228 shellinabox_2.10-1.diff.gz + 24aa0ec647df827fdc2fc304fba30c94ab8e3418f96d1482fb0742ad6821f498 516851 shellinabox_2.10.orig.tar.gz + 9ed38840a398ba3fa91865300b567d74d8092ff35d11761bfd7c6bb360e3aa29 6226 shellinabox_2.10-1.diff.gz Files: - b7778268e7ca047e22de48d96ebedd9d 516594 shellinabox_2.10.orig.tar.gz - f7b4acce1664f574f7759534e831c737 6228 shellinabox_2.10-1.diff.gz + d2cc6c24220d20ff17cc795526ceb94a 516851 shellinabox_2.10.orig.tar.gz + 82f9394188f4605e79837ed23fb2064c 6226 shellinabox_2.10-1.diff.gz diff --git a/distributions/debian/shellinabox_2.10.orig.tar.gz b/distributions/debian/shellinabox_2.10.orig.tar.gz index 313c278..a5e5707 100644 Binary files a/distributions/debian/shellinabox_2.10.orig.tar.gz and b/distributions/debian/shellinabox_2.10.orig.tar.gz differ diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 37adc11..23d826d 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; 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" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index 1c33cd9..ff48872 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = 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" + "For more information check http://shellinabox.com"); };