jengelh/putty
SHA256
1
0
Fork 0
forked from pool/putty
Code Pull Requests Activity

putty-0.68

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=32
This commit is contained in:
Jan Engelhardt 2017-03-15 08:30:10 +00:00 committed by Git OBS Bridge
parent c2c43cde80
commit da7e21c1f0
8 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
putty-0.67.tar.gz
View File

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

BIN
putty-0.67.tar.gz.gpg
View File

Binary file not shown.

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

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

BIN
putty-0.68.tar.gz.gpg Normal file
View File

Binary file not shown.

65
putty-03-config.diff
View File

@ -6,17 +6,17 @@
---
settings.c | 51 ++++++++++++++++++++++++++++++++++-----------------
unix/gtkwin.c | 2 +-
unix/unix.h | 6 +-----
windows/windefs.c | 2 +-
3 files changed, 36 insertions(+), 19 deletions(-)
3 files changed, 36 insertions(+), 23 deletions(-)
Index: putty-0.63/settings.c
Index: putty-0.68/settings.c
===================================================================
--- putty-0.63.orig/settings.c 2013-08-02 23:33:40.000000000 +0100
+++ putty-0.63/settings.c 2013-08-06 19:22:06.000000000 +0100
@@ -12,8 +12,8 @@
static const struct keyvalwhere ciphernames[] = {
--- putty-0.68.orig/settings.c
+++ putty-0.68/settings.c
@@ -13,8 +13,8 @@ static const struct keyvalwhere cipherna
{ "aes", CIPHER_AES, -1, -1 },
{ "chacha20", CIPHER_CHACHA20, CIPHER_AES, +1 },
{ "blowfish", CIPHER_BLOWFISH, -1, -1 },
- { "3des", CIPHER_3DES, -1, -1 },
{ "WARN", CIPHER_WARN, -1, -1 },
@ -24,7 +24,7 @@ Index: putty-0.63/settings.c
{ "arcfour", CIPHER_ARCFOUR, -1, -1 },
{ "des", CIPHER_DES, -1, -1 }
};
@@ -696,7 +696,7 @@ void load_open_settings(void *sesskey, C
@@ -746,7 +746,7 @@ void load_open_settings(void *sesskey, C
}
gppi(sesskey, "TCPNoDelay", 1, conf, CONF_tcp_nodelay);
gppi(sesskey, "TCPKeepalives", 0, conf, CONF_tcp_keepalives);
@ -33,7 +33,7 @@ Index: putty-0.63/settings.c
gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed);
if (!gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) {
/* This hardcodes a big set of defaults in any new saved
@@ -783,10 +783,10 @@ void load_open_settings(void *sesskey, C
@@ -870,10 +870,10 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "PassiveTelnet", 0, conf, CONF_passive_telnet);
gppi(sesskey, "BackspaceIsDelete", 1, conf, CONF_bksp_is_delete);
gppi(sesskey, "RXVTHomeEnd", 0, conf, CONF_rxvt_homeend);
@ -46,7 +46,7 @@ Index: putty-0.63/settings.c
gppi(sesskey, "NoRemoteResize", 0, conf, CONF_no_remote_resize);
gppi(sesskey, "NoAltScreen", 0, conf, CONF_no_alt_screen);
gppi(sesskey, "NoRemoteWinTitle", 0, conf, CONF_no_remote_wintitle);
@@ -806,9 +806,9 @@ void load_open_settings(void *sesskey, C
@@ -894,9 +894,9 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "ApplicationKeypad", 0, conf, CONF_app_keypad);
gppi(sesskey, "NetHackKeypad", 0, conf, CONF_nethack_keypad);
gppi(sesskey, "AltF4", 1, conf, CONF_alt_f4);
@ -56,9 +56,9 @@ Index: putty-0.63/settings.c
- gppi(sesskey, "ComposeKey", 0, conf, CONF_compose_key);
+ gppi(sesskey, "ComposeKey", 1, conf, CONF_compose_key);
gppi(sesskey, "CtrlAltKeys", 1, conf, CONF_ctrlaltkeys);
gppi(sesskey, "TelnetKey", 0, conf, CONF_telnet_keyboard);
gppi(sesskey, "TelnetRet", 1, conf, CONF_telnet_newline);
@@ -816,12 +816,12 @@ void load_open_settings(void *sesskey, C
#ifdef OSX_META_KEY_CONFIG
gppi(sesskey, "OSXOptionMeta", 1, conf, CONF_osx_option_meta);
@@ -908,12 +908,12 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "LocalEdit", AUTO, conf, CONF_localedit);
gpps(sesskey, "Answerback", "PuTTY", conf, CONF_answerback);
gppi(sesskey, "AlwaysOnTop", 0, conf, CONF_alwaysontop);
@ -74,7 +74,7 @@ Index: putty-0.63/settings.c
/* pedantic compiler tells me I can't use conf, CONF_beep as an int * :-) */
gppi(sesskey, "Beep", 1, conf, CONF_beep);
gppi(sesskey, "BeepInd", 0, conf, CONF_beep_ind);
@@ -855,10 +855,10 @@ void load_open_settings(void *sesskey, C
@@ -947,10 +947,10 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "CRImpliesLF", 0, conf, CONF_crhaslf);
gppi(sesskey, "DisableArabicShaping", 0, conf, CONF_arabicshaping);
gppi(sesskey, "DisableBidi", 0, conf, CONF_bidi);
@ -87,7 +87,7 @@ Index: putty-0.63/settings.c
gppfont(sesskey, "Font", conf, CONF_font);
gppi(sesskey, "FontQuality", FQ_DEFAULT, conf, CONF_font_quality);
gppi(sesskey, "FontVTMode", VT_UNICODE, conf, CONF_vtmode);
@@ -870,11 +870,28 @@ void load_open_settings(void *sesskey, C
@@ -962,11 +962,28 @@ void load_open_settings(void *sesskey, C
for (i = 0; i < 22; i++) {
static const char *const defaults[] = {
@ -121,7 +121,7 @@ Index: putty-0.63/settings.c
};
char buf[20], *buf2;
int c0, c1, c2;
@@ -922,7 +939,7 @@ void load_open_settings(void *sesskey, C
@@ -1014,7 +1031,7 @@ void load_open_settings(void *sesskey, C
* The empty default for LineCodePage will be converted later
* into a plausible default for the locale.
*/
@ -130,23 +130,26 @@ Index: putty-0.63/settings.c
gppi(sesskey, "CJKAmbigWide", 0, conf, CONF_cjk_ambig_wide);
gppi(sesskey, "UTF8Override", 1, conf, CONF_utf8_override);
gpps(sesskey, "Printer", "", conf, CONF_printer);
Index: putty-0.63/unix/gtkwin.c
Index: putty-0.68/unix/unix.h
===================================================================
--- putty-0.63.orig/unix/gtkwin.c 2013-07-20 14:15:10.000000000 +0100
+++ putty-0.63/unix/gtkwin.c 2013-08-06 19:22:45.000000000 +0100
@@ -164,7 +164,7 @@ void connection_fatal(void *frontend, ch
FontSpec *platform_default_fontspec(const char *name)
{
if (!strcmp(name, "Font"))
- return fontspec_new("server:fixed");
+ return fontspec_new("client:Monospace 14");
else
return fontspec_new("");
}
Index: putty-0.63/windows/windefs.c
--- putty-0.68.orig/unix/unix.h
+++ putty-0.68/unix/unix.h
@@ -249,10 +249,6 @@ int so_peercred(int fd, int *pid, int *u
/*
* Default font setting, which can vary depending on NOT_X_WINDOWS.
*/
-#ifdef NOT_X_WINDOWS
-#define DEFAULT_GTK_FONT "client:Monospace 12"
-#else
-#define DEFAULT_GTK_FONT "server:fixed"
-#endif
+#define DEFAULT_GTK_FONT "client:Monospace 14"
#endif
Index: putty-0.68/windows/windefs.c
===================================================================
--- putty-0.63.orig/windows/windefs.c 2011-10-02 12:01:57.000000000 +0100
+++ putty-0.63/windows/windefs.c 2013-08-06 19:23:22.000000000 +0100
--- putty-0.68.orig/windows/windefs.c
+++ putty-0.68/windows/windefs.c
@@ -9,7 +9,7 @@
FontSpec *platform_default_fontspec(const char *name)
{

8
putty.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Mar 15 08:26:13 UTC 2017 - jengelh@inai.de
- Update to new upstream release 0.68
* resolve integer overflow in the ssh_agent_channel_data
[CVE-2017-6542, boo#1029256]
- Drop reproducible.patch, no longer applies
-------------------------------------------------------------------
Tue Mar 8 18:35:39 UTC 2016 - bwiedemann@suse.com

11
putty.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package putty
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: putty
Version: 0.67
Version: 0.68
Release: 0
Summary: GTK-based terminal emulator program
License: MIT
@ -30,7 +30,6 @@ Source: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz
Source2: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.gpg
Source4: %name.keyring
Patch1: putty-03-config.diff
Patch2: reproducible.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ImageMagick
BuildRequires: gtk2-devel
@ -45,7 +44,7 @@ serial console client.
%prep
%setup -q
%patch -P 1 -P 2 -p1
%patch -P 1 -p1
%build
%configure
@ -79,15 +78,11 @@ install -m644 icons/putty-32.png "$b/%_datadir/pixmaps/putty.png"
%check
make check
%if 0%{?suse_version} >= 1140
%post
%desktop_database_post
%endif
%if 0%{?suse_version} >= 1140
%postun
%desktop_database_postun
%endif
%files
%defattr(-,root,root)

17
reproducible.patch
View File

@ -1,17 +0,0 @@
From: Bernhard Wiedemann <bwiedemann@suse.com>
Date: Tue, 8 Mar 2016 19:39:47
# PATCH-FIX-TO-UPSTREAM
Drop build timestamps from png.
--- putty-0.66/icons/mkicon.py.orig 2015-11-07 10:16:40.000000000 +0000
+++ putty-0.66/icons/mkicon.py 2016-03-08 18:34:34.600917451 +0000
@@ -912,7 +912,7 @@
assert minx >= 0 and miny >= 0 and maxx <= width and maxy <= width
block = render(canvas, 0, 0, width, width)
- p = os.popen("convert -depth 8 -size %dx%d rgba:- %s" % (width,width,fname), "w")
+ p = os.popen("convert -strip -depth 8 -size %dx%d rgba:- %s" % (width,width,fname), "w")
assert len(block) == width
for line in block:
assert len(line) == width