- (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement

   "make survey" and "make send-survey".  This will provide data on the
   configure parameters, platform and platform features to the development
   team, which will allow (among other things) better targetting of testing.
   It's entirely voluntary and is off be default. ok djm@

diff --git a/.cvsignore b/.cvsignore
index e38a50bbd1aa4ee069129a493609cddf6c68ebf6..397691f1b395699841d82b1ee82c107e4e6b8c0f 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -23,3 +23,5 @@ buildit.sh
 buildpkg.sh
 autom4te.cache
 ssh-rand-helper
+survey.sh
+survey

diff --git a/ChangeLog b/ChangeLog
index 4f3341f2d85f3cf1c7d4c3d43c91946b2dbb0b18..bdc03ae374823f48683b0c637c97484ca5db5e1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20040118
+ - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement
+   "make survey" and "make send-survey".  This will provide data on the
+   configure parameters, platform and platform features to the development
+   team, which will allow (among other things) better targetting of testing.
+   It's entirely voluntary and is off be default. ok djm@
+
 20041220
  - (dtucker) [ssh-rand-helper.c] Fall back to command-based seeding if reading
    from prngd is enabled at compile time but fails at run time, eg because

diff --git a/INSTALL b/INSTALL
index 692baade3e6a55b98b592ded891e560a8ea3328a..c953fb968a9d7e1e023bb4217f05d07a123c95d2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -200,7 +200,20 @@ running and has collected some Entropy.
 For more information on configuration, please refer to the manual pages
 for sshd, ssh and ssh-agent.
 
-4. Problems?
+4. (Optional) Send survey
+-------------------------
+
+$ make survey
+[check the contents and make sure there's no sensitive information]
+$ make send-survey
+
+This will send configuration information for the currently configured
+host to a survey address.  This will help determine which configurations
+are actually in use, and what valid combinations of configure options
+exist.  The raw data is available only to the OpenSSH developers, however
+summary data may be published.
+
+5. Problems?
 ------------
 
 If you experience problems compiling, installing or running OpenSSH.

diff --git a/Makefile.in b/Makefile.in
index 3f18e8bd012725b9965eec04314dbb18fe817396..d0f27afbe41be69a2320c68967e119e9bfd62ae1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,13 +195,13 @@ moduli:
 
 clean: regressclean
        rm -f *.o *.a $(TARGETS) logintest config.cache config.log
-       rm -f *.out core
+       rm -f *.out core survey
        (cd openbsd-compat && $(MAKE) clean)
 
 distclean:     regressclean
        rm -f *.o *.a $(TARGETS) logintest config.cache config.log
        rm -f *.out core opensshd.init
-       rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds *~
+       rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds survey.sh *~
        rm -rf autom4te.cache
        (cd openbsd-compat && $(MAKE) distclean)
        (cd scard && $(MAKE) distclean)
@@ -411,6 +411,15 @@ regressclean:
                (cd regress && $(MAKE) clean) \
        fi
 
+survey: survey.sh ssh
+       @$(SHELL) ./survey.sh > survey
+       @echo 'The survey results have been placed in the file "survey" in the'
+       @echo 'current directory.  Please review the file then send with'
+       @echo '"make send-survey".'
+
+send-survey:   survey
+       mail portable-survey@mindrot.org <survey
+
 package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS)
        if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \
                sh buildpkg.sh; \

diff --git a/configure.ac b/configure.ac
index 22086abaf8479c3ac98e6344339af31300c3ef14..afbd1f9aa23094b227c8a922241150bd53875fd4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3020,7 +3020,8 @@ if test "$ac_cv_lib_pam_pam_set_item" = yes ; then
 fi
 
 AC_EXEEXT
-AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openbsd-compat/Makefile scard/Makefile ssh_prng_cmds])
+AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openbsd-compat/Makefile \
+       scard/Makefile ssh_prng_cmds survey.sh])
 AC_OUTPUT
 
 # Print summary of options

diff --git a/survey.sh.in b/survey.sh.in
new file mode 100644 (file)
index 0000000..6a0c08d
--- /dev/null
+++ b/survey.sh.in
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Copyright (c) 2004, 2005 Darren Tucker
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+host="@host@"
+AWK="@AWK@"
+CC="@CC@"
+CPP="@CPP@"
+CFLAGS="@CFLAGS@"
+CPPFLAGS="@CPPFLAGS@"
+LDFLAGS="@LDFLAGS@"
+LIBS="@LIBS@"
+
+# Note format:
+# identifier: [data] CRCR
+
+echo "openssh-survey-version: 1"
+echo
+echo "openssh-version: `./ssh -V 2>&1`"
+echo
+configinv=`$AWK '/^  \\\$.*configure/' config.log | sed 's/^  \\\$ //g'`
+echo "configure-invocation: $configinv"
+echo
+echo "host: $host"
+echo
+echo "uname: `uname`"
+echo
+echo "uname-r: `uname -r`"
+echo
+echo "uname-m: `uname -m`"
+echo
+echo "uname-p: `uname -p`"
+echo
+echo "oslevel: `oslevel 2>/dev/null`"
+echo
+echo "cc: $CC"
+echo
+echo "cflags: $CFLAGS"
+echo
+echo "cppflags: $CPPFLAGS"
+echo
+echo "ldflags: $LDFLAGS"
+echo
+echo "libs: $LIBS"
+echo
+echo "ccver-v: `$CC -v 2>&1`"
+echo
+echo "ccver-V: `$CC -V 2>&1`"
+echo
+echo "cppdefines:"
+${CPP} -dM - </dev/null
+echo
+echo "config.h:"
+egrep '#define|#undef' config.h
+echo