summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-12-13 18:08:32 +1100
committerDarren Tucker <dtucker@zip.com.au>2004-12-13 18:08:32 +1100
commit442a383418dc3eb1809e66c966933071034d5325 (patch)
tree5dd97bd2c45a48aa656db3494f3352bf44169266
parentf0f90989fa7c22ab86ae7957b3af539584be375c (diff)
- (dtucker) [contrib/findssh.sh] Clean up on interrupt; from
amarendra.godbole at ge com.
-rw-r--r--ChangeLog6
-rw-r--r--contrib/findssl.sh10
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cf68f4fb3..469fa4954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120041213
2 - (dtucker) [contrib/findssh.sh] Clean up on interrupt; from
3 amarendra.godbole at ge com.
4
120041211 520041211
2 - (dtucker) OpenBSD CVS Sync 6 - (dtucker) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2004/12/06 16:00:43 7 - markus@cvs.openbsd.org 2004/12/06 16:00:43
@@ -1946,4 +1950,4 @@
1946 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1950 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1947 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1951 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1948 1952
1949$Id: ChangeLog,v 1.3603 2004/12/11 02:39:50 dtucker Exp $ 1953$Id: ChangeLog,v 1.3604 2004/12/13 07:08:32 dtucker Exp $
diff --git a/contrib/findssl.sh b/contrib/findssl.sh
index 0c08d4a18..716abced5 100644
--- a/contrib/findssl.sh
+++ b/contrib/findssl.sh
@@ -1,5 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $Id: findssl.sh,v 1.3 2004/12/13 07:08:33 dtucker Exp $
4#
3# findssl.sh 5# findssl.sh
4# Search for all instances of OpenSSL headers and libraries 6# Search for all instances of OpenSSL headers and libraries
5# and print their versions. 7# and print their versions.
@@ -9,10 +11,11 @@
9# Written by Darren Tucker (dtucker at zip dot com dot au) 11# Written by Darren Tucker (dtucker at zip dot com dot au)
10# This file is placed in the public domain. 12# This file is placed in the public domain.
11# 13#
12# $Id: findssl.sh,v 1.2 2003/11/21 12:48:56 djm Exp $ 14# Release history:
13# 2002-07-27: Initial release. 15# 2002-07-27: Initial release.
14# 2002-08-04: Added public domain notice. 16# 2002-08-04: Added public domain notice.
15# 2003-06-24: Incorporated readme, set library paths. First cvs version. 17# 2003-06-24: Incorporated readme, set library paths. First cvs version.
18# 2004-12-13: Add traps to cleanup temp files, from Amarendra Godbole.
16# 19#
17# "OpenSSL headers do not match your library" are usually caused by 20# "OpenSSL headers do not match your library" are usually caused by
18# OpenSSH's configure picking up an older version of OpenSSL headers 21# OpenSSH's configure picking up an older version of OpenSSL headers
@@ -64,6 +67,11 @@ CC=gcc
64STATIC=-static 67STATIC=-static
65 68
66# 69#
70# Cleanup on interrupt
71#
72trap 'rm -f conftest.c' INT HUP TERM
73
74#
67# Set up conftest C source 75# Set up conftest C source
68# 76#
69rm -f findssl.log 77rm -f findssl.log