Upgrade of the amanda packages from 2.4.1p1 to 2.4.2.

10 files changed, 83 insertions, 216 deletions

diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 12ec248e02f..71cb4a7d694 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2000/09/03 12:03:16 veego Exp $
+# $NetBSD: Makefile,v 1.12 2001/01/16 21:59:31 cjones Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
-DISTNAME=		amanda-2.4.1p1
-PKGNAME=		amanda-common-2.4.1p1
+DISTNAME=		amanda-2.4.2
+PKGNAME=		amanda-common-2.4.2
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.cs.umd.edu/pub/amanda/
 
diff --git a/sysutils/amanda-common/files/md5 b/sysutils/amanda-common/files/md5
index f0d9db749d7..1096a66375f 100644
--- a/sysutils/amanda-common/files/md5
+++ b/sysutils/amanda-common/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/04/04 23:34:45 tron Exp $
+$NetBSD: md5,v 1.3 2001/01/16 21:59:31 cjones Exp $
 
-MD5 (amanda-2.4.1p1.tar.gz) = 13f34dc97c35f85f88e54ca25b2009ed
+MD5 (amanda-2.4.2.tar.gz) = b10c0ada724694d0bbc46a0d3ebee3c9
diff --git a/sysutils/amanda-common/files/patch-sum b/sysutils/amanda-common/files/patch-sum
index ebdeaf69271..ff7f5c0b01f 100644
--- a/sysutils/amanda-common/files/patch-sum
+++ b/sysutils/amanda-common/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.4 2000/09/15 15:59:34 skrll Exp $
+$NetBSD: patch-sum,v 1.5 2001/01/16 21:59:31 cjones Exp $
 
-MD5 (patch-aa) = 62906fb534c538021b83b757b91534fd
-MD5 (patch-ab) = 2eaacdc2ccf0db3fe126cbc88eb36d26
-MD5 (patch-ac) = 2dcc4ba64e249c61c0a303f10303683a
-MD5 (patch-ad) = 5d6a750fa5d7d1d26483b52790f82f0e
-MD5 (patch-ae) = dc79d66683986442e288cb93b779f1ab
+MD5 (patch-aa) = 554ec557cdcddb2a17ba268024226aac
+MD5 (patch-ab) = 5b1e0835db60d0e8e3d89a18febf26f0
+MD5 (patch-ac) = 8cb1380da436abe6dfb5f34066b01994
+MD5 (patch-ad) = 78cec9042f6247b4f4eb8667e32fb1ea
diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa
index fd0802b6206..6421986add1 100644
--- a/sysutils/amanda-common/patches/patch-aa
+++ b/sysutils/amanda-common/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.4 2000/09/15 15:59:34 skrll Exp $
+$NetBSD: patch-aa,v 1.5 2001/01/16 21:59:31 cjones Exp $
 
---- client-src/Makefile.in.orig	Sat Nov 21 17:33:45 1998
-+++ client-src/Makefile.in
-@@ -285,9 +285,8 @@
- getfsent_LDFLAGS = 
+--- client-src/Makefile.in.orig	Sat Nov 25 07:01:56 2000
++++ client-src/Makefile.in	Thu Jan 11 12:40:19 2001
+@@ -284,9 +284,8 @@
+ sendsize_LDFLAGS = 
  versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS =  versionsuffix.o
+ versionsuffix_OBJECTS =  versionsuffix.$(OBJEXT)
 -versionsuffix_LDADD = $(LDADD)
 -versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab
index 63c0398f31c..9e5fd5be425 100644
--- a/sysutils/amanda-common/patches/patch-ab
+++ b/sysutils/amanda-common/patches/patch-ab
@@ -1,12 +1,48 @@
-$NetBSD: patch-ab,v 1.3 2000/02/05 06:51:27 wiz Exp $
---- tape-src/Makefile.in.old	Tue Feb 23 11:45:50 1999
-+++ tape-src/Makefile.in	Tue Feb 23 11:45:21 1999
-@@ -162,7 +162,7 @@
+$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:31 cjones Exp $
+
+--- Makefile.in.orig	Sat Nov 25 07:01:53 2000
++++ Makefile.in	Fri Jan 12 11:20:53 2001
+@@ -154,11 +154,11 @@
+ ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
  
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(AMANDA_CFLAGS)
+ @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
+-@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = @WANT_AMPLOT_TRUE@ amplot
++#PLOT_SUBDIRS = amplot
+ # order is significant, don't change it arbitrarily
+ SUBDIRS = \
+ 	config \
+@@ -169,13 +169,10 @@
+ 	$(RESTORE_SUBDIRS) \
+ 	$(RECOVER_SUBDIRS) \
+ 	$(PLOT_SUBDIRS) \
+-	man docs example
++	man
  
