[packages/w3m] - egd is gone in openssl 1.1.0 - fixed files - rel 8

[baggins]

commit 0f5b2e094cb7c807a3db2ce5e9a2d03bdf80888c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Sep 21 14:17:40 2018 +0000

    - egd is gone in openssl 1.1.0
    - fixed files
    - rel 8

 openssl.patch | 11 +++++++++++
 w3m.spec      | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/w3m.spec b/w3m.spec
index ff6ef3c..81495ec 100644
--- a/w3m.spec
+++ b/w3m.spec
@@ -7,7 +7,7 @@ Summary(pt_BR.UTF-8):	O w3m é um paginador, mas pode ser usado também como um
 Summary(tr.UTF-8):	Metin ekranda WWW tarayıcı
 Name:		w3m
 Version:	0.5.3
-Release:	7
+Release:	8
 Epoch:		1
 License:	MIT-like
 Group:		Applications/Networking
@@ -20,6 +20,7 @@ Patch3:		%{name}-0.5.2-fix_gcc_error.patch
 Patch4:		%{name}-gc.patch
 Patch5:		format-security.patch
 Patch6:		ac-gettext.patch
+Patch7:		openssl.patch
 URL:		http://w3m.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -91,6 +92,7 @@ na linuksowym framebufferze.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} '/^AC_PROG_CXX$/d' -i configure.ac
 
@@ -132,13 +134,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*.html doc/{README,keymap,menu}.* NEWS
 %attr(755,root,root) %{_bindir}/w3m
 %attr(755,root,root) %{_bindir}/w3mman
-%dir %{_libdir}/w3m
-%attr(755,root,root) %{_libdir}/w3m/inflate
-%attr(755,root,root) %{_libdir}/w3m/xface2xpm
-%dir %{_libdir}/w3m/cgi-bin
-%attr(755,root,root) %{_libdir}/w3m/cgi-bin/*.cgi
-%attr(755,root,root) %{_libdir}/w3m/cgi-bin/w3mbookmark
-%attr(755,root,root) %{_libdir}/w3m/cgi-bin/w3mhelperpanel
+%dir %{_libexecdir}/w3m
+%attr(755,root,root) %{_libexecdir}/w3m/inflate
+%attr(755,root,root) %{_libexecdir}/w3m/xface2xpm
+%dir %{_libexecdir}/w3m/cgi-bin
+%attr(755,root,root) %{_libexecdir}/w3m/cgi-bin/*.cgi
+%attr(755,root,root) %{_libexecdir}/w3m/cgi-bin/w3mbookmark
+%attr(755,root,root) %{_libexecdir}/w3m/cgi-bin/w3mhelperpanel
 %dir %{_datadir}/w3m
 %{_datadir}/w3m/w3mhelp.html
 %{_datadir}/w3m/w3mhelp*en.*
@@ -150,4 +152,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files imgdisplay
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/w3m/w3mimgdisplay
+%attr(755,root,root) %{_libexecdir}/w3m/w3mimgdisplay
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..034e15d
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,11 @@
+--- w3m-0.5.3/config.h.in~	2011-01-04 09:22:19.000000000 +0000
++++ w3m-0.5.3/config.h.in	2018-09-21 14:13:06.628573235 +0000
+@@ -84,7 +84,7 @@
+ #undef INET6
+ #undef HAVE_SOCKLEN_T
+ #undef HAVE_OLD_SS_FAMILY
+-#define USE_EGD
++#undef USE_EGD
+ #define ENABLE_REMOVE_TRAILINGSPACES
+ #undef MENU_THIN_FRAME
+ #undef USE_RAW_SCROLL
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/w3m.git/commitdiff/0f5b2e094cb7c807a3db2ce5e9a2d03bdf80888c