4 files changed, 137 insertions, 0 deletions

diff --git a/security/fressh/files/patch-Makefile b/security/fressh/files/patch-Makefile
new file mode 100644
index 000000000000..3138268be3d7
--- /dev/null
+++ b/security/fressh/files/patch-Makefile
@@ -0,0 +1,71 @@
+
+$FreeBSD$
+
+--- Makefile.orig	Sun Feb 11 06:01:50 2001
++++ Makefile	Wed Apr 18 19:11:30 2001
+@@ -1,11 +1,11 @@
+ # $Id: Makefile,v 1.80.2.1 2001/02/11 04:01:50 tls Exp $
+ 
+-DEBUG = -g
+-OPTIMIZE = -O2
++#DEBUG = -g
++#OPTIMIZE = -O2
+ #PROF = -pg
+-WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
+-           -Wpointer-arithmetic -Wreturn-type -Wwrite-strings \
+-	   -Wcast-qual -Wswitch -Werror # -Wshadow
++#WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
++#           -Wpointer-arithmetic -Wreturn-type -Wwrite-strings \
++#	   -Wcast-qual -Wswitch -Werror # -Wshadow
+ # DEFINES += -DUNSAFE_DEBUG
+ # DEFINES += -DFORCE_VALID_LOOPBACK_HOST_KEYS
+ # DEFINES += -DNO_CRC_AT_ALL
+@@ -20,15 +20,15 @@
+ #MEMDEBUG_INCLUDE= -I /usr/pkg/include
+ #MEMDEBUG_LINK= -L /usr/pkg/lib -R /usr/pkg/lib -lleak
+ 
+-CPPFLAGS = ${WARNINGS} -I. -Itransport -Icrypto ${MEMDEBUG_INCLUDE}
+-CFLAGS = ${DEBUG} ${OPTIMIZE} ${PROF} ${CPPFLAGS}
++CPPFLAGS += ${WARNINGS} -I. -Itransport -Icrypto ${MEMDEBUG_INCLUDE}
++CFLAGS += ${DEBUG} ${OPTIMIZE} ${PROF} ${CPPFLAGS}
+ 
+ OS_HDR = ssh_sys_bsd44+.h
+ OS_SRC = ssh_sys_bsd44+.c ssh_sys_posix.c
+ OS_OBJ = ssh_sys_bsd44+.o ssh_sys_posix.o
+ 
+ # Use *one* of the two below:
+-LIBS=	-Llib -lssh	# If you have BSD pmake and BSD-style shared libs.
++LIBS+=	${LDFLAGS} -Llib -lssh	# If you have BSD pmake and BSD-style shared libs.
+ SSHLIB= libssh
+ LIBCLEAN= libclean
+ LIBDEP= libdep
+@@ -40,11 +40,10 @@
+ 
+ #IDEA_LIB = -lcrypto_idea
+ 
+-LIBS+= -lutil -lcrypt -lz ${IDEA_LIB} -lcrypto ${MEMDEBUG_LINK}
++LIBS+= -lutil -lcrypt -lz ${IDEA_LIB} -lcrypto ${MEMDEBUG_LINK} ${RSAGLUE}
+ 
+ INSTALL=install
+ INSTALL_FLAGS=-c -r -m 755 -o bin -g bin
+-PREFIX=/usr/local
+ FRE=fre
+ 
+ HDRS = options.h ssh_buffer.h ssh_channel.h ssh_client.h ssh_defines.h	\
+@@ -154,11 +153,11 @@
+ 	(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/files/patch-crypto::ssh_crypto_openssl.c b/security/fressh/files/patch-crypto::ssh_crypto_openssl.c
new file mode 100644
index 000000000000..7b43df90b662
--- /dev/null
+++ b/security/fressh/files/patch-crypto::ssh_crypto_openssl.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- crypto/ssh_crypto_openssl.c	2001/04/18 16:00:03	1.1
++++ crypto/ssh_crypto_openssl.c	2001/04/18 16:00:24
+@@ -44,6 +44,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #include <openssl/rand.h>
+ 
diff --git a/security/fressh/files/patch-lib::Makefile b/security/fressh/files/patch-lib::Makefile
new file mode 100644
index 000000000000..569942595639
--- /dev/null
+++ b/security/fressh/files/patch-lib::Makefile
@@ -0,0 +1,40 @@
+
+$FreeBSD$
+
+--- lib/Makefile	2001/04/18 15:56:18	1.1
++++ lib/Makefile	2001/04/18 15:56:44
+@@ -1,8 +1,8 @@
+ # $Id: Makefile,v 1.1 2001/04/18 15:56:18 root Exp root $
+ 
+ NOLINT = 1
+-DEBUG = -g
+-OPTIMIZE = -O2
++#DEBUG = -g
++#OPTIMIZE = -O2
+ LIB = ssh
+ NOPIC = 1
+ 
+@@ -10,9 +10,9 @@
+ .PATH:	${.CURDIR}/../transport
+ .PATH:	${.CURDIR}/../crypto
+ 
+-WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
+-           -Wpointer-arithmetic -Wreturn-type -Wwrite-strings \
+-	   -Wcast-qual -Wswitch -Werror # -Wshadow
++#WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
++#           -Wpointer-arithmetic -Wreturn-type -Wwrite-strings \
++#	   -Wcast-qual -Wswitch -Werror # -Wshadow
+ # DEFINES += -DUNSAFE_DEBUG
+ # DEFINES += -DFORCE_VALID_LOOPBACK_HOST_KEYS
+ # DEFINES += -DNO_CRC_AT_ALL
+@@ -20,8 +20,8 @@
+ 
+ INCLUDE	=  -I${.CURDIR}/.. -I${.CURDIR}/../transport -I${.CURDIR}/../crypto
+ 
+-CPPFLAGS = ${WARNINGS} ${INCLUDE} ${MEMDEBUG_INCLUDE}
+-CFLAGS = ${DEBUG} ${OPTIMIZE} ${CPPFLAGS}
++CPPFLAGS += ${WARNINGS} ${INCLUDE} ${MEMDEBUG_INCLUDE}
++CFLAGS += ${DEBUG} ${OPTIMIZE} ${CPPFLAGS}
+ 
+ OS_SRC = ssh_sys_bsd44+.c ssh_sys_posix.c
+ 
diff --git a/security/fressh/files/patch-ssh_logging.c b/security/fressh/files/patch-ssh_logging.c
new file mode 100644
index 000000000000..c856200a4306
--- /dev/null
+++ b/security/fressh/files/patch-ssh_logging.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- ssh_logging.c	2001/04/18 15:57:35	1.1
++++ ssh_logging.c	2001/04/18 15:57:48
+@@ -46,6 +46,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
++#include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+