[w3m/f15] Resolves: rh#707994-[abrt] openSocket: Process /usr/bin/w3m was killed by signal 11 (SIGSEGV)

[pnemade]

commit 38d310918352935a8451b82ece566cc11c523436
Author: Parag Nemade <pnemade at redhat.com>
Date:   Wed Nov 9 12:28:38 2011 +0530

    Resolves: rh#707994-[abrt] openSocket: Process /usr/bin/w3m was killed by signal 11 (SIGSEGV)

 rh707994-fix-https-segfault.patch |   17 ++++++++++++++
 sources                           |    2 +-
 w3m.spec                          |   43 +++++++++++++++++++++++++------------
 3 files changed, 47 insertions(+), 15 deletions(-)
---
diff --git a/rh707994-fix-https-segfault.patch b/rh707994-fix-https-segfault.patch
new file mode 100644
index 0000000..0cadcfe
--- /dev/null
+++ b/rh707994-fix-https-segfault.patch
@@ -0,0 +1,17 @@
+--- url.c.old	2011-01-04 14:52:24.000000000 +0530
++++ url.c	2011-09-02 18:25:43.305652690 +0530
+@@ -82,11 +82,11 @@
+     {"ftp", SCM_FTP},
+     {"local", SCM_LOCAL},
+     {"file", SCM_LOCAL},
+-    /*  {"exec", SCM_EXEC}, */
++    {"exec", SCM_EXEC}, 
+     {"nntp", SCM_NNTP},
+-    /*  {"nntp", SCM_NNTP_GROUP}, */
++    {"nntp", SCM_NNTP_GROUP}, 
+     {"news", SCM_NEWS},
+-    /*  {"news", SCM_NEWS_GROUP}, */
++    {"news", SCM_NEWS_GROUP}, 
+     {"data", SCM_DATA},
+ #ifndef USE_W3MMAILER
+     {"mailto", SCM_MAILTO},
diff --git a/sources b/sources
index 9798143..2bc85d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba06992d3207666ed1bf2dcf7c72bf58  w3m-0.5.2.tar.gz
+1b845a983a50b8dec0169ac48479eacc  w3m-0.5.3.tar.gz
diff --git a/w3m.spec b/w3m.spec
index 3f14975..e56facd 100644
--- a/w3m.spec
+++ b/w3m.spec
@@ -4,8 +4,8 @@
 %define   with_utf8 1
 
 Name:     w3m
-Version:  0.5.2
-Release:  20%{?dist}
+Version:  0.5.3
+Release:  2%{?dist}
 License:  MIT
 URL:      http://w3m.sourceforge.net/
 BuildRequires:  bzip2 findutils sed ncurses-devel
@@ -32,12 +32,11 @@ Source14:  filter-requires-w3m.sh
 ## fix patch
 Patch0:  w3m-0.4.1-helpcharset.patch
 Patch1:  w3m-0.5.1-gcc4.patch
-Patch2:  w3m-0.5.2-multilib.patch
-Patch3:  bug_555467_FTBFS.patch
-Patch4:  bug_566101_Fix-DSO-X11.patch
-Patch5:  w3m-0.5.2-nulcn.patch
-Patch6:  w3m-0.5.2-ssl_verify_server_on.patch
-Patch7:  w3m-0.5.2-fix_version_in_manpage.patch
+Patch2:  bug_555467_FTBFS.patch
+Patch3:  bug_566101_Fix-DSO-X11.patch
+Patch4:  w3m-0.5.2-ssl_verify_server_on.patch
+Patch5:  w3m-0.5.2-fix_gcc_error.patch
+Patch6:  rh707994-fix-https-segfault.patch
 
 Summary:  A pager with Web browsing abilities
 Group:    Applications/Internet
@@ -74,12 +73,11 @@ chmod 755 doc-jp
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 %patch3 -p0
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p0
+%patch6 -p0
 
 %if %{with_utf8}
 pushd doc-jp
@@ -101,6 +99,15 @@ done
 popd
 %endif
 
+pushd doc
+# Convert to utf-8
+for file in README.m17n README.cookie; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+popd
+
 %build
 %configure  %{build_options} \
     %{?_without_nntp:--disable-nntp} \
@@ -121,12 +128,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/w3m
 install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/w3m/config
 
 rm -f doc*/w3m.1
+rm -rf doc/CVS doc-jp/CVS
 
 %find_lang w3m
 
 
 %files -f w3m.lang
-%defattr(-, root, root, -)
 %doc NEWS
 %doc doc
 %lang(ja) %doc doc-jp
@@ -140,10 +147,18 @@ rm -f doc*/w3m.1
 %exclude %{_libexecdir}/w3m/w3mimgdisplay
 
 %files img
-%defattr(-, root, root,-)
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Mon Sep 05 2011 Parag <pnemade AT redhat DOT com> - 0.5.3-2
+- Resolves: rh#707994-[abrt] openSocket: Process /usr/bin/w3m was killed by signal 11 (SIGSEGV) 
+
+* Mon Aug 08 2011 Parag <pnemade AT redhat DOT com> - 0.5.3-1
+- update to 0.5.3 upstream release 
+
+* Mon Jun 27 2011 Parag <pnemade AT redhat DOT com> - 0.5.2-21
+- Resolves:rh#716155-FTBFS w3m-0.5.2-20.fc15
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild