Changes 3.0.2:

* Fix 1323 about a problem when mounting a requested volume during a restore.
* Add more example SD Device configurations.
* Force the client_encoding to SQL_ASCII when database is already using this
  mode.
* Fix 1335 about postgresql error message during copy session
* Cleanup old job records when starting the director (Created/Running -> Failed)
* Apply patch in bug 1315 by McMichaeli that fixes scripts/logwatch
* Add more output when spooling and no space left
* Fix postgresql driver bug that displayed <NULL> rows from time to time.
* Implement the project 'restore' menu: enter a JobId, automatically
  select dependents
* Should fix 1323 about verify accurate jobs and deleted files.
* more...

9 files changed, 55 insertions, 62 deletions

diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 4ce462bce6d..675de7b3926 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/06/18 11:10:55 adam Exp $
-
-PKGREVISION=		1
+# $NetBSD: Makefile,v 1.33 2009/08/24 08:23:41 adam Exp $
 
 CONFLICTS+=		bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index e60554d63b0..658f8f0b5a5 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.50 2009/05/15 10:29:05 adam Exp $
+# $NetBSD: Makefile.common,v 1.51 2009/08/24 08:23:41 adam Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
 # used by sysutils/bacula-gnome-console/Makefile
 # used by sysutils/bacula-tray-monitor/Makefile
 # used by sysutils/bacula-wx-console/Makefile
 
-DISTNAME=		bacula-3.0.1
+DISTNAME=		bacula-3.0.2
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index c40f5f9ce2d..33b6be2bede 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.36 2009/08/18 15:23:59 joerg Exp $
+$NetBSD: distinfo,v 1.37 2009/08/24 08:23:41 adam Exp $
 
-SHA1 (bacula-3.0.1.tar.gz) = 073d3d9458b51b928c0b5f8cf830c94362366c9a
-RMD160 (bacula-3.0.1.tar.gz) = 8f23238a7475fb1d3371e583d43fbd6f49efc113
-Size (bacula-3.0.1.tar.gz) = 3842746 bytes
+SHA1 (bacula-3.0.2.tar.gz) = a397d953a51a88206f7613626265c60bdf77198e
+RMD160 (bacula-3.0.2.tar.gz) = e21ca4296a439a2ba804cb3b2fc0e2e2996f41b1
+Size (bacula-3.0.2.tar.gz) = 3910414 bytes
 SHA1 (patch-aa) = e59bccdc80b23b2a64bd7e4f2bbefe22e019fca8
-SHA1 (patch-ab) = ae9df9398fbcd4669f513613eb11910aa5b9e370
-SHA1 (patch-ac) = db88570ebbed0e624315b6eb4668ff97b6b180b6
-SHA1 (patch-ad) = 6a739f6960da444d30df8ffd49cb258446e06797
+SHA1 (patch-ab) = 07ff96289fe4fe9a1d666b3fa70c97f9ad45bc34
+SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e
+SHA1 (patch-ad) = dc0fcf90112e973e122370feb3b31a9495efa17a
 SHA1 (patch-ae) = 1b4d6fdeb8570be9f7e5f0355701d92d81f68b07
 SHA1 (patch-af) = 20429fa1f517348ee290d90dd1d420347fb1928e
 SHA1 (patch-ag) = ccb411db5fb65d5ef3ed5a56b70129d83a66da68
@@ -14,8 +14,7 @@ SHA1 (patch-ah) = 72839df5640a649e2abcbaaa3dcc8ae32468e5ab
 SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
 SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
 SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a
-SHA1 (patch-al) = 1fc78c0de4461c9294325e835e5ed529228e32c4
 SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b
 SHA1 (patch-an) = 365e6ee90c178349b6ca127accb47b9c7de7ce94
