summaryrefslogtreecommitdiff
path: root/sysutils/amanda-server
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/amanda-server')
-rw-r--r--sysutils/amanda-server/Makefile45
-rw-r--r--sysutils/amanda-server/files/md54
-rw-r--r--sysutils/amanda-server/files/patch-sum21
-rw-r--r--sysutils/amanda-server/patches/patch-aa23
-rw-r--r--sysutils/amanda-server/patches/patch-ab35
-rw-r--r--sysutils/amanda-server/patches/patch-ac29
-rw-r--r--sysutils/amanda-server/patches/patch-ad189
-rw-r--r--sysutils/amanda-server/patches/patch-ae271
-rw-r--r--sysutils/amanda-server/patches/patch-af220
-rw-r--r--sysutils/amanda-server/patches/patch-ah10
-rw-r--r--sysutils/amanda-server/patches/patch-ai195
-rw-r--r--sysutils/amanda-server/patches/patch-aj31
-rw-r--r--sysutils/amanda-server/patches/patch-ak13
-rw-r--r--sysutils/amanda-server/patches/patch-al12
-rw-r--r--sysutils/amanda-server/pkg/DESCR9
-rw-r--r--sysutils/amanda-server/pkg/PLIST20
16 files changed, 558 insertions, 569 deletions
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index d8ee5008454..1387a8a007e 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2000/07/20 15:26:18 tron Exp $
+# $NetBSD: Makefile,v 1.15 2001/01/16 21:59:39 cjones Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-server-2.4.1p1
+DISTNAME= amanda-2.4.2
+PKGNAME= amanda-server-2.4.2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
@@ -11,10 +11,11 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.amanda.org/
DEPENDS+= readline>=4.0:../../devel/readline
-DEPENDS+= amanda-common-2.4.1p1:../../sysutils/amanda-common
+DEPENDS+= amanda-common-2.4.2:../../sysutils/amanda-common
USE_X11= yes
USE_PERL5= yes
+USE_GMAKE= yes
.include "../../mk/bsd.prefs.mk"
.include "../../sysutils/amanda-common/Makefile.common"
@@ -23,24 +24,24 @@ CONFIGURE_ARGS+= --without-client
BUILD_DEFS+= AMANDA_USER AMANDA_SMB AMANDA_VAR
-post-install:
- ${MKDIR} ${PREFIX}/share/doc/amanda
- ${MKDIR} ${PREFIX}/share/examples/amanda
- for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \
- ${INSTALL_DATA} $$i ${PREFIX}/share/doc/amanda; \
- done
- for i in ${WRKDIR}/${DISTNAME}/example/8.5x11.ps \
- ${WRKDIR}/${DISTNAME}/example/DIN-A4.ps \
- ${WRKDIR}/${DISTNAME}/example/DLT.ps \
- ${WRKDIR}/${DISTNAME}/example/EXB-8500.ps \
- ${WRKDIR}/${DISTNAME}/example/HP-DAT.ps \
- ${WRKDIR}/${DISTNAME}/example/amanda.conf \
- ${WRKDIR}/${DISTNAME}/example/chg-multi.conf \
- ${WRKDIR}/${DISTNAME}/example/chg-scsi.conf \
- ${WRKDIR}/${DISTNAME}/example/config.site \
- ${WRKDIR}/${DISTNAME}/example/disklist; do \
- ${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \
- done
+# post-install:
+# ${MKDIR} ${PREFIX}/share/doc/amanda
+# ${MKDIR} ${PREFIX}/share/examples/amanda
+# for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \
+# ${INSTALL_DATA} $$i ${PREFIX}/share/doc/amanda; \
+# done
+# for i in ${WRKDIR}/${DISTNAME}/example/8.5x11.ps \
+# ${WRKDIR}/${DISTNAME}/example/DIN-A4.ps \
+# ${WRKDIR}/${DISTNAME}/example/DLT.ps \
+# ${WRKDIR}/${DISTNAME}/example/EXB-8500.ps \
+# ${WRKDIR}/${DISTNAME}/example/HP-DAT.ps \
+# ${WRKDIR}/${DISTNAME}/example/amanda.conf \
+# ${WRKDIR}/${DISTNAME}/example/chg-multi.conf \
+# ${WRKDIR}/${DISTNAME}/example/chg-scsi.conf \
+# ${WRKDIR}/${DISTNAME}/example/config.site \
+# ${WRKDIR}/${DISTNAME}/example/disklist; do \
+# ${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \
+# done
.if ${OPSYS} == "SunOS"
PLIST_SRC= ${WRKDIR}/PLIST-src
diff --git a/sysutils/amanda-server/files/md5 b/sysutils/amanda-server/files/md5
index 60f97a6b577..d837bf8a245 100644
--- a/sysutils/amanda-server/files/md5
+++ b/sysutils/amanda-server/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/04/04 23:34:46 tron Exp $
+$NetBSD: md5,v 1.3 2001/01/16 21:59:39 cjones Exp $
-MD5 (amanda-2.4.1p1.tar.gz) = 13f34dc97c35f85f88e54ca25b2009ed
+MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
diff --git a/sysutils/amanda-server/files/patch-sum b/sysutils/amanda-server/files/patch-sum
index c15995a4245..857d4514add 100644
--- a/sysutils/amanda-server/files/patch-sum
+++ b/sysutils/amanda-server/files/patch-sum
@@ -1,11 +1,14 @@
-$NetBSD: patch-sum,v 1.4 2000/03/06 21:14:52 groo Exp $
+$NetBSD: patch-sum,v 1.5 2001/01/16 21:59:39 cjones Exp $
-MD5 (patch-aa) = 4f057e8227b12059dc4b75fefdb3385a
-MD5 (patch-ab) = 683940c28441b1bf5e51101c70ef6020
-MD5 (patch-ac) = 3a8fc02a7ca54d23950f387a0f21dc42
-MD5 (patch-ad) = 136a4a8c143cb183a46e29635e7760be
-MD5 (patch-ae) = 94337bb089dad64045eebd2ae50e8a60
-MD5 (patch-af) = ad691c5f446498750a993e2857e57132
+MD5 (patch-aa) = 48523a17fe624686607217c437d552cc
+MD5 (patch-ab) = e2b0eedd04ddf03fdcd8be5a6c7a732b
+MD5 (patch-ac) = 22c485e47a3fa49130c5ce86727b274d
+MD5 (patch-ad) = c56ed041983485b354fb83ef6d08522e
+MD5 (patch-ae) = ccb0f0bf0185e2d9baa52c25ee19b279
+MD5 (patch-af) = 0b10a21151b51818546ca424e39147c8
MD5 (patch-ag) = b7df4171bf9a4daa9e7e4bd024857b10
-MD5 (patch-ah) = 0abf39e69917329b3103e28fb7d47632
-MD5 (patch-ai) = dc79d66683986442e288cb93b779f1ab
+MD5 (patch-ah) = 1b32587420a7d591809737bbad9cde45
+MD5 (patch-ai) = 67a08795eb19530e38271814481321b2
+MD5 (patch-aj) = 1da69289764d62de86a00d1de72c34a3
+MD5 (patch-ak) = 79970eda2347d7215ea198c356a7b6e1
+MD5 (patch-al) = ecc9e6eff9e4f1c5313a0810b5651b9e
diff --git a/sysutils/amanda-server/patches/patch-aa b/sysutils/amanda-server/patches/patch-aa
index 5def18046b4..35ce7e29f3e 100644
--- a/sysutils/amanda-server/patches/patch-aa
+++ b/sysutils/amanda-server/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1999/09/06 18:16:34 bad Exp $
+$NetBSD: patch-aa,v 1.4 2001/01/16 21:59:39 cjones Exp $
---- configure.orig Sat Nov 21 18:12:59 1998
-+++ configure Fri Sep 3 20:08:38 1999
-@@ -2943,6 +2943,7 @@
+--- configure.orig Sat Nov 25 06:59:40 2000
++++ configure Mon Jan 15 14:08:27 2001
+@@ -3268,6 +3268,7 @@
done
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 1999/09/06 18:16:34 bad Exp $
for ac_prog in gnuplot
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -2978,6 +2979,8 @@
+@@ -3307,6 +3308,8 @@
test -n "$GNUPLOT" && break
done
@@ -18,19 +18,14 @@ $NetBSD: patch-aa,v 1.3 1999/09/06 18:16:34 bad Exp $
+GNUPLOT=""
if test -z "$GNUPLOT"; then
- BUILD_AMPLOT_SBIN=
-@@ -4457,6 +4460,7 @@
- echo "$ac_t""no" 1>&6
- fi
+ NO_AMPLOT_MODE=true
+@@ -4924,8 +4927,10 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+if false; then
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-@@ -4502,6 +4506,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+fi
# Redirect the config.log output again, so that the ltconfig log is not
diff --git a/sysutils/amanda-server/patches/patch-ab b/sysutils/amanda-server/patches/patch-ab
index a52aed618b2..42fdd045345 100644
--- a/sysutils/amanda-server/patches/patch-ab
+++ b/sysutils/amanda-server/patches/patch-ab
@@ -1,13 +1,30 @@
-$NetBSD: patch-ab,v 1.3 1999/09/04 01:19:50 bad Exp $
+$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:39 cjones Exp $
---- client-src/Makefile.in.old Tue Feb 23 10:34:37 1999
-+++ client-src/Makefile.in Tue Feb 23 10:35:09 1999
-@@ -167,7 +167,7 @@
+--- Makefile.in.orig Sat Nov 25 07:01:53 2000
++++ Makefile.in Mon Jan 15 15:44:03 2001
+@@ -33,7 +33,7 @@
- SUFFIXES = .sh .pl
+ DESTDIR =
--libexec_PROGRAMS = versionsuffix @BUILD_CLIENT_PROGS_LIBEXEC@
-+libexec_PROGRAMS = @BUILD_CLIENT_PROGS_LIBEXEC@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
- # these are used for testing only:
- TEST_PROGS = getfsent
+@@ -154,7 +154,7 @@
+ ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
+
+ @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = @WANT_CLIENT_TRUE@client-src
+-@WANT_TAPE_TRUE@TAPE_SUBDIRS = @WANT_TAPE_TRUE@tape-src
++#TAPE_SUBDIRS = #tape-src
+ @WANT_SERVER_TRUE@SERVER_SUBDIRS = @WANT_SERVER_TRUE@server-src changer-src
+ @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = @WANT_RESTORE_TRUE@ restore-src
+ @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = @WANT_RECOVER_TRUE@ recover-src
+@@ -162,7 +162,6 @@
+ # order is significant, don't change it arbitrarily
+ SUBDIRS = \
+ config \
+- common-src \
+ $(CLIENT_SUBDIRS) \
+ $(TAPE_SUBDIRS) \
+ $(SERVER_SUBDIRS) \
diff --git a/sysutils/amanda-server/patches/patch-ac b/sysutils/amanda-server/patches/patch-ac
index 7d0a31bb9fb..2e2931efcc0 100644
--- a/sysutils/amanda-server/patches/patch-ac
+++ b/sysutils/amanda-server/patches/patch-ac
@@ -1,16 +1,19 @@
-$NetBSD: patch-ac,v 1.4 1999/09/06 18:16:34 bad Exp $
+$NetBSD: patch-ac,v 1.5 2001/01/16 21:59:39 cjones Exp $
---- Makefile.in.orig Sat Nov 21 18:32:54 1998
-+++ Makefile.in Fri Sep 3 20:09:55 1999
-@@ -157,9 +157,9 @@
- AUTOCONF = @AUTOCONF@ --localdir=config
+--- example/amanda.conf.chg-scsi.in~ Thu Jun 17 12:33:43 1999
++++ example/amanda.conf.chg-scsi.in Mon Jan 15 14:26:31 2001
+@@ -153,10 +153,10 @@
+ # Note that, although the keyword below is infofile, it is only so for
+ # historic reasons, since now it is supposed to be a directory (unless
+ # you have selected some database format other than the `text' default)
+-infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
+-logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory
+-indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory
+-#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes
++infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
++logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory
++indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory
++#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
+ # tapelist is stored, by default, in the directory that contains amanda.conf
- SUBDIRS=config \
-- common-src client-src tape-src \
-+ client-src \
- server-src restore-src recover-src \
-- changer-src amplot man \
-+ changer-src man \
- example
- EXTRA_DIST = \
diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad
index 5144c9c2dbc..5cdd157be31 100644
--- a/sysutils/amanda-server/patches/patch-ad
+++ b/sysutils/amanda-server/patches/patch-ad
@@ -1,17 +1,180 @@
-$NetBSD: patch-ad,v 1.4 1999/09/06 18:16:34 bad Exp $
+$NetBSD: patch-ad,v 1.5 2001/01/16 21:59:39 cjones Exp $
---- man/Makefile.in.orig Sat Nov 21 18:34:50 1998
-+++ man/Makefile.in Sat Sep 4 03:26:17 1999
-@@ -158,10 +158,10 @@
+--- server-src/Makefile.in.orig Sat Nov 25 07:01:58 2000
++++ server-src/Makefile.in Mon Jan 15 14:18:34 2001
+@@ -180,9 +180,7 @@
- transform = s,x,x,;
+ libamserver_a_SOURCES = $(libamserver_la_SOURCES)
--man_MANS = amadmin.8 amanda.8 amcheck.8 \
-+man_MANS = amadmin.8 amcheck.8 \
- amcheckdb.8 amcleanup.8 amdump.8 \
- amflush.8 amlabel.8 amoverview.8 \
-- amplot.8 amrecover.8 amrestore.8 \
-+ amrestore.8 \
- amrmtape.8 amtape.8 amtoc.8 \
- amverify.8 amstatus.8 amreport.8
+-LDADD = libamserver.$(LIB_EXTENSION) \
+- ../tape-src/libamtape.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++LDADD = libamserver.$(LIB_EXTENSION)
+
+
+ SUFFIXES = .sh .pl
+@@ -221,7 +219,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lamtape -lamanda
+ libamserver_a_AR = $(AR) cru
+ libamserver_a_LIBADD =
+ am_libamserver_a_OBJECTS = amindex.$(OBJEXT) changer.$(OBJEXT) \
+@@ -247,136 +245,98 @@
+ amadmin_SOURCES = amadmin.c
+ amadmin_OBJECTS = amadmin.$(OBJEXT)
+ amadmin_LDADD = $(LDADD)
+-amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amadmin_LDFLAGS =
+ amcheck_SOURCES = amcheck.c
+ amcheck_OBJECTS = amcheck.$(OBJEXT)
+ amcheck_LDADD = $(LDADD)
+-amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amcheck_LDFLAGS =
+ amcleanupdisk_SOURCES = amcleanupdisk.c
+ amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT)
+ amcleanupdisk_LDADD = $(LDADD)
+-amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amcleanupdisk_LDFLAGS =
+ amflush_SOURCES = amflush.c
+ amflush_OBJECTS = amflush.$(OBJEXT)
+ amflush_LDADD = $(LDADD)
+-amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amflush_LDFLAGS =
+ am_amgetconf_OBJECTS = getconf.$(OBJEXT)
+ amgetconf_OBJECTS = $(am_amgetconf_OBJECTS)
+ amgetconf_LDADD = $(LDADD)
+-amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amgetconf_LDFLAGS =
+ am_amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \
+ list_dir.$(OBJEXT)
+ amindexd_OBJECTS = $(am_amindexd_OBJECTS)
+ amindexd_LDADD = $(LDADD)
+-amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amindexd_LDFLAGS =
+ amlabel_SOURCES = amlabel.c
+ amlabel_OBJECTS = amlabel.$(OBJEXT)
+ amlabel_LDADD = $(LDADD)
+-amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amlabel_LDFLAGS =
+ amlogroll_SOURCES = amlogroll.c
+ amlogroll_OBJECTS = amlogroll.$(OBJEXT)
+ amlogroll_LDADD = $(LDADD)
+-amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amlogroll_LDFLAGS =
+ am_amreport_OBJECTS = reporter.$(OBJEXT)
+ amreport_OBJECTS = $(am_amreport_OBJECTS)
+ amreport_LDADD = $(LDADD)
+-amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amreport_LDFLAGS =
+ amtape_SOURCES = amtape.c
+ amtape_OBJECTS = amtape.$(OBJEXT)
+ amtape_LDADD = $(LDADD)
+-amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amtape_LDFLAGS =
+ amtrmidx_SOURCES = amtrmidx.c
+ amtrmidx_OBJECTS = amtrmidx.$(OBJEXT)
+ amtrmidx_LDADD = $(LDADD)
+-amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amtrmidx_LDFLAGS =
+ amtrmlog_SOURCES = amtrmlog.c
+ amtrmlog_OBJECTS = amtrmlog.$(OBJEXT)
+ amtrmlog_LDADD = $(LDADD)
+-amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amtrmlog_LDFLAGS =
+ am_conffile_OBJECTS = conffile.test.$(OBJEXT)
+ conffile_OBJECTS = $(am_conffile_OBJECTS)
+ conffile_LDADD = $(LDADD)
+-conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ conffile_LDFLAGS =
+ am_diskfile_OBJECTS = diskfile.test.$(OBJEXT)
+ diskfile_OBJECTS = $(am_diskfile_OBJECTS)
+ diskfile_LDADD = $(LDADD)
+-diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ diskfile_LDFLAGS =
+ driver_SOURCES = driver.c
+ driver_OBJECTS = driver.$(OBJEXT)
+ driver_LDADD = $(LDADD)
+-driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ driver_LDFLAGS =
+ dumper_SOURCES = dumper.c
+ dumper_OBJECTS = dumper.$(OBJEXT)
+ dumper_LDADD = $(LDADD)
+-dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ dumper_LDFLAGS =
+ am_infofile_OBJECTS = infofile.test.$(OBJEXT)
+ infofile_OBJECTS = $(am_infofile_OBJECTS)
+ infofile_LDADD = $(LDADD)
+-infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ infofile_LDFLAGS =
+ planner_SOURCES = planner.c
+ planner_OBJECTS = planner.$(OBJEXT)
+ planner_LDADD = $(LDADD)
+-planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ planner_LDFLAGS =
+ taper_SOURCES = taper.c
+ taper_OBJECTS = taper.$(OBJEXT)
+ taper_LDADD = $(LDADD)
+-taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ taper_LDFLAGS =
+ SCRIPTS = $(sbin_SCRIPTS)
diff --git a/sysutils/amanda-server/patches/patch-ae b/sysutils/amanda-server/patches/patch-ae
index b5b76628cd4..b93b23a662f 100644
--- a/sysutils/amanda-server/patches/patch-ae
+++ b/sysutils/amanda-server/patches/patch-ae
@@ -1,261 +1,28 @@
-$NetBSD: patch-ae,v 1.3 1999/09/04 01:19:50 bad Exp $
+$NetBSD: patch-ae,v 1.4 2001/01/16 21:59:40 cjones Exp $
---- changer-src/Makefile.in.old Tue Feb 23 11:55:44 1999
-+++ changer-src/Makefile.in Tue Feb 23 11:57:09 1999
-@@ -83,7 +83,7 @@
- BUILD_CLIENT_SCRIPTS_LIBEXEC = @BUILD_CLIENT_SCRIPTS_LIBEXEC@
- BUILD_CLIENT_SCRIPTS_SBIN = @BUILD_CLIENT_SCRIPTS_SBIN@
- BUILD_COMMON_LIB = @BUILD_COMMON_LIB@
--BUILD_COMMON_LTLIB = @BUILD_COMMON_LTLIB@
-+BUILD_COMMON_LTLIB =
- BUILD_RECOVER_PROGS_SBIN = @BUILD_RECOVER_PROGS_SBIN@
- BUILD_RESTORE_PROGS_LIBEXEC = @BUILD_RESTORE_PROGS_LIBEXEC@
- BUILD_RESTORE_PROGS_SBIN = @BUILD_RESTORE_PROGS_SBIN@
-@@ -93,7 +93,7 @@
- BUILD_SERVER_PROGS_SBIN = @BUILD_SERVER_PROGS_SBIN@
- BUILD_SERVER_SCRIPTS_SBIN = @BUILD_SERVER_SCRIPTS_SBIN@
- BUILD_TAPE_LIB = @BUILD_TAPE_LIB@
--BUILD_TAPE_LTLIB = @BUILD_TAPE_LTLIB@
-+BUILD_TAPE_LTLIB =
- CAT = @CAT@
- CC = @CC@
- CHIO = @CHIO@
-@@ -161,8 +161,7 @@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(AMANDA_CFLAGS)
+--- changer-src/Makefile.in.orig Sat Nov 25 07:01:58 2000
++++ changer-src/Makefile.in Mon Jan 15 14:14:51 2001
+@@ -161,9 +161,7 @@
+ chg-zd-mtx
- # they cross-reference each other a bit, so need to be included twice
--LDADD = ../server-src/libamserver.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
-
- SUFFIXES = .pl .sh
-
-@@ -203,9 +202,8 @@
-
- chg_scsi_OBJECTS = chg-scsi.o
- chg_scsi_DEPENDENCIES = libscsi.a \
--../server-src/libamserver.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
--chg_scsi_LDFLAGS =
-+../server-src/libamserver.$(LIB_EXTENSION)
-+chg_scsi_LDFLAGS = -lamanda
- SCRIPTS = $(libexec_SCRIPTS)
- CFLAGS = @CFLAGS@
---- restore-src/Makefile.in.old Tue Feb 23 11:58:06 1999
-+++ restore-src/Makefile.in Tue Feb 23 12:58:50 1999
-@@ -83,7 +83,7 @@
- BUILD_CLIENT_SCRIPTS_LIBEXEC = @BUILD_CLIENT_SCRIPTS_LIBEXEC@
- BUILD_CLIENT_SCRIPTS_SBIN = @BUILD_CLIENT_SCRIPTS_SBIN@
- BUILD_COMMON_LIB = @BUILD_COMMON_LIB@
--BUILD_COMMON_LTLIB = @BUILD_COMMON_LTLIB@
-+BUILD_COMMON_LTLIB =
- BUILD_RECOVER_PROGS_SBIN = @BUILD_RECOVER_PROGS_SBIN@
- BUILD_RESTORE_PROGS_LIBEXEC = @BUILD_RESTORE_PROGS_LIBEXEC@
- BUILD_RESTORE_PROGS_SBIN = @BUILD_RESTORE_PROGS_SBIN@
-@@ -93,7 +93,7 @@
- BUILD_SERVER_PROGS_SBIN = @BUILD_SERVER_PROGS_SBIN@
- BUILD_SERVER_SCRIPTS_SBIN = @BUILD_SERVER_SCRIPTS_SBIN@
- BUILD_TAPE_LIB = @BUILD_TAPE_LIB@
--BUILD_TAPE_LTLIB = @BUILD_TAPE_LTLIB@
-+BUILD_TAPE_LTLIB =
- CAT = @CAT@
- CC = @CC@
- CHIO = @CHIO@
-@@ -162,8 +162,7 @@
-
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(AMANDA_CFLAGS)
-
--LDADD = ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD =
-
- sbin_PROGRAMS = @BUILD_RESTORE_PROGS_SBIN@
-
-@@ -181,17 +180,15 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../config
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lamtape -lamanda
- amrestore_SOURCES = amrestore.c
- amrestore_OBJECTS = amrestore.o
- amrestore_LDADD = $(LDADD)
--amrestore_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amrestore_DEPENDENCIES =
- amrestore_LDFLAGS =
- amidxtaped_OBJECTS = amidxtaped.o
- amidxtaped_LDADD = $(LDADD)
--amidxtaped_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amidxtaped_DEPENDENCIES =
- amidxtaped_LDFLAGS =
- CFLAGS = @CFLAGS@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
---- server-src/Makefile.in.old Tue Feb 23 13:01:08 1999
-+++ server-src/Makefile.in Tue Feb 23 13:03:27 1999
-@@ -83,7 +83,7 @@
- BUILD_CLIENT_SCRIPTS_LIBEXEC = @BUILD_CLIENT_SCRIPTS_LIBEXEC@
- BUILD_CLIENT_SCRIPTS_SBIN = @BUILD_CLIENT_SCRIPTS_SBIN@
- BUILD_COMMON_LIB = @BUILD_COMMON_LIB@
--BUILD_COMMON_LTLIB = @BUILD_COMMON_LTLIB@
-+BUILD_COMMON_LTLIB =
- BUILD_RECOVER_PROGS_SBIN = @BUILD_RECOVER_PROGS_SBIN@
- BUILD_RESTORE_PROGS_LIBEXEC = @BUILD_RESTORE_PROGS_LIBEXEC@
- BUILD_RESTORE_PROGS_SBIN = @BUILD_RESTORE_PROGS_SBIN@
-@@ -93,7 +93,7 @@
- BUILD_SERVER_PROGS_SBIN = @BUILD_SERVER_PROGS_SBIN@
- BUILD_SERVER_SCRIPTS_SBIN = @BUILD_SERVER_SCRIPTS_SBIN@
- BUILD_TAPE_LIB = @BUILD_TAPE_LIB@
--BUILD_TAPE_LTLIB = @BUILD_TAPE_LTLIB@
-+BUILD_TAPE_LTLIB =
- CAT = @CAT@
- CC = @CC@
- CHIO = @CHIO@
-@@ -162,9 +162,7 @@
-
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(AMANDA_CFLAGS)
-
--LDADD = libamserver.$(LIB_EXTENSION) \
+-LDADD = ../server-src/libamserver.$(LIB_EXTENSION) \
- ../tape-src/libamtape.$(LIB_EXTENSION) \
- ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamserver.$(LIB_EXTENSION)
++LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
- SUFFIXES = .sh .pl
-@@ -234,7 +232,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../config
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lamtape -lamanda
- libamserver_a_LIBADD =
- libamserver_a_OBJECTS = amindex.o changer.o clock.o conffile.o \
- diskfile.o driverio.o holding.o infofile.o logfile.o tapefile.o find.o
-@@ -249,109 +247,77 @@
- amadmin_SOURCES = amadmin.c
- amadmin_OBJECTS = amadmin.o
- amadmin_LDADD = $(LDADD)
--amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amadmin_LDFLAGS =
- amcheck_SOURCES = amcheck.c
- amcheck_OBJECTS = amcheck.o
- amcheck_LDADD = $(LDADD)
--amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amcheck_LDFLAGS =
- amflush_SOURCES = amflush.c
- amflush_OBJECTS = amflush.o
- amflush_LDADD = $(LDADD)
--amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amflush_LDFLAGS =
- amindexd_OBJECTS = amindexd.o disk_history.o list_dir.o
- amindexd_LDADD = $(LDADD)
--amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amindexd_LDFLAGS =
- amlabel_SOURCES = amlabel.c
- amlabel_OBJECTS = amlabel.o
- amlabel_LDADD = $(LDADD)
--amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
+ SUFFIXES = .pl .sh
+@@ -195,10 +193,8 @@
+ scsi-bsd.$(OBJEXT)
+ chg_scsi_OBJECTS = $(am_chg_scsi_OBJECTS)
+ chg_scsi_LDADD = $(LDADD)
+-chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) \
-../tape-src/libamtape.$(LIB_EXTENSION) \
-../common-src/libamanda.$(LIB_EXTENSION)
-+amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amlabel_LDFLAGS =
- amtape_SOURCES = amtape.c
- amtape_OBJECTS = amtape.o
- amtape_LDADD = $(LDADD)
--amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtape_LDFLAGS =
- amtrmidx_SOURCES = amtrmidx.c
- amtrmidx_OBJECTS = amtrmidx.o
- amtrmidx_LDADD = $(LDADD)
--amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtrmidx_LDFLAGS =
- driver_SOURCES = driver.c
- driver_OBJECTS = driver.o
- driver_LDADD = $(LDADD)
--driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- driver_LDFLAGS =
- dumper_SOURCES = dumper.c
- dumper_OBJECTS = dumper.o
- dumper_LDADD = $(LDADD)
--dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- dumper_LDFLAGS =
- getconf_SOURCES = getconf.c
- getconf_OBJECTS = getconf.o
- getconf_LDADD = $(LDADD)
--getconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+getconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- getconf_LDFLAGS =
- planner_SOURCES = planner.c
- planner_OBJECTS = planner.o
- planner_LDADD = $(LDADD)
--planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- planner_LDFLAGS =
- amreport_OBJECTS = reporter.o
- amreport_LDADD = $(LDADD)
--amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amreport_LDFLAGS =
- taper_SOURCES = taper.c
- taper_OBJECTS = taper.o
- taper_LDADD = $(LDADD)
--taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- taper_LDFLAGS =
- diskfile_OBJECTS = diskfile.test.o
- diskfile_LDADD = $(LDADD)
--diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- diskfile_LDFLAGS =
- conffile_OBJECTS = conffile.test.o
- conffile_LDADD = $(LDADD)
--conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- conffile_LDFLAGS =
- infofile_OBJECTS = infofile.test.o
- infofile_LDADD = $(LDADD)
--infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- infofile_LDFLAGS =
- SCRIPTS = $(sbin_SCRIPTS)
-
+-chg_scsi_LDFLAGS =
++chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
++chg_scsi_LDFLAGS = -lamanda -lamtape
+ am_chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \
+ scsi-chio.$(OBJEXT)
+ chg_scsi_chio_OBJECTS = $(am_chg_scsi_chio_OBJECTS)
diff --git a/sysutils/amanda-server/patches/patch-af b/sysutils/amanda-server/patches/patch-af
index 4caa2621d99..2d62327eea2 100644
--- a/sysutils/amanda-server/patches/patch-af
+++ b/sysutils/amanda-server/patches/patch-af
@@ -1,59 +1,165 @@
-$NetBSD: patch-af,v 1.3 1999/09/04 01:19:50 bad Exp $
+$NetBSD: patch-af,v 1.4 2001/01/16 21:59:40 cjones Exp $
---- changer-src/chg-scsi.c.orig Sat Sep 19 03:55:13 1998
-+++ changer-src/chg-scsi.c Mon Feb 22 20:00:39 1999
-@@ -527,6 +527,15 @@
+--- changer-src/scsi-chio.c.orig Thu Jun 17 12:33:19 1999
++++ changer-src/scsi-chio.c Thu Jan 11 13:01:33 2001
+@@ -121,25 +121,41 @@
+ */
+ int isempty(int fd, int slot)
{
- FILE *out=NULL;
- int cnt=0;
-+
-+ /* if we have a long timeout, sleep a long time before access.
-+ * This is avoid lots of error messages for drives which need a lot of time
-+ */
-+ if ((timeout /2) > 1) {
-+ timeout = timeout / 2;
-+ sleep(timeout);
-+ }
-+
- while ((cnt<timeout) && (NULL==(out=fopen(tapedev,"w+")))){
- cnt++;
- sleep(1);
-@@ -634,7 +643,10 @@
-
- /* Get the configuration parameters */
- if (tape_device[0] >= '0' && tape_device[0] <= '9' && tape_device[1] == 0){
-- read_config(changer_file,&chg);
-+ if (read_config(changer_file,&chg) == -1) {
-+ perror(changer_file);
-+ exit(1);
-+ }
- confnum=atoi(tape_device);
- use_slots = chg.conf[confnum].end-chg.conf[confnum].start+1;
- slot_offset = chg.conf[confnum].start;
-@@ -717,7 +729,7 @@
- if (need_eject)
- eject_tape(tape_device);
- (void)unload(fd, drive_num, oldtarget);
-- if (ask_clean(tape_device,need_sleep))
-+ if (clean_slot != -1 && ask_clean(tape_device,need_sleep))
- clean_tape(fd,tape_device,clean_file,drive_num,
- clean_slot,maxclean,time_file);
- loaded=0;
-@@ -751,7 +763,7 @@
- if (need_eject)
- eject_tape(tape_device);
- (void)unload(fd, drive_num, target);
-- if (ask_clean(tape_device,need_sleep))
-+ if (clean_slot != -1 && ask_clean(tape_device,need_sleep))
- clean_tape(fd,tape_device,clean_file,drive_num,clean_slot,
- maxclean,time_file);
- }
-@@ -776,7 +788,7 @@
- if (need_eject)
- eject_tape(tape_device);
- (void)unload(fd, drive_num, target);
-- if (ask_clean(tape_device,need_sleep))
-+ if (clean_slot != -1 && ask_clean(tape_device,need_sleep))
- clean_tape(fd,tape_device,clean_file,drive_num,clean_slot,
- maxclean,time_file);
- printf("%d %s\n", target, tape_device);
++#if defined(OCHIOGSTATUS)
++struct ochanger_element_status_request cesr;
++#else
+ struct changer_element_status ces;
++#endif
++
+ int i,rc;
+ int type=CHET_ST;
+
+ get_changer_info(fd);
+
++#if defined(OCHIOGSTATUS)
++ cesr.cesr_type = type;
++ cesr.cesr_data = malloc(changer_info.cp_nslots);
++ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
++#else
+ ces.ces_type = type;
+ ces.ces_data = malloc(changer_info.cp_nslots);
+-
+ rc = ioctl(fd, CHIOGSTATUS, &ces);
++#endif
++
+ if (rc) {
+ dbprintf(("%s: changer status query failed: 0x%x %s\n",
+ get_pname(), rc,strerror(errno)));
+ return -1;
+ }
+
++#if defined(OCHIOGSTATUS)
++ i = cesr.cesr_data[slot] & CESTATUS_FULL;
++ free(cesr.cesr_data);
++#else
+ i = ces.ces_data[slot] & CESTATUS_FULL;
+-
+ free(ces.ces_data);
++#endif
++
+ return !i;
+ }
+
+@@ -148,16 +164,27 @@
+ */
+ int find_empty(int fd, int start, int count)
+ {
++#if defined(OCHIOGSTATUS)
++struct ochanger_element_status_request cesr;
++#else
+ struct changer_element_status ces;
++#endif
++
+ int i,rc;
+ int type=CHET_ST;
+
+ get_changer_info(fd);
+
++#if defined(OCHIOGSTATUS)
++ cesr.cesr_type = type;
++ cesr.cesr_data = malloc(changer_info.cp_nslots);
++ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
++#else
+ ces.ces_type = type;
+ ces.ces_data = malloc(changer_info.cp_nslots);
++ rc = ioctl(fd, CHIOGSTATUS, &ces);
++#endif
+
+- rc = ioctl(fd,CHIOGSTATUS,&ces);
+ if (rc) {
+ dbprintf(("%s: changer status query failed: 0x%x %s\n",
+ get_pname(), rc, strerror(errno)));
+@@ -165,9 +192,17 @@
+ }
+
+ i = 0;
++
++#if defined(OCHIOGSTATUS)
++ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL))
++ i++;
++ free(cesr.cesr_data);
++#else
+ while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL))
+ i++;
+ free(ces.ces_data);
++#endif
++
+ return i;
+ }
+
+@@ -176,25 +211,41 @@
+ */
+ int drive_loaded(int fd, int drivenum)
+ {
++#if defined(OCHIOGSTATUS)
++struct ochanger_element_status_request cesr;
++#else
+ struct changer_element_status ces;
++#endif
++
+ int i,rc;
+ int type=CHET_DT;
+
+ get_changer_info(fd);
+
++#if defined(OCHIOGSTATUS)
++ cesr.cesr_type = type;
++ cesr.cesr_data = malloc(changer_info.cp_ndrives);
++ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
++#else
+ ces.ces_type = type;
+ ces.ces_data = malloc(changer_info.cp_ndrives);
+-
+ rc = ioctl(fd, CHIOGSTATUS, &ces);
++#endif
++
+ if (rc) {
+ dbprintf(("%s: drive status query failed: 0x%x %s\n",
+ get_pname(), rc, strerror(errno)));
+ return -1;
+ }
+
++#if defined(OCHIOGSTATUS)
++ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL);
++ free(cesr.cesr_data);
++#else
+ i = (ces.ces_data[drivenum] & CESTATUS_FULL);
+-
+ free(ces.ces_data);
++#endif
++
+ return i;
+ }
+
+@@ -204,7 +255,12 @@
+ */
+ int unload(int fd, int drive, int slot)
+ {
++#if defined(OCHIOGSTATUS)
++struct changer_move_request move;
++#else
+ struct changer_move move;
++#endif
++
+ int rc;
+
+ dbprintf(("unload : fd = %d, drive = %d, slot =%d\n",fd, drive, slot));
+@@ -230,7 +286,12 @@
+ */
+ int load(int fd, int drive, int slot)
+ {
++#if defined(OCHIOGSTATUS)
++struct changer_move_request move;
++#else
+ struct changer_move move;
++#endif
++
+ int rc;
+
+ dbprintf(("load : fd = %d, drive = %d, slot =%d\n",fd, drive, slot));
diff --git a/sysutils/amanda-server/patches/patch-ah b/sysutils/amanda-server/patches/patch-ah
index e60d1512de9..a6f021ab4b8 100644
--- a/sysutils/amanda-server/patches/patch-ah
+++ b/sysutils/amanda-server/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 1999/09/04 01:19:50 bad Exp $
+$NetBSD: patch-ah,v 1.4 2001/01/16 21:59:40 cjones Exp $
---- example/amanda.conf.in.old Thu Feb 25 15:56:29 1999
-+++ example/amanda.conf.in Tue Nov 17 20:17:36 1998
-@@ -59,8 +59,8 @@
+--- example/amanda.conf.in.orig Tue Nov 7 18:44:50 2000
++++ example/amanda.conf.in Mon Jan 15 14:19:56 2001
+@@ -71,8 +71,8 @@
tpchanger "chg-manual" # the tape-changer glue script
tapedev "@DEFAULT_TAPE_DEVICE@" # the no-rewind tape device to be used
rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only)
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.3 1999/09/04 01:19:50 bad Exp $
changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf"
changerdev "@DEFAULT_CHANGER_DEVICE@"
-@@ -130,10 +130,10 @@
+@@ -159,10 +159,10 @@
# Note that, although the keyword below is infofile, it is only so for
# historic reasons, since now it is supposed to be a directory (unless
# you have selected some database format other than the `text' default)
diff --git a/sysutils/amanda-server/patches/patch-ai b/sysutils/amanda-server/patches/patch-ai
index a3b9547e839..b7f5959e863 100644
--- a/sysutils/amanda-server/patches/patch-ai
+++ b/sysutils/amanda-server/patches/patch-ai
@@ -1,164 +1,31 @@
-$NetBSD: patch-ai,v 1.2 2000/03/16 13:58:48 wiz Exp $
---- changer-src/scsi-chio.c.orig Wed Jul 8 00:04:04 1998
-+++ changer-src/scsi-chio.c Mon Mar 6 15:26:26 2000
-@@ -119,25 +119,41 @@
- */
- int isempty(int fd, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_ST;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_nslots);
--
- rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
- if (rc) {
- fprintf(stderr,"%s: changer status query failed: 0x%x %s\n",
- get_pname(), rc,strerror(errno));
- return -1;
- }
-
-+#if defined(OCHIOGSTATUS)
-+ i = cesr.cesr_data[slot] & CESTATUS_FULL;
-+ free(cesr.cesr_data);
-+#else
- i = ces.ces_data[slot] & CESTATUS_FULL;
--
- free(ces.ces_data);
-+#endif
-+
- return !i;
- }
-
-@@ -146,16 +162,27 @@
- */
- int find_empty(int fd)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_ST;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-
-- rc = ioctl(fd,CHIOGSTATUS,&ces);
- if (rc) {
- fprintf(stderr,"%s: changer status query failed: 0x%x %s\n",
- get_pname(), rc, strerror(errno));
-@@ -163,9 +190,17 @@
- }
-
- i = 0;
-+
-+#if defined(OCHIOGSTATUS)
-+ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL))
-+ i++;
-+ free(cesr.cesr_data);
-+#else
- while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL))
- i++;
- free(ces.ces_data);
-+#endif
-+
- return i;
- }
-
-@@ -174,25 +209,41 @@
- */
- int drive_loaded(int fd, int drivenum)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_DT;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_ndrives);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_ndrives);
--
- rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
- if (rc) {
- fprintf(stderr,"%s: drive status query failed: 0x%x %s\n",
- get_pname(), rc, strerror(errno));
- return -1;
- }
-
-+#if defined(OCHIOGSTATUS)
-+ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL);
-+ free(cesr.cesr_data);
-+#else
- i = (ces.ces_data[drivenum] & CESTATUS_FULL);
--
- free(ces.ces_data);
-+#endif
-+
- return i;
- }
-
-@@ -202,7 +253,12 @@
- */
- int unload(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move move;
-+#endif
-+
- int rc;
-
- move.cm_fromtype = CHET_DT;
-@@ -226,7 +282,12 @@
- */
- int load(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move move;
-+#endif
-+
- int rc;
-
- move.cm_fromtype = CHET_ST;
+$NetBSD: patch-ai,v 1.3 2001/01/16 21:59:40 cjones Exp $
+
+--- restore-src/Makefile.in.orig Sat Nov 25 07:01:59 2000
++++ restore-src/Makefile.in Mon Jan 15 14:54:31 2001
+@@ -156,8 +156,7 @@
+
+ libexec_PROGRAMS = amidxtaped
+
+-LDADD = ../tape-src/libamtape.$(LIB_EXTENSION) \
+- ../common-src/libamanda.$(LIB_EXTENSION)
++LDADD = -lamtape -lamanda
+
+
+ amidxtaped_SOURCES = amidxtaped.c
+@@ -177,14 +176,12 @@
+ am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT)
+ amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS)
+ amidxtaped_LDADD = $(LDADD)
+-amidxtaped_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amidxtaped_DEPENDENCIES =
+ amidxtaped_LDFLAGS =
+ amrestore_SOURCES = amrestore.c
+ amrestore_OBJECTS = amrestore.$(OBJEXT)
+ amrestore_LDADD = $(LDADD)
+-amrestore_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amrestore_DEPENDENCIES =
+ amrestore_LDFLAGS =
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/sysutils/amanda-server/patches/patch-aj b/sysutils/amanda-server/patches/patch-aj
new file mode 100644
index 00000000000..de7789d4aed
--- /dev/null
+++ b/sysutils/amanda-server/patches/patch-aj
@@ -0,0 +1,31 @@
+$NetBSD: patch-aj,v 1.1 2001/01/16 21:59:40 cjones Exp $
+
+--- example/Makefile.in.orig Sat Nov 25 07:02:02 2000
++++ example/Makefile.in Mon Jan 15 15:33:47 2001
+@@ -33,7 +33,7 @@
+
+ DESTDIR =
+
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/examples/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+
+@@ -216,7 +216,16 @@
+ install-exec-am:
+ install-exec: install-exec-am
+
+-install-data-am:
++install-data-am: $(noinst_DATA) $(EXTRA_DIST)
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
++ @list='$(noinst_DATA) $(EXTRA_DIST)'; for p in $$list; do \
++ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
++ done
++
+ install-data: install-data-am
+
+ install-am: all-am
diff --git a/sysutils/amanda-server/patches/patch-ak b/sysutils/amanda-server/patches/patch-ak
new file mode 100644
index 00000000000..c90054087ed
--- /dev/null
+++ b/sysutils/amanda-server/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2001/01/16 21:59:40 cjones Exp $
+
+--- docs/Makefile.in.orig Sat Nov 25 07:02:01 2000
++++ docs/Makefile.in Mon Jan 15 15:33:59 2001
+@@ -33,7 +33,7 @@
+
+ DESTDIR =
+
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+
diff --git a/sysutils/amanda-server/patches/patch-al b/sysutils/amanda-server/patches/patch-al
new file mode 100644
index 00000000000..7e6e67ce00c
--- /dev/null
+++ b/sysutils/amanda-server/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2001/01/16 21:59:40 cjones Exp $
+
+--- man/Makefile.in~ Sat Nov 25 07:02:01 2000
++++ man/Makefile.in Mon Jan 15 17:07:08 2001
+@@ -177,7 +177,6 @@
+ EXTRA_DIST = amplot.8 amrestore.8 amtape.8
+
+ man_MANS = $(AMPLOT_MAN_PAGES) \
+- $(COMMON_MAN_PAGES) \
+ $(SERVER_MAN_PAGES) \
+ $(RECOVER_MAN_PAGES) \
+ $(RESTORE_MAN_PAGES)
diff --git a/sysutils/amanda-server/pkg/DESCR b/sysutils/amanda-server/pkg/DESCR
index 447b0759853..4b14085e122 100644
--- a/sysutils/amanda-server/pkg/DESCR
+++ b/sysutils/amanda-server/pkg/DESCR
@@ -96,21 +96,22 @@ Amanda should run on any modern Unix system that supports dump or GNU
tar, has sockets and inetd, and either system V shared memory, or BSD
mmap implemented.
-In particular, Amanda 2.4.0 has been compiled, and the client side tested
+In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
on the following systems:
AIX 3.2 and 4.1
BSDI BSD/OS 2.1 and 3.1
DEC OSF/1 3.2 and 4.0
FreeBSD 2.2.5
IRIX 5.2 and 6.3
- Linux/GNU on x86, alpha and sparc
+ GNU/Linux on x86, alpha, sparc, arm and powerpc
NetBSD 1.0
Nextstep 3 (*)
- SunOS 4.1.x (x >= 1) and 5.[56]
+ OpenBSD 2.5 x86, sparc, etc (ports available)
+ SunOS 4.1.x (x >= 1) and 5.[567]
Ultrix 4.2
HP-UX 9.x and 10.x (x >= 01)
-The Amanda 2.4.0 server side is known to run on all of the other
+The Amanda 2.4.1p1 server side is known to run on all of the other
machines except on those marked with an asterisk.
If you know of any system that is not listed here on which amanda
diff --git a/sysutils/amanda-server/pkg/PLIST b/sysutils/amanda-server/pkg/PLIST
index 7bc800edcbc..fd6dbc4da89 100644
--- a/sysutils/amanda-server/pkg/PLIST
+++ b/sysutils/amanda-server/pkg/PLIST
@@ -1,21 +1,23 @@
-@comment $NetBSD: PLIST,v 1.5 2000/11/29 22:28:31 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/16 21:59:41 cjones Exp $
+lib/libamserver-2.4.2.so
lib/libamserver.a
lib/libamserver.la
-lib/libamserver-2.4.1p1.so
+libexec/amcleanupdisk
libexec/amidxtaped
libexec/amindexd
+libexec/amlogroll
libexec/amtrmidx
-libexec/chg-scsi
-libexec/chg-zd-mtx
+libexec/amtrmlog
libexec/chg-chio
libexec/chg-chs
libexec/chg-manual
libexec/chg-mtx
libexec/chg-multi
libexec/chg-rth
+libexec/chg-scsi
+libexec/chg-zd-mtx
libexec/driver
libexec/dumper
-libexec/getconf
libexec/planner
libexec/taper
man/man8/amadmin.8
@@ -24,6 +26,7 @@ man/man8/amcheckdb.8
man/man8/amcleanup.8
man/man8/amdump.8
man/man8/amflush.8
+man/man8/amgetconf.8
man/man8/amlabel.8
man/man8/amoverview.8
man/man8/amreport.8
@@ -39,6 +42,7 @@ sbin/amcheckdb
sbin/amcleanup
sbin/amdump
sbin/amflush
+sbin/amgetconf
sbin/amlabel
sbin/amoverview
sbin/amreport
@@ -48,6 +52,10 @@ sbin/amstatus
sbin/amtape
sbin/amtoc
sbin/amverify
+share/doc/amanda/COPYRIGHT
+share/doc/amanda/COPYRIGHT-APACHE
+share/doc/amanda/COPYRIGHT-REGEX
+share/doc/amanda/DUMPER-API
share/doc/amanda/FAQ
share/doc/amanda/INDEXING
share/doc/amanda/INSTALL
@@ -66,12 +74,14 @@ share/doc/amanda/WHATS.NEW
share/doc/amanda/WISHLIST
share/doc/amanda/YEAR2000
share/doc/amanda/ZFTAPE
+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.conf
+share/examples/amanda/amanda.conf.chg-scsi
share/examples/amanda/chg-multi.conf
share/examples/amanda/chg-scsi.conf
share/examples/amanda/config.site
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 17:39:47 +0000