From 16bcc1c92e6baa0a32efe105c58b6d6242331d10 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 7 Nov 2004 20:14:34 +1100 Subject: - (dtucker) [INSTALL Makefile.in configure.ac] Add --with-libedit configure option and supporting makefile bits and documentation. --- INSTALL | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index dae1bb159..26d62976b 100644 --- a/INSTALL +++ b/INSTALL @@ -52,6 +52,14 @@ http://www.lothar.com/tech/crypto/ S/Key Libraries: http://www.sparc.spb.su/solaris/skey/ +LibEdit: + +sftp now supports command-line editing via NetBSD's libedit. If your +platform has it available natively you can use that, alternatively +you might try these multi-platform ports: +http://www.thrysoee.dk/editline/ +http://sourceforge.net/projects/libedit/ + If you wish to use --with-skey then you will need the above library installed. No other current S/Key library is currently known to be supported. @@ -200,4 +208,4 @@ Please refer to the "reporting bugs" section of the webpage at http://www.openssh.com/ -$Id: INSTALL,v 1.64 2004/05/26 23:59:31 dtucker Exp $ +$Id: INSTALL,v 1.65 2004/11/07 09:14:34 dtucker Exp $ -- cgit v1.2.3 From 72c025d9f0f494d6816f045819b9be05fc915730 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 18 Jan 2005 12:05:18 +1100 Subject: - (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@ --- .cvsignore | 2 ++ ChangeLog | 9 +++++++- INSTALL | 17 +++++++++++++-- Makefile.in | 15 +++++++++++--- configure.ac | 5 +++-- survey.sh.in | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 107 insertions(+), 8 deletions(-) create mode 100644 survey.sh.in (limited to 'INSTALL') diff --git a/.cvsignore b/.cvsignore index e38a50bbd..397691f1b 100644 --- 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 797ff28bf..2cead3c87 100644 --- 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 @@ -1960,4 +1967,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3606 2004/12/20 01:35:42 dtucker Exp $ +$Id: ChangeLog,v 1.3607 2005/01/18 01:05:18 dtucker Exp $ diff --git a/INSTALL b/INSTALL index 26d62976b..4fc3744f3 100644 --- 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. @@ -208,4 +221,4 @@ Please refer to the "reporting bugs" section of the webpage at http://www.openssh.com/ -$Id: INSTALL,v 1.65 2004/11/07 09:14:34 dtucker Exp $ +$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 @@ -# $Id: Makefile.in,v 1.266 2004/11/07 09:14:34 dtucker Exp $ +# $Id: Makefile.in,v 1.267 2005/01/18 01:05:18 dtucker Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -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 &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 -