Add .note.GNU-stack to all object files so that the generated binary doesn't erroneou...

diff --git a/ChangeLog b/ChangeLog
index 3e437c7084c5c35cf66f12f853914d6a72d2431c..2a519ac5caa80dea59402379ce44dce64cc8458f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-10  Markus Gutschke  <markus@shellinabox.com>
+
+       * Add .note.GNU-stack to all object files so that the generated
+       binary doesn't erroneously request an executable stack.
+
 2009-12-03  Markus Gutschke  <markus@shellinabox.com>
 
        * Allow retrieval of the user's default login shell from

diff --git a/Makefile.am b/Makefile.am
index 37592029c113b34df5384830cf871cb267d0f4e6..f0ab2f6748c935bcc23ab5bae0041d43e1729a15 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,31 +226,47 @@ shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
 
 clean-local:
        -rm -rf shellinaboxd.1                                                \
-                shellinaboxd.ps
+               shellinaboxd.ps
        -rm -rf debian/shellinabox                                            \
-                debian/shellinabox*.debhelper*                                \
+               debian/shellinabox*.debhelper*                                \
                debian/shellinabox.substvars                                  \
-                debian/tmp
+               debian/tmp
+       -rm -rf GNU-stack
 
 .css.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
 
 .gif.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
+
 
 .html.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
+
 
 .ico.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
+
 
 shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
 
@@ -267,9 +283,17 @@ shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
+
 
 .wav.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
+
 

diff --git a/Makefile.in b/Makefile.in
index 7ad48c00705ce8749775f1934dee7d972f5ed86c..75627b319cbd8e1ac4d3d00db7ef5cb18793dad1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1239,31 +1239,44 @@ shellinaboxd.1: shellinabox/shellinaboxd.man.in config.h
 
 clean-local:
        -rm -rf shellinaboxd.1                                                \
-                shellinaboxd.ps
+               shellinaboxd.ps
        -rm -rf debian/shellinabox                                            \
-                debian/shellinabox*.debhelper*                                \
+               debian/shellinabox*.debhelper*                                \
                debian/shellinabox.substvars                                  \
-                debian/tmp
+               debian/tmp
+       -rm -rf GNU-stack
 
 .css.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
 
 .gif.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
 
 .html.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
 
 .ico.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
 
 shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
 
@@ -1280,11 +1293,17 @@ shellinabox/shell_in_a_box.o: shellinabox/shell_in_a_box.js config.h
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
 
 .wav.o:
        @echo objcopy "$<" "$@"
        @objcopy -I binary `$(objcopyflags)` `echo "$<" | $(renamesymbols)`   \
          "$<" "$@"
+       @-printf '\000' >GNU-stack &&                                         \
+         objcopy --add-section .note.GNU-stack=GNU-stack "$@";               \
+         rm -f GNU-stack
 
 # 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 f893da39d77b10914a4dc31a7a6f1c02ecf5a554..15dd68f5d9715550768205f9d07c8e05a07c51a4 100644 (file)
--- a/config.h
+++ b/config.h
@@ -141,7 +141,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "198"
+#define VCS_REVISION "200"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index d4c15afeacc0733de2f8622e08456ef97ecdd418..1626dd109edc3887312095dac960794f819c541b 100755 (executable)
--- a/configure
+++ b/configure
@@ -2325,7 +2325,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=198
+VCS_REVISION=200
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 8dff904df388ad9f38b9aed6a2b46cb26305fa6b..a42b0e50dca1828b624f1bec5e54433f259ef361 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=198
+VCS_REVISION=200
 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 96bdb46725fddf6b09b854a8bd7daf13bb2408f0..c46e0c0a1f3e78d3c2acfc2e60eee4f57a7d8230 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 198)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 200)" +
         "\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 fb8fdccedd7b7092fa5cff2fafa61d692440fcf5..c5801250744ff27aff477f75f2383ec11b78dc0b 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 198)" +
+  alert("Shell In A Box version " + "2.10 (revision 200)" +
         "\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 96bdb46725fddf6b09b854a8bd7daf13bb2408f0..c46e0c0a1f3e78d3c2acfc2e60eee4f57a7d8230 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 198)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 200)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };