From 12274b1bd72db7f1736ab3ed7fc41b26b7cffe12 Mon Sep 17 00:00:00 2001
From: jonb <jonb@pkgsrc.org>
Date: Thu, 16 Dec 1999 08:18:04 +0000
Subject: Fix ns32k specific syntax error.  Require use of rsaref-2.0p3 instead
 of faulty rsaref-2.0p2 while I'm in here.

---
 security/ssh/Makefile           |  4 ++--
 security/ssh/files/patch-sum-v6 |  4 ++--
 security/ssh/patches/patch-al   | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'security/ssh')

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index f9c3cc1eedb..96fc8f1ba09 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 1999/11/30 09:08:44 explorer Exp $
+# $NetBSD: Makefile,v 1.66 1999/12/16 08:18:04 jonb Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--with-etcdir=${SSH_CONF_DIR} --with-libwrap
 #CONFIGURE_ARGS+=	--with-none
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
-DEPENDS+=		rsaref-2.0p2:../../security/rsaref
+DEPENDS+=		rsaref-2.0p3:../../security/rsaref
 CONFIGURE_ARGS+=	--with-rsaref="${LOCALBASE}/lib"
 CONFIGURE_ENV+=		LDFLAGS="-Wl,-R${LOCALBASE}/lib"
 CFLAGS+=		-I${LOCALBASE}/include
diff --git a/security/ssh/files/patch-sum-v6 b/security/ssh/files/patch-sum-v6
index 508e31be5ca..cc015c79f39 100644
--- a/security/ssh/files/patch-sum-v6
+++ b/security/ssh/files/patch-sum-v6
@@ -1,4 +1,4 @@
-# $NetBSD: patch-sum-v6,v 1.7 1999/12/05 13:58:59 sommerfeld Exp $
+# $NetBSD: patch-sum-v6,v 1.8 1999/12/16 08:18:05 jonb Exp $
 
 MD5 (patch-aa) = 39a4c82d2b89aae61df69a50f7aaa813
 MD5 (patch-ab) = c94c6aa280b0904bbce66c822ef071ba
@@ -7,7 +7,7 @@ MD5 (patch-ad) = 60483c735ff0e3c47e640002be0cee75
 MD5 (patch-ae) = e654824aa0394aa47d474011902411a9
 MD5 (patch-af) = 577e03bb92268c10b74ae3e60caf9147
 MD5 (patch-aj) = 775013bab6d1b7d878335db99cbfbd2d
-MD5 (patch-al) = 0cb4bff88a26d1a09e0669b5879b91f7
+MD5 (patch-al) = 00d14d38c42bae1c8c597855e1054e2c
 MD5 (patch-am) = fd4e766e57c58645714fdab8ed55da5d
 MD5 (patch-an) = 135b09a36c66aaf25a476dcb659efcf7
 MD5 (patch-ao) = 98e2eb418ee7f5ad544c32c7d5569ea2
diff --git a/security/ssh/patches/patch-al b/security/ssh/patches/patch-al
index 8df037208fe..6f04042927c 100644
--- a/security/ssh/patches/patch-al
+++ b/security/ssh/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.3 1999/03/01 23:46:05 tron Exp $
+$NetBSD: patch-al,v 1.4 1999/12/16 08:18:05 jonb Exp $
 
---- gmp-2.0.2-ssh-2/longlong.h.orig	Thu Apr 30 04:32:35 1998
-+++ gmp-2.0.2-ssh-2/longlong.h	Tue Mar  2 00:14:37 1999
+--- gmp-2.0.2-ssh-2/longlong.h.orig	Wed Apr 29 19:32:35 1998
++++ gmp-2.0.2-ssh-2/longlong.h	Tue Dec 14 23:03:54 1999
 @@ -190,26 +190,40 @@
  	     "rI" ((USItype)(bh)),					\
  	     "r" ((USItype)(al)),					\
@@ -59,3 +59,12 @@ $NetBSD: patch-al,v 1.3 1999/03/01 23:46:05 tron Exp $
  #define UDIV_TIME 100
  #endif /* __arm__ */
  
+@@ -719,7 +733,7 @@
+ 	     "g" ((USItype)(d)));					\
+   (r) = __xx.__i.__l; (q) = __xx.__i.__h; })
+ #define count_trailing_zeros(count,x) \
+-  do {
++  do {									\
+     __asm__ ("ffsd	%2,%0"						\
+ 	     : "=r" ((USItype) (count))					\
+ 	     : "0" ((USItype) 0),					\
-- 
cgit v1.2.3