-SHA1 (patch-ao) = e2e005d7fa2f769f650fb3f6f2e1c52d611352ad
-SHA1 (patch-ap) = 385d8ee2227c58dabfe2d88ce9abb1fe88a67b4e
+SHA1 (patch-ao) = d90d238b066be15a4b2d6c8c03fa769bcf87adff
+SHA1 (patch-ap) = 65ca9bcf58d1004e022c466bc40bb9f822e87f77
diff --git a/sysutils/bacula/patches/patch-ab b/sysutils/bacula/patches/patch-ab
index 25916baca7a..76bd7c6a278 100644
--- a/sysutils/bacula/patches/patch-ab
+++ b/sysutils/bacula/patches/patch-ab
@@ -1,8 +1,20 @@
-$NetBSD: patch-ab,v 1.4 2009/07/10 19:21:28 hasso Exp $
+$NetBSD: patch-ab,v 1.5 2009/08/24 08:23:41 adam Exp $
 
---- ./src/lib/crypto.c.orig	2008-11-06 21:10:08 +0200
-+++ ./src/lib/crypto.c	2009-07-10 13:27:39 +0300
-@@ -1099,7 +1099,11 @@ CRYPTO_SESSION *crypto_session_new (cryp
+--- src/lib/crypto.c.orig	2008-11-06 20:10:08.000000000 +0100
++++ src/lib/crypto.c
+@@ -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
++   const X509V3_EXT_METHOD *method;
++#else
+    X509V3_EXT_METHOD *method;
++#endif
+    ASN1_OCTET_STRING *keyid;
+    int i;
+ #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
+@@ -1099,7 +1103,11 @@ CRYPTO_SESSION *crypto_session_new (cryp
        /* Encrypt the session key */
        ekey = (unsigned char *)malloc(EVP_PKEY_size(keypair->pubkey));
  
@@ -14,7 +26,7 @@ $NetBSD: patch-ab,v 1.4 2009/07/10 19:21:28 hasso Exp $
           /* OpenSSL failure */
           RecipientInfo_free(ri);
           crypto_session_free(cs);
-@@ -1222,8 +1226,13 @@ crypto_error_t crypto_session_decode(con
+@@ -1222,8 +1230,13 @@ 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));
diff --git a/sysutils/bacula/patches/patch-ac b/sysutils/bacula/patches/patch-ac
index 722d0d8cc08..c175ce093cb 100644
--- a/sysutils/bacula/patches/patch-ac
+++ b/sysutils/bacula/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2009/05/16 08:06:56 adam Exp $
+$NetBSD: patch-ac,v 1.6 2009/08/24 08:23:41 adam Exp $
 
---- src/console/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
+--- src/console/Makefile.in.orig	2009-06-05 15:02:10.000000000 +0200
 +++ src/console/Makefile.in
 @@ -48,7 +48,7 @@ all: Makefile bconsole @STATIC_CONS@
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.5 2009/05/16 08:06:56 adam Exp $
 +	      $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) \
  	      $(OPENSSL_LIBS)
  
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
 @@ -90,19 +90,19 @@ install: all
  	fi
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
diff --git a/sysutils/bacula/patches/patch-ad b/sysutils/bacula/patches/patch-ad
index 98ea067ee8c..8941c99e98c 100644
--- a/sysutils/bacula/patches/patch-ad
+++ b/sysutils/bacula/patches/patch-ad
@@ -1,18 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-ad,v 1.2 2009/08/24 08:23:41 adam Exp $
 
