- 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

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

putty-0.77.tar.gz

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

putty-03-config.diff

@@ -5,15 +5,15 @@
 * Set standard colors and use a more legilible font size.
 
 ---
- settings.c        |   49 +++++++++++++++++++++++++++++++++----------------
+ settings.c               |   49 +++++++++++++++++++++++++++++++----------------
- unix/unix.h       |    6 +-----
+ unix/platform.h          |    6 -----
- windows/windefs.c |    2 +-
+ 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.77.orig/settings.c
-+++ putty-0.73/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.77.orig/unix/platform.h
-+++ putty-0.73/unix/unix.h
++++ putty-0.77/unix/platform.h
-@@ -400,11 +400,7 @@ Socket *make_fd_socket(int infd, int out
+@@ -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.
+  * pty.c.
-Index: putty-0.73/windows/windefs.c
+Index: putty-0.77/windows/utils/defaults.c
 ===================================================================
---- putty-0.73.orig/windows/windefs.c
+--- putty-0.77.orig/windows/utils/defaults.c
-+++ putty-0.73/windows/windefs.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);
  }

putty.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sat May 28 19:42:12 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- 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 <jengelh@inai.de>
 

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"
+# from defs.h: """PuTTY is a security project, so assertions are
-%configure
+# important""" (-DNDEBUG injected by optflags not allowed)
-make %{?_smp_mflags}
+#
-make %{?_smp_mflags} -C icons cicons pngs
+%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 unix/pterm-xpm.c "$b/%_datadir/pixmaps/pterm.xpm"
-install -m644 icons/xpmputty.c "$b/%_datadir/pixmaps/putty.xpm"
+install -m644 unix/putty-xpm.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
 
 %files
-%doc LICENCE doc/*.html
+%license LICENCE
-%doc %_mandir/man*/*
+%doc doc/*.html
+%_mandir/man*/*
 %_bindir/*
 %_datadir/applications/%name.desktop
 %_datadir/pixmaps/*.png