tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

20061006

Browse Source 
- (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris.
   Differentiate between OpenServer 5 and OpenServer 6
This commit is contained in:
Tim Rice 2006-10-06 14:58:38 -07:00
parent 1cfab23b7f
commit 09f1093a29
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20061006
- (tim) [buildpkg.sh.in] Use uname -r instead of -v in OS_VER for Solaris.
Differentiate between OpenServer 5 and OpenServer 6
20061003 20061003
- (tim) [configure.ac] Move CHECK_HEADERS test before platform specific - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific
section so additional platform specific CHECK_HEADER tests will work section so additional platform specific CHECK_HEADER tests will work
@ -2515,4 +2519,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4566 2006/10/03 16:34:35 tim Exp $ $Id: ChangeLog,v 1.4567 2006/10/06 21:58:38 tim Exp $

11
buildpkg.sh.in
View File

@ -154,15 +154,22 @@ ARCH=`uname -m`
DEF_MSG="\n" DEF_MSG="\n"
OS_VER=`uname -v` OS_VER=`uname -v`
SCRIPT_SHELL=/sbin/sh SCRIPT_SHELL=/sbin/sh
UNAME_R=`uname -r`
UNAME_S=`uname -s` UNAME_S=`uname -s`
case ${UNAME_S} in case ${UNAME_S} in
SunOS) UNAME_S=Solaris SunOS) UNAME_S=Solaris
OS_VER=${UNAME_R}
ARCH=`uname -p` ARCH=`uname -p`
RCS_D=yes RCS_D=yes
DEF_MSG="(default: n)" DEF_MSG="(default: n)"
;; ;;
SCO_SV) UNAME_S=OpenServer SCO_SV) case ${UNAME_R} in
3.2) UNAME_S=OpenServer5
OS_VER=`uname -X | grep Release | sed -e 's/^Rel.*3.2v//'` OS_VER=`uname -X | grep Release | sed -e 's/^Rel.*3.2v//'`
;;
5) UNAME_S=OpenServer6
;;
esac
SCRIPT_SHELL=/bin/sh SCRIPT_SHELL=/bin/sh
RC1_D=no RC1_D=no
DEF_MSG="(default: n)" DEF_MSG="(default: n)"
@ -481,7 +488,7 @@ _EOF
[ -x /usr/bin/ckyorn ] || cat >> request << _EOF [ -x /usr/bin/ckyorn ] || cat >> request << _EOF
ckyorn() { ckyorn() {
# for some strange reason OpenServer has no ckyorn # for some strange reason OpenServer5 has no ckyorn
# We build a striped down version here # We build a striped down version here
DEFAULT=n DEFAULT=n