1 |
commit: 9489ea43e91dbe22e609e7029759defc6b7ffe8b |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 9 11:43:47 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 11:45:15 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9489ea43 |
7 |
|
8 |
www-client/dillo: Fix compiling against >dev-libs/openssl-1.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
11 |
Closes: https://bugs.gentoo.org/708732 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
www-client/dillo/dillo-3.0.5-r3.ebuild | 70 ++++++++++++++++++++++ |
15 |
.../dillo/files/dillo-3.0.5-openssl-1.1.patch | 26 ++++++++ |
16 |
2 files changed, 96 insertions(+) |
17 |
|
18 |
diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild |
19 |
new file mode 100644 |
20 |
index 00000000000..f2cd65be706 |
21 |
--- /dev/null |
22 |
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild |
23 |
@@ -0,0 +1,70 @@ |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+EAPI=7 |
28 |
+inherit autotools desktop multilib toolchain-funcs |
29 |
+ |
30 |
+DESCRIPTION="Lean FLTK based web browser" |
31 |
+HOMEPAGE="https://www.dillo.org/" |
32 |
+SRC_URI=" |
33 |
+ https://www.dillo.org/download/${P}.tar.bz2 |
34 |
+ mirror://gentoo/${PN}.png |
35 |
+" |
36 |
+ |
37 |
+LICENSE="GPL-3" |
38 |
+SLOT="0" |
39 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" |
40 |
+IUSE="doc +gif ipv6 +jpeg libressl +png ssl" |
41 |
+ |
42 |
+RDEPEND=" |
43 |
+ >=x11-libs/fltk-1.3 |
44 |
+ sys-libs/zlib |
45 |
+ jpeg? ( virtual/jpeg:0 ) |
46 |
+ png? ( >=media-libs/libpng-1.2:0 ) |
47 |
+ ssl? ( |
48 |
+ !libressl? ( dev-libs/openssl:0= ) |
49 |
+ libressl? ( dev-libs/libressl ) |
50 |
+ ) |
51 |
+" |
52 |
+BDEPEND=" |
53 |
+ ${RDEPEND} |
54 |
+ doc? ( app-doc/doxygen ) |
55 |
+" |
56 |
+PATCHES=( |
57 |
+ "${FILESDIR}"/${PN}2-inbuf.patch |
58 |
+ "${FILESDIR}"/${PN}-3.0.5-fno-common.patch |
59 |
+ "${FILESDIR}"/${PN}-3.0.5-openssl-1.1.patch |
60 |
+) |
61 |
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" |
62 |
+ |
63 |
+src_prepare() { |
64 |
+ default |
65 |
+ eautoreconf |
66 |
+} |
67 |
+ |
68 |
+src_configure() { |
69 |
+ econf \ |
70 |
+ $(use_enable gif) \ |
71 |
+ $(use_enable ipv6) \ |
72 |
+ $(use_enable jpeg) \ |
73 |
+ $(use_enable png) \ |
74 |
+ $(use_enable ssl) \ |
75 |
+ --docdir="/usr/share/doc/${PF}" |
76 |
+} |
77 |
+ |
78 |
+src_compile() { |
79 |
+ emake AR=$(tc-getAR) |
80 |
+ if use doc; then |
81 |
+ doxygen Doxyfile || die |
82 |
+ fi |
83 |
+} |
84 |
+ |
85 |
+src_install() { |
86 |
+ dodir /etc |
87 |
+ default |
88 |
+ |
89 |
+ use doc && dodoc -r html |
90 |
+ |
91 |
+ doicon "${DISTDIR}"/${PN}.png |
92 |
+ make_desktop_entry ${PN} Dillo |
93 |
+} |
94 |
|
95 |
diff --git a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch |
96 |
new file mode 100644 |
97 |
index 00000000000..f21694113c2 |
98 |
--- /dev/null |
99 |
+++ b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch |
100 |
@@ -0,0 +1,26 @@ |
101 |
+--- a/configure.ac |
102 |
++++ b/configure.ac |
103 |
+@@ -286,7 +286,7 @@ |
104 |
+ |
105 |
+ if test "x$ssl_ok" = "xyes"; then |
106 |
+ old_libs="$LIBS" |
107 |
+- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto) |
108 |
++ AC_CHECK_LIB(ssl, OPENSSL_config, ssl_ok=yes, ssl_ok=no, -lcrypto) |
109 |
+ LIBS="$old_libs" |
110 |
+ fi |
111 |
+ |
112 |
+--- a/dpi/https.c |
113 |
++++ b/dpi/https.c |
114 |
+@@ -476,7 +476,11 @@ |
115 |
+ case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: |
116 |
+ /*Either self signed and untrusted*/ |
117 |
+ /*Extract CN from certificate name information*/ |
118 |
++#if OPENSSL_VERSION_NUMBER < 0x10100000L |
119 |
+ if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) { |
120 |
++#else |
121 |
++ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) { |
122 |
++#endif |
123 |
+ strcpy(buf, "(no CN given)"); |
124 |
+ } else { |
125 |
+ char *cn_end; |
126 |
+ |