* [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/, net-misc/putty/files/
@ 2019-03-18 1:29 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2019-03-18 1:29 UTC (permalink / raw
To: gentoo-commits
commit: b9d41551a25341494964ab129c0bfff48d4c1246
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 01:28:50 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 01:29:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d41551
net-misc/putty: Fix USE=-gssapi
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/680818
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-misc/putty/files/putty-0.71-no-gssapi.patch | 182 ++++++++++++++++++++++++
net-misc/putty/putty-0.71.ebuild | 3 +
2 files changed, 185 insertions(+)
diff --git a/net-misc/putty/files/putty-0.71-no-gssapi.patch b/net-misc/putty/files/putty-0.71-no-gssapi.patch
new file mode 100644
index 00000000000..d74a9e7de9b
--- /dev/null
+++ b/net-misc/putty/files/putty-0.71-no-gssapi.patch
@@ -0,0 +1,182 @@
+--- a/config.c
++++ b/config.c
+@@ -2442,10 +2442,12 @@
+ HELPCTX(ssh_kexlist),
+ kexlist_handler, P(NULL));
+ c->listbox.height = KEX_MAX;
++#ifndef NO_GSSAPI
+ ctrl_checkbox(s, "Attempt GSSAPI key exchange",
+ 'k', HELPCTX(ssh_gssapi),
+ conf_checkbox_handler,
+ I(CONF_try_gssapi_kex));
++#endif
+
+ s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
+ "Options controlling key re-exchange");
+@@ -2455,11 +2457,13 @@
+ conf_editbox_handler,
+ I(CONF_ssh_rekey_time),
+ I(-1));
++#ifndef NO_GSSAPI
+ ctrl_editbox(s, "Minutes between GSS checks (0 for never)", NO_SHORTCUT, 20,
+ HELPCTX(ssh_kex_repeat),
+ conf_editbox_handler,
+ I(CONF_gssapirekey),
+ I(-1));
++#endif
+ ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
+ HELPCTX(ssh_kex_repeat),
+ conf_editbox_handler,
+--- a/settings.c
++++ b/settings.c
+@@ -990,7 +990,9 @@
+ gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN",
+ hknames, HK_MAX, conf, CONF_ssh_hklist);
+ gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time);
++#ifndef NO_GSSAPI
+ gppi(sesskey, "GssapiRekey", GSS_DEF_REKEY_MINS, conf, CONF_gssapirekey);
++#endif
+ gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data);
+ {
+ /* SSH-2 only by default */
+--- a/ssh.c
++++ b/ssh.c
+@@ -50,7 +50,9 @@
+ ssh_sharing_state *connshare;
+ bool attempting_connshare;
+
++#ifndef NO_GSSAPI
+ struct ssh_connection_shared_gss_state gss_state;
++#endif
+
+ char *savedhost;
+ int savedport;
+@@ -257,7 +257,11 @@
+ 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),
++#ifndef NO_GSSAPI
+ &ssh->gss_state);
++#else
++ NULL);
++#endif
+ ssh_connect_ppl(ssh, userauth_layer);
+ transport_child_layer = userauth_layer;
+
+@@ -269,7 +273,11 @@
+ ssh->fullhostname,
+ ssh_verstring_get_local(old_bpp),
+ ssh_verstring_get_remote(old_bpp),
++#ifndef NO_GSSAPI
+ &ssh->gss_state,
++#else
++ NULL,
++#endif
+ &ssh->stats, transport_child_layer, false);
+ ssh_connect_ppl(ssh, ssh->base_layer);
+
+--- a/sshserver.c
++++ b/sshserver.c
+@@ -50,7 +50,9 @@
+ PacketProtocolLayer *base_layer;
+ ConnectionLayer *cl;
+
++#ifndef NO_GSSAPI
+ struct ssh_connection_shared_gss_state gss_state;
++#endif
+ };
+
+ static void ssh_server_free_callback(void *vsrv);
+@@ -246,8 +248,10 @@
+ bufchain_init(&srv->dummy_user_input);
+
+ /* FIXME: replace with sensible */
++#ifndef NO_GSSAPI
+ srv->gss_state.libs = snew(struct ssh_gss_liblist);
+ srv->gss_state.libs->nlibraries = 0;
++#endif
+
+ return &srv->plug;
+ }
+@@ -297,7 +301,9 @@
+ conf_free(srv->conf);
+ log_free(srv->logctx);
+
++#ifndef NO_GSSAPI
+ sfree(srv->gss_state.libs); /* FIXME: replace with sensible */
++#endif
+
+ sfree(srv);
+
+@@ -442,7 +448,11 @@
+ srv->conf, NULL, 0, NULL,
+ ssh_verstring_get_remote(old_bpp),
+ ssh_verstring_get_local(old_bpp),
++#ifndef NO_GSSAPI
+ &srv->gss_state, &srv->stats, transport_child_layer, true);
++#else
++ NULL, &srv->stats, transport_child_layer, true);
++#endif
+ 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);
diff --git a/net-misc/putty/putty-0.71.ebuild b/net-misc/putty/putty-0.71.ebuild
index 06b7756af05..3cb7948531d 100644
--- a/net-misc/putty/putty-0.71.ebuild
+++ b/net-misc/putty/putty-0.71.ebuild
@@ -33,6 +33,9 @@ DEPEND="
dev-lang/perl
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.71-no-gssapi.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/, net-misc/putty/files/
@ 2019-03-26 7:54 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2019-03-26 7:54 UTC (permalink / raw
To: gentoo-commits
commit: f7b0fab72e164d096b3f5e01dd6a5c4b2affa139
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 07:52:57 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:54:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b0fab7
net-misc/putty: Replace no-gssapi patch after upstream review
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Bug: https://bugs.gentoo.org/show_bug.cgi?id=675524
Bug: https://bugs.gentoo.org/show_bug.cgi?id=680818
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-misc/putty/files/putty-0.71-no-gssapi.patch | 190 ++++++++++++---------
.../{putty-0.71-r1.ebuild => putty-0.71-r2.ebuild} | 0
2 files changed, 108 insertions(+), 82 deletions(-)
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 75add0687d2..33a3f226851 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 <jacobn@chiark.greenend.org.uk>
+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-r2.ebuild
similarity index 100%
rename from net-misc/putty/putty-0.71-r1.ebuild
rename to net-misc/putty/putty-0.71-r2.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/, net-misc/putty/files/
@ 2022-12-04 8:55 Matthew Smith
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Smith @ 2022-12-04 8:55 UTC (permalink / raw
To: gentoo-commits
commit: f8cedace6a6c08e6210970e2cf204da145d80273
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 4 08:53:11 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 08:55:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8cedace
net-misc/putty: drop 0.77-r3
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
net-misc/putty/Manifest | 1 -
net-misc/putty/files/putty-0.77-nogssapi.patch | 18 -----
net-misc/putty/putty-0.77-r3.ebuild | 101 -------------------------
3 files changed, 120 deletions(-)
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index d83a3d0407d0..df4e3c0e67ea 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,3 +1,2 @@
-DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da81d33f864d72074d1e5cae2fcf2710a038aef1de56077de2e296f4c5e573af077f4b55e433563f680cd9cc4b SHA512 35eb1e3f98a07611365bedc492c69a5475ce9b3d920ecebc78c76813505684c16cfcbfbb2306c1106fb5a9b72ca3dd52cbd39b9e9805c6689c9a9464910c0e7d
DIST putty-0.78.tar.gz 2811628 BLAKE2B 544fa7d3f7acfeb76cdb19e5ff3b60c81e4a1101ba16fab107d1f403745f792ab562d438d64a8a0a429b31ec426806c296a7b4e03916f8f32d2c227a54c32c71 SHA512 d7a3e2eabd5f1f65fc0f3f1ee0789c30fbe891b57f63ddeac0b92befcb6aecd4a748f04a21c76ee42d992deb77c2e1a0454a71cc620ef26fbf23af660bd84bb5
DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
diff --git a/net-misc/putty/files/putty-0.77-nogssapi.patch b/net-misc/putty/files/putty-0.77-nogssapi.patch
deleted file mode 100644
index 84d36e1849e0..000000000000
--- a/net-misc/putty/files/putty-0.77-nogssapi.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Define NO_GSSAPI when -DPUTTY_GSSAPI=OFF
-
-Previously it would only be defined if -DPUTTY_GSSAPI=DYNAMIC and libdl is
-not found on the system. Setting -DPUTTY_GSSAPI=OFF on systems with glibc
-2.33 and earlier causes a build failure, because libdl is not linked in.
-
-Bug: https://bugs.gentoo.org/873355
---- a/cmake/platforms/unix.cmake
-+++ b/cmake/platforms/unix.cmake
-@@ -105,6 +105,8 @@
- "Could not find libdl -- cannot provide dynamic GSSAPI support")
- set(NO_GSSAPI ON)
- endif()
-+else()
-+ set(NO_GSSAPI ON)
- endif()
-
- if(PUTTY_GSSAPI STREQUAL STATIC)
diff --git a/net-misc/putty/putty-0.77-r3.ebuild b/net-misc/putty/putty-0.77-r3.ebuild
deleted file mode 100644
index 737dcfe68966..000000000000
--- a/net-misc/putty/putty-0.77-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${PN}-icons.tar.bz2"
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
-else
- SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-fi
-LICENSE="MIT"
-
-SLOT="0"
-IUSE="debug doc +gtk gtk2 gssapi"
-
-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}
-"
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- doc? ( app-doc/halibut )
-"
-
-REQUIRED_USE="
- gtk2? ( gtk )
-"
-
-PATCHES=(
- # Bug #873355
- "${FILESDIR}"/putty-0.77-nogssapi.patch
-)
-
-src_unpack() {
- [[ ${PV} == *9999 ]] && git-r3_src_unpack
- default
-}
-
-src_configure() {
- cd "${S}"/unix || die
- local mycmakeargs=(
- -DPUTTY_DEBUG="$(usex debug)"
- -DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
- -DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
- -DPUTTY_IPV6=yes
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all doc
-}
-
-src_install() {
- cmake_src_install
-
- doman "${BUILD_DIR}"/doc/*.1
-
- if use doc ; then
- docinto html
- dodoc "${BUILD_DIR}"/doc/html/*.html
- fi
-
- if use gtk ; then
- local i
- 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_postinst() {
- use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-04 8:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-18 1:29 [gentoo-commits] repo/gentoo:master commit in: net-misc/putty/, net-misc/putty/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2019-03-26 7:54 Jeroen Roovers
2022-12-04 8:55 Matthew Smith
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox