head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.20 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.18 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.16 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.14 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.12 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.10 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.8 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.6 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.4 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.2 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.5.0.26 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.24 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.22 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.20 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.18 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.16 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.14 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.12 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.10 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.8 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.6 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.4 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.2 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2; locks; strict; comment @# @; 1.6 date 2008.02.15.16.23.09; author gdt; state dead; branches; next 1.5; 1.5 date 2004.11.12.12.13.45; author mjl; state Exp; branches; next 1.4; 1.4 date 2004.05.28.09.20.37; author bouyer; state Exp; branches; next 1.3; 1.3 date 2001.01.16.21.59.32; author cjones; state dead; branches; next 1.2; 1.2 date 2000.03.16.13.58.48; author wiz; state Exp; branches; next 1.1; 1.1 date 2000.03.06.21.14.52; author groo; state Exp; branches; next ; desc @@ 1.6 log @Update to 2.5.2p1, provided by Nick Goffee of BBN. [bugfixes and minor improvements omitted; see NEWS] Changes in release 2.5.2 * krb5 auth is working * Works with IPv6 address * Amanda configuration file changes o amanda.conf changes + debugging is enabled in the config file see all debug_* config option + tapetype 'readblocksize', if maxtapeblocksize is set too larger for your hardware * Amanda command changes o amadmin: new 'holding list' and 'holding delete' subcommand. Changes in release 2.5.1p3 * Works with tar-1.16 and exit status of 1. Changes in release 2.5.1p2 * amoverview is working * dumptype starttime is working * Amanda command changes o amtape accept the -o arguments o amgetconf --list to list all tapetype, dumptype, holdingdisk or interface o amgetconf can return a value of a specific tapetype, dumptype, holdingdisk or interface Changes in release 2.5.1p1 * Remove contrib/sst. Changes in release 2.5.1 * Defects found by Coverity scan and Klocwork K7 analysis tools fixed. * Works with GNU tar 1.15.91 - work with new gtar state file format. * Open SSL encryption support * Two new authentication methods: bsdtcp, bsdudp. * Unlimited number of DLEs on a client with bsdtcp, rsh and ssh authentication methods. * Recovery process amrecover uses Secure API. amoldrecover command (same syntax and functionality as amrecover command) is provided for compatibility with old Amanda releases. amoldrecover command uses old amidxtaped/amindexd protocol. * Amanda debug files are separated into client/server/amandad and are also classified based on Amanda configuration name. * Amanda command changes o amfetchdump -o is replaced by -O. o amcheck -w option does all tests including the tape writable test. Use amcheck -t -w to do only the tape writable test. o -o command option to override Amanda configuration. See amanda man page for details. o amgetconf command doesn't write the BUGGY message when a entry is not found in the configuration file. * Amanda configuration file changes o amanda.conf changes + amrecover_do_fsf in amanda.conf defaults to yes + amrecover_check_label in amanda.conf defaults to yes + usetimestamps in amanda.conf to support multiple backup runs in a calendar day. + holdingdisk in amanda.conf supports new values: NEVER, AUTO, REQUIRED. + amandad_path, client_username and ssh_keys in amanda.conf for ssh/rsh authentication. o New amanda client configuration file - amanda-client.conf. Different client configuration file can be used for each Amanda configuration. + gnutar_list-dir and amandates can be specified in Amanda client configuration file - amanda-client.conf o .amandahosts format changes to allow use of secure API for recovery. o Amanda service entries in xinetd configuration has changed. Changes in release 2.5.0p1 * Add the 'amtape update' command. Changes in release 2.5.0 * Communication security/authentication: Kerberos 4/5, OpenSSH * Data security: Symmetric/Assymetric encrytion algorithms (aesutil and gpg encryption), Encryption can be done on server or client, Custom encryption utilities can be used. * Compression: Ability to add custom compression tools. This is a really useful feature especially since it can specified for a DLE. You can use different compression algorithm for images, binaries, ascii files and so on. * Dump images spanning multiple media volumes - Dump images are no longer restricted to a single media volume (tape or vtape). Data restoration can be done using amrecover and amfetchdump commands. * Auto tape labelling - This optional feature is good for disk backups. Change in release 2.4.5 * new displayunit global option to select the unit use to display number k=kilo, m=mega, g=giga, t=tera. * new amoverview -skipmissed option. Change in release 2.4.5b1 * holding disk disk use timestamped directory. * autoflush flush today's dump. * new bumppercent global option, this should improve bumping criteria, the bumpsize is set to a fixed value which can be adequate for small and large disk. * bumpsize, bumppercent, bumpdays and bumpmult can be in a dumptype. * calcsize support include and exclude like gnutar. * new 'estimate' dumptype option to select estimate type: CLIENT: estimate by the dumping program. CALCSIZE: estimate by the calcsize program, a lot faster but less acurate. SERVER: estimate based on statistic from previous run, take second but can be wrong on the estimate size. @ text @$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 @ 1.5 log @Update amanda to 2.4.4p4 Bug fix release and minor improvements: new chg-iomega changer script. amanda will not use a tape if it's label is not in the tapelist file. amflush.c: Don't start a driver if nothing to flush. amadmin.c: Call check_dumpuser() as soon as posible. amadmin.c: Don't core dump if DUMPCYLE is too big. dumper.c: Parse warning message. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Add file I forgot to 'cvs add' when I updated this package. Pointed out by Thomas Klausner. @ text @d1 1 a1 1 $NetBSD: $ d3 6 a8 15 --- tape-src/Makefile.in.orig 2004-01-08 19:22:46.000000000 +0100 +++ tape-src/Makefile.in 2004-05-12 14:35:59.000000000 +0200 @@@@ -160,7 +160,7 @@@@ lib_LTLIBRARIES = libamtape.la LIB_EXTENSION = la -sbin_PROGRAMS = ammt amdd amtapetype +sbin_PROGRAMS = libamtape_la_SOURCES = output-file.c \ output-null.c \ @@@@ -217,7 +217,7 @@@@ output-tape.lo tapeio.lo libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS) EXTRA_PROGRAMS = amtapeio$(EXEEXT) d10 5 a14 5 +sbin_PROGRAMS = PROGRAMS = $(sbin_PROGRAMS) amdd_SOURCES = amdd.c @@@@ -519,7 +519,7 @@@@ @ 1.3 log @Upgrade of the amanda packages from 2.4.1p1 to 2.4.2. @ text @d1 30 a30 162 $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; a31 1 move.cm_fromtype = CHET_ST; @ 1.2 log @RCS tag added @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Allow amanda to build with either the 1.4 chio.h or the post-comdex chio.h. Note: I do *not* own a SCSI tape changer. Testing appreciated! This patch continues to use the old ioctl on new systems. If it worked before, it should continue to work. Fixes PR pkg/8651. @ text @d1 1 @