From e54a665a8463d1eebf5557ecd2cfd2f91fe8c3e9 Mon Sep 17 00:00:00 2001
From: edwin <edwin@FreeBSD.org>
Date: Thu, 16 Oct 2003 05:34:33 +0000
Subject: add several patches to make it compiling on -current again. Informed
 maintainer.

---
 security/sslwrap/Makefile               | 16 ++++++++--------
 security/sslwrap/files/patch-apps.h     | 15 +++++++++++++++
 security/sslwrap/files/patch-s_cb.c     | 15 +++++++++++++++
 security/sslwrap/files/patch-s_server.c | 32 ++++++++++++++++++++++++++++++++
 security/sslwrap/files/patch-s_socket.c | 11 +++++++++++
 5 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 security/sslwrap/files/patch-apps.h
 create mode 100644 security/sslwrap/files/patch-s_cb.c
 create mode 100644 security/sslwrap/files/patch-s_server.c
 create mode 100644 security/sslwrap/files/patch-s_socket.c

(limited to 'security')

diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
index 2008b7e1e814..7be7c15f5666 100644
--- a/security/sslwrap/Makefile
+++ b/security/sslwrap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sslwrap
 PORTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.quiltaholic.com/rickk/sslwrap/
 DISTNAME=	${PORTNAME}
@@ -19,14 +20,13 @@ USE_REINPLACE=	YES
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
-	${REINPLACE_CMD} -e 's/SSL_OP_NON_EXPORT_FIRST/SSL_OP_CIPHER_SERVER_PREFERENCE/g' ${WRKSRC}/s_server.c
+	${REINPLACE_CMD} -e \
+		's/SSL_OP_NON_EXPORT_FIRST/SSL_OP_CIPHER_SERVER_PREFERENCE/g' \
+		${WRKSRC}/s_server.c
+	${REINPLACE_CMD} -e \
+		's,%%OPENSSL%%,openssl/,g' \
+		${WRKSRC}/s_server.c ${WRKSRC}/s_cb.c ${WRKSRC}/apps.h ${WRKSRC}/s_socket.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sslwrap ${PREFIX}/bin/sslwrap
@@ -36,4 +36,4 @@ do-install:
 			${PREFIX}/share/doc/sslwrap
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/sslwrap/files/patch-apps.h b/security/sslwrap/files/patch-apps.h
new file mode 100644
index 000000000000..fe168da1500f
--- /dev/null
+++ b/security/sslwrap/files/patch-apps.h
@@ -0,0 +1,15 @@
+--- apps.h.orig	Wed Oct 15 22:28:24 2003
++++ apps.h	Wed Oct 15 22:28:45 2003
+@@ -65,9 +65,9 @@
+ #include "../e_os.h"
+ #endif
+ 
+-#include OPENSSL"buffer.h"
+-#include OPENSSL"bio.h"
+-#include OPENSSL"crypto.h"
++#include "%%OPENSSL%%/buffer.h"
++#include "%%OPENSSL%%/bio.h"
++#include "%%OPENSSL%%/crypto.h"
+ /*#include "progs.h"*/
+ 
+ #ifdef WIN16
diff --git a/security/sslwrap/files/patch-s_cb.c b/security/sslwrap/files/patch-s_cb.c
new file mode 100644
index 000000000000..d2e75ea4b09a
--- /dev/null
+++ b/security/sslwrap/files/patch-s_cb.c
@@ -0,0 +1,15 @@
+--- s_cb.c.orig	Wed Oct 15 22:29:17 2003
++++ s_cb.c	Wed Oct 15 22:29:31 2003
+@@ -63,9 +63,9 @@
+ #include "apps.h"
+ #undef NON_MAIN
+ #undef USE_SOCKETS
+-#include OPENSSL"err.h"
+-#include OPENSSL"x509.h"
+-#include OPENSSL"ssl.h"
++#include "%%OPENSSL%%/err.h"
++#include "%%OPENSSL%%/x509.h"
++#include "%%OPENSSL%%/ssl.h"
+ #include "s_apps.h"
+ 
+ int verify_depth=0;
diff --git a/security/sslwrap/files/patch-s_server.c b/security/sslwrap/files/patch-s_server.c
new file mode 100644
index 000000000000..123987969e03
--- /dev/null
+++ b/security/sslwrap/files/patch-s_server.c
@@ -0,0 +1,32 @@
+--- s_server.c.orig	Sat Nov 11 14:11:18 2000
++++ s_server.c	Wed Oct 15 22:31:56 2003
+@@ -121,14 +121,14 @@
+ #ifdef WIN16
+ #define APPS_WIN16
+ #endif
+-#include OPENSSL"lhash.h"
+-#include OPENSSL"bn.h"
++#include "openssl//lhash.h"
++#include "openssl//bn.h"
+ #define USE_SOCKETS
+ #include "apps.h"
+-#include OPENSSL"err.h"
+-#include OPENSSL"pem.h"
+-#include OPENSSL"x509.h"
+-#include OPENSSL"ssl.h"
++#include "openssl//err.h"
++#include "openssl//pem.h"
++#include "openssl//x509.h"
++#include "openssl//ssl.h"
+ #include "s_apps.h"
+ 
+ #ifndef NOPROTO
+@@ -468,7 +468,7 @@
+ 
+ 	if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);
+ 	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
+-	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST);
++	if (hack) SSL_CTX_set_options(ctx,SSL_OP_CIPHER_SERVER_PREFERENCE);
+ 
+ 	if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
+ 
diff --git a/security/sslwrap/files/patch-s_socket.c b/security/sslwrap/files/patch-s_socket.c
new file mode 100644
index 000000000000..37034f552685
--- /dev/null
+++ b/security/sslwrap/files/patch-s_socket.c
@@ -0,0 +1,11 @@
+--- s_socket.c.orig	Wed Oct 15 22:32:33 2003
++++ s_socket.c	Wed Oct 15 22:32:45 2003
+@@ -67,7 +67,7 @@
+ #undef USE_SOCKETS
+ #undef NON_MAIN
+ #include "s_apps.h"
+-#include OPENSSL"ssl.h"
++#include "%%OPENSSL%%/ssl.h"
+ 
+ #ifndef NOPROTO
+ static struct hostent *GetHostByName(char *name);
-- 
cgit