Added OpenSSL as an option

4 files changed, 33 insertions, 4 deletions

diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 04800992c45..e31ed0fae90 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2008/11/21 14:09:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.47 2008/11/28 13:47:51 adam Exp $
 
 DISTNAME=		bacula-2.4.3
 CATEGORIES=		sysutils
@@ -70,5 +70,6 @@ EXAMPLESDIR=		${PREFIX}/share/examples/bacula
 pre-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR}
 
+.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 8f49708c67e..9e92ed57ffc 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2008/11/21 14:09:30 adam Exp $
+$NetBSD: distinfo,v 1.31 2008/11/28 13:47:51 adam Exp $
 
 SHA1 (bacula-2.4.3/2.4.3-cancel-after-network-outage.patch) = c3bfc9805792525b95857640c3549443b54e33c4
 RMD160 (bacula-2.4.3/2.4.3-cancel-after-network-outage.patch) = 100e77272267824ee3275df7b190a6da31d78fe3
@@ -13,6 +13,7 @@ SHA1 (bacula-2.4.3/bacula-2.4.3.tar.gz) = c24e7c2bd8706467d71c60b32cccdec416902c
 RMD160 (bacula-2.4.3/bacula-2.4.3.tar.gz) = 3fc216718746f8cdc1e4ca385e3d6f9c72c534c5
 Size (bacula-2.4.3/bacula-2.4.3.tar.gz) = 3125702 bytes
 SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
+SHA1 (patch-ab) = 760c5214dc9a4e4c11e812842e790b973c502c1a
 SHA1 (patch-ac) = ee3771bc026d7f6e714f5e77dec920d07d4c12cf
 SHA1 (patch-ae) = 80f2adb5e905f775fbfe6568654ba8495b4c456e
 SHA1 (patch-af) = e2e60b5ecba58ced41855f01719c6bc6e27e6a1d
diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk
index 6a1b950e3a3..445628d63f1 100644
--- a/sysutils/bacula/options.mk
+++ b/sysutils/bacula/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2008/11/21 14:09:30 adam Exp $
+# $NetBSD: options.mk,v 1.13 2008/11/28 13:47:51 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bacula
-PKG_SUPPORTED_OPTIONS=		bacula-static python 
+PKG_SUPPORTED_OPTIONS=		bacula-static openssl python
 PKG_OPTIONS_REQUIRED_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	catalog-sqlite catalog-sqlite3 catalog-pgsql catalog-mysql
 PKG_SUGGESTED_OPTIONS=		catalog-sqlite
@@ -49,3 +49,8 @@ PLIST_SUBST+=		STATIC=
 .else
 PLIST_SUBST+=		STATIC="@comment "
 .endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+.endif
diff --git a/sysutils/bacula/patches/patch-ab b/sysutils/bacula/patches/patch-ab
new file mode 100644
index 00000000000..d369e40e216
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.3 2008/11/28 13:47:51 adam Exp $
+
+--- src/lib/crypto.c.orig	2008-11-28 13:50:13.000000000 +0100
++++ src/lib/crypto.c
+@@ -1099,7 +1099,7 @@ CRYPTO_SESSION *crypto_session_new (cryp
+       /* Encrypt the session key */
+       ekey = (unsigned char *)malloc(EVP_PKEY_size(keypair->pubkey));
+ 
+-      if ((ekey_len = EVP_PKEY_encrypt(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) {
++      if ((ekey_len = EVP_PKEY_encrypt_old(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) {
+          /* OpenSSL failure */
+          RecipientInfo_free(ri);
+          crypto_session_free(cs);
+@@ -1222,7 +1222,7 @@ crypto_error_t crypto_session_decode(con
+             /* Decrypt the session key */
+             /* Allocate sufficient space for the largest possible decrypted data */
+             cs->session_key = (unsigned char *)malloc(EVP_PKEY_size(keypair->privkey));
+-            cs->session_key_len = EVP_PKEY_decrypt(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey),
++            cs->session_key_len = EVP_PKEY_decrypt_old(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey),
+                                   M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey);
+ 
+             if (cs->session_key_len <= 0) {