Added fallback code that dynamically computes the correct commandline

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

Fixed a lintian "informational" message.

diff --git a/ChangeLog b/ChangeLog
index ee5b50ccfe873a03438373fc5d07dc17ba829493..efd7401839b4e6a4c21fa5da511715cae5a8fbd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * Added some basic sanity checks to the commit script that now makes

diff --git a/Makefile.am b/Makefile.am
index 0cb1307fe00168dfc6fd71b955c09044e51ccab7..93ab34f78851a3615343c6f8f4c92bcfe98345ac 100644 (file)
--- 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 f63e861f4a879e8f812ac7a8cdf4e14cae7a9d78..322bd589aca73d0d184390938dcdeff37fe04a42 100644 (file)
--- 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 701f57ea8579d0942ea1226c1f959c980c40cf7d..5296648bf86480e29e743adb0358a95b35f62557 100755 (executable)
--- 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 ed342ef88b42e66f327cf9720e94192e34c667fe..590cf1d8ec8e0b66a861adc4170952e773472734 100644 (file)
--- 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 3553aada6193f5be5b0450bf605c95ca4ceec20b..97374cfdef172a2083d2c628766aa8fbf7a2833c 100755 (executable)
--- 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 22864c7700e8ecbc663a25bb2d3647f200c2c140..0b9e53344a440857707bd0ca097219a259fb6fb7 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.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 3e490d79f5443a4b1586b6268923a0d47f9e3fb3..4d3a31d138eae77e1c1e00a2ff23dbb0795db069 100644 (file)
--- 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 1c33cd9e079f6c8f4bb54d1164c62128c1232f20..ff488722d95179413184f9b29514c04a2816084e 100644 (file)
--- 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 2e57ce71c31ef531276b10d4504309ed0007b2f6..08a8a443f80ee446ae3e62546bb79e357cc4b592 100644 (file)
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 60412e1073fd5c5d6dea7b3ad7fdc37b7bbb37a2..d413b5ffeb54778d04a4782bd23bf807c30d36f9 100644 (file)
--- 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 313c2788e6f8bad3d7ca4128b4b79fb597e8b7f3..a5e57070acb48b9f24f7dfeb3bd4ace50c9406f3 100644 (file)
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 37adc1147999fbe7892afff7b1ae10396ba27e93..23d826d832d0c2ce79d03b710cb032a86ee7c8ad 100644 (file)
--- 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 1c33cd9e079f6c8f4bb54d1164c62128c1232f20..ff488722d95179413184f9b29514c04a2816084e 100644 (file)
--- 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");
 };