summaryrefslogtreecommitdiff
path: root/misc/amanda32-server/files
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2006-11-29 01:05:24 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2006-11-29 01:05:24 +0000
commit6f1bcedf57fdbda1b6f6e96c2d04ccb7200e943a (patch)
tree52e9953c873685536f9f9f69667e285b2f7edcdc /misc/amanda32-server/files
parent- Make X11BASE-clean. (diff)
- Upgrade to 2.5.1p2.
- Add a patch to fix amfetchdump to dump core [1]. - Fix GNUTAR, DUMP_SNAPSHOT options handling [2]. Submitted by: Andy Hilker <ah@cryptobank.de> [1][2] PR: ports/105635 [1], ports/105942 [2]
Notes
Notes: svn path=/head/; revision=178220
Diffstat (limited to 'misc/amanda32-server/files')
-rw-r--r--misc/amanda32-server/files/patch-amanda.conf.516
-rw-r--r--misc/amanda32-server/files/patch-restore.c18
2 files changed, 26 insertions, 8 deletions
diff --git a/misc/amanda32-server/files/patch-amanda.conf.5 b/misc/amanda32-server/files/patch-amanda.conf.5
index ec18732bee43..a1ef3a5c6eeb 100644
--- a/misc/amanda32-server/files/patch-amanda.conf.5
+++ b/misc/amanda32-server/files/patch-amanda.conf.5
@@ -1,11 +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.
+--- man/amanda.conf.5.orig Fri Nov 10 00:01:50 2006
++++ man/amanda.conf.5 Wed Nov 29 09:47:28 2006
+@@ -586,7 +586,7 @@
+ and put one space before it. The hostname column will be 10 characters wide with
+ no space to the left. The output KBytes column is seven characters wide
+ with one space before it.
- .TP
+.TP
- \fBchunksize\fR \fB int\fR
-
+ \fBincludefile\fR \fB string\fR
Default:
+ \fBnone\fR. The name of an
diff --git a/misc/amanda32-server/files/patch-restore.c b/misc/amanda32-server/files/patch-restore.c
new file mode 100644
index 000000000000..2c0d8a8fab66
--- /dev/null
+++ b/misc/amanda32-server/files/patch-restore.c
@@ -0,0 +1,18 @@
+--- restore-src/restore.c.orig Wed Nov 29 09:49:01 2006
++++ restore-src/restore.c Wed Nov 29 09:49:19 2006
+@@ -1692,13 +1692,13 @@
+ seentapes_t *seentapes = NULL;
+ int ret;
+
++ if(!prompt_out) prompt_out = stderr;
++
+ dbprintf(("search_tapes(prompt_out=%d, prompt_in=%d, use_changer=%d, "
+ "tapelist=%p, "
+ "match_list=%p, flags=%p, features=%p)\n",
+ fileno(prompt_out), fileno(prompt_in), use_changer, tapelist,
+ match_list, flags, their_features));
+-
+- if(!prompt_out) prompt_out = stderr;
+
+ if(flags->blocksize)
+ blocksize = (size_t)flags->blocksize;