packages: amanda/amanda-FHS.patch, amanda/amanda-heimdal.patch - updated to...
baggins
baggins at pld-linux.org
Thu Nov 25 14:25:08 CET 2010
Author: baggins Date: Thu Nov 25 13:25:08 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.2.0
---- Files affected:
packages/amanda:
amanda-FHS.patch (1.1 -> 1.2) , amanda-heimdal.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/amanda/amanda-FHS.patch
diff -u packages/amanda/amanda-FHS.patch:1.1 packages/amanda/amanda-FHS.patch:1.2
--- packages/amanda/amanda-FHS.patch:1.1 Thu May 8 17:49:14 2008
+++ packages/amanda/amanda-FHS.patch Thu Nov 25 14:25:03 2010
@@ -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 @@
+ 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 @@
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");
}
================================================================
Index: packages/amanda/amanda-heimdal.patch
diff -u packages/amanda/amanda-heimdal.patch:1.4 packages/amanda/amanda-heimdal.patch:1.5
--- packages/amanda/amanda-heimdal.patch:1.4 Wed Dec 9 15:22:36 2009
+++ packages/amanda/amanda-heimdal.patch Thu Nov 25 14:25:03 2010
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amanda/amanda-FHS.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amanda/amanda-heimdal.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list