version bump

(Portage version: 2.1.5_rc4)

15 files changed, 8 insertions, 277 deletions

diff --git a/app-backup/bacula/files/2.2.8/2.2.8-bacula-conf.patch b/app-backup/bacula/files/2.2.8/2.2.8-bacula-conf.patch
deleted file mode 100644
index 04387085433d..000000000000
--- a/app-backup/bacula/files/2.2.8/2.2.8-bacula-conf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
- This patch automatically adds the Bacula database and user name to
- the default make_catalog_backup Run script call line in the bacula-dir.conf
- file.
-
- Apply it to version 2.2.8 or earlier with:
-
- cd <bacula-source>
- patch -p0 <2.2.8-bacula-conf.patch
- ./configure <your-options>
- make
- ...
- make install
-
-
-Index: src/dird/bacula-dir.conf.in
-===================================================================
---- src/dird/bacula-dir.conf.in	(revision 6327)
-+++ src/dird/bacula-dir.conf.in	(working copy)
-@@ -61,7 +61,11 @@
-   FileSet="Catalog"
-   Schedule = "WeeklyCycleAfterBackup"
-   # This creates an ASCII copy of the catalog
--  RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula"
-+  # WARNING!!! Passing the password via the command line is insecure.
-+  # see comments in make_catalog_backup for details.
-+  # Arguments to make_catalog_backup are:
-+  #  make_catalog_backup <database-name> <user-name> <password> <host>
-+  RunBeforeJob = "@scriptdir@/make_catalog_backup @db_name@ @db_user@"
-   # This deletes the copy of the catalog
-   RunAfterJob  = "@scriptdir@/delete_catalog_backup"
-   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-jobmedia-fix.patch b/app-backup/bacula/files/2.2.8/2.2.8-jobmedia-fix.patch
deleted file mode 100644
index 89807be4abe4..000000000000
--- a/app-backup/bacula/files/2.2.8/2.2.8-jobmedia-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-
- This patch fixes a bug that cause storage to create JOBMEDIA records 
- for every block written to tape.
-
- This Patch works with 2.2.8-jobmedia.patch
-
- Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
-
- cd <bacula-source>
- patch -p0 <2.2.8-jobmedia-fix.patch
- ./configure <your-options>
- make
- ...
- make install
-
-
-Index: src/stored/block.c
-===================================================================
---- src/stored/block.c  (revision 6531)
-+++ src/stored/block.c  (working copy)
-@@ -374,7 +374,6 @@
-       if (dcr->NewVol) {
-          /* Note, setting a new volume also handles any pending new file */
-          set_new_volume_parameters(dcr);
--         dcr->NewFile = false;        /* this handled for new file too */
-       } else {
-          set_new_file_parameters(dcr);
-       }
-Index: src/stored/device.c
-===================================================================
---- src/stored/device.c (revision 6531)
-+++ src/stored/device.c (working copy)
-@@ -226,6 +226,7 @@
-    }
-    set_new_file_parameters(dcr);
-    jcr->NumWriteVolumes++;
-+   dcr->NewVol = false;
- }
-
- /*
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-jobmedia.patch b/app-backup/bacula/files/2.2.8/2.2.8-jobmedia.patch
deleted file mode 100644
index b7bdb9be9013..000000000000
--- a/app-backup/bacula/files/2.2.8/2.2.8-jobmedia.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-
- This patch fixes a migration bug that always has a zero index entry
- (JobMedia record) as the first entry. This causes Bacula to search
- for the first record during a restore rather than seek directly to
- it.
-
- You have to apply 2.2.8-jobmedia-fix.patch too.
-
- Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
-
- cd <bacula-source>
- patch -p0 <2.2.8-jobmedia.patch
- patch -p0 <2.2.8-jobmedia-fix.patch
- ./configure <your-options>
- make
- ...
- make install
-
-
-Index: src/stored/device.c
-===================================================================
---- src/stored/device.c	(revision 6391)
-+++ src/stored/device.c	(working copy)
-@@ -200,6 +200,19 @@
-    return ok;                               /* device locked */
- }
- 
-+void set_start_vol_position(DCR *dcr)
-+{
-+   DEVICE *dev = dcr->dev;
-+   /* Set new start position */
-+   if (dev->is_tape()) {
-+      dcr->StartBlock = dev->block_num;
-+      dcr->StartFile = dev->file;
-+   } else {
-+      dcr->StartBlock = (uint32_t)dev->file_addr;
-+      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
-+   }
-+}
-+
- /*
-  * We have a new Volume mounted, so reset the Volume parameters
-  *  concerning this job.  The global changes were made earlier
-@@ -208,24 +221,11 @@
- void set_new_volume_parameters(DCR *dcr)
- {
-    JCR *jcr = dcr->jcr;
--   DEVICE *dev = dcr->dev;
-    if (dcr->NewVol && !dir_get_volume_info(dcr, GET_VOL_INFO_FOR_WRITE)) {
-       Jmsg1(jcr, M_ERROR, 0, "%s", jcr->errmsg);
-    }
--   /* Set new start/end positions */
--   if (dev->is_tape()) {
--      dcr->StartBlock = dev->block_num;
--      dcr->StartFile = dev->file;
--   } else {
--      dcr->StartBlock = (uint32_t)dev->file_addr;
--      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
--   }
--   /* Reset indicies */
--   dcr->VolFirstIndex = 0;
--   dcr->VolLastIndex = 0;
-+   set_new_file_parameters(dcr);
-    jcr->NumWriteVolumes++;
--   dcr->NewVol = false;
--   dcr->WroteVol = false;
- }
- 
- /*
-@@ -235,16 +235,8 @@
-  */
- void set_new_file_parameters(DCR *dcr)
- {
--   DEVICE *dev = dcr->dev;
-+   set_start_vol_position(dcr);
- 
--   /* Set new start/end positions */
--   if (dev->is_tape()) {
--      dcr->StartBlock = dev->block_num;
--      dcr->StartFile = dev->file;
--   } else {
--      dcr->StartBlock = (uint32_t)dev->file_addr;
--      dcr->StartFile  = (uint32_t)(dev->file_addr >> 32);
--   }
-    /* Reset indicies */
-    dcr->VolFirstIndex = 0;
-    dcr->VolLastIndex = 0;
-Index: src/stored/mac.c
-===================================================================
---- src/stored/mac.c	(revision 6391)
-+++ src/stored/mac.c	(working copy)
-@@ -108,6 +108,7 @@
- 
-    jcr->dcr->VolFirstIndex = jcr->dcr->VolLastIndex = 0;
-    jcr->run_time = time(NULL);
-+   set_start_vol_position(jcr->dcr);
- 
-    ok = read_records(jcr->read_dcr, record_cb, mount_next_read_volume);
-    goto ok_out;
-Index: src/stored/protos.h
-===================================================================
---- src/stored/protos.h	(revision 6391)
-+++ src/stored/protos.h	(working copy)
-@@ -126,6 +126,7 @@
- bool     open_device(DCR *dcr);
- bool     first_open_device(DCR *dcr);
- bool     fixup_device_block_write_error(DCR *dcr);
-+void     set_start_vol_position(DCR *dcr);
- void     set_new_volume_parameters(DCR *dcr);
- void     set_new_file_parameters(DCR *dcr);
- bool     is_device_unmounted(DEVICE *dev);
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-pool-source.patch b/app-backup/bacula/files/2.2.8/2.2.8-pool-source.patch
deleted file mode 100644
index 347dcce12752..000000000000
--- a/app-backup/bacula/files/2.2.8/2.2.8-pool-source.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
- This patch fixes bug #1031 about wrong pool source information
- in job report.
-
- Apply the patch to 2.2.8 (and possibly any 2.2.x version with):
-
- cd <bacula-source>
- patch -p0 <2.2.8-pool-source.patch
- ./configure <your-options>
- make
- ...
- make install
-
-
-
-Index: src/dird/ua_run.c
-===================================================================
---- src/dird/ua_run.c	(révision 6388)
-+++ src/dird/ua_run.c	(copie de travail)
-@@ -122,6 +122,9 @@
-    jcr->verify_job = rc.verify_job;
-    jcr->previous_job = rc.previous_job;
-    jcr->pool = rc.pool;
-+   if (jcr->pool != jcr->job->pool) {
-+      pm_strcpy(jcr->pool_source, _("User input"));
-+   }
-    set_rwstorage(jcr, rc.store);
-    jcr->client = rc.client;
-    pm_strcpy(jcr->client_name, rc.client->name());
diff --git a/app-backup/bacula/files/2.2.8/2.2.8-strip-path.patch b/app-backup/bacula/files/2.2.8/2.2.8-strip-path.patch
deleted file mode 100644
index db75b85b698b..000000000000
--- a/app-backup/bacula/files/2.2.8/2.2.8-strip-path.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-
- This patch should fix bug #1047 -- heap corruption when using
- strippath on certain directories.
-
- Apply it to 2.2.8 (probably prior versions) with:
-
- cd <bacula-source>
- patch -p0 <2.2.8-strip-path.patch
- ./configure <your-options>
- make 
- ...
- make install
-
-
-Index: src/filed/backup.c
-===================================================================
---- src/filed/backup.c	(revision 6390)
-+++ src/filed/backup.c	(revision 6391)
-@@ -1146,20 +1146,21 @@
-    /* 
-     * Strip path.  If it doesn't succeed put it back.  If
-     *  it does, and there is a different link string,
--    *  attempt to strip the link. If it fails, but them
-+    *  attempt to strip the link. If it fails, back them
-     *  both back.
-+    * Don't strip symlinks.
-     * I.e. if either stripping fails don't strip anything.
-     */
-    if (do_strip(ff_pkt->strip_path, ff_pkt->fname)) {
--      if (ff_pkt->fname != ff_pkt->link) {
-+      if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
-          pm_strcpy(ff_pkt->link_save, ff_pkt->link);
-          if (!do_strip(ff_pkt->strip_path, ff_pkt->link)) {
--            strcpy(ff_pkt->link, ff_pkt->link_save);
--            strcpy(ff_pkt->fname, ff_pkt->fname_save);
-+            pm_strcpy(ff_pkt->link, ff_pkt->link_save);
-+            pm_strcpy(ff_pkt->fname, ff_pkt->fname_save);
-          }
-       }
-    } else {
--      strcpy(ff_pkt->fname, ff_pkt->fname_save);
-+      pm_strcpy(ff_pkt->fname, ff_pkt->fname_save);
-    } 
-    Dmsg2(200, "fname=%s stripped=%s\n", ff_pkt->fname_save, ff_pkt->fname);
- }
-@@ -1169,8 +1170,8 @@
-    if (!(ff_pkt->flags & FO_STRIPPATH) || ff_pkt->strip_path <= 0) {
-       return;
-    }
--   strcpy(ff_pkt->fname, ff_pkt->fname_save);
--   if (ff_pkt->fname != ff_pkt->link) {
--      strcpy(ff_pkt->link, ff_pkt->link_save);
-+   pm_strcpy(ff_pkt->fname, ff_pkt->fname_save);
-+   if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
-+      pm_strcpy(ff_pkt->link, ff_pkt->link_save);
-    }
- }
diff --git a/app-backup/bacula/files/2.2.8/bacula-all-conf b/app-backup/bacula/files/2.4.0/bacula-all-conf
index a1461c541af8..f3dc29d63de0 100644
--- a/app-backup/bacula/files/2.2.8/bacula-all-conf
+++ b/app-backup/bacula/files/2.4.0/bacula-all-conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-all-conf,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-all-conf,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 # Config file for /etc/init.d/bacula
 
