Update to "rsaref-2.0p2" dependency, to make the md5 crap work. Also

reorder some patches, and touch the timestamp on all Makefile.in files, so
that automake and autoconf are never run (regardless of whether they are
installed).

3 files changed, 67 insertions, 65 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 60255650754..a845754e422 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 1999/05/23 21:12:33 tv Exp $
+# $NetBSD: Makefile,v 1.47 1999/05/26 15:35:42 tv Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--with-etcdir=${SSH_CONF_DIR} --with-libwrap
 #CONFIGURE_ARGS+=	--with-none
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
-DEPENDS+=		rsaref-2.0p1:../../security/rsaref
+DEPENDS+=		rsaref-2.0p2:../../security/rsaref
 CONFIGURE_ARGS+=	--with-rsaref="${LOCALBASE}/lib"
 CONFIGURE_ENV+=		LDFLAGS="-Wl,-R${LOCALBASE}/lib"
 CFLAGS+=		-I${LOCALBASE}/include
@@ -109,7 +109,9 @@ fetch-depends:
 	@${FALSE}
 .endif
 
-post-extract:
+# Make sure that "automake" is never run.
+post-patch:
+	@find ${WRKSRC} -name Makefile.in -print | xargs ${TOUCH} ${TOUCH_FLAGS}
 
 post-build:
 	@cd ${PKGDIR}; \
diff --git a/security/ssh/patches/patch-ao b/security/ssh/patches/patch-ao
index 7e766b427fc..e7e8c95ab00 100644
--- a/security/ssh/patches/patch-ao
+++ b/security/ssh/patches/patch-ao
@@ -1,42 +1,22 @@
-$NetBSD: patch-ao,v 1.7 1999/05/15 13:46:59 bouyer Exp $
+$NetBSD: patch-ao,v 1.8 1999/05/26 15:35:43 tv Exp $
 
---- newchannels.c.orig	Wed May 12 13:19:27 1999
-+++ newchannels.c	Sat May 15 04:31:04 1999
-@@ -274,7 +274,7 @@
- #include "authfd.h"
- #include "emulate.h"
- #include "servconf.h"
--#ifdef LIBWRAP
-+#if defined(LIBWRAP) && defined(LIBWRAP_FWD)
- #include <tcpd.h>
- #include <syslog.h>
- #ifdef NEED_SYS_SYSLOG_H
-@@ -934,7 +934,7 @@
-               snprintf(buf, sizeof(buf), "X11 connection from %.200s port %d",
-                       remote_hostname, get_peer_port(newsock));
-               xfree(remote_hostname);
--#ifdef LIBWRAP
-+#if defined(LIBWRAP) && defined(LIBWRAP_FWD)
-               {
-                 struct request_info req;
-                 struct servent *serv;
-@@ -986,7 +986,7 @@
-                        ch->listening_port, remote_hostname,
-                        get_peer_port(newsock));
-               xfree(remote_hostname);
--#ifdef LIBWRAP
-+#if defined(LIBWRAP) && defined(LIBWRAP_FWD)
-               {
-                 struct request_info req;
-                 struct servent *serv;
-@@ -2412,6 +2412,10 @@
-      ssh-agent connections on your system */
-   old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
-   
-+  /* Make sure the socket doesn't already exist, left over from a system
-+     crash perhaps. */
-+  unlink(channel_forwarded_auth_socket_name);
-+
-   if (bind(sock, (struct sockaddr *)&sunaddr, AF_UNIX_SIZE(sunaddr)) < 0)
-     packet_disconnect("Agent socket bind failed: %.100s", strerror(errno));
-   
+--- gmp-2.0.2-ssh-2/aclocal.m4.orig	Wed Jul  8 18:40:42 1998
++++ gmp-2.0.2-ssh-2/aclocal.m4	Mon May 10 23:50:28 1999
+@@ -20,7 +20,7 @@
+ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+ 
+ AC_DEFUN(AM_INIT_AUTOMAKE,
+-[AC_REQUIRE([AM_PROG_INSTALL])
++[AC_REQUIRE([AC_PROG_INSTALL])
+ PACKAGE=[$1]
+ AC_SUBST(PACKAGE)
+ VERSION=[$2]
+@@ -46,7 +46,7 @@
+ 
+ # serial 1
+ 
+-AC_DEFUN(AM_PROG_INSTALL,
++AC_DEFUN(AC_PROG_INSTALL,
+ [AC_REQUIRE([AC_PROG_INSTALL])
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ AC_SUBST(INSTALL_SCRIPT)dnl
diff --git a/security/ssh/patches/patch-aq b/security/ssh/patches/patch-aq
index 047fa6540ca..1de53ceb568 100644
--- a/security/ssh/patches/patch-aq
+++ b/security/ssh/patches/patch-aq
@@ -1,22 +1,42 @@
-$NetBSD: patch-aq,v 1.1 1999/05/10 22:11:40 tron Exp $
+$NetBSD: patch-aq,v 1.2 1999/05/26 15:35:43 tv Exp $
 
---- gmp-2.0.2-ssh-2/aclocal.m4.orig	Wed Jul  8 18:40:42 1998
-+++ gmp-2.0.2-ssh-2/aclocal.m4	Mon May 10 23:50:28 1999
-@@ -20,7 +20,7 @@
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
--[AC_REQUIRE([AM_PROG_INSTALL])
-+[AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
-@@ -46,7 +46,7 @@
- 
- # serial 1
- 
--AC_DEFUN(AM_PROG_INSTALL,
-+AC_DEFUN(AC_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
- AC_SUBST(INSTALL_SCRIPT)dnl
+--- newchannels.c.orig	Wed May 12 13:19:27 1999
++++ newchannels.c	Sat May 15 04:31:04 1999
+@@ -274,7 +274,7 @@
+ #include "authfd.h"
+ #include "emulate.h"
+ #include "servconf.h"
+-#ifdef LIBWRAP
++#if defined(LIBWRAP) && defined(LIBWRAP_FWD)
+ #include <tcpd.h>
+ #include <syslog.h>
+ #ifdef NEED_SYS_SYSLOG_H
+@@ -934,7 +934,7 @@
+               snprintf(buf, sizeof(buf), "X11 connection from %.200s port %d",
+                       remote_hostname, get_peer_port(newsock));
+               xfree(remote_hostname);
+-#ifdef LIBWRAP
++#if defined(LIBWRAP) && defined(LIBWRAP_FWD)
+               {
+                 struct request_info req;
+                 struct servent *serv;
+@@ -986,7 +986,7 @@
+                        ch->listening_port, remote_hostname,
+                        get_peer_port(newsock));
+               xfree(remote_hostname);
+-#ifdef LIBWRAP
++#if defined(LIBWRAP) && defined(LIBWRAP_FWD)
+               {
+                 struct request_info req;
+                 struct servent *serv;
+@@ -2412,6 +2412,10 @@
+      ssh-agent connections on your system */
+   old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
+   
++  /* Make sure the socket doesn't already exist, left over from a system
++     crash perhaps. */
++  unlink(channel_forwarded_auth_socket_name);
++
+   if (bind(sock, (struct sockaddr *)&sunaddr, AF_UNIX_SIZE(sunaddr)) < 0)
+     packet_disconnect("Agent socket bind failed: %.100s", strerror(errno));
+