---- src/lib/jcr.c.orig	2009-04-10 13:12:50.000000000 +0200
-+++ src/lib/jcr.c
-@@ -1059,13 +1059,8 @@ void _dbg_print_jcr(FILE *fp)
-       
-       fprintf(fp, "JCR=%p JobId=%i name=%s JobStatus=%c\n", 
-               jcr, jcr->JobId, jcr->Job, jcr->JobStatus);
--#ifdef HAVE_WIN32
-       fprintf(fp, "\tuse_count=%i\n",
-               jcr->use_count());
--#else
--      fprintf(fp, "\tuse_count=%i threadid=0x%x\n",
--              jcr->use_count(), (int)jcr->my_thread_id);
--#endif
-       fprintf(fp, "\tJobType=%c JobLevel=%c\n",
-               jcr->get_JobType(), jcr->get_JobLevel());
-       bstrftime(buf1, sizeof(buf1), jcr->sched_time);
+--- src/lib/tls.c.orig	2008-11-22 19:36:12.000000000 +0100
++++ src/lib/tls.c
+@@ -315,7 +315,11 @@ bool tls_postconnect_verify_host(JCR *jc
+          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
+ 
+          if (strcmp(extname, "subjectAltName") == 0) {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++            const X509V3_EXT_METHOD *method;
++#else
+             X509V3_EXT_METHOD *method;
++#endif
+             STACK_OF(CONF_VALUE) *val;
+             CONF_VALUE *nval;
+             void *extstr = NULL;
diff --git a/sysutils/bacula/patches/patch-al b/sysutils/bacula/patches/patch-al
deleted file mode 100644
index af70805fb9f..00000000000
--- a/sysutils/bacula/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.3 2009/05/15 10:29:05 adam Exp $
-
---- src/cats/sql.c.orig	2009-04-10 13:40:54.000000000 +0200
-+++ src/cats/sql.c
-@@ -758,9 +758,6 @@ void _dbg_print_db(JCR *jcr, FILE *fp)
-    fprintf(fp, "\tcmd=\"%s\" changes=%i\n", NPRTB(mdb->cmd), mdb->changes);
-    if (mdb->lock.valid == RWLOCK_VALID) { 
-       fprintf(fp, "\tRWLOCK=%p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait);
--#ifndef HAVE_WIN32
--      fprintf(fp, "\t\tthreadid=0x%x mutex=%p\n", (int)mdb->lock.writer_id, &mdb->lock.mutex);
--#endif
-    }
- }
- 
diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-ao
index 377f740ce3e..82c3b8ab06d 100644
--- a/sysutils/bacula/patches/patch-ao
+++ b/sysutils/bacula/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-ao,v 1.2 2009/08/24 08:23:41 adam Exp $
 
---- configure.orig	2009-05-15 10:52:32.000000000 +0200
+--- configure.orig	2009-07-10 16:12:39.000000000 +0200
 +++ configure
-@@ -45609,7 +45609,7 @@ if test "${support_bat}" = "yes" ; then
-       exit 1
+@@ -45726,7 +45726,7 @@ echo "$as_me: error: Could not find qmak
+    { (exit 1); exit 1; }; }
     fi
  
 -   QMAKEBIN="qmake"
diff --git a/sysutils/bacula/patches/patch-ap b/sysutils/bacula/patches/patch-ap
index caf8f562e99..55721cbeea8 100644
--- a/sysutils/bacula/patches/patch-ap
+++ b/sysutils/bacula/patches/patch-ap
@@ -1,13 +1,13 @@
-$NetBSD: patch-ap,v 1.1 2009/05/16 08:06:57 adam Exp $
+$NetBSD: patch-ap,v 1.2 2009/08/24 08:23:41 adam Exp $
 
---- src/qt-console/bat.pro.in.orig	2009-03-27 18:59:16.000000000 +0100
+--- src/qt-console/bat.pro.in.orig	2009-06-08 10:38:06.000000000 +0200
 +++ src/qt-console/bat.pro.in
 @@ -11,8 +11,6 @@ CONFIG += qt debug @QWT@
  
  bins.path = /$(DESTDIR)@sbindir@
- bins.files = ./bat
+ bins.files = bat
 -confs.path = /$(DESTDIR)@sysconfdir@
--confs.commands = ./install_conf_file   
+-confs.commands = ./install_conf_file
  help.path = /$(DESTDIR)@htmldir@
  help.files = help/*.html images/status.png images/mail-message-new.png