Updated skeyinfo.c and skey.3 from newer NetBSD version, which isskey-1.1.5-patches-2

under a 2-clause BSD license. Removed some whitespace changes.

2 files changed, 18 insertions, 95 deletions

diff --git a/patchsets/skey/1.1.5/01_all_gentoo.patch b/patchsets/skey/1.1.5/01_all_gentoo.patch
index 270fe6b..0576ae2 100644
--- a/patchsets/skey/1.1.5/01_all_gentoo.patch
+++ b/patchsets/skey/1.1.5/01_all_gentoo.patch
@@ -3,6 +3,10 @@ NetBSD project, some other updates and fixes, and the addition
 of some new features like shadow password and cracklib support.
 	(05 Nov 2003) -taviso@gentoo.org
 
+Updated skeyinfo.c and skey.3 from newer NetBSD version, which is
+under a 2-clause BSD license. Removed some whitespace changes.
+	(05 Jan 2012) -ulm@gentoo.org
+
 --- skey-1.1.5.orig/CHANGES	2001-05-10 17:10:49.000000000 +0100
 +++ skey-1.1.5/CHANGES	2003-11-06 17:46:45.000000000 +0000
 @@ -1,6 +1,19 @@
@@ -2147,9 +2151,9 @@ of some new features like shadow password and cracklib support.
 +John S. Walden,
 +Scott Chasin
 --- skey-1.1.5.orig/skey.3	1970-01-01 01:00:00.000000000 +0100
-+++ skey-1.1.5/skey.3	2003-11-06 17:46:45.000000000 +0000
-@@ -0,0 +1,264 @@
-+.\"     $NetBSD: skey.3,v 1.8 2003/06/06 13:42:50 wiz Exp $
++++ skey-1.1.5/skey.3	2008-04-30 14:10:52.000000000 +0100
+@@ -0,0 +1,257 @@
++.\"     $NetBSD: skey.3,v 1.9 2008/04/30 13:10:52 martin Exp $
 +.\"
 +.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 +.\" All rights reserved.
@@ -2165,13 +2169,6 @@ of some new features like shadow password and cracklib support.
 +.\" 2. Redistributions in binary form must reproduce the above copyright
 +.\"    notice, this list of conditions and the following disclaimer in the
 +.\"    documentation and/or other materials provided with the distribution.
-+.\" 3. All advertising materials mentioning features or use of this software
-+.\"    must display the following acknowledgement:
-+.\"        This product includes software developed by the NetBSD
-+.\"        Foundation, Inc. and its contributors.
-+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-+.\"    contributors may be used to endorse or promote products derived
-+.\"    from this software without specific prior written permission.
 +.\"
 +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -2967,96 +2964,29 @@ of some new features like shadow password and cracklib support.
  }
 --- skey-1.1.5.orig/skey.h	2001-05-10 17:10:49.000000000 +0100
 +++ skey-1.1.5/skey.h	2003-11-06 17:46:45.000000000 +0000
