[pkgsrc/trunk]: pkgsrc/security/sslwrap Make this work with 0.9.7 openssl (an...

[jmc <jmc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdfdb5677b58
branches:  trunk
changeset: 461594:cdfdb5677b58
user:      jmc <jmc%pkgsrc.org@localhost>
date:      Thu Sep 18 04:09:17 2003 +0000

description:
Make this work with 0.9.7 openssl (and other non-pkgsrc installed nbsd versions

diffstat:

 security/sslwrap/Makefile         |   7 ++++++-
 security/sslwrap/distinfo         |   5 +++--
 security/sslwrap/patches/patch-aa |  11 ++++++-----
 security/sslwrap/patches/patch-ac |  14 ++++++++++++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diffs (74 lines):

diff -r 015ddf2cb8af -r cdfdb5677b58 security/sslwrap/Makefile
--- a/security/sslwrap/Makefile Thu Sep 18 04:01:17 2003 +0000
+++ b/security/sslwrap/Makefile Thu Sep 18 04:09:17 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:20:37 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/18 04:09:17 jmc Exp $
 #
 
 DISTNAME=      ${PKGNAME:S/-//}
@@ -13,4 +13,9 @@
 USE_BUILDLINK2=        YES
 
 .include "../../security/openssl/buildlink2.mk"
+
+.if !exists(${BUILDLINK_PREFIX.openssl}/include/openssl/e_os.h)
+CFLAGS+=       -DFLAT_INC
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r 015ddf2cb8af -r cdfdb5677b58 security/sslwrap/distinfo
--- a/security/sslwrap/distinfo Thu Sep 18 04:01:17 2003 +0000
+++ b/security/sslwrap/distinfo Thu Sep 18 04:09:17 2003 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:40 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/09/18 04:09:18 jmc Exp $
 
 SHA1 (sslwrap206.tar.gz) = fc8a4a4134d2668705f9fc4ac92a45a847c3edf9
 Size (sslwrap206.tar.gz) = 21170 bytes
-SHA1 (patch-aa) = b54ec5ed8fbb29aefd52c4ba85bcc373ed46d9eb
+SHA1 (patch-aa) = 9a8e868a64ea7439f1a2c46f5295c552bf3060df
 SHA1 (patch-ab) = 7f28cb5eca2a004408cb20aa365edad0d4f7d45a
+SHA1 (patch-ac) = 7ffb5a45843d8d4d99867967547663ef7656bd32
diff -r 015ddf2cb8af -r cdfdb5677b58 security/sslwrap/patches/patch-aa
--- a/security/sslwrap/patches/patch-aa Thu Sep 18 04:01:17 2003 +0000
+++ b/security/sslwrap/patches/patch-aa Thu Sep 18 04:09:17 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/12/30 20:12:17 rh Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/18 04:09:19 jmc Exp $
 
---- Makefile.orig      Sat Nov 11 23:01:25 2000
-+++ Makefile
-@@ -1,28 +1,14 @@
+--- Makefile.orig      2000-11-11 22:01:25.000000000 +0000
++++ Makefile   2003-09-17 23:03:22.000000000 +0000
+@@ -1,28 +1,16 @@
 +PROG= sslwrap
 +SRCS= s_server.c s_socket.c s_cb.c
 +COPTS+=       -DOPENSSL="\"openssl/\""
@@ -42,5 +42,6 @@
 -
 -
 -
--
++NOGCCERROR=1
+ 
 +.include <bsd.prog.mk>
diff -r 015ddf2cb8af -r cdfdb5677b58 security/sslwrap/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/sslwrap/patches/patch-ac Thu Sep 18 04:09:17 2003 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2003/09/18 04:09:19 jmc Exp $
+
+--- s_server.c.orig    2003-09-17 23:01:01.000000000 +0000
++++ s_server.c 2003-09-17 23:01:22.000000000 +0000
+@@ -468,7 +468,9 @@
+ 
+       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 defined(SSL_OP_NON_EXPORT_FIRST)
+       if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST);
++#endif
+ 
+       if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
+