diff options
author | gdt <gdt@pkgsrc.org> | 2008-02-15 16:23:09 +0000 |
---|---|---|
committer | gdt <gdt@pkgsrc.org> | 2008-02-15 16:23:09 +0000 |
commit | b4036ff68aca30dfca8455ff5e0570d434e2e336 (patch) | |
tree | b31530af4fe533258592293ce22127bedfa001b3 /sysutils/amanda-server | |
parent | 0a7284a5266398c484690a53756e8bcb1df46e27 (diff) | |
download | pkgsrc-b4036ff68aca30dfca8455ff5e0570d434e2e336.tar.gz |
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.
Diffstat (limited to 'sysutils/amanda-server')
-rw-r--r-- | sysutils/amanda-server/Makefile | 5 | ||||
-rw-r--r-- | sysutils/amanda-server/PLIST | 126 | ||||
-rw-r--r-- | sysutils/amanda-server/distinfo | 28 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-ab | 33 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-ae | 66 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-af | 50 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-ah | 199 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-ai | 43 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-aj | 78 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-ak | 38 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-al | 13 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-am | 13 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-an | 78 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-ao | 26 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-ap | 38 | ||||
-rw-r--r-- | sysutils/amanda-server/patches/patch-aq | 25 |
16 files changed, 443 insertions, 416 deletions
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 |