[putty/el5: 16/16] Merge branch 'master' into el5

[tremble]

commit f3cc6bd9b07fe13fa8b82912e53f4d6354bcb402
Merge: a4d0914 5bd6fe0
Author: Mark Chappell <mchappel at redhat.com>
Date:   Wed Sep 17 15:48:04 2014 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	putty.spec

 .gitignore        |    2 +-
 putty-perms.patch |   11 -------
 putty.png         |  Bin 466 -> 0 bytes
 putty.spec        |   85 +++++++++++++++++++++++++++++++++++++++--------------
 sources           |    2 +-
 5 files changed, 65 insertions(+), 35 deletions(-)
---
diff --cc putty.spec
index 27a4496,b100372..53d4fae
--- a/putty.spec
+++ b/putty.spec
@@@ -8,17 -5,11 +5,12 @@@ Summary:	SSH, Telnet and Rlogin clien
  License:	MIT
  Group:		Applications/Internet
  URL:		http://www.chiark.greenend.org.uk/~sgtatham/putty/
- #Source0:	http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz
- # The source for this package was pulled from upstream's vcs.  Use the
- # following commands to generate the tarball:
- #  svn export -r %{svnver} svn://svn.tartarus.org/sgt/putty putty-%{svndate}
- #  tar -cjvf putty-%{svndate}.tar.bz2 putty-%{svndate}
- Source0:	%{name}-%{svndate}.tar.bz2
+ Source0:	http://the.earth.li/~sgtatham/putty/latest/%{name}-%{version}.tar.gz
  Source2:	%{name}.desktop
- Source3:	%{name}.png
- Patch0:		putty-perms.patch
+ # By default create new files as non-executables
  BuildRequires:	gtk2-devel krb5-devel halibut desktop-file-utils
+ BuildRequires:	ImageMagick
 +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %description
  Putty is a SSH, Telnet & Rlogin client - this time for Linux.
@@@ -65,8 -56,56 +57,57 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Thu Sep 16 2010 Mark Chappell <tremble at fedoraproject.org> - 0.60-6.20100910svn.1
- - EL5 Needs a BuildRoot defining
+ * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.63-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Mon Aug 12 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 0.63-1
+ - New version
+   Resolves: rhbz#995610
+ - Dropped perms, CVE-2013-4852, CVE-2013-4206, CVE-2013-4207,
+   CVE-2013-4208 patches (all in upstream)
+ 
+ * Thu Aug  8 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 0.62-7
+ - Fixed a heap-corrupting buffer underrun bug in the modmul function
+   Resolves: CVE-2013-4206
+ - Fixed a buffer overflow vulnerability in the calculation of modular
+   inverses when verifying a DSA signature
+   Resolves: CVE-2013-4207
+ - Fixed problem when private keys are left in memory after being
+   used by PuTTY tools
+   Resolves: CVE-2013-4208
+ 
+ * Mon Aug  5 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 0.62-6
+ - Fixed integer overflow
+   Resolves: CVE-2013-4852
+ - Fixed bogus dates in changelog (best estimated)
+ 
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.62-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.62-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Wed Sep 26 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.62-3
+ - Added missing ImageMagick BuildRequires
+ 
+ * Wed Sep 19 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.62-2
+ - Generated icon from sources
+ 
+ * Tue Aug  7 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 0.62-1
+ - New version
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-9.20100910svn
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.60-8.20100910svn
+ - Rebuild for new libpng
+ 
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-7.20100910svn
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++>>>>>>> master
  
  * Fri Sep 10 2010 Mark Chappell <tremble at fedoraproject.org> - 0.60-6.20100910svn
  - Bump version in line with packaging specs