DragonFly has libutil.h like FreeBSD. Include sys/time.h to get

struct timeval on DragonFly. Use BSD_INSTALL_PROGRAM, removing
the unportable -r flag at the same time. Fix build with newer
OpenSSL versions by including openssl/sha.h explicitly.

5 files changed, 63 insertions, 14 deletions

diff --git a/security/fressh/distinfo b/security/fressh/distinfo
index 6e0a818e573..9f047c11488 100644
--- a/security/fressh/distinfo
+++ b/security/fressh/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 13:10:06 agc Exp $
+$NetBSD: distinfo,v 1.9 2006/01/27 18:08:10 joerg Exp $
 
 SHA1 (fressh-0.8.1.tar.bz2) = 4dd0a6d4240337b4726a6a68b17878a45974cf82
 RMD160 (fressh-0.8.1.tar.bz2) = fa1c3444febc0eb73e2367753ed261b30000171c
 Size (fressh-0.8.1.tar.bz2) = 110390 bytes
-SHA1 (patch-aa) = 0b65db8177ffb81084412f9716f73e92920d559c
+SHA1 (patch-aa) = dd3e80db0192932a15fc6f6433e823879fddee0f
 SHA1 (patch-ab) = 612c7f5e1541d413f3d336a4330528343f78e420
 SHA1 (patch-af) = a62d7421315f4bf70558224dcb4b4b4a7fbaadd1
 SHA1 (patch-ag) = eb02a24bc9ed6a299f40722bfb87d0aefd22ab34
 SHA1 (patch-ah) = 5a4aefc5fdad1c6a0517a7351af461aaa53462a3
 SHA1 (patch-ai) = 0e3233da83fae4a12c2aca91d9cd7c606310eff6
-SHA1 (patch-aj) = 379a1bb374244e6a0672a27e2f4fffc437ac8b3a
+SHA1 (patch-aj) = bb22f2dcac1dc30ca667a6ebe066435a525d8725
 SHA1 (patch-ak) = aa86ae8e33b3189ce720a8c800bb2cbc5e5f33f9
 SHA1 (patch-al) = 9425efd0c6b024e8913ce2e931a3be025997d108
+SHA1 (patch-am) = 1111f4c72da953b378ee54d92422ca38b3f715d8
+SHA1 (patch-an) = efbd728c6038a7f20c3a346bbb82ae690a0f4ed4
diff --git a/security/fressh/patches/patch-aa b/security/fressh/patches/patch-aa
index 97b767a839c..c78f73884bb 100644
--- a/security/fressh/patches/patch-aa
+++ b/security/fressh/patches/patch-aa
@@ -1,11 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/12 16:15:14 agc Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/27 18:08:10 joerg Exp $
 
-Get rid of hard-coded PREFIX definition - it gets passed through the environment
-in pkgsrc.
-
---- Makefile	2001/02/12 15:48:04	1.1
-+++ Makefile	2001/02/12 15:48:21
-@@ -44,7 +44,6 @@
+--- Makefile.orig	2001-02-11 04:01:50.000000000 +0000
++++ Makefile
+@@ -44,7 +44,6 @@ LIBS+= -lutil -lcrypt -lz ${IDEA_LIB} -l
  
  INSTALL=install
  INSTALL_FLAGS=-c -r -m 755 -o bin -g bin
@@ -13,3 +10,20 @@ in pkgsrc.
  FRE=fre
  
  HDRS = options.h ssh_buffer.h ssh_channel.h ssh_client.h ssh_defines.h	\
+@@ -154,11 +153,11 @@ libdep::
+ 	(cd lib ; make depend)
+ 
+ install: sshd
+-	${INSTALL} ${INSTALL_FLAGS} sshd ${PREFIX}/sbin/${FRE}sshd
+-	${INSTALL} ${INSTALL_FLAGS} ssh-keygen ${PREFIX}/bin/${FRE}ssh-keygen
+-	${INSTALL} ${INSTALL_FLAGS} ssh ${PREFIX}/bin/${FRE}ssh
+-	${INSTALL} ${INSTALL_FLAGS} ssh-agent ${PREFIX}/bin/${FRE}ssh-agent
+-	${INSTALL} ${INSTALL_FLAGS} ssh-add ${PREFIX}/bin/${FRE}ssh-add
++	${BSD_INSTALL_PROGRAM} sshd ${PREFIX}/sbin/${FRE}sshd
++	${BSD_INSTALL_PROGRAM} ssh-keygen ${PREFIX}/bin/${FRE}ssh-keygen
++	${BSD_INSTALL_PROGRAM} ssh ${PREFIX}/bin/${FRE}ssh
++	${BSD_INSTALL_PROGRAM} ssh-agent ${PREFIX}/bin/${FRE}ssh-agent
++	${BSD_INSTALL_PROGRAM} ssh-add ${PREFIX}/bin/${FRE}ssh-add
+ 
+ clean: ${LIBCLEAN}
+ 	rm -f *.o crypto/*.o transport/*.o a.out sshd ssh-keygen ssh \
diff --git a/security/fressh/patches/patch-aj b/security/fressh/patches/patch-aj
index 7de849a7853..400835e47bd 100644
--- a/security/fressh/patches/patch-aj
+++ b/security/fressh/patches/patch-aj
@@ -1,8 +1,17 @@
-$NetBSD: patch-aj,v 1.1 2003/10/28 00:14:11 kristerw Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/27 18:08:10 joerg Exp $
 
---- ssh_sys_bsd44+.c.orig	Tue Oct 28 00:53:17 2003
-+++ ssh_sys_bsd44+.c	Tue Oct 28 00:55:52 2003
-@@ -830,7 +830,7 @@
+--- ssh_sys_bsd44+.c.orig	2001-02-15 21:33:40.000000000 +0000
++++ ssh_sys_bsd44+.c
+@@ -61,7 +61,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <libutil.h>
+ #else
+ #include <util.h>
+@@ -830,7 +830,7 @@ ssh_sys_checkpw(char *uname, const char 
  	if (pwent == NULL)
  		return -1;
  
diff --git a/security/fressh/patches/patch-am b/security/fressh/patches/patch-am
new file mode 100644
index 00000000000..231c7fb678d
--- /dev/null
+++ b/security/fressh/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2006/01/27 18:08:10 joerg Exp $
+
+--- crypto/ssh_crypto_openssl.c.orig	2006-01-27 17:53:03.000000000 +0000
++++ crypto/ssh_crypto_openssl.c
+@@ -46,6 +46,7 @@
+ #include <string.h>
+ 
+ #include <openssl/rand.h>
++#include <openssl/sha.h>
+ 
+ #include <openssl/opensslv.h>
+ 
diff --git a/security/fressh/patches/patch-an b/security/fressh/patches/patch-an
new file mode 100644
index 00000000000..14c32dea082
--- /dev/null
+++ b/security/fressh/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2006/01/27 18:08:10 joerg Exp $
+
+--- ssh_logging.c.orig	2006-01-27 17:56:05.000000000 +0000
++++ ssh_logging.c
+@@ -47,6 +47,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <sys/types.h>
++#include <sys/time.h>
+ #include <unistd.h>
+ 
+ #include "options.h"