4 files changed, 55 insertions, 42 deletions

diff --git a/misc/amanda-server/files/extra-patch-sendbackup-dump.c b/misc/amanda-server/files/extra-patch-sendbackup-dump.c
index 8d2e6b737c42..79764a121f76 100644
--- a/misc/amanda-server/files/extra-patch-sendbackup-dump.c
+++ b/misc/amanda-server/files/extra-patch-sendbackup-dump.c
@@ -1,14 +1,8 @@
-Index: client-src/sendbackup-dump.c
-===================================================================
-RCS file: /home/cvs/opensources/amanda/client-src/sendbackup-dump.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.5
-diff -u -r1.1.1.2 -r1.5
---- client-src/sendbackup-dump.c	25 Jun 2003 04:39:28 -0000	1.1.1.2
-+++ client-src/sendbackup-dump.c	25 Jun 2003 04:43:20 -0000	1.5
-@@ -40,6 +40,10 @@
- #define NAUGHTY_BITS			/* but then I'd have to kill you */
- #endif
+--- client-src/sendbackup-dump.c.orig	Fri Sep  8 13:09:14 2006
++++ client-src/sendbackup-dump.c	Fri Sep  8 13:15:44 2006
+@@ -35,6 +35,10 @@
+ #include "clock.h"
+ #include "version.h"
  
 +#ifdef __FreeBSD__
 +#include <sys/param.h>
@@ -16,8 +10,8 @@ diff -u -r1.1.1.2 -r1.5
 +
  #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'"
  
- static regex_t re_table[] = {
-@@ -306,6 +310,12 @@
+ static amregex_t re_table[] = {
+@@ -370,6 +374,12 @@
  
  	dumpkeys = vstralloc(level_str,
  			     options->no_record ? "" : "u",
@@ -30,9 +24,9 @@ diff -u -r1.1.1.2 -r1.5
  			     "s",
  #ifdef HAVE_HONOR_NODUMP
  			     "h",
-@@ -328,6 +338,9 @@
+@@ -392,6 +402,9 @@
  			    &dumpin, &dumpout, &mesgf, 
- 			    "dump",
+ 			    cmd, config,
  			    dumpkeys,
 +#ifdef __FreeBSD__
 +			    "64",
diff --git a/misc/amanda-server/files/patch-aa b/misc/amanda-server/files/patch-aa
index b52dbe5b5f3f..3f21a3181ae0 100644
--- a/misc/amanda-server/files/patch-aa
+++ b/misc/amanda-server/files/patch-aa
@@ -1,31 +1,39 @@
---- man/Makefile.in.orig	Mon May  8 20:51:44 2006
-+++ man/Makefile.in	Fri Jun  9 07:18:19 2006
-@@ -40,7 +40,7 @@
- @WANT_AMPLOT_TRUE@am__append_1 = $(AMPLOT_MAN8_PAGES)
- @WANT_SERVER_TRUE@am__append_2 = $(SERVER_MAN8_PAGES)
- @WANT_RECOVER_TRUE@am__append_3 = $(RECOVER_MAN8_PAGES)
--@WANT_RESTORE_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES)
-+@WANT_CLIENT_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES)
- subdir = man
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -260,8 +260,8 @@
+--- man/Makefile.in.orig	Tue Sep  5 23:08:22 2006
++++ man/Makefile.in	Thu Sep  7 14:14:52 2006
+@@ -193,8 +193,8 @@
+ WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@
+ WANT_RECOVER_FALSE = @WANT_RECOVER_FALSE@
+ WANT_RECOVER_TRUE = @WANT_RECOVER_TRUE@
+-WANT_RESTORE_FALSE = @WANT_RESTORE_FALSE@
+-WANT_RESTORE_TRUE = @WANT_RESTORE_TRUE@
++WANT_CLIENT_FALSE = @WANT_CLIENT_FALSE@
++WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@
+ WANT_RUNTIME_PSEUDO_RELOC_FALSE = @WANT_RUNTIME_PSEUDO_RELOC_FALSE@
+ WANT_RUNTIME_PSEUDO_RELOC_TRUE = @WANT_RUNTIME_PSEUDO_RELOC_TRUE@
+ WANT_SAMBA_FALSE = @WANT_SAMBA_FALSE@
+@@ -261,13 +261,13 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
- AMPLOT_MAN8_PAGES = amplot.8
+ @WANT_AMPLOT_TRUE@AMPLOT_MAN8_PAGES = amplot.8
 -COMMON_MAN8_PAGES = amanda.8
--COMMON_MAN5_PAGES = amanda.conf.5
+-COMMON_MAN5_PAGES = amanda.conf.5 \
 +@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8
-+@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5
- SERVER_MAN8_PAGES = amadmin.8 \
++@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 \
+ 		    amanda-client.conf.5
+ 
+ 
+ #if WANT_SERVER
+-SERVER_MAN8_PAGES = amadmin.8 \
++@WANT_SERVER_TRUE@SERVER_MAN8_PAGES = amadmin.8 \
  		    amcheck.8 \
  		    amcheckdb.8 \
-@@ -286,7 +286,7 @@
- 		    amaespipe.8
+ 		    amcleanup.8 \
+@@ -294,7 +294,7 @@
  
+ #endif
  @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8
 -@WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8
 +@WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8
- man8_MANS = $(COMMON_MAN8_PAGES) $(am__append_1) $(am__append_2) \
- 	$(am__append_3) $(am__append_4)
- man5_MANS = $(COMMON_MAN5_PAGES)
+ man8_MANS = $(COMMON_MAN8_PAGES) \
+ 	    $(AMPLOT_MAN8_PAGES) \
+ 	    $(SERVER_MAN8_PAGES) \
diff --git a/misc/amanda-server/files/patch-ae b/misc/amanda-server/files/patch-ae
index c52b8e445369..5b539bea3d43 100644
--- a/misc/amanda-server/files/patch-ae
+++ b/misc/amanda-server/files/patch-ae
@@ -1,9 +1,9 @@
---- client-src/sendbackup-gnutar.c.orig	Sat Jan  4 12:46:08 2003
-+++ client-src/sendbackup-gnutar.c	Thu Oct 23 19:22:31 2003
-@@ -480,7 +480,11 @@
- 
- 	start_index(options->createindex, dumpout, mesgf, indexf, indexcmd);
- 
+--- client-src/sendbackup-gnutar.c.orig	Wed Jul 26 03:35:21 2006
++++ client-src/sendbackup-gnutar.c	Thu Sep  7 12:13:59 2006
+@@ -543,7 +543,11 @@
+ 	    my_argv[i++] = g_options->config;
+ 	else
+ 	    my_argv[i++] = "NOCONFIG";
 +#ifdef GNUTAR
 +	my_argv[i++] = "GNUTAR";
 +#else
diff --git a/misc/amanda-server/files/patch-amanda.conf.5 b/misc/amanda-server/files/patch-amanda.conf.5
new file mode 100644
index 000000000000..ec18732bee43
--- /dev/null
+++ b/misc/amanda-server/files/patch-amanda.conf.5
@@ -0,0 +1,11 @@
+--- man/amanda.conf.5.orig	Wed Jun 14 16:11:30 2006
++++ man/amanda.conf.5	Wed Jun 14 16:13:12 2006
+@@ -627,7 +627,7 @@
+ Amount of space that can be used in this holding disk area.
+ If the value is zero, all available space on the file system is used.
+ If the value is negative, \fBAmanda\fR will use all available space minus that value.
+-  .TP
++.TP
+ \fBchunksize\fR \fB int\fR
+ 
+ Default: