diff options
-rw-r--r-- | .cvsignore | 2 | ||||
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | INSTALL | 17 | ||||
-rw-r--r-- | Makefile.in | 15 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | survey.sh.in | 67 |
6 files changed, 107 insertions, 8 deletions
diff --git a/.cvsignore b/.cvsignore index e38a50bbd..397691f1b 100644 --- a/.cvsignore +++ b/.cvsignore | |||
@@ -23,3 +23,5 @@ buildit.sh | |||
23 | buildpkg.sh | 23 | buildpkg.sh |
24 | autom4te.cache | 24 | autom4te.cache |
25 | ssh-rand-helper | 25 | ssh-rand-helper |
26 | survey.sh | ||
27 | survey | ||
@@ -1,3 +1,10 @@ | |||
1 | 20040118 | ||
2 | - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement | ||
3 | "make survey" and "make send-survey". This will provide data on the | ||
4 | configure parameters, platform and platform features to the development | ||
5 | team, which will allow (among other things) better targetting of testing. | ||
6 | It's entirely voluntary and is off be default. ok djm@ | ||
7 | |||
1 | 20041220 | 8 | 20041220 |
2 | - (dtucker) [ssh-rand-helper.c] Fall back to command-based seeding if reading | 9 | - (dtucker) [ssh-rand-helper.c] Fall back to command-based seeding if reading |
3 | from prngd is enabled at compile time but fails at run time, eg because | 10 | from prngd is enabled at compile time but fails at run time, eg because |
@@ -1960,4 +1967,4 @@ | |||
1960 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1967 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1961 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1968 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1962 | 1969 | ||
1963 | $Id: ChangeLog,v 1.3606 2004/12/20 01:35:42 dtucker Exp $ | 1970 | $Id: ChangeLog,v 1.3607 2005/01/18 01:05:18 dtucker Exp $ |
@@ -200,7 +200,20 @@ running and has collected some Entropy. | |||
200 | For more information on configuration, please refer to the manual pages | 200 | For more information on configuration, please refer to the manual pages |
201 | for sshd, ssh and ssh-agent. | 201 | for sshd, ssh and ssh-agent. |
202 | 202 | ||
203 | 4. Problems? | 203 | 4. (Optional) Send survey |
204 | ------------------------- | ||
205 | |||
206 | $ make survey | ||
207 | [check the contents and make sure there's no sensitive information] | ||
208 | $ make send-survey | ||
209 | |||
210 | This will send configuration information for the currently configured | ||
211 | host to a survey address. This will help determine which configurations | ||
212 | are actually in use, and what valid combinations of configure options | ||
213 | exist. The raw data is available only to the OpenSSH developers, however | ||
214 | summary data may be published. | ||
215 | |||
216 | 5. Problems? | ||
204 | ------------ | 217 | ------------ |
205 | 218 | ||
206 | If you experience problems compiling, installing or running OpenSSH. | 219 | If you experience problems compiling, installing or running OpenSSH. |
@@ -208,4 +221,4 @@ Please refer to the "reporting bugs" section of the webpage at | |||
208 | http://www.openssh.com/ | 221 | http://www.openssh.com/ |
209 | 222 | ||
210 | 223 | ||
211 | $Id: INSTALL,v 1.65 2004/11/07 09:14:34 dtucker Exp $ | 224 | $Id: INSTALL,v 1.66 2005/01/18 01:05:18 dtucker Exp $ |
diff --git a/Makefile.in b/Makefile.in index 940e686b0..8a1c9f7c0 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.266 2004/11/07 09:14:34 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.267 2005/01/18 01:05:18 dtucker Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -195,13 +195,13 @@ moduli: | |||
195 | 195 | ||
196 | clean: regressclean | 196 | clean: regressclean |
197 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 197 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
198 | rm -f *.out core | 198 | rm -f *.out core survey |
199 | (cd openbsd-compat && $(MAKE) clean) | 199 | (cd openbsd-compat && $(MAKE) clean) |
200 | 200 | ||
201 | distclean: regressclean | 201 | distclean: regressclean |
202 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 202 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
203 | rm -f *.out core opensshd.init | 203 | rm -f *.out core opensshd.init |
204 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds *~ | 204 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds survey.sh *~ |
205 | rm -rf autom4te.cache | 205 | rm -rf autom4te.cache |
206 | (cd openbsd-compat && $(MAKE) distclean) | 206 | (cd openbsd-compat && $(MAKE) distclean) |
207 | (cd scard && $(MAKE) distclean) | 207 | (cd scard && $(MAKE) distclean) |
@@ -411,6 +411,15 @@ regressclean: | |||
411 | (cd regress && $(MAKE) clean) \ | 411 | (cd regress && $(MAKE) clean) \ |
412 | fi | 412 | fi |
413 | 413 | ||
414 | survey: survey.sh ssh | ||
415 | @$(SHELL) ./survey.sh > survey | ||
416 | @echo 'The survey results have been placed in the file "survey" in the' | ||
417 | @echo 'current directory. Please review the file then send with' | ||
418 | @echo '"make send-survey".' | ||
419 | |||
420 | send-survey: survey | ||
421 | mail portable-survey@mindrot.org <survey | ||
422 | |||
414 | package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) | 423 | package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) |
415 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ | 424 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ |
416 | sh buildpkg.sh; \ | 425 | sh buildpkg.sh; \ |
diff --git a/configure.ac b/configure.ac index 4b40b768a..d4151feb0 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.234 2004/12/09 02:29:59 tim Exp $ | 1 | # $Id: configure.ac,v 1.235 2005/01/18 01:05:18 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -3020,7 +3020,8 @@ if test "$ac_cv_lib_pam_pam_set_item" = yes ; then | |||
3020 | fi | 3020 | fi |
3021 | 3021 | ||
3022 | AC_EXEEXT | 3022 | AC_EXEEXT |
3023 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openbsd-compat/Makefile scard/Makefile ssh_prng_cmds]) | 3023 | AC_CONFIG_FILES([Makefile buildpkg.sh opensshd.init openbsd-compat/Makefile \ |
3024 | scard/Makefile ssh_prng_cmds survey.sh]) | ||
3024 | AC_OUTPUT | 3025 | AC_OUTPUT |
3025 | 3026 | ||
3026 | # Print summary of options | 3027 | # Print summary of options |
diff --git a/survey.sh.in b/survey.sh.in new file mode 100644 index 000000000..6a0c08df4 --- /dev/null +++ b/survey.sh.in | |||
@@ -0,0 +1,67 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Copyright (c) 2004, 2005 Darren Tucker | ||
4 | # | ||
5 | # Permission to use, copy, modify, and distribute this software for any | ||
6 | # purpose with or without fee is hereby granted, provided that the above | ||
7 | # copyright notice and this permission notice appear in all copies. | ||
8 | # | ||
9 | # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | |||
17 | host="@host@" | ||
18 | AWK="@AWK@" | ||
19 | CC="@CC@" | ||
20 | CPP="@CPP@" | ||
21 | CFLAGS="@CFLAGS@" | ||
22 | CPPFLAGS="@CPPFLAGS@" | ||
23 | LDFLAGS="@LDFLAGS@" | ||
24 | LIBS="@LIBS@" | ||
25 | |||
26 | # Note format: | ||
27 | # identifier: [data] CRCR | ||
28 | |||
29 | echo "openssh-survey-version: 1" | ||
30 | echo | ||
31 | echo "openssh-version: `./ssh -V 2>&1`" | ||
32 | echo | ||
33 | configinv=`$AWK '/^ \\\$.*configure/' config.log | sed 's/^ \\\$ //g'` | ||
34 | echo "configure-invocation: $configinv" | ||
35 | echo | ||
36 | echo "host: $host" | ||
37 | echo | ||
38 | echo "uname: `uname`" | ||
39 | echo | ||
40 | echo "uname-r: `uname -r`" | ||
41 | echo | ||
42 | echo "uname-m: `uname -m`" | ||
43 | echo | ||
44 | echo "uname-p: `uname -p`" | ||
45 | echo | ||
46 | echo "oslevel: `oslevel 2>/dev/null`" | ||
47 | echo | ||
48 | echo "cc: $CC" | ||
49 | echo | ||
50 | echo "cflags: $CFLAGS" | ||
51 | echo | ||
52 | echo "cppflags: $CPPFLAGS" | ||
53 | echo | ||
54 | echo "ldflags: $LDFLAGS" | ||
55 | echo | ||
56 | echo "libs: $LIBS" | ||
57 | echo | ||
58 | echo "ccver-v: `$CC -v 2>&1`" | ||
59 | echo | ||
60 | echo "ccver-V: `$CC -V 2>&1`" | ||
61 | echo | ||
62 | echo "cppdefines:" | ||
63 | ${CPP} -dM - </dev/null | ||
64 | echo | ||
65 | echo "config.h:" | ||
66 | egrep '#define|#undef' config.h | ||
67 | echo | ||