pkg/44683: Bacula-5.0.3 won't compile on DragonFly BSD 2.8.2

[csg%ocmulgeeemc.com@localhost]

>Number:         44683
>Category:       pkg
>Synopsis:       Bacula-5.0.3 won't compile on DragonFly BSD 2.8.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Mar 04 22:50:00 +0000 2011
>Originator:     Michael Roland
>Release:        DragonFly BSD v2.8.2-RELEASE
>Organization:
Ocmulgee EMC
>Environment:
DragonFly arum.ocmulgeeemc.com 2.8-RELEASE DragonFly v2.8.2-RELEASE #2: Fri Oct 
29 01:29:56 PDT 2010     
dillon%office1.backplane.com@localhost:/usr/obj/usr/src-misc/sys/GENERIC  i386

>Description:
In pgksrc-2010Q4, the Bacula-5.0.3 compile generates this error message:

Compiling tls.c
tls.c: In function 'bool tls_postconnect_verify_host(JCR*, TLS_CONNECTION*, cons
t char*)':
tls.c:333: error: invalid conversion from 'const X509V3_EXT_METHOD*' to 'X509V3_
EXT_METHOD*'
*** Error code 1

This error occurs when compiling Bacula with OpenSSL version 1.0.0 or higher. 
Patch-ad in the patches directory contains a patch for the tls.c file that 
corrects the error. However, the patch seems to check for an OpenSSL version 
higher than 1.0.0. DragonFly BSD 2.8.2 uses OpenSSL 1.0.0a, so the patch has no 
effect. Looking at Linux and BSD forums where this same problem is described, 
it looks like patch-ad should check for OPENSSL_VERSION_NUMBER >= 0x10000000L 
instead of 0x10100000L.

Changing the OpenSSL version check to 0x10000000L makes Bacula compile 
successfully.
>How-To-Repeat:
Install pkgsrc-2010Q4.
cd /usr/pkgsrc/sysutils/bacula
bmake
>Fix:
In patch-ad, change the OPENSSL_VERSION_NUMBER from 0x10100000L to 0x10000000L. 
Run make distinfo to update the patch file checksums.

$NetBSD: patch-ad,v 1.4 2010/05/25 06:47:31 adam Exp $

--- src/lib/tls.c.orig  2010-04-27 19:58:29.000000000 +0000
+++ src/lib/tls.c
@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));

          if (strcmp(extname, "subjectAltName") == 0) {
-#ifdef HAVE_OPENSSLv1
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
             const X509V3_EXT_METHOD *method;
 #else
             X509V3_EXT_METHOD *method;

cd /usr/pkgsrc/sysutils/bacula
bmake distinfo