5 files changed, 65 insertions, 23 deletions

diff --git a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c
new file mode 100644
index 000000000000..8d2e6b737c42
--- /dev/null
+++ b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c
@@ -0,0 +1,42 @@
+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
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
+ #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 @@
+ 
+ 	dumpkeys = vstralloc(level_str,
+ 			     options->no_record ? "" : "u",
++#ifdef __FreeBSD__
++			     "b",
++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043)
++			     "L",
++#endif
++#endif
+ 			     "s",
+ #ifdef HAVE_HONOR_NODUMP
+ 			     "h",
+@@ -328,6 +338,9 @@
+ 			    &dumpin, &dumpout, &mesgf, 
+ 			    "dump",
+ 			    dumpkeys,
++#ifdef __FreeBSD__
++			    "64",
++#endif
+ 			    "1048576",
+ #ifdef HAVE_HONOR_NODUMP
+ 			    "0",
diff --git a/misc/amanda26-server/files/patch-aa b/misc/amanda26-server/files/patch-aa
index c5029f0fdfde..3e14a6ca4b07 100644
--- a/misc/amanda26-server/files/patch-aa
+++ b/misc/amanda26-server/files/patch-aa
@@ -1,15 +1,15 @@
---- man/Makefile.in.orig	Fri Oct 22 09:12:40 2004
-+++ man/Makefile.in	Mon Nov  8 06:24:40 2004
-@@ -254,7 +254,7 @@
+--- man/Makefile.in.orig	Tue Oct 25 06:23:41 2005
++++ man/Makefile.in	Wed Mar 22 12:08:22 2006
+@@ -247,7 +247,7 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
--COMMON_MAN_PAGES = amanda.8
-+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8
+-COMMON_MAN_PAGES = amanda.8 amanda.conf.5
++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 amanda.conf.5
  @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \
  @WANT_SERVER_TRUE@		   amcheck.8 \
  @WANT_SERVER_TRUE@		   amcheckdb.8 \
-@@ -276,7 +276,7 @@
+@@ -269,7 +269,7 @@
  @WANT_SERVER_TRUE@		   amverifyrun.8
  
  @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8
@@ -17,4 +17,4 @@
 +@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8
  
  # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
+ EXTRA_DIST = amadmin.8 amanda.8 amanda.conf.5 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 amoverview.8 amplot.8 amreport.8 amrecover.8 amrestore.8 amrmtape.8 amstatus.8 amtape.8 amtapetype.8 amtoc.8 amverify.8 amverifyrun.8
diff --git a/misc/amanda26-server/files/patch-ac b/misc/amanda26-server/files/patch-ac
index c2af6273b054..a9e95a3a6607 100644
--- a/misc/amanda26-server/files/patch-ac
+++ b/misc/amanda26-server/files/patch-ac
@@ -1,9 +1,9 @@
---- tape-src/Makefile.in.orig	Fri Oct 22 09:12:42 2004
-+++ tape-src/Makefile.in	Mon Nov  8 06:27:54 2004
-@@ -41,7 +41,7 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
+--- tape-src/Makefile.in.orig	Tue Oct 25 06:23:42 2005
++++ tape-src/Makefile.in	Wed Mar 22 12:10:00 2006
+@@ -43,7 +43,7 @@
+ build_triplet = @build@
  host_triplet = @host@
+ target_triplet = @target@
 -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
 +@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
  EXTRA_PROGRAMS = $(am__EXEEXT_1)
diff --git a/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in
new file mode 100644
index 000000000000..555c4dffe362
--- /dev/null
+++ b/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in
@@ -0,0 +1,11 @@
+--- changer-src/chg-zd-mtx.sh.in.orig	Wed Feb  9 21:58:30 2005
++++ changer-src/chg-zd-mtx.sh.in	Wed Feb  9 21:58:49 2005
+@@ -413,7 +413,7 @@
+ 
+ IsNumeric() {
+ 	test -z "$1" && return 1
+-	x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`"
++	x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`"
+ 	return `expr X"$1" != X"$x"`
+ }
+ 
diff --git a/misc/amanda26-server/files/patch-server-src_infofile.c b/misc/amanda26-server/files/patch-server-src_infofile.c
deleted file mode 100644
index e826e411303e..000000000000
--- a/misc/amanda26-server/files/patch-server-src_infofile.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- server-src/infofile.c.orig	Wed Mar 16 11:15:28 2005
-+++ server-src/infofile.c	Thu Jul  7 14:12:54 2005
-@@ -274,7 +274,7 @@
-     rc = 0;
- 
-     nb_history = 0;
--    for(i=0;i<=NB_HISTORY+1;i++) {
-+    for(i=0;i<sizeof(info->history)/sizeof(info->history[0]);i++) {
- 	info->history[i].level = -2;
-     }
-     for(rc = -2; (line = agets(infof)) != NULL; free(line)) {