- updated to 3.2.0

Changed files:
    amanda-FHS.patch -> 1.2
    amanda-heimdal.patch -> 1.5

diff --git a/amanda-FHS.patch b/amanda-FHS.patch
index 7da3f476e5265576f3707d438d6825eda6fbf355..9ee2e0356f3e0b0cbb3a8a731aa6b16e73e41b0f 100644 (file)
--- a/amanda-FHS.patch
+++ b/amanda-FHS.patch
@@ -1,12 +1,7 @@
 diff -ur amanda-2.6.0/common-src/conffile.c amanda-2.6.0-fhs/common-src/conffile.c
 --- amanda-2.6.0/common-src/conffile.c 2008-01-28 22:57:34.000000000 +0100
 +++ amanda-2.6.0-fhs/common-src/conffile.c     2008-05-08 17:39:18.000000000 +0200
-@@ -3143,13 +3143,13 @@
-     conf_init_str(&conf_data[CNF_TAPEDEV], DEFAULT_TAPE_DEVICE);
-     conf_init_proplist(&conf_data[CNF_DEVICE_PROPERTY]);
-     conf_init_str(&conf_data[CNF_CHANGERDEV], DEFAULT_CHANGER_DEVICE);
--    conf_init_str(&conf_data[CNF_CHANGERFILE], "/usr/adm/amanda/changer-status");
-+    conf_init_str(&conf_data[CNF_CHANGERFILE], "/etc/amanda/changer-status");
+@@ -3143,9 +3143,9 @@
      conf_init_str   (&conf_data[CNF_LABELSTR]             , ".*");
      conf_init_str   (&conf_data[CNF_TAPELIST]             , "tapelist");
      conf_init_str   (&conf_data[CNF_DISKFILE]             , "disklist");
@@ -16,9 +11,9 @@ diff -ur amanda-2.6.0/common-src/conffile.c amanda-2.6.0-fhs/common-src/conffile
 +    conf_init_str   (&conf_data[CNF_INFOFILE]             , "/var/lib/amanda/curinfo");
 +    conf_init_str   (&conf_data[CNF_LOGDIR]               , "/var/lib/amanda");
 +    conf_init_str   (&conf_data[CNF_INDEXDIR]             , "/var/lib/amanda/index");
-     conf_init_ident    (&conf_data[CNF_TAPETYPE]             , "EXABYTE");
+     conf_init_ident    (&conf_data[CNF_TAPETYPE]             , "DEFAULT_TAPE");
+     conf_init_identlist(&conf_data[CNF_HOLDINGDISK]          , NULL);
      conf_init_int      (&conf_data[CNF_DUMPCYCLE]            , 10);
-     conf_init_int      (&conf_data[CNF_RUNSPERCYCLE]         , 0);
 diff -ur amanda-2.6.0/example/amanda.conf.in amanda-2.6.0-fhs/example/amanda.conf.in
 --- amanda-2.6.0/example/amanda.conf.in        2008-01-18 01:31:14.000000000 +0100
 +++ amanda-2.6.0-fhs/example/amanda.conf.in    2008-05-08 17:42:35.000000000 +0200
@@ -85,16 +80,16 @@ diff -ur amanda-2.6.0/server-src/amserverconfig.pl amanda-2.6.0-fhs/server-src/a
  
  
  sub create_curinfo_index_dir {
--    mkdir("$confdir/$config/curinfo", $def_perm) ||
--      &log_and_die ("ERROR: mkdir: $confdir/$config/curinfo failed: $!\n", 1);
--    mkdir("$confdir/$config/index", $def_perm) || 
--      &log_and_die ("ERROR: mkdir: $confdir/$config/index failed: $!\n", 1);
-+    mkdir("$localstatedir/lib/amanda/$config", $def_perm) ||
-+      &log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config failed: $!\n", 1);
-+    mkdir("$localstatedir/lib/amanda/$config/curinfo", $def_perm) ||
-+      &log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config/curinfo failed: $!\n", 1);
-+    mkdir("$localstatedir/lib/amanda/$config/index", $def_perm) || 
-+      &log_and_die ("ERROR: mkdir: $localstatedir/lib/amanda/$config/index failed: $!\n", 1);
+-    mkpath("$confdir/$config/curinfo", $def_perm) ||
+-      &log_and_die ("ERROR: mkpath: $confdir/$config/curinfo failed: $!\n", 1);
+-    mkpath("$confdir/$config/index", $def_perm) || 
+-      &log_and_die ("ERROR: mkpath: $confdir/$config/index failed: $!\n", 1);
++    mkpath("$localstatedir/lib/amanda/$config", $def_perm) ||
++      &log_and_die ("ERROR: mkpath: $localstatedir/lib/amanda/$config failed: $!\n", 1);
++    mkpath("$localstatedir/lib/amanda/$config/curinfo", $def_perm) ||
++      &log_and_die ("ERROR: mkpath: $localstatedir/lib/amanda/$config/curinfo failed: $!\n", 1);
++    mkpath("$localstatedir/lib/amanda/$config/index", $def_perm) || 
++      &log_and_die ("ERROR: mkpath: $localstatedir/lib/amanda/$config/index failed: $!\n", 1);
      &mprint ("curinfo and index directory created\n");
  }
  

diff --git a/amanda-heimdal.patch b/amanda-heimdal.patch
index 062284c16f8e783d5eb529f0bb7b04790df0aa3d..4448083fce10f26a470f829f7722318299b1460e 100644 (file)
--- a/amanda-heimdal.patch
+++ b/amanda-heimdal.patch
@@ -31,18 +31,7 @@
  
 --- amanda-2.6.0/common-src/security-util.h~   2008-01-18 01:31:41.000000000 +0100
 +++ amanda-2.6.0/common-src/security-util.h    2008-05-13 11:51:10.000000000 +0200
-@@ -51,7 +51,7 @@
- #  ifndef KRB5_HEIMDAL_INCLUDES
- #    include <gssapi/gssapi_generic.h>
- #  else
--#    include <gssapi/gssapi.h>
-+#    include <gssapi.h>
- #  endif
- #  include <krb5.h>
- #endif
---- amanda-2.6.1p1/common-src/security-util.h~ 2009-12-09 15:20:43.091037399 +0100
-+++ amanda-2.6.1p1/common-src/security-util.h  2009-12-09 15:21:33.612974357 +0100
-@@ -47,10 +47,10 @@
+@@ -47,11 +47,11 @@
  
  
  #ifdef KRB5_SECURITY
@@ -51,6 +40,8 @@
 +#    define KRB5_DEPRECATED 1
  #    include <gssapi/gssapi_generic.h>
  #  else
- #    include <gssapi.h>
+-#    include <gssapi/gssapi.h>
++#    include <gssapi.h>
  #  endif
  #  include <krb5.h>
+ #endif