diff --git a/app-backup/bacula/files/2.2.8/bacula-all-init b/app-backup/bacula/files/2.4.0/bacula-all-init
index b4cb8526890c..dcf5e69f576a 100644
--- a/app-backup/bacula/files/2.2.8/bacula-all-init
+++ b/app-backup/bacula/files/2.4.0/bacula-all-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-all-init,v 1.2 2008/03/19 13:38:55 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-all-init,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 depend() {
 	need net
diff --git a/app-backup/bacula/files/2.2.8/bacula-default-configs.patch b/app-backup/bacula/files/2.4.0/bacula-default-configs.patch
index ebf66ccd4ffe..ebf66ccd4ffe 100644
--- a/app-backup/bacula/files/2.2.8/bacula-default-configs.patch
+++ b/app-backup/bacula/files/2.4.0/bacula-default-configs.patch
diff --git a/app-backup/bacula/files/2.2.8/bacula-dir-conf b/app-backup/bacula/files/2.4.0/bacula-dir-conf
index 54569949248a..1c05153c63f6 100644
--- a/app-backup/bacula/files/2.2.8/bacula-dir-conf
+++ b/app-backup/bacula/files/2.4.0/bacula-dir-conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-dir-conf,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-dir-conf,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 # Config file for /etc/init.d/bacula-dir
 
diff --git a/app-backup/bacula/files/2.2.8/bacula-dir-init b/app-backup/bacula/files/2.4.0/bacula-dir-init
index 45c9695e5877..67afc928dba2 100644
--- a/app-backup/bacula/files/2.2.8/bacula-dir-init
+++ b/app-backup/bacula/files/2.4.0/bacula-dir-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-dir-init,v 1.2 2008/03/19 13:38:55 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-dir-init,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 depend() {
 	need net
diff --git a/app-backup/bacula/files/2.2.8/bacula-fd-conf b/app-backup/bacula/files/2.4.0/bacula-fd-conf
index b2dd7282828f..926eb820c2a2 100644
--- a/app-backup/bacula/files/2.2.8/bacula-fd-conf
+++ b/app-backup/bacula/files/2.4.0/bacula-fd-conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-fd-conf,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-fd-conf,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 # Config file for /etc/init.d/bacula-fd
 
diff --git a/app-backup/bacula/files/2.2.8/bacula-fd-init b/app-backup/bacula/files/2.4.0/bacula-fd-init
index a284ba66a310..347c46692612 100644
--- a/app-backup/bacula/files/2.2.8/bacula-fd-init
+++ b/app-backup/bacula/files/2.4.0/bacula-fd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-fd-init,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-fd-init,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 depend() {
 	need net
diff --git a/app-backup/bacula/files/2.2.8/bacula-gnomesu2gksu.diff b/app-backup/bacula/files/2.4.0/bacula-gnomesu2gksu.diff
index cb08b8b8c44f..cb08b8b8c44f 100644
--- a/app-backup/bacula/files/2.2.8/bacula-gnomesu2gksu.diff
+++ b/app-backup/bacula/files/2.4.0/bacula-gnomesu2gksu.diff
diff --git a/app-backup/bacula/files/2.2.8/bacula-sd-conf b/app-backup/bacula/files/2.4.0/bacula-sd-conf
index fcb57a22c006..3a38bbf6ca3f 100644
--- a/app-backup/bacula/files/2.2.8/bacula-sd-conf
+++ b/app-backup/bacula/files/2.4.0/bacula-sd-conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-sd-conf,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-sd-conf,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 # Config file for /etc/init.d/bacula-sd
 
diff --git a/app-backup/bacula/files/2.2.8/bacula-sd-init b/app-backup/bacula/files/2.4.0/bacula-sd-init
index 5a2464cbf6f3..cef53871a88c 100644
--- a/app-backup/bacula/files/2.2.8/bacula-sd-init
+++ b/app-backup/bacula/files/2.4.0/bacula-sd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.2.8/bacula-sd-init,v 1.1 2008/01/28 22:51:58 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/files/2.4.0/bacula-sd-init,v 1.1 2008/06/07 15:41:29 wschlich Exp $
 
 depend() {
 	need net