From 8c6ef5e35a13a80406e87f8c1ec16259bab0af26 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 21 Oct 2008 07:14:20 +0000
Subject: [PATCH] - load certificates from /etc/ssl/cert.pem

from James Turner (MAINTAINER)
---
 www/dillo/Makefile                  |  3 ++-
 www/dillo/patches/patch-dpi_https_c | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index b2aee459ddf..354c9d19c67 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2008/10/19 08:42:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2008/10/21 07:14:20 ajacoutot Exp $
 
 COMMENT=		fast and light graphical web browser
 
 DISTNAME=		dillo-2.0
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=     	www
 
 HOMEPAGE=		http://www.dillo.org/
diff --git a/www/dillo/patches/patch-dpi_https_c b/www/dillo/patches/patch-dpi_https_c
index 8fb2e299921..0ed4696d506 100644
--- a/www/dillo/patches/patch-dpi_https_c
+++ b/www/dillo/patches/patch-dpi_https_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-dpi_https_c,v 1.1 2008/10/19 08:42:55 ajacoutot Exp $
---- dpi/https.c.orig	Fri Oct 17 07:39:18 2008
-+++ dpi/https.c	Fri Oct 17 07:39:29 2008
+$OpenBSD: patch-dpi_https_c,v 1.2 2008/10/21 07:14:20 ajacoutot Exp $
+--- dpi/https.c.orig	Mon Oct 13 16:49:46 2008
++++ dpi/https.c	Tue Oct 21 09:12:22 2008
 @@ -69,7 +69,6 @@
  
  
@@ -9,3 +9,12 @@ $OpenBSD: patch-dpi_https_c,v 1.1 2008/10/19 08:42:55 ajacoutot Exp $
  #ifdef ENABLE_SSL
  
  #include <openssl/ssl.h>
+@@ -155,7 +154,7 @@ static void yes_ssl_support(void)
+    /*FIXME - provide for sysconfdir variables and such*/
+    if (exit_error == 0){
+       if (SSL_CTX_load_verify_locations(
+-         ssl_context, NULL, "/etc/ssl/certs/" ) == 0){
++         ssl_context, "/etc/ssl/cert.pem", "/etc/ssl/certs/" ) == 0){
+          MSG("Error opening system x509 certificate location\n");
+          exit_error = 1;
+       }