From 8e307e3e963a1e572a85912d6453a09c7fd9d1cd Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 3 Dec 2004 23:13:10 +0000
Subject: Make it explicit that we're using the old DES API, and include
 <openssl/des_old.h> instead of <des.h> so that this will work on older NetBSD
 releases.

---
 net/openvpn-current/Makefile         | 11 +++++------
 net/openvpn-current/distinfo         |  4 ++--
 net/openvpn-current/patches/patch-aa |  8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'net')

diff --git a/net/openvpn-current/Makefile b/net/openvpn-current/Makefile
index 12556ba8825..27c3147b956 100644
--- a/net/openvpn-current/Makefile
+++ b/net/openvpn-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/03 19:51:39 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/03 23:13:10 jlam Exp $
 #
 
 DISTNAME=	openvpn-2.0_beta15
@@ -10,9 +10,10 @@ MAINTAINER=	ianzag@mail.ru
 HOMEPAGE=	http://openvpn.sourceforge.net/
 COMMENT=	Easy-to-use SSL VPN daemon
 
-USE_BUILDLINK3=	yes
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_BUILDLINK3=		yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_OLD_DES_API=	yes
 
 PKG_SYSCONFSUBDIR=	openvpn
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
@@ -24,8 +25,6 @@ CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ARGS+=	--enable-multi
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-LIBS+=		-ldes
-
 .include "../../archivers/liblzo/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/openvpn-current/distinfo b/net/openvpn-current/distinfo
index 96fd1f272ff..32ec72cb7a4 100644
--- a/net/openvpn-current/distinfo
+++ b/net/openvpn-current/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/11/17 18:04:04 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/12/03 23:13:10 jlam Exp $
 
 SHA1 (openvpn-2.0_beta15.tar.gz) = f1b210df6c8b6ea45737f97e3a184e6dac7b2ec1
 Size (openvpn-2.0_beta15.tar.gz) = 585952 bytes
-SHA1 (patch-aa) = 8a8019a20af0f7b8e2a162b555ac4ad04e025470
+SHA1 (patch-aa) = 06898cead40974b91d5fa4f2d5a4a9e3ae9d3ffe
diff --git a/net/openvpn-current/patches/patch-aa b/net/openvpn-current/patches/patch-aa
index a2a904f978b..7b8dc87c98b 100644
--- a/net/openvpn-current/patches/patch-aa
+++ b/net/openvpn-current/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/17 18:04:04 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/03 23:13:10 jlam Exp $
 
---- ntlm.c.orig	2004-11-17 18:47:38.000000000 +0100
-+++ ntlm.c	2004-11-17 18:47:49.000000000 +0100
+--- ntlm.c.orig	2004-10-02 06:22:38.000000000 -0400
++++ ntlm.c
 @@ -29,7 +29,7 @@
  
  #if NTLM
  
 -#include <openssl/des.h>
-+#include <des.h>
++#include <openssl/des_old.h>
  #include <openssl/md4.h>
  #include "common.h"
  #include "buffer.h"
-- 
cgit v1.2.3