From 14ce397ec02703ed069a1dedad11f9e7c08a9ac0 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Mon, 11 Sep 2006 13:14:38 +0000
Subject: [PATCH] Update to 4.3p2

---
 openssh/build.sh            | 73 ++++++++-----------------------------
 openssh/meta/depend.openssh |  2 +-
 2 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/openssh/build.sh b/openssh/build.sh
index 24d2eff..e0c5dd6 100755
--- a/openssh/build.sh
+++ b/openssh/build.sh
@@ -3,25 +3,30 @@
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
-# The concept of "method" registering and the logic that implements it was shamelessly
-# stolen from jhlj's Compile.sh script :)
+# build.sh helper functions
+. ${BUILDPKG_BASE}/scripts/build.sh.functions
 #
+###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=3.9p1
-pkgver=4
+version=4.3p2
+pkgver=1
 source[0]=$topdir-$version.tar.gz
 # If there are no patches, simply comment this
 #patch[0]=
 
 # Source function library
-. ${HOME}/buildpkg/scripts/buildpkg.functions
+. ${BUILDPKG_BASE}/scripts/buildpkg.functions
+
+# Global settings
+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)
+#export ENTROPY="--with-prngd-socket=/var/run/egd-pool"
+# Use /dev/random (For Solaris 9 & 8 with patch 112438)
+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'
 
-# Define script functions and register them
-METHODS=""
-reg() {
-    METHODS="$METHODS $1"
-}
 
 reg prep
 prep()
@@ -32,14 +37,6 @@ 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)
-    #export ENTROPY="--with-prngd-socket=/var/run/egd-pool"
-    # Use /dev/random (For Solaris 9 & 8 with patch 112438)
-    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
 }
 
@@ -72,42 +69,4 @@ distclean()
 ###################################################
 # No need to look below here
 ###################################################
-
-reg all
-all()
-{
-    for METHOD in $METHODS 
-    do
-	case $METHOD in
-	     all*) ;;
-	     *) $METHOD
-		;;
-	esac
-    done
-
-}
-
-reg
-usage() {
-    echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}"
-    exit 1
-}
-
-OK=0
-for METHOD in $*
-do
-    METHOD=" $METHOD *"
-    if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then
-	usage
-    fi
-    OK=1
-done
-
-if [ $OK = 0 ] ; then
-    usage;
-fi
-
-for METHOD in $*
-do
-    ( $METHOD )
-done
+build_sh $*
diff --git a/openssh/meta/depend.openssh b/openssh/meta/depend.openssh
index 8095d25..f153225 100644
--- a/openssh/meta/depend.openssh
+++ b/openssh/meta/depend.openssh
@@ -1,2 +1,2 @@
-P   SBossl097dlib   OpenSSL - Secure Socket Layer
+P   SBossl097klib   OpenSSL - Secure Socket Layer
 P   SBlibgccso1	    libgcc_s.so.1 from gcc 3.3.2+