rpms/bacula
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- rebuilt with new openssl

Browse Source
This commit is contained in:
Tomáš Mráz 2009-08-22 11:45:56 +00:00
parent be575fcaad
commit 43cef8a8db
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bacula-3.0.2-openssl.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c
--- bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl 2008-11-06 20:10:08.000000000 +0100
+++ bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c 2009-08-22 12:48:20.000000000 +0200
@@ -309,7 +309,11 @@ typedef struct PEM_CB_Context {
*/
static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
X509_EXTENSION *ext;
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
X509V3_EXT_METHOD *method;
+#else
+ const X509V3_EXT_METHOD *method;
+#endif
ASN1_OCTET_STRING *keyid;
int i;
#if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
@@ -973,6 +977,10 @@ void crypto_sign_free(SIGNATURE *sig)
free (sig);
}
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
+#endif
/*
* Create a new encryption session.
* Returns: A pointer to a CRYPTO_SESSION object on success.

4
bacula.spec
View File

@ -39,6 +39,7 @@ Patch3: bacula-pamd.patch
#Patch10: bacula-web-smarty.patch #Patch10: bacula-web-smarty.patch
#Patch11: bacula-2.4.3-orphaned-jobs.patch #Patch11: bacula-2.4.3-orphaned-jobs.patch
#Patch12: bacula-2.4.3-python26.patch #Patch12: bacula-2.4.3-python26.patch
Patch13: bacula-3.0.2-openssl.patch
URL: http://www.bacula.org URL: http://www.bacula.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@ -365,6 +366,7 @@ pushd bacula-%{version}
#%patch9 -p0 #%patch9 -p0
#%patch11 -p0 #%patch11 -p0
#%patch12 -p0 #%patch12 -p0
%patch13 -p1 -b .openssl
# Remove execution permissions from files we're packaging as docs later on # Remove execution permissions from files we're packaging as docs later on
find examples -type f | xargs chmod -x find examples -type f | xargs chmod -x
@ -1005,7 +1007,7 @@ fi
%changelog %changelog
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 3.0.2-4 * Sat Aug 22 2009 Tomas Mraz <tmraz@redhat.com> - 3.0.2-4
- rebuilt with new openssl - rebuilt with new openssl
* Mon Aug 10 2009 Jon Ciesla <limb@jcomserv.net - 3.0.2-3 * Mon Aug 10 2009 Jon Ciesla <limb@jcomserv.net - 3.0.2-3