old
authorMike Frysinger <vapier@gentoo.org>
Fri, 23 Apr 2010 03:31:46 +0000 (03:31 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 23 Apr 2010 03:31:46 +0000 (03:31 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-misc/openssh/Manifest
net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch [deleted file]
net-misc/openssh/files/openssh-5.1_p1-escaped-banner.patch [deleted file]
net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch [deleted file]
net-misc/openssh/files/openssh-5.1_p1-null-banner.patch [deleted file]
net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch [deleted file]
net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch [deleted file]
net-misc/openssh/openssh-5.1_p1-r2.ebuild [deleted file]
net-misc/openssh/openssh-5.4_p1-r1.ebuild [deleted file]
net-misc/openssh/openssh-5.4_p1.ebuild [deleted file]
net-misc/openssh/openssh-5.5_p1.ebuild [deleted file]

index 58b86d96c730a7a8937113a3ef08da27befe61a6..5889e01d912a7fc080f060958a7a913cfe8dcd20 100644 (file)
@@ -1,12 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openssh-3.9_p1-opensc.patch 3242 RMD160 9c382109f0a64c30d6404f6c6ecdd274b8114fd3 SHA1 1020a213c5acb479003bebe6e4bed0f5b1e56a9f SHA256 36f27a6cd277cf08fadbc23cd4d019def69f40a601d75e63ead7bdc7cdf0539b
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
 AUX openssh-4.7p1-selinux.diff 541 RMD160 bcb8f1fef2ae8378e7000732223c6116e06e0d6f SHA1 395b4dcff3eb7b92582a4364e612fff87278e7bc SHA256 ef8d71c46059bdcc8487cad06914639a8237197561cc030d8eed3baf418cc810
-AUX openssh-5.1_p1-better-ssp-check.patch 746 RMD160 b7facd50af120db7da8af5bfdc4826e3aa164bf5 SHA1 5853549f875f2a660a084c578b5e00fffd3d1d9d SHA256 2bfd132a0b2ee952629e9b2d17b5b84785736c6c6e8444f0bb71d7c394ab11a5
-AUX openssh-5.1_p1-escaped-banner.patch 554 RMD160 90ca69b68e774d9640fc3d9e5bac2bf1e94fd706 SHA1 fee652862c4050c3275d258791bdf9e2a12a6083 SHA256 31ca766d4bc7b5cb45546cc85ca088687b6436915d404ecc2d38bba511f4ab8d
-AUX openssh-5.1_p1-ldap-hpn-glue.patch 1666 RMD160 5fbcc5c60f9a8f44967c258749e2379295015ae2 SHA1 dfdf6fd489a1a2db4cc25d7fc49d31769d48c07d SHA256 f92037859510902f7bc7b97c92dc989614e0d2c07e5812b4d787b38892f3a6a3
-AUX openssh-5.1_p1-null-banner.patch 1411 RMD160 b3034cecc1d74973eed05c8f6ef580cab7ed1a7e SHA1 b5173ac7714c185abbc256b44a80e1dd21687f9b SHA256 7a682f19d1f60bf2c8cde330504fa22306c9ab2ed6d2b7fd455fb6d851a1f423
-AUX openssh-5.1_p1-x509-headers.patch 248 RMD160 e0085a315ac4a766527e4b44095f9520de79d7a5 SHA1 1d39aea309013ce81de4f03db569c838453176a3 SHA256 3d882e3c0701387c81b87aead5635d3d4c1962dbe78f3407cd6de73913c35824
-AUX openssh-5.1_p1-x509-hpn-glue.patch 3373 RMD160 024d7f17972907a591a067bfd0883ba0c0b297d0 SHA1 1b2ad74448c695bedee22a48d0bca879605c23d0 SHA256 0d9b10881a9207e5feec7429693b34fa56464e2c9e4fea1540d258ee2000e37a
 AUX openssh-5.2_p1-autoconf.patch 386 RMD160 8e57ae97df0b2483f826a7aba00bc0622b9a28f8 SHA1 22c4e40f54f97f866b460fe8987eb16363410caf SHA256 42bb5f23f02241186abd6158ac15cd1fba0fadb4bd79e6b051fbd05605419ebb
 AUX openssh-5.2_p1-gsskex-fix.patch 408 RMD160 6a6296cd1c8acc52af4e0d8b6238b326d5d41e77 SHA1 b31e5294c68e6af9a75987a1c3ece5e52f56e9a5 SHA256 8190db31ed2e8dc6ce79030e5c648d04610b06dd8366df5948ef6e990314ee96
 AUX openssh-5.2_p1-x509-hpn-glue.patch 2851 RMD160 2c3fbb549976f9004e89bcfb58dadf2186f64517 SHA1 ff666fb2a0ef3fc7d703f99438ca4c39ee2eafdf SHA256 a21336a892b61e29a556d16e9f0a67ee08ad04dd61e3963a201fdf032ce55f75
@@ -19,10 +16,6 @@ AUX sshd.confd 396 RMD160 029680b2281961130a815ef599750c4fc4e84987 SHA1 23c283d0
 AUX sshd.pam 294 RMD160 1d4499a7de54188e51e87a240ec7a1b3b1af583d SHA1 4cd17fb40793fa9ca77ac93698129f2c8cafd7b8 SHA256 f01cc51c624b21a815fb6c0be35edc590e2e6f8a5ffbdcabc220a9630517972f
 AUX sshd.pam_include.2 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
 AUX sshd.rc6 2159 RMD160 961c7222fe809d81dc04c1f62e14c8292c0e3452 SHA1 d9853a50ff89d4359cc813a0f5ec936659941646 SHA256 83b94fed859ab3a00861969f97c166bd3b2fdd217f26468153e17005dfd55828
-DIST openssh-5.0p1-gsskex-20080404.patch 68272 RMD160 7adfadf11f0fbc8fb5f71848d6fb8c4231e4ebc4 SHA1 41dfe293b3a3c08163cd43926fefabd321f0c37f SHA256 8f8b9910af767ce8e2a5d4854e95c8eb8b089bb250b290d22add38e9ddb1791e
-DIST openssh-5.1p1+x509-6.1.1.diff.gz 152642 RMD160 ec9885a90be95d8b260f8a40f4b7e739e4b0ca4b SHA1 08f252adb10787aa8c7aba9cce8a680176f3b776 SHA256 2821d8fe003337569d6551fd26a387f53b4adc9b59f2b0131659936e11966eb3
-DIST openssh-5.1p1-hpn13v5.diff.gz 23017 RMD160 6466cd0825e80366adc1978069e3c61255e0bde7 SHA1 c2911f04f8d46a28afa9f9cbb7ec226cb2c893d1 SHA256 81bebd71fb0aa8a265c0576aa3c42c0fdf263712db771f12d35c8aff09523aab
-DIST openssh-5.1p1.tar.gz 1040041 RMD160 24293ad89633cfd4791f08eb3442becb7e5788ca SHA1 877ea5b283060fe0160e376ea645e8e168047ff5 SHA256 f05358164dae1021386ae57be53a5e9f5cba7a1f8c9beaa428299e28a5666d75
 DIST openssh-5.2p1+x509-6.2.1.diff.gz 153887 RMD160 3642946adfc122f28fb80518719040dddacf84ea SHA1 e48447e4335c543f4b702b3e3d0e41d6d9f7f6aa SHA256 9a745634eaf450fb2c0f9dcc31f3021dcd70d6bbdba0ae5b6952f2dfcb21ee55
 DIST openssh-5.2p1-gsskex-all-20090726.patch 90959 RMD160 45763e73aa65181d56aafed9ab7dd217150769f2 SHA1 64058c69fb866a8ab0233d454f3bb8e94a0b9db7 SHA256 6eb297d6fa74be3323c5e4f53df5b6e1f4edf6bf394e3e707c075846886e18e7
 DIST openssh-5.2p1-hpn13v6.diff.gz 33540 RMD160 d647d3b0547e4d698c616f5ed6643b3ddbcced95 SHA1 9683d5feb3f7e302ef836901af5366df6c425815 SHA256 90a395037a826a8ebcff68be8e46ddce1f89fd776c312c0e10e73cb703ed21bd
@@ -31,24 +24,25 @@ DIST openssh-5.2pkcs11-0.26.tar.bz2 18642 RMD160 07093fb2ad47247b2f028fae4fe1b80
 DIST openssh-5.3p1+x509-6.2.1.diff.gz 154130 RMD160 d16e9d4fd7f6e64091c7b421df7bbd7c21b40c4e SHA1 52182f3a3f84b5ce5e9fada5669776abb851a3fd SHA256 e7e122e74498a0db4253e4a2a43b55688685381066fbad69ad1beafd27b62523
 DIST openssh-5.3p1-hpn13v6-gentoo.diff.gz 23262 RMD160 f4a99017f658d5b803b966cb3711f246be6344f9 SHA1 a30568339458976933e770900a933f013e8ce2c2 SHA256 3f3861ca5e58134dc3f3f7a042d53b9d652b7e4232fcadd45c7fba2d98f5bf63
 DIST openssh-5.3p1.tar.gz 1027130 RMD160 f8c98b4b91b7e0e02b33837ef6978e8b7570cf9e SHA1 d411fde2584ef6022187f565360b2c63a05602b5 SHA256 d0c917462896974480b14454a8e1cb8b809291f67e5b9779c9b4dc4156c5ef12
-DIST openssh-5.4p1+x509-6.2.2.diff.gz 156585 RMD160 3b21a9b44d846518e8da038c19e4429a6a4740c2 SHA1 fc733648fd3dc3bc2ff6a9fc73b74f3910ba8a2f SHA256 3a1634e4c90262e13ce1b30800a60345737a84b1f348702716af7123f4e0a01e
 DIST openssh-5.4p1+x509-6.2.3.diff.gz 156621 RMD160 20be6252837563c299dfc8d32ac8823f21efbba4 SHA1 fe77afbe1a2884ee9545b027c311b9e7d4b84115 SHA256 90a21d282b846c28d8c8123dbc6f9bf9e1ec21d818ffe4260027875667164b0b
 DIST openssh-5.4p1-hpn13v7-x509variant.diff.gz 22941 RMD160 383b3883984ee0e6068363fdd645d2dd24c7964c SHA1 d3f04c938ab6e5e10587d0ffb717af37360a8dd6 SHA256 c2b1a81c6952ae73cc4dfd1528d560588c45cf1242ea8b0e6eadb0cc83b50377
 DIST openssh-5.4p1-hpn13v7.diff.gz 22848 RMD160 c3e151d7804ec2fa60769e1c73d369bffab6d4b1 SHA1 bbf7778dd57a25c0d742ca66f29b46bbbf607435 SHA256 fdfd7205ec8aa2b3dd7a69c9c2050b91d0623ee1eff07f27a58bf9190e605cf6
 DIST openssh-5.4p1.tar.gz 1094604 RMD160 2382307f19edc727a108da262e531ecf3671cf09 SHA1 2a3042372f08afb1415ceaec8178213276a36302 SHA256 ae96e70d04104824ab10f0d7aaef4584ac96b2a870adfcd8b457d836c8c5404e
 DIST openssh-5.5p1+x509-6.2.3.diff.gz 156737 RMD160 cf6d9e5f51512b3e22a3561ff7e1c6daad80d016 SHA1 5f163b03b3086605d9759b76565e6f3a5fa8cb85 SHA256 a2fdf904c21036fe6ee89da7572a37f4763ef414348f9a953c7c7e0fb3562a7f
 DIST openssh-5.5p1.tar.gz 1097574 RMD160 7cee614112b691da5daac9f2579becba2409b727 SHA1 361c6335e74809b26ea096b34062ba8ff6c97cd6 SHA256 36eedd6efe6663186ed23573488670f9b02e34744694e94a9f869b6f25e47e8a
-DIST openssh-lpk-5.1p1-0.3.10.patch.gz 17922 RMD160 b569ea5ab867294796f8db698016e656fcc31cd3 SHA1 510a1bad95d7b3c0d52a3bd6202b0495e6388369 SHA256 90cce711526c9caed6af32539c00cb51c922df14c2f1d0106c4eb593cf62321e
 DIST openssh-lpk-5.2p1-0.3.11.patch.gz 18116 RMD160 2ff9bdff19e0854a96063be1e0589fa3f85da0d7 SHA1 33b36cf94f68a80fca497da110529ce69d62fbb0 SHA256 450b56a989767aa65a974213e8f7e9d0ee9d08522247db7b787730e53685bebd
 DIST openssh-lpk-5.3p1-0.3.11.patch.gz 18137 RMD160 3e316722d521e163a82d661465abef7f128d736b SHA1 870a703e2cafa744681733766e48faf3229e3b7e SHA256 34d8dbccde3b1fedb6b75d7a725ade8b37389c46f5b13a2e5a80d8cd8e6ffaaa
 DIST openssh-lpk-5.4p1-0.3.13.patch.gz 18105 RMD160 734b2c3ea740b6de610e3bfa91c93a2540b79acc SHA1 4c73f21b16db41c16e096db834380ec53f15c723 SHA256 4e5dbe769e487c914ecc5b104866f6d4412cbe35c3f2bed897d06f7d824878be
-EBUILD openssh-5.1_p1-r2.ebuild 5462 RMD160 f36841058b21ed27a1852a5b1570939c2ad709c9 SHA1 fd8625bcc5c76842aea3c3ed5b7f93846be7567c SHA256 2a50479c1d0c4f60a67a2ca74ae658228d3297b528772b43951bac2ea3291c02
 EBUILD openssh-5.2_p1-r3.ebuild 8150 RMD160 b9049bb12151086a4261cfc70aad4ba0def0d4a7 SHA1 a9f0ec39435444e2ca4ca2e0ca99d3a10ded6bd8 SHA256 ba524fd8817de5ece224ba2fca841964020069bd580ae644c99ad9ff3587af1d
 EBUILD openssh-5.3_p1-r1.ebuild 8321 RMD160 c632f38bae4c60e4836c96ca7e35dd103b598159 SHA1 1a7f59e8144586def7d83b6c6721d6da5c9e8d40 SHA256 1fa0285b909c4bd834bf495d3140aa8c7e6586ca1f85ec0c46aa0e0b4ee8df5d
-EBUILD openssh-5.4_p1-r1.ebuild 6774 RMD160 2450daf74d50d75ea54f3dfb0de663168b5a60f1 SHA1 761711f292d54d2f584fd5b82146a448ccf0c184 SHA256 aee22e034c991f9d425f864c1713e851f16a7715a1075d56a693b7148bca81c7
 EBUILD openssh-5.4_p1-r2.ebuild 8272 RMD160 0ceae73fbee90c61e62d0a38009c21d54333951a SHA1 3e314540758e06cd84ed897bc7fb12ca330a145c SHA256 020cf22f04921cb841449b4d86deb9ea6cc4135fbec5884fb24987d638cc7246
-EBUILD openssh-5.4_p1.ebuild 6654 RMD160 fcdc656a6235e2cac6acec9de1a19411168cb136 SHA1 05337c3b3bf9f6f149960e950a2c8a9656923dc1 SHA256 3312d3f11221a69f517c33170a08d8133d47efb25ba0dc31f81a36548f083f3b
 EBUILD openssh-5.5_p1-r1.ebuild 8195 RMD160 14b3fb4ee1ca2a7fde0d30081ff816b5517c1c9e SHA1 ad49e8ff2cfafd9b2f43bd60e6e16788ce6d3050 SHA256 ac37347ba4a8cde38ce73832daae32bd96918d096e9f92ee5afaa37e89976a2f
-EBUILD openssh-5.5_p1.ebuild 8162 RMD160 be5bcd28f1ff2fb9e8eab17a4eafb38d6d6b6a2a SHA1 925f0fac49b1e648d057991e79df2d1dffd24b85 SHA256 8d33b3ff7c391792bcd4039378720c0859ce894651b31564bea0d466a4b253de
 MISC ChangeLog 59873 RMD160 089e269cc59f79173d092ea6a1c119a4efbb04e7 SHA1 fe44bf8e80d39ab6f1b06cdd7bd0dc0dfcccc841 SHA256 84242f592f249f2b61f4c68102d91fc280c1dee30b8bccd7968602120e7c2d43
 MISC metadata.xml 1641 RMD160 b5ae0d7b86c8dcb36414bc31da6fd22a807ced0b SHA1 31923a9db53fcad2b9cca72c39e733376bf6c501 SHA256 d34bb27c9f775ce973246c2a6b32ccd17d300de562920afbdd47312056cd8946
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkvRFN0ACgkQTwhj9JtAlp6kWAEAxkVFaITpdKizt7bqQ8sdcjaH
+rU1k2uRIq8xDCgt3m1oBAMMFlF+XNio21M80/ZSVzuws1urTLa2jLTdBfXeC9yNe
+=5lsz
+-----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch b/net-misc/openssh/files/openssh-5.1_p1-better-ssp-check.patch
deleted file mode 100644 (file)
index cc986fc..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-a simple 'int main(){}' function won't generate references to SSP functions
-when using -fstack-protector which means systems that dont have SSP support
-wont get properly detected as lacking support.  instead, create a big buffer
-on the stack and use it as that seems to do the trick.
-
-https://bugzilla.mindrot.org/show_bug.cgi?id=1538
-https://bugs.gentoo.org/244776
-
---- openssh-5.1p1/configure.ac
-+++ openssh-5.1p1/configure.ac
-@@ -145,8 +145,8 @@ int main(void){return 0;}
-                     AC_MSG_CHECKING(if $t works)
-                     AC_RUN_IFELSE(
-                       [AC_LANG_SOURCE([
--#include <stdlib.h>
--int main(void){exit(0);}
-+#include <stdio.h>
-+int main(void){char foo[[1024]];return sprintf(foo, "moo cow") == 7;}
-                       ])],
-                       [ AC_MSG_RESULT(yes)
-                         break ],
diff --git a/net-misc/openssh/files/openssh-5.1_p1-escaped-banner.patch b/net-misc/openssh/files/openssh-5.1_p1-escaped-banner.patch
deleted file mode 100644 (file)
index 4407722..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-don't escape the banner output
-
-http://bugs.gentoo.org/244222
-https://bugzilla.mindrot.org/show_bug.cgi?id=1533
-
-fix by Michał Górny <mgorny.3ehbo@mailnull.com>
-
---- sshconnect2.c
-+++ sshconnect2.c
-@@ -415,7 +415,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
-               if (len > 65536)
-                       len = 65536;
-               msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
--              strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL);
-+              strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL|VIS_NOSLASH);
-               fprintf(stderr, "%s", msg);
-               xfree(msg);
-       }
diff --git a/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch b/net-misc/openssh/files/openssh-5.1_p1-ldap-hpn-glue.patch
deleted file mode 100644 (file)
index e6e22e8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' openssh-5.1p1+lpk/servconf.c openssh-5.1p1+lpk+glue/servconf.c
---- openssh-5.1p1+lpk/servconf.c       2008-08-23 14:37:18.000000000 -0700
-+++ openssh-5.1p1+lpk+glue/servconf.c  2008-08-23 14:52:19.000000000 -0700
-@@ -111,6 +111,25 @@
-       options->num_allow_groups = 0;
-       options->num_deny_groups = 0;
-       options->ciphers = NULL;
-+#ifdef WITH_LDAP_PUBKEY
-+      /* XXX dirty */
-+      options->lpk.ld = NULL;
-+      options->lpk.on = -1;
-+      options->lpk.servers = NULL;
-+      options->lpk.u_basedn = NULL;
-+      options->lpk.g_basedn = NULL;
-+      options->lpk.binddn = NULL;
-+      options->lpk.bindpw = NULL;
-+      options->lpk.sgroup = NULL;
-+      options->lpk.filter = NULL;
-+      options->lpk.fgroup = NULL;
-+      options->lpk.l_conf = NULL;
-+      options->lpk.tls = -1;
-+      options->lpk.b_timeout.tv_sec = -1;
-+      options->lpk.s_timeout.tv_sec = -1;
-+      options->lpk.flags = FLAG_EMPTY;
-+#endif
-+
-       options->macs = NULL;
-       options->protocol = SSH_PROTO_UNKNOWN;
-       options->gateway_ports = -1;
-@@ -131,25 +150,6 @@
-       options->num_permitted_opens = -1;
-       options->adm_forced_command = NULL;
-       options->chroot_directory = NULL;
--#ifdef WITH_LDAP_PUBKEY
--      /* XXX dirty */
--      options->lpk.ld = NULL;
--      options->lpk.on = -1;
--      options->lpk.servers = NULL;
--      options->lpk.u_basedn = NULL;
--      options->lpk.g_basedn = NULL;
--      options->lpk.binddn = NULL;
--      options->lpk.bindpw = NULL;
--      options->lpk.sgroup = NULL;
--      options->lpk.filter = NULL;
--      options->lpk.fgroup = NULL;
--      options->lpk.l_conf = NULL;
--      options->lpk.tls = -1;
--      options->lpk.b_timeout.tv_sec = -1;
--      options->lpk.s_timeout.tv_sec = -1;
--      options->lpk.flags = FLAG_EMPTY;
--#endif
--
- }
- 
- void
diff --git a/net-misc/openssh/files/openssh-5.1_p1-null-banner.patch b/net-misc/openssh/files/openssh-5.1_p1-null-banner.patch
deleted file mode 100644 (file)
index 79e5a6c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-apply fixes from upstream for empty banner
-
-https://bugzilla.mindrot.org/show_bug.cgi?id=1496
-http://bugs.gentoo.org/244222
-
-----------------------------
-revision 1.168
-date: 2008/10/03 23:56:28;  author: deraadt;  state: Exp;  lines: +3 -3
-Repair strnvis() buffersize of 4*n+1, with termination gauranteed by the
-function.
-spotted by des@freebsd, who commited an incorrect fix to the freebsd tree
-and (as is fairly typical) did not report the problem to us.  But this fix
-is correct.
-ok djm
-----------------------------
-revision 1.167
-date: 2008/07/31 14:48:28;  author: markus;  state: Exp;  lines: +2 -2
-don't allocate space for empty banners; report t8m at centrum.cz; ok deraadt
---- src/usr.bin/ssh/sshconnect2.c      2008/07/17 09:48:00     1.166
-+++ src/usr.bin/ssh/sshconnect2.c      2008/10/04 00:56:28     1.168
-@@ -377,11 +377,11 @@ input_userauth_banner(int type, u_int32_t seq, void *c
-       debug3("input_userauth_banner");
-       raw = packet_get_string(&len);
-       lang = packet_get_string(NULL);
--      if (options.log_level >= SYSLOG_LEVEL_INFO) {
-+      if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) {
-               if (len > 65536)
-                       len = 65536;
--              msg = xmalloc(len * 4); /* max expansion from strnvis() */
--              strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL);
-+              msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */
-+              strnvis(msg, raw, len * 4 + 1, VIS_SAFE|VIS_OCTAL);
-               fprintf(stderr, "%s", msg);
-               xfree(msg);
-       }
diff --git a/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch b/net-misc/openssh/files/openssh-5.1_p1-x509-headers.patch
deleted file mode 100644 (file)
index b572c2a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-need strsep() prototype for 64bit systems
-
-http://bugs.gentoo.org/258795
-
---- a/auth2-pubkey.c
-+++ b/auth2-pubkey.c
-@@ -54,6 +54,7 @@
- #endif
- #include "monitor_wrap.h"
- #include "ssh-x509.h"
-+#include <string.h>
- #include "misc.h"
- 
- /* import */
diff --git a/net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-5.1_p1-x509-hpn-glue.patch
deleted file mode 100644 (file)
index 85f8773..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-Move things around so hpn applies cleanly when using X509.
-
-Forward-Ported-from: files/openssh-4.9_p1-x509-hpn-glue.patch
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/Makefile.in openssh-5.1p1+x509-hpn-glue/Makefile.in
---- openssh-5.1p1+x509/Makefile.in     2008-08-23 14:12:53.000000000 -0700
-+++ openssh-5.1p1+x509-hpn-glue/Makefile.in    2008-08-23 14:13:51.000000000 -0700
-@@ -44,11 +44,12 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- SSHDLIBS=@SSHDLIBS@
- LIBEDIT=@LIBEDIT@
- LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
-+CPPFLAGS += @LDAP_CPPFLAGS@
- AR=@AR@
- AWK=@AWK@
- RANLIB=@RANLIB@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' openssh-5.1p1+x509/servconf.c openssh-5.1p1+x509-hpn-glue/servconf.c
---- openssh-5.1p1+x509/servconf.c      2008-08-23 14:12:53.000000000 -0700
-+++ openssh-5.1p1+x509-hpn-glue/servconf.c     2008-08-23 14:23:56.000000000 -0700
-@@ -108,6 +108,17 @@
-       options->log_level = SYSLOG_LEVEL_NOT_SET;
-       options->rhosts_rsa_authentication = -1;
-       options->hostbased_authentication = -1;
-+      options->hostbased_algorithms = NULL;
-+      options->pubkey_algorithms = NULL;
-+      ssh_x509flags_initialize(&options->x509flags, 1);
-+#ifndef SSH_X509STORE_DISABLED
-+      ssh_x509store_initialize(&options->ca);
-+#endif /*ndef SSH_X509STORE_DISABLED*/
-+#ifdef SSH_OCSP_ENABLED
-+      options->va.type = -1;
-+      options->va.certificate_file = NULL;
-+      options->va.responder_url = NULL;
-+#endif /*def SSH_OCSP_ENABLED*/
-       options->hostbased_uses_name_from_packet_only = -1;
-       options->rsa_authentication = -1;
-       options->pubkey_authentication = -1;
-@@ -151,18 +162,6 @@
-       options->num_permitted_opens = -1;
-       options->adm_forced_command = NULL;
-       options->chroot_directory = NULL;
--
--      options->hostbased_algorithms = NULL;
--      options->pubkey_algorithms = NULL;
--      ssh_x509flags_initialize(&options->x509flags, 1);
--#ifndef SSH_X509STORE_DISABLED
--      ssh_x509store_initialize(&options->ca);
--#endif /*ndef SSH_X509STORE_DISABLED*/
--#ifdef SSH_OCSP_ENABLED
--      options->va.type = -1;
--      options->va.certificate_file = NULL;
--      options->va.responder_url = NULL;
--#endif /*def SSH_OCSP_ENABLED*/
- }
- 
- void
-@@ -338,6 +337,16 @@
-       /* Portable-specific options */
-       sUsePAM,
-       /* Standard Options */
-+      sHostbasedAlgorithms,
-+      sPubkeyAlgorithms,
-+      sX509KeyAlgorithm,
-+      sAllowedClientCertPurpose,
-+      sKeyAllowSelfIssued, sMandatoryCRL,
-+      sCACertificateFile, sCACertificatePath,
-+      sCARevocationFile, sCARevocationPath,
-+      sCAldapVersion, sCAldapURL,
-+      sVAType, sVACertificateFile,
-+      sVAOCSPResponderURL,
-       sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime,
-       sPermitRootLogin, sLogFacility, sLogLevel,
-       sRhostsRSAAuthentication, sRSAAuthentication,
-@@ -360,16 +369,6 @@
-       sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
-       sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
-       sUsePrivilegeSeparation, sAllowAgentForwarding,
--      sHostbasedAlgorithms,
--      sPubkeyAlgorithms,
--      sX509KeyAlgorithm,
--      sAllowedClientCertPurpose,
--      sKeyAllowSelfIssued, sMandatoryCRL,
--      sCACertificateFile, sCACertificatePath,
--      sCARevocationFile, sCARevocationPath,
--      sCAldapVersion, sCAldapURL,
--      sVAType, sVACertificateFile,
--      sVAOCSPResponderURL,
-       sDeprecated, sUnsupported
- } ServerOpCodes;
- 
diff --git a/net-misc/openssh/openssh-5.1_p1-r2.ebuild b/net-misc/openssh/openssh-5.1_p1-r2.ebuild
deleted file mode 100644 (file)
index bfc13a7..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.1_p1-r2.ebuild,v 1.13 2009/08/13 06:30:33 vapier Exp $
-
-inherit eutils flag-o-matic multilib autotools pam
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-X509_PATCH="${PARCH}+x509-6.1.1.diff.gz"
-LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.10.patch.gz"
-HPN_PATCH="${PARCH}-hpn13v5.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-       http://www.sxw.org.uk/computing/patches/openssh-5.0p1-gsskex-20080404.patch
-       ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
-       ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-6.1.1/${X509_PATCH} )}
-       ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )}"
-       #${LDAP_PATCH:+ldap? ( http://dev.inversepath.com/openssh-lpk/${LDAP_PATCH} )}
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="static pam tcpd kerberos skey selinux X509 ldap smartcard hpn libedit X"
-
-RDEPEND="pam? ( virtual/pam )
-       kerberos? ( virtual/krb5 )
-       selinux? ( >=sys-libs/libselinux-1.28 )
-       skey? ( >=sys-auth/skey-1.1.5-r1 )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       >=dev-libs/openssl-0.9.6d
-       >=sys-libs/zlib-1.2.3
-       smartcard? ( dev-libs/opensc )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       X? ( x11-apps/xauth )
-       userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       virtual/os-headers
-       sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-       pam? ( sys-auth/pambase )"
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
-       # this sucks, but i'd rather have people unable to `emerge -u openssh`
-       # than not be able to log in to their server any more
-       maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; }
-       local fail="
-               $(maybe_fail X509 X509_PATCH)
-               $(maybe_fail ldap LDAP_PATCH)
-       "
-       fail=$(echo ${fail})
-       if [[ -n ${fail} ]] ; then
-               eerror "Sorry, but this version does not yet support features"
-               eerror "that you requested:      ${fail}"
-               eerror "Please mask ${PF} for now and check back later:"
-               eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-               die "booooo"
-       fi
-}
-
-src_unpack() {
-       unpack ${PARCH}.tar.gz
-       cd "${S}"
-
-       sed -i \
-               -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-               pathnames.h || die
-
-       use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${PN}-5.1_p1-x509-{headers,hpn-glue}.patch
-       use smartcard && epatch "${FILESDIR}"/openssh-3.9_p1-opensc.patch
-       if ! use X509 ; then
-               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-                       # The patch for bug 210110 64-bit stuff is now included.
-                       epatch "${DISTDIR}"/${LDAP_PATCH}
-                       epatch "${FILESDIR}"/${PN}-5.1_p1-ldap-hpn-glue.patch
-               fi
-               #epatch "${DISTDIR}"/openssh-5.0p1-gsskex-20080404.patch #115553 #216932
-       else
-               use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap"
-       fi
-       epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-       [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
-       epatch "${FILESDIR}"/${PN}-4.7p1-selinux.diff #191665
-
-       sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
-
-       epatch "${FILESDIR}"/${P}-null-banner.patch #244222
-       epatch "${FILESDIR}"/${P}-escaped-banner.patch #244222
-       epatch "${FILESDIR}"/${P}-better-ssp-check.patch
-
-       eautoreconf
-}
-
-src_compile() {
-       addwrite /dev/ptmx
-       addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-       local myconf=""
-       if use static ; then
-               append-ldflags -static
-               use pam && ewarn "Disabling pam support becuse of static flag"
-               myconf="${myconf} --without-pam"
-       else
-               myconf="${myconf} $(use_with pam)"
-       fi
-
-       econf \
-               --with-ldflags="${LDFLAGS}" \
-               --disable-strip \
-               --sysconfdir=/etc/ssh \
-               --libexecdir=/usr/$(get_libdir)/misc \
-               --datadir=/usr/share/openssh \
-               --with-privsep-path=/var/empty \
-               --with-privsep-user=sshd \
-               --with-md5-passwords \
-               --with-ssl-engine \
-               ${LDAP_PATCH:+$(use ldap && use_with ldap)} \
-               $(use_with libedit) \
-               $(use_with kerberos kerberos5 /usr) \
-               $(use_with tcpd tcp-wrappers) \
-               $(use_with selinux) \
-               $(use_with skey) \
-               $(use_with smartcard opensc) \
-               ${myconf} \
-               || die "bad configure"
-       emake || die "compile problem"
-}
-
-src_install() {
-       emake install-nokeys DESTDIR="${D}" || die
-       fperms 600 /etc/ssh/sshd_config
-       dobin contrib/ssh-copy-id
-       newinitd "${FILESDIR}"/sshd.rc6 sshd
-       newconfd "${FILESDIR}"/sshd.confd sshd
-       keepdir /var/empty
-
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-       use pam \
-               && dosed "/^#UsePAM /s:.*:UsePAM yes:" /etc/ssh/sshd_config \
-               && dosed "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" /etc/ssh/sshd_config
-
-       doman contrib/ssh-copy-id.1
-       dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
-       diropts -m 0700
-       dodir /etc/skel/.ssh
-}
-
-pkg_postinst() {
-       enewgroup sshd 22
-       enewuser sshd 22 -1 /var/empty sshd
-
-       # help fix broken perms caused by older ebuilds.
-       # can probably cut this after the next stage release.
-       chmod u+x "${ROOT}"/etc/skel/.ssh >& /dev/null
-
-       ewarn "Remember to merge your config files in /etc/ssh/ and then"
-       ewarn "reload sshd: '/etc/init.d/sshd reload'."
-       if use pam ; then
-               echo
-               ewarn "Please be aware users need a valid shell in /etc/passwd"
-               ewarn "in order to be allowed to login."
-       fi
-}
diff --git a/net-misc/openssh/openssh-5.4_p1-r1.ebuild b/net-misc/openssh/openssh-5.4_p1-r1.ebuild
deleted file mode 100644 (file)
index 546bd22..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1-r1.ebuild,v 1.1 2010/03/29 05:42:45 vapier Exp $
-
-inherit eutils flag-o-matic multilib autotools pam
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-#HPN_PATCH="${PARCH}-hpn13v7.diff.gz"
-#LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.11.patch.gz"
-X509_VER="6.2.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-       ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )}
-       ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
-       ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
-
-RDEPEND="pam? ( virtual/pam )
-       kerberos? ( virtual/krb5 )
-       selinux? ( >=sys-libs/libselinux-1.28 )
-       skey? ( >=sys-auth/skey-1.1.5-r1 )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       >=dev-libs/openssl-0.9.6d
-       >=sys-libs/zlib-1.2.3
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       X? ( x11-apps/xauth )
-       userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       virtual/os-headers
-       sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-       pam? ( >=sys-auth/pambase-20081028 )"
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
-       # this sucks, but i'd rather have people unable to `emerge -u openssh`
-       # than not be able to log in to their server any more
-       maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; }
-       local fail="
-               $(maybe_fail ldap LDAP_PATCH)
-               $(maybe_fail X509 X509_PATCH)
-       "
-       fail=$(echo ${fail})
-       if [[ -n ${fail} ]] ; then
-               eerror "Sorry, but this version does not yet support features"
-               eerror "that you requested:      ${fail}"
-               eerror "Please mask ${PF} for now and check back later:"
-               eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-               die "booooo"
-       fi
-}
-
-src_unpack() {
-       unpack ${PARCH}.tar.gz
-       cd "${S}"
-
-       sed -i \
-               -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-               pathnames.h || die
-
-       if use X509 ; then
-               # Apply X509 patch
-               epatch "${DISTDIR}"/${X509_PATCH}
-               # Apply glue so that HPN will still work after X509
-               #epatch "${FILESDIR}"/${PN}-5.2_p1-x509-hpn-glue.patch
-       fi
-       if ! use X509 ; then
-               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-                       # The patch for bug 210110 64-bit stuff is now included.
-                       epatch "${DISTDIR}"/${LDAP_PATCH}
-                       epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654
-               fi
-       else
-               use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap"
-       fi
-       epatch "${FILESDIR}"/${P}-openssl.patch
-       epatch "${FILESDIR}"/${P}-pkcs11.patch #310929
-       epatch "${FILESDIR}"/${P}-relative-AuthorizedKeysFile.patch #308939
-       epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-       [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
-       epatch "${FILESDIR}"/${PN}-5.2_p1-autoconf.patch
-
-       sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
-
-       # Disable PATH reset, trust what portage gives us. bug 254615
-       sed -i -e 's:^PATH=/:#PATH=/:' configure || die
-
-       eautoreconf
-}
-
-static_use_with() {
-       local flag=$1
-       if use static && use ${flag} ; then
-               ewarn "Disabling '${flag}' support because of USE='static'"
-               # rebuild args so that we invert the first one (USE flag)
-               # but otherwise leave everything else working so we can
-               # just leverage use_with
-               shift
-               [[ -z $1 ]] && flag="${flag} ${flag}"
-               set -- !${flag} "$@"
-       fi
-       use_with "$@"
-}
-
-src_compile() {
-       addwrite /dev/ptmx
-       addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-       use static && append-ldflags -static
-
-       econf \
-               --with-ldflags="${LDFLAGS}" \
-               --disable-strip \
-               --sysconfdir=/etc/ssh \
-               --libexecdir=/usr/$(get_libdir)/misc \
-               --datadir=/usr/share/openssh \
-               --with-privsep-path=/var/empty \
-               --with-privsep-user=sshd \
-               --with-md5-passwords \
-               --with-ssl-engine \
-               $(static_use_with pam) \
-               $(static_use_with kerberos kerberos5 /usr) \
-               ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
-               $(use_with libedit) \
-               $(use_with selinux) \
-               $(use_with skey) \
-               $(use_with tcpd tcp-wrappers) \
-               || die
-       emake || die
-}
-
-src_install() {
-       emake install-nokeys DESTDIR="${D}" || die
-       fperms 600 /etc/ssh/sshd_config
-       dobin contrib/ssh-copy-id
-       newinitd "${FILESDIR}"/sshd.rc6 sshd
-       newconfd "${FILESDIR}"/sshd.confd sshd
-       keepdir /var/empty
-
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-       if use pam ; then
-               sed -i \
-                       -e "/^#UsePAM /s:.*:UsePAM yes:" \
-                       -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-                       -e "/^#PrintMotd /s:.*:PrintMotd no:" \
-                       -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-                       "${D}"/etc/ssh/sshd_config || die "sed of configuration file failed"
-       fi
-
-       # This instruction is from the HPN webpage,
-       # Used for the server logging functionality
-       if [[ -n ${HPN_PATCH} ]] && use hpn; then
-               keepdir /var/empty/dev
-       fi
-
-       doman contrib/ssh-copy-id.1
-       dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
-       diropts -m 0700
-       dodir /etc/skel/.ssh
-}
-
-src_test() {
-       local t tests skipped failed passed shell
-       tests="interop-tests compat-tests"
-       skipped=""
-       shell=$(getent passwd ${UID} | cut -d: -f7)
-       if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-               elog "Running the full OpenSSH testsuite"
-               elog "requires a usable shell for the 'portage'"
-               elog "user, so we will run a subset only."
-               skipped="${skipped} tests"
-       else
-               tests="${tests} tests"
-       fi
-       for t in ${tests} ; do
-               # Some tests read from stdin ...
-               emake -k -j1 ${t} </dev/null \
-                       && passed="${passed}${t} " \
-                       || failed="${failed}${t} "
-       done
-       einfo "Passed tests: ${passed}"
-       ewarn "Skipped tests: ${skipped}"
-       if [[ -n ${failed} ]] ; then
-               ewarn "Failed tests: ${failed}"
-               die "Some tests failed: ${failed}"
-       else
-               einfo "Failed tests: ${failed}"
-               return 0
-       fi
-}
-
-pkg_postinst() {
-       enewgroup sshd 22
-       enewuser sshd 22 -1 /var/empty sshd
-
-       ewarn "Remember to merge your config files in /etc/ssh/ and then"
-       ewarn "reload sshd: '/etc/init.d/sshd reload'."
-       if use pam ; then
-               echo
-               ewarn "Please be aware users need a valid shell in /etc/passwd"
-               ewarn "in order to be allowed to login."
-       fi
-       # This instruction is from the HPN webpage,
-       # Used for the server logging functionality
-       if [[ -n ${HPN_PATCH} ]] && use hpn; then
-               echo
-               einfo "For the HPN server logging patch, you must ensure that"
-               einfo "your syslog application also listens at /var/empty/dev/log."
-       fi
-}
diff --git a/net-misc/openssh/openssh-5.4_p1.ebuild b/net-misc/openssh/openssh-5.4_p1.ebuild
deleted file mode 100644 (file)
index 6158514..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.4_p1.ebuild,v 1.3 2010/03/20 00:17:55 vapier Exp $
-
-inherit eutils flag-o-matic multilib autotools pam
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-#HPN_PATCH="${PARCH}-hpn13v7.diff.gz"
-#LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.11.patch.gz"
-X509_VER="6.2.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-       ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} )}
-       ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
-       ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
-
-RDEPEND="pam? ( virtual/pam )
-       kerberos? ( virtual/krb5 )
-       selinux? ( >=sys-libs/libselinux-1.28 )
-       skey? ( >=sys-auth/skey-1.1.5-r1 )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       >=dev-libs/openssl-0.9.6d
-       >=sys-libs/zlib-1.2.3
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       X? ( x11-apps/xauth )
-       userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       virtual/os-headers
-       sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-       pam? ( >=sys-auth/pambase-20081028 )"
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
-       # this sucks, but i'd rather have people unable to `emerge -u openssh`
-       # than not be able to log in to their server any more
-       maybe_fail() { [[ -z ${!2} ]] && use ${1} && echo ${1} ; }
-       local fail="
-               $(maybe_fail ldap LDAP_PATCH)
-               $(maybe_fail X509 X509_PATCH)
-       "
-       fail=$(echo ${fail})
-       if [[ -n ${fail} ]] ; then
-               eerror "Sorry, but this version does not yet support features"
-               eerror "that you requested:      ${fail}"
-               eerror "Please mask ${PF} for now and check back later:"
-               eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-               die "booooo"
-       fi
-}
-
-src_unpack() {
-       unpack ${PARCH}.tar.gz
-       cd "${S}"
-
-       sed -i \
-               -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-               pathnames.h || die
-
-       if use X509 ; then
-               # Apply X509 patch
-               epatch "${DISTDIR}"/${X509_PATCH}
-               # Apply glue so that HPN will still work after X509
-               #epatch "${FILESDIR}"/${PN}-5.2_p1-x509-hpn-glue.patch
-       fi
-       if ! use X509 ; then
-               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-                       # The patch for bug 210110 64-bit stuff is now included.
-                       epatch "${DISTDIR}"/${LDAP_PATCH}
-                       epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654
-               fi
-       else
-               use ldap && ewarn "Sorry, X509 and ldap don't get along, disabling ldap"
-       fi
-       epatch "${FILESDIR}"/${P}-openssl.patch
-       epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-       [[ -n ${HPN_PATCH} ]] && use hpn && epatch "${DISTDIR}"/${HPN_PATCH}
-       epatch "${FILESDIR}"/${PN}-5.2_p1-autoconf.patch
-
-       sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
-
-       # Disable PATH reset, trust what portage gives us. bug 254615
-       sed -i -e 's:^PATH=/:#PATH=/:' configure || die
-
-       eautoreconf
-}
-
-static_use_with() {
-       local flag=$1
-       if use static && use ${flag} ; then
-               ewarn "Disabling '${flag}' support because of USE='static'"
-               # rebuild args so that we invert the first one (USE flag)
-               # but otherwise leave everything else working so we can
-               # just leverage use_with
-               shift
-               [[ -z $1 ]] && flag="${flag} ${flag}"
-               set -- !${flag} "$@"
-       fi
-       use_with "$@"
-}
-
-src_compile() {
-       addwrite /dev/ptmx
-       addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-       use static && append-ldflags -static
-
-       econf \
-               --with-ldflags="${LDFLAGS}" \
-               --disable-strip \
-               --sysconfdir=/etc/ssh \
-               --libexecdir=/usr/$(get_libdir)/misc \
-               --datadir=/usr/share/openssh \
-               --with-privsep-path=/var/empty \
-               --with-privsep-user=sshd \
-               --with-md5-passwords \
-               --with-ssl-engine \
-               $(static_use_with pam) \
-               $(static_use_with kerberos kerberos5 /usr) \
-               ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
-               $(use_with libedit) \
-               $(use_with selinux) \
-               $(use_with skey) \
-               $(use_with tcpd tcp-wrappers) \
-               || die
-       emake || die
-}
-
-src_install() {
-       emake install-nokeys DESTDIR="${D}" || die
-       fperms 600 /etc/ssh/sshd_config
-       dobin contrib/ssh-copy-id
-       newinitd "${FILESDIR}"/sshd.rc6 sshd
-       newconfd "${FILESDIR}"/sshd.confd sshd
-       keepdir /var/empty
-
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-       if use pam ; then
-               sed -i \
-                       -e "/^#UsePAM /s:.*:UsePAM yes:" \
-                       -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-                       -e "/^#PrintMotd /s:.*:PrintMotd no:" \
-                       -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-                       "${D}"/etc/ssh/sshd_config || die "sed of configuration file failed"
-       fi
-
-       # This instruction is from the HPN webpage,
-       # Used for the server logging functionality
-       if [[ -n ${HPN_PATCH} ]] && use hpn; then
-               keepdir /var/empty/dev
-       fi
-
-       doman contrib/ssh-copy-id.1
-       dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
-       diropts -m 0700
-       dodir /etc/skel/.ssh
-}
-
-src_test() {
-       local t tests skipped failed passed shell
-       tests="interop-tests compat-tests"
-       skipped=""
-       shell=$(getent passwd ${UID} | cut -d: -f7)
-       if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-               elog "Running the full OpenSSH testsuite"
-               elog "requires a usable shell for the 'portage'"
-               elog "user, so we will run a subset only."
-               skipped="${skipped} tests"
-       else
-               tests="${tests} tests"
-       fi
-       for t in ${tests} ; do
-               # Some tests read from stdin ...
-               emake -k -j1 ${t} </dev/null \
-                       && passed="${passed}${t} " \
-                       || failed="${failed}${t} "
-       done
-       einfo "Passed tests: ${passed}"
-       ewarn "Skipped tests: ${skipped}"
-       if [[ -n ${failed} ]] ; then
-               ewarn "Failed tests: ${failed}"
-               die "Some tests failed: ${failed}"
-       else
-               einfo "Failed tests: ${failed}"
-               return 0
-       fi
-}
-
-pkg_postinst() {
-       enewgroup sshd 22
-       enewuser sshd 22 -1 /var/empty sshd
-
-       ewarn "Remember to merge your config files in /etc/ssh/ and then"
-       ewarn "reload sshd: '/etc/init.d/sshd reload'."
-       if use pam ; then
-               echo
-               ewarn "Please be aware users need a valid shell in /etc/passwd"
-               ewarn "in order to be allowed to login."
-       fi
-       # This instruction is from the HPN webpage,
-       # Used for the server logging functionality
-       if [[ -n ${HPN_PATCH} ]] && use hpn; then
-               echo
-               einfo "For the HPN server logging patch, you must ensure that"
-               einfo "your syslog application also listens at /var/empty/dev/log."
-       fi
-}
diff --git a/net-misc/openssh/openssh-5.5_p1.ebuild b/net-misc/openssh/openssh-5.5_p1.ebuild
deleted file mode 100644 (file)
index 21c02b2..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.5_p1.ebuild,v 1.1 2010/04/16 21:20:37 vapier Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib autotools pam
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_/}
-
-#HPN_PATCH="${PARCH}-hpn13v7.diff.gz"
-#HPN_X509_PATCH="${HPN_PATCH%.diff.gz}-x509variant.diff.gz"
-#LDAP_PATCH="${PARCH/openssh/openssh-lpk}-0.3.13.patch.gz"
-X509_VER="6.2.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-       ${HPN_PATCH:+hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/${HPN_PATCH} mirror://gentoo/${HPN_PATCH} )}
-       ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
-       ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-       ${HPN_X509_PATCH:+hpn? ( X509? ( mirror://gentoo/${HPN_X509_PATCH} ) )}
-       "
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="hpn kerberos ldap libedit pam selinux skey static tcpd X X509"
-
-RDEPEND="pam? ( virtual/pam )
-       kerberos? ( virtual/krb5 )
-       selinux? ( >=sys-libs/libselinux-1.28 )
-       skey? ( >=sys-auth/skey-1.1.5-r1 )
-       ldap? ( net-nds/openldap )
-       libedit? ( dev-libs/libedit )
-       >=dev-libs/openssl-0.9.6d
-       >=sys-libs/zlib-1.2.3
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-       X? ( x11-apps/xauth )
-       userland_GNU? ( sys-apps/shadow )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       virtual/os-headers
-       sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-       pam? ( >=sys-auth/pambase-20081028 )"
-PROVIDE="virtual/ssh"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
-       # this sucks, but i'd rather have people unable to `emerge -u openssh`
-       # than not be able to log in to their server any more
-       maybe_fail() { [[ -z ${!2} ]] && echo ${1} ; }
-       local fail="
-               $(use X509 && maybe_fail X509 X509_PATCH)
-               $(use ldap && maybe_fail ldap LDAP_PATCH)
-               $(use hpn && maybe_fail hpn HPN_PATCH)
-               $(use X509 && use hpn && maybe_fail x509+hpn HPN_X509_PATCH)
-       "
-       fail=$(echo ${fail})
-       if [[ -n ${fail} ]] ; then
-               eerror "Sorry, but this version does not yet support features"
-               eerror "that you requested:      ${fail}"
-               eerror "Please mask ${PF} for now and check back later:"
-               eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-               die "booooo"
-       fi
-}
-
-src_prepare() {
-       sed -i \
-               -e '/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:/usr/bin/xauth:' \
-               pathnames.h || die
-       # keep this as we need it to avoid the conflict between LPK and HPN changing
-       # this file.
-       cp version.h version.h.pristine
-
-       if use X509 ; then
-               # Apply X509 patch
-               epatch "${DISTDIR}"/${X509_PATCH}
-               # Apply glue so that HPN will still work after X509
-               #epatch "${FILESDIR}"/${PN}-5.2_p1-x509-hpn-glue.patch
-       fi
-       if ! use X509 ; then
-               if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-                       epatch "${DISTDIR}"/${LDAP_PATCH}
-                       epatch "${FILESDIR}"/${PN}-5.2p1-ldap-stdargs.diff #266654
-                       # version.h patch conflict avoidence
-                       mv version.h version.h.lpk
-                       cp -f version.h.pristine version.h
-               fi
-       else
-               use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP"
-       fi
-       epatch "${FILESDIR}"/${PN}-5.4_p1-openssl.patch
-       epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-       if [[ -n ${HPN_PATCH} ]] && use hpn; then
-               if use X509 ; then
-                       epatch "${DISTDIR}"/${HPN_X509_PATCH}
-               else
-                       epatch "${DISTDIR}"/${HPN_PATCH}
-               fi
-               # version.h patch conflict avoidence
-               mv version.h version.h.hpn
-               cp -f version.h.pristine version.h
-               # The AES-CTR multithreaded variant is temporarily broken, and
-               # causes random hangs when combined with the -f switch of ssh.
-               # To avoid this, we change the internal table to use the non-multithread
-               # version for the meantime.
-               sed -i \
-                       -e '/aes...-ctr.*SSH_CIPHER_SSH2/s,evp_aes_ctr_mt,evp_aes_128_ctr,' \
-                       cipher.c || die
-       fi
-       epatch "${FILESDIR}"/${PN}-5.2_p1-autoconf.patch
-
-       sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die
-
-       # Disable PATH reset, trust what portage gives us. bug 254615
-       sed -i -e 's:^PATH=/:#PATH=/:' configure || die
-
-       # Now we can build a sane merged version.h
-       t="${T}"/version.h
-       m="${t}.merge" f="${t}.final"
-       cat version.h.{hpn,pristine,lpk} 2>/dev/null \
-               | sed '/^#define SSH_RELEASE/d' \
-               | sort | uniq >"${m}"
-       sed -n -r \
-               -e '/^\//p' \
-               <"${m}" >"${f}"
-       sed -n -r \
-               -e '/SSH_LPK/s,"lpk","-lpk",g' \
-               -e '/^#define/p' \
-               <"${m}" >>"${f}"
-       v="SSH_VERSION SSH_PORTABLE"
-       [[ -f version.h.hpn ]] && v="${v} SSH_HPN"
-       [[ -f version.h.lpk ]] && v="${v} SSH_LPK"
-       echo "#define SSH_RELEASE ${v}" >>"${f}"
-       cp "${f}" version.h
-
-       eautoreconf
-}
-
-static_use_with() {
-       local flag=$1
-       if use static && use ${flag} ; then
-               ewarn "Disabling '${flag}' support because of USE='static'"
-               # rebuild args so that we invert the first one (USE flag)
-               # but otherwise leave everything else working so we can
-               # just leverage use_with
-               shift
-               [[ -z $1 ]] && flag="${flag} ${flag}"
-               set -- !${flag} "$@"
-       fi
-       use_with "$@"
-}
-
-src_configure() {
-       addwrite /dev/ptmx
-       addpredict /etc/skey/skeykeys #skey configure code triggers this
-
-       use static && append-ldflags -static
-
-       econf \
-               --with-ldflags="${LDFLAGS}" \
-               --disable-strip \
-               --sysconfdir=/etc/ssh \
-               --libexecdir=/usr/$(get_libdir)/misc \
-               --datadir=/usr/share/openssh \
-               --with-privsep-path=/var/empty \
-               --with-privsep-user=sshd \
-               --with-md5-passwords \
-               --with-ssl-engine \
-               $(static_use_with pam) \
-               $(static_use_with kerberos kerberos5 /usr) \
-               ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
-               $(use_with libedit) \
-               $(use_with selinux) \
-               $(use_with skey) \
-               $(use_with tcpd tcp-wrappers) \
-               || die
-}
-
-src_compile() {
-       emake || die
-}
-
-src_install() {
-       emake install-nokeys DESTDIR="${D}" || die
-       fperms 600 /etc/ssh/sshd_config
-       dobin contrib/ssh-copy-id
-       newinitd "${FILESDIR}"/sshd.rc6 sshd
-       newconfd "${FILESDIR}"/sshd.confd sshd
-       keepdir /var/empty
-
-       newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-       if use pam ; then
-               sed -i \
-                       -e "/^#UsePAM /s:.*:UsePAM yes:" \
-                       -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-                       -e "/^#PrintMotd /s:.*:PrintMotd no:" \
-                       -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-                       "${D}"/etc/ssh/sshd_config || die "sed of configuration file failed"
-       fi
-
-       # This instruction is from the HPN webpage,
-       # Used for the server logging functionality
-       if [[ -n ${HPN_PATCH} ]] && use hpn; then
-               keepdir /var/empty/dev
-       fi
-
-       doman contrib/ssh-copy-id.1
-       dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
-       diropts -m 0700
-       dodir /etc/skel/.ssh
-}
-
-src_test() {
-       local t tests skipped failed passed shell
-       tests="interop-tests compat-tests"
-       skipped=""
-       shell=$(getent passwd ${UID} | cut -d: -f7)
-       if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-               elog "Running the full OpenSSH testsuite"
-               elog "requires a usable shell for the 'portage'"
-               elog "user, so we will run a subset only."
-               skipped="${skipped} tests"
-       else
-               tests="${tests} tests"
-       fi
-       for t in ${tests} ; do
-               # Some tests read from stdin ...
-               emake -k -j1 ${t} </dev/null \
-                       && passed="${passed}${t} " \
-                       || failed="${failed}${t} "
-       done
-       einfo "Passed tests: ${passed}"
-       ewarn "Skipped tests: ${skipped}"
-       if [[ -n ${failed} ]] ; then
-               ewarn "Failed tests: ${failed}"
-               die "Some tests failed: ${failed}"
-       else
-               einfo "Failed tests: ${failed}"
-               return 0
-       fi
-}
-
-pkg_postinst() {
-       enewgroup sshd 22
-       enewuser sshd 22 -1 /var/empty sshd
-
-       ewarn "Remember to merge your config files in /etc/ssh/ and then"
-       ewarn "reload sshd: '/etc/init.d/sshd reload'."
-       if use pam ; then
-               echo
-               ewarn "Please be aware users need a valid shell in /etc/passwd"
-               ewarn "in order to be allowed to login."
-       fi
-       # This instruction is from the HPN webpage,
-       # Used for the server logging functionality
-       if [[ -n ${HPN_PATCH} ]] && use hpn; then
-               echo
-               einfo "For the HPN server logging patch, you must ensure that"
-               einfo "your syslog application also listens at /var/empty/dev/log."
-       fi
-}