diff options
author | mjl <mjl@pkgsrc.org> | 2004-11-12 12:13:44 +0000 |
---|---|---|
committer | mjl <mjl@pkgsrc.org> | 2004-11-12 12:13:44 +0000 |
commit | df9cd3edaa37db7157543371733949c8a8000129 (patch) | |
tree | d1f225724e77f6dc963c4d3de1ea6f57cc98e737 /sysutils/amanda-common/patches | |
parent | 8458f9aed322d1a5a64b0db3978745078a025409 (diff) | |
download | pkgsrc-df9cd3edaa37db7157543371733949c8a8000129.tar.gz |
Update amanda to 2.4.4p4
Bug fix release and minor improvements:
new chg-iomega changer script.
amanda will not use a tape if it's label is not in the tapelist file.
amflush.c: Don't start a driver if nothing to flush.
amadmin.c: Call check_dumpuser() as soon as posible.
amadmin.c: Don't core dump if DUMPCYLE is too big.
dumper.c: Parse warning message.
Diffstat (limited to 'sysutils/amanda-common/patches')
-rw-r--r-- | sysutils/amanda-common/patches/patch-aa | 14 | ||||
-rw-r--r-- | sysutils/amanda-common/patches/patch-ab | 24 | ||||
-rw-r--r-- | sysutils/amanda-common/patches/patch-ac | 20 | ||||
-rw-r--r-- | sysutils/amanda-common/patches/patch-ae | 33 |
4 files changed, 41 insertions, 50 deletions
diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa index c9090ae94ef..7161a5c9ac0 100644 --- a/sysutils/amanda-common/patches/patch-aa +++ b/sysutils/amanda-common/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $ +$NetBSD: patch-aa,v 1.8 2004/11/12 12:13:45 mjl Exp $ ---- client-src/Makefile.in.orig 2004-01-08 10:22:34.000000000 -0800 -+++ client-src/Makefile.in 2004-02-23 16:26:20.000000000 -0800 -@@ -307,10 +307,8 @@ - sendsize_LDFLAGS = +--- client-src/Makefile.in.orig 2004-10-22 15:12:39.000000000 +0200 ++++ client-src/Makefile.in 2004-11-07 13:17:17.000000000 +0100 +@@ -134,10 +134,8 @@ + ../common-src/libamanda.$(LIB_EXTENSION) versionsuffix_SOURCES = versionsuffix.c versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) -versionsuffix_LDADD = $(LDADD) @@ -12,6 +12,6 @@ $NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $ - ../common-src/libamanda.$(LIB_EXTENSION) +versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) +versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) - versionsuffix_LDFLAGS = + libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) + sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) - diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab index c91b5def0b3..c59e9e85dda 100644 --- a/sysutils/amanda-common/patches/patch-ab +++ b/sysutils/amanda-common/patches/patch-ab @@ -1,19 +1,19 @@ -$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $ +$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $ ---- Makefile.in.orig 2004-01-08 10:21:29.000000000 -0800 -+++ Makefile.in 2004-02-23 16:30:27.000000000 -0800 -@@ -33,7 +33,7 @@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include +--- Makefile.in.orig 2004-10-22 15:12:38.000000000 +0200 ++++ Makefile.in 2004-11-07 13:23:31.000000000 +0100 +@@ -17,7 +17,7 @@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ +pkgdatadir = $(datadir)/doc/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -160,11 +160,11 @@ +@@ -269,11 +269,11 @@ + LIBTOOL_M4I = $(srcdir)/config/libtool.m4i ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I) - @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src -@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src +TAPE_SUBDIRS = tape-src @@ -21,16 +21,16 @@ $NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $ @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src -@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot -+#PLOT_SUBDIRS = amplot ++# PLOT_SUBDIRS = amplot # order is significant, don't change it arbitrarily SUBDIRS = \ config \ -@@ -175,7 +175,7 @@ +@@ -284,7 +284,7 @@ $(RESTORE_SUBDIRS) \ $(RECOVER_SUBDIRS) \ $(PLOT_SUBDIRS) \ - man docs example + man - pkgdata_DATA = \ + COPYRIGHT \ diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac index a11dad566f7..4375e1485b0 100644 --- a/sysutils/amanda-common/patches/patch-ac +++ b/sysutils/amanda-common/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.7 2004/07/09 12:21:26 salo Exp $ +$NetBSD: patch-ac,v 1.8 2004/11/12 12:13:45 mjl Exp $ ---- man/Makefile.in.orig Thu Jan 8 19:23:42 2004 -+++ man/Makefile.in Fri Jul 9 14:17:32 2004 -@@ -156,7 +156,7 @@ - am__quote = @am__quote@ - install_sh = @install_sh@ - +--- man/Makefile.in.orig 2004-10-22 15:12:40.000000000 +0200 ++++ man/Makefile.in 2004-11-07 13:25:11.000000000 +0100 +@@ -253,7 +253,7 @@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ -@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 -+#AMPLOT_MAN_PAGES = amplot.8 - ++# AMPLOT_MAN_PAGES = amplot.8 COMMON_MAN_PAGES = amanda.8 - + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ + @WANT_SERVER_TRUE@ amcheck.8 \ diff --git a/sysutils/amanda-common/patches/patch-ae b/sysutils/amanda-common/patches/patch-ae index 2eca1b57ca2..36953c18515 100644 --- a/sysutils/amanda-common/patches/patch-ae +++ b/sysutils/amanda-common/patches/patch-ae @@ -1,26 +1,17 @@ -$NetBSD: patch-ae,v 1.4 2004/05/28 09:20:37 bouyer Exp $ +$NetBSD: patch-ae,v 1.5 2004/11/12 12:13:45 mjl Exp $ ---- tape-src/Makefile.in.orig 2004-01-08 19:22:46.000000000 +0100 -+++ tape-src/Makefile.in 2004-05-12 14:35:59.000000000 +0200 -@@ -160,7 +160,7 @@ - lib_LTLIBRARIES = libamtape.la - LIB_EXTENSION = la - --sbin_PROGRAMS = ammt amdd amtapetype -+sbin_PROGRAMS = - - libamtape_la_SOURCES = output-file.c \ - output-null.c \ -@@ -217,7 +217,7 @@ - output-tape.lo tapeio.lo - libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS) - EXTRA_PROGRAMS = amtapeio$(EXEEXT) +--- tape-src/Makefile.in.orig 2004-10-22 15:12:42.000000000 +0200 ++++ tape-src/Makefile.in 2004-11-07 13:26:54.000000000 +0100 +@@ -41,7 +41,7 @@ + PRE_UNINSTALL = : + POST_UNINSTALL = : + host_triplet = @host@ -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) -+sbin_PROGRAMS = - PROGRAMS = $(sbin_PROGRAMS) - - amdd_SOURCES = amdd.c -@@ -519,7 +519,7 @@ ++sbin_PROGRAMS = + EXTRA_PROGRAMS = $(am__EXEEXT_1) + subdir = tape-src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ +@@ -622,7 +622,7 @@ install-data-am: |