diff options
47 files changed, 911 insertions, 695 deletions
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index ffa59de69f3..a9c19e467fc 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,22 +1,22 @@ -# $NetBSD: Makefile,v 1.44 2007/11/08 19:39:42 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2008/02/15 16:23:09 gdt Exp $ # PKGNAME= amanda-client-${VERS} -PKGREVISION= 5 SVR4_PKGNAME= amacl COMMENT= Client part of Amanda, a network backup system GNU_CONFIGURE= yes +USE_TOOLS+= awk:run perl:run .include "../../mk/bsd.prefs.mk" .include "../../sysutils/amanda-common/Makefile.common" .include "../../sysutils/amanda-common/buildlink3.mk" #.include "../../devel/readline/buildlink3.mk" -CONFIGURE_ARGS+= --without-server --without-restore +CONFIGURE_ARGS+= --without-server -BUILD_DEFS+= AMANDA_DUMP_SNAP +BUILD_DEFS+= AMANDA_SMB AMANDA_DUMP_SNAP # Prevent configure script from finding unnecessary libraries. We'll patch # the amrecover Makefile to add the readline libraries as it's the only diff --git a/sysutils/amanda-client/PLIST b/sysutils/amanda-client/PLIST index 62372a7899c..fea02ef25a4 100644 --- a/sysutils/amanda-client/PLIST +++ b/sysutils/amanda-client/PLIST @@ -1,9 +1,11 @@ -@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:53 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/02/15 16:23:09 gdt Exp $ +dumper/amgtar +dumper/generic-dumper lib/libamclient.la libexec/amandad -libexec/amqde libexec/calcsize libexec/killpgrp +libexec/noop libexec/patch-system libexec/rundump libexec/runtar @@ -12,4 +14,6 @@ libexec/sendbackup libexec/sendsize libexec/versionsuffix man/man8/amrecover.8 +sbin/amoldrecover sbin/amrecover +@dirrm dumper diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo index 8b3a3f75ac7..234a170b10d 100644 --- a/sysutils/amanda-client/distinfo +++ b/sysutils/amanda-client/distinfo @@ -1,14 +1,16 @@ -$NetBSD: distinfo,v 1.8 2006/03/16 19:13:57 bouyer Exp $ +$NetBSD: distinfo,v 1.9 2008/02/15 16:23:09 gdt Exp $ -SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6 -RMD160 (amanda-2.4.4p4.tar.gz) = d145a5ebb0df340af6aee0e8a15da6b54dfb3051 -Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes -SHA1 (patch-aa) = 2a7dde94ea59ed017d3b05fc33fd98b840126cfb -SHA1 (patch-ab) = c37b50640d53619ef5ec07d6e63817b3070b7e66 -SHA1 (patch-ac) = e04871589a719e1b1502f8609cf6e04cc6f76428 -SHA1 (patch-ad) = b0ce806ccb513674b68ef1bf2e683d2191636717 -SHA1 (patch-ae) = 2eb02a96fc493a2093dd73ff9e38eb82ca08a7ea -SHA1 (patch-af) = 2cdea33419fbdce2854c4e9911d1193c5b96aa9b -SHA1 (patch-ag) = 0a98cce093882315b8f9df2f732d6596ade64e7f -SHA1 (patch-ah) = 7a06873415a058518afb6ebd0829ff97840ebdf9 -SHA1 (patch-ai) = 11d1012fb1e95aea4bbf0933f4c601ea3581de7c +SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 +RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 +Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes +SHA1 (patch-aa) = b76a56b28aba238d838764b9d562e29cbb882553 +SHA1 (patch-ab) = c2b966dae6007ae320b0f31051d463e4e51b054b +SHA1 (patch-ac) = 6327632e03e635c515789db9590d2eee6ebf121b +SHA1 (patch-ad) = 0cef70057b2003ac9de7ac130c84746504981a95 +SHA1 (patch-ae) = 00f5f000c0d6ff3e655ecbbe30183529bb244b66 +SHA1 (patch-af) = 97c97b0ea1b73c03606e9cea6921391c569538d2 +SHA1 (patch-ag) = dbf2a86ad1bf394cd47bdf6f8e8b279fe621ce04 +SHA1 (patch-ah) = 9df6c042739b6948d4dd61e5b66cad81b86de792 +SHA1 (patch-ai) = 40a5114c5aa5d467982546af5de960cfeff96c60 +SHA1 (patch-aj) = 9e466b4c244d64c7840ab890d75d56ad61980b62 +SHA1 (patch-ak) = 57e38ec30763c53d9a576865fe76772b033f8301 diff --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa index 0eafb0c9125..d354db6be55 100644 --- a/sysutils/amanda-client/patches/patch-aa +++ b/sysutils/amanda-client/patches/patch-aa @@ -1,35 +1,28 @@ -$NetBSD: patch-aa,v 1.6 2004/11/12 12:13:44 mjl Exp $ +$NetBSD: patch-aa,v 1.7 2008/02/15 16:23:09 gdt Exp $ ---- Makefile.in.orig 2004-10-22 15:12:38.000000000 +0200 -+++ Makefile.in 2004-11-08 00:35:11.000000000 +0100 -@@ -277,19 +277,15 @@ - # order is significant, don't change it arbitrarily +Remove SUBDIRS and DATA that we don't want in -client package. + +--- Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ Makefile.in +@@ -382,19 +382,12 @@ ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACIN SUBDIRS = \ + gnulib \ config \ - common-src \ + amandad-src \ +- $(TAPE_SUBDIRS) \ $(CLIENT_SUBDIRS) \ - $(TAPE_SUBDIRS) \ - $(SERVER_SUBDIRS) \ - $(RESTORE_SUBDIRS) \ +- $(SERVER_SUBDIRS) \ +- $(RESTORE_SUBDIRS) \ $(RECOVER_SUBDIRS) \ - $(PLOT_SUBDIRS) \ +- $(PLOT_SUBDIRS) \ - man docs example + man -pkgdata_DATA = \ -- COPYRIGHT \ -- COPYRIGHT-APACHE \ -- COPYRIGHT-REGEX +- ReleaseNotes \ +- COPYRIGHT +pkgdata_DATA = EXTRA_DIST = $(SNAPSHOT_STAMP) \ $(pkgdata_DATA) \ -@@ -676,7 +672,7 @@ - uninstall: uninstall-recursive - - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - - installcheck: installcheck-recursive - install-strip: diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab index 27cec6a2659..3f101658a9c 100644 --- a/sysutils/amanda-client/patches/patch-ab +++ b/sysutils/amanda-client/patches/patch-ab @@ -1,15 +1,29 @@ -$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:44 mjl Exp $ +$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- man/Makefile.in.orig 2004-10-22 15:12:40.000000000 +0200 -+++ man/Makefile.in 2004-11-08 00:36:33.000000000 +0100 -@@ -280,9 +280,7 @@ +Don't install any manpages except client-specific ones, namely +RECOVER_MAN8_PAGES. + +--- man/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 ++++ man/Makefile.in +@@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \ + #endif + @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 + @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +-man8_pages = $(COMMON_MAN8_PAGES) \ +- $(AMPLOT_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ +- $(RESTORE_MAN8_PAGES) ++man8_pages = $(RECOVER_MAN8_PAGES) + + man5_pages = $(COMMON_MAN5_PAGES) +-ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ +- $(COMMON_MAN5_PAGES) \ +- $(COMMON_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ +- $(RESTORE_MAN8_PAGES) ++ALL_MAN_PAGES = $(RECOVER_MAN8_PAGES) - # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 --man_MANS = $(AMPLOT_MAN_PAGES) \ -- $(COMMON_MAN_PAGES) \ -- $(SERVER_MAN_PAGES) \ -+man_MANS = $(SERVER_MAN_PAGES) \ - $(RECOVER_MAN_PAGES) \ - $(RESTORE_MAN_PAGES) + # These lines are needed to force automake to set the $man<n>dir variables. diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac index 5ee3c27a123..cf0e17bfbb4 100644 --- a/sysutils/amanda-client/patches/patch-ac +++ b/sysutils/amanda-client/patches/patch-ac @@ -1,97 +1,117 @@ -$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:44 mjl Exp $ +$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- client-src/Makefile.in.orig 2004-10-22 15:12:39.000000000 +0200 -+++ client-src/Makefile.in 2004-11-08 00:42:06.000000000 +0100 -@@ -74,70 +74,48 @@ - amandad_SOURCES = amandad.c - amandad_OBJECTS = amandad.$(OBJEXT) - amandad_LDADD = $(LDADD) --amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - amqde_SOURCES = amqde.c - amqde_OBJECTS = amqde.$(OBJEXT) - amqde_LDADD = $(LDADD) --amqde_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amqde_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +--- client-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ client-src/Makefile.in +@@ -115,83 +115,53 @@ PROGRAMS = $(libexec_PROGRAMS) calcsize_SOURCES = calcsize.c calcsize_OBJECTS = calcsize.$(OBJEXT) calcsize_LDADD = $(LDADD) -calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) am_getfsent_OBJECTS = getfsent.test.$(OBJEXT) getfsent_OBJECTS = $(am_getfsent_OBJECTS) getfsent_LDADD = $(LDADD) -getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) killpgrp_SOURCES = killpgrp.c killpgrp_OBJECTS = killpgrp.$(OBJEXT) killpgrp_LDADD = $(LDADD) -killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) + noop_SOURCES = noop.c + noop_OBJECTS = noop.$(OBJEXT) + noop_LDADD = $(LDADD) +-noop_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamclient.$(LIB_EXTENSION) \ +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++noop_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) rundump_SOURCES = rundump.c rundump_OBJECTS = rundump.$(OBJEXT) rundump_LDADD = $(LDADD) -rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) runtar_SOURCES = runtar.c runtar_OBJECTS = runtar.$(OBJEXT) runtar_LDADD = $(LDADD) -runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) selfcheck_SOURCES = selfcheck.c selfcheck_OBJECTS = selfcheck.$(OBJEXT) selfcheck_LDADD = $(LDADD) -selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \ sendbackup-gnutar.$(OBJEXT) sendbackup_OBJECTS = $(am_sendbackup_OBJECTS) sendbackup_LDADD = $(LDADD) -sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) sendsize_SOURCES = sendsize.c sendsize_OBJECTS = sendsize.$(OBJEXT) sendsize_LDADD = $(LDADD) -sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) versionsuffix_SOURCES = versionsuffix.c versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) versionsuffix_LDADD = $(LDADD) -versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) - SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) -@@ -382,9 +360,7 @@ +@@ -489,11 +459,10 @@ libamclient_la_LDFLAGS = -release $(VERS # need to list libamanda twice here, first to override the system library # routines, and second to pick up any references in the other libraries. ### -LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = libamclient.$(LIB_EXTENSION) -lamanda +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../gnulib/libgnu.$(LIB_EXTENSION) ++LDADD = libamclient.$(LIB_EXTENSION) \ ++ ../gnulib/libgnu.$(LIB_EXTENSION) \ ++ -lamanda \ ++ -lamandad SUFFIXES = .sh .pl diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad index 64ac61a6f94..4a63227bf8d 100644 --- a/sysutils/amanda-client/patches/patch-ad +++ b/sysutils/amanda-client/patches/patch-ad @@ -1,19 +1,22 @@ -$NetBSD: patch-ad,v 1.7 2004/11/12 12:13:44 mjl Exp $ +$NetBSD: patch-ad,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- recover-src/Makefile.in.orig 2004-10-22 15:12:41.000000000 +0200 -+++ recover-src/Makefile.in 2004-11-08 00:44:56.000000000 +0100 -@@ -61,9 +61,7 @@ +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +--- recover-src/Makefile.in.orig 2007-06-06 19:22:53.000000000 -0400 ++++ recover-src/Makefile.in +@@ -97,9 +97,7 @@ am_amrecover_OBJECTS = $(am__objects_1) amrecover_OBJECTS = $(am_amrecover_OBJECTS) amrecover_LDADD = $(LDADD) am__DEPENDENCIES_1 = -amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - ../client-src/libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) -+amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp - am__depfiles_maybe = depfiles -@@ -291,10 +289,9 @@ +@@ -386,11 +384,10 @@ LIB_EXTENSION = la # need to list libamanda twice here, first to override the system library # routines, and second to pick up any references in the other libraries. ### @@ -22,7 +25,8 @@ $NetBSD: patch-ad,v 1.7 2004/11/12 12:13:44 mjl Exp $ +LDADD = @LEXLIB@ \ ../client-src/libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) \ + -lamanda \ $(READLINE_LIBS) - amrecover_SOURCES = amrecover.c \ + amrecover_CSRC = amrecover.c \ diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae index 0cf2887a833..e08f7b3dd1b 100644 --- a/sysutils/amanda-client/patches/patch-ae +++ b/sysutils/amanda-client/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.8 2006/03/16 19:13:57 bouyer Exp $ +$NetBSD: patch-ae,v 1.9 2008/02/15 16:23:09 gdt Exp $ ---- configure.in.orig 2004-10-22 15:12:14.000000000 +0200 -+++ configure.in 2006-02-17 17:22:12.000000000 +0100 -@@ -1488,6 +1488,44 @@ +--- configure.in.orig 2007-06-06 19:22:24.000000000 -0400 ++++ configure.in +@@ -1838,6 +1838,44 @@ if test "$DUMP" -a "$RESTORE"; then AC_DEFINE(HAVE_HONOR_NODUMP,1,[Define this if dump accepts -h for honoring nodump. ]) fi ]) diff --git a/sysutils/amanda-client/patches/patch-af b/sysutils/amanda-client/patches/patch-af index 69755716cb6..41d7758aad1 100644 --- a/sysutils/amanda-client/patches/patch-af +++ b/sysutils/amanda-client/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2006/03/16 19:13:57 bouyer Exp $ +$NetBSD: patch-af,v 1.5 2008/02/15 16:23:09 gdt Exp $ ---- config/config.h.in.orig 2006-02-17 18:06:04.000000000 +0100 -+++ config/config.h.in 2006-02-17 18:06:46.000000000 +0100 -@@ -373,6 +373,9 @@ +--- config/config.h.in.orig 2007-06-06 19:23:42.000000000 -0400 ++++ config/config.h.in +@@ -440,6 +440,9 @@ /* Define this if dump accepts -h for honoring nodump. */ #undef HAVE_HONOR_NODUMP diff --git a/sysutils/amanda-client/patches/patch-ag b/sysutils/amanda-client/patches/patch-ag index b082ff36355..395bfbbf1a7 100644 --- a/sysutils/amanda-client/patches/patch-ag +++ b/sysutils/amanda-client/patches/patch-ag @@ -1,11 +1,11 @@ -$NetBSD: patch-ag,v 1.4 2006/03/16 19:13:57 bouyer Exp $ +$NetBSD: patch-ag,v 1.5 2008/02/15 16:23:09 gdt Exp $ ---- client-src/sendbackup-dump.c.orig 2006-02-17 18:07:17.000000000 +0100 -+++ client-src/sendbackup-dump.c 2006-02-17 18:08:53.000000000 +0100 -@@ -310,6 +310,9 @@ - #ifdef HAVE_HONOR_NODUMP - "h", - #endif +--- client-src/sendbackup-dump.c.orig 2007-05-04 07:39:05.000000000 -0400 ++++ client-src/sendbackup-dump.c +@@ -388,6 +388,9 @@ start_backup( + options->no_record ? "" : "u", + "s", + PARAM_HONOR_NODUMP, +#ifdef HAVE_DUMP_SNAPSHOT + "X", +#endif diff --git a/sysutils/amanda-client/patches/patch-ah b/sysutils/amanda-client/patches/patch-ah index 9e44a739bbc..6cf4ae7d739 100644 --- a/sysutils/amanda-client/patches/patch-ah +++ b/sysutils/amanda-client/patches/patch-ah @@ -1,11 +1,11 @@ -$NetBSD: patch-ah,v 1.1 2006/03/16 19:13:57 bouyer Exp $ +$NetBSD: patch-ah,v 1.2 2008/02/15 16:23:09 gdt Exp $ ---- client-src/sendsize.c.orig 2006-02-17 18:09:16.000000000 +0100 -+++ client-src/sendsize.c 2006-02-17 18:09:54.000000000 +0100 -@@ -873,6 +873,9 @@ - # ifdef HAVE_HONOR_NODUMP /* { */ - "h", - # endif /* } */ +--- client-src/sendsize.c.orig 2007-05-15 14:14:58.000000000 -0400 ++++ client-src/sendsize.c +@@ -1272,6 +1272,9 @@ getsize_dump( + dumpkeys = vstralloc(level_str, + PARAM_DUMP_ESTIMATE, + PARAM_HONOR_NODUMP, +# ifdef HAVE_DUMP_SNAPSHOT /* { */ + "X", +# endif /* } */ diff --git a/sysutils/amanda-client/patches/patch-ai b/sysutils/amanda-client/patches/patch-ai index 5dc4630da1d..e59331536a9 100644 --- a/sysutils/amanda-client/patches/patch-ai +++ b/sysutils/amanda-client/patches/patch-ai @@ -1,16 +1,28 @@ -$NetBSD: patch-ai,v 1.1 2006/03/16 19:13:57 bouyer Exp $ +$NetBSD: patch-ai,v 1.2 2008/02/15 16:23:09 gdt Exp $ ---- configure.orig 2004-10-22 15:12:36.000000000 +0200 -+++ configure 2006-02-17 18:15:31.000000000 +0100 -@@ -1094,6 +1094,7 @@ - --with-debug-days=NN number of days to keep debugging files default=4 - --with-testing=suffix use alternate service names +--- configure.orig 2007-06-06 19:22:45.000000000 -0400 ++++ configure +@@ -1119,6 +1119,7 @@ Optional Packages: + --with-testing[=suffix] use alternate service names + --with-gnuplot=PATH use gnuplot executable at PATH in amplot --with-dump-honor-nodump if dump supports -h, use it for level0s too + --with-dump-use-snapshot if dump supports -X, use it --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] -@@ -9701,6 +9702,72 @@ +@@ -13538,7 +13539,10 @@ echo $ECHO_N "checking SSH options... $E + # now convert that to a comma-separated list of C strings + eval "set dummy ${SSH_OPTIONS}"; shift + SSH_OPTIONS='' +- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done ++ for i in "${@}"; do ++ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" ++ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; ++ done + echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 + echo "${ECHO_T}$SSH_OPTIONS" >&6 + +@@ -18808,6 +18812,72 @@ _ACEOF fi fi; @@ -83,3 +95,12 @@ $NetBSD: patch-ai,v 1.1 2006/03/16 19:13:57 bouyer Exp $ fi for ac_prog in xfsdump +@@ -62491,7 +62561,7 @@ fi; + # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. + if test "${with_xsltproc_flags+set}" = set; then + withval="$with_xsltproc_flags" +- if test "x$withval" == "xno"; then ++ if test "x$withval" = "xno"; then + XSLTPROC_FLAGS='' + else + if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-client/patches/patch-aj b/sysutils/amanda-client/patches/patch-aj new file mode 100644 index 00000000000..96937835ad4 --- /dev/null +++ b/sysutils/amanda-client/patches/patch-aj @@ -0,0 +1,43 @@ +$NetBSD: patch-aj,v 1.1 2008/02/15 16:23:09 gdt Exp $ + +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +Also, install amandad executable only, since libamandad is installed by +amanda-common. + +--- amandad-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ amandad-src/Makefile.in +@@ -105,10 +105,7 @@ PROGRAMS = $(libexec_PROGRAMS) + amandad_SOURCES = amandad.c + amandad_OBJECTS = amandad.$(OBJEXT) + amandad_LDADD = $(LDADD) +-amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../gnulib/libgnu.$(LIB_EXTENSION) ++amandad_DEPENDENCIES = ../gnulib/libgnu.$(LIB_EXTENSION) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config + depcomp = $(SHELL) $(top_srcdir)/config/depcomp + am__depfiles_maybe = depfiles +@@ -379,7 +376,7 @@ INCLUDES = -I$(top_builddir)/common-src + + LINT = @AMLINT@ + LINTFLAGS = @AMLINTFLAGS@ +-lib_LTLIBRARIES = libamandad.la ++# lib_LTLIBRARIES = libamandad.la + LIB_EXTENSION = la + @WANT_RUNTIME_PSEUDO_RELOC_TRUE@AM_LDFLAGS = -Wl,-enable-runtime-pseudo-reloc + libamandad_la_SOURCES = amandad_util.c +@@ -392,10 +389,7 @@ noinst_HEADERS = amandad.h + # need to list libamanda twice here, first to override the system library + # routines, and second to pick up any references in the other libraries. + ### +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamandad.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../gnulib/libgnu.$(LIB_EXTENSION) ++LDADD = ../gnulib/libgnu.$(LIB_EXTENSION) -lamanda -lamandad + + all: all-am + diff --git a/sysutils/amanda-client/patches/patch-ak b/sysutils/amanda-client/patches/patch-ak new file mode 100644 index 00000000000..45d28b9bd36 --- /dev/null +++ b/sysutils/amanda-client/patches/patch-ak @@ -0,0 +1,35 @@ +$NetBSD: patch-ak,v 1.1 2008/02/15 16:23:09 gdt Exp $ + +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +--- oldrecover-src/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 ++++ oldrecover-src/Makefile.in +@@ -97,9 +97,8 @@ am_amoldrecover_OBJECTS = $(am__objects_ + amoldrecover_OBJECTS = $(am_amoldrecover_OBJECTS) + amoldrecover_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-amoldrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../client-src/libamclient.$(LIB_EXTENSION) \ +- $(am__DEPENDENCIES_1) ../common-src/libamanda.$(LIB_EXTENSION) \ ++amoldrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) \ ++ $(am__DEPENDENCIES_1) \ + ../gnulib/libgnu.$(LIB_EXTENSION) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config + depcomp = $(SHELL) $(top_srcdir)/config/depcomp +@@ -386,12 +385,11 @@ LIB_EXTENSION = la + # need to list libamanda twice here, first to override the system library + # routines, and second to pick up any references in the other libraries. + ### +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- @LEXLIB@ \ ++LDADD = @LEXLIB@ \ + ../client-src/libamclient.$(LIB_EXTENSION) \ + $(READLINE_LIBS) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../gnulib/libgnu.$(LIB_EXTENSION) ++ ../gnulib/libgnu.$(LIB_EXTENSION) \ ++ -lamanda + + amoldrecover_CSRC = amrecover.c \ + display_commands.c extract_list.c \ diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index d72a09142b7..bb95632633e 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.43 2007/11/08 19:39:42 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2008/02/15 16:23:09 gdt Exp $ PKGNAME= amanda-common-${VERS} -PKGREVISION= 5 SVR4_PKGNAME= amaco COMMENT= Common libraries and binaries for Amanda @@ -16,7 +15,7 @@ CPPFLAGS= # empty CPPFLAGS+= -D_LARGEFILE64_SOURCE .endif -CONFIGURE_ARGS+= --without-server --without-restore --without-client +CONFIGURE_ARGS+= --without-server --without-client # Prevent configure script from finding unnecessary libraries. # diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 8efb9d2f19a..df0252a3f86 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,9 +1,11 @@ -# $NetBSD: Makefile.common,v 1.25 2007/07/04 20:54:59 jlam Exp $ -# -# common make file fragment shared by all amanda-* pkgs. -# +# $NetBSD: Makefile.common,v 1.26 2008/02/15 16:23:09 gdt Exp $ -VERS= 2.4.4p4 +# used by sysutils/amanda-common/Makefile +# used by sysutils/amanda-client/Makefile +# used by sysutils/amanda-server/Makefile +# used by sysutils/amanda-plot/Makefile + +VERS= 2.5.2p1 DISTNAME?= amanda-${VERS} CATEGORIES= sysutils MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} @@ -26,7 +28,7 @@ AMANDA_VAR?= ${VARBASE}/amanda PKG_GROUPS_VARS+= AMANDA_GROUP PKG_USERS_VARS+= AMANDA_USER -BUILD_DEFS+= AMANDA_SMB AMANDA_TMP AMANDA_VAR VARBASE +BUILD_DEFS+= AMANDA_TMP AMANDA_VAR VARBASE USE_LIBTOOL= yes @@ -45,3 +47,13 @@ CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q} CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists CONFIGURE_ARGS+= --with-dump-honor-nodump CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} + +BUILD_DEFS+= AMANDA_SSH AMANDA_FQDN + +.if defined(AMANDA_FQDN) && !empty(AMANDA_FQDN:M[yY][eE][sS]) +CONFIGURE_ARGS+= --with-fqdn +.endif + +.if defined(AMANDA_SSH) && !empty(AMANDA_SSH:M[yY][eE][sS]) +CONFIGURE_ARGS+= --with-ssh-security +.endif diff --git a/sysutils/amanda-common/PLIST b/sysutils/amanda-common/PLIST index e612d9a44f3..c40cd447a2a 100644 --- a/sysutils/amanda-common/PLIST +++ b/sysutils/amanda-common/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.4 2005/11/03 13:45:17 rillig Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/02/15 16:23:09 gdt Exp $ lib/libamanda.la -lib/libamtape.la +lib/libamandad.la +man/man5/amanda-client.conf.5 +man/man5/amanda.conf.5 man/man8/amanda.8 share/doc/amanda/COPYRIGHT -share/doc/amanda/COPYRIGHT-APACHE -share/doc/amanda/COPYRIGHT-REGEX +share/doc/amanda/ReleaseNotes @dirrm share/doc/amanda diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk index a891e2d5d86..ffed3925cfc 100644 --- a/sysutils/amanda-common/buildlink3.mk +++ b/sysutils/amanda-common/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:08 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2008/02/15 16:23:09 gdt Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AMANDA_COMMON_BUILDLINK3_MK:= ${AMANDA_COMMON_BUILDLINK3_MK}+ @@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= amanda-common BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}amanda-common .if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.amanda-common+= amanda-common>=2.4.4p4nb2 -BUILDLINK_ABI_DEPENDS.amanda-common+= amanda-common>=2.4.4p4nb3 +BUILDLINK_API_DEPENDS.amanda-common+= amanda-common>=2.5.2p1 +BUILDLINK_ABI_DEPENDS.amanda-common+= amanda-common>=2.5.2p1 BUILDLINK_PKGSRCDIR.amanda-common?= ../../sysutils/amanda-common .endif # AMANDA_COMMON_BUILDLINK3_MK diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo index 68b6fe78c2e..dea6d0cb69f 100644 --- a/sysutils/amanda-common/distinfo +++ b/sysutils/amanda-common/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2005/02/24 13:40:50 agc Exp $ +$NetBSD: distinfo,v 1.8 2008/02/15 16:23:09 gdt Exp $ -SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6 -RMD160 (amanda-2.4.4p4.tar.gz) = d145a5ebb0df340af6aee0e8a15da6b54dfb3051 -Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes -SHA1 (patch-aa) = c03117e065da4fa3b7dce91c091d6cf044f884ea -SHA1 (patch-ab) = 8a6233a38207d514e2671eac50e38996ee578530 -SHA1 (patch-ac) = 1c42e18ac4055fe7370acd5a00c126ab9d93f890 +SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 +RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 +Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes +SHA1 (patch-ab) = 1b07671b54492c3e4826e09f66ba9f4b1c9e3e55 +SHA1 (patch-ac) = e67098e2fb0a0e85837d124e41fd9d1976675f89 SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd -SHA1 (patch-ae) = bcf887d6e1722cf27538cf9d1d190b5c749f587f +SHA1 (patch-af) = 6f996ef8dacb75cf17a47df73024b91ad137315e +SHA1 (patch-ag) = 6e79b0e71d37a44b03addae67e361178b537ad8d diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa deleted file mode 100644 index 7161a5c9ac0..00000000000 --- a/sysutils/amanda-common/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2004/11/12 12:13:45 mjl Exp $ - ---- 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) --versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) -+versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) - 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 c59e9e85dda..27d0aa8a5d3 100644 --- a/sysutils/amanda-common/patches/patch-ab +++ b/sysutils/amanda-common/patches/patch-ab @@ -1,7 +1,9 @@ -$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- Makefile.in.orig 2004-10-22 15:12:38.000000000 +0200 -+++ Makefile.in 2004-11-07 13:23:31.000000000 +0100 +Remove SUBDIRS that don't belong in -common package. + +--- Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ Makefile.in @@ -17,7 +17,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -11,26 +13,18 @@ $NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -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 - @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src - @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src - @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src --@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot -+# PLOT_SUBDIRS = amplot - # order is significant, don't change it arbitrarily - SUBDIRS = \ +@@ -384,13 +384,7 @@ SUBDIRS = \ config \ -@@ -284,7 +284,7 @@ - $(RESTORE_SUBDIRS) \ - $(RECOVER_SUBDIRS) \ - $(PLOT_SUBDIRS) \ + common-src \ + amandad-src \ +- $(TAPE_SUBDIRS) \ +- $(CLIENT_SUBDIRS) \ +- $(SERVER_SUBDIRS) \ +- $(RESTORE_SUBDIRS) \ +- $(RECOVER_SUBDIRS) \ +- $(PLOT_SUBDIRS) \ - man docs example + man pkgdata_DATA = \ - COPYRIGHT \ + ReleaseNotes \ diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac index 4375e1485b0..e22f799c766 100644 --- a/sysutils/amanda-common/patches/patch-ac +++ b/sysutils/amanda-common/patches/patch-ac @@ -1,13 +1,29 @@ -$NetBSD: patch-ac,v 1.8 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ac,v 1.9 2008/02/15 16:23:09 gdt Exp $ ---- 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 - COMMON_MAN_PAGES = amanda.8 - @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ - @WANT_SERVER_TRUE@ amcheck.8 \ +Don't install any manpages except COMMON_MAN*_PAGES. + +--- man/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 ++++ man/Makefile.in +@@ -373,19 +373,11 @@ SERVER_MAN8_PAGES = amadmin.8 \ + #endif + @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 + @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +-man8_pages = $(COMMON_MAN8_PAGES) \ +- $(AMPLOT_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ +- $(RESTORE_MAN8_PAGES) ++man8_pages = $(COMMON_MAN8_PAGES) + + man5_pages = $(COMMON_MAN5_PAGES) +-ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ +- $(COMMON_MAN5_PAGES) \ +- $(COMMON_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ +- $(RESTORE_MAN8_PAGES) ++ALL_MAN_PAGES = $(COMMON_MAN5_PAGES) \ ++ $(COMMON_MAN8_PAGES) + + + # These lines are needed to force automake to set the $man<n>dir variables. diff --git a/sysutils/amanda-common/patches/patch-ae b/sysutils/amanda-common/patches/patch-ae deleted file mode 100644 index 36953c18515..00000000000 --- a/sysutils/amanda-common/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2004/11/12 12:13:45 mjl Exp $ - ---- 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 = - EXTRA_PROGRAMS = $(am__EXEEXT_1) - subdir = tape-src - DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -@@ -622,7 +622,7 @@ - - install-data-am: - --install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS -+install-exec-am: install-libLTLIBRARIES - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - diff --git a/sysutils/amanda-common/patches/patch-af b/sysutils/amanda-common/patches/patch-af new file mode 100644 index 00000000000..b7ad6dde8e8 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-af @@ -0,0 +1,28 @@ +$NetBSD: patch-af,v 1.1 2008/02/15 16:23:09 gdt Exp $ + +Fix a bug in processing the --with-ssh-security option. Already fixed +in amanda svn, just backported from there. + +--- configure.orig 2007-06-06 19:22:45.000000000 -0400 ++++ configure +@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E + # now convert that to a comma-separated list of C strings + eval "set dummy ${SSH_OPTIONS}"; shift + SSH_OPTIONS='' +- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done ++ for i in "${@}"; do ++ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" ++ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; ++ done + echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 + echo "${ECHO_T}$SSH_OPTIONS" >&6 + +@@ -62491,7 +62494,7 @@ fi; + # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. + if test "${with_xsltproc_flags+set}" = set; then + withval="$with_xsltproc_flags" +- if test "x$withval" == "xno"; then ++ if test "x$withval" = "xno"; then + XSLTPROC_FLAGS='' + else + if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-common/patches/patch-ag b/sysutils/amanda-common/patches/patch-ag new file mode 100644 index 00000000000..3d0ec1c277e --- /dev/null +++ b/sysutils/amanda-common/patches/patch-ag @@ -0,0 +1,17 @@ +$NetBSD: patch-ag,v 1.1 2008/02/15 16:23:09 gdt Exp $ + +Don't install amandad executable, just libamandad. The executable +belongs in -client, but the library is used by binaries in both +-client and -server. + +--- amandad-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ amandad-src/Makefile.in +@@ -41,7 +41,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-libexec_PROGRAMS = amandad$(EXEEXT) ++# libexec_PROGRAMS = amandad$(EXEEXT) + subdir = amandad-src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile index 46ac6fb4d92..80d84615a4b 100644 --- a/sysutils/amanda-plot/Makefile +++ b/sysutils/amanda-plot/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.23 2007/11/08 19:39:42 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2008/02/15 16:23:09 gdt Exp $ # PKGNAME= amanda-plot-${VERS} -PKGREVISION= 4 SVR4_PKGNAME= amapl COMMENT= Visualizes the behavior of Amanda, a network backup system DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot -DEPENDS+= amanda-server-2.4.4p4{,nb[0-9]*}:../../sysutils/amanda-server +DEPENDS+= amanda-server-2.5.2p1{,nb[0-9]*}:../../sysutils/amanda-server .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo index 462e2d93bf5..0225bcb09b6 100644 --- a/sysutils/amanda-plot/distinfo +++ b/sysutils/amanda-plot/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2005/02/24 13:40:50 agc Exp $ +$NetBSD: distinfo,v 1.9 2008/02/15 16:23:09 gdt Exp $ -SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6 -RMD160 (amanda-2.4.4p4.tar.gz) = d145a5ebb0df340af6aee0e8a15da6b54dfb3051 -Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes -SHA1 (patch-aa) = 207efbc13033b10309d4194db7e180f50a53a76d -SHA1 (patch-ab) = 9380ccd35cf3126e581ac72f34ad87d554395188 -SHA1 (patch-ac) = 04e2d7a595ee87b4c066f4fbef06f26799df71ce +SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 +RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 +Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes +SHA1 (patch-aa) = 7b041da3d60634c0741cb19a2ea296dfcdb88601 +SHA1 (patch-ab) = 33c7b2c3dbc21bd1fcfa490b0e9bb9fccaedb70c +SHA1 (patch-ac) = 066c93eeaba931cb04040f3f6859ffc7b9c81f29 diff --git a/sysutils/amanda-plot/patches/patch-aa b/sysutils/amanda-plot/patches/patch-aa index 6567f557c44..b0fb4e99cec 100644 --- a/sysutils/amanda-plot/patches/patch-aa +++ b/sysutils/amanda-plot/patches/patch-aa @@ -1,8 +1,20 @@ -$NetBSD: patch-aa,v 1.3 2004/05/15 12:15:22 bouyer Exp $ +$NetBSD: patch-aa,v 1.4 2008/02/15 16:23:09 gdt Exp $ ---- configure.orig 2004-01-08 19:21:36.000000000 +0100 -+++ configure 2004-05-15 13:46:46.000000000 +0200 -@@ -11399,8 +11399,10 @@ +--- configure.orig 2008-02-08 16:34:38.000000000 -0500 ++++ configure +@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E + # now convert that to a comma-separated list of C strings + eval "set dummy ${SSH_OPTIONS}"; shift + SSH_OPTIONS='' +- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done ++ for i in "${@}"; do ++ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" ++ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; ++ done + echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 + echo "${ECHO_T}$SSH_OPTIONS" >&6 + +@@ -38647,8 +38650,10 @@ fi # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -13,3 +25,12 @@ $NetBSD: patch-aa,v 1.3 2004/05/15 12:15:22 bouyer Exp $ # Prevent multiple expansion +@@ -62491,7 +62496,7 @@ fi; + # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. + if test "${with_xsltproc_flags+set}" = set; then + withval="$with_xsltproc_flags" +- if test "x$withval" == "xno"; then ++ if test "x$withval" = "xno"; then + XSLTPROC_FLAGS='' + else + if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab index 5e2411bca16..0761fd40dc4 100644 --- a/sysutils/amanda-plot/patches/patch-ab +++ b/sysutils/amanda-plot/patches/patch-ab @@ -1,24 +1,17 @@ -$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- Makefile.in.orig 2004-10-22 15:12:38.000000000 +0200 -+++ Makefile.in 2004-11-08 01:36:50.000000000 +0100 -@@ -62,8 +62,7 @@ - DATA = $(pkgdata_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = config common-src client-src tape-src server-src \ -- changer-src restore-src recover-src amplot man docs example -+DIST_SUBDIRS = config amplot man - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -277,19 +276,13 @@ +--- Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ Makefile.in +@@ -380,21 +380,14 @@ ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACIN + @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot # order is significant, don't change it arbitrarily SUBDIRS = \ +- gnulib \ config \ - common-src \ - $(CLIENT_SUBDIRS) \ +- amandad-src \ - $(TAPE_SUBDIRS) \ + $(CLIENT_SUBDIRS) \ - $(SERVER_SUBDIRS) \ $(RESTORE_SUBDIRS) \ $(RECOVER_SUBDIRS) \ @@ -27,14 +20,13 @@ $NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $ + man -pkgdata_DATA = \ -- COPYRIGHT \ -- COPYRIGHT-APACHE \ -- COPYRIGHT-REGEX +- ReleaseNotes \ +- COPYRIGHT +pkgdata_DATA = EXTRA_DIST = $(SNAPSHOT_STAMP) \ $(pkgdata_DATA) \ -@@ -676,7 +669,7 @@ +@@ -775,7 +768,7 @@ install-data: install-data-recursive uninstall: uninstall-recursive install-am: all-am diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac index 48301b00d68..d96a6e6d482 100644 --- a/sysutils/amanda-plot/patches/patch-ac +++ b/sysutils/amanda-plot/patches/patch-ac @@ -1,17 +1,28 @@ -$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- man/Makefile.in.orig 2004-10-22 15:12:40.000000000 +0200 -+++ man/Makefile.in 2004-11-08 01:38:11.000000000 +0100 -@@ -280,11 +280,7 @@ +--- man/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 ++++ man/Makefile.in +@@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \ + #endif + @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 + @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +-man8_pages = $(COMMON_MAN8_PAGES) \ +- $(AMPLOT_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ +- $(RESTORE_MAN8_PAGES) +- +-man5_pages = $(COMMON_MAN5_PAGES) +-ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ +- $(COMMON_MAN5_PAGES) \ +- $(COMMON_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ +- $(RESTORE_MAN8_PAGES) ++man8_pages = $(AMPLOT_MAN8_PAGES) ++ ++man5_pages = ++ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) - # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 --man_MANS = $(AMPLOT_MAN_PAGES) \ -- $(COMMON_MAN_PAGES) \ -- $(SERVER_MAN_PAGES) \ -- $(RECOVER_MAN_PAGES) \ -- $(RESTORE_MAN_PAGES) -+man_MANS = $(AMPLOT_MAN_PAGES) - - all: all-am + # These lines are needed to force automake to set the $man<n>dir variables. diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index f1fdd5358d5..486bf80eda1 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.42 2007/11/08 19:39:42 joerg Exp $ +# $NetBSD: Makefile,v 1.43 2008/02/15 16:23:09 gdt Exp $ PKGNAME= amanda-server-${VERS} -PKGREVISION= 7 SVR4_PKGNAME= amase COMMENT= Server part of Amanda, a network backup system -USE_TOOLS+= gmake perl:run +USE_TOOLS+= awk:run perl:run .include "../../mk/bsd.prefs.mk" .include "../../sysutils/amanda-common/Makefile.common" diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST index dbd1742d958..9f4d1f9897c 100644 --- a/sysutils/amanda-server/PLIST +++ b/sysutils/amanda-server/PLIST @@ -1,5 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 2004/11/12 12:13:45 mjl Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/02/15 16:23:09 gdt Exp $ lib/libamserver.la +lib/libamtape.la +lib/librestore.la libexec/amcleanupdisk libexec/amidxtaped libexec/amindexd @@ -11,6 +13,7 @@ libexec/chg-chs libexec/chg-disk libexec/chg-iomega libexec/chg-juke +libexec/chg-lib.sh libexec/chg-manual libexec/chg-mcutil libexec/chg-mtx @@ -20,16 +23,22 @@ libexec/chg-rait libexec/chg-rth libexec/chg-scsi libexec/chg-zd-mtx +libexec/chunker libexec/driver libexec/dumper libexec/planner libexec/taper man/man8/amadmin.8 +man/man8/amaespipe.8 man/man8/amcheck.8 man/man8/amcheckdb.8 man/man8/amcleanup.8 +man/man8/amcrypt-ossl-asym.8 +man/man8/amcrypt-ossl.8 +man/man8/amcrypt.8 man/man8/amdd.8 man/man8/amdump.8 +man/man8/amfetchdump.8 man/man8/amflush.8 man/man8/amgetconf.8 man/man8/amlabel.8 @@ -45,11 +54,16 @@ man/man8/amtoc.8 man/man8/amverify.8 man/man8/amverifyrun.8 sbin/amadmin +sbin/amaespipe sbin/amcheck sbin/amcheckdb sbin/amcleanup +sbin/amcrypt +sbin/amcrypt-ossl +sbin/amcrypt-ossl-asym sbin/amdd sbin/amdump +sbin/amfetchdump sbin/amflush sbin/amgetconf sbin/amlabel @@ -64,41 +78,95 @@ sbin/amtapetype sbin/amtoc sbin/amverify sbin/amverifyrun -share/doc/amanda/DUMPER-API -share/doc/amanda/EXCLUDE -share/doc/amanda/FAQ -share/doc/amanda/HOWTO-AFS -share/doc/amanda/HOWTO-CYGWIN.html -share/doc/amanda/HOWTO-FILE-DRIVER -share/doc/amanda/INDEXING -share/doc/amanda/INSTALL -share/doc/amanda/INTERNALS -share/doc/amanda/KERBEROS -share/doc/amanda/LABEL.PRINTING -share/doc/amanda/MULTITAPE -share/doc/amanda/PORT.USAGE -share/doc/amanda/RAIT -share/doc/amanda/RESTORE -share/doc/amanda/SAMBA -share/doc/amanda/SECURITY -share/doc/amanda/SYSTEM.NOTES -share/doc/amanda/TAPE.CHANGERS -share/doc/amanda/TAPETYPES -share/doc/amanda/UPGRADE -share/doc/amanda/VTAPE-API -share/doc/amanda/WHATS.NEW -share/doc/amanda/WISHLIST -share/doc/amanda/YEAR2000 -share/doc/amanda/ZFTAPE -share/doc/amanda/chg-scsi.notes +share/doc/amanda/Appendix.txt +share/doc/amanda/amadmin.8.txt +share/doc/amanda/amaespipe.8.txt +share/doc/amanda/amanda-client.conf.5.txt +share/doc/amanda/amanda.8.txt +share/doc/amanda/amanda.conf.5.txt +share/doc/amanda/amcheck.8.txt +share/doc/amanda/amcheckdb.8.txt +share/doc/amanda/amcleanup.8.txt +share/doc/amanda/amcrypt-asym-ossl.8.txt +share/doc/amanda/amcrypt-ossl.8.txt +share/doc/amanda/amcrypt.8.txt +share/doc/amanda/amdd.8.txt +share/doc/amanda/amdump.8.txt +share/doc/amanda/amfetchdump.8.txt +share/doc/amanda/amflush.8.txt +share/doc/amanda/amgetconf.8.txt +share/doc/amanda/amlabel.8.txt +share/doc/amanda/ammt.8.txt +share/doc/amanda/amoverview.8.txt +share/doc/amanda/amplot.8.txt +share/doc/amanda/amrecover.8.txt +share/doc/amanda/amreport.8.txt +share/doc/amanda/amrestore.8.txt +share/doc/amanda/amrmtape.8.txt +share/doc/amanda/amstatus.8.txt +share/doc/amanda/amtape.8.txt +share/doc/amanda/amtapetype.8.txt +share/doc/amanda/amtoc.8.txt +share/doc/amanda/amverify.8.txt +share/doc/amanda/amverifyrun.8.txt +share/doc/amanda/chgscsi.txt +share/doc/amanda/dumperapi.txt +share/doc/amanda/eventapi.txt +share/doc/amanda/exclude.txt +share/doc/amanda/faq.txt +share/doc/amanda/historical.txt +share/doc/amanda/howto-afs.txt +share/doc/amanda/howto-auth.txt +share/doc/amanda/howto-cygwin.txt +share/doc/amanda/howto-filedriver.txt +share/doc/amanda/howto-wrapper.txt +share/doc/amanda/howtos.txt +share/doc/amanda/index.txt +share/doc/amanda/indexing.txt +share/doc/amanda/install.txt +share/doc/amanda/internals.txt +share/doc/amanda/introduction.txt +share/doc/amanda/ix01.txt +share/doc/amanda/kerberos.txt +share/doc/amanda/labelprinting.txt +share/doc/amanda/links.txt +share/doc/amanda/manpages.txt +share/doc/amanda/multitape.txt +share/doc/amanda/portusage.txt +share/doc/amanda/pr01.txt +share/doc/amanda/pr02.txt +share/doc/amanda/pr03.txt +share/doc/amanda/pr04.txt +share/doc/amanda/rait.txt +share/doc/amanda/references.txt +share/doc/amanda/restore.txt +share/doc/amanda/samba.txt +share/doc/amanda/security-api.txt +share/doc/amanda/security.txt +share/doc/amanda/strategy-api.txt +share/doc/amanda/survey.txt +share/doc/amanda/systemnotes.txt +share/doc/amanda/tapechangers.txt +share/doc/amanda/tapesnchangers.txt +share/doc/amanda/tapetypes.txt +share/doc/amanda/technical.txt +share/doc/amanda/topten.txt +share/doc/amanda/upgrade.txt +share/doc/amanda/using.txt +share/doc/amanda/various.txt +share/doc/amanda/vtape-api.txt +share/doc/amanda/whatwasnew.txt +share/doc/amanda/wishlist.txt +share/doc/amanda/y2k.txt +share/doc/amanda/zftape.txt share/examples/amanda/3hole.ps share/examples/amanda/8.5x11.ps share/examples/amanda/DIN-A4.ps share/examples/amanda/DLT.ps share/examples/amanda/EXB-8500.ps share/examples/amanda/HP-DAT.ps +share/examples/amanda/amanda-client.conf share/examples/amanda/amanda.conf -share/examples/amanda/amanda.conf.chg-scsi share/examples/amanda/chg-mcutil.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf diff --git a/sysutils/amanda-server/distinfo b/sysutils/amanda-server/distinfo index c1831253d9d..a7efe574f0b 100644 --- a/sysutils/amanda-server/distinfo +++ b/sysutils/amanda-server/distinfo @@ -1,21 +1,17 @@ -$NetBSD: distinfo,v 1.11 2007/02/07 02:04:15 gdt Exp $ +$NetBSD: distinfo,v 1.12 2008/02/15 16:23:09 gdt Exp $ -SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6 -RMD160 (amanda-2.4.4p4.tar.gz) = d145a5ebb0df340af6aee0e8a15da6b54dfb3051 -Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes +SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 +RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 +Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes SHA1 (patch-aa) = af41269882c8dfdb45bc177a45aa86122443d8df -SHA1 (patch-ab) = 87e628b0fbcd4174cb63f87ed8eb10a6cc87af46 +SHA1 (patch-ab) = 2d2ada69e2876092194002edfde1795f77a20d82 SHA1 (patch-ac) = 047647205258910f5b0ff7c04854816508e2d904 SHA1 (patch-ad) = 374df6ccf94d6533166db6eb2468d555f4f52f39 -SHA1 (patch-ae) = a646c7fd01f04c0a569564ba14e0cae3ea76792d -SHA1 (patch-af) = 950d161f35ffe121821ce7f10f2692dba2519469 +SHA1 (patch-ae) = 9ec981cae457668882bc280494145c8dc365b89d +SHA1 (patch-af) = bb261c9d74a9caab4864b943082143b0445aef5d SHA1 (patch-ag) = 2256353832fef411fb2e0dab56a8d3aaa699da81 -SHA1 (patch-ah) = a0f156ac45498a73af66af62113f8e19bbccad01 -SHA1 (patch-ai) = 3a21e49fa8b261413d4bc8fb97e3ee0664b00292 -SHA1 (patch-aj) = f7c33a543a015e282ba9836ffa2c5c501a2bddcb -SHA1 (patch-ak) = 9555f098dc705a7af9004e6fd3d4d259705a9935 -SHA1 (patch-al) = dfd85511e2441be2f4a7428ee964310f3fd5374c -SHA1 (patch-am) = 4949524ff94afa54c0c5ad7cd4bb673c51f73815 -SHA1 (patch-an) = a7a6d2777e94d06eba8bf51857b95043a65be6e4 -SHA1 (patch-ao) = 553a724fbe3422397ea9473c7d59b1139eca224f -SHA1 (patch-ap) = fde38b4718968cdf15c2f62b83ed9156d252ac08 +SHA1 (patch-ah) = 52095cc6eab0ec49ada00df4291e9e96e3ff7514 +SHA1 (patch-ai) = a5d85a0b947926f84dab3d6826cdcc69d4709486 +SHA1 (patch-aj) = 63e3cb69b74fbe624c7777ae5515832aea9335ca +SHA1 (patch-ak) = 403ed50f3396198abab03cc06378030b605fff02 +SHA1 (patch-aq) = 5d0b287ef3271c0ffaa13f4841312859ffc34bf4 diff --git a/sysutils/amanda-server/patches/patch-ab b/sysutils/amanda-server/patches/patch-ab index e358190961f..f0bb8f28b39 100644 --- a/sysutils/amanda-server/patches/patch-ab +++ b/sysutils/amanda-server/patches/patch-ab @@ -1,7 +1,9 @@ -$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- Makefile.in.orig 2004-10-22 15:12:38.000000000 +0200 -+++ Makefile.in 2004-11-08 00:53:24.000000000 +0100 +Remove SUBDIRS and DATA that we don't want in -server package. + +--- Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ Makefile.in @@ -17,7 +17,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -11,12 +13,23 @@ $NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -676,7 +676,7 @@ - uninstall: uninstall-recursive +@@ -383,18 +383,12 @@ SUBDIRS = \ + gnulib \ + config \ + common-src \ +- amandad-src \ + $(TAPE_SUBDIRS) \ +- $(CLIENT_SUBDIRS) \ + $(SERVER_SUBDIRS) \ + $(RESTORE_SUBDIRS) \ +- $(RECOVER_SUBDIRS) \ +- $(PLOT_SUBDIRS) \ + man docs example - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am +-pkgdata_DATA = \ +- ReleaseNotes \ +- COPYRIGHT ++pkgdata_DATA = - installcheck: installcheck-recursive - install-strip: + EXTRA_DIST = $(SNAPSHOT_STAMP) \ + $(pkgdata_DATA) \ diff --git a/sysutils/amanda-server/patches/patch-ae b/sysutils/amanda-server/patches/patch-ae index fe4713e4979..2feb21eeea8 100644 --- a/sysutils/amanda-server/patches/patch-ae +++ b/sysutils/amanda-server/patches/patch-ae @@ -1,17 +1,17 @@ -$NetBSD: patch-ae,v 1.7 2004/10/03 09:19:16 bouyer Exp $ +$NetBSD: patch-ae,v 1.8 2008/02/15 16:23:09 gdt Exp $ ---- changer-src/scsi-changer-driver.c.orig Sun Jan 26 20:20:56 2003 -+++ changer-src/scsi-changer-driver.c Sat Oct 2 20:54:52 2004 -@@ -372,6 +372,18 @@ +--- changer-src/scsi-changer-driver.c.orig 2007-05-04 07:39:04.000000000 -0400 ++++ changer-src/scsi-changer-driver.c +@@ -372,6 +372,18 @@ ChangerCMD_T ChangerIO[] = { NoBarCode, GenericSearch, GenericSenseHandler}, + {"SDLT320", + "DLT Tape [SDLT320]", -+ DoNothing, -+ DoNothing, -+ DoNothing, -+ DoNothing, ++ DoNothing3, ++ DoNothing2, ++ DoNothing1, ++ DoNothing0, + DLT4000Eject, + GenericClean, + GenericRewind, @@ -20,10 +20,10 @@ $NetBSD: patch-ae,v 1.7 2004/10/03 09:19:16 bouyer Exp $ + GenericSenseHandler}, {"DLT8000", "DLT Tape [DLT8000]", - DoNothing, -@@ -1358,13 +1370,14 @@ + DoNothing3, +@@ -1488,13 +1500,14 @@ BarCode( { - int ret = 0; + int ret; extern OpenFiles_T *pDev; + extern changer_t chg; /* Needed for the infos about havebarcode */ @@ -33,43 +33,43 @@ $NetBSD: patch-ae,v 1.7 2004/10/03 09:19:16 bouyer Exp $ DebugPrint(DEBUG_INFO, SECTION_BARCODE,"Ident = [%s], function = [%s]\n", pDev[fd].ident, pDev[fd].functions->ident); - ret = pDev[fd].functions->function_barcode(fd); -+ ret = (pDev[fd].functions->function_barcode(fd) | chg.havebarcode); ++ ret = (pDev[fd].functions->function_barcode(fd) | changer->havebarcode); DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP BarCode (%d)\n",ret); return(ret); } -@@ -3770,7 +3783,7 @@ - barcode, +@@ -4068,7 +4081,7 @@ GetElementStatus( + (u_char)barcode, V2(pEAAPage->MediumTransportElementAddress), - MTE+1, -- sizeof(MediumTransportElementDescriptor_T), + (MTE + (size_t)1), +- SIZEOF(MediumTransportElementDescriptor_T), + 0, /* let the buffer auto-size */ - (char **)&DataBuffer) != 0) + &DataBuffer) != 0) { - if (DataBuffer != 0) -@@ -3855,7 +3868,7 @@ - barcode, + ChgExit("genericElementStatus","Can't read MTE status", FATAL); +@@ -4153,7 +4166,7 @@ GetElementStatus( + (u_char)barcode, V2(pEAAPage->FirstStorageElementAddress), STE, -- sizeof(StorageElementDescriptor_T), +- SIZEOF(StorageElementDescriptor_T), + 0, /* let the buffer auto-size */ - (char **)&DataBuffer) != 0) + &DataBuffer) != 0) { - if (DataBuffer != 0) -@@ -3942,7 +3955,7 @@ - barcode, + ChgExit("GetElementStatus", "Can't read STE status", FATAL); +@@ -4239,7 +4252,7 @@ GetElementStatus( + (u_char)barcode, V2(pEAAPage->FirstImportExportElementAddress), IEE, -- sizeof(ImportExportElementDescriptor_T), +- SIZEOF(ImportExportElementDescriptor_T), + 0, /* let the buffer auto-size */ - (char **)&DataBuffer) != 0) + &DataBuffer) != 0) { - if (DataBuffer != 0) -@@ -4027,7 +4040,7 @@ - barcode, + ChgExit("GetElementStatus", "Can't read IEE status", FATAL); +@@ -4323,7 +4336,7 @@ GetElementStatus( + (u_char)barcode, V2(pEAAPage->FirstDataTransferElementAddress), DTE, -- sizeof(DataTransferElementDescriptor_T), +- SIZEOF(DataTransferElementDescriptor_T), + 0, /* let the buffer auto-size */ - (char **)&DataBuffer) != 0) + &DataBuffer) != 0) { - if (DataBuffer != 0) + ChgExit("GenericElementStatus", "Can't read DTE status", FATAL); diff --git a/sysutils/amanda-server/patches/patch-af b/sysutils/amanda-server/patches/patch-af index ab34db004f9..848ddecbcd9 100644 --- a/sysutils/amanda-server/patches/patch-af +++ b/sysutils/amanda-server/patches/patch-af @@ -1,39 +1,42 @@ -$NetBSD: patch-af,v 1.6 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-af,v 1.7 2008/02/15 16:23:09 gdt Exp $ ---- tape-src/Makefile.in.orig 2004-10-22 15:12:42.000000000 +0200 -+++ tape-src/Makefile.in 2004-11-08 01:01:43.000000000 +0100 -@@ -67,26 +67,18 @@ +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +--- tape-src/Makefile.in.orig 2007-06-06 19:22:53.000000000 -0400 ++++ tape-src/Makefile.in +@@ -108,26 +108,18 @@ PROGRAMS = $(sbin_PROGRAMS) amdd_SOURCES = amdd.c amdd_OBJECTS = amdd.$(OBJEXT) amdd_LDADD = $(LDADD) -amdd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) -+amdd_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda ++amdd_DEPENDENCIES = libamtape.$(LIB_EXTENSION) ammt_SOURCES = ammt.c ammt_OBJECTS = ammt.$(OBJEXT) ammt_LDADD = $(LDADD) -ammt_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) -+ammt_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda ++ammt_DEPENDENCIES = libamtape.$(LIB_EXTENSION) am_amtapeio_OBJECTS = amtapeio.test.$(OBJEXT) amtapeio_OBJECTS = $(am_amtapeio_OBJECTS) -amtapeio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) -+amtapeio_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda ++amtapeio_DEPENDENCIES = libamtape.$(LIB_EXTENSION) am_amtapetype_OBJECTS = tapetype.$(OBJEXT) amtapetype_OBJECTS = $(am_amtapetype_OBJECTS) amtapetype_LDADD = $(LDADD) -amtapetype_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamtape.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) -+amtapetype_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda ++amtapetype_DEPENDENCIES = libamtape.$(LIB_EXTENSION) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles -@@ -318,9 +310,7 @@ +@@ -416,9 +408,7 @@ libamtape_la_LDFLAGS = -release $(VERSIO # need to list libamanda twice here, first to override the system library # routines, and second to pick up any references in the other libraries. ### @@ -44,7 +47,7 @@ $NetBSD: patch-af,v 1.6 2004/11/12 12:13:45 mjl Exp $ # used for testing only -@@ -335,9 +325,7 @@ +@@ -433,9 +423,7 @@ noinst_HEADERS = \ tapeio.h amtapeio_SOURCES = amtapeio.test.c @@ -55,30 +58,3 @@ $NetBSD: patch-af,v 1.6 2004/11/12 12:13:45 mjl Exp $ all: all-am -@@ -569,7 +557,7 @@ - done - check-am: all-am - check: check-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(PROGRAMS) $(HEADERS) - installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ -@@ -622,7 +610,7 @@ - - install-data-am: - --install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS -+install-exec-am: install-sbinPROGRAMS - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - -@@ -650,7 +638,7 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ -+uninstall-am: uninstall-info-am \ - uninstall-sbinPROGRAMS - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ diff --git a/sysutils/amanda-server/patches/patch-ah b/sysutils/amanda-server/patches/patch-ah index b9cea70e1c5..8c2447befe8 100644 --- a/sysutils/amanda-server/patches/patch-ah +++ b/sysutils/amanda-server/patches/patch-ah @@ -1,182 +1,251 @@ -$NetBSD: patch-ah,v 1.6 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ah,v 1.7 2008/02/15 16:23:09 gdt Exp $ ---- server-src/Makefile.in.orig 2004-10-22 15:12:41.000000000 +0200 -+++ server-src/Makefile.in 2004-11-08 01:11:07.000000000 +0100 -@@ -88,137 +88,80 @@ - amadmin_SOURCES = amadmin.c +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +--- server-src/Makefile.in.orig 2007-06-06 19:22:53.000000000 -0400 ++++ server-src/Makefile.in +@@ -129,194 +129,117 @@ amadmin_SOURCES = amadmin.c amadmin_OBJECTS = amadmin.$(OBJEXT) amadmin_LDADD = $(LDADD) + am__DEPENDENCIES_1 = -amadmin_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ ++amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) amcheck_SOURCES = amcheck.c amcheck_OBJECTS = amcheck.$(OBJEXT) amcheck_LDADD = $(LDADD) -amcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) amcleanupdisk_SOURCES = amcleanupdisk.c amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT) amcleanupdisk_LDADD = $(LDADD) -amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) amflush_SOURCES = amflush.c amflush_OBJECTS = amflush.$(OBJEXT) amflush_LDADD = $(LDADD) -amflush_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ ++amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) am_amgetconf_OBJECTS = getconf.$(OBJEXT) amgetconf_OBJECTS = $(am_amgetconf_OBJECTS) amgetconf_LDADD = $(LDADD) -amgetconf_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - am_amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) + am__objects_1 = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \ list_dir.$(OBJEXT) + am_amindexd_OBJECTS = $(am__objects_1) amindexd_OBJECTS = $(am_amindexd_OBJECTS) - amindexd_LDADD = $(LDADD) -amindexd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) amlabel_SOURCES = amlabel.c amlabel_OBJECTS = amlabel.$(OBJEXT) amlabel_LDADD = $(LDADD) -amlabel_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ ++amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) amlogroll_SOURCES = amlogroll.c amlogroll_OBJECTS = amlogroll.$(OBJEXT) amlogroll_LDADD = $(LDADD) -amlogroll_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) am_amreport_OBJECTS = reporter.$(OBJEXT) amreport_OBJECTS = $(am_amreport_OBJECTS) amreport_LDADD = $(LDADD) -amreport_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) amtape_SOURCES = amtape.c amtape_OBJECTS = amtape.$(OBJEXT) amtape_LDADD = $(LDADD) -amtape_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ ++amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) amtrmidx_SOURCES = amtrmidx.c amtrmidx_OBJECTS = amtrmidx.$(OBJEXT) amtrmidx_LDADD = $(LDADD) -amtrmidx_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) amtrmlog_SOURCES = amtrmlog.c amtrmlog_OBJECTS = amtrmlog.$(OBJEXT) amtrmlog_LDADD = $(LDADD) -amtrmlog_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ ++amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION) - am_conffile_OBJECTS = conffile.test.$(OBJEXT) - conffile_OBJECTS = $(am_conffile_OBJECTS) - conffile_LDADD = $(LDADD) --conffile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) + chunker_SOURCES = chunker.c + chunker_OBJECTS = chunker.$(OBJEXT) + chunker_LDADD = $(LDADD) +-chunker_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++chunker_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) am_diskfile_OBJECTS = diskfile.test.$(OBJEXT) diskfile_OBJECTS = $(am_diskfile_OBJECTS) diskfile_LDADD = $(LDADD) -diskfile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) driver_SOURCES = driver.c driver_OBJECTS = driver.$(OBJEXT) driver_LDADD = $(LDADD) -driver_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ ++driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) dumper_SOURCES = dumper.c dumper_OBJECTS = dumper.$(OBJEXT) dumper_LDADD = $(LDADD) -dumper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) am_infofile_OBJECTS = infofile.test.$(OBJEXT) infofile_OBJECTS = $(am_infofile_OBJECTS) infofile_LDADD = $(LDADD) -infofile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) planner_SOURCES = planner.c planner_OBJECTS = planner.$(OBJEXT) planner_LDADD = $(LDADD) -planner_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ ++planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) taper_SOURCES = taper.c taper_OBJECTS = taper.$(OBJEXT) taper_LDADD = $(LDADD) -taper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamserver.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(sbin_SCRIPTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -@@ -338,7 +281,7 @@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lamtape -lamanda - LIBTOOL = @LIBTOOL@ - LIBTOOL_DEPS = @LIBTOOL_DEPS@ - LN_S = @LN_S@ -@@ -478,10 +421,7 @@ +@@ -623,23 +546,17 @@ libamserver_la_LDFLAGS = -release $(VERS # need to list libamanda twice here, first to override the system library # routines, and second to pick up any references in the other libraries. ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamserver.$(LIB_EXTENSION) \ -- ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = libamserver.$(LIB_EXTENSION) +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ ++LDADD = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) \ ++ -lamanda \ + $(READLINE_LIBS) + +-amindexd_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../amandad-src/libamandad.$(LIB_EXTENSION) \ ++amindexd_LDADD = libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../gnulib/libgnu.$(LIB_EXTENSION) ++ ../gnulib/libgnu.$(LIB_EXTENSION) \ ++ -lamanda \ ++ -lamandad SUFFIXES = .sh .pl diff --git a/sysutils/amanda-server/patches/patch-ai b/sysutils/amanda-server/patches/patch-ai index a10c10486ca..34ccdb52bfa 100644 --- a/sysutils/amanda-server/patches/patch-ai +++ b/sysutils/amanda-server/patches/patch-ai @@ -1,37 +1,44 @@ -$NetBSD: patch-ai,v 1.6 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ai,v 1.7 2008/02/15 16:23:09 gdt Exp $ ---- changer-src/Makefile.in.orig 2004-10-22 15:12:38.000000000 +0200 -+++ changer-src/Makefile.in 2004-11-08 01:13:46.000000000 +0100 -@@ -73,18 +73,12 @@ - sense.$(OBJEXT) +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +--- changer-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 ++++ changer-src/Makefile.in +@@ -110,20 +110,16 @@ am_chg_scsi_OBJECTS = $(am__objects_1) chg_scsi_OBJECTS = $(am_chg_scsi_OBJECTS) chg_scsi_LDADD = $(LDADD) + am__DEPENDENCIES_1 = -chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - ../server-src/libamserver.$(LIB_EXTENSION) \ -- ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) - am_chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \ ++chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) + am__objects_2 = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \ scsi-chio.$(OBJEXT) + am_chg_scsi_chio_OBJECTS = $(am__objects_2) chg_scsi_chio_OBJECTS = $(am_chg_scsi_chio_OBJECTS) chg_scsi_chio_LDADD = $(LDADD) -chg_scsi_chio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - ../server-src/libamserver.$(LIB_EXTENSION) \ -- ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+chg_scsi_chio_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) ++chg_scsi_chio_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(libexec_SCRIPTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config -@@ -316,10 +310,7 @@ +@@ -415,11 +411,10 @@ CLEANFILES = $(libexec_SCRIPTS) # need to list libamanda twice here, first to override the system library # routines, and second to pick up any references in the other libraries. ### -LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ - ../server-src/libamserver.$(LIB_EXTENSION) \ -- ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = ../server-src/libamserver.$(LIB_EXTENSION) ++LDADD = ../server-src/libamserver.$(LIB_EXTENSION) \ + ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) \ ++ -lamanda \ + $(READLINE_LIBS) SUFFIXES = .pl .sh - chg_scsi_SOURCES = chg-scsi.c libscsi.h scsi-defs.h \ diff --git a/sysutils/amanda-server/patches/patch-aj b/sysutils/amanda-server/patches/patch-aj index 8bdfbd9b175..b026c02a5ab 100644 --- a/sysutils/amanda-server/patches/patch-aj +++ b/sysutils/amanda-server/patches/patch-aj @@ -1,41 +1,67 @@ -$NetBSD: patch-aj,v 1.3 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-aj,v 1.4 2008/02/15 16:23:09 gdt Exp $ ---- restore-src/Makefile.in.orig 2004-10-22 15:12:41.000000000 +0200 -+++ restore-src/Makefile.in 2004-11-08 01:16:01.000000000 +0100 -@@ -57,16 +57,11 @@ - PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS) +Remove build-directory library dependencies and link against the ones +installed by amanda-common instead. + +--- restore-src/Makefile.in.orig 2007-06-06 19:22:53.000000000 -0400 ++++ restore-src/Makefile.in +@@ -99,8 +99,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" + "$(DESTDIR)$(sbindir)" + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) +-librestore_la_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ ++librestore_la_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \ + ../server-src/libamserver.$(LIB_EXTENSION) + am_librestore_la_OBJECTS = restore.lo + librestore_la_OBJECTS = $(am_librestore_la_OBJECTS) +@@ -112,21 +111,17 @@ amfetchdump_OBJECTS = $(am_amfetchdump_O + amfetchdump_LDADD = $(LDADD) + am__DEPENDENCIES_1 = + amfetchdump_DEPENDENCIES = librestore.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT) amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS) --amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../server-src/libamserver.$(LIB_EXTENSION) \ -- ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amidxtaped_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) + am__DEPENDENCIES_2 = librestore.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) + amidxtaped_DEPENDENCIES = $(am__DEPENDENCIES_2) \ +- ../gnulib/libgnu.$(LIB_EXTENSION) \ +- ../amandad-src/libamandad.$(LIB_EXTENSION) ++ ../gnulib/libgnu.$(LIB_EXTENSION) amrestore_SOURCES = amrestore.c amrestore_OBJECTS = amrestore.$(OBJEXT) amrestore_LDADD = $(LDADD) --amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amrestore_DEPENDENCIES = + amrestore_DEPENDENCIES = librestore.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp - am__depfiles_maybe = depfiles -@@ -282,15 +277,10 @@ - # need to list libamanda twice here, first to override the system library +@@ -413,21 +408,20 @@ LIB_EXTENSION = la # routines, and second to pick up any references in the other libraries. ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = -lamtape -lamanda + LDADD = librestore.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) \ + ../gnulib/libgnu.$(LIB_EXTENSION) \ ++ -lamanda \ + $(READLINE_LIBS) + + amidxtaped_LDADD = $(LDADD) \ +- ../gnulib/libgnu.$(LIB_EXTENSION) \ +- ../amandad-src/libamandad.$(LIB_EXTENSION) ++ -lamandad amidxtaped_SOURCES = amidxtaped.c --amidxtaped_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../server-src/libamserver.$(LIB_EXTENSION) \ + amfetchdump_SOURCES = amfetchdump.c + librestore_la_SOURCES = restore.c + librestore_la_LDFLAGS = -release $(VERSION) +-librestore_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amidxtaped_LDADD = ../server-src/libamserver.$(LIB_EXTENSION) +- ../server-src/libamserver.$(LIB_EXTENSION) ++librestore_la_LIBADD = ../tape-src/libamtape.$(LIB_EXTENSION) \ ++ ../server-src/libamserver.$(LIB_EXTENSION) \ ++ -lamanda + noinst_HEADERS = restore.h all: all-am - diff --git a/sysutils/amanda-server/patches/patch-ak b/sysutils/amanda-server/patches/patch-ak index 120482aaf94..3d393c793c8 100644 --- a/sysutils/amanda-server/patches/patch-ak +++ b/sysutils/amanda-server/patches/patch-ak @@ -1,12 +1,28 @@ -$NetBSD: patch-ak,v 1.3 2004/11/12 12:13:45 mjl Exp $ +$NetBSD: patch-ak,v 1.4 2008/02/15 16:23:09 gdt Exp $ ---- man/Makefile.in.orig 2004-10-22 15:12:40.000000000 +0200 -+++ man/Makefile.in 2004-11-08 01:17:10.000000000 +0100 -@@ -281,7 +281,6 @@ - # not autoconf-generated: - EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8 - man_MANS = $(AMPLOT_MAN_PAGES) \ -- $(COMMON_MAN_PAGES) \ - $(SERVER_MAN_PAGES) \ - $(RECOVER_MAN_PAGES) \ - $(RESTORE_MAN_PAGES) +Don't install any manpages except server-specific ones. + +--- man/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 ++++ man/Makefile.in +@@ -373,18 +373,11 @@ SERVER_MAN8_PAGES = amadmin.8 \ + #endif + @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 + @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 +-man8_pages = $(COMMON_MAN8_PAGES) \ +- $(AMPLOT_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ ++man8_pages = $(SERVER_MAN8_PAGES) \ + $(RESTORE_MAN8_PAGES) + +-man5_pages = $(COMMON_MAN5_PAGES) +-ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ +- $(COMMON_MAN5_PAGES) \ +- $(COMMON_MAN8_PAGES) \ +- $(SERVER_MAN8_PAGES) \ +- $(RECOVER_MAN8_PAGES) \ ++man5_pages = ++ALL_MAN_PAGES = $(SERVER_MAN8_PAGES) \ + $(RESTORE_MAN8_PAGES) + + diff --git a/sysutils/amanda-server/patches/patch-al b/sysutils/amanda-server/patches/patch-al deleted file mode 100644 index c3079b5c085..00000000000 --- a/sysutils/amanda-server/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.4 2006/01/22 04:36:55 joerg Exp $ - ---- server-src/conffile.c.orig 2006-01-22 04:30:15.000000000 +0000 -+++ server-src/conffile.c -@@ -864,8 +864,6 @@ static void init_defaults() - static void read_conffile_recursively(filename) - char *filename; - { -- extern int errno; -- - /* Save globals used in read_confline(), elsewhere. */ - int save_line_num = line_num; - FILE *save_conf = conf; diff --git a/sysutils/amanda-server/patches/patch-am b/sysutils/amanda-server/patches/patch-am deleted file mode 100644 index 025f64512e2..00000000000 --- a/sysutils/amanda-server/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/01/22 04:36:55 joerg Exp $ - ---- server-src/diskfile.c.orig 2006-01-22 04:31:40.000000000 +0000 -+++ server-src/diskfile.c -@@ -51,8 +51,6 @@ static void parserror P((char *format, . - disklist_t *read_diskfile(filename) - char *filename; - { -- extern int errno; -- - /* initialize */ - - hostlist = NULL; diff --git a/sysutils/amanda-server/patches/patch-an b/sysutils/amanda-server/patches/patch-an deleted file mode 100644 index 74e414ed008..00000000000 --- a/sysutils/amanda-server/patches/patch-an +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-an,v 1.1 2007/01/05 13:20:54 obache Exp $ - -Prevent amverify from looping forever. Patch provided by Jean-Louis -Martineau on amanda-users: -http://groups.yahoo.com/group/amanda-users/message/55099 - ---- restore-src/amrestore.c.orig 2003-02-10 15:22:11.000000000 +0000 -+++ restore-src/amrestore.c -@@ -482,6 +482,7 @@ char **argv; - char *e; - char *err; - char *label = NULL; -+ int count_error; - - for(fd = 3; fd < FD_SETSIZE; fd++) { - /* -@@ -667,25 +668,29 @@ char **argv; - get_pname()); - } - -- while(file.type == F_TAPESTART || file.type == F_DUMPFILE) { -- amfree(filename); -- filename = make_filename(&file); -+ count_error=0; -+ while(count_error < 10) { -+ if(file.type == F_TAPEEND) break; - found_match = 0; -- for(me = match_list; me; me = me->next) { -- if(disk_match(&file,me->datestamp,me->hostname,me->diskname) != 0) { -- found_match = 1; -- break; -+ if(file.type == F_DUMPFILE) { -+ amfree(filename); -+ filename = make_filename(&file); -+ for(me = match_list; me; me = me->next) { -+ if(disk_match(&file,me->datestamp,me->hostname,me->diskname) != 0) { -+ found_match = 1; -+ break; -+ } -+ } -+ fprintf(stderr, "%s: %3d: %s ", -+ get_pname(), -+ file_number, -+ found_match ? "restoring" : "skipping"); -+ if(file.type != F_DUMPFILE) { -+ print_header(stderr, &file); -+ } else { -+ fprintf(stderr, "%s\n", filename); - } - } -- fprintf(stderr, "%s: %3d: %s ", -- get_pname(), -- file_number, -- found_match ? "restoring" : "skipping"); -- if(file.type != F_DUMPFILE) { -- print_header(stderr, &file); -- } else { -- fprintf(stderr, "%s\n", filename); -- } - if(found_match) { - restore(&file, filename, isafile); - if(compress_pid > 0) { -@@ -718,6 +723,7 @@ char **argv; - if((tapedev = tape_open(tapename, 0)) < 0) { - error("could not open %s: %s", tapename, strerror(errno)); - } -+ count_error++; - } else { - /* - * If the last read got something (even an error), we can -@@ -726,6 +732,7 @@ char **argv; - if(tapefd_fsf(tapedev, 1) < 0) { - error("could not fsf %s: %s", tapename, strerror(errno)); - } -+ count_error=0; - } - file_number++; - read_file_header(&file, isafile); diff --git a/sysutils/amanda-server/patches/patch-ao b/sysutils/amanda-server/patches/patch-ao deleted file mode 100644 index 490261c47f1..00000000000 --- a/sysutils/amanda-server/patches/patch-ao +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2007/01/05 13:20:54 obache Exp $ - -Prevent amverify from looping forever. Patch provided by Jean-Louis -Martineau on amanda-users: -http://groups.yahoo.com/group/amanda-users/message/55099 - ---- server-src/amverify.sh.in.orig 2004-10-04 11:47:06.000000000 +0000 -+++ server-src/amverify.sh.in -@@ -428,6 +428,7 @@ while [ $SLOT -lt $SLOTS ]; do - FILE=`grep restoring $TEMP/amrestore.out \ - | sed 's/^.*restoring //'` - EOF=`grep "reached end of tape" $TEMP/amrestore.out` -+ EOI=`grep "reached end of information" $TEMP/amrestore.out` - # amrestore: 0: restoring sundae._mnt_sol1_usr.19961127.1 - if [ X"$FILE" != X"" -a X"$RESULT" = X"0" ]; then - report "Checked $FILE" -@@ -436,6 +437,9 @@ while [ $SLOT -lt $SLOTS ]; do - elif [ -n "$EOF" ]; then - report "End-of-Tape detected." - break -+ elif [ -n "$EOI" ]; then -+ report "End-of-Information detected." -+ break - else - report "** Error detected ($FILE)" - echo "$VOLUME ($FILE):" >>$DEFECTS diff --git a/sysutils/amanda-server/patches/patch-ap b/sysutils/amanda-server/patches/patch-ap deleted file mode 100644 index f902c9ddcd6..00000000000 --- a/sysutils/amanda-server/patches/patch-ap +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2007/02/07 02:04:15 gdt Exp $ - ---- changer-src/chg-chio.pl.in.orig 2003-11-21 14:09:35.000000000 -0500 -+++ changer-src/chg-chio.pl.in -@@ -281,6 +281,13 @@ sub Load { - print "$progname: cannot '@CHIO@ -f $changerDevice move' tape $tape into drive 0\n"; - exit(2); - } -+ -+ # wait for tape to load -+ do { -+ print LOG &do_time(), ": waiting for tape to load\n"; -+ sleep 30; -+ } while ( system("$MT $MTF $tapeDevice status > /dev/null 2>&1" ) ); -+ - print LOG &do_time(), ": leave: Load\n"; - } - -@@ -302,8 +309,8 @@ sub Unload { - # firmware rev but for now it's safest to just explicitly eject - # the tape before moving the cartridge. - # -- if ( system ("@MT@ @MT_FILE_FLAG@ $tapeDevice offline") ) { -- print "$progname: Warning, failed to eject the tape with '@MT@ @MT_FILE_FLAG@ $tapeDevice offline'\n"; -+ if ( system ("$MT $MTF $tapeDevice offline") ) { -+ print "$progname: Warning, failed to eject the tape with '$MT $MTF $tapeDevice offline'\n"; - # NB: not fatal; let chio try it's thing - } - -@@ -370,7 +377,7 @@ if (-x "$sbindir/ammt$SUF") { - print "<none> mt program not found\n"; - exit(1); - } --print LOG &do_time(), "MT -> $MT $MTF\n"; -+print LOG &do_time(), ": MT -> $MT $MTF\n"; - - system ("$MT $MTF $tapeDevice rewind") - unless $currentTape == 0; diff --git a/sysutils/amanda-server/patches/patch-aq b/sysutils/amanda-server/patches/patch-aq new file mode 100644 index 00000000000..cb0c044dc5c --- /dev/null +++ b/sysutils/amanda-server/patches/patch-aq @@ -0,0 +1,25 @@ +$NetBSD: patch-aq,v 1.1 2008/02/15 16:23:09 gdt Exp $ + +--- configure.orig 2007-06-06 19:22:45.000000000 -0400 ++++ configure +@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E + # now convert that to a comma-separated list of C strings + eval "set dummy ${SSH_OPTIONS}"; shift + SSH_OPTIONS='' +- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done ++ for i in "${@}"; do ++ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" ++ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; ++ done + echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 + echo "${ECHO_T}$SSH_OPTIONS" >&6 + +@@ -62491,7 +62494,7 @@ fi; + # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. + if test "${with_xsltproc_flags+set}" = set; then + withval="$with_xsltproc_flags" +- if test "x$withval" == "xno"; then ++ if test "x$withval" = "xno"; then + XSLTPROC_FLAGS='' + else + if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile index 93bf8f04394..462c2fd259a 100644 --- a/sysutils/amanda/Makefile +++ b/sysutils/amanda/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.42 2007/10/25 22:01:05 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2008/02/15 16:23:09 gdt Exp $ # -DISTNAME= amanda-2.4.4p4 -PKGREVISION= 1 +# XXX get this from ../../sysutils/amanda-common/Makefile.common +VERSION=2.5.2p1 + +DISTNAME= amanda-${VERSION} CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty @@ -11,9 +13,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.amanda.org/ COMMENT= The "meta-package" for Amanda, a network backup system -DEPENDS+= amanda-client-2.4.4p4{,nb[0-9]*}:../../sysutils/amanda-client -DEPENDS+= amanda-server-2.4.4p4{,nb[0-9]*}:../../sysutils/amanda-server -DEPENDS+= amanda-plot-2.4.4p4{,nb[0-9]*}:../../sysutils/amanda-plot +DEPENDS+= amanda-client-${VERSION}{,nb[0-9]*}:../../sysutils/amanda-client +DEPENDS+= amanda-server-${VERSION}{,nb[0-9]*}:../../sysutils/amanda-server +DEPENDS+= amanda-plot-${VERSION}{,nb[0-9]*}:../../sysutils/amanda-plot EXTRACT_ONLY= # empty NO_CHECKSUM= yes |