From 242279f33aecc6f3fa8918ad400ac521c4ce6fcadeaa5c8161cabf2777369b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 3 May 2017 18:10:47 +0000 Subject: [PATCH 1/2] Accepting request 492472 from home:namtrac:branches:X11:Utilities - Update to new upstream release 0.69 * You can now explicitly configure SSH terminal mode settings not to be sent to the server, if your server objects to them. - Switch to gtk+3 interface. OBS-URL: https://build.opensuse.org/request/show/492472 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=34 --- gtk-buildfix.patch | 20 ++++++++++++++++++++ putty-0.68.tar.gz | 3 --- putty-0.68.tar.gz.gpg | Bin 287 -> 0 bytes putty-0.69.tar.gz | 3 +++ putty-0.69.tar.gz.gpg | Bin 0 -> 287 bytes putty-03-config.diff | 38 +++++++++++++++++++------------------- putty.changes | 8 ++++++++ putty.spec | 8 +++++--- 8 files changed, 55 insertions(+), 25 deletions(-) create mode 100644 gtk-buildfix.patch delete mode 100644 putty-0.68.tar.gz delete mode 100644 putty-0.68.tar.gz.gpg create mode 100644 putty-0.69.tar.gz create mode 100644 putty-0.69.tar.gz.gpg diff --git a/gtk-buildfix.patch b/gtk-buildfix.patch new file mode 100644 index 0000000..288a1d8 --- /dev/null +++ b/gtk-buildfix.patch @@ -0,0 +1,20 @@ +X-Git-Url: https://git.tartarus.org/?p=simon%2Fputty.git;a=blobdiff_plain;f=unix%2Fgtkwin.c;h=bca6daa43c2911e7912be8a57131684b7050d541;hp=69e335094c8eaf8546e402c674923da712f1ebd2;hb=230f7d56284a703c65c4fecf7e6f23b791043f81;hpb=fb023da0fdcbfca104b39c2315a79186d7254c99 + +diff --git a/unix/gtkwin.c b/unix/gtkwin.c +index 69e3350..bca6daa 100644 +--- a/unix/gtkwin.c ++++ b/unix/gtkwin.c +@@ -2188,11 +2188,11 @@ void set_gtk_widget_background(GtkWidget *widget, const GdkColor *col) + free(data); + free(col_css); + #else +- if (gtk_widget_get_window(win)) { ++ if (gtk_widget_get_window(widget)) { + /* For GTK1, which doesn't have a 'const' on + * gdk_window_set_background's second parameter type. */ + GdkColor col_mutable = *col; +- gdk_window_set_background(gtk_widget_get_window(win), &col_mutable); ++ gdk_window_set_background(gtk_widget_get_window(widget), &col_mutable); + } + #endif + } diff --git a/putty-0.68.tar.gz b/putty-0.68.tar.gz deleted file mode 100644 index 7a6029f..0000000 --- a/putty-0.68.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c -size 2114499 diff --git a/putty-0.68.tar.gz.gpg b/putty-0.68.tar.gz.gpg deleted file mode 100644 index d64b1f0ec617c4e95302b935f5a0510c9203d61f481f5b27c9f0f2e294a8b342..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0SEvF1p-*8f_?xB2@swBCP=h2G~`zc2mU`>_l2?T+eK|7sMrLr z2Kx=BY$de&k>{BoHYiK#`l@PQ2-JPPR5m2AZx-+r-^(WmWY%Z2DPI7W-jpliNNxZv zNeqqg^S|rl>HW2Xt6&}cIJmMO$NO1)>5WHqt9u$#Y1~DVG<9T78B414WDX;SV zo9X8oDh+_Be&L)_t%|t(6S!enlIwpvD5E06_UvWMkF~!!JP7dr!5uh5mM#I&gLf|v zJ*X+vw<8g%SZ0jm3lR}8RjZaf6*|W4FXcg01!tBJCt|FxQgVq25 diff --git a/putty-0.69.tar.gz b/putty-0.69.tar.gz new file mode 100644 index 0000000..469f3a6 --- /dev/null +++ b/putty-0.69.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1 +size 2122306 diff --git a/putty-0.69.tar.gz.gpg b/putty-0.69.tar.gz.gpg new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..faa3331fb2776d98655a7bfe0b5bcfa1c6039c1f2c9c90318059dadc45a5816b GIT binary patch literal 287 zcmV+)0pR|L0UQJX0SEvF1p-+FSeyU~2@swBCP=h2G~`;m2mf@yRlU8JqdeKhRnM6t zflB=!Qc2o8n$;!;;%IiN#6E*7en7snE(Xap3eQcU4~ zaA`L{bk%yKZOV8M`ftXnxue3~PtVitNaLFVj!Z`m9W0)aA8_BSwoTix-CD9B9PKAU l;JXL&?QVg;nnqXv3c6;cEFwR6w199>)Ocr7Z3vw#o_J1Mfg}I` literal 0 HcmV?d00001 diff --git a/putty-03-config.diff b/putty-03-config.diff index 0e0163c..ce750df 100644 --- a/putty-03-config.diff +++ b/putty-03-config.diff @@ -10,10 +10,10 @@ windows/windefs.c | 2 +- 3 files changed, 36 insertions(+), 23 deletions(-) -Index: putty-0.68/settings.c +Index: putty-0.69/settings.c =================================================================== ---- putty-0.68.orig/settings.c -+++ putty-0.68/settings.c +--- putty-0.69.orig/settings.c ++++ putty-0.69/settings.c @@ -13,8 +13,8 @@ static const struct keyvalwhere cipherna { "aes", CIPHER_AES, -1, -1 }, { "chacha20", CIPHER_CHACHA20, CIPHER_AES, +1 }, @@ -24,16 +24,16 @@ Index: putty-0.68/settings.c { "arcfour", CIPHER_ARCFOUR, -1, -1 }, { "des", CIPHER_DES, -1, -1 } }; -@@ -746,7 +746,7 @@ void load_open_settings(void *sesskey, C +@@ -749,7 +749,7 @@ void load_open_settings(void *sesskey, C } gppi(sesskey, "TCPNoDelay", 1, conf, CONF_tcp_nodelay); gppi(sesskey, "TCPKeepalives", 0, conf, CONF_tcp_keepalives); - gpps(sesskey, "TerminalType", "xterm", conf, CONF_termtype); + gpps(sesskey, "TerminalType", "linux", conf, CONF_termtype); 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 -@@ -870,10 +870,10 @@ void load_open_settings(void *sesskey, C + if (gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) { + /* +@@ -917,10 +917,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.68/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); -@@ -894,9 +894,9 @@ void load_open_settings(void *sesskey, C +@@ -941,9 +941,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); @@ -58,7 +58,7 @@ Index: putty-0.68/settings.c gppi(sesskey, "CtrlAltKeys", 1, conf, CONF_ctrlaltkeys); #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 +@@ -955,12 +955,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.68/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); -@@ -947,10 +947,10 @@ void load_open_settings(void *sesskey, C +@@ -994,10 +994,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.68/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); -@@ -962,11 +962,28 @@ void load_open_settings(void *sesskey, C +@@ -1009,11 +1009,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.68/settings.c }; char buf[20], *buf2; int c0, c1, c2; -@@ -1014,7 +1031,7 @@ void load_open_settings(void *sesskey, C +@@ -1061,7 +1078,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,11 +130,11 @@ Index: putty-0.68/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.68/unix/unix.h +Index: putty-0.69/unix/unix.h =================================================================== ---- 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 +--- putty-0.69.orig/unix/unix.h ++++ putty-0.69/unix/unix.h +@@ -257,10 +257,6 @@ int so_peercred(int fd, int *pid, int *u /* * Default font setting, which can vary depending on NOT_X_WINDOWS. */ @@ -146,10 +146,10 @@ Index: putty-0.68/unix/unix.h +#define DEFAULT_GTK_FONT "client:Monospace 14" #endif -Index: putty-0.68/windows/windefs.c +Index: putty-0.69/windows/windefs.c =================================================================== ---- putty-0.68.orig/windows/windefs.c -+++ putty-0.68/windows/windefs.c +--- putty-0.69.orig/windows/windefs.c ++++ putty-0.69/windows/windefs.c @@ -9,7 +9,7 @@ FontSpec *platform_default_fontspec(const char *name) { diff --git a/putty.changes b/putty.changes index 39c45ea..d713025 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 2 12:11:41 UTC 2017 - idonmez@suse.com + +- Update to new upstream release 0.69 + * You can now explicitly configure SSH terminal mode settings + not to be sent to the server, if your server objects to them. +- Switch to gtk+3 interface. + ------------------------------------------------------------------- Wed Mar 15 08:26:13 UTC 2017 - jengelh@inai.de diff --git a/putty.spec b/putty.spec index 5460dda..2ae38d2 100644 --- a/putty.spec +++ b/putty.spec @@ -17,7 +17,7 @@ Name: putty -Version: 0.68 +Version: 0.69 Release: 0 Summary: GTK-based terminal emulator program License: MIT @@ -30,9 +30,10 @@ 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: gtk-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: krb5-devel BuildRequires: update-desktop-files Conflicts: pssh @@ -44,7 +45,8 @@ serial console client. %prep %setup -q -%patch -P 1 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure From b4ccd21087d3a37f1877b048101f5484aec0bbe7be7242d6ad9314ce418d1324 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 3 May 2017 19:08:42 +0000 Subject: [PATCH 2/2] use native patch format OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=35 --- gtk-buildfix.patch => gtk-buildfix.diff | 15 +++++++++++++-- putty.changes | 2 +- putty.spec | 5 ++--- 3 files changed, 16 insertions(+), 6 deletions(-) rename gtk-buildfix.patch => gtk-buildfix.diff (64%) diff --git a/gtk-buildfix.patch b/gtk-buildfix.diff similarity index 64% rename from gtk-buildfix.patch rename to gtk-buildfix.diff index 288a1d8..2b12d1b 100644 --- a/gtk-buildfix.patch +++ b/gtk-buildfix.diff @@ -1,7 +1,15 @@ -X-Git-Url: https://git.tartarus.org/?p=simon%2Fputty.git;a=blobdiff_plain;f=unix%2Fgtkwin.c;h=bca6daa43c2911e7912be8a57131684b7050d541;hp=69e335094c8eaf8546e402c674923da712f1ebd2;hb=230f7d56284a703c65c4fecf7e6f23b791043f81;hpb=fb023da0fdcbfca104b39c2315a79186d7254c99 +From 230f7d56284a703c65c4fecf7e6f23b791043f81 Mon Sep 17 00:00:00 2001 +From: Zero King +Date: Sun, 30 Apr 2017 11:01:13 +0100 +Subject: [PATCH] Fix thinko introduced in 8833634f4. + +This prevented compilation with Gtk 2. +--- + unix/gtkwin.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unix/gtkwin.c b/unix/gtkwin.c -index 69e3350..bca6daa 100644 +index 69e33509..bca6daa4 100644 --- a/unix/gtkwin.c +++ b/unix/gtkwin.c @@ -2188,11 +2188,11 @@ void set_gtk_widget_background(GtkWidget *widget, const GdkColor *col) @@ -18,3 +26,6 @@ index 69e3350..bca6daa 100644 } #endif } +-- +2.12.2 + diff --git a/putty.changes b/putty.changes index d713025..b8b5817 100644 --- a/putty.changes +++ b/putty.changes @@ -4,7 +4,7 @@ Tue May 2 12:11:41 UTC 2017 - idonmez@suse.com - Update to new upstream release 0.69 * You can now explicitly configure SSH terminal mode settings not to be sent to the server, if your server objects to them. -- Switch to gtk+3 interface. +- Switch to gtk+3 interface, add gtk-buildfix.diff. ------------------------------------------------------------------- Wed Mar 15 08:26:13 UTC 2017 - jengelh@inai.de diff --git a/putty.spec b/putty.spec index 2ae38d2..4bec74a 100644 --- a/putty.spec +++ b/putty.spec @@ -30,7 +30,7 @@ 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: gtk-buildfix.patch +Patch2: gtk-buildfix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick BuildRequires: gtk3-devel @@ -45,8 +45,7 @@ serial console client. %prep %setup -q -%patch1 -p1 -%patch2 -p1 +%patch -P 1 -P 2 -p1 %build %configure