Fix the three deadly sins for patch files:

- add missing RCS Ids
- don't patch files several times
- only one file per patch file

5 files changed, 109 insertions, 114 deletions

diff --git a/security/ssh/patches/patch-ab b/security/ssh/patches/patch-ab
index 0d42a7178e9..c79073021fc 100644
--- a/security/ssh/patches/patch-ab
+++ b/security/ssh/patches/patch-ab
@@ -1,54 +1,52 @@
-$NetBSD: patch-ab,v 1.5 1998/11/04 23:43:39 tron Exp $
+$NetBSD: patch-ab,v 1.6 1999/05/10 21:34:46 tron Exp $
 
---- configure.orig	Wed Jul  8 18:41:14 1998
-+++ configure	Thu Nov  5 00:28:07 1998
-@@ -1996,12 +1996,6 @@
+--- configure.in.orig	Mon May 10 23:27:44 1999
++++ configure.in	Mon May 10 23:27:53 1999
+@@ -317,9 +317,9 @@
  
  export CFLAGS CC
  
 -# Socket pairs appear to be broken on several systems.  I don't know exactly
 -# where, so I'll use pipes everywhere for now.
--cat >> confdefs.h <<\EOF
--#define USE_PIPES 1
--EOF
--
- 
- echo $ac_n "checking that the compiler works""... $ac_c" 1>&6
- echo "configure:2008: checking that the compiler works" >&5
-@@ -7344,15 +7338,15 @@
-    case "$enableval" in
+-AC_DEFINE(USE_PIPES)
++dnl # Socket pairs appear to be broken on several systems.  I don't know exactly
++dnl # where, so I'll use pipes everywhere for now.
++dnl AC_DEFINE(USE_PIPES)
+ 
+ AC_MSG_CHECKING([that the compiler works])
+ AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
+@@ -909,8 +909,8 @@
+     fi
+     AC_MSG_RESULT(Assuming TIS headers and libraries are in $withval.)
+     AC_DEFINE(HAVE_TIS)
+-    CFLAGS="$CFLAGS -I$withval -DHAVE_TIS"
+-    LIBS="-L$withval -lauth -lfwall $LIBS"
++    CFLAGS="$CFLAGS -I$withval/include -DHAVE_TIS"
++    LIBS="-L$withval/lib -lauth -lfwall $LIBS"
+     AC_MSG_WARN(Remember to read README.TIS. The connection between sshd and TIS authentication
+ server is clear text!)
+     ;;
+@@ -1236,14 +1236,14 @@
+ [ case "$enableval" in
    no)
-        echo "$ac_t""no" 1>&6
+        AC_MSG_RESULT(no)
 -       SSHINSTALLMODE=0711
 +       SSHINSTALLMODE=0511
         ;;
-   *)   echo "$ac_t""yes" 1>&6
+   *)   AC_MSG_RESULT(yes)
 -       SSHINSTALLMODE=04711
 +       SSHINSTALLMODE=04511
         ;;
-   esac 
- else
-   echo "$ac_t""yes" 1>&6
+   esac ],
+   AC_MSG_RESULT(yes)
 -  SSHINSTALLMODE=04711
 +  SSHINSTALLMODE=04511
+ )
  
- fi
- 
-@@ -7632,7 +7626,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
- 
--trap 'rm -fr `echo "Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "Makefile sshd.8 ssh.1 make-ssh-known-hosts.pl make-ssh-known-hosts.1 zlib-1.0.4/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -7740,7 +7734,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
+ AC_MSG_CHECKING(whether to enable TCP_NODELAY)
+@@ -1345,4 +1345,4 @@
+ AC_SUBST(SSHDCONFOBJS)
+ AC_SUBST(SSHINSTALLMODE)
  
--CONFIG_FILES=\${CONFIG_FILES-"Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile sshd.8 ssh.1 make-ssh-known-hosts.pl make-ssh-known-hosts.1 zlib-1.0.4/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+-AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile)
++AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.pl make-ssh-known-hosts.1 zlib-1.0.4/Makefile)
diff --git a/security/ssh/patches/patch-af b/security/ssh/patches/patch-af
index 14ede36a845..f2814e01aae 100644
--- a/security/ssh/patches/patch-af
+++ b/security/ssh/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.4 1998/08/07 11:13:50 agc Exp $
+$NetBSD: patch-af,v 1.5 1999/05/10 21:34:46 tron Exp $
 
---- sshd.c.orig	Wed Aug  5 21:35:31 1998
-+++ sshd.c	Wed Aug  5 23:52:17 1998
+--- sshd.c.orig	Mon May 10 23:26:51 1999
++++ sshd.c	Mon May 10 23:27:53 1999
 @@ -1736,55 +1736,59 @@
      endspent();
    }
@@ -109,6 +109,15 @@ $NetBSD: patch-af,v 1.4 1998/08/07 11:13:50 agc Exp $
    pwcopy.pw_dir = xstrdup(pw->pw_dir);
    pwcopy.pw_shell = xstrdup(pw->pw_shell);
    pw = &pwcopy;
