From be8b3205fabe6172fdbca09da44b3087c7c44a9e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 1 Nov 2008 20:00:49 +0000 Subject: [PATCH] Rework patches git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7958 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/patches/2.4.3-migrate-log.patch | 14 ++++++++++++++ bacula/patches/{ => 2.4.x}/2.4.0-bacula.patch | 0 bacula/patches/{ => 2.4.x}/2.4.0-bus-error.patch | 0 bacula/patches/{ => 2.4.x}/2.4.0-recycle.patch | 0 bacula/patches/{ => 2.4.x}/2.4.0-reschedule.patch | 0 bacula/patches/{ => 2.4.x}/2.4.0-sd-deadlock.patch | 0 bacula/patches/{ => 2.4.x}/2.4.1-bat-restore.patch | 0 bacula/patches/{ => 2.4.x}/2.4.1-migration.patch | 0 bacula/patches/{ => 2.4.x}/2.4.1-mount.patch | 0 .../patches/{ => 2.4.x}/2.4.1-mysql-timeout.patch | 0 .../2.4.1-restore-wrong-mediatype.patch | 0 bacula/patches/{ => 2.4.x}/2.4.1-sd-crash.patch | 0 .../patches/{ => 2.4.x}/2.4.1-wrong-volume.patch | 0 bacula/patches/{ => 2.4.x}/2.4.2-bat.patch | 0 .../2.4.2-cancel-non-running-jobs.patch | 0 .../patches/{ => 2.4.x}/2.4.2-estimate-cmd.patch | 0 bacula/patches/{ => 2.4.x}/2.4.2-inchanger.patch | 0 .../patches/{ => 2.4.x}/2.4.2-jobend-crash.patch | 0 bacula/patches/{ => 2.4.x}/2.4.2-mig-message.patch | 0 .../{ => 2.4.x}/2.4.2-migrate-poolsize.patch | 0 .../{ => 2.4.x}/2.4.2-migration-deadlock.patch | 0 bacula/patches/{ => 2.4.x}/2.4.2-null-vol.patch | 0 bacula/patches/{ => 2.4.x}/2.4.2-storename.patch | 0 bacula/patches/{ => 2.4.x}/2.4.2-verify.patch | 0 bacula/patches/{ => 2.4.x}/2.4.2-verifydisk.patch | 0 25 files changed, 14 insertions(+) rename bacula/patches/{ => 2.4.x}/2.4.0-bacula.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.0-bus-error.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.0-recycle.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.0-reschedule.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.0-sd-deadlock.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.1-bat-restore.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.1-migration.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.1-mount.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.1-mysql-timeout.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.1-restore-wrong-mediatype.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.1-sd-crash.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.1-wrong-volume.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-bat.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-cancel-non-running-jobs.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-estimate-cmd.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-inchanger.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-jobend-crash.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-mig-message.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-migrate-poolsize.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-migration-deadlock.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-null-vol.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-storename.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-verify.patch (100%) rename bacula/patches/{ => 2.4.x}/2.4.2-verifydisk.patch (100%) diff --git a/bacula/patches/2.4.3-migrate-log.patch b/bacula/patches/2.4.3-migrate-log.patch index a35f8159da..c593cc23ef 100644 --- a/bacula/patches/2.4.3-migrate-log.patch +++ b/bacula/patches/2.4.3-migrate-log.patch @@ -1,3 +1,17 @@ + + This patch should cause all Job Log records to be migrated when the + Job is migrated. It fixes the second issue reported in bug #1171. + + Apply it to Bacula 2.4.3 (possibly earlier versions) + with: + + cd + patch -p0 <2.4.3-migrate.patch + ./configure + make + ... + make install + Index: src/dird/migrate.c =================================================================== --- src/dird/migrate.c (revision 7926) diff --git a/bacula/patches/2.4.0-bacula.patch b/bacula/patches/2.4.x/2.4.0-bacula.patch similarity index 100% rename from bacula/patches/2.4.0-bacula.patch rename to bacula/patches/2.4.x/2.4.0-bacula.patch diff --git a/bacula/patches/2.4.0-bus-error.patch b/bacula/patches/2.4.x/2.4.0-bus-error.patch similarity index 100% rename from bacula/patches/2.4.0-bus-error.patch rename to bacula/patches/2.4.x/2.4.0-bus-error.patch diff --git a/bacula/patches/2.4.0-recycle.patch b/bacula/patches/2.4.x/2.4.0-recycle.patch similarity index 100% rename from bacula/patches/2.4.0-recycle.patch rename to bacula/patches/2.4.x/2.4.0-recycle.patch diff --git a/bacula/patches/2.4.0-reschedule.patch b/bacula/patches/2.4.x/2.4.0-reschedule.patch similarity index 100% rename from bacula/patches/2.4.0-reschedule.patch rename to bacula/patches/2.4.x/2.4.0-reschedule.patch diff --git a/bacula/patches/2.4.0-sd-deadlock.patch b/bacula/patches/2.4.x/2.4.0-sd-deadlock.patch similarity index 100% rename from bacula/patches/2.4.0-sd-deadlock.patch rename to bacula/patches/2.4.x/2.4.0-sd-deadlock.patch diff --git a/bacula/patches/2.4.1-bat-restore.patch b/bacula/patches/2.4.x/2.4.1-bat-restore.patch similarity index 100% rename from bacula/patches/2.4.1-bat-restore.patch rename to bacula/patches/2.4.x/2.4.1-bat-restore.patch diff --git a/bacula/patches/2.4.1-migration.patch b/bacula/patches/2.4.x/2.4.1-migration.patch similarity index 100% rename from bacula/patches/2.4.1-migration.patch rename to bacula/patches/2.4.x/2.4.1-migration.patch diff --git a/bacula/patches/2.4.1-mount.patch b/bacula/patches/2.4.x/2.4.1-mount.patch similarity index 100% rename from bacula/patches/2.4.1-mount.patch rename to bacula/patches/2.4.x/2.4.1-mount.patch diff --git a/bacula/patches/2.4.1-mysql-timeout.patch b/bacula/patches/2.4.x/2.4.1-mysql-timeout.patch similarity index 100% rename from bacula/patches/2.4.1-mysql-timeout.patch rename to bacula/patches/2.4.x/2.4.1-mysql-timeout.patch diff --git a/bacula/patches/2.4.1-restore-wrong-mediatype.patch b/bacula/patches/2.4.x/2.4.1-restore-wrong-mediatype.patch similarity index 100% rename from bacula/patches/2.4.1-restore-wrong-mediatype.patch rename to bacula/patches/2.4.x/2.4.1-restore-wrong-mediatype.patch diff --git a/bacula/patches/2.4.1-sd-crash.patch b/bacula/patches/2.4.x/2.4.1-sd-crash.patch similarity index 100% rename from bacula/patches/2.4.1-sd-crash.patch rename to bacula/patches/2.4.x/2.4.1-sd-crash.patch diff --git a/bacula/patches/2.4.1-wrong-volume.patch b/bacula/patches/2.4.x/2.4.1-wrong-volume.patch similarity index 100% rename from bacula/patches/2.4.1-wrong-volume.patch rename to bacula/patches/2.4.x/2.4.1-wrong-volume.patch diff --git a/bacula/patches/2.4.2-bat.patch b/bacula/patches/2.4.x/2.4.2-bat.patch similarity index 100% rename from bacula/patches/2.4.2-bat.patch rename to bacula/patches/2.4.x/2.4.2-bat.patch diff --git a/bacula/patches/2.4.2-cancel-non-running-jobs.patch b/bacula/patches/2.4.x/2.4.2-cancel-non-running-jobs.patch similarity index 100% rename from bacula/patches/2.4.2-cancel-non-running-jobs.patch rename to bacula/patches/2.4.x/2.4.2-cancel-non-running-jobs.patch diff --git a/bacula/patches/2.4.2-estimate-cmd.patch b/bacula/patches/2.4.x/2.4.2-estimate-cmd.patch similarity index 100% rename from bacula/patches/2.4.2-estimate-cmd.patch rename to bacula/patches/2.4.x/2.4.2-estimate-cmd.patch diff --git a/bacula/patches/2.4.2-inchanger.patch b/bacula/patches/2.4.x/2.4.2-inchanger.patch similarity index 100% rename from bacula/patches/2.4.2-inchanger.patch rename to bacula/patches/2.4.x/2.4.2-inchanger.patch diff --git a/bacula/patches/2.4.2-jobend-crash.patch b/bacula/patches/2.4.x/2.4.2-jobend-crash.patch similarity index 100% rename from bacula/patches/2.4.2-jobend-crash.patch rename to bacula/patches/2.4.x/2.4.2-jobend-crash.patch diff --git a/bacula/patches/2.4.2-mig-message.patch b/bacula/patches/2.4.x/2.4.2-mig-message.patch similarity index 100% rename from bacula/patches/2.4.2-mig-message.patch rename to bacula/patches/2.4.x/2.4.2-mig-message.patch diff --git a/bacula/patches/2.4.2-migrate-poolsize.patch b/bacula/patches/2.4.x/2.4.2-migrate-poolsize.patch similarity index 100% rename from bacula/patches/2.4.2-migrate-poolsize.patch rename to bacula/patches/2.4.x/2.4.2-migrate-poolsize.patch diff --git a/bacula/patches/2.4.2-migration-deadlock.patch b/bacula/patches/2.4.x/2.4.2-migration-deadlock.patch similarity index 100% rename from bacula/patches/2.4.2-migration-deadlock.patch rename to bacula/patches/2.4.x/2.4.2-migration-deadlock.patch diff --git a/bacula/patches/2.4.2-null-vol.patch b/bacula/patches/2.4.x/2.4.2-null-vol.patch similarity index 100% rename from bacula/patches/2.4.2-null-vol.patch rename to bacula/patches/2.4.x/2.4.2-null-vol.patch diff --git a/bacula/patches/2.4.2-storename.patch b/bacula/patches/2.4.x/2.4.2-storename.patch similarity index 100% rename from bacula/patches/2.4.2-storename.patch rename to bacula/patches/2.4.x/2.4.2-storename.patch diff --git a/bacula/patches/2.4.2-verify.patch b/bacula/patches/2.4.x/2.4.2-verify.patch similarity index 100% rename from bacula/patches/2.4.2-verify.patch rename to bacula/patches/2.4.x/2.4.2-verify.patch diff --git a/bacula/patches/2.4.2-verifydisk.patch b/bacula/patches/2.4.x/2.4.2-verifydisk.patch similarity index 100% rename from bacula/patches/2.4.2-verifydisk.patch rename to bacula/patches/2.4.x/2.4.2-verifydisk.patch -- 2.39.5