diff --git a/0001-Revert-the-default-for-font-bolding-style.patch b/0001-Revert-the-default-for-font-bolding-style.patch deleted file mode 100644 index 28b3a27..0000000 --- a/0001-Revert-the-default-for-font-bolding-style.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dbc1513565d852397c7d1c189ed23a48aa4fcff7 Mon Sep 17 00:00:00 2001 -From: simon -Date: Wed, 7 Aug 2013 06:22:52 +0000 -Subject: [PATCH] Revert the default for font bolding style back to using - colours rather than fonts. I broke this in r9559 when I added the option for - 'both', because the internal representation got offset by one so as to change - from a boolean to two bitfields and I must have confused myself about what - the default should be. - -git-svn-id: svn://svn.tartarus.org/sgt/putty@10008 cda61777-01e9-0310-a592-d414129be87e ---- - settings.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/settings.c b/settings.c -index 6499686..df24f53 100644 ---- a/settings.c -+++ b/settings.c -@@ -866,7 +866,7 @@ void load_open_settings(void *sesskey, Conf *conf) - gppi(sesskey, "TryPalette", 0, conf, CONF_try_palette); - gppi(sesskey, "ANSIColour", 1, conf, CONF_ansi_colour); - gppi(sesskey, "Xterm256Colour", 1, conf, CONF_xterm_256_colour); -- i = gppi_raw(sesskey, "BoldAsColour", 0); conf_set_int(conf, CONF_bold_style, i+1); -+ i = gppi_raw(sesskey, "BoldAsColour", 1); conf_set_int(conf, CONF_bold_style, i+1); - - for (i = 0; i < 22; i++) { - static const char *const defaults[] = { --- -1.8.2 - diff --git a/putty-0.63.tar.gz b/putty-0.63.tar.gz deleted file mode 100644 index b9c26c1..0000000 --- a/putty-0.63.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81e8eaaf31be7d9a46b4f3fb80d1d9540776f142cd89d0a11f2f8082dc68f8b5 -size 1887913 diff --git a/putty-0.63.tar.gz.RSA b/putty-0.63.tar.gz.RSA deleted file mode 100644 index cd59b03..0000000 Binary files a/putty-0.63.tar.gz.RSA and /dev/null differ diff --git a/putty-0.64.tar.gz b/putty-0.64.tar.gz new file mode 100644 index 0000000..5b97ed6 --- /dev/null +++ b/putty-0.64.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a46c97a184144e3ec2392aca9acc64d062317a3a38b9a5f623a147eda5f3821 +size 1977448 diff --git a/putty-0.64.tar.gz.RSA b/putty-0.64.tar.gz.RSA new file mode 100644 index 0000000..f0c5b41 Binary files /dev/null and b/putty-0.64.tar.gz.RSA differ diff --git a/putty-04-nodate.diff b/putty-04-nodate.diff deleted file mode 100644 index aed9ffb..0000000 --- a/putty-04-nodate.diff +++ /dev/null @@ -1,29 +0,0 @@ - -__DATE__/__TIME__ should not be used; it causes unnecessary -rebuilds in the build service. - ---- - version.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: putty-0.62/version.c -=================================================================== ---- putty-0.62.orig/version.c -+++ putty-0.62/version.c -@@ -30,13 +30,13 @@ char sshver[] = "PuTTY-Prerelease-" STR( - - #elif defined SVN_REV - --char ver[] = "Custom build r" STR(SVN_REV) ", " __DATE__ " " __TIME__; -+char ver[] = "Custom build r" STR(SVN_REV); - char sshver[] = "PuTTY-Custom-r" STR(SVN_REV); - - #else - --char ver[] = "Unidentified build, " __DATE__ " " __TIME__; --char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__; -+char ver[] = "Unidentified build"; -+char sshver[] = "PuTTY-Local"; - - #endif - diff --git a/putty.changes b/putty.changes index aab06bf..9663500 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Mar 2 10:19:15 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 0.64 +* Security fix: PuTTY no longer retains the private half of users' + keys in memory by mistake after authenticating with them. + [bnc#920167] (CVE-2015-2157) +* Support for SSH connection sharing, so that multiple instances of + PuTTY to the same host can share a single SSH connection instead + of all having to log in independently. +* Bug fix: IPv6 literals are handled sensibly throughout the suite, + if you enclose them in square brackets to prevent the colons + being mistaken for a :port suffix. +- Remove 0001-Revert-the-default-for-font-bolding-style.patch + (merged upstream), putty-04-nodate.diff (no longer needed). + ------------------------------------------------------------------- Tue Sep 23 15:43:40 UTC 2014 - jengelh@inai.de diff --git a/putty.spec b/putty.spec index fdc6ae4..e463526 100644 --- a/putty.spec +++ b/putty.spec @@ -1,7 +1,7 @@ # # spec file for package putty # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,19 +17,19 @@ Name: putty -Version: 0.63 +Version: 0.64 Release: 0 Summary: GTK-based terminal emulator program License: MIT Group: System/X11/Utilities Url: http://www.chiark.greenend.org.uk/~sgtatham/putty/ +#Git-Web: http://tartarus.org/~simon-git/gitweb/?p=putty.git +#Git-Clone: git://git.tartarus.org/simon/putty Source: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz Source2: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.RSA Source4: %name.keyring -Patch1: 0001-Revert-the-default-for-font-bolding-style.patch -Patch2: putty-03-config.diff -Patch3: putty-04-nodate.diff +Patch1: putty-03-config.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel BuildRequires: krb5-devel @@ -42,14 +42,14 @@ serial console client. %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -p1 %build %configure make %{?_smp_mflags}; %install -make install DESTDIR="%buildroot"; +%make_install %check make check