From 66125575b659044ed5b3b5e0754862de1f7741a3480b33b3fc0b805e2f14db23 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 8 Mar 2016 17:38:57 +0000 Subject: [PATCH 1/3] putty-0.67 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=28 --- putty-0.66.tar.gz | 3 --- putty-0.66.tar.gz.gpg | Bin 287 -> 0 bytes putty-0.67.tar.gz | 3 +++ putty-0.67.tar.gz.gpg | Bin 0 -> 287 bytes putty.changes | 6 ++++++ putty.spec | 4 ++-- 6 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 putty-0.66.tar.gz delete mode 100644 putty-0.66.tar.gz.gpg create mode 100644 putty-0.67.tar.gz create mode 100644 putty-0.67.tar.gz.gpg diff --git a/putty-0.66.tar.gz b/putty-0.66.tar.gz deleted file mode 100644 index c1c2565..0000000 --- a/putty-0.66.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe7312f66c54865868b362f4b79bd1fbe7ce9e8b1fd504b04034182db1f32993 -size 1948323 diff --git a/putty-0.66.tar.gz.gpg b/putty-0.66.tar.gz.gpg deleted file mode 100644 index c6c4853410d1f627fc05b257dc889c26d81b20bda03fee43fabff3394fb48289..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0SEvF1p-z*(klQ82@swBCP=h2G~_o#2mKUcwe-{NpUB>_zPx+e zeG)imm^bkYTxQW4!9|I&>&0Ap0;Lu~k|a~K=GZBG_q7HL=1p7bp_z6(!xB8xJ&+38 zbV<~Dq20mI5zw)!{kZq7~w{#PzF;X=e{77AtX-SeRKzdd|Zr$ zS53Ck06AfdR~c`b8=s5RoUvXrz6y~33xM;RyjR@u^QT%Tjs2HsluyQ+)*p*evb6Gl lzl3&9k|i4C-Ib|r1B6?+W#~yz`RT#uvpy)j%&RhDB@oyTi>Lqq diff --git a/putty-0.67.tar.gz b/putty-0.67.tar.gz new file mode 100644 index 0000000..a32e56c --- /dev/null +++ b/putty-0.67.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80192458e8a46229de512afeca5c757dd8fce09606b3c992fbaeeee29b994a47 +size 1955547 diff --git a/putty-0.67.tar.gz.gpg b/putty-0.67.tar.gz.gpg new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..2bfe2b29b2c81bdd5381858ecf9a40df6dfdd52fa2510fff50b8491bae0cc9db GIT binary patch literal 287 zcmV+)0pR|L0UQJX0SEvF1p-#umiGV(2@swBCP=h2G~_nv2mrCtd^KAHS!v>mM9?cT z>TghUw(9tti+y_$fT49;+hSkvH|($*GqmDguo;XbG*;TEU?-U?4{)d*V5`2KOL&SV75>FLZ)UpB$vEHLfn@zeDf-BIHqNRDL%)VD6hFY*GWQ3sA_VKzL zZcW#x{;kK~woZ8rOV2qB`g630A>9E5<_1nk1yUbSQkJVg9vMZ@1c7sA- zk;sY0WRpV26!t!MIB*?QF+NY_W)F~w^fV83w{{ciN>so~Za634Byj^d%@7RqwxZG` lo1Bp_KWH$&Z;yOi(_?(2>v=x)(t_!2lfD$0+Y4;F$tb~3iHHCI literal 0 HcmV?d00001 diff --git a/putty.changes b/putty.changes index b65ac07..8768c51 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 8 16:43:24 UTC 2016 - jengelh@inai.de + +- Update to new upstream release 0.67 +* resolved a security issue with the PSCP protocol implementation + ------------------------------------------------------------------- Mon Nov 9 08:47:47 UTC 2015 - jengelh@inai.de diff --git a/putty.spec b/putty.spec index 5bc47bb..93a84dc 100644 --- a/putty.spec +++ b/putty.spec @@ -1,7 +1,7 @@ # # spec file for package putty # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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.66 +Version: 0.67 Release: 0 Summary: GTK-based terminal emulator program License: MIT From d4e18187e47675ba0d756cf5b5b2cc05b39c2a97a4656b4e04aa65a232f61881 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 8 Mar 2016 18:41:07 +0000 Subject: [PATCH 2/3] Accepting request 368646 from home:bmwiedemann:branches:X11:Utilities Add reproducible.patch to fix build-compare OBS-URL: https://build.opensuse.org/request/show/368646 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=29 --- putty.changes | 5 +++++ putty.spec | 3 +++ reproducible.patch | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 reproducible.patch diff --git a/putty.changes b/putty.changes index 8768c51..d7168da 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 8 18:35:39 UTC 2016 - bwiedemann@suse.com + +- Add reproducible.patch to fix build-compare + ------------------------------------------------------------------- Tue Mar 8 16:43:24 UTC 2016 - jengelh@inai.de diff --git a/putty.spec b/putty.spec index 93a84dc..961e9fc 100644 --- a/putty.spec +++ b/putty.spec @@ -30,6 +30,8 @@ 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 +# PATCH-FIX-TO-UPSTREAM: bmwiedemann -- drop build timestamps from png +Patch2: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick BuildRequires: gtk2-devel @@ -45,6 +47,7 @@ serial console client. %prep %setup -q %patch -P 1 -p1 +%patch2 -p1 %build %configure diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..8b88948 --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,11 @@ +--- 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 From c2c43cde807c435c0a29269fad121ea0d006f95b623fd55270a56e23f6aa6d82 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 8 Mar 2016 19:27:46 +0000 Subject: [PATCH 3/3] patch metadata goes into the patch OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=30 --- putty.spec | 4 +--- reproducible.patch | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/putty.spec b/putty.spec index 961e9fc..c4dca2d 100644 --- a/putty.spec +++ b/putty.spec @@ -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 -# PATCH-FIX-TO-UPSTREAM: bmwiedemann -- drop build timestamps from png Patch2: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick @@ -46,8 +45,7 @@ serial console client. %prep %setup -q -%patch -P 1 -p1 -%patch2 -p1 +%patch -P 1 -P 2 -p1 %build %configure diff --git a/reproducible.patch b/reproducible.patch index 8b88948..0a41f90 100644 --- a/reproducible.patch +++ b/reproducible.patch @@ -1,3 +1,9 @@ +From: Bernhard Wiedemann +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 @@