1 |
ulm 12/01/05 13:03:19 |
2 |
|
3 |
Modified: 01_all_gentoo.patch 10_all_man_libpath.patch |
4 |
Log: |
5 |
Updated skeyinfo.c and skey.3 from newer NetBSD version, which is |
6 |
under a 2-clause BSD license. Removed some whitespace changes. |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 src/patchsets/skey/1.1.5/01_all_gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/skey/1.1.5/01_all_gentoo.patch?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/skey/1.1.5/01_all_gentoo.patch?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/skey/1.1.5/01_all_gentoo.patch?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: 01_all_gentoo.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo/src/patchsets/skey/1.1.5/01_all_gentoo.patch,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- 01_all_gentoo.patch 4 Jan 2012 21:52:30 -0000 1.2 |
22 |
+++ 01_all_gentoo.patch 5 Jan 2012 13:03:19 -0000 1.3 |
23 |
@@ -3,6 +3,10 @@ |
24 |
of some new features like shadow password and cracklib support. |
25 |
(05 Nov 2003) -taviso@g.o |
26 |
|
27 |
+Updated skeyinfo.c and skey.3 from newer NetBSD version, which is |
28 |
+under a 2-clause BSD license. Removed some whitespace changes. |
29 |
+ (05 Jan 2012) -ulm@g.o |
30 |
+ |
31 |
--- skey-1.1.5.orig/CHANGES 2001-05-10 17:10:49.000000000 +0100 |
32 |
+++ skey-1.1.5/CHANGES 2003-11-06 17:46:45.000000000 +0000 |
33 |
@@ -1,6 +1,19 @@ |
34 |
@@ -2147,9 +2151,9 @@ |
35 |
+John S. Walden, |
36 |
+Scott Chasin |
37 |
--- skey-1.1.5.orig/skey.3 1970-01-01 01:00:00.000000000 +0100 |
38 |
-+++ skey-1.1.5/skey.3 2003-11-06 17:46:45.000000000 +0000 |
39 |
-@@ -0,0 +1,264 @@ |
40 |
-+.\" $NetBSD: skey.3,v 1.8 2003/06/06 13:42:50 wiz Exp $ |
41 |
++++ skey-1.1.5/skey.3 2008-04-30 14:10:52.000000000 +0100 |
42 |
+@@ -0,0 +1,257 @@ |
43 |
++.\" $NetBSD: skey.3,v 1.9 2008/04/30 13:10:52 martin Exp $ |
44 |
+.\" |
45 |
+.\" Copyright (c) 2001 The NetBSD Foundation, Inc. |
46 |
+.\" All rights reserved. |
47 |
@@ -2165,13 +2169,6 @@ |
48 |
+.\" 2. Redistributions in binary form must reproduce the above copyright |
49 |
+.\" notice, this list of conditions and the following disclaimer in the |
50 |
+.\" documentation and/or other materials provided with the distribution. |
51 |
-+.\" 3. All advertising materials mentioning features or use of this software |
52 |
-+.\" must display the following acknowledgement: |
53 |
-+.\" This product includes software developed by the NetBSD |
54 |
-+.\" Foundation, Inc. and its contributors. |
55 |
-+.\" 4. Neither the name of The NetBSD Foundation nor the names of its |
56 |
-+.\" contributors may be used to endorse or promote products derived |
57 |
-+.\" from this software without specific prior written permission. |
58 |
+.\" |
59 |
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS |
60 |
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED |
61 |
@@ -2967,96 +2964,29 @@ |
62 |
} |
63 |
--- skey-1.1.5.orig/skey.h 2001-05-10 17:10:49.000000000 +0100 |
64 |
+++ skey-1.1.5/skey.h 2003-11-06 17:46:45.000000000 +0000 |
65 |
-@@ -1,3 +1,5 @@ |
66 |
-+/* $NetBSD: skey.h,v 1.8 2000/07/28 16:35:11 thorpej Exp $ */ |
67 |
-+ |
68 |
- /* |
69 |
- * S/KEY v1.1b (skey.h) |
70 |
- * |
71 |
-@@ -11,86 +13,86 @@ |
72 |
- * Todd C. Miller <Todd.Miller@×××××××××.com> |
73 |
- * |
74 |
- * Main client header |
75 |
-- * |
76 |
-- * $OpenBSD: skey.h,v 1.13 1999/07/15 14:33:48 provos Exp $ |
77 |
- */ |
78 |
- |
79 |
- /* Server-side data structure for reading keys file during login */ |
80 |
--struct skey { |
81 |
-- FILE *keyfile; |
82 |
-- char buf[256]; |
83 |
-- char *logname; |
84 |
-- int n; |
85 |
-- char *seed; |
86 |
-- char *val; |
87 |
-- long recstart; /* needed so reread of buffer is efficient */ |
88 |
-+struct skey |
89 |
-+{ |
90 |
-+ FILE *keyfile; |
91 |
-+ char buf[256]; |
92 |
-+ char *logname; |
93 |
-+ int n; |
94 |
-+ char *seed; |
95 |
-+ char *val; |
96 |
-+ long recstart; /* needed so reread of buffer is efficient */ |
97 |
- }; |
98 |
- |
99 |
- /* Client-side structure for scanning data stream for challenge */ |
100 |
--struct mc { |
101 |
-- char buf[256]; |
102 |
-- int skip; |
103 |
-- int cnt; |
104 |
-+struct mc |
105 |
-+{ |
106 |
-+ char buf[256]; |
107 |
-+ int skip; |
108 |
-+ int cnt; |
109 |
- }; |
110 |
- |
111 |
- /* Maximum sequence number we allow */ |
112 |
- #ifndef SKEY_MAX_SEQ |
113 |
--#define SKEY_MAX_SEQ 10000 |
114 |
-+#define SKEY_MAX_SEQ 10000 |
115 |
+@@ -38,17 +38,17 @@ |
116 |
+ #define SKEY_MAX_SEQ 10000 |
117 |
#endif |
118 |
|
119 |
-/* Minimum secret password length (rfc1938) */ |
120 |
+/* Minimum secret password length (rfc2289) */ |
121 |
#ifndef SKEY_MIN_PW_LEN |
122 |
--#define SKEY_MIN_PW_LEN 10 |
123 |
-+#define SKEY_MIN_PW_LEN 10 |
124 |
+ #define SKEY_MIN_PW_LEN 10 |
125 |
#endif |
126 |
|
127 |
-/* Max secret password length (rfc1938 says 63 but allows more) */ |
128 |
+/* Max secret password length (rfc2289 says 63 but allows more) */ |
129 |
#ifndef SKEY_MAX_PW_LEN |
130 |
--#define SKEY_MAX_PW_LEN 255 |
131 |
-+#define SKEY_MAX_PW_LEN 255 |
132 |
+ #define SKEY_MAX_PW_LEN 255 |
133 |
#endif |
134 |
|
135 |
-/* Max length of an S/Key seed (rfc1938) */ |
136 |
+/* Max length of an S/Key seed (rfc2289) */ |
137 |
#ifndef SKEY_MAX_SEED_LEN |
138 |
--#define SKEY_MAX_SEED_LEN 16 |
139 |
-+#define SKEY_MAX_SEED_LEN 16 |
140 |
- #endif |
141 |
- |
142 |
- /* Max length of S/Key challenge (otp-???? 9999 seed) */ |
143 |
- #ifndef SKEY_MAX_CHALLENGE |
144 |
--#define SKEY_MAX_CHALLENGE (11 + SKEY_MAX_HASHNAME_LEN + SKEY_MAX_SEED_LEN) |
145 |
-+#define SKEY_MAX_CHALLENGE (11 + SKEY_MAX_HASHNAME_LEN + SKEY_MAX_SEED_LEN) |
146 |
+ #define SKEY_MAX_SEED_LEN 16 |
147 |
#endif |
148 |
- |
149 |
- /* Max length of hash algorithm name (md4/md5/sha1/rmd160) */ |
150 |
--#define SKEY_MAX_HASHNAME_LEN 6 |
151 |
-+#define SKEY_MAX_HASHNAME_LEN 6 |
152 |
- |
153 |
- /* Size of a binary key (not NULL-terminated) */ |
154 |
--#define SKEY_BINKEY_SIZE 8 |
155 |
-+#define SKEY_BINKEY_SIZE 8 |
156 |
- |
157 |
- /* Location of random file for bogus challenges */ |
158 |
--#define _SKEY_RAND_FILE_PATH_ "/var/db/host.random" |
159 |
-+#define _SKEY_RAND_FILE_PATH_ "/var/db/host.random" |
160 |
+@@ -68,29 +68,29 @@ |
161 |
+ #define _SKEY_RAND_FILE_PATH_ "/var/db/host.random" |
162 |
|
163 |
/* Prototypes */ |
164 |
-void f(char *x); |
165 |
@@ -3149,10 +3079,10 @@ |
166 |
+.Xr skeyaudit 1 , |
167 |
.Xr skeyinit 1 |
168 |
--- skey-1.1.5.orig/skeyinfo.c 2001-05-10 17:10:49.000000000 +0100 |
169 |
-+++ skey-1.1.5/skeyinfo.c 2003-11-06 17:46:45.000000000 +0000 |
170 |
++++ skey-1.1.5/skeyinfo.c 2012-01-05 11:24:15.000000000 +0000 |
171 |
@@ -1,9 +1,12 @@ |
172 |
-/* $OpenBSD: skeyinfo.c,v 1.6 2001/02/05 16:58:11 millert Exp $ */ |
173 |
-+/* $NetBSD: skeyinfo.c,v 1.4 2003/07/23 04:11:50 itojun Exp $ */ |
174 |
++/* $NetBSD: skeyinfo.c,v 1.5 2008/04/28 20:24:15 martin Exp $ */ |
175 |
|
176 |
-/* |
177 |
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@×××××××××.com> |
178 |
@@ -3166,19 +3096,12 @@ |
179 |
* Redistribution and use in source and binary forms, with or without |
180 |
* modification, are permitted provided that the following conditions |
181 |
* are met: |
182 |
-@@ -12,104 +15,79 @@ |
183 |
+@@ -12,104 +15,72 @@ |
184 |
* 2. Redistributions in binary form must reproduce the above copyright |
185 |
* notice, this list of conditions and the following disclaimer in the |
186 |
* documentation and/or other materials provided with the distribution. |
187 |
- * 3. The name of the author may not be used to endorse or promote products |
188 |
- * derived from this software without specific prior written permission. |
189 |
-+ * 3. All advertising materials mentioning features or use of this software |
190 |
-+ * must display the following acknowledgement: |
191 |
-+ * This product includes software developed by the NetBSD |
192 |
-+ * Foundation, Inc. and its contributors. |
193 |
-+ * 4. Neither the name of The NetBSD Foundation nor the names of its |
194 |
-+ * contributors may be used to endorse or promote products derived |
195 |
-+ * from this software without specific prior written permission. |
196 |
* |
197 |
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, |
198 |
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY |
199 |
|
200 |
|
201 |
|
202 |
1.2 src/patchsets/skey/1.1.5/10_all_man_libpath.patch |
203 |
|
204 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/skey/1.1.5/10_all_man_libpath.patch?rev=1.2&view=markup |
205 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/skey/1.1.5/10_all_man_libpath.patch?rev=1.2&content-type=text/plain |
206 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/skey/1.1.5/10_all_man_libpath.patch?r1=1.1&r2=1.2 |
207 |
|
208 |
Index: 10_all_man_libpath.patch |
209 |
=================================================================== |
210 |
RCS file: /var/cvsroot/gentoo/src/patchsets/skey/1.1.5/10_all_man_libpath.patch,v |
211 |
retrieving revision 1.1 |
212 |
retrieving revision 1.2 |
213 |
diff -u -r1.1 -r1.2 |
214 |
--- 10_all_man_libpath.patch 4 Jan 2012 20:05:23 -0000 1.1 |
215 |
+++ 10_all_man_libpath.patch 5 Jan 2012 13:03:19 -0000 1.2 |
216 |
@@ -2,7 +2,7 @@ |
217 |
|
218 |
--- skey-1.1.5-orig/skey.3 |
219 |
+++ skey-1.1.5/skey.3 |
220 |
-@@ -245,10 +245,8 @@ |
221 |
+@@ -238,10 +238,8 @@ |
222 |
.Bl -tag -width /usr/lib/libskey_p.a -compact |
223 |
.It Pa /usr/lib/libskey.a |
224 |
static skey library |