+@@ -2506,7 +2510,7 @@
+ 	    
+ 	    if (!strncmp(buf, "challenge ", 10) ||
+ 		!strncmp(buf, "chalnecho ", 10)) {
+-	      sprintf(prompt,"Challenge \"%.100s\": ",&buf[10]);
++	      sprintf(prompt,"%.100s" ,&buf[10]);
+ 	      debug("TIS challenge %s", buf);
+ 	      packet_start(SSH_SMSG_AUTH_TIS_CHALLENGE);
+ 	      packet_put_string(prompt, strlen(prompt));
 @@ -3200,9 +3204,6 @@
  #if defined (__FreeBSD__) && defined(HAVE_LOGIN_CAP_H)
    login_cap_t *lc;
@@ -150,4 +159,3 @@ $NetBSD: patch-af,v 1.4 1998/08/07 11:13:50 agc Exp $
  	}
  
  #if defined (__FreeBSD__) && defined HAVE_LOGIN_CAP_H
-
diff --git a/security/ssh/patches/patch-aj b/security/ssh/patches/patch-aj
index 2a19ec9b0da..a533146aac3 100644
--- a/security/ssh/patches/patch-aj
+++ b/security/ssh/patches/patch-aj
@@ -1,41 +1,65 @@
-$NetBSD: patch-aj,v 1.5 1998/11/04 23:43:39 tron Exp $
+$NetBSD: patch-aj,v 1.6 1999/05/10 21:34:46 tron Exp $
 
---- configure.in.orig	Wed Jul  8 18:41:10 1998
-+++ configure.in	Thu Nov  5 00:28:07 1998
-@@ -317,9 +317,9 @@
+--- configure.orig	Mon May 10 23:27:27 1999
++++ configure	Mon May 10 23:27:53 1999
+@@ -1996,12 +1996,6 @@
  
  export CFLAGS CC
  
 -# Socket pairs appear to be broken on several systems.  I don't know exactly
 -# where, so I'll use pipes everywhere for now.
--AC_DEFINE(USE_PIPES)
-+dnl # Socket pairs appear to be broken on several systems.  I don't know exactly
-+dnl # where, so I'll use pipes everywhere for now.
-+dnl AC_DEFINE(USE_PIPES)
- 
- AC_MSG_CHECKING([that the compiler works])
- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ],
-@@ -1236,14 +1236,14 @@
- [ case "$enableval" in
+-cat >> confdefs.h <<\EOF
+-#define USE_PIPES 1
+-EOF
+-
+ 
+ echo $ac_n "checking that the compiler works""... $ac_c" 1>&6
+ echo "configure:2008: checking that the compiler works" >&5
+@@ -6611,8 +6605,8 @@
+ #define HAVE_TIS 1
+ EOF
+ 
+-    CFLAGS="$CFLAGS -I$withval -DHAVE_TIS"
+-    LIBS="-L$withval -lauth -lfwall $LIBS"
++    CFLAGS="$CFLAGS -I$withval/include -DHAVE_TIS"
++    LIBS="-L$withval/lib -lauth -lfwall $LIBS"
+     echo "configure: warning: Remember to read README.TIS. The connection between sshd and TIS authentication
+ server is clear text!" 1>&2
+     ;;
+@@ -7344,15 +7338,15 @@
+    case "$enableval" in
    no)
-        AC_MSG_RESULT(no)
+        echo "$ac_t""no" 1>&6
 -       SSHINSTALLMODE=0711
 +       SSHINSTALLMODE=0511
         ;;
-   *)   AC_MSG_RESULT(yes)
+   *)   echo "$ac_t""yes" 1>&6
 -       SSHINSTALLMODE=04711
 +       SSHINSTALLMODE=04511
         ;;
-   esac ],
-   AC_MSG_RESULT(yes)
+   esac 
+ else
+   echo "$ac_t""yes" 1>&6
 -  SSHINSTALLMODE=04711
 +  SSHINSTALLMODE=04511
- )
  
- AC_MSG_CHECKING(whether to enable TCP_NODELAY)
-@@ -1345,4 +1345,4 @@
- AC_SUBST(SSHDCONFOBJS)
- AC_SUBST(SSHINSTALLMODE)
+ fi
+ 
+@@ -7632,7 +7626,7 @@
+ ac_given_srcdir=$srcdir
+ ac_given_INSTALL="$INSTALL"
+ 
+-trap 'rm -fr `echo "Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++trap 'rm -fr `echo "Makefile sshd.8 ssh.1 make-ssh-known-hosts.pl make-ssh-known-hosts.1 zlib-1.0.4/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+ 
+@@ -7740,7 +7734,7 @@
+ 
+ cat >> $CONFIG_STATUS <<EOF
  
--AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile)
-+AC_OUTPUT(Makefile sshd.8 ssh.1 make-ssh-known-hosts.pl make-ssh-known-hosts.1 zlib-1.0.4/Makefile)
+-CONFIG_FILES=\${CONFIG_FILES-"Makefile sshd.8 ssh.1 make-ssh-known-hosts.1 zlib-1.0.4/Makefile"}
++CONFIG_FILES=\${CONFIG_FILES-"Makefile sshd.8 ssh.1 make-ssh-known-hosts.pl make-ssh-known-hosts.1 zlib-1.0.4/Makefile"}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/security/ssh/patches/patch-am b/security/ssh/patches/patch-am
index de6f1a0f311..04eee58f5a3 100644
--- a/security/ssh/patches/patch-am
+++ b/security/ssh/patches/patch-am
@@ -1,39 +1,15 @@
-$NetBSD: patch-am,v 1.1 1999/03/02 02:25:53 simonb Exp $
+$NetBSD: patch-am,v 1.2 1999/05/10 21:34:46 tron Exp $
 
---- sshd.c.orig	Tue Mar  2 12:24:50 1999
-+++ sshd.c	Tue Mar  2 12:25:46 1999
-@@ -2510,7 +2510,7 @@
- 	    
- 	    if (!strncmp(buf, "challenge ", 10) ||
- 		!strncmp(buf, "chalnecho ", 10)) {
--	      sprintf(prompt,"Challenge \"%.100s\": ",&buf[10]);
-+	      sprintf(prompt,"%.100s" ,&buf[10]);
- 	      debug("TIS challenge %s", buf);
- 	      packet_start(SSH_SMSG_AUTH_TIS_CHALLENGE);
- 	      packet_put_string(prompt, strlen(prompt));
---- configure.in.orig	Thu Jul  9 02:41:10 1998
-+++ configure.in	Tue Mar  2 12:46:58 1999
-@@ -909,8 +909,8 @@
-     fi
-     AC_MSG_RESULT(Assuming TIS headers and libraries are in $withval.)
-     AC_DEFINE(HAVE_TIS)
--    CFLAGS="$CFLAGS -I$withval -DHAVE_TIS"
--    LIBS="-L$withval -lauth -lfwall $LIBS"
-+    CFLAGS="$CFLAGS -I$withval/include -DHAVE_TIS"
-+    LIBS="-L$withval/lib -lauth -lfwall $LIBS"
-     AC_MSG_WARN(Remember to read README.TIS. The connection between sshd and TIS authentication
- server is clear text!)
+--- gmp-2.0.2-ssh-2/configure.in.orig	Mon Apr 26 19:50:09 1999
++++ gmp-2.0.2-ssh-2/configure.in	Mon Apr 26 20:06:07 1999
+@@ -222,6 +222,10 @@
+   sh2-*-*)
+     path="sh/sh2 sh"
      ;;
---- configure.orig	Tue Mar  2 12:55:14 1999
-+++ configure	Tue Mar  2 12:58:22 1999
-@@ -6605,8 +6605,8 @@
- #define HAVE_TIS 1
- EOF
- 
--    CFLAGS="$CFLAGS -I$withval -DHAVE_TIS"
--    LIBS="-L$withval -lauth -lfwall $LIBS"
-+    CFLAGS="$CFLAGS -I$withval/include -DHAVE_TIS"
-+    LIBS="-L$withval/lib -lauth -lfwall $LIBS"
-     echo "configure: warning: Remember to read README.TIS. The connection between sshd and TIS authentication
- server is clear text!" 1>&2
++  mips*-*-netbsd*)
++    path="mips2"
++    SFLAGS="-Wa,-KPIC"
++    ;;
+   mips[34]*-*-*)
+     path="mips3"
      ;;
diff --git a/security/ssh/patches/patch-ap b/security/ssh/patches/patch-ap
index 0d509cedad1..dd43922900c 100644
--- a/security/ssh/patches/patch-ap
+++ b/security/ssh/patches/patch-ap
@@ -1,16 +1,5 @@
---- gmp-2.0.2-ssh-2/configure.in.orig	Mon Apr 26 19:50:09 1999
-+++ gmp-2.0.2-ssh-2/configure.in	Mon Apr 26 20:06:07 1999
-@@ -222,6 +222,10 @@
-   sh2-*-*)
-     path="sh/sh2 sh"
-     ;;
-+  mips*-*-netbsd*)
-+    path="mips2"
-+    SFLAGS="-Wa,-KPIC"
-+    ;;
-   mips[34]*-*-*)
-     path="mips3"
-     ;;
+$NetBSD: patch-ap,v 1.2 1999/05/10 21:34:47 tron Exp $
+
 --- gmp-2.0.2-ssh-2/configure.orig	Thu Jul  9 02:40:44 1998
 +++ gmp-2.0.2-ssh-2/configure	Mon Apr 26 20:06:12 1999
 @@ -1955,6 +1955,10 @@