From cc6d35ddcf9266e02c98466f4cc8514be5c9893a09fb4cefd54d4489a880bd59 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 May 2022 19:48:10 +0000 Subject: [PATCH 1/2] - Update to release 0.77 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=72 --- putty-0.76.tar.gz | 3 --- putty-0.76.tar.gz.gpg | Bin 438 -> 0 bytes putty-0.77.tar.gz | 3 +++ putty-0.77.tar.gz.gpg | Bin 0 -> 438 bytes putty-03-config.diff | 48 ++++++++++++++++++++++-------------------- putty.changes | 24 +++++++++++++++++++++ putty.spec | 35 +++++++++++++----------------- 7 files changed, 67 insertions(+), 46 deletions(-) delete mode 100644 putty-0.76.tar.gz delete mode 100644 putty-0.76.tar.gz.gpg create mode 100644 putty-0.77.tar.gz create mode 100644 putty-0.77.tar.gz.gpg diff --git a/putty-0.76.tar.gz b/putty-0.76.tar.gz deleted file mode 100644 index 251d5f8..0000000 --- a/putty-0.76.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f -size 2735687 diff --git a/putty-0.76.tar.gz.gpg b/putty-0.76.tar.gz.gpg deleted file mode 100644 index 21e9ce982e69646bb264a57ef9a094525746813fa8ae18e1dcf8af22caddeb55..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmV;n0ZIOe0kZ@E0SEvc79j-UbCj&3`Pl@OBH&bFiK1Uh=-Pq>0$}p7vH%JR5Mqg< zUrOlOg0emg0MsaFM3kL%jE-P|RHeM<(mU6?Q;ZJf?|YBXZz-8jiHs3DS-Wf4az%$D z^-XQCcI_B)_y{SnJ9_IlCTJ+;lwD=t!@?-eOHpHw^p)zR9CmBok|^{99si-j(+Zf( z>2!$40VpE_3raCNHA1rKNjOgls8RTeN&bv3p9co2s1UlI01o_5-5Lg&9{PZ10U(3U z2{UOm!|Ga&S7e07Tg)n?dFAx8szk2GBLXU5t=W<^rIZ{X{_QM^ZASXQ@=U?hvxOu~ zQ&W^4xrZleNHN#Tsu9-Gto+I=s>hr8`F+&EA^?e8C_#(Xo}yQ}qo8e$EAl?*uk1CD z5GW?~oFp^3;zh6iH40GxX9UInwmsUAp5p_}Hy-iz!=4 g+1^FQ%tfGH0Wy=I@oD6cCa5;{tbzmc*|2_cy_libJpcdz diff --git a/putty-0.77.tar.gz b/putty-0.77.tar.gz new file mode 100644 index 0000000..30b81a2 --- /dev/null +++ b/putty-0.77.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:419a76f45238fd45f2c76b42438993056e74fa78374f136052aaa843085beae5 +size 2619481 diff --git a/putty-0.77.tar.gz.gpg b/putty-0.77.tar.gz.gpg new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..cadc250294e8e08bef321fe9fa8d396151dc56b05186c6e88d19f9725f46e61a GIT binary patch literal 438 zcmV;n0ZIOe0kZ@E0SEvc79j*I_7h9f_j+ZB>(*%G_&%blNfqn`0%DMY9{>so5ajqi zqN+(1>~bg!0J9w19}8z28X!OaBH^jAY})!c?8tYr*UD=BpR~qq?RgyHf8XDx- zkKfmHdRWGS8u|cvyb~L#4*LQfNc=Hms2-q&o`>ZQU6qeswN}`x(gS9zHuT*Zg1cPj zn`}`2Hw~sB%7_Z!FKgXpH>1ips@@4aoqDQWrYucKA|ZYNPkAl7=G=EY-PMP0`UqvY z;lk)EOYGiD9x7EkbIRZ?Qhbh4JIdrClJ4{NA)AD#OHyTEP;gx1?w*D&vx}JUME);g ze~^2foutcl$7qthx+EK+e7xYFkchxPj(p#5u?DOzRrgo*ltdi1jvoDTWHBSUw}0$E zkD)}9Xph5HlwvMvqUJo|yoY(}62qpV+I2=HWB(xypw=fS@g%2TkT7gO`($W-JYcIVxFmX2hWkbGt5tTwe$2Z6Xg3?ozxW-ri7ayYpf&U+d0 gEwJCmrtb}QJA(&kHhw3PeOv-?2iEs}>rC#jkP*1oJ^%m! literal 0 HcmV?d00001 diff --git a/putty-03-config.diff b/putty-03-config.diff index 1afa154..af92719 100644 --- a/putty-03-config.diff +++ b/putty-03-config.diff @@ -5,15 +5,15 @@ * Set standard colors and use a more legilible font size. --- - settings.c | 49 +++++++++++++++++++++++++++++++++---------------- - unix/unix.h | 6 +----- - windows/windefs.c | 2 +- + settings.c | 49 +++++++++++++++++++++++++++++++---------------- + unix/platform.h | 6 ----- + windows/utils/defaults.c | 2 - 3 files changed, 35 insertions(+), 22 deletions(-) -Index: putty-0.73/settings.c +Index: putty-0.77/settings.c =================================================================== ---- putty-0.73.orig/settings.c -+++ putty-0.73/settings.c +--- putty-0.77.orig/settings.c ++++ putty-0.77/settings.c @@ -17,8 +17,8 @@ static const struct keyvalwhere ciphernames[] = { { "aes", CIPHER_AES, -1, -1 }, @@ -24,7 +24,7 @@ Index: putty-0.73/settings.c { "des", CIPHER_DES, -1, -1 }, { "blowfish", CIPHER_BLOWFISH, -1, -1 }, { "arcfour", CIPHER_ARCFOUR, -1, -1 }, -@@ -847,7 +847,7 @@ void load_open_settings(settings_r *sess +@@ -862,7 +862,7 @@ void load_open_settings(settings_r *sess } gppb(sesskey, "TCPNoDelay", true, conf, CONF_tcp_nodelay); gppb(sesskey, "TCPKeepalives", false, conf, CONF_tcp_keepalives); @@ -33,12 +33,14 @@ Index: putty-0.73/settings.c gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed); if (gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) { /* -@@ -1029,10 +1029,10 @@ void load_open_settings(settings_r *sess +@@ -1046,12 +1046,12 @@ void load_open_settings(settings_r *sess gppb(sesskey, "PassiveTelnet", false, conf, CONF_passive_telnet); gppb(sesskey, "BackspaceIsDelete", true, conf, CONF_bksp_is_delete); gppb(sesskey, "RXVTHomeEnd", false, conf, CONF_rxvt_homeend); - gppi(sesskey, "LinuxFunctionKeys", 0, conf, CONF_funky_type); + gppi(sesskey, "LinuxFunctionKeys", true, conf, CONF_funky_type); + gppi(sesskey, "ShiftedArrowKeys", SHARROW_APPLICATION, conf, + CONF_sharrow_type); gppb(sesskey, "NoApplicationKeys", false, conf, CONF_no_applic_k); gppb(sesskey, "NoApplicationCursors", false, conf, CONF_no_applic_c); - gppb(sesskey, "NoMouseReporting", false, conf, CONF_no_mouse_rep); @@ -46,7 +48,7 @@ Index: putty-0.73/settings.c gppb(sesskey, "NoRemoteResize", false, conf, CONF_no_remote_resize); gppb(sesskey, "NoAltScreen", false, conf, CONF_no_alt_screen); gppb(sesskey, "NoRemoteWinTitle", false, conf, CONF_no_remote_wintitle); -@@ -1054,9 +1054,9 @@ void load_open_settings(settings_r *sess +@@ -1073,9 +1073,9 @@ void load_open_settings(settings_r *sess gppb(sesskey, "ApplicationKeypad", false, conf, CONF_app_keypad); gppb(sesskey, "NetHackKeypad", false, conf, CONF_nethack_keypad); gppb(sesskey, "AltF4", true, conf, CONF_alt_f4); @@ -58,7 +60,7 @@ Index: putty-0.73/settings.c gppb(sesskey, "CtrlAltKeys", true, conf, CONF_ctrlaltkeys); #ifdef OSX_META_KEY_CONFIG gppb(sesskey, "OSXOptionMeta", true, conf, CONF_osx_option_meta); -@@ -1068,12 +1068,12 @@ void load_open_settings(settings_r *sess +@@ -1087,12 +1087,12 @@ void load_open_settings(settings_r *sess gppi(sesskey, "LocalEdit", AUTO, conf, CONF_localedit); gpps(sesskey, "Answerback", "PuTTY", conf, CONF_answerback); gppb(sesskey, "AlwaysOnTop", false, conf, CONF_alwaysontop); @@ -73,7 +75,7 @@ Index: putty-0.73/settings.c gppb(sesskey, "BlinkCur", false, conf, CONF_blink_cur); /* pedantic compiler tells me I can't use conf, CONF_beep as an int * :-) */ gppi(sesskey, "Beep", 1, conf, CONF_beep); -@@ -1108,10 +1108,10 @@ void load_open_settings(settings_r *sess +@@ -1127,10 +1127,10 @@ void load_open_settings(settings_r *sess gppb(sesskey, "CRImpliesLF", false, conf, CONF_crhaslf); gppb(sesskey, "DisableArabicShaping", false, conf, CONF_no_arabicshaping); gppb(sesskey, "DisableBidi", false, conf, CONF_no_bidi); @@ -86,7 +88,7 @@ Index: putty-0.73/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); -@@ -1124,11 +1124,28 @@ void load_open_settings(settings_r *sess +@@ -1143,11 +1143,28 @@ void load_open_settings(settings_r *sess for (i = 0; i < 22; i++) { static const char *const defaults[] = { @@ -120,7 +122,7 @@ Index: putty-0.73/settings.c }; char buf[20], *buf2; int c0, c1, c2; -@@ -1186,7 +1203,7 @@ void load_open_settings(settings_r *sess +@@ -1205,7 +1222,7 @@ void load_open_settings(settings_r *sess * The empty default for LineCodePage will be converted later * into a plausible default for the locale. */ @@ -129,11 +131,11 @@ Index: putty-0.73/settings.c gppb(sesskey, "CJKAmbigWide", false, conf, CONF_cjk_ambig_wide); gppb(sesskey, "UTF8Override", true, conf, CONF_utf8_override); gpps(sesskey, "Printer", "", conf, CONF_printer); -Index: putty-0.73/unix/unix.h +Index: putty-0.77/unix/platform.h =================================================================== ---- putty-0.73.orig/unix/unix.h -+++ putty-0.73/unix/unix.h -@@ -400,11 +400,7 @@ Socket *make_fd_socket(int infd, int out +--- putty-0.77.orig/unix/platform.h ++++ putty-0.77/unix/platform.h +@@ -389,11 +389,7 @@ void setup_fd_socket(Socket *s, int infd /* * Default font setting, which can vary depending on NOT_X_WINDOWS. */ @@ -142,20 +144,20 @@ Index: putty-0.73/unix/unix.h -#else -#define DEFAULT_GTK_FONT "server:fixed" -#endif -+#define DEFAULT_GTK_FONT "client:Monospace 14" ++#define DEFAULT_GTK_FONT "client:Monospace 16" /* - * uxpty.c. -Index: putty-0.73/windows/windefs.c + * pty.c. +Index: putty-0.77/windows/utils/defaults.c =================================================================== ---- putty-0.73.orig/windows/windefs.c -+++ putty-0.73/windows/windefs.c +--- putty-0.77.orig/windows/utils/defaults.c ++++ putty-0.77/windows/utils/defaults.c @@ -9,7 +9,7 @@ FontSpec *platform_default_fontspec(const char *name) { if (!strcmp(name, "Font")) - return fontspec_new("Courier New", false, 10, ANSI_CHARSET); -+ return fontspec_new("Consolas", false, 14, ANSI_CHARSET); ++ return fontspec_new("Consolas", false, 16, ANSI_CHARSET); else return fontspec_new("", false, 0, 0); } diff --git a/putty.changes b/putty.changes index c450f1c..e631a1f 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat May 28 19:42:12 UTC 2022 - Jan Engelhardt + +- Update to release 0.77 + * Major improvements to network proxy support: + * Support for interactively prompting the user if the proxy + server requires authentication. + * Built-in support for proxying via another SSH server, so that + PuTTY will SSH to the proxy and then automatically forward a + port through it to the destination host. (Similar to running + plink -nc as a subprocess, but more convenient to set up, and + allows you to answer interactive prompts presented by the + proxy.) + * Support for HTTP Digest authentication, when talking to HTTP + proxies. + * New configuration options for keyboard handling: + * Option to control handling of Shift + arrow keys + * Extra mode in the function-keys option, for modern xterm + (v216 and above). + * Crypto update: added side-channel resistance in probabilistic + RSA key generation. + * Crypto update: retired the use of short Diffie-Hellman + exponents. + ------------------------------------------------------------------- Sun Jul 18 22:20:49 UTC 2021 - Jan Engelhardt diff --git a/putty.spec b/putty.spec index 96b4724..33a14eb 100644 --- a/putty.spec +++ b/putty.spec @@ -1,7 +1,7 @@ # # spec file for package putty # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # 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.76 +Version: 0.77 Release: 0 Summary: SSH client with optional GTK-based terminal emulator frontend License: MIT @@ -32,13 +32,10 @@ Source4: %name.keyring Patch1: putty-03-config.diff Patch2: reproducible.patch BuildRequires: ImageMagick +BuildRequires: cmake BuildRequires: gtk3-devel BuildRequires: krb5-devel -%if 0%{?suse_version} < 1500 BuildRequires: python3-base -%else -BuildRequires: python-base -%endif BuildRequires: update-desktop-files Conflicts: pssh @@ -55,13 +52,15 @@ openssh, and "putty" is the program that combines both in one. %autosetup -p1 %build -export CFLAGS="%optflags -Wno-error" -%configure -make %{?_smp_mflags} -make %{?_smp_mflags} -C icons cicons pngs +# from defs.h: """PuTTY is a security project, so assertions are +# important""" (-DNDEBUG injected by optflags not allowed) +# +%cmake -DCMAKE_C_FLAGS:STRING="%optflags -UNDEBUG" +%cmake_build +#make_build -C icons cicons pngs %install -%make_install +%cmake_install b="%buildroot" mkdir -p "$b/%_datadir/applications/" cat >"$b/%_datadir/applications/%name.desktop" <<-EOF @@ -79,17 +78,13 @@ EOF %suse_update_desktop_file -n %name mkdir -p "$b/%_datadir/pixmaps/" -install -m644 icons/xpmpterm.c "$b/%_datadir/pixmaps/pterm.xpm" -install -m644 icons/xpmputty.c "$b/%_datadir/pixmaps/putty.xpm" -install -m644 icons/pterm-32.png "$b/%_datadir/pixmaps/pterm.png" -install -m644 icons/putty-32.png "$b/%_datadir/pixmaps/putty.png" - -%check -make check +install -m644 unix/pterm-xpm.c "$b/%_datadir/pixmaps/pterm.xpm" +install -m644 unix/putty-xpm.c "$b/%_datadir/pixmaps/putty.xpm" %files -%doc LICENCE doc/*.html -%doc %_mandir/man*/* +%license LICENCE +%doc doc/*.html +%_mandir/man*/* %_bindir/* %_datadir/applications/%name.desktop %_datadir/pixmaps/*.png From 70bf61d4737f03b7979b76228401d44b2b7a30ea88383129c6ea117dabf8a54b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 May 2022 20:08:09 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=73 --- putty.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/putty.spec b/putty.spec index 33a14eb..e44c905 100644 --- a/putty.spec +++ b/putty.spec @@ -52,12 +52,13 @@ openssh, and "putty" is the program that combines both in one. %autosetup -p1 %build +make -C icons cicons pngs +# # from defs.h: """PuTTY is a security project, so assertions are # important""" (-DNDEBUG injected by optflags not allowed) # %cmake -DCMAKE_C_FLAGS:STRING="%optflags -UNDEBUG" %cmake_build -#make_build -C icons cicons pngs %install %cmake_install @@ -78,12 +79,14 @@ EOF %suse_update_desktop_file -n %name mkdir -p "$b/%_datadir/pixmaps/" -install -m644 unix/pterm-xpm.c "$b/%_datadir/pixmaps/pterm.xpm" -install -m644 unix/putty-xpm.c "$b/%_datadir/pixmaps/putty.xpm" +install -m644 icons/xpmpterm.c "$b/%_datadir/pixmaps/pterm.xpm" +install -m644 icons/xpmputty.c "$b/%_datadir/pixmaps/putty.xpm" +install -m644 icons/pterm-32.png "$b/%_datadir/pixmaps/pterm.png" +install -m644 icons/putty-32.png "$b/%_datadir/pixmaps/putty.png" %files %license LICENCE -%doc doc/*.html +%doc doc/*.but %_mandir/man*/* %_bindir/* %_datadir/applications/%name.desktop