View | Details | Raw Unified | Return to bug 233985 | Differences between
and this patch

Collapse All | Expand All

(-)www/dillo2/Makefile (-3 / +7 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	dillo
4
PORTNAME=	dillo
5
PORTVERSION=	3.0.5
5
PORTVERSION=	3.0.5
6
PORTREVISION=	1
6
CATEGORIES=	www ipv6
7
CATEGORIES=	www ipv6
7
MASTER_SITES=	http://www.dillo.org/download/ LOCAL/bf/dillo/ \
8
MASTER_SITES=	http://www.dillo.org/download/ LOCAL/bf/dillo/ \
8
		TEX_CTAN/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen
9
		TEX_CTAN/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen
Lines 16-25 Link Here
16
LICENSE=	GPLv3+
17
LICENSE=	GPLv3+
17
LICENSE_FILE=	${WRKSRC}/COPYING
18
LICENSE_FILE=	${WRKSRC}/COPYING
18
19
19
LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
20
LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk libpng16.so:graphics/png \
21
		          libfontconfig.so:x11-fonts/fontconfig
20
RUN_DEPENDS=	wget:ftp/wget
22
RUN_DEPENDS=	wget:ftp/wget
21
23
22
USES=		gmake iconv pkgconfig tar:bzip2
24
USES=		gmake iconv jpeg pkgconfig tar:bzip2
25
USE_XORG=x11 xcursor xext xfixes xft xinerama xrender
26
23
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
28
CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
25
CONFLICTS=	dillo-i18n-[0-9]* \
29
CONFLICTS=	dillo-i18n-[0-9]* \
Lines 31-42 Link Here
31
35
32
COOKIES_DESC=		Cookie support
36
COOKIES_DESC=		Cookie support
33
HYPHENATION_DESC=	Hyphenation file(s) for HYPHENATION_LANGS
37
HYPHENATION_DESC=	Hyphenation file(s) for HYPHENATION_LANGS
34
SSL_DESC=		Experimental HTTPS support
35
38
36
SSL_USES=			ssl
39
SSL_USES=			ssl
37
COOKIES_CONFIGURE_ENABLE=	cookies
40
COOKIES_CONFIGURE_ENABLE=	cookies
38
IPV6_CONFIGURE_ENABLE=		ipv6
41
IPV6_CONFIGURE_ENABLE=		ipv6
39
SSL_CONFIGURE_ENABLE=		ssl
42
SSL_CONFIGURE_ENABLE=		ssl
43
SSL_EXTRA_PATCHES=	      ${PATCHDIR}/extra-patches-openssl
40
THREADS_CONFIGURE_ENABLE=	threaded-dns
44
THREADS_CONFIGURE_ENABLE=	threaded-dns
41
45
42
.include <bsd.port.pre.mk>
46
.include <bsd.port.pre.mk>
(-)www/dillo2/distinfo (-4 / +5 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1544764518
1
SHA256 (dillo/dillo-3.0.5.tar.bz2) = db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
2
SHA256 (dillo/dillo-3.0.5.tar.bz2) = db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
2
SIZE (dillo/dillo-3.0.5.tar.bz2) = 734472
3
SIZE (dillo/dillo-3.0.5.tar.bz2) = 734472
3
SHA256 (dillo/hyph-af.pat.txt) = 094be0ccc966cb8a9919abffb4d481566bbc25d62bb182647be9feb431de5b5b
4
SHA256 (dillo/hyph-af.pat.txt) = 094be0ccc966cb8a9919abffb4d481566bbc25d62bb182647be9feb431de5b5b
Lines 18-29 Link Here
18
SIZE (dillo/hyph-cy.pat.txt) = 43100
19
SIZE (dillo/hyph-cy.pat.txt) = 43100
19
SHA256 (dillo/hyph-da.pat.txt) = a093ef99375717fe34d261b05d2fdc8e64f8a9f741578c020204374f4c39a20c
20
SHA256 (dillo/hyph-da.pat.txt) = a093ef99375717fe34d261b05d2fdc8e64f8a9f741578c020204374f4c39a20c
20
SIZE (dillo/hyph-da.pat.txt) = 6153
21
SIZE (dillo/hyph-da.pat.txt) = 6153
21
SHA256 (dillo/hyph-de-1901.pat.txt) = aa18580882fc20cac0b330c04cef10dd023216ae8f2c9b0208afe25aecaed6dd
22
SHA256 (dillo/hyph-de-1901.pat.txt) = 9af55f28b39c5e4b54b5a51424721cfaf431cc15ebe7a666c08f5c23bcb46fc9
22
SIZE (dillo/hyph-de-1901.pat.txt) = 104907
23
SIZE (dillo/hyph-de-1901.pat.txt) = 170329
23
SHA256 (dillo/hyph-de-1996.pat.txt) = 36953568ac154ad587e35159bc4e7e2d084b07f55cbb1a6e83c387f1dd886226
24
SHA256 (dillo/hyph-de-1996.pat.txt) = 36953568ac154ad587e35159bc4e7e2d084b07f55cbb1a6e83c387f1dd886226
24
SIZE (dillo/hyph-de-1996.pat.txt) = 101489
25
SIZE (dillo/hyph-de-1996.pat.txt) = 101489
25
SHA256 (dillo/hyph-de-ch-1901.pat.txt) = 37e836c9d3212e264bbcf0ff77e327d7c48f4f28e246881e4d21e3cdca6c9246
26
SHA256 (dillo/hyph-de-ch-1901.pat.txt) = 5df2c7948174e5734214356a83a6b7a29eb9234379a2b061f026e0dae8aff6ac
26
SIZE (dillo/hyph-de-ch-1901.pat.txt) = 103095
27
SIZE (dillo/hyph-de-ch-1901.pat.txt) = 167577
27
SHA256 (dillo/hyph-el-monoton.pat.txt) = ae58ac05e9c88dcfa6a2ebecb2fd6aebb08c3f36c4bf3c4e96984c0a2a71ad2e
28
SHA256 (dillo/hyph-el-monoton.pat.txt) = ae58ac05e9c88dcfa6a2ebecb2fd6aebb08c3f36c4bf3c4e96984c0a2a71ad2e
28
SIZE (dillo/hyph-el-monoton.pat.txt) = 3905
29
SIZE (dillo/hyph-el-monoton.pat.txt) = 3905
29
SHA256 (dillo/hyph-el-polyton.pat.txt) = ee93362de2e568ec0254dad0595aa79804d1c26815976cace38522f5afac3ff6
30
SHA256 (dillo/hyph-el-polyton.pat.txt) = ee93362de2e568ec0254dad0595aa79804d1c26815976cace38522f5afac3ff6
(-)www/dillo2/files/extra-patches-openssl (+41 lines)
Line 0 Link Here
1
Patches obtained from:
2
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/dillo/patches/
3
4
$NetBSD: patch-configure,v 1.1 2018/03/24 15:40:07 ryoon Exp $
5
6
* Detect OpenSSL 1.1.0
7
8
--- configure.orig	2015-06-30 14:07:22.000000000 +0000
9
+++ configure
10
@@ -6018,11 +6018,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
11
 #ifdef __cplusplus
12
 extern "C"
13
 #endif
14
-char SSL_library_init ();
15
+void OPENSSL_config ();
16
 int
17
 main ()
18
 {
19
-return SSL_library_init ();
20
+OPENSSL_config ();
21
   ;
22
   return 0;
23
 }
24
$NetBSD: patch-dpi_https.c,v 1.1 2018/03/24 15:40:07 ryoon Exp $
25
26
* Support OpenSSL 1.1.0
27
28
--- dpi/https.c.orig	2015-06-30 14:06:08.000000000 +0000
29
+++ dpi/https.c
30
@@ -476,7 +476,11 @@ static int handle_certificate_problem(SS
31
       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
32
          /*Either self signed and untrusted*/
33
          /*Extract CN from certificate name information*/
34
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
35
          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
36
+#else
37
+         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
38
+#endif
39
             strcpy(buf, "(no CN given)");
40
          } else {
41
             char *cn_end;

Return to bug 233985