summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/caldera/openssh.spec4
-rw-r--r--contrib/cygwin/README25
-rw-r--r--contrib/cygwin/ssh-host-config2
-rw-r--r--contrib/findssl.sh10
-rw-r--r--contrib/redhat/openssh.spec2
-rw-r--r--contrib/ssh-copy-id2
-rw-r--r--contrib/suse/openssh.spec2
7 files changed, 32 insertions, 15 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 53b16455e..67d8e6ff4 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,7 +17,7 @@
17#old cvs stuff. please update before use. may be deprecated. 17#old cvs stuff. please update before use. may be deprecated.
18%define use_stable 1 18%define use_stable 1
19%if %{use_stable} 19%if %{use_stable}
20 %define version 3.9p1 20 %define version 4.0p1
21 %define cvs %{nil} 21 %define cvs %{nil}
22 %define release 1 22 %define release 1
23%else 23%else
@@ -363,4 +363,4 @@ fi
363* Mon Jan 01 1998 ... 363* Mon Jan 01 1998 ...
364Template Version: 1.31 364Template Version: 1.31
365 365
366$Id: openssh.spec,v 1.51 2004/08/17 12:49:12 djm Exp $ 366$Id: openssh.spec,v 1.52 2005/03/09 00:02:42 djm Exp $
diff --git a/contrib/cygwin/README b/contrib/cygwin/README
index 5a9b1ce0c..3dd45014a 100644
--- a/contrib/cygwin/README
+++ b/contrib/cygwin/README
@@ -195,28 +195,37 @@ configure are used for the Cygwin binary distribution:
195 195
196 --prefix=/usr \ 196 --prefix=/usr \
197 --sysconfdir=/etc \ 197 --sysconfdir=/etc \
198 --libexecdir='$(sbindir)' \ 198 --libexecdir='${sbindir}' \
199 --localstatedir=/var \ 199 --localstatedir=/var \
200 --datadir='$(prefix)/share' \ 200 --datadir='${prefix}/share' \
201 --mandir='$(datadir)/man' \ 201 --mandir='${datadir}/man' \
202 --infodir='${datadir}/info'
202 --with-tcp-wrappers 203 --with-tcp-wrappers
203 204
204If you want to create a Cygwin package, equivalent to the one 205If you want to create a Cygwin package, equivalent to the one
205in the Cygwin binary distribution, install like this: 206in the Cygwin binary distribution, install like this:
206 207
207 mkdir /tmp/cygwin-ssh 208 mkdir /tmp/cygwin-ssh
208 cd $(builddir) 209 cd ${builddir}
209 make install DESTDIR=/tmp/cygwin-ssh 210 make install DESTDIR=/tmp/cygwin-ssh
210 cd $(srcdir)/contrib/cygwin 211 cd ${srcdir}/contrib/cygwin
211 make cygwin-postinstall DESTDIR=/tmp/cygwin-ssh 212 make cygwin-postinstall DESTDIR=/tmp/cygwin-ssh
212 cd /tmp/cygwin-ssh 213 cd /tmp/cygwin-ssh
213 find * \! -type d | tar cvjfT my-openssh.tar.bz2 - 214 find * \! -type d | tar cvjfT my-openssh.tar.bz2 -
214 215
215You must have installed the zlib, the openssl-devel and the minires-devel 216You must have installed the following packages to be able to build OpenSSH:
216packages to be able to build OpenSSH! 217
218- zlib
219- openssl-devel
220- minires-devel
221
222If you want to build with --with-tcp-wrappers, you also need the package
223
224- tcp_wrappers
217 225
218Please send requests, error reports etc. to cygwin@cygwin.com. 226Please send requests, error reports etc. to cygwin@cygwin.com.
219 227
228
220Have fun, 229Have fun,
221 230
222Corinna Vinschen 231Corinna Vinschen
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 9c0dabf41..c7164f610 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -449,7 +449,7 @@ then
449 echo "Should this script create a new local account 'sshd_server' which has" 449 echo "Should this script create a new local account 'sshd_server' which has"
450 if request "the required privileges?" 450 if request "the required privileges?"
451 then 451 then
452 _admingroup=`awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group` 452 _admingroup=`awk -F: '{if ( $1 != "root" && $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
453 if [ -z "${_admingroup}" ] 453 if [ -z "${_admingroup}" ]
454 then 454 then
455 echo "There's no group with SID S-1-5-32-544 (Local administrators group) in" 455 echo "There's no group with SID S-1-5-32-544 (Local administrators group) in"
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
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index f8a91f2c2..8fbc4c02a 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
1%define ver 3.9p1 1%define ver 4.0p1
2%define rel 1 2%define rel 1
3 3
4# OpenSSH privilege separation requires a user & group ID 4# OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1c0a9234..1555b5d37 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -24,7 +24,7 @@ else
24 fi 24 fi
25fi 25fi
26 26
27if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then 27if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
28 GET_ID="cat ${ID_FILE}" 28 GET_ID="cat ${ID_FILE}"
29fi 29fi
30 30
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 3f4a0189b..449613db6 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -1,6 +1,6 @@
1Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation 1Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
2Name: openssh 2Name: openssh
3Version: 3.9p1 3Version: 4.0p1
4URL: http://www.openssh.com/ 4URL: http://www.openssh.com/
5Release: 1 5Release: 1
6Source0: openssh-%{version}.tar.gz 6Source0: openssh-%{version}.tar.gz