summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--contrib/findssl.sh10
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cf68f4fb..469fa495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20041213
+ - (dtucker) [contrib/findssh.sh] Clean up on interrupt; from
+ amarendra.godbole at ge com.
+
20041211
- (dtucker) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2004/12/06 16:00:43
@@ -1946,4 +1950,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.3603 2004/12/11 02:39:50 dtucker Exp $
+$Id: ChangeLog,v 1.3604 2004/12/13 07:08:32 dtucker Exp $
diff --git a/contrib/findssl.sh b/contrib/findssl.sh
index 0c08d4a1..716abced 100644
--- a/contrib/findssl.sh
+++ b/contrib/findssl.sh
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# $Id: findssl.sh,v 1.3 2004/12/13 07:08:33 dtucker Exp $
+#
# findssl.sh
# Search for all instances of OpenSSL headers and libraries
# and print their versions.
@@ -9,10 +11,11 @@
# Written by Darren Tucker (dtucker at zip dot com dot au)
# This file is placed in the public domain.
#
-# $Id: findssl.sh,v 1.2 2003/11/21 12:48:56 djm Exp $
+# Release history:
# 2002-07-27: Initial release.
# 2002-08-04: Added public domain notice.
# 2003-06-24: Incorporated readme, set library paths. First cvs version.
+# 2004-12-13: Add traps to cleanup temp files, from Amarendra Godbole.
#
# "OpenSSL headers do not match your library" are usually caused by
# OpenSSH's configure picking up an older version of OpenSSL headers
@@ -64,6 +67,11 @@ CC=gcc
STATIC=-static
#
+# Cleanup on interrupt
+#
+trap 'rm -f conftest.c' INT HUP TERM
+
+#
# Set up conftest C source
#
rm -f findssl.log