summaryrefslogtreecommitdiff
path: root/misc/amanda26-server/files
diff options
context:
space:
mode:
Diffstat (limited to 'misc/amanda26-server/files')
-rw-r--r--misc/amanda26-server/files/extra-patch-sendbackup-dump.c36
-rw-r--r--misc/amanda26-server/files/patch-aa39
-rw-r--r--misc/amanda26-server/files/patch-ab12
-rw-r--r--misc/amanda26-server/files/patch-ac11
-rw-r--r--misc/amanda26-server/files/patch-ad14
-rw-r--r--misc/amanda26-server/files/patch-ae14
-rw-r--r--misc/amanda26-server/files/patch-chg-zd-mtx.sh.in11
-rw-r--r--misc/amanda26-server/files/patch-sendsize.c11
8 files changed, 0 insertions, 148 deletions
diff --git a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c
deleted file mode 100644
index 79764a121f76..000000000000
--- a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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>
-+#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 amregex_t re_table[] = {
-@@ -370,6 +374,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",
-@@ -392,6 +402,9 @@
- &dumpin, &dumpout, &mesgf,
- cmd, config,
- 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
deleted file mode 100644
index 3f21a3181ae0..000000000000
--- a/misc/amanda26-server/files/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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@
- @WANT_AMPLOT_TRUE@AMPLOT_MAN8_PAGES = amplot.8
--COMMON_MAN8_PAGES = amanda.8
--COMMON_MAN5_PAGES = amanda.conf.5 \
-+@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.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 \
- 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) \
- $(AMPLOT_MAN8_PAGES) \
- $(SERVER_MAN8_PAGES) \
diff --git a/misc/amanda26-server/files/patch-ab b/misc/amanda26-server/files/patch-ab
deleted file mode 100644
index 4f6bc0ca5d58..000000000000
--- a/misc/amanda26-server/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- common-src/Makefile.in Fri Nov 30 11:33:48 2001
-+++ common-src/Makefile.in.new Fri Nov 30 18:03:29 2001
-@@ -611,7 +611,8 @@
-
- install-data-am:
-
--install-exec-am: install-libLTLIBRARIES
-+@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES
-+@WANT_SERVER_TRUE@install-exec-am:
-
- install-info:
-
diff --git a/misc/amanda26-server/files/patch-ac b/misc/amanda26-server/files/patch-ac
deleted file mode 100644
index a9e95a3a6607..000000000000
--- a/misc/amanda26-server/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
- subdir = tape-src
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
diff --git a/misc/amanda26-server/files/patch-ad b/misc/amanda26-server/files/patch-ad
deleted file mode 100644
index 8d41e16eb9cb..000000000000
--- a/misc/amanda26-server/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- client-src/calcsize.c.orig Mon Nov 4 20:37:53 2002
-+++ client-src/calcsize.c Thu Oct 23 19:25:07 2003
-@@ -130,7 +130,11 @@
- dump_total += (ST_BLOCKS(finfo) + 1)/2 + 1;
- gtar_total += ROUND(4,(ST_BLOCKS(finfo) + 1));
- }
-+#ifdef GNUTAR
-+ printf(" GNUTAR dump\n");
-+#else
- printf(" gtar dump\n");
-+#endif
- printf("total %-9lu %-9lu\n",gtar_total,dump_total);
- return 0;
- #else
diff --git a/misc/amanda26-server/files/patch-ae b/misc/amanda26-server/files/patch-ae
deleted file mode 100644
index 5b539bea3d43..000000000000
--- a/misc/amanda26-server/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
- my_argv[i++] = "gtar";
-+#endif
- my_argv[i++] = "--create";
- my_argv[i++] = "--file";
- my_argv[i++] = "-";
diff --git a/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in
deleted file mode 100644
index 555c4dffe362..000000000000
--- a/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-sendsize.c b/misc/amanda26-server/files/patch-sendsize.c
deleted file mode 100644
index 1279be968739..000000000000
--- a/misc/amanda26-server/files/patch-sendsize.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- client-src/sendsize.c.orig Thu Feb 15 11:11:39 2007
-+++ client-src/sendsize.c Thu Feb 15 11:12:03 2007
-@@ -1190,7 +1190,7 @@
- # endif
- dumpkeys = vstralloc(level_str,
- PARAM_DUMP_ESTIMATE,
-- PARAM_DUMP_ESTIMATE,
-+ PARAM_HONOR_NODUMP,
- "s", "f", NULL);
-
- # ifdef HAVE_DUMP_ESTIMATE