Update to use openssl-0.9.5a.

4 files changed, 11 insertions, 23 deletions

diff --git a/net/ppp-mppe/Makefile b/net/ppp-mppe/Makefile
index 1b52453f432..cf00fb76ea7 100644
--- a/net/ppp-mppe/Makefile
+++ b/net/ppp-mppe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/08 13:57:42 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/09/02 19:45:19 wiz Exp $
 
 DISTNAME=	ppp-2.3.9
 PKGNAME=	ppp-mppe-2.3.9
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://cs.anu.edu.au/pub/software/ppp/
 MAINTAINER=	dbj@netbsd.org
 HOMEPAGE=	http://www.moretonbay.com/vpn/releases/
 
-OPENSSL_VER=	0.9.4
+OPENSSL_VER=	0.9.5a
 
 BUILD_DEPENDS= ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/rc4:../../security/openssl:extract
 
@@ -17,6 +17,7 @@ MANCOMPRESSED_IF_MANZ=	yes
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/netbsd-1.4
+	@${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/md32_common.h ${WRKSRC}/pppd/md32_common.h
 	@${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha.h ${WRKSRC}/pppd/sha.h
 	@${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha1dgst.c ${WRKSRC}/pppd/sha1dgst.c
 	@${CP} ${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VER}/crypto/sha/sha_locl.h ${WRKSRC}/pppd/sha_locl.h
diff --git a/net/ppp-mppe/files/patch-sum b/net/ppp-mppe/files/patch-sum
index 65a1632cc24..324ad421af7 100644
--- a/net/ppp-mppe/files/patch-sum
+++ b/net/ppp-mppe/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/12/08 13:57:43 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/02 19:45:20 wiz Exp $
 
 MD5 (patch-aa) = 5f9efcf826eceb65b448e0e38c98532d
 MD5 (patch-ab) = 8392c4c0cdb816bb14e5648fb1be80a2
@@ -44,8 +44,7 @@ MD5 (patch-bt) = e837bed871618115b33f3cfc2dd12bde
 MD5 (patch-bu) = cc269345ddc56fc2ae79f78cc34410ad
 MD5 (patch-bv) = 4264052342d9f49e9a597061ae20c032
 MD5 (patch-bw) = bad7068e9a11f80d62c5c0bbd3ccd4e9
-MD5 (patch-bx) = c5c1db004cfa269da7c897ff77c15212
-MD5 (patch-by) = 5ffc26cb35daf31e39725afa654f70be
+MD5 (patch-bx) = 88ff56ad6b31f5128f4cc5833a7d0fdc
 MD5 (patch-bz) = 79b1a33a575322e33eecdce343a9a456
 MD5 (patch-ca) = 037ad1ae57c8df5718b9b80c7f2ef10a
 MD5 (patch-cb) = 3c7866418380f16dba4ba4dfe5442521
diff --git a/net/ppp-mppe/patches/patch-bx b/net/ppp-mppe/patches/patch-bx
index 25f27de2f42..ef1d81db157 100644
--- a/net/ppp-mppe/patches/patch-bx
+++ b/net/ppp-mppe/patches/patch-bx
@@ -1,13 +1,14 @@
-$NetBSD: patch-bx,v 1.2 1999/12/08 13:57:44 rh Exp $
+$NetBSD: patch-bx,v 1.3 2000/09/02 19:45:20 wiz Exp $
 
---- netbsd-1.4/sha_locl.h.orig	Wed Dec  8 14:56:15 1999
-+++ netbsd-1.4/sha_locl.h	Wed Dec  8 14:56:26 1999
-@@ -56,8 +56,6 @@
+--- netbsd-1.4/sha_locl.h.orig	Sat Sep  2 21:30:08 2000
++++ netbsd-1.4/sha_locl.h
+@@ -56,9 +56,6 @@
   * [including the GNU Public Licence.]
   */
  
 -#include <stdlib.h>
 -#include <string.h>
- 
+-
  #include <openssl/opensslconf.h>
+ #include <openssl/sha.h>
  
diff --git a/net/ppp-mppe/patches/patch-by b/net/ppp-mppe/patches/patch-by
deleted file mode 100644
index 654bf09f654..00000000000
--- a/net/ppp-mppe/patches/patch-by
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-by,v 1.2 1999/12/08 13:57:44 rh Exp $
-
---- netbsd-1.4/sha1dgst.c.orig	Wed Dec  8 14:56:15 1999
-+++ netbsd-1.4/sha1dgst.c	Wed Dec  8 14:56:26 1999
-@@ -56,8 +56,6 @@
-  * [including the GNU Public Licence.]
-  */
- 
--#include <stdio.h>
--#include <string.h>
- #undef  SHA_0
- #define SHA_1
- #include <openssl/sha.h>