- Update to new upstream release 0.71

OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=53
This commit is contained in:
Jan Engelhardt 2019-03-17 11:40:14 +00:00 committed by Git OBS Bridge
parent f57534d21f
commit c767b9fed6
7 changed files with 85 additions and 71 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be
size 2386108

Binary file not shown.

3
putty-0.71.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f931ce2f89780cc8ca7bbed90fcd22c44515d2773f5fa954069e209b48ec6b8
size 2423752

BIN
putty-0.71.tar.gz.gpg Normal file

Binary file not shown.

View File

@ -5,81 +5,80 @@
* Set standard colors and use a more legilible font size. * Set standard colors and use a more legilible font size.
--- ---
settings.c | 51 ++++++++++++++++++++++++++++++++++----------------- settings.c | 49 +++++++++++++++++++++++++++++++++----------------
unix/unix.h | 6 +----- unix/unix.h | 6 +-----
windows/windefs.c | 2 +- windows/windefs.c | 2 +-
3 files changed, 36 insertions(+), 23 deletions(-) 3 files changed, 35 insertions(+), 22 deletions(-)
Index: putty-0.69/settings.c Index: putty-0.71/settings.c
=================================================================== ===================================================================
--- putty-0.69.orig/settings.c --- putty-0.71.orig/settings.c
+++ putty-0.69/settings.c +++ putty-0.71/settings.c
@@ -13,8 +13,8 @@ static const struct keyvalwhere cipherna @@ -17,8 +17,8 @@
static const struct keyvalwhere ciphernames[] = {
{ "aes", CIPHER_AES, -1, -1 }, { "aes", CIPHER_AES, -1, -1 },
{ "chacha20", CIPHER_CHACHA20, CIPHER_AES, +1 }, { "chacha20", CIPHER_CHACHA20, CIPHER_AES, +1 },
{ "blowfish", CIPHER_BLOWFISH, -1, -1 },
- { "3des", CIPHER_3DES, -1, -1 }, - { "3des", CIPHER_3DES, -1, -1 },
{ "WARN", CIPHER_WARN, -1, -1 }, { "WARN", CIPHER_WARN, -1, -1 },
+ { "3des", CIPHER_3DES, -1, -1 }, + { "3des", CIPHER_3DES, -1, -1 },
{ "des", CIPHER_DES, -1, -1 },
{ "blowfish", CIPHER_BLOWFISH, -1, -1 },
{ "arcfour", CIPHER_ARCFOUR, -1, -1 }, { "arcfour", CIPHER_ARCFOUR, -1, -1 },
{ "des", CIPHER_DES, -1, -1 } @@ -843,7 +843,7 @@ void load_open_settings(settings_r *sess
};
@@ -749,7 +749,7 @@ void load_open_settings(void *sesskey, C
} }
gppi(sesskey, "TCPNoDelay", 1, conf, CONF_tcp_nodelay); gppb(sesskey, "TCPNoDelay", true, conf, CONF_tcp_nodelay);
gppi(sesskey, "TCPKeepalives", 0, conf, CONF_tcp_keepalives); gppb(sesskey, "TCPKeepalives", false, conf, CONF_tcp_keepalives);
- gpps(sesskey, "TerminalType", "xterm", conf, CONF_termtype); - gpps(sesskey, "TerminalType", "xterm", conf, CONF_termtype);
+ gpps(sesskey, "TerminalType", "linux", conf, CONF_termtype); + gpps(sesskey, "TerminalType", "linux", conf, CONF_termtype);
gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed); gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed);
if (gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) { if (gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) {
/* /*
@@ -917,10 +917,10 @@ void load_open_settings(void *sesskey, C @@ -1021,10 +1021,10 @@ void load_open_settings(settings_r *sess
gppi(sesskey, "PassiveTelnet", 0, conf, CONF_passive_telnet); gppb(sesskey, "PassiveTelnet", false, conf, CONF_passive_telnet);
gppi(sesskey, "BackspaceIsDelete", 1, conf, CONF_bksp_is_delete); gppb(sesskey, "BackspaceIsDelete", true, conf, CONF_bksp_is_delete);
gppi(sesskey, "RXVTHomeEnd", 0, conf, CONF_rxvt_homeend); gppb(sesskey, "RXVTHomeEnd", false, conf, CONF_rxvt_homeend);
- gppi(sesskey, "LinuxFunctionKeys", 0, conf, CONF_funky_type); - gppi(sesskey, "LinuxFunctionKeys", 0, conf, CONF_funky_type);
+ gppi(sesskey, "LinuxFunctionKeys", 1, conf, CONF_funky_type); + gppi(sesskey, "LinuxFunctionKeys", true, conf, CONF_funky_type);
gppi(sesskey, "NoApplicationKeys", 0, conf, CONF_no_applic_k); gppb(sesskey, "NoApplicationKeys", false, conf, CONF_no_applic_k);
gppi(sesskey, "NoApplicationCursors", 0, conf, CONF_no_applic_c); gppb(sesskey, "NoApplicationCursors", false, conf, CONF_no_applic_c);
- gppi(sesskey, "NoMouseReporting", 0, conf, CONF_no_mouse_rep); - gppb(sesskey, "NoMouseReporting", false, conf, CONF_no_mouse_rep);
+ gppi(sesskey, "NoMouseReporting", 1, conf, CONF_no_mouse_rep); + gppb(sesskey, "NoMouseReporting", true, conf, CONF_no_mouse_rep);
gppi(sesskey, "NoRemoteResize", 0, conf, CONF_no_remote_resize); gppb(sesskey, "NoRemoteResize", false, conf, CONF_no_remote_resize);
gppi(sesskey, "NoAltScreen", 0, conf, CONF_no_alt_screen); gppb(sesskey, "NoAltScreen", false, conf, CONF_no_alt_screen);
gppi(sesskey, "NoRemoteWinTitle", 0, conf, CONF_no_remote_wintitle); gppb(sesskey, "NoRemoteWinTitle", false, conf, CONF_no_remote_wintitle);
@@ -941,9 +941,9 @@ void load_open_settings(void *sesskey, C @@ -1046,9 +1046,9 @@ void load_open_settings(settings_r *sess
gppi(sesskey, "ApplicationKeypad", 0, conf, CONF_app_keypad); gppb(sesskey, "ApplicationKeypad", false, conf, CONF_app_keypad);
gppi(sesskey, "NetHackKeypad", 0, conf, CONF_nethack_keypad); gppb(sesskey, "NetHackKeypad", false, conf, CONF_nethack_keypad);
gppi(sesskey, "AltF4", 1, conf, CONF_alt_f4); gppb(sesskey, "AltF4", true, conf, CONF_alt_f4);
- gppi(sesskey, "AltSpace", 0, conf, CONF_alt_space); - gppb(sesskey, "AltSpace", false, conf, CONF_alt_space);
+ gppi(sesskey, "AltSpace", 1, conf, CONF_alt_space); + gppb(sesskey, "AltSpace", true, conf, CONF_alt_space);
gppi(sesskey, "AltOnly", 0, conf, CONF_alt_only); gppb(sesskey, "AltOnly", false, conf, CONF_alt_only);
- gppi(sesskey, "ComposeKey", 0, conf, CONF_compose_key); - gppb(sesskey, "ComposeKey", false, conf, CONF_compose_key);
+ gppi(sesskey, "ComposeKey", 1, conf, CONF_compose_key); + gppb(sesskey, "ComposeKey", true, conf, CONF_compose_key);
gppi(sesskey, "CtrlAltKeys", 1, conf, CONF_ctrlaltkeys); gppb(sesskey, "CtrlAltKeys", true, conf, CONF_ctrlaltkeys);
#ifdef OSX_META_KEY_CONFIG #ifdef OSX_META_KEY_CONFIG
gppi(sesskey, "OSXOptionMeta", 1, conf, CONF_osx_option_meta); gppb(sesskey, "OSXOptionMeta", true, conf, CONF_osx_option_meta);
@@ -955,12 +955,12 @@ void load_open_settings(void *sesskey, C @@ -1060,12 +1060,12 @@ void load_open_settings(settings_r *sess
gppi(sesskey, "LocalEdit", AUTO, conf, CONF_localedit); gppi(sesskey, "LocalEdit", AUTO, conf, CONF_localedit);
gpps(sesskey, "Answerback", "PuTTY", conf, CONF_answerback); gpps(sesskey, "Answerback", "PuTTY", conf, CONF_answerback);
gppi(sesskey, "AlwaysOnTop", 0, conf, CONF_alwaysontop); gppb(sesskey, "AlwaysOnTop", false, conf, CONF_alwaysontop);
- gppi(sesskey, "FullScreenOnAltEnter", 0, conf, CONF_fullscreenonaltenter); - gppb(sesskey, "FullScreenOnAltEnter", false,
+ gppi(sesskey, "FullScreenOnAltEnter", 1, conf, CONF_fullscreenonaltenter); + gppb(sesskey, "FullScreenOnAltEnter", true,
gppi(sesskey, "HideMousePtr", 0, conf, CONF_hide_mouseptr); conf, CONF_fullscreenonaltenter);
gppi(sesskey, "SunkenEdge", 0, conf, CONF_sunken_edge); gppb(sesskey, "HideMousePtr", false, conf, CONF_hide_mouseptr);
gppb(sesskey, "SunkenEdge", false, conf, CONF_sunken_edge);
gppi(sesskey, "WindowBorder", 1, conf, CONF_window_border); gppi(sesskey, "WindowBorder", 1, conf, CONF_window_border);
- gppi(sesskey, "CurType", 0, conf, CONF_cursor_type); - gppi(sesskey, "CurType", 0, conf, CONF_cursor_type);
- gppi(sesskey, "BlinkCur", 0, conf, CONF_blink_cur);
+ gppi(sesskey, "CurType", 1, conf, CONF_cursor_type); + gppi(sesskey, "CurType", 1, conf, CONF_cursor_type);
+ gppi(sesskey, "BlinkCur", 1, conf, CONF_blink_cur); gppb(sesskey, "BlinkCur", false, conf, CONF_blink_cur);
/* pedantic compiler tells me I can't use conf, CONF_beep as an int * :-) */ /* pedantic compiler tells me I can't use conf, CONF_beep as an int * :-) */
gppi(sesskey, "Beep", 1, conf, CONF_beep); gppi(sesskey, "Beep", 1, conf, CONF_beep);
gppi(sesskey, "BeepInd", 0, conf, CONF_beep_ind); @@ -1100,10 +1100,10 @@ void load_open_settings(settings_r *sess
@@ -994,10 +994,10 @@ void load_open_settings(void *sesskey, C gppb(sesskey, "CRImpliesLF", false, conf, CONF_crhaslf);
gppi(sesskey, "CRImpliesLF", 0, conf, CONF_crhaslf); gppb(sesskey, "DisableArabicShaping", false, conf, CONF_arabicshaping);
gppi(sesskey, "DisableArabicShaping", 0, conf, CONF_arabicshaping); gppb(sesskey, "DisableBidi", false, conf, CONF_bidi);
gppi(sesskey, "DisableBidi", 0, conf, CONF_bidi); - gppb(sesskey, "WinNameAlways", true, conf, CONF_win_name_always);
- gppi(sesskey, "WinNameAlways", 1, conf, CONF_win_name_always); + gppb(sesskey, "WinNameAlways", false, conf, CONF_win_name_always);
+ gppi(sesskey, "WinNameAlways", 0, conf, CONF_win_name_always);
gpps(sesskey, "WinTitle", "", conf, CONF_wintitle); gpps(sesskey, "WinTitle", "", conf, CONF_wintitle);
gppi(sesskey, "TermWidth", 80, conf, CONF_width); gppi(sesskey, "TermWidth", 80, conf, CONF_width);
- gppi(sesskey, "TermHeight", 24, conf, CONF_height); - gppi(sesskey, "TermHeight", 24, conf, CONF_height);
@ -87,7 +86,7 @@ Index: putty-0.69/settings.c
gppfont(sesskey, "Font", conf, CONF_font); gppfont(sesskey, "Font", conf, CONF_font);
gppi(sesskey, "FontQuality", FQ_DEFAULT, conf, CONF_font_quality); gppi(sesskey, "FontQuality", FQ_DEFAULT, conf, CONF_font_quality);
gppi(sesskey, "FontVTMode", VT_UNICODE, conf, CONF_vtmode); gppi(sesskey, "FontVTMode", VT_UNICODE, conf, CONF_vtmode);
@@ -1009,11 +1009,28 @@ void load_open_settings(void *sesskey, C @@ -1116,11 +1116,28 @@ void load_open_settings(settings_r *sess
for (i = 0; i < 22; i++) { for (i = 0; i < 22; i++) {
static const char *const defaults[] = { static const char *const defaults[] = {
@ -121,20 +120,20 @@ Index: putty-0.69/settings.c
}; };
char buf[20], *buf2; char buf[20], *buf2;
int c0, c1, c2; int c0, c1, c2;
@@ -1061,7 +1078,7 @@ void load_open_settings(void *sesskey, C @@ -1178,7 +1195,7 @@ void load_open_settings(settings_r *sess
* The empty default for LineCodePage will be converted later * The empty default for LineCodePage will be converted later
* into a plausible default for the locale. * into a plausible default for the locale.
*/ */
- gpps(sesskey, "LineCodePage", "", conf, CONF_line_codepage); - gpps(sesskey, "LineCodePage", "", conf, CONF_line_codepage);
+ gpps(sesskey, "LineCodePage", "UTF-8", conf, CONF_line_codepage); + gpps(sesskey, "LineCodePage", "UTF-8", conf, CONF_line_codepage);
gppi(sesskey, "CJKAmbigWide", 0, conf, CONF_cjk_ambig_wide); gppb(sesskey, "CJKAmbigWide", false, conf, CONF_cjk_ambig_wide);
gppi(sesskey, "UTF8Override", 1, conf, CONF_utf8_override); gppb(sesskey, "UTF8Override", true, conf, CONF_utf8_override);
gpps(sesskey, "Printer", "", conf, CONF_printer); gpps(sesskey, "Printer", "", conf, CONF_printer);
Index: putty-0.69/unix/unix.h Index: putty-0.71/unix/unix.h
=================================================================== ===================================================================
--- putty-0.69.orig/unix/unix.h --- putty-0.71.orig/unix/unix.h
+++ putty-0.69/unix/unix.h +++ putty-0.71/unix/unix.h
@@ -257,10 +257,6 @@ int so_peercred(int fd, int *pid, int *u @@ -399,11 +399,7 @@ Socket *make_fd_socket(int infd, int out
/* /*
* Default font setting, which can vary depending on NOT_X_WINDOWS. * Default font setting, which can vary depending on NOT_X_WINDOWS.
*/ */
@ -145,17 +144,18 @@ Index: putty-0.69/unix/unix.h
-#endif -#endif
+#define DEFAULT_GTK_FONT "client:Monospace 14" +#define DEFAULT_GTK_FONT "client:Monospace 14"
#endif /*
Index: putty-0.69/windows/windefs.c * uxpty.c.
Index: putty-0.71/windows/windefs.c
=================================================================== ===================================================================
--- putty-0.69.orig/windows/windefs.c --- putty-0.71.orig/windows/windefs.c
+++ putty-0.69/windows/windefs.c +++ putty-0.71/windows/windefs.c
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
FontSpec *platform_default_fontspec(const char *name) FontSpec *platform_default_fontspec(const char *name)
{ {
if (!strcmp(name, "Font")) if (!strcmp(name, "Font"))
- return fontspec_new("Courier New", 0, 10, ANSI_CHARSET); - return fontspec_new("Courier New", false, 10, ANSI_CHARSET);
+ return fontspec_new("Ludica Console", 0, 14, ANSI_CHARSET); + return fontspec_new("Consolas", false, 14, ANSI_CHARSET);
else else
return fontspec_new("", 0, 0, 0); return fontspec_new("", false, 0, 0);
} }

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Mar 17 11:28:14 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 0.71
* Fixed a remotely triggerable memory overwrite in RSA key
exchange, which can occur before host key verification
potential recycling of random numbers used in cryptography.
* Fixed a remotely triggerable buffer overflow in any kind of
server-to-client forwarding.
* Fixed multiple denial-of-service attacks that can be triggered
by writing to the terminal.
* Major rewrite of the crypto code to remove cache and timing
side channels.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 7 03:56:51 UTC 2018 - jnwang@suse.com Thu Jun 7 03:56:51 UTC 2018 - jnwang@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package putty # spec file for package putty
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
Name: putty Name: putty
Version: 0.70 Version: 0.71
Release: 0 Release: 0
Summary: GTK-based terminal emulator program Summary: GTK-based terminal emulator program
License: MIT License: MIT