Update to 3.9p1

Add a space file to shut up pkgmk.
Redid the sshd.init script with inspiration from the irix version.

openssh/build.sh

@@ -8,8 +8,8 @@
 #
 # Check the following 4 variables before running the script
 topdir=openssh
-version=3.8.1p1
-pkgver=2
+version=3.9p1
+pkgver=4
 source[0]=$topdir-$version.tar.gz
 # If there are no patches, simply comment this
 #patch[0]=
@@ -17,13 +17,6 @@ source[0]=$topdir-$version.tar.gz
 # Source function library
 . ${HOME}/buildpkg/scripts/buildpkg.functions
 
-# Fill in pkginfo values if necessary
-# using pkgname,name,pkgcat,pkgvendor & pkgdesc
-pkgname=SBossh
-name="OpenSSH portable for Solaris"
-pkgvendor="http://www.openssh.org"
-pkgdesc="Secure Shell remote access utility"
-
 # Define script functions and register them
 METHODS=""
 reg() {
@@ -39,13 +32,15 @@ prep()
 reg build
 build()
 {
+    export LDFLAGS="-R/usr/local/lib -L/usr/local/lib"
+    export CPPFLAGS="-I/usr/local/include/openssl"
     # Use prngd socket (For Solaris 2.6,7 & 8 without patch 112438)
-    #ENTROPY="--with-prngd-socket=/var/run/egd-pool"
+    #export ENTROPY="--with-prngd-socket=/var/run/egd-pool"
     # Use /dev/random (For Solaris 9 & 8 with patch 112438)
-    ENTROPY="--without-prngd --without-rand-helper"
-    setdir source
-    ./configure --prefix=$prefix $ENTROPY --with-default-path=/usr/bin:/usr/local/bin --with-mantype=cat --with-pam --disable-suid-ssh --without-rsh --with-privsep-user=sshd --with-superuser-path=/usr/bin:/usr/sbin:/usr/local/bin --with-lastlog=/var/adm/lastlog --without-zlib-version-check
-    $MAKE_PROG
+    export ENTROPY="--without-prngd --without-rand-helper"
+    configure_args='--prefix=$prefix --sysconfdir=$prefix/${_sysconfdir} --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:/usr/local/bin --with-mantype=cat --with-pam --disable-suid-ssh --without-rsh --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:/usr/local/bin --with-lastlog=/var/adm/lastlog --without-zlib-version-check $ENTROPY'
+
+    generic_build
 }
 
 reg install
@@ -54,10 +49,12 @@ install()
     clean stage
     setdir source
     $MAKE_PROG DESTDIR=$stagedir install-nokeys
-    strip
-    setdir $stagedir$prefix/etc
-    for i in *; do mv $i $i.default; done
-    cp -p $srcdir/sshd.init $stagedir/usr/local/etc
+    setdir ${stagedir}${prefix}/${_sysconfdir}
+    for i in *; do ${MV} $i $i.default; done
+    ${CP} -p $srcdir/sshd.init $stagedir/usr/local/etc
+    custom_install=1
+    generic_install
+    doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README README.privsep README.smartcard RFC.nroff TODO WARNING.RNG
  }
 
 reg pack

openssh/meta/space.openssh

@@ -0,0 +1,4 @@
+/etc/rcS.d/K30sshd.local 0 1
+/etc/rc0.d/K30sshd.local 0 1
+/etc/rc1.d/K30sshd.local 0 1
+/etc/rc2.d/S78sshd.local 0 1

openssh/src/sshd.init

@@ -4,34 +4,41 @@
 # History:
 #   Please see CVS for history information
 
+SSHD=/usr/local/sbin/sshd
+
 pidfile=/var/run/sshd.pid
-desc="sshd"
+
+kill_sshd()
+{
+        if [ -r $pidfile ]; then
+            sshd_pid=`cat $pidfile`
+            ps -p $sshd_pid | grep sshd > /dev/null
+            if [ $? -eq 0 ]; then
+                /usr/bin/kill -15 -$sshd_pid
+            fi
+        fi
+}
 
 mode=$1
-
 set `/usr/xpg4/bin/id -u`
 if [ $1 = "0" ]; then
 
 case $mode in
-
-'start' ) if [ -r $pidfile ]; then
-	    echo "A pidfile was found, trying to stop $desc first"
-	    $0 stop
-	  fi
-	  echo "Starting $desc" 
-	  /usr/local/sbin/sshd
-  	  ;;
-'stop' ) if [ -r $pidfile ]; then
-	    echo "Stopping $desc"
-	    kill `cat $pidfile`
-	 else
-	    echo "$desc already stopped (no pid file found)"
-	 fi
-	 ;;
-'restart') $0 stop
-	   $0 start
-	   ;;
-*) echo "Usage: $0 {start|stop|restart}"
+    start)
+	kill_sshd
+	echo "Starting sshd" 
+	$SSHD
+	;;
+    stop) 
+	kill_sshd
+	exit 0
+	;;
+    restart)
+	$0 start
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart}"
+	;;
 esac 
 
 else