diff options
Diffstat (limited to 'misc/amanda26-server/files')
| -rw-r--r-- | misc/amanda26-server/files/extra-patch-sendbackup-dump.c | 42 | ||||
| -rw-r--r-- | misc/amanda26-server/files/patch-aa | 31 | ||||
| -rw-r--r-- | misc/amanda26-server/files/patch-ab | 12 | ||||
| -rw-r--r-- | misc/amanda26-server/files/patch-ac | 11 | ||||
| -rw-r--r-- | misc/amanda26-server/files/patch-ad | 14 | ||||
| -rw-r--r-- | misc/amanda26-server/files/patch-ae | 14 | ||||
| -rw-r--r-- | misc/amanda26-server/files/patch-chg-zd-mtx.sh.in | 11 |
7 files changed, 0 insertions, 135 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 8d2e6b737c42..000000000000 --- a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index b52dbe5b5f3f..000000000000 --- a/misc/amanda26-server/files/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - 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 - SERVER_MAN8_PAGES = amadmin.8 \ - amcheck.8 \ - amcheckdb.8 \ -@@ -286,7 +286,7 @@ - amaespipe.8 - - @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) 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 c52b8e445369..000000000000 --- a/misc/amanda26-server/files/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ ---- 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); - -+#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"` - } - |