--lib_LTLIBRARIES = 	@BUILD_TAPE_LTLIB@
-+lib_LTLIBRARIES = 	libamtape.la
- EXTRA_LTLIBRARIES = 	libamtape.la
  
- noinst_LIBRARIES = 	@BUILD_TAPE_LIB@
+-pkgdata_DATA = \
+-	COPYRIGHT			\
+-	COPYRIGHT-APACHE		\
+-	COPYRIGHT-REGEX
++pkgdata_DATA =
+ 
+ 
+ EXTRA_DIST = $(SNAPSHOT_STAMP) \
+@@ -443,11 +440,11 @@
+ install-exec-am:
+ install-exec: install-exec-recursive
+ 
+-install-data-am: install-pkgdataDATA
++#install-data-am: install-pkgdataDATA
+ install-data: install-data-recursive
+ 
+ install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ install: install-recursive
+ uninstall-am: uninstall-pkgdataDATA
+ uninstall: uninstall-recursive
diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac
index ee4a5e6d3fe..15d50cbaf8e 100644
--- a/sysutils/amanda-common/patches/patch-ac
+++ b/sysutils/amanda-common/patches/patch-ac
@@ -1,17 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2000/02/05 06:51:27 wiz Exp $
---- man/Makefile.in.old	Tue Feb 23 10:24:35 1999
-+++ man/Makefile.in	Tue Feb 23 10:25:34 1999
-@@ -158,12 +158,7 @@
+$NetBSD: patch-ac,v 1.4 2001/01/16 21:59:32 cjones Exp $
+
+--- man/Makefile.in.orig	Thu Jan 11 14:35:21 2001
++++ man/Makefile.in	Thu Jan 11 14:35:42 2001
+@@ -149,7 +149,7 @@
  
- transform =	s,x,x,;
+ transform = s,x,x,;
  
--man_MANS =	amadmin.8	amanda.8	amcheck.8	\
--		amcheckdb.8	amcleanup.8	amdump.8	\
--		amflush.8	amlabel.8	amoverview.8	\
--		amplot.8	amrecover.8	amrestore.8	\
--		amrmtape.8	amtape.8	amtoc.8		\
--		amverify.8	amstatus.8	amreport.8
-+man_MANS =	amanda.8
+-@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8
++#AMPLOT_MAN_PAGES = amplot.8
+ 
+ COMMON_MAN_PAGES = amanda.8
  
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/sysutils/amanda-common/patches/patch-ad b/sysutils/amanda-common/patches/patch-ad
index 1318d6dc0d9..b93e48eb5ac 100644
--- a/sysutils/amanda-common/patches/patch-ad
+++ b/sysutils/amanda-common/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 1999/04/21 14:14:33 agc Exp $
+$NetBSD: patch-ad,v 1.2 2001/01/16 21:59:32 cjones Exp $
 
 Use the correct name for the statvfs struct.
 
---- common-src/statfs.c	1999/04/21 13:24:31	1.1
-+++ common-src/statfs.c	1999/04/21 13:47:22
+--- common-src/statfs.c.orig	Sun May 23 11:11:18 1999
++++ common-src/statfs.c	Thu Jan 11 12:53:12 2001
 @@ -55,7 +55,15 @@
  */
  #  include <sys/statvfs.h>
- #  define STATFS_TYP		"SVR4 (Irix-5, Solaris-2)"
+ #  define STATFS_TYP		"SVR4 (Irix-5+, Solaris-2, Linux glibc 2.1)"
 +#if defined(__sun__) && defined(__svr4__)
 +#if defined(_LARGEFILE64_SOURCE)
 +#  define STATFS_STRUCT	statvfs64_t
diff --git a/sysutils/amanda-common/patches/patch-ae b/sysutils/amanda-common/patches/patch-ae
deleted file mode 100644
index 11002ce1cf7..00000000000
--- a/sysutils/amanda-common/patches/patch-ae
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-ae,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;
diff --git a/sysutils/amanda-common/pkg/DESCR b/sysutils/amanda-common/pkg/DESCR
index 447b0759853..4b14085e122 100644
--- a/sysutils/amanda-common/pkg/DESCR
+++ b/sysutils/amanda-common/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-common/pkg/PLIST b/sysutils/amanda-common/pkg/PLIST
index d904594c9a5..7dee278a080 100644
--- a/sysutils/amanda-common/pkg/PLIST
+++ b/sysutils/amanda-common/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2000/11/29 21:51:34 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/16 21:59:32 cjones Exp $
 lib/libamanda.a
 lib/libamanda.la
 lib/libamanda.so
-lib/libamanda-2.4.1p1.so
+lib/libamanda-2.4.2.so
 lib/libamtape.a
 lib/libamtape.la
 lib/libamtape.so
-lib/libamtape-2.4.1p1.so
-libexec/versionsuffix
+lib/libamtape-2.4.2.so
 man/man8/amanda.8