1 files changed, 0 insertions, 81 deletions
diff --git a/app-backup/amanda/files/amanda-2.6.1_p1-gentoo.patch b/app-backup/amanda/files/amanda-2.6.1_p1-gentoo.patch
deleted file mode 100644
index 40329b4..0000000
--- a/app-backup/amanda/files/amanda-2.6.1_p1-gentoo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur amanda-2.6.1p1.orig/example/template.d/amanda-harddisk.conf.in amanda-2.6.1p1/example/template.d/amanda-harddisk.conf.in
---- amanda-2.6.1p1.orig/example/template.d/amanda-harddisk.conf.in	2008-12-02 06:17:16.000000000 +0900
-+++ amanda-2.6.1p1/example/template.d/amanda-harddisk.conf.in	2009-04-22 19:53:25.000000000 +0900
-@@ -11,7 +11,7 @@
-                                # cycle
- runtapes 1                     # number of tapes to be used in a single run of amdump
- tpchanger "chg-disk"           # the tape-changer glue script
--tapedev "file://var/lib/amanda/vtapes/@DEFAULT_CONFIG@" # the no-rewind tape device to be used
-+tapedev "file:/@localstatedir@/vtapes/@DEFAULT_CONFIG@" # the no-rewind tape device to be used
- changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf"
- changerdev "/dev/null"
- tapetype HARDDISK               # what kind of tape it is 
-diff -Naur amanda-2.6.1p1.orig/server-src/amaddclient.pl amanda-2.6.1p1/server-src/amaddclient.pl
---- amanda-2.6.1p1.orig/server-src/amaddclient.pl	2008-12-02 06:17:18.000000000 +0900
-+++ amanda-2.6.1p1/server-src/amaddclient.pl	2009-04-22 18:56:21.000000000 +0900
-@@ -30,7 +30,7 @@
- 
- my $prefix="@prefix@";
- my $localstatedir="@localstatedir@";
--my $amandahomedir="$localstatedir/lib/amanda";
-+my $amandahomedir="$localstatedir";
- 
- my $amanda_user="@CLIENT_LOGIN@";
- my $amanda_group="disk";
-@@ -487,9 +487,6 @@
- }
- }
- 
--&mprint ("File /var/lib/amanda/example/xinetd.amandaclient contains the latest Amanda client daemon configuration.\n");
--&mprint ("Please merge it to /etc/xinetd.d/amandaclient.\n");
-- 
- $ENV{'PATH'} = $oldPATH;
- close (LOG);
- 
-diff -Naur amanda-2.6.1p1.orig/server-src/amserverconfig.pl amanda-2.6.1p1/server-src/amserverconfig.pl
---- amanda-2.6.1p1.orig/server-src/amserverconfig.pl	2009-02-06 20:52:08.000000000 +0900
-+++ amanda-2.6.1p1/server-src/amserverconfig.pl	2009-04-22 19:48:15.000000000 +0900
-@@ -28,7 +28,7 @@
- 
- my $confdir="$CONFIG_DIR";
- my $tmpdir="$AMANDA_DBGDIR";
--my $amandahomedir="$localstatedir/lib/amanda";
-+my $amandahomedir="$localstatedir";
- my $templatedir="$amdatadir/template.d"; #rpm install template files here
- my $def_tapedev="file:$amandahomedir/vtapes";
- 
-@@ -120,12 +120,12 @@
- 
- # rpm installation should have taken care of these. Create one if it's not there
- sub check_gnutarlist_dir {
--    if ( -e "$amandahomedir/gnutar-lists" ) {
--	&mprint ("$amandahomedir/gnutar-lists directory exists\n");
-+    if ( -e $GNUTAR_LISTED_INCREMENTAL_DIR ) {
-+	&mprint ("$GNUTAR_LISTED_INCREMENTAL_DIR directory exists\n");
-     }
-     else {
--	mkdir ("$amandahomedir/gnutar-lists", $def_perm) ||
--	    &log_and_die ("ERROR: mkdir:$amandahomedir/gnutar-lists failed: $!\n", 0);
-+	mkdir ($GNUTAR_LISTED_INCREMENTAL_DIR, $def_perm) ||
-+	    &log_and_die ("ERROR: mkdir:$GNUTAR_LISTED_INCREMENTAL_DIR failed: $!\n", 0);
-     }
- }
- 
-@@ -399,8 +399,6 @@
- 
- 
- sub check_xinetd{
--    &mprint ("/var/lib/amanda/example/xinetd.amandaserver contains the latest Amanda server daemon configuration.\n");
--    &mprint ("Please merge it to /etc/xinetd.d/amandaserver.\n");
- }
- 
- 
-@@ -420,7 +418,7 @@
-     }
-       close NEWAUTH;
-       close PUB;
--      &mprint("$amandahomedir/.ssh/client_authorized_keys created. Please append to /var/lib/amanda/.ssh/authorized_keys file on Amanda clients\n");
-+      &mprint("$amandahomedir/.ssh/client_authorized_keys created. Please append to $amandahomedir/.ssh/authorized_keys file on Amanda clients\n");
-       }
-   }
- }