From efa13a3a74f1d17653f9a49129c43a99fde64835 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 04 May 2008 13:35:41 +0000
Subject: [PATCH] Updated patch and notes. Also added the optional package description and the post install script.


git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@25312 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 patches/openssh/.OptionalPackageDescription |  5 +++++
 patches/openssh/Notes                       | 19 +++++++++++++++----
 patches/openssh/openssh-4.7p1.diff          | 13 -------------
 patches/openssh/openssh.diff                | 20 ++++++++++++++++++++
 patches/openssh/ssh.sh                      | 17 +++++++++++++++++
 5 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/patches/openssh/.OptionalPackageDescription b/patches/openssh/.OptionalPackageDescription
new file mode 100644
index 0000000..25d5cf5 100644
--- /dev/null
+++ b/patches/openssh/.OptionalPackageDescription
@@ -1,0 +1,5 @@
+Package:		OpenSSH
+Version:		5.0p1
+Copyright:		2005-2008 Tatu Ylonen et al.
+License:		OpenSSH
+URL:			http://www.openssh.org/
diff --git a/patches/openssh/Notes b/patches/openssh/Notes
index 6b7fc36..42155ee 100644
--- a/patches/openssh/Notes
+++ b/patches/openssh/Notes
@@ -1,4 +1,4 @@
-Notes for OpenSSH 4.7p1 (Haiku r24683)
+Notes for OpenSSH 5.0p1 (Haiku r25311)
 ======================================
 
 configure
@@ -8,19 +8,24 @@
   automake --add-missing
   autoreconf --force
 
-  ./configure --prefix=/boot/home/config --with-ssl-dir=/boot/home/config
+  ./configure --prefix=/boot/home/config --with-ssl-dir=/boot/home/config --sbindir=/boot/home/config/bin --libexecdir=/boot/home/config/bin --localstatedir=/var
 
 * automake will fail, but it will replace config.{sub,guess} anyway, which is
   all we want.
-* Edit config.h:
-  - Undefined HAVE_CONTROL_IN_MSGHDR: Haiku doesn't really support it.
-  - define HAVE_U_INT64_T: Only to get rid of warnings while compiling. The
-    configure test only includes <sys/types.h>, which doesn't define Haiku's
-    u_int64_t (<stdint.h> does).
+* Note, the /boot/home/config paths are temporary only. This has to be changed
+  to /boot/common.
 
+
 make/install
 ------------
 
   make
   make install
+
+
+packaging
+---------
 
+* Remove the generated host keys (in /boot/home/config/etc).
+* Add the post install script (ssh.sh) that generates the host keys on the first
+  run.
diff --git a/patches/openssh/openssh-4.7p1.diff b/patches/openssh/openssh-4.7p1.diff
deleted file mode 100644
index 641dd10..0000000 100644
--- a/patches/openssh/openssh-4.7p1.diff
+++ /dev/null
@@ -1,13 +1,0 @@
-diff -ur openssh-4.7p1-orig/includes.h openssh-4.7p1/includes.h
---- openssh-4.7p1-orig/includes.h	2007-06-11 06:44:03.000000000 +0200
-+++ openssh-4.7p1/includes.h	2008-03-29 03:00:42.000000000 +0100
-@@ -109,7 +109,9 @@
- #endif
- 
- #include <netinet/in.h>
-+#ifndef __HAIKU__
- #include <netinet/in_systm.h> /* For typedefs */
-+#endif
- #ifdef HAVE_RPC_TYPES_H
- # include <rpc/types.h> /* For INADDR_LOOPBACK */
- #endif
diff --git a/patches/openssh/openssh.diff b/patches/openssh/openssh.diff
new file mode 100644
index 0000000..9d7116b 100644
--- /dev/null
+++ b/patches/openssh/openssh.diff
@@ -1,0 +1,20 @@
+Patch against OpenSSH 5.0p1 to add Haiku support.
+Date: 2008-05-04
+
+diff -urN openssh-5.0p1-orig/configure.ac openssh-5.0p1/configure.ac
+--- openssh-5.0p1-orig/configure.ac	2008-03-27 01:33:07.000000000 +0000
++++ openssh-5.0p1/configure.ac	2008-05-04 00:29:35.000000000 +0000
+@@ -468,6 +468,13 @@
+ *-*-dragonfly*)
+ 	SSHDLIBS="$SSHDLIBS -lcrypt"
+ 	;;
++*-*-haiku*)
++	CPPFLAGS="$CPPFLAGS -I/boot/develop/headers/bsd"
++	LIBS="$LIBS -lbsd -lnetwork"
++	dnl u_int64_t is defined, just not through <sys/types.h>
++	AC_DEFINE(HAVE_U_INT64_T)
++	MANTYPE=man
++	;;
+ *-*-hpux*)
+ 	# first we define all of the options common to all HP-UX releases
+ 	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
diff --git a/patches/openssh/ssh.sh b/patches/openssh/ssh.sh
new file mode 100755
index 0000000..c5d7dc4 100755
--- /dev/null
+++ b/patches/openssh/ssh.sh
@@ -1,0 +1,17 @@
+#!/bin/sh
+
+# generate SSH host keys
+
+hostKeyDir=/boot/home/config/etc
+
+if [ ! -f "$hostKeyDir/ssh_host_key" ] ; then
+	ssh-keygen -t rsa1 -f "$hostKeyDir/ssh_host_key" -N ""
+fi
+
+if [ ! -f "$hostKeyDir/ssh_host_dsa_key" ] ; then
+	ssh-keygen -t dsa -f "$hostKeyDir/ssh_host_dsa_key" -N ""
+fi
+
+if [ ! -f "$hostKeyDir/ssh_host_rsa_key" ] ; then
+	ssh-keygen -t rsa -f "$hostKeyDir/ssh_host_rsa_key" -N ""
+fi
--
gitore 0.2.3