-@@ -1,3 +1,5 @@
-+/*	$NetBSD: skey.h,v 1.8 2000/07/28 16:35:11 thorpej Exp $	*/
-+
- /*
-  * S/KEY v1.1b (skey.h)
-  *
-@@ -11,86 +13,86 @@
-  *          Todd C. Miller <Todd.Miller@courtesan.com>
-  *
-  * Main client header
-- *
-- * $OpenBSD: skey.h,v 1.13 1999/07/15 14:33:48 provos Exp $
-  */
- 
- /* Server-side data structure for reading keys file during login */
--struct skey {
--	FILE *keyfile;
--	char buf[256];
--	char *logname;
--	int n;
--	char *seed;
--	char *val;
--	long recstart;		/* needed so reread of buffer is efficient */
-+struct skey
-+{
-+  FILE *keyfile;
-+  char buf[256];
-+  char *logname;
-+  int n;
-+  char *seed;
-+  char *val;
-+  long recstart;		/* needed so reread of buffer is efficient */
- };
- 
- /* Client-side structure for scanning data stream for challenge */
--struct mc {
--	char buf[256];
--	int skip;
--	int cnt;
-+struct mc
-+{
-+  char buf[256];
-+  int skip;
-+  int cnt;
- };
- 
- /* Maximum sequence number we allow */
- #ifndef SKEY_MAX_SEQ
--#define SKEY_MAX_SEQ		10000
-+#define SKEY_MAX_SEQ           10000
+@@ -38,17 +38,17 @@
+ #define SKEY_MAX_SEQ		10000
  #endif
  
 -/* Minimum secret password length (rfc1938) */
 +/* Minimum secret password length (rfc2289) */
  #ifndef SKEY_MIN_PW_LEN
--#define SKEY_MIN_PW_LEN		10
-+#define SKEY_MIN_PW_LEN                10
+ #define SKEY_MIN_PW_LEN		10
  #endif
  
 -/* Max secret password length (rfc1938 says 63 but allows more) */
 +/* Max secret password length (rfc2289 says 63 but allows more) */
  #ifndef SKEY_MAX_PW_LEN
--#define SKEY_MAX_PW_LEN		255
-+#define SKEY_MAX_PW_LEN                255
+ #define SKEY_MAX_PW_LEN		255
  #endif
  
 -/* Max length of an S/Key seed (rfc1938) */
 +/* Max length of an S/Key seed (rfc2289) */
  #ifndef SKEY_MAX_SEED_LEN
--#define SKEY_MAX_SEED_LEN	16
-+#define SKEY_MAX_SEED_LEN  	 16
+ #define SKEY_MAX_SEED_LEN	16
  #endif
- 
- /* Max length of S/Key challenge (otp-???? 9999 seed) */
- #ifndef SKEY_MAX_CHALLENGE
--#define SKEY_MAX_CHALLENGE	(11 + SKEY_MAX_HASHNAME_LEN + SKEY_MAX_SEED_LEN)
-+#define SKEY_MAX_CHALLENGE 	 (11 + SKEY_MAX_HASHNAME_LEN + SKEY_MAX_SEED_LEN)
- #endif
- 
- /* Max length of hash algorithm name (md4/md5/sha1/rmd160) */
--#define SKEY_MAX_HASHNAME_LEN	6
-+#define SKEY_MAX_HASHNAME_LEN  6
- 
- /* Size of a binary key (not NULL-terminated) */
--#define SKEY_BINKEY_SIZE	8
-+#define SKEY_BINKEY_SIZE		 8
- 
- /* Location of random file for bogus challenges */
--#define _SKEY_RAND_FILE_PATH_	"/var/db/host.random"
-+#define _SKEY_RAND_FILE_PATH_  "/var/db/host.random"
+@@ -68,29 +68,29 @@
+ #define _SKEY_RAND_FILE_PATH_	"/var/db/host.random"
  
  /* Prototypes */
 -void f(char *x);
@@ -3149,10 +3079,10 @@ of some new features like shadow password and cracklib support.
 +.Xr skeyaudit 1 ,
  .Xr skeyinit 1
 --- skey-1.1.5.orig/skeyinfo.c	2001-05-10 17:10:49.000000000 +0100
-+++ skey-1.1.5/skeyinfo.c	2003-11-06 17:46:45.000000000 +0000
++++ skey-1.1.5/skeyinfo.c	2012-01-05 11:24:15.000000000 +0000
 @@ -1,9 +1,12 @@
 -/*    $OpenBSD: skeyinfo.c,v 1.6 2001/02/05 16:58:11 millert Exp $    */
-+/*	$NetBSD: skeyinfo.c,v 1.4 2003/07/23 04:11:50 itojun Exp $	*/
++/*	$NetBSD: skeyinfo.c,v 1.5 2008/04/28 20:24:15 martin Exp $	*/
  
 -/*
 - * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -3166,19 +3096,12 @@ of some new features like shadow password and cracklib support.
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
-@@ -12,104 +15,79 @@
+@@ -12,104 +15,72 @@
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in the
   *    documentation and/or other materials provided with the distribution.
 - * 3. The name of the author may not be used to endorse or promote products
 - *    derived from this software without specific prior written permission.
-+ * 3. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the NetBSD
-+ *	Foundation, Inc. and its contributors.
-+ * 4. Neither the name of The NetBSD Foundation nor the names of its
-+ *    contributors may be used to endorse or promote products derived
-+ *    from this software without specific prior written permission.
   *
 - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
diff --git a/patchsets/skey/1.1.5/10_all_man_libpath.patch b/patchsets/skey/1.1.5/10_all_man_libpath.patch
index 4892645..acaef16 100644
--- a/patchsets/skey/1.1.5/10_all_man_libpath.patch
+++ b/patchsets/skey/1.1.5/10_all_man_libpath.patch
@@ -2,7 +2,7 @@ skey(3): shared library is in /lib; we don't install a profiling library
 
 --- skey-1.1.5-orig/skey.3
 +++ skey-1.1.5/skey.3
-@@ -245,10 +245,8 @@
+@@ -238,10 +238,8 @@
  .Bl -tag -width /usr/lib/libskey_p.a -compact
  .It Pa /usr/lib/libskey.a
  static skey library