fix openssh-3.8.1_p1-largekey.patch #60547

2 files changed, 36 insertions, 26 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3131722b7509..8040780d1341 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,32 +1,42 @@
-MD5 ec96fb49d91d5e77e391b92b93b76488 openssh-3.7.1_p2-r1.ebuild 4086
-MD5 e03d5b76db7eed6a83a4c849a5249363 openssh-3.8.1_p1-r1.ebuild 4204
-MD5 07179e41e3c7d022657732605478a8bd openssh-3.8.1_p1.ebuild 4030
-MD5 2fc7548ab51d3e0db127dd23f4f2c5f8 openssh-3.7.1_p2-r2.ebuild 4605
-MD5 6c6cba60e3f770193f24e3f9354f2e03 openssh-3.8.1_p1-r2.ebuild 4382
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f78b9f309f2b163d659ef02c192bd99a ChangeLog 14363
 MD5 0feff9b09e482567359625301bddce1c metadata.xml 1329
+MD5 ec96fb49d91d5e77e391b92b93b76488 openssh-3.7.1_p2-r1.ebuild 4086
+MD5 2fc7548ab51d3e0db127dd23f4f2c5f8 openssh-3.7.1_p2-r2.ebuild 4605
+MD5 07179e41e3c7d022657732605478a8bd openssh-3.8.1_p1.ebuild 4030
 MD5 685c84b3f8cc4608d391deb65fd75198 openssh-3.8_p1.ebuild 4198
-MD5 f3838696f97d8942b708798fa021c688 files/openssh-3.8_p1-kerberos.patch 745
-MD5 5e42c267d017c8bcf5a68a8b16398736 files/openssh-3.8_p1-skey.patch 326
+MD5 e03d5b76db7eed6a83a4c849a5249363 openssh-3.8.1_p1-r1.ebuild 4204
+MD5 6c6cba60e3f770193f24e3f9354f2e03 openssh-3.8.1_p1-r2.ebuild 4382
+MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r2 142
+MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142
 MD5 2cb187d8f60994c5e1b5fef2bcb6e85d files/openssh-3.5_p1-gentoo-sshd-gcc3.patch 315
-MD5 e62c6cfae268e95fb406080c91713c1a files/digest-openssh-3.8_p1 138
-MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8.1_p1-chroot.patch 2884
 MD5 9e179b1c0e3a139a5a9067c6e5bd6595 files/openssh-3.7.1_p1-selinux.diff 3389
-MD5 f3838696f97d8942b708798fa021c688 files/openssh-3.8.1_p1-kerberos.patch 745
-MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8_p1-chroot.patch 2884
-MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r1 141
-MD5 682d18c6b2348b1ab15b31b56d905b2d files/digest-openssh-3.8.1_p1-r2 223
-MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1 141
-MD5 33b0a1a9cf8349c411da7e97e3a5df64 files/openssh-3.8.1_p1-opensc.patch 3499
-MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.7.1_p2-chroot.patch 2884
 MD5 b31110303673214476c57e1bed28e1ce files/openssh-skeychallenge-args.diff 925
-MD5 6b5c7838f95832cbff8d407fdc6caafa files/openssh-3.8.1_p1-largekey.patch 2974
-MD5 9b53f18685eeb54c381c9bd11b9b80cc files/openssh-3.7.1_p2-skey.patch 326
-MD5 47853493e53ca7d4ac9942d6a76fb855 files/openssh-3.7.1_p2-kerberos.patch 1190
 MD5 b86ae0c43a704c4ee2abd2ce5c955f8f files/sshd.pam 294
 MD5 0a1428803057b7d25e624c6b297980d8 files/sshd.rc6 1281
+MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.7.1_p2-chroot.patch 2884
+MD5 e62c6cfae268e95fb406080c91713c1a files/digest-openssh-3.8_p1 138
+MD5 47853493e53ca7d4ac9942d6a76fb855 files/openssh-3.7.1_p2-kerberos.patch 1190
+MD5 9b53f18685eeb54c381c9bd11b9b80cc files/openssh-3.7.1_p2-skey.patch 326
+MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8_p1-chroot.patch 2884
+MD5 f3838696f97d8942b708798fa021c688 files/openssh-3.8_p1-kerberos.patch 745
 MD5 319cf9de283116bf886d3aab3d036249 files/openssh-3.8_p1-resolv_functions.patch 422
-MD5 5e42c267d017c8bcf5a68a8b16398736 files/openssh-3.8.1_p1-skey.patch 326
-MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r1 142
-MD5 2f8fc1bd837220c9708d9d8b0730fe2c files/digest-openssh-3.7.1_p2-r2 142
+MD5 5e42c267d017c8bcf5a68a8b16398736 files/openssh-3.8_p1-skey.patch 326
+MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1 141
+MD5 8f72054fc8c55107b5bf7ce13a8ad083 files/openssh-3.8.1_p1-chroot.patch 2884
+MD5 f3838696f97d8942b708798fa021c688 files/openssh-3.8.1_p1-kerberos.patch 745
 MD5 319cf9de283116bf886d3aab3d036249 files/openssh-3.8.1_p1-resolv_functions.patch 422
+MD5 5e42c267d017c8bcf5a68a8b16398736 files/openssh-3.8.1_p1-skey.patch 326
+MD5 7c16095191b5dc9d653dcb658650c88c files/digest-openssh-3.8.1_p1-r1 141
+MD5 682d18c6b2348b1ab15b31b56d905b2d files/digest-openssh-3.8.1_p1-r2 223
+MD5 33b0a1a9cf8349c411da7e97e3a5df64 files/openssh-3.8.1_p1-opensc.patch 3499
+MD5 e95d63b8ba5af76772f92fec4544fa3d files/openssh-3.8.1_p1-largekey.patch 2986
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBIhdvHTu7gpaalycRAgqJAJ9fNVnsW0uauHQ488ugLjQeWTotdACdGMeJ
+SwWV/NVZj3uWRE8FCeflS9U=
+=yrr+
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-3.8.1_p1-largekey.patch b/net-misc/openssh/files/openssh-3.8.1_p1-largekey.patch
index 4fe7976df802..67841670145c 100644
--- a/net-misc/openssh/files/openssh-3.8.1_p1-largekey.patch
+++ b/net-misc/openssh/files/openssh-3.8.1_p1-largekey.patch
@@ -2,13 +2,13 @@ diff -uNr openssh-3.8.1p1/auth2-pubkey.c openssh-3.8.1p1-hugekeys/auth2-pubkey.c
 --- openssh-3.8.1p1/auth2-pubkey.c	2004-01-21 01:02:50.000000000 +0100
 +++ openssh-3.8.1p1-hugekeys/auth2-pubkey.c	2004-06-24 13:53:28.493574960 +0200
 @@ -32,6 +32,7 @@
- #include "log.h"
- #include "servconf.h"
- #include "compat.h"
-+#include "authfile.h
  #include "bufaux.h"
  #include "auth.h"
  #include "key.h"
++#include "authfile.h"
+ #include "pathnames.h"
+ #include "uidswap.h"
+ #include "auth-options.h"
 @@ -167,7 +168,8 @@
  static int
  user_key_allowed2(struct passwd *pw, Key *key, char *file)