[Haiku-commits] r24695 - in buildtools/trunk/patches: . openssh

[bonefish at BerliOS]

Author: bonefish
Date: 2008-03-30 22:28:30 +0200 (Sun, 30 Mar 2008)
New Revision: 24695
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=24695&view=rev

Added:
   buildtools/trunk/patches/openssh/
   buildtools/trunk/patches/openssh/Notes
   buildtools/trunk/patches/openssh/openssh-4.7p1.diff
Log:
Intermediate mini patch against OpenSSH 4.7p1 adding Haiku support. It
only adds a guard against the inclusion of <netinet/in_systm.h>, which
Haiku doesn't have ATM (we should probably just add it). Following the
instructions in my Notes file everything builds and the results run
somewhat. ssh has problems with a Sun server I tested against (all
OpenSSH servers worked fine, though), sftp is broken, and sshd refuses
to work without a "sshd" user for privilege separation. Well, I'm
working on it...


Added: buildtools/trunk/patches/openssh/Notes
===================================================================
--- buildtools/trunk/patches/openssh/Notes	2008-03-30 20:24:58 UTC (rev 24694)
+++ buildtools/trunk/patches/openssh/Notes	2008-03-30 20:28:30 UTC (rev 24695)
@@ -0,0 +1,26 @@
+Notes for OpenSSH 4.7p1 (Haiku r24683)
+======================================
+
+configure
+---------
+
+  rm config.sub config.guess
+  automake --add-missing
+  autoreconf --force
+
+  ./configure --prefix=/boot/home/config --with-ssl-dir=/boot/home/config
+
+* 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).
+
+make/install
+------------
+
+  make
+  make install
+

Added: buildtools/trunk/patches/openssh/openssh-4.7p1.diff
===================================================================
--- buildtools/trunk/patches/openssh/openssh-4.7p1.diff	2008-03-30 20:24:58 UTC (rev 24694)
+++ buildtools/trunk/patches/openssh/openssh-4.7p1.diff	2008-03-30 20:28:30 UTC (rev 24695)
@@ -0,0 +1,13 @@
+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