Fri Jul 10 19:21:28 2009 UTC ()
Unbreak it with openssl older than 0.9.9.


(hasso)
diff -r1.34 -r1.35 pkgsrc/sysutils/bacula/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/bacula/patches/patch-ab
cvs diff -r1.34 -r1.35 pkgsrc/sysutils/bacula/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/distinfo 2009/05/16 08:06:56 1.34
+++ pkgsrc/sysutils/bacula/distinfo 2009/07/10 19:21:28 1.35
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.34 2009/05/16 08:06:56 adam Exp $ 1$NetBSD: distinfo,v 1.35 2009/07/10 19:21:28 hasso Exp $
2 2
3SHA1 (bacula-3.0.1.tar.gz) = 073d3d9458b51b928c0b5f8cf830c94362366c9a 3SHA1 (bacula-3.0.1.tar.gz) = 073d3d9458b51b928c0b5f8cf830c94362366c9a
4RMD160 (bacula-3.0.1.tar.gz) = 8f23238a7475fb1d3371e583d43fbd6f49efc113 4RMD160 (bacula-3.0.1.tar.gz) = 8f23238a7475fb1d3371e583d43fbd6f49efc113
5Size (bacula-3.0.1.tar.gz) = 3842746 bytes 5Size (bacula-3.0.1.tar.gz) = 3842746 bytes
6SHA1 (patch-aa) = e59bccdc80b23b2a64bd7e4f2bbefe22e019fca8 6SHA1 (patch-aa) = e59bccdc80b23b2a64bd7e4f2bbefe22e019fca8
7SHA1 (patch-ab) = 760c5214dc9a4e4c11e812842e790b973c502c1a 7SHA1 (patch-ab) = ae9df9398fbcd4669f513613eb11910aa5b9e370
8SHA1 (patch-ac) = db88570ebbed0e624315b6eb4668ff97b6b180b6 8SHA1 (patch-ac) = db88570ebbed0e624315b6eb4668ff97b6b180b6
9SHA1 (patch-ad) = 6a739f6960da444d30df8ffd49cb258446e06797 9SHA1 (patch-ad) = 6a739f6960da444d30df8ffd49cb258446e06797
10SHA1 (patch-ae) = 1b4d6fdeb8570be9f7e5f0355701d92d81f68b07 10SHA1 (patch-ae) = 1b4d6fdeb8570be9f7e5f0355701d92d81f68b07
11SHA1 (patch-af) = 20429fa1f517348ee290d90dd1d420347fb1928e 11SHA1 (patch-af) = 20429fa1f517348ee290d90dd1d420347fb1928e
12SHA1 (patch-ag) = 6123cbf2cb3517850e65251ea80fb9b505cdf230 12SHA1 (patch-ag) = 6123cbf2cb3517850e65251ea80fb9b505cdf230
13SHA1 (patch-ah) = c096a775d98eae0b4ce20bedbbb99ed9a646603e 13SHA1 (patch-ah) = c096a775d98eae0b4ce20bedbbb99ed9a646603e
14SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee 14SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
15SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0 15SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
16SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a 16SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a
17SHA1 (patch-al) = 1fc78c0de4461c9294325e835e5ed529228e32c4 17SHA1 (patch-al) = 1fc78c0de4461c9294325e835e5ed529228e32c4
18SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b 18SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b
19SHA1 (patch-an) = 365e6ee90c178349b6ca127accb47b9c7de7ce94 19SHA1 (patch-an) = 365e6ee90c178349b6ca127accb47b9c7de7ce94
20SHA1 (patch-ao) = e2e005d7fa2f769f650fb3f6f2e1c52d611352ad 20SHA1 (patch-ao) = e2e005d7fa2f769f650fb3f6f2e1c52d611352ad
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/bacula/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/sysutils/bacula/patches/Attic/patch-ab 2008/11/28 13:47:51 1.3
+++ pkgsrc/sysutils/bacula/patches/Attic/patch-ab 2009/07/10 19:21:28 1.4
@@ -1,22 +1,30 @@ @@ -1,22 +1,30 @@
1$NetBSD: patch-ab,v 1.3 2008/11/28 13:47:51 adam Exp $ 1$NetBSD: patch-ab,v 1.4 2009/07/10 19:21:28 hasso Exp $
2 2
3--- src/lib/crypto.c.orig 2008-11-28 13:50:13.000000000 +0100 3--- ./src/lib/crypto.c.orig 2008-11-06 21:10:08 +0200
4+++ src/lib/crypto.c 4+++ ./src/lib/crypto.c 2009-07-10 13:27:39 +0300
5@@ -1099,7 +1099,7 @@ CRYPTO_SESSION *crypto_session_new (cryp 5@@ -1099,7 +1099,11 @@ CRYPTO_SESSION *crypto_session_new (cryp
6 /* Encrypt the session key */ 6 /* Encrypt the session key */
7 ekey = (unsigned char *)malloc(EVP_PKEY_size(keypair->pubkey)); 7 ekey = (unsigned char *)malloc(EVP_PKEY_size(keypair->pubkey));
8  8
9- if ((ekey_len = EVP_PKEY_encrypt(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) { 9+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
10+ if ((ekey_len = EVP_PKEY_encrypt_old(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) { 10+ if ((ekey_len = EVP_PKEY_encrypt_old(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) {
 11+#else
 12 if ((ekey_len = EVP_PKEY_encrypt(ekey, cs->session_key, cs->session_key_len, keypair->pubkey)) <= 0) {
 13+#endif
11 /* OpenSSL failure */ 14 /* OpenSSL failure */
12 RecipientInfo_free(ri); 15 RecipientInfo_free(ri);
13 crypto_session_free(cs); 16 crypto_session_free(cs);
14@@ -1222,7 +1222,7 @@ crypto_error_t crypto_session_decode(con 17@@ -1222,8 +1226,13 @@ crypto_error_t crypto_session_decode(con
15 /* Decrypt the session key */ 18 /* Decrypt the session key */
16 /* Allocate sufficient space for the largest possible decrypted data */ 19 /* Allocate sufficient space for the largest possible decrypted data */
17 cs->session_key = (unsigned char *)malloc(EVP_PKEY_size(keypair->privkey)); 20 cs->session_key = (unsigned char *)malloc(EVP_PKEY_size(keypair->privkey));
18- cs->session_key_len = EVP_PKEY_decrypt(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey), 21+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
19+ cs->session_key_len = EVP_PKEY_decrypt_old(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey), 22+ cs->session_key_len = EVP_PKEY_decrypt_old(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey),
 23+ M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey);
 24+#else
 25 cs->session_key_len = EVP_PKEY_decrypt(cs->session_key, M_ASN1_STRING_data(ri->encryptedKey),
20 M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey); 26 M_ASN1_STRING_length(ri->encryptedKey), keypair->privkey);
 27+#endif
21  28
22 if (cs->session_key_len <= 0) { 29 if (cs->session_key_len <= 0) {
 30 openssl_post_errors(M_ERROR, _("Failure decrypting the session key"));