- openssl1 patch outdated, won't build as can't find libbac.la

Changed files:
    bacula-openssl1.patch -> 1.2
    bacula.spec -> 1.138

diff --git a/bacula-openssl1.patch b/bacula-openssl1.patch
deleted file mode 100644 (file)
index be40335..0000000
--- a/bacula-openssl1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -durN bacula-5.0.1.orig/src/lib/crypto.c bacula-5.0.1/src/lib/crypto.c
---- bacula-5.0.1.orig/src/lib/crypto.c 2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.0.1/src/lib/crypto.c      2010-04-21 20:50:32.587691290 +0200
-@@ -49,6 +47,13 @@
- #include "jcr.h"
- #include <assert.h>
- 
-+/**
-+ * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
-+ *  exists.  It was not an official API.
-+ */
-+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
-+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
-+
- /*
-  * Bacula ASN.1 Syntax
-  *
-@@ -309,7 +316,7 @@
-  */
- static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
-    X509_EXTENSION *ext;
--   X509V3_EXT_METHOD *method;
-+   const X509V3_EXT_METHOD *method;
-    ASN1_OCTET_STRING *keyid;
-    int i;
- #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
-diff -durN bacula-5.0.1.orig/src/lib/tls.c bacula-5.0.1/src/lib/tls.c
---- bacula-5.0.1.orig/src/lib/tls.c    2010-02-24 16:33:48.000000000 +0100
-+++ bacula-5.0.1/src/lib/tls.c 2010-04-21 20:50:32.589983312 +0200
-@@ -315,7 +315,7 @@
-          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
- 
-          if (strcmp(extname, "subjectAltName") == 0) {
--            X509V3_EXT_METHOD *method;
-+            const X509V3_EXT_METHOD *method;
-             STACK_OF(CONF_VALUE) *val;
-             CONF_VALUE *nval;
-             void *extstr = NULL;

diff --git a/bacula.spec b/bacula.spec
index 54bfc03601d3a2302c4f26bab1c0cb1c387c1715..26554fefc59585de6f78a46dae0e111338e909bb 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,6 +2,10 @@
 #      - update desktop files, think about su-wrappers for console (with .desktop files)
 #      - package web admin
 #      - fix log file permissions
+#      - no longer builds:
+#make[1]: *** No rule to make target `../lib/libbac.la', needed by `bacula-dir'.  Stop.
+#make[1]: *** Waiting for unfinished jobs....
+#make[1]: Leaving directory `/home/users/glen/rpm/BUILD.x86_64-linux/bacula-5.0.2/src/dird'
 #
 # Conditional build:
 %bcond_without console_wx              # wx-console program
@@ -14,11 +18,11 @@
 %bcond_with    nagios          # build nagios plugin
 %bcond_with    rescue
 %bcond_with    sqlite3_sync_off        # makes SQLite3 backend much faster, but less reliable
-#
+
 %if %{without sqlite3}
 %undefine       with_sqlite3_sync_off
 %endif
-#
+
 Summary:       Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
@@ -48,7 +52,6 @@ Patch5:               %{name}-desktop.patch
 Patch6:                %{name}-64bitbuild_fix.patch
 Patch7:                %{name}-dbi_fixes.patch
 Patch8:                %{name}-dbi_dbcheck.patch
-Patch9:                %{name}-openssl1.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -460,7 +463,6 @@ Nagios plugin to check bacula.
 #%patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue