From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- net-misc/putty/Manifest | 4 +- net-misc/putty/files/putty-0.71-no-gssapi.patch | 190 ++++++++++++++---------- net-misc/putty/putty-0.71-r1.ebuild | 94 ------------ net-misc/putty/putty-0.71-r2.ebuild | 94 ++++++++++++ 4 files changed, 204 insertions(+), 178 deletions(-) delete mode 100644 net-misc/putty/putty-0.71-r1.ebuild create mode 100644 net-misc/putty/putty-0.71-r2.ebuild (limited to 'net-misc/putty') diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index 09ee1ee4a037..2954ab9bb4f6 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,8 +1,8 @@ -AUX putty-0.71-no-gssapi.patch 8533 BLAKE2B 8877d15eb81d846343ff7bd198bbf67ebf82145ff149f4844fd3625c4a4b025374e30c450f49bb6c044c9b096c37018f96e2014247f1181fc80a1241e344b04a SHA512 d82647f6c212502a710c47536b61ed152c53ccbcbe6792142d831f62601ff8377b927b26a0bc364bc48ad033732088afd3bff2926d5cb8da83a4ed2d1f9cbfab +AUX putty-0.71-no-gssapi.patch 10370 BLAKE2B 785e3710f175f01cde6c236b719d7e7b410036758980ad41e7703dcb169b0ea4518682ba8eb196800ebe04ac68c1ffa12febe407b447f1abf1469bfea226e655 SHA512 c2bd2480605e9a52fc429463eee53c5850cc2e81fbc486f059aa759aee22ba5f18e3e27d052c3b549aa0e6f2ce2a8ef8b4172d8e4d5bb4cde5ec74ef7fd9ddf5 DIST putty-0.68.tar.gz 2114499 BLAKE2B b7f2f216bbeaea3fa175810defd546b3b94bb7f2e182b46d05a11db1e4841266674a71f6ce2d30edeefe98e3e0093e379abf736a34fb742d60dcdfd20593afec SHA512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3 DIST putty-0.71.tar.gz 2423752 BLAKE2B fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6 SHA512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 EBUILD putty-0.68.ebuild 1585 BLAKE2B c5cf6d298348b950e62eaad33054fef6d2740aa148afd3d0b9f1411dfc38162c22919f71829ebb5bdc77a3e758045aad5fa751f8f084dcd8bbdc7f6afee781fc SHA512 2d4188d5cd77f4335990b5e67d516b6cd6b5c34efc1d8253e5c3ac28f03995f24646b29a6de180d9a8957d10d30d76ec60b185cbda5bb889edad83894b1ecfd4 -EBUILD putty-0.71-r1.ebuild 1715 BLAKE2B 2d06f04e11ae6cec185097d874d9221bf970bd71f28fdbc158bd5989db0578d9892b9cd48d59fdb3ab17e900e95e7c1f48b3a8fecefd558eb07c2e830d3e58ab SHA512 f13898e24aca15efdd68372e49c78984c26859d1262ba0e3967c81c14417b716f099bb2a2f6c8e1e70fc8e3a161bcafeb370292e2d5cca0747d66511c604fdbe +EBUILD putty-0.71-r2.ebuild 1712 BLAKE2B 1027379f8e23ec3132c89e3fee5251b1b4a2407e034794b5ccb24f58a6bab3b205c92277cc55d7625ad31b3912ac2845ab32fcf817c5a9c4db67b584318a65c5 SHA512 d1e13059b70667a936f2e336dce81bd5921e34d9a64638dc046312cf0762715a11e39c0c4a28a00ca11ea7cb5883f80caeaa3928be50729114b19ff86c56cb2f EBUILD putty-9999.ebuild 1778 BLAKE2B d84806c66abe03ce824f8d7c9dc54cf07f49da77d4bd29ac590465e85cc4019cef2a4af8f4d39c81443c0b0c4c643afc17ce45897e6855aa0677f295b71baba5 SHA512 8d702ecce91b4a8e98171e97424cde8eac4a54144ca9c39d178490950c66a300889690eb0c19c35af5faf5b63e3c18ee93525cd3b1c670e6307aedf2128d5ede MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6 diff --git a/net-misc/putty/files/putty-0.71-no-gssapi.patch b/net-misc/putty/files/putty-0.71-no-gssapi.patch index 75add0687d28..33a3f226851f 100644 --- a/net-misc/putty/files/putty-0.71-no-gssapi.patch +++ b/net-misc/putty/files/putty-0.71-no-gssapi.patch @@ -1,6 +1,27 @@ +From 7ad08649a223a4cd61e67d8334a147f55c79399d Mon Sep 17 00:00:00 2001 +From: Jacob Nevins +Date: Mon, 25 Mar 2019 23:46:59 +0000 +Subject: [PATCH] Fix compilation with NO_GSSAPI. + +This is a fairly shallow patch, which removes the UI and interactions +with external libraries. Some other machinery (which is dead code in +this configuration) is left in place. + +Adapted by me from a patch by Jeroen Roovers. +--- + config.c | 4 ++++ + settings.c | 12 ++++++++++-- + ssh.c | 16 +++++++++++++++- + ssh2transport.c | 3 +-- + ssh2userauth.c | 8 ++++++-- + sshserver.c | 13 ++++++++++++- + 6 files changed, 48 insertions(+), 8 deletions(-) + +diff --git a/config.c b/config.c +index 9c299fee..6528a969 100644 --- a/config.c +++ b/config.c -@@ -2442,10 +2442,12 @@ +@@ -2442,10 +2442,12 @@ void setup_config_box(struct controlbox *b, bool midsession, HELPCTX(ssh_kexlist), kexlist_handler, P(NULL)); c->listbox.height = KEX_MAX; @@ -13,7 +34,7 @@ s = ctrl_getset(b, "Connection/SSH/Kex", "repeat", "Options controlling key re-exchange"); -@@ -2455,11 +2457,13 @@ +@@ -2455,11 +2457,13 @@ void setup_config_box(struct controlbox *b, bool midsession, conf_editbox_handler, I(CONF_ssh_rekey_time), I(-1)); @@ -27,9 +48,11 @@ ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20, HELPCTX(ssh_kex_repeat), conf_editbox_handler, +diff --git a/settings.c b/settings.c +index 8d563026..54f5ab7b 100644 --- a/settings.c +++ b/settings.c -@@ -592,21 +592,25 @@ +@@ -592,21 +592,25 @@ void save_open_settings(settings_w *sesskey, Conf *conf) write_setting_b(sesskey, "Compression", conf_get_bool(conf, CONF_compression)); write_setting_b(sesskey, "TryAgent", conf_get_bool(conf, CONF_tryagent)); write_setting_b(sesskey, "AgentFwd", conf_get_bool(conf, CONF_agentfwd)); @@ -56,7 +79,7 @@ wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist); write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ssh_gss_custom)); #endif -@@ -937,7 +941,9 @@ +@@ -937,7 +941,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf) gppb(sesskey, "TryAgent", true, conf, CONF_tryagent); gppb(sesskey, "AgentFwd", false, conf, CONF_agentfwd); gppb(sesskey, "ChangeUsername", false, conf, CONF_change_username); @@ -66,7 +89,7 @@ gprefs(sesskey, "Cipher", "\0", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist); { -@@ -990,7 +996,9 @@ +@@ -990,7 +996,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf) gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN", hknames, HK_MAX, conf, CONF_ssh_hklist); gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time); @@ -76,7 +99,7 @@ gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data); { /* SSH-2 only by default */ -@@ -1007,9 +1015,9 @@ +@@ -1007,9 +1015,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf) gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner); gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth); gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth); @@ -87,9 +110,11 @@ gprefs(sesskey, "GSSLibs", "\0", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist); gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom); +diff --git a/ssh.c b/ssh.c +index e35ebc64..e8ad61b8 100644 --- a/ssh.c +++ b/ssh.c -@@ -50,7 +50,9 @@ +@@ -50,7 +50,9 @@ struct Ssh { ssh_sharing_state *connshare; bool attempting_connshare; @@ -99,7 +124,7 @@ char *savedhost; int savedport; -@@ -252,10 +254,17 @@ +@@ -252,10 +254,18 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv, conf_get_bool(ssh->conf, CONF_tryagent), username, conf_get_bool(ssh->conf, CONF_change_username), conf_get_bool(ssh->conf, CONF_try_ki_auth), @@ -107,31 +132,86 @@ conf_get_bool(ssh->conf, CONF_try_gssapi_auth), conf_get_bool(ssh->conf, CONF_try_gssapi_kex), conf_get_bool(ssh->conf, CONF_gssapifwd), - &ssh->gss_state); +- &ssh->gss_state); ++ &ssh->gss_state +#else -+ NULL, -+ NULL, -+ NULL, -+ NULL); ++ false, ++ false, ++ false, ++ NULL +#endif ++ ); ssh_connect_ppl(ssh, userauth_layer); transport_child_layer = userauth_layer; -@@ -267,7 +276,11 @@ +@@ -267,7 +277,11 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv, ssh->fullhostname, ssh_verstring_get_local(old_bpp), ssh_verstring_get_remote(old_bpp), +#ifndef NO_GSSAPI &ssh->gss_state, +#else -+ NULL, ++ NULL, +#endif &ssh->stats, transport_child_layer, false); ssh_connect_ppl(ssh, ssh->base_layer); +diff --git a/ssh2transport.c b/ssh2transport.c +index 8640d89d..5e8955a0 100644 +--- a/ssh2transport.c ++++ b/ssh2transport.c +@@ -1781,6 +1781,7 @@ static void ssh2_transport_gss_update(struct ssh2_transport_state *s, + if (mins > 0 && s->gss_ctxt_lifetime <= mins * 60) + s->gss_status |= GSS_CTXT_EXPIRES; + } ++#endif /* NO_GSSAPI */ + + ptrlen ssh2_transport_get_session_id(PacketProtocolLayer *ppl) + { +@@ -1805,8 +1806,6 @@ void ssh2_transport_notify_auth_done(PacketProtocolLayer *ppl) + queue_idempotent_callback(&s->ppl.ic_process_queue); + } + +-#endif /* NO_GSSAPI */ +- + static bool ssh2_transport_get_specials( + PacketProtocolLayer *ppl, add_special_fn_t add_special, void *ctx) + { +diff --git a/ssh2userauth.c b/ssh2userauth.c +index fc413923..7f5a1292 100644 +--- a/ssh2userauth.c ++++ b/ssh2userauth.c +@@ -613,8 +613,10 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl) + * Scan it for method identifiers we know about. + */ + bool srv_pubkey = false, srv_passwd = false; +- bool srv_keyb_inter = false, srv_gssapi = false; +- bool srv_gssapi_keyex_auth = false; ++ bool srv_keyb_inter = false; ++#ifndef NO_GSSAPI ++ bool srv_gssapi = false, srv_gssapi_keyex_auth = false; ++#endif + + for (ptrlen method; get_commasep_word(&methods, &method) ;) { + if (ptrlen_eq_string(method, "publickey")) +@@ -623,10 +625,12 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl) + srv_passwd = true; + else if (ptrlen_eq_string(method, "keyboard-interactive")) + srv_keyb_inter = true; ++#ifndef NO_GSSAPI + else if (ptrlen_eq_string(method, "gssapi-with-mic")) + srv_gssapi = true; + else if (ptrlen_eq_string(method, "gssapi-keyex")) + srv_gssapi_keyex_auth = true; ++#endif + } + + /* +diff --git a/sshserver.c b/sshserver.c +index 5f6e7dde..5c34bb35 100644 --- a/sshserver.c +++ b/sshserver.c -@@ -50,7 +50,9 @@ +@@ -50,7 +50,9 @@ struct server { PacketProtocolLayer *base_layer; ConnectionLayer *cl; @@ -141,18 +221,19 @@ }; static void ssh_server_free_callback(void *vsrv); -@@ -246,8 +248,10 @@ +@@ -245,9 +247,11 @@ Plug *ssh_server_plug( + bufchain_init(&srv->out_raw); bufchain_init(&srv->dummy_user_input); - /* FIXME: replace with sensible */ +#ifndef NO_GSSAPI + /* FIXME: replace with sensible */ srv->gss_state.libs = snew(struct ssh_gss_liblist); srv->gss_state.libs->nlibraries = 0; +#endif return &srv->plug; } -@@ -297,7 +301,9 @@ +@@ -297,7 +301,9 @@ static void ssh_server_free_callback(void *vsrv) conf_free(srv->conf); log_free(srv->logctx); @@ -162,75 +243,20 @@ sfree(srv); -@@ -442,7 +448,11 @@ +@@ -442,7 +448,12 @@ static void server_got_ssh_version(struct ssh_version_receiver *rcv, srv->conf, NULL, 0, NULL, ssh_verstring_get_remote(old_bpp), ssh_verstring_get_local(old_bpp), +- &srv->gss_state, &srv->stats, transport_child_layer, true); +#ifndef NO_GSSAPI - &srv->gss_state, &srv->stats, transport_child_layer, true); ++ &srv->gss_state, +#else -+ NULL, &srv->stats, transport_child_layer, true); ++ NULL, +#endif ++ &srv->stats, transport_child_layer, true); ssh2_transport_provide_hostkeys( srv->base_layer, srv->hostkeys, srv->nhostkeys); if (userauth_layer) ---- a/ssh2userauth.c -+++ b/ssh2userauth.c -@@ -241,7 +241,9 @@ - * Misc one-time setup for authentication. - */ - s->publickey_blob = NULL; -+#ifndef NO_GSSAPI - s->session_id = ssh2_transport_get_session_id(s->transport_layer); -+#endif - - /* - * Load the public half of any configured public key file for -@@ -613,8 +615,12 @@ - * Scan it for method identifiers we know about. - */ - bool srv_pubkey = false, srv_passwd = false; -+#ifndef NO_GSSAPI - bool srv_keyb_inter = false, srv_gssapi = false; - bool srv_gssapi_keyex_auth = false; -+#else -+ bool srv_keyb_inter = false; -+#endif - - for (ptrlen method; get_commasep_word(&methods, &method) ;) { - if (ptrlen_eq_string(method, "publickey")) -@@ -623,10 +629,12 @@ - srv_passwd = true; - else if (ptrlen_eq_string(method, "keyboard-interactive")) - srv_keyb_inter = true; -+#ifndef NO_GSSAPI - else if (ptrlen_eq_string(method, "gssapi-with-mic")) - srv_gssapi = true; - else if (ptrlen_eq_string(method, "gssapi-keyex")) - srv_gssapi_keyex_auth = true; -+#endif - } - - /* -@@ -1640,7 +1648,9 @@ - * any packets since. Signal the transport layer to consider - * doing an immediate rekey, if it has any reason to want to. - */ -+#ifndef NO_GSSAPI - ssh2_transport_notify_auth_done(s->transport_layer); -+#endif - - /* - * Finally, hand over to our successor layer, and return ---- a/ssh2userauth-server.c -+++ b/ssh2userauth-server.c -@@ -122,7 +122,9 @@ - - crBegin(s->crState); - -+#ifndef NO_GSSAPI - s->session_id = ssh2_transport_get_session_id(s->transport_layer); -+#endif - - while (1) { - crMaybeWaitUntilV((pktin = ssh2_userauth_server_pop(s)) != NULL); +-- +2.11.0 + diff --git a/net-misc/putty/putty-0.71-r1.ebuild b/net-misc/putty/putty-0.71-r1.ebuild deleted file mode 100644 index 3cb7948531d8..000000000000 --- a/net-misc/putty/putty-0.71-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils gnome2-utils toolchain-funcs - -DESCRIPTION="A Free Telnet/SSH Client" -HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" -LICENSE="MIT" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc +gtk gtk2 ipv6 gssapi" -SRC_URI=" - https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 - https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz -" - -RDEPEND=" - !net-misc/pssh - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/pango - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3[X] ) - ) - gssapi? ( virtual/krb5 ) -" -DEPEND=" - ${RDEPEND} - dev-lang/perl - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-0.71-no-gssapi.patch -) - -src_prepare() { - default - - sed -i \ - -e '/AM_PATH_GTK(/d' \ - -e 's|-Werror||g' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - cd "${S}"/unix || die - econf \ - $(use_with gssapi) \ - $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) ) -} - -src_compile() { - cd "${S}"/unix || die - emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) -} - -src_install() { - dodoc doc/puttydoc.txt - - if use doc; then - docinto html - dodoc doc/*.html - fi - - cd "${S}"/unix || die - default - - if use gtk ; then - for i in 16 22 24 32 48 64 128 256; do - newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png - done - - # install desktop file provided by Gustav Schaffter in #49577 - make_desktop_entry ${PN} PuTTY ${PN} Network - fi -} - -pkg_preinst() { - use gtk && gnome2_icon_savelist -} - -pkg_postinst() { - use gtk && gnome2_icon_cache_update -} - -pkg_postrm() { - use gtk && gnome2_icon_cache_update -} diff --git a/net-misc/putty/putty-0.71-r2.ebuild b/net-misc/putty/putty-0.71-r2.ebuild new file mode 100644 index 000000000000..e8860e799793 --- /dev/null +++ b/net-misc/putty/putty-0.71-r2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils gnome2-utils toolchain-funcs + +DESCRIPTION="A Free Telnet/SSH Client" +HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86" +IUSE="doc +gtk gtk2 ipv6 gssapi" +SRC_URI=" + https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 + https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz +" + +RDEPEND=" + !net-misc/pssh + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + x11-libs/libX11 + x11-libs/pango + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3[X] ) + ) + gssapi? ( virtual/krb5 ) +" +DEPEND=" + ${RDEPEND} + dev-lang/perl + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-0.71-no-gssapi.patch +) + +src_prepare() { + default + + sed -i \ + -e '/AM_PATH_GTK(/d' \ + -e 's|-Werror||g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + cd "${S}"/unix || die + econf \ + $(use_with gssapi) \ + $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) ) +} + +src_compile() { + cd "${S}"/unix || die + emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) +} + +src_install() { + dodoc doc/puttydoc.txt + + if use doc; then + docinto html + dodoc doc/*.html + fi + + cd "${S}"/unix || die + default + + if use gtk ; then + for i in 16 22 24 32 48 64 128 256; do + newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png + done + + # install desktop file provided by Gustav Schaffter in #49577 + make_desktop_entry ${PN} PuTTY ${PN} Network + fi +} + +pkg_preinst() { + use gtk && gnome2_icon_savelist +} + +pkg_postinst() { + use gtk && gnome2_icon_cache_update +} + +pkg_postrm() { + use gtk && gnome2_icon_cache_update +} -- cgit v1.2.3