From 01e9d8f4f4ed4775dd2e3fc0b254c4db459c4509 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sat, 8 May 2010 19:13:49 +0000
Subject: [PATCH] Update to 5.5

---
 openssh/build.sh       | 19 ++++++++++++-------
 openssh/meta/ChangeLog |  4 ++++
 openssh/meta/pkgdef    |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 openssh/meta/ChangeLog

diff --git a/openssh/build.sh b/openssh/build.sh
index 917b50d..b72e466 100755
--- a/openssh/build.sh
+++ b/openssh/build.sh
@@ -1,26 +1,25 @@
 #!/bin/bash
-#
-# This is a generic build.sh script
+# This is a buildpkg build.sh script
 # It can be used nearly unmodified with many packages
-# 
 # build.sh helper functions
-. ${BUILDPKG_BASE}/scripts/build.sh.functions
+. ${BUILDPKG_SCRIPTS}/build.sh.functions
 #
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=5.1p1
+version=5.5p1
 pkgver=1
-source[0]=ftp://ftp.dkuug.dk/pub/OpenSSH/portable/$topdir-$version.tar.gz
+source[0]=ftp://ftp.sunet.se/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
 #patch[0]=
 
 # Source function library
-. ${BUILDPKG_BASE}/scripts/buildpkg.functions
+. ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
 # Global settings
 export LDFLAGS="-R$prefix/lib -L$prefix/lib"
 export CPPFLAGS="-I$prefix/include"
+make_check_target="tests"
 
 configure_args="--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --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:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check"
 
@@ -36,6 +35,12 @@ build()
     generic_build
 }
 
+reg check
+check()
+{
+    generic_check
+}
+
 reg install
 install()
 {
diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog
new file mode 100644
index 0000000..b91eb3e
--- /dev/null
+++ b/openssh/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Sat May 08 2010 Tom G. Christensen <swpkg@jupiterrise.com> - 5.5p1-1
+- Update to 5.5p1
diff --git a/openssh/meta/pkgdef b/openssh/meta/pkgdef
index 28ca3a0..e59ae81 100644
--- a/openssh/meta/pkgdef
+++ b/openssh/meta/pkgdef
@@ -29,6 +29,6 @@ $lprefix/$_mandir
 $lprefix/$_sysconfdir
 $lprefix/libexec/ssh-keysign
 $lprefix/libexec/sftp-server
-${lprefix}/${_sharedir}/openssh/Ssh.bin
+$lprefix/libexec/ssh-pkcs11-helper
 default_docs