diff options
| author | sbd <sbd> | 2012-07-30 07:21:10 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2012-07-30 07:21:10 +0000 |
| commit | e36bf91d601ba9d78642162dc562e9e341a1620a (patch) | |
| tree | 2a15becfc8f0e90789c9a3fc20ccf4b42375af31 | |
| parent | e03d79ff1628790644cf5e98e6d6203d7e65c513 (diff) | |
| download | pkgsrc-e36bf91d601ba9d78642162dc562e9e341a1620a.tar.gz | |
Update amanda to 3.3.1
Changes in release 3.3.1
* amrecover
o New 'settransalte' command.
* amanda.conf
o new '$s' substitution in autolabel.
o new 'max-dle-by-volume' global option.
o new 'eject-volume' global option.
* diskfile
o new 'includefile' option.
* amcheck
o new '--client-verbose' argument.
* All programs have a new '--version' argument.
* ampgsql can take property from server configuration.
* amgetconf can print one property of a section.
* s3 device
o new S3_SERVER_SIDE_ENCRYPTION property.
o use multiple thread to speedup deleting a volume.
* Many bug fix.
Changes in release 3.3.0
* The default auth is changed to "bsdtcp", if you are using the default bsd
then you must add it to your configuration.
o in amanda.conf
o in amanda-client.conf
o in dumptype/disklist
o in xinetd (if no '-auth' argument to amandad)
* amdump trap crtl-c, it still send the report and do cleanup if you do
one crtl-c, do it more than once to abort the run.
* s3 device
o use multiple threads to speedup the transfer
o can connect to eucalytus.
o new NB_THREADS_BACKUP property
o new NB_THREADS_RECOVERY property
o new S3_HOST property
o new S3_SERVICE_PATH property
o new S3_SUBDOMAIN property
* chg-aggregate: new changer that use other changer sequentially.
* meta-volume
* Add meta label in tapelist file
* chg-disk:
o support for removable disk
o new NUM-SLOT property
o new AUTO-CREATE-SLOT property
o new REMOVABLE property
o new MOUNT property
o new UMOUNT property
o new UMOUNT-LOCKFILE property
o new UMOUNT-IDLE property
* new taperscan algorithm:
o oldest: this algorithm try to run through the volumes in the oldest
order
o lexical: this algorithm try to run through the volumes in the natural
order
* Change in amanda.conf
o new meta-autolabel option
o autolabel can include org, config, barcode, meta in the label
o new client-name option in appication and script.
* application and script in amanda-client.conf can be used to set default
properties for application or script.
* amlabel
o The label argument is no longer required, an autolabel can be
generated
o new --meta option
o new --barcode option
o new --assign option
* amgtar, amstar: The path must be specified, it will not works with a
device.
* amrecover: decompression and decryption are now done on the client if
compression/encryption was done on the client.
* amtape: inventory print the current slot
* amanda.conf:
o autoflush have value "no|yes|all"
o script have single-execution setting.
o Add pre-amcheck, post-amcheck, pre-estimate, post-estimate, pre-backup
and post-backup to execute-on of script.
o Add taperscan and interactivity section.
o add 'server' value in recovery-limit.
o add dump-limit in a dumptype.
* amanda-client.conf
o add amdump-server setting.
* script are searched in $APPLICATION_DIR, $CONFIG_DIR/<conf>/application
and $CONFIG_DIR/application
* amservice
o add -s argument
o is also installed on client
* new amdumpd server service, if enable, it allow client to start a backup
of itself.
* new amdump_client program, it is use on client to start a backup of itself
* implement restore command amzfs-sendrecv, it can be use with amrecover.
Changes in release 3.2.2
* Do not restore the NUL padding bytes, some program fail with them.
* Fix driver doing nothing if taper crash early.
* Fix taperalog *FIT no going to second volume.
* Fix amrestore '-p' not going to next file.
* flush even if flush threshold are not met if it save tape space.
* fix crash in amtrmidx due to memory leak.
* amsamba use 'Use smbclient -TF' for restore.
Changes in release 3.2.1
* barcode are added to the tapelist file.
* Faster 'amadmin find', improve speed on many programs.
* device-output-buffer-size default to a minimum of 4*block_size.
* ssh auth use the client-port
* Bug fixed:
o "Can't opendata output stream: Connection refused".
o Better handling of dump to tape.
o Corrupted 'amdump' log file, amstatus not showing correct state.
o Execute subprocess with the config overwrite.
o tape-device allow to set LEOM.
o Crash in robot changer.
o Script output property are not sent to application.
Changes in release 3.2.0
* Support for multiple simultaneous writes to storage devices
o Can write to all available drives in parallel.
o Works only with the new changer API.
o Useful if two or more volumes are used in a single run.
o dump direct to tape can be scheduled any time during the run,
previously they were done sequencially after all dump to holding disk.
o enabled with the new 'taper-parallel-write' configuration option.
* Support for LEOM in storage devices
o allows splitting without partial parts, saving space
o much more efficient, since parts need not be cached on disk in most
cases
* new, simpler splitting commands in the tapetype section:
part-size, part-cache-type, part-cache-dir, part-cache-max-size; see
amanda.conf(5) for details
* Amanda server configuration file changes (amanda.conf)
o new configuration keyword:
+ taper-parallel-write -- How many drive amanda can write to
in parallel.
o deprecated configuration keywords:
+ amrecover_do_fsf
+ amrecover_check_label
* the CONFIG parameter to amidxtaped is now required; this means that
versions of amrecover older than 2.4.3 will be unable to recover from
servers running Amanda-3.2 and later.
* The new dumptype and global parameters 'recovery-limit' can be used to
limit which hosts may recover from a particular DLE. See amanda.conf(5)
and amanda-auth(7) for more information.
* Several old changers have been removed - these changers will work with
Amanda for the forseeable future, but are no longer included in the
distribution.
o chg-chio
o chg-chs
o chg-iomega
o chg-juke
o chg-mcutil
o chg-mtx
o chg-null (use the new "chg-null:")
o chg-rait (use the new "chg-rait:{dev1,dev2}")
o chg-rth
o chg-scsi-chio
o chg-scsi
* Amdump change:
o new '--no-taper' option to start the run in degraded mode
* Amvault is much improved, but still experimental:
o supports assembling split parts on the source volume and re-splitting
them on the destination
o supports filtering dumps with the same syntax as amfetchdump
o a --fulls-only option skips all incremental dumps on the source
o an --export option tries to move tertiary volumes to import/export
slots when completed
o command-line syntax has changed incompatibly; see manpage or
'amvault --help'
* Rewritten and improved:
o amoverview
o amcheckdump
Changes in release 3.1.0
* Deprecated old changers; see amanda-changers(7) for replacements. These
changers are still available in the distribution, but will be removed in a
future release.
o chg-null
o chg-zd-mtx
o chg-rait
o chg-disk
o chg-multi
* Although chg-zd-mtx is still supported, we recommend that all users upgrade
to the more efficient chg-robot. See contrib/convert-zd-mtx-to-robot.sh
for a useful conversion script.
* Amanda server configuration file changes (amanda.conf)
o deprecated configuration keywords:
+ label_new_tapes
o keywords deprecated in 2.6.1:
+ rawtapedev
+ tapebufs
+ file-pad
o new configuration keyword
+ autolabel -- replace label_new_tapes
+ columnspec -- can specify a precision.
+ order -- in script, to specify script order execution.
+ client_port -- in dumptype, to specify which port to connect on
the client.
+ estimate -- in dumptype, can specify multiple estimate method.
o accept 'define' keyword for defining an holdingdisk
* Amanda client configuration file changes (amanda-client.conf)
o new configuration keyword
+ debug_days -- how many days to keep debug files.
+ client_port -- use by amrecover, specify which port to connect on
the server.
* Removed compile-time default --with-changer-device: specify a device
explicitly in amanda.conf instead
* amtape behavior has changed:
o 'device' subcommand removed
o 'slot advance' subcommand removed
o 'update' subcommand no longer displays each slot as it is updated, and
is not supported by all changers
o taperscan output has changed
o new 'inventory' subcommand
* amrmtape rewrite
o use long option
+ --changer -- Specify which changer to use
+ --cleanup -- Remove logs and indexes associated with label
+ --dryrun -- do not update the original copies.
+ --erase -- Attempt to erase the data contained on the volume
+ --keep-label -- Do not remove label from the tapelist
+ --quiet -- Opposite of --verbose
+ --verbose -- List backups of hosts and disks that are being
discarded.
* amdevcheck
o new --label option.
o new --properties option.
* Device API
o changed wildcard setting for S3_BUCKET_LOCATION from "" to "*"
o new 'ndmp:' device to write to a tape on an ndmp server.
o new 'dvdrw:' device to write to a dvd drive.
* Application API
o new properties to many applications
o amgtar
+ new ACLS, SELINUX and XATTRS properties
o amsamba
+ Allow '\' in diskname and amandapass.
+ new ALLOW-ANONYMOUS property.
o new applications:
+ ampgsql -- Backup PostgreSQL using continuous WAL archiving
+ amsuntar -- Backup filesytem with the SUN tar
+ amraw -- Backup only one directory entry
* New taper, with DirectTCP support, changed tape and catalog format:
o all dumpfiles are now F_SPLIT_DUMPFILE
o all on-tape dumpfiles have numparts=-1, since it's no longer possible
to calculate this value in advance
o there is no logging or reporting of zero-byte, successful parts (this
may cause gaps in filenums in the catalog)
* Redesigned amreport
o much more natural command-line interface (just run 'amreport $config')
o experimental XML output
* configuration override for dumptype works with inheritance.
Changes in release 2.6.1p2
* amtapetype: new -p option
* Bugs fixed
o S3 device driver
o amcheckdump
o file not removed from holding disk
o sendbackup compatibility with a 2.4.2 server
o handle EROFS error from tape device.
o zfs snapshot name us the diskname.
o fix fd allocation in amandad
o crash in amflush
Changes in release 2.6.1p1
* amplot: better output
* Don't include genversion.h in distribution tarballs.
* Bugs fixed
o S3 device driver
o rait device driver
o amstatus
o configure
o application-api
o compilation on some platform
o others small bug
Changes in release 2.6.1
* Amanda server configuration file changes (amanda.conf)
o deprecated configuration keywords:
+ rawtapedev
+ tapebufs
+ file-pad
* Application API: Allow to easily write wrappers around any backup program,
See the 'amanda-applications' man page.
o amgtar: Use GNU tar, it is a lot more configurable than the GNUTAR
program. See 'amgtar' man page.
o amstar: Use star to do a backup, it work only on a partition. See
'amstar' man page.
o amsamba: Use smbclient to backup a cifs share, see amsamba man page.
o amzfs-sendrecv: Do a backup of a ZFS filesystem with 'zfs send'.
* Script API: Allow to run script before and after amanda process, see the
'amanda-scripts' man page.
o amzfs-snapshot: Do a snapshot of a ZFS filesystem, then 'amgtar'
application will backup the snapshot. See 'amzfs-snapshot' man page.
o script-email: Simple script to send email. see 'script-email' man page.
* Changer API v2.0: perl-based changer interface supporting concurrent
use of multiple devices and changers.
o currently operating in "compatibility mode," calling old changer
shell scripts.
o under active development.
* Xfer API: generic library to move and filter data with maximal efficiency
o can read from and write to arbitrary devices, files, etc.
o only used in some applications.
* Amanda archive format: A simple archive format that an application can
use to create backup image.
* 'amarchiver' program to manipulate file in amanda archive format.
* Many improvements to report better error message to user.
* amtape subcommands 'slot prev' and 'slot last' are removed.
* Dozens more perl libraries, with more stable interfaces.
* Many bugs fixed and improvement.
* amgetconf '--client' option to retrieve config from
amanda-client.conf on a client.
* Amanda configuration file changes
o new application-tool section
o new script-tool section
o new device section
o new changer section
Changes in release 2.6.0
* configure --disable-shared doesn't work because perl modules require
shared libraries. Use configure --with-static-binaries to build
statically linked binaries.
* 'amverify' and 'amverifyrun' are deprecated and replaced with the
new, more flexible 'amcheckdump'
* 'amdd' and 'ammt' are deprecated.
* Some Amanda files are now installed in new "amanda/" subdirectories:
libraries are now installed in $libdir/amanda and internal programs
are now installed in $libexecdir/amanda.
* The amandates file, previously at /etc/amandates, is now at
$localstatedir/amanda/amandates. You may want to move your existing
/etc/amandates when you upgrade Amanda.
* New 'amcryptsimple', 'amgpgcrypt' - encryption plugins based on gpg.
* New 'amserverconfig', 'amaddclient' - Initial Amanda configuration tools
these tools make assumptions, please see man page.
* Many bugs fixed and code rewrite/cleanup
* glib is required to compile and run amanda.
* Device API: pluggable interface to storage devices, supporting tapes,
vtapes, RAIT, and Amazon S3
* New perl modules link directly to Amanda, to support writing Amanda
applications in Perl. Perl module are installed by default in the perl
installsitelib directory. It can be changed with
'configure --with-amperldir'.
* New 'local' security driver supports backups of the amanda server
without any network connection or other configuration.
* Almost 200 unit tests are available via 'make installcheck'.
* Amanda configuration file changes
o amanda.conf changes
+ flush-threshold-dumped
+ flush-threshold-scheduled
+ taperflush
+ device_property
+ usetimestamps default to yes
67 files changed, 943 insertions, 1868 deletions
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index 05eec47d969..586d0864f4b 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,18 +1,37 @@ -# $NetBSD: Makefile,v 1.54 2012/07/30 07:04:29 sbd Exp $ +# $NetBSD: Makefile,v 1.55 2012/07/30 07:21:10 sbd Exp $ # PKGNAME= amanda-client-${AMANDA_VERSION} -PKGREVISION= 2 SVR4_PKGNAME= amacl COMMENT= Client part of Amanda, a network backup system PKG_DESTDIR_SUPPORT= user-destdir -USE_TOOLS+= awk:run perl:run +CONFIGURE_ARGS+= --without-server --without-gnuplot + +BUILD_DIRS= gnulib +BUILD_DIRS+= client-src application-src +BUILD_DIRS+= recover-src oldrecover-src + +MANPAGES+= amanda-applications.7 +MANPAGES+= amdump_client.8 +MANPAGES+= amgtar.8 +MANPAGES+= ampgsql.8 +MANPAGES+= amraw.8 +MANPAGES+= amrecover.8 +MANPAGES+= amsamba.8 +MANPAGES+= amstar.8 +MANPAGES+= amsuntar.8 +MANPAGES+= amzfs-snapshot.8 +MANPAGES+= amzfs-sendrecv.8 + +PERL5_MODS+= Amanda/Application.pm +PERL5_MODS+= Amanda/Application/Zfs.pm + +PERL5_LIBS+= Application .include "../../sysutils/amanda-common/Makefile.common" -CONFIGURE_ARGS+= --without-server --without-gnuplot .if !empty(PKG_OPTIONS:Mamanda-smb) CONFIGURE_ARGS+= --with-smbclient @@ -23,20 +42,21 @@ DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba CONFIGURE_ARGS+= --with-dump-use-snapshot --with-rundump .endif -# Prevent configure script from finding unnecessary libraries. We'll patch -# the amrecover Makefile to add the readline libraries as it's the only -# program that uses readline. (XXX: incorrect, does not happen) -# -CONFIGURE_ENV+= ac_cv_lib_intl_main=no -CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_readline_readline=no +SPECIAL_PERMS+= libexec/amanda/application/amgtar ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/amanda/application/amstar ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/amanda/calcsize ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/amanda/killpgrp ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/amanda/rundump ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/amanda/runtar ${AM_PROG_PERMS} + +post-build: + ${RUN}${_ULIMIT_CMD} cd ${WRKSRC}/amandad-src && \ + ${BUILD_MAKE_CMD} amandad -SPECIAL_PERMS+= libexec/runtar ${AM_PROG_PERMS} -SPECIAL_PERMS+= libexec/killpgrp ${AM_PROG_PERMS} -SPECIAL_PERMS+= libexec/rundump ${AM_PROG_PERMS} -SPECIAL_PERMS+= libexec/calcsize ${AM_PROG_PERMS} +post-install: + ${INSTALL_PROGRAM} ${WRKSRC}/amandad-src/amandad \ + ${DESTDIR}${PREFIX}/libexec/amanda .include "../../sysutils/amanda-common/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-client/PLIST b/sysutils/amanda-client/PLIST index 33436f9a0b9..eed5731b64c 100644 --- a/sysutils/amanda-client/PLIST +++ b/sysutils/amanda-client/PLIST @@ -1,18 +1,40 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:00 joerg Exp $ -dumper/amgtar -dumper/generic-dumper -lib/libamclient.la -libexec/amandad -libexec/calcsize -libexec/killpgrp -libexec/noop -libexec/patch-system -libexec/rundump -libexec/runtar -libexec/selfcheck -libexec/sendbackup -libexec/sendsize -libexec/versionsuffix +@comment $NetBSD: PLIST,v 1.6 2012/07/30 07:21:10 sbd Exp $ +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Application.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Application/Zfs.pm +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Application/libApplication.la +lib/amanda/libamclient.la +libexec/amanda/amandad +libexec/amanda/application/amgtar +libexec/amanda/application/amlog-script +libexec/amanda/application/ampgsql +libexec/amanda/application/amraw +libexec/amanda/application/amsamba +libexec/amanda/application/amstar +libexec/amanda/application/amsuntar +libexec/amanda/application/amzfs-sendrecv +libexec/amanda/application/amzfs-snapshot +libexec/amanda/application/script-email +libexec/amanda/calcsize +libexec/amanda/killpgrp +libexec/amanda/noop +libexec/amanda/patch-system +libexec/amanda/rundump +libexec/amanda/runtar +libexec/amanda/selfcheck +libexec/amanda/sendbackup +libexec/amanda/sendsize +libexec/amanda/teecount +man/man7/amanda-applications.7 +man/man8/amdump_client.8 +man/man8/amgtar.8 +man/man8/ampgsql.8 +man/man8/amraw.8 man/man8/amrecover.8 +man/man8/amsamba.8 +man/man8/amstar.8 +man/man8/amsuntar.8 +man/man8/amzfs-sendrecv.8 +man/man8/amzfs-snapshot.8 +sbin/amdump_client sbin/amoldrecover sbin/amrecover diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo deleted file mode 100644 index 955492942ac..00000000000 --- a/sysutils/amanda-client/distinfo +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: distinfo,v 1.10 2010/06/28 10:09:26 joerg Exp $ - -SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 -RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 -Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes -SHA1 (patch-aa) = b76a56b28aba238d838764b9d562e29cbb882553 -SHA1 (patch-ab) = 4c1b2a5f025854a9469a9fcdc11f6110b22d4989 -SHA1 (patch-ac) = 6327632e03e635c515789db9590d2eee6ebf121b -SHA1 (patch-ad) = 0cef70057b2003ac9de7ac130c84746504981a95 -SHA1 (patch-ae) = 00f5f000c0d6ff3e655ecbbe30183529bb244b66 -SHA1 (patch-af) = 97c97b0ea1b73c03606e9cea6921391c569538d2 -SHA1 (patch-ag) = dbf2a86ad1bf394cd47bdf6f8e8b279fe621ce04 -SHA1 (patch-ah) = 9df6c042739b6948d4dd61e5b66cad81b86de792 -SHA1 (patch-ai) = 40a5114c5aa5d467982546af5de960cfeff96c60 -SHA1 (patch-aj) = 9e466b4c244d64c7840ab890d75d56ad61980b62 -SHA1 (patch-ak) = 57e38ec30763c53d9a576865fe76772b033f8301 diff --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa deleted file mode 100644 index d354db6be55..00000000000 --- a/sysutils/amanda-client/patches/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2008/02/15 16:23:09 gdt Exp $ - -Remove SUBDIRS and DATA that we don't want in -client package. - ---- Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 -+++ Makefile.in -@@ -382,19 +382,12 @@ ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACIN - SUBDIRS = \ - gnulib \ - config \ -- common-src \ - amandad-src \ -- $(TAPE_SUBDIRS) \ - $(CLIENT_SUBDIRS) \ -- $(SERVER_SUBDIRS) \ -- $(RESTORE_SUBDIRS) \ - $(RECOVER_SUBDIRS) \ -- $(PLOT_SUBDIRS) \ -- man docs example -+ man - --pkgdata_DATA = \ -- ReleaseNotes \ -- COPYRIGHT -+pkgdata_DATA = - - EXTRA_DIST = $(SNAPSHOT_STAMP) \ - $(pkgdata_DATA) \ diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab deleted file mode 100644 index 0a878415148..00000000000 --- a/sysutils/amanda-client/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2010/06/28 10:09:26 joerg Exp $ - -Don't install any manpages except client-specific ones, namely -RECOVER_MAN8_PAGES. - ---- man/Makefile.in.orig 2007-06-06 23:22:52.000000000 +0000 -+++ man/Makefile.in -@@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \ - #endif - @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 - @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 --man8_pages = $(COMMON_MAN8_PAGES) \ -- $(AMPLOT_MAN8_PAGES) \ -- $(SERVER_MAN8_PAGES) \ -- $(RECOVER_MAN8_PAGES) \ -- $(RESTORE_MAN8_PAGES) -- --man5_pages = $(COMMON_MAN5_PAGES) --ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ -- $(COMMON_MAN5_PAGES) \ -- $(COMMON_MAN8_PAGES) \ -- $(SERVER_MAN8_PAGES) \ -- $(RECOVER_MAN8_PAGES) \ -- $(RESTORE_MAN8_PAGES) -+man8_pages = $(RECOVER_MAN8_PAGES) -+ -+man5_pages = -+ALL_MAN_PAGES = $(RECOVER_MAN8_PAGES) - - - # These lines are needed to force automake to set the $man<n>dir variables. diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac deleted file mode 100644 index cf0e17bfbb4..00000000000 --- a/sysutils/amanda-client/patches/patch-ac +++ /dev/null @@ -1,117 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $ - -Remove build-directory library dependencies and link against the ones -installed by amanda-common instead. - ---- client-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 -+++ client-src/Makefile.in -@@ -115,83 +115,53 @@ PROGRAMS = $(libexec_PROGRAMS) - calcsize_SOURCES = calcsize.c - calcsize_OBJECTS = calcsize.$(OBJEXT) - calcsize_LDADD = $(LDADD) --calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - am_getfsent_OBJECTS = getfsent.test.$(OBJEXT) - getfsent_OBJECTS = $(am_getfsent_OBJECTS) - getfsent_LDADD = $(LDADD) --getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - killpgrp_SOURCES = killpgrp.c - killpgrp_OBJECTS = killpgrp.$(OBJEXT) - killpgrp_LDADD = $(LDADD) --killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - noop_SOURCES = noop.c - noop_OBJECTS = noop.$(OBJEXT) - noop_LDADD = $(LDADD) --noop_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+noop_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - rundump_SOURCES = rundump.c - rundump_OBJECTS = rundump.$(OBJEXT) - rundump_LDADD = $(LDADD) --rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - runtar_SOURCES = runtar.c - runtar_OBJECTS = runtar.$(OBJEXT) - runtar_LDADD = $(LDADD) --runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - selfcheck_SOURCES = selfcheck.c - selfcheck_OBJECTS = selfcheck.$(OBJEXT) - selfcheck_LDADD = $(LDADD) --selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \ - sendbackup-gnutar.$(OBJEXT) - sendbackup_OBJECTS = $(am_sendbackup_OBJECTS) - sendbackup_LDADD = $(LDADD) --sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - sendsize_SOURCES = sendsize.c - sendsize_OBJECTS = sendsize.$(OBJEXT) - sendsize_LDADD = $(LDADD) --sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - versionsuffix_SOURCES = versionsuffix.c - versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) - versionsuffix_LDADD = $(LDADD) --versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) - sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) -@@ -489,11 +459,10 @@ libamclient_la_LDFLAGS = -release $(VERS - # need to list libamanda twice here, first to override the system library - # routines, and second to pick up any references in the other libraries. - ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../amandad-src/libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../gnulib/libgnu.$(LIB_EXTENSION) -+LDADD = libamclient.$(LIB_EXTENSION) \ -+ ../gnulib/libgnu.$(LIB_EXTENSION) \ -+ -lamanda \ -+ -lamandad - - SUFFIXES = .sh .pl - diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad deleted file mode 100644 index 4a63227bf8d..00000000000 --- a/sysutils/amanda-client/patches/patch-ad +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ad,v 1.8 2008/02/15 16:23:09 gdt Exp $ - -Remove build-directory library dependencies and link against the ones -installed by amanda-common instead. - ---- recover-src/Makefile.in.orig 2007-06-06 19:22:53.000000000 -0400 -+++ recover-src/Makefile.in -@@ -97,9 +97,7 @@ am_amrecover_OBJECTS = $(am__objects_1) - amrecover_OBJECTS = $(am_amrecover_OBJECTS) - amrecover_LDADD = $(LDADD) - am__DEPENDENCIES_1 = --amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../client-src/libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -+amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config - depcomp = $(SHELL) $(top_srcdir)/config/depcomp -@@ -386,11 +384,10 @@ LIB_EXTENSION = la - # need to list libamanda twice here, first to override the system library - # routines, and second to pick up any references in the other libraries. - ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- @LEXLIB@ \ -+LDADD = @LEXLIB@ \ - ../client-src/libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) \ -+ -lamanda \ - $(READLINE_LIBS) - - amrecover_CSRC = amrecover.c \ diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae deleted file mode 100644 index e08f7b3dd1b..00000000000 --- a/sysutils/amanda-client/patches/patch-ae +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ae,v 1.9 2008/02/15 16:23:09 gdt Exp $ - ---- configure.in.orig 2007-06-06 19:22:24.000000000 -0400 -+++ configure.in -@@ -1838,6 +1838,44 @@ if test "$DUMP" -a "$RESTORE"; then - AC_DEFINE(HAVE_HONOR_NODUMP,1,[Define this if dump accepts -h for honoring nodump. ]) - fi - ]) -+ AC_ARG_WITH(dump-use-snapshot, -+ [ --with-dump-use-snapshot if dump supports -X, use it], -+ [ if test -x $DUMP; then -+ AC_CACHE_CHECK( -+ [whether $DUMP supports -X (use filesystem snapshot)], -+ amanda_cv_use_snapshot, -+ [ -+ case "$DUMP" in -+ *dump) -+ AC_TRY_COMMAND($DUMP 9Xf /dev/null /dev/null/invalid/fs 2>&1 -+ | $GREP -v Dumping -+ | $GREP -v Date -+ | $GREP -v Label >conftest.d-x 2>&1) -+ cat conftest.d-x >&AS_MESSAGE_LOG_FD() -+ AC_TRY_COMMAND($DUMP 9f /dev/null /dev/null/invalid/fs 2>&1 -+ | $GREP -v Dumping -+ | $GREP -v Date -+ | $GREP -v Label >conftest.d 2>&1) -+ cat conftest.d >&AS_MESSAGE_LOG_FD() -+ if AC_TRY_COMMAND(diff conftest.d-x conftest.d 1>&2); then -+ amanda_cv_use_snapshot=yes -+ else -+ amanda_cv_use_snapshot=no -+ fi -+ rm -f conftest.d conftest.d-x -+ ;; -+ *) amanda_cv_use_snapshot=no -+ ;; -+ esac -+ ]) -+ else -+ AC_MSG_WARN([*** $DUMP is not executable, cannot run -X test]) -+ amanda_cv_use_snapshot=no -+ fi -+ if test "$amanda_cv_use_snapshot" = yes; then -+ AC_DEFINE(HAVE_DUMP_SNAPSHOT,1,[Define this if dump accepts -X for using snapshots. ]) -+ fi -+ ]) - fi - - AC_PATH_PROGS(XFSDUMP,xfsdump,,$SYSLOCPATH) diff --git a/sysutils/amanda-client/patches/patch-af b/sysutils/amanda-client/patches/patch-af deleted file mode 100644 index 41d7758aad1..00000000000 --- a/sysutils/amanda-client/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.5 2008/02/15 16:23:09 gdt Exp $ - ---- config/config.h.in.orig 2007-06-06 19:23:42.000000000 -0400 -+++ config/config.h.in -@@ -440,6 +440,9 @@ - /* Define this if dump accepts -h for honoring nodump. */ - #undef HAVE_HONOR_NODUMP - -+/* Define this if dump accepts -X for filesystem snapshot. */ -+#undef HAVE_DUMP_SNAPSHOT -+ - /* Define to enable HPUX tape-changer support. */ - #undef HAVE_HPUX_LIKE_SCSI - diff --git a/sysutils/amanda-client/patches/patch-ag b/sysutils/amanda-client/patches/patch-ag deleted file mode 100644 index 395bfbbf1a7..00000000000 --- a/sysutils/amanda-client/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2008/02/15 16:23:09 gdt Exp $ - ---- client-src/sendbackup-dump.c.orig 2007-05-04 07:39:05.000000000 -0400 -+++ client-src/sendbackup-dump.c -@@ -388,6 +388,9 @@ start_backup( - options->no_record ? "" : "u", - "s", - PARAM_HONOR_NODUMP, -+#ifdef HAVE_DUMP_SNAPSHOT -+ "X", -+#endif - "f", - NULL); - diff --git a/sysutils/amanda-client/patches/patch-ah b/sysutils/amanda-client/patches/patch-ah deleted file mode 100644 index 6cf4ae7d739..00000000000 --- a/sysutils/amanda-client/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2008/02/15 16:23:09 gdt Exp $ - ---- client-src/sendsize.c.orig 2007-05-15 14:14:58.000000000 -0400 -+++ client-src/sendsize.c -@@ -1272,6 +1272,9 @@ getsize_dump( - dumpkeys = vstralloc(level_str, - PARAM_DUMP_ESTIMATE, - PARAM_HONOR_NODUMP, -+# ifdef HAVE_DUMP_SNAPSHOT /* { */ -+ "X", -+# endif /* } */ - "s", "f", NULL); - - # ifdef HAVE_DUMP_ESTIMATE diff --git a/sysutils/amanda-client/patches/patch-ai b/sysutils/amanda-client/patches/patch-ai deleted file mode 100644 index e59331536a9..00000000000 --- a/sysutils/amanda-client/patches/patch-ai +++ /dev/null @@ -1,106 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2008/02/15 16:23:09 gdt Exp $ - ---- configure.orig 2007-06-06 19:22:45.000000000 -0400 -+++ configure -@@ -1119,6 +1119,7 @@ Optional Packages: - --with-testing[=suffix] use alternate service names - --with-gnuplot=PATH use gnuplot executable at PATH in amplot - --with-dump-honor-nodump if dump supports -h, use it for level0s too -+ --with-dump-use-snapshot if dump supports -X, use it - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use - both] -@@ -13538,7 +13539,10 @@ echo $ECHO_N "checking SSH options... $E - # now convert that to a comma-separated list of C strings - eval "set dummy ${SSH_OPTIONS}"; shift - SSH_OPTIONS='' -- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done -+ for i in "${@}"; do -+ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" -+ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; -+ done - echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 - echo "${ECHO_T}$SSH_OPTIONS" >&6 - -@@ -18808,6 +18812,72 @@ _ACEOF - fi - - fi; -+ -+# Check whether --with-dump-use-snapshot or --without-dump-use-snapshot was given. -+if test "${with_dump_use_snapshot+set}" = set; then -+ withval="$with_dump_use_snapshot" -+ if test -x $DUMP; then -+ echo "$as_me:$LINENO: checking whether $DUMP supports -X (use filesystem snapshot)" >&5 -+echo $ECHO_N "checking whether $DUMP supports -X (use filesystem snapshot)... $ECHO_C" >&6 -+if test "${amanda_cv_use_snapshot+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ case "$DUMP" in -+ *dump) -+ { ac_try='$DUMP 9Xf /dev/null /dev/null/invalid/fs 2>&1 -+ | $GREP -v Dumping -+ | $GREP -v Date -+ | $GREP -v Label >conftest.d-x 2>&1' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ cat conftest.d-x >&5 -+ { ac_try='$DUMP 9f /dev/null /dev/null/invalid/fs 2>&1 -+ | $GREP -v Dumping -+ | $GREP -v Date -+ | $GREP -v Label >conftest.d 2>&1' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ cat conftest.d >&5 -+ if { ac_try='diff conftest.d-x conftest.d 1>&2' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ amanda_cv_use_snapshot=yes -+ else -+ amanda_cv_use_snapshot=no -+ fi -+ rm -f conftest.d conftest.d-x -+ ;; -+ *) amanda_cv_use_snapshot=no -+ ;; -+ esac -+ -+fi -+echo "$as_me:$LINENO: result: $amanda_cv_use_snapshot" >&5 -+echo "${ECHO_T}$amanda_cv_use_snapshot" >&6 -+ else -+ { echo "$as_me:$LINENO: WARNING: *** $DUMP is not executable, cannot run -X test" >&5 -+echo "$as_me: WARNING: *** $DUMP is not executable, cannot run -X test" >&2;} -+ amanda_cv_use_snapshot=no -+ fi -+ if test "$amanda_cv_use_snapshot" = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_DUMP_SNAPSHOT 1 -+_ACEOF -+ -+ fi -+ -+fi; - fi - - for ac_prog in xfsdump -@@ -62491,7 +62561,7 @@ fi; - # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. - if test "${with_xsltproc_flags+set}" = set; then - withval="$with_xsltproc_flags" -- if test "x$withval" == "xno"; then -+ if test "x$withval" = "xno"; then - XSLTPROC_FLAGS='' - else - if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-client/patches/patch-aj b/sysutils/amanda-client/patches/patch-aj deleted file mode 100644 index 96937835ad4..00000000000 --- a/sysutils/amanda-client/patches/patch-aj +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2008/02/15 16:23:09 gdt Exp $ - -Remove build-directory library dependencies and link against the ones -installed by amanda-common instead. - -Also, install amandad executable only, since libamandad is installed by -amanda-common. - ---- amandad-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 -+++ amandad-src/Makefile.in -@@ -105,10 +105,7 @@ PROGRAMS = $(libexec_PROGRAMS) - amandad_SOURCES = amandad.c - amandad_OBJECTS = amandad.$(OBJEXT) - amandad_LDADD = $(LDADD) --amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../gnulib/libgnu.$(LIB_EXTENSION) -+amandad_DEPENDENCIES = ../gnulib/libgnu.$(LIB_EXTENSION) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config - depcomp = $(SHELL) $(top_srcdir)/config/depcomp - am__depfiles_maybe = depfiles -@@ -379,7 +376,7 @@ INCLUDES = -I$(top_builddir)/common-src - - LINT = @AMLINT@ - LINTFLAGS = @AMLINTFLAGS@ --lib_LTLIBRARIES = libamandad.la -+# lib_LTLIBRARIES = libamandad.la - LIB_EXTENSION = la - @WANT_RUNTIME_PSEUDO_RELOC_TRUE@AM_LDFLAGS = -Wl,-enable-runtime-pseudo-reloc - libamandad_la_SOURCES = amandad_util.c -@@ -392,10 +389,7 @@ noinst_HEADERS = amandad.h - # need to list libamanda twice here, first to override the system library - # routines, and second to pick up any references in the other libraries. - ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamandad.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../gnulib/libgnu.$(LIB_EXTENSION) -+LDADD = ../gnulib/libgnu.$(LIB_EXTENSION) -lamanda -lamandad - - all: all-am - diff --git a/sysutils/amanda-client/patches/patch-ak b/sysutils/amanda-client/patches/patch-ak deleted file mode 100644 index 45d28b9bd36..00000000000 --- a/sysutils/amanda-client/patches/patch-ak +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2008/02/15 16:23:09 gdt Exp $ - -Remove build-directory library dependencies and link against the ones -installed by amanda-common instead. - ---- oldrecover-src/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 -+++ oldrecover-src/Makefile.in -@@ -97,9 +97,8 @@ am_amoldrecover_OBJECTS = $(am__objects_ - amoldrecover_OBJECTS = $(am_amoldrecover_OBJECTS) - amoldrecover_LDADD = $(LDADD) - am__DEPENDENCIES_1 = --amoldrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../client-src/libamclient.$(LIB_EXTENSION) \ -- $(am__DEPENDENCIES_1) ../common-src/libamanda.$(LIB_EXTENSION) \ -+amoldrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) \ -+ $(am__DEPENDENCIES_1) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config - depcomp = $(SHELL) $(top_srcdir)/config/depcomp -@@ -386,12 +385,11 @@ LIB_EXTENSION = la - # need to list libamanda twice here, first to override the system library - # routines, and second to pick up any references in the other libraries. - ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- @LEXLIB@ \ -+LDADD = @LEXLIB@ \ - ../client-src/libamclient.$(LIB_EXTENSION) \ - $(READLINE_LIBS) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../gnulib/libgnu.$(LIB_EXTENSION) -+ ../gnulib/libgnu.$(LIB_EXTENSION) \ -+ -lamanda - - amoldrecover_CSRC = amrecover.c \ - display_commands.c extract_list.c \ diff --git a/sysutils/amanda-common/INSTALL b/sysutils/amanda-common/INSTALL new file mode 100644 index 00000000000..29a5f61672e --- /dev/null +++ b/sysutils/amanda-common/INSTALL @@ -0,0 +1,9 @@ +# $NetBSD: INSTALL,v 1.3 2012/07/30 07:21:11 sbd Exp $ + +case ${STAGE} in +POST-INSTALL) + if ${TEST} ! -f @AMANDA_VAR@/amandates ;then + ${TOUCH} @AMANDA_VAR@/amandates + fi + ;; +esac diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index cf692e327eb..cc90603ce7b 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.56 2012/07/30 07:04:29 sbd Exp $ +# $NetBSD: Makefile,v 1.57 2012/07/30 07:21:11 sbd Exp $ PKGNAME= amanda-common-${AMANDA_VERSION} SVR4_PKGNAME= amaco -PKGREVISION= 2 COMMENT= Common libraries and binaries for Amanda @@ -16,14 +15,6 @@ CPPFLAGS+= -D_LARGEFILE64_SOURCE CONFIGURE_ARGS+= --without-server --without-client --without-gnuplot -# Prevent configure script from finding unnecessary libraries. -# -CONFIGURE_ENV+= ac_cv_lib_intl_main=no -CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_readline_readline=no - PKG_GROUPS= ${AMANDA_GROUP} PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} @@ -31,8 +22,17 @@ PKG_GECOS.${AMANDA_USER}= Amanda backup user PKG_SHELL.${AMANDA_USER}= ${SH} PKG_HOME.${AMANDA_USER}= ${AMANDA_VAR} +OWN_DIRS+= ${PKG_SYSCONFDIR}/amanda OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0750 OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0750 OWN_DIRS_PERMS+= ${VARBASE}/log/amanda ${AMANDA_USER} ${AMANDA_GROUP} 0750 +CONF_FILES_PERMS= ${PREFIX}/share/doc/amanda/example/amanda-client.conf \ + ${PKG_SYSCONFDIR}/amanda/amanda-client.conf \ + ${AMANDA_USER} ${AMANDA_GROUP} 0600 + +REQD_FILES_PERMS+= /dev/null ${AMANDA_VAR}/amandates ${AMANDA_USER} ${AMANDA_GROUP} 0640 + +SPECIAL_PERMS+= sbin/amservice ${AM_PROG_PERMS} + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 50fdaf9a829..2281e62aec1 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2012/07/30 07:04:29 sbd Exp $ +# $NetBSD: Makefile.common,v 1.37 2012/07/30 07:21:11 sbd Exp $ # used by sysutils/amanda-common/Makefile # used by sysutils/amanda-client/Makefile @@ -14,7 +14,15 @@ MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.amanda.org/ -LICENSE= modified-bsd AND gnu-gpl-v2 +LICENSE= modified-bsd AND gnu-gpl-v3 + +DISTINFO_FILE= ${.CURDIR}/${COMMONDIR}/distinfo +PATCHDIR= ${.CURDIR}/${COMMONDIR}/patches + +CHECK_PORTABILITY_SKIP+= configure # It gets regend +CHECK_PORTABILITY_SKIP+= packaging/deb/amanda-backup-server.postinst +CHECK_PORTABILITY_SKIP+= packaging/common/post_inst_functions.sh +CHECK_PORTABILITY_SKIP+= packaging/common/test_sh_libs.sh .include "../../mk/bsd.prefs.mk" @@ -32,11 +40,15 @@ AMANDA_VAR?= ${VARBASE}/amanda PKG_GROUPS_VARS+= AMANDA_GROUP PKG_USERS_VARS+= AMANDA_USER BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE +FILES_SUBST+= AMANDA_VAR=${AMANDA_VAR:Q} AM_PROG_PERMS= ${REAL_ROOT_USER} ${AMANDA_GROUP} 4510 USE_LIBTOOL= yes -USE_TOOLS+= gzip:run gtar:run +USE_TOOLS+= gzip:run gtar:run perl:run +USE_TOOLS+= gmake pkg-config autoconf automake +PERL5_CONFIGURE= no +AUTO_MKDIRS= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} @@ -45,11 +57,11 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q} CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q} CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists +CONFIGURE_ARGS+= --with-amperldir=${AMPERLDIR:Q} CONFIGURE_ARGS+= --with-debugging=${VARBASE:Q}/log/amanda CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q} CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q} CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q} -CONFIGURE_ARGS+= --with-mmap CONFIGURE_ARGS+= --with-index-server=localhost CONFIGURE_ARGS+= --with-tape-server=localhost CONFIGURE_ARGS+= --with-assertions @@ -62,4 +74,55 @@ CONFIGURE_ARGS+= --disable-installperms INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} +AMPERLDIR= ${PERLDIR:Q}/${PERL5_SUB_INSTALLVENDORLIB} + .include "../../sysutils/amanda-common/options.mk" + +.PHONY: autogen +pre-configure: autogen +autogen: + ${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \ + ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ + ${CONFIG_SHELL} ./autogen + +.PHONY: build-perl +post-build: build-perl +build-perl: +.if defined(PERL5_LIBS) && !empty(PERL5_LIBS) + ${RUN}${_ULIMIT_CMD} cd ${WRKSRC}/perl && \ + ${BUILD_MAKE_CMD} ${PERL5_LIBS:@lib@lib${lib}.la@} +.endif + +.if defined(PERL5_MODS) && !empty(PERL5_MODS) +INSTALLATION_DIRS+= ${PERL5_MODS:H:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/${_t_}@} +.endif +.if defined(PERL5_LIBS) && !empty(PERL5_LIBS) +INSTALLATION_DIRS+= ${PERL5_LIBS:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${_t_}@} +.endif + +.PHONY: post-install-extra +post-install: post-install-extra +post-install-extra: +.if defined(PERL5_MODS) && !empty(PERL5_MODS) +. for mod in ${PERL5_MODS} + ${INSTALL_DATA} ${WRKSRC}/perl/${mod} \ + ${DESTDIR}${PERLDIR}/${PERL5_SUB_INSTALLVENDORLIB}/${mod} +. endfor +.endif +.if defined(PERL5_LIBS) && !empty(PERL5_LIBS) +. for lib in ${PERL5_LIBS} + ${RUN}${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} \ + ${WRAPPER_BINDIR}/libtool --mode=install ${INSTALL_LIB} \ + ${WRKSRC}/perl/lib${lib}.la \ + ${DESTDIR}${PERLDIR}/${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${lib} +. endfor +.endif +.if defined(MANPAGES) && !empty(MANPAGES) +. for manpage in ${MANPAGES} + ${INSTALL_MAN} ${WRKSRC}/man/${manpage} \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man${manpage:E} +. endfor +.endif + +.include "../../lang/perl5/module.mk" +.include "../../devel/glib2/buildlink3.mk" diff --git a/sysutils/amanda-common/PLIST b/sysutils/amanda-common/PLIST index fe672043e4d..d156b9a36d4 100644 --- a/sysutils/amanda-common/PLIST +++ b/sysutils/amanda-common/PLIST @@ -1,8 +1,91 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:16:00 joerg Exp $ -lib/libamanda.la -lib/libamandad.la +@comment $NetBSD: PLIST,v 1.7 2012/07/30 07:21:11 sbd Exp $ +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Archive.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/BigIntCompat.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/ClientService.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Config.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Config/FoldingHash.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Constants.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Debug.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Feature.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Header.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/Binary.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/IPC/LineProtocol.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/MainLoop.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/NDMP.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Paths.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Process.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Script.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Script_App.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Tests.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Util.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Xfer.pm +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Archive/libArchive.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Config/libConfig.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Debug/libDebug.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Feature/libFeature.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Header/libHeader.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/IPC/Binary/libBinary.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/MainLoop/libMainLoop.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/NDMP/libNDMP.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Tests/libTests.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Util/libUtil.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Xfer/libXfer.la +lib/amanda/libamanda.la +lib/amanda/libamandad.la +lib/amanda/libamar.la +lib/amanda/libamglue.la +lib/amanda/libamxfer.la +lib/amanda/libndmjob.la +lib/amanda/libndmlib.la +libexec/amanda/amanda-sh-lib.sh +libexec/amanda/amndmjob +libexec/amanda/ndmjob +man/man5/amanda-archive-format.5 man/man5/amanda-client.conf.5 man/man5/amanda.conf.5 +man/man7/amanda-auth.7 +man/man7/amanda-match.7 +man/man7/amanda-scripts.7 man/man8/amanda.8 +man/man8/amarchiver.8 +man/man8/amservice.8 +man/man8/script-email.8 +sbin/amaespipe +sbin/amarchiver +sbin/amcrypt +sbin/amcrypt-ossl +sbin/amcrypt-ossl-asym +sbin/amcryptsimple +sbin/amgetconf +sbin/amgpgcrypt +sbin/amservice share/doc/amanda/COPYRIGHT +share/doc/amanda/ChangeLog +share/doc/amanda/NEWS share/doc/amanda/ReleaseNotes +share/doc/amanda/example/amanda-client-postgresql.conf +share/doc/amanda/example/amanda-client.conf +share/doc/amanda/example/amanda.conf +share/doc/amanda/example/chg-multi.conf +share/doc/amanda/example/chg-scsi.conf +share/doc/amanda/example/disklist +share/doc/amanda/example/inetd.conf.amandaclient +share/doc/amanda/example/inetd.conf.amandaserver +share/doc/amanda/example/label-templates/3hole.ps +share/doc/amanda/example/label-templates/8.5x11.ps +share/doc/amanda/example/label-templates/DIN-A4.ps +share/doc/amanda/example/label-templates/DLT-A4.ps +share/doc/amanda/example/label-templates/DLT.ps +share/doc/amanda/example/label-templates/EXB-8500.ps +share/doc/amanda/example/label-templates/HP-DAT.ps +share/doc/amanda/example/xinetd.amandaclient +share/doc/amanda/example/xinetd.amandaserver +share/doc/amanda/template.d/README +share/doc/amanda/template.d/advanced.conf +share/doc/amanda/template.d/amanda-S3.conf +share/doc/amanda/template.d/amanda-harddisk.conf +share/doc/amanda/template.d/amanda-single-tape.conf +share/doc/amanda/template.d/amanda-tape-changer.conf +share/doc/amanda/template.d/chg-manual.conf +share/doc/amanda/template.d/dumptypes +share/doc/amanda/template.d/tapetypes diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk index 1f22f0ca554..deed7ebd850 100644 --- a/sysutils/amanda-common/buildlink3.mk +++ b/sysutils/amanda-common/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2012/07/30 06:57:21 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2012/07/30 07:21:11 sbd Exp $ BUILDLINK_TREE+= amanda-common @@ -9,6 +9,15 @@ AMANDA_COMMON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.amanda-common+= amanda-common>=${AMANDA_VERSION} BUILDLINK_ABI_DEPENDS.amanda-common+= amanda-common>=${AMANDA_VERSION} BUILDLINK_PKGSRCDIR.amanda-common?= ../../sysutils/amanda-common + +BUILDLINK_LIBDIRS.amanda-common= lib/amanda + +pkgbase := amanda-common +.include "../../mk/pkg-build-options.mk" +. if !empty(PKG_BUILD_OPTIONS.amanda-common:Mamanda-krb5) +CONFIGURE_ARGS+= --with-krb5-security=${KRB5BASE:Q} +. include "../../mk/krb5.buildlink3.mk" +. endif .endif # AMANDA_COMMON_BUILDLINK3_MK BUILDLINK_TREE+= -amanda-common diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo index fc7731fe4b9..58c17019058 100644 --- a/sysutils/amanda-common/distinfo +++ b/sysutils/amanda-common/distinfo @@ -1,11 +1,22 @@ -$NetBSD: distinfo,v 1.9 2008/03/08 01:10:27 gdt Exp $ +$NetBSD: distinfo,v 1.10 2012/07/30 07:21:11 sbd Exp $ -SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 -RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 -Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes -SHA1 (patch-ab) = 1b07671b54492c3e4826e09f66ba9f4b1c9e3e55 -SHA1 (patch-ac) = e67098e2fb0a0e85837d124e41fd9d1976675f89 -SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd -SHA1 (patch-af) = 6f996ef8dacb75cf17a47df73024b91ad137315e -SHA1 (patch-ag) = 6e79b0e71d37a44b03addae67e361178b537ad8d -SHA1 (patch-ah) = aecd08fd2a1982ac8ab62aa85979958b73fd038c +SHA1 (amanda-3.3.1.tar.gz) = 22273381f61319e46e1da9d7029ca2b3991eee98 +RMD160 (amanda-3.3.1.tar.gz) = 0d66ad25fd905901a1afd3651bd6c1e00db9af8d +Size (amanda-3.3.1.tar.gz) = 4328574 bytes +SHA1 (patch-Makefile.am) = 005201b7a9b4e875c45362456e100c57fcf700f3 +SHA1 (patch-amandad-src_Makefile.am) = bdff2c06da0ee6c88237c56568fe20c5cefedd7a +SHA1 (patch-application-src_Makefile.am) = 3a5f256ab7e2439c2e19c4f75234d3a677707cc2 +SHA1 (patch-client-src_Makefile.am) = 641ef76fd1ea413b416704e1e52e25a93a596442 +SHA1 (patch-client-src_sendbackup-dump.c) = aea1aca0bbcdab0c393b012a592cbc5ca458acec +SHA1 (patch-client-src_sendsize.c) = 32a1627c250b6413e4695a610bba59796c6e7ed6 +SHA1 (patch-common-src_glib-util.c) = 8b62499f6730843fbf9e872adc80978b77b5573f +SHA1 (patch-common-src_glib-util.h) = 6d5b14acd7a44b17a52ebc697f5354db2a4b04f9 +SHA1 (patch-config_amanda_dumpers.m4) = 3d0cf6133b003de53e05929d2ce04eaa0f614819 +SHA1 (patch-config_amanda_krb5-security.m4) = c82af0e106e49b59994b40f12ed5b1c165a8497f +SHA1 (patch-config_macro-archive_xsltproc.m4) = 20324db1ce3db016fa89fe39df5a8133c7766693 +SHA1 (patch-device-src_Makefile.am) = 29fd554033ff0ff7b1d98a08306f157ced7324c5 +SHA1 (patch-example_Makefile.am) = 8d2dac1abdc473fbf94489bcb620a42a665fd27a +SHA1 (patch-oldrecover-src_Makefile.am) = 9127c1523937da3955662cc0b0921d05bca75248 +SHA1 (patch-perl_Makefile.am) = 9b02c19d88a91385fe0bd330cebe5520a40a78af +SHA1 (patch-recover-src_Makefile.am) = cd2ee55a0b285a33903e6157260cf167a1c79249 +SHA1 (patch-server-src_Makefile.am) = d1a4546a8ae55b86040d423bd1bde7b5de5f03aa diff --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk index 32e31189421..edf42342696 100644 --- a/sysutils/amanda-common/options.mk +++ b/sysutils/amanda-common/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.8 2012/07/30 06:54:45 sbd Exp $ +# $NetBSD: options.mk,v 1.9 2012/07/30 07:21:11 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.amanda # Common options. -PKG_SUPPORTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh -PKG_SUGGESTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh +PKG_SUPPORTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh kerberos +PKG_SUGGESTED_OPTIONS+= inet6 amanda-fqdn amanda-ssh kerberos # Client options. PKG_SUPPORTED_OPTIONS+= amanda-smb amanda-dump-snap PKG_SUGGESTED_OPTIONS+= amanda-dump-snap @@ -35,3 +35,8 @@ FIND_PREFIX:= SSHPREFIX=openssh CONFIGURE_ENV+= ac_cv_path_SSH=${SSHPREFIX}/bin/ssh . endif .endif + +.if !empty(PKG_OPTIONS:Mkerberos) +CONFIGURE_ARGS+= --with-krb5-security=${KRB5BASE:Q} +. include "../../mk/krb5.buildlink3.mk" +.endif diff --git a/sysutils/amanda-common/patches/patch-Makefile.am b/sysutils/amanda-common/patches/patch-Makefile.am new file mode 100644 index 00000000000..2a72486628f --- /dev/null +++ b/sysutils/amanda-common/patches/patch-Makefile.am @@ -0,0 +1,13 @@ +$NetBSD: patch-Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +--- Makefile.am.orig 2012-02-21 11:36:51.000000000 +0000 ++++ Makefile.am +@@ -43,7 +43,7 @@ SUBDIRS = . \ + packaging \ + installcheck + +-pkgdata_DATA = \ ++doc_DATA = \ + ReleaseNotes \ + COPYRIGHT \ + NEWS \ diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab deleted file mode 100644 index 27d0aa8a5d3..00000000000 --- a/sysutils/amanda-common/patches/patch-ab +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ - -Remove SUBDIRS that don't belong in -common package. - ---- Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 -+++ Makefile.in -@@ -17,7 +17,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdatadir = $(datadir)/doc/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . -@@ -384,13 +384,7 @@ SUBDIRS = \ - config \ - common-src \ - amandad-src \ -- $(TAPE_SUBDIRS) \ -- $(CLIENT_SUBDIRS) \ -- $(SERVER_SUBDIRS) \ -- $(RESTORE_SUBDIRS) \ -- $(RECOVER_SUBDIRS) \ -- $(PLOT_SUBDIRS) \ -- man docs example -+ man - - pkgdata_DATA = \ - ReleaseNotes \ diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac deleted file mode 100644 index e22f799c766..00000000000 --- a/sysutils/amanda-common/patches/patch-ac +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ac,v 1.9 2008/02/15 16:23:09 gdt Exp $ - -Don't install any manpages except COMMON_MAN*_PAGES. - ---- man/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 -+++ man/Makefile.in -@@ -373,19 +373,11 @@ SERVER_MAN8_PAGES = amadmin.8 \ - #endif - @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 - @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 --man8_pages = $(COMMON_MAN8_PAGES) \ -- $(AMPLOT_MAN8_PAGES) \ -- $(SERVER_MAN8_PAGES) \ -- $(RECOVER_MAN8_PAGES) \ -- $(RESTORE_MAN8_PAGES) -+man8_pages = $(COMMON_MAN8_PAGES) - - man5_pages = $(COMMON_MAN5_PAGES) --ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ -- $(COMMON_MAN5_PAGES) \ -- $(COMMON_MAN8_PAGES) \ -- $(SERVER_MAN8_PAGES) \ -- $(RECOVER_MAN8_PAGES) \ -- $(RESTORE_MAN8_PAGES) -+ALL_MAN_PAGES = $(COMMON_MAN5_PAGES) \ -+ $(COMMON_MAN8_PAGES) - - - # These lines are needed to force automake to set the $man<n>dir variables. diff --git a/sysutils/amanda-common/patches/patch-ad b/sysutils/amanda-common/patches/patch-ad deleted file mode 100644 index b93e48eb5ac..00000000000 --- a/sysutils/amanda-common/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$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.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, Linux glibc 2.1)" -+#if defined(__sun__) && defined(__svr4__) -+#if defined(_LARGEFILE64_SOURCE) -+# define STATFS_STRUCT statvfs64_t -+#else -+# define STATFS_STRUCT statvfs_t -+#endif /* largefile source */ -+#else - # define STATFS_STRUCT struct statvfs -+#endif /* !Solaris */ - # define STATFS_TOTAL(buf) (buf).f_blocks - # define STATFS_AVAIL(buf) (buf).f_bavail - # define STATFS_FREE(buf) (buf).f_bfree diff --git a/sysutils/amanda-common/patches/patch-af b/sysutils/amanda-common/patches/patch-af deleted file mode 100644 index b7ad6dde8e8..00000000000 --- a/sysutils/amanda-common/patches/patch-af +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-af,v 1.1 2008/02/15 16:23:09 gdt Exp $ - -Fix a bug in processing the --with-ssh-security option. Already fixed -in amanda svn, just backported from there. - ---- configure.orig 2007-06-06 19:22:45.000000000 -0400 -+++ configure -@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E - # now convert that to a comma-separated list of C strings - eval "set dummy ${SSH_OPTIONS}"; shift - SSH_OPTIONS='' -- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done -+ for i in "${@}"; do -+ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" -+ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; -+ done - echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 - echo "${ECHO_T}$SSH_OPTIONS" >&6 - -@@ -62491,7 +62494,7 @@ fi; - # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. - if test "${with_xsltproc_flags+set}" = set; then - withval="$with_xsltproc_flags" -- if test "x$withval" == "xno"; then -+ if test "x$withval" = "xno"; then - XSLTPROC_FLAGS='' - else - if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-common/patches/patch-ag b/sysutils/amanda-common/patches/patch-ag deleted file mode 100644 index 3d0ec1c277e..00000000000 --- a/sysutils/amanda-common/patches/patch-ag +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2008/02/15 16:23:09 gdt Exp $ - -Don't install amandad executable, just libamandad. The executable -belongs in -client, but the library is used by binaries in both --client and -server. - ---- amandad-src/Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 -+++ amandad-src/Makefile.in -@@ -41,7 +41,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ --libexec_PROGRAMS = amandad$(EXEEXT) -+# libexec_PROGRAMS = amandad$(EXEEXT) - subdir = amandad-src - DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in diff --git a/sysutils/amanda-common/patches/patch-ah b/sysutils/amanda-common/patches/patch-ah deleted file mode 100644 index 3b43ab5dc86..00000000000 --- a/sysutils/amanda-common/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2008/03/08 01:10:27 gdt Exp $ - -Work around a problem linking to _environ in Mac OS X. - ---- common-src/alloc.c.orig 2007-05-07 16:46:45.000000000 -0400 -+++ common-src/alloc.c -@@ -37,6 +37,11 @@ - #define MIN_ALLOC 64 - static char *internal_vstralloc(const char *, va_list); - -+#ifdef __APPLE__ -+#include <crt_externs.h> -+#define environ (* _NSGetEnviron()) -+#endif -+ - /* - *===================================================================== - * debug_caller_loc -- keep track of all allocation callers diff --git a/sysutils/amanda-common/patches/patch-amandad-src_Makefile.am b/sysutils/amanda-common/patches/patch-amandad-src_Makefile.am new file mode 100644 index 00000000000..aa02f49cb12 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-amandad-src_Makefile.am @@ -0,0 +1,27 @@ +$NetBSD: patch-amandad-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Don't install amandad by default (it get manualy install in amanda-client). + +--- amandad-src/Makefile.am.orig 2012-02-21 11:36:42.000000000 +0000 ++++ amandad-src/Makefile.am +@@ -16,7 +16,7 @@ LINTFLAGS=$(AMLINTFLAGS) + + amlib_LTLIBRARIES = libamandad.la + +-amlibexec_PROGRAMS = amandad ++EXTRA_PROGRAMS = amandad + + libamandad_la_SOURCES= amandad_util.c + libamandad_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS) +@@ -31,9 +31,8 @@ noinst_HEADERS = amandad.h + # routines, and second to pick up any references in the other libraries. + ### + +-LDADD = ../common-src/libamanda.la \ +- libamandad.la \ +- ../common-src/libamanda.la \ ++LDADD = -lamanda \ ++ -lamandad \ + ../gnulib/libgnu.la + + lint: diff --git a/sysutils/amanda-common/patches/patch-application-src_Makefile.am b/sysutils/amanda-common/patches/patch-application-src_Makefile.am new file mode 100644 index 00000000000..74ed7c821fc --- /dev/null +++ b/sysutils/amanda-common/patches/patch-application-src_Makefile.am @@ -0,0 +1,20 @@ +$NetBSD: patch-application-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Link with installed librarys from amanda-common. + +--- application-src/Makefile.am.orig 2012-02-21 11:36:45.000000000 +0000 ++++ application-src/Makefile.am +@@ -42,10 +42,10 @@ applicationdir = $(APPLICATION_DIR) + applicationexec_PROGRAMS = amgtar amstar + applicationexec_SCRIPTS = $(SCRIPTS_PERL) + +-LDADD = ../common-src/libamanda.la \ ++LDADD = -lamanda \ + ../client-src/libamclient.la \ +- ../amandad-src/libamandad.la \ +- ../common-src/libamanda.la \ ++ -lamandad \ ++ -lamanda \ + ../gnulib/libgnu.la + + if WANT_SETUID_CLIENT diff --git a/sysutils/amanda-common/patches/patch-client-src_Makefile.am b/sysutils/amanda-common/patches/patch-client-src_Makefile.am new file mode 100644 index 00000000000..652f033de3f --- /dev/null +++ b/sysutils/amanda-common/patches/patch-client-src_Makefile.am @@ -0,0 +1,29 @@ +$NetBSD: patch-client-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Link with installed librarys from amanda-common. + +--- client-src/Makefile.am.orig 2012-02-21 11:36:41.000000000 +0000 ++++ client-src/Makefile.am +@@ -36,7 +36,7 @@ libamclient_la_SOURCES += findpass.c + endif + + libamclient_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS) +-libamclient_la_LIBADD = ../common-src/libamanda.la ++libamclient_la_LIBADD = -lamanda + + ### + # Because libamanda includes routines (e.g. regex) provided by some system +@@ -45,10 +45,10 @@ libamclient_la_LIBADD = ../common-src/l + # routines, and second to pick up any references in the other libraries. + ### + +-LDADD = ../common-src/libamanda.la \ ++LDADD = -lamanda \ + libamclient.la \ +- ../amandad-src/libamandad.la \ +- ../common-src/libamanda.la \ ++ -lamandad \ ++ -lamanda \ + ../gnulib/libgnu.la + + # these are used for testing only: diff --git a/sysutils/amanda-common/patches/patch-client-src_sendbackup-dump.c b/sysutils/amanda-common/patches/patch-client-src_sendbackup-dump.c new file mode 100644 index 00000000000..cb378fee0be --- /dev/null +++ b/sysutils/amanda-common/patches/patch-client-src_sendbackup-dump.c @@ -0,0 +1,16 @@ +$NetBSD: patch-client-src_sendbackup-dump.c,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Add dump-use-snapshot code. + +--- client-src/sendbackup-dump.c.orig 2012-02-21 11:36:41.000000000 +0000 ++++ client-src/sendbackup-dump.c +@@ -391,6 +391,9 @@ start_backup( + FREEBSD_EXTRA_KEYS, + "s", + PARAM_HONOR_NODUMP, ++#ifdef HAVE_DUMP_SNAPSHOT ++ "X", ++#endif + "f", + NULL); + diff --git a/sysutils/amanda-common/patches/patch-client-src_sendsize.c b/sysutils/amanda-common/patches/patch-client-src_sendsize.c new file mode 100644 index 00000000000..0c9812fe093 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-client-src_sendsize.c @@ -0,0 +1,16 @@ +$NetBSD: patch-client-src_sendsize.c,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Add dump-use-snapshot code. + +--- client-src/sendsize.c.orig 2012-02-21 11:36:41.000000000 +0000 ++++ client-src/sendsize.c +@@ -1492,6 +1492,9 @@ getsize_dump( + dumpkeys = vstralloc(level_str, + PARAM_DUMP_ESTIMATE, + PARAM_HONOR_NODUMP, ++# ifdef HAVE_DUMP_SNAPSHOT ++ "X", ++# endif + "s", "f", NULL); + + # ifdef HAVE_DUMP_ESTIMATE diff --git a/sysutils/amanda-common/patches/patch-common-src_glib-util.c b/sysutils/amanda-common/patches/patch-common-src_glib-util.c new file mode 100644 index 00000000000..832c7ba9742 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-common-src_glib-util.c @@ -0,0 +1,15 @@ +$NetBSD: patch-common-src_glib-util.c,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Rename g_queue_free_full to stop conflict with newer glib. + +--- common-src/glib-util.c.orig 2012-02-21 11:36:51.000000000 +0000 ++++ common-src/glib-util.c +@@ -120,7 +120,7 @@ void slist_free_full(GSList * list, GDes + } + #endif + +-void g_queue_free_full(GQueue * queue) { ++void am_g_queue_free_full(GQueue * queue) { + while (!g_queue_is_empty(queue)) { + gpointer data; + data = g_queue_pop_head(queue); diff --git a/sysutils/amanda-common/patches/patch-common-src_glib-util.h b/sysutils/amanda-common/patches/patch-common-src_glib-util.h new file mode 100644 index 00000000000..bce31b83568 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-common-src_glib-util.h @@ -0,0 +1,15 @@ +$NetBSD: patch-common-src_glib-util.h,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Rename g_queue_free_full to stop conflict with newer glib. + +--- common-src/glib-util.h.orig 2012-02-21 11:36:51.000000000 +0000 ++++ common-src/glib-util.h +@@ -72,7 +72,7 @@ void slist_free_full(GSList * list, GDes + + /* These functions all take a GLib container, and call free() on all the + * pointers in the container before free()ing the container itself. */ +-void g_queue_free_full(GQueue * queue); ++void am_g_queue_free_full(GQueue * queue); + void g_ptr_array_free_full(GPtrArray * array); + + /* g_value_compare() does what you expect. It returns TRUE if and diff --git a/sysutils/amanda-common/patches/patch-config_amanda_dumpers.m4 b/sysutils/amanda-common/patches/patch-config_amanda_dumpers.m4 new file mode 100644 index 00000000000..42362d20c83 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-config_amanda_dumpers.m4 @@ -0,0 +1,62 @@ +$NetBSD: patch-config_amanda_dumpers.m4,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +* Fix shell portability problem. + +* Add '--with-dump-use-snapshot' code. + +--- config/amanda/dumpers.m4.orig 2012-02-21 11:36:49.000000000 +0000 ++++ config/amanda/dumpers.m4 +@@ -166,7 +166,7 @@ AC_DEFUN([AMANDA_PROG_SUNTAR], + # done + ], + [ +- if test "x$SUNTAR" == "x"; then ++ if test "x$SUNTAR" = "x"; then + SUNTAR="/usr/sbin/tar" + fi + ] +@@ -484,6 +484,44 @@ AC_DEFUN([AMANDA_PROG_DUMP_RESTORE], + [Define this if dump accepts -h for honoring nodump. ]) + fi + ]) ++ AC_ARG_WITH(dump-use-snapshot, ++ [ --with-dump-use-snapshot if dump supports -X, use it], ++ [ if test -x $DUMP; then ++ AC_CACHE_CHECK( ++ [whether $DUMP supports -X (use filesystem snapshot)], ++ amanda_cv_use_snapshot, ++ [ case "$DUMP" in ++ *dump) ++ AC_TRY_COMMAND($DUMP 9Xf /dev/null /dev/null/invalid/fs 2>&1 ++ | $GREP -v Dumping ++ | $GREP -v Date ++ | $GREP -v Label >conftest.d-x 2>&1) ++ cat conftest.d-x >&AS_MESSAGE_LOG_FD() ++ AC_TRY_COMMAND($DUMP 9f /dev/null /dev/null/invalid/fs 2>&1 ++ | $GREP -v Dumping ++ | $GREP -v Date ++ | $GREP -v Label >conftest.d 2>&1) ++ cat conftest.d >&AS_MESSAGE_LOG_FD() ++ if AC_TRY_COMMAND(diff conftest.d-x conftest.d 1>&2); then ++ amanda_cv_use_snapshot=yes ++ else ++ amanda_cv_use_snapshot=no ++ fi ++ rm -f conftest.d conftest.d-x ++ ;; ++ *) amanda_cv_use_snapshot=no ++ ;; ++ esac ++ ]) ++ else ++ AC_MSG_WARN([*** $DUMP is not executable, cannot run -X test]) ++ amanda_cv_use_snapshot=no ++ fi ++ if test "$amanda_cv_use_snapshot" = yes; then ++ AC_DEFINE(HAVE_DUMP_SNAPSHOT,1,[Define this if dump accepts -X for using snapshots. ]) ++ fi ++ ]) ++ + fi + + AC_SUBST(AIX_BACKUP) diff --git a/sysutils/amanda-common/patches/patch-config_amanda_krb5-security.m4 b/sysutils/amanda-common/patches/patch-config_amanda_krb5-security.m4 new file mode 100644 index 00000000000..a9b2edfeb3f --- /dev/null +++ b/sysutils/amanda-common/patches/patch-config_amanda_krb5-security.m4 @@ -0,0 +1,25 @@ +$NetBSD: patch-config_amanda_krb5-security.m4,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +* Make passing the krb5 location to '--with-krb5-security=' work. +* Make building with Heimdal work + +--- config/amanda/krb5-security.m4.orig 2012-02-21 11:36:49.000000000 +0000 ++++ config/amanda/krb5-security.m4 +@@ -27,7 +27,7 @@ AC_DEFUN([AMANDA_KRB5_SECURITY], + case "$withval" in + n | no) KRB5_SECURITY=no ;; + y | ye | yes) KRB5_SECURITY=yes ;; +- *) KRB5_SPOTS="$KRB5_SECURITY" ++ *) KRB5_SPOTS="$withval" + KRB5_SECURITY=yes + ;; + esac +@@ -61,6 +61,8 @@ AC_DEFUN([AMANDA_KRB5_SECURITY], + AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err]) + break + elif test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libasn1.a -o -f ${k5libdir}/libasn1.so \) -a \( -f ${k5libdir}/libgssapi.a -o -f ${k5libdir}/libgssapi.so \); then ++ KRB5_DIR_FOUND=$dir ++ KRB5_LIBDIR_FOUND=$k5libdir + AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1]) + AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES]) + break diff --git a/sysutils/amanda-common/patches/patch-config_macro-archive_xsltproc.m4 b/sysutils/amanda-common/patches/patch-config_macro-archive_xsltproc.m4 new file mode 100644 index 00000000000..e78e5d6d83f --- /dev/null +++ b/sysutils/amanda-common/patches/patch-config_macro-archive_xsltproc.m4 @@ -0,0 +1,15 @@ +$NetBSD: patch-config_macro-archive_xsltproc.m4,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Fix shell portability problem. + +--- config/macro-archive/xsltproc.m4.orig 2012-02-21 11:36:49.000000000 +0000 ++++ config/macro-archive/xsltproc.m4 +@@ -67,7 +67,7 @@ AS_HELP_STRING([--with-xsltproc[[[[[=PAT + AC_ARG_WITH(xsltproc-flags, + AS_HELP_STRING([ --with-xsltproc-flags=FLAGS], + [Flags to pass to xsltproc (default $1)]), +- [ if test "x$withval" == "xno"; then ++ [ if test "x$withval" = "xno"; then + XSLTPROC_FLAGS='' + else + if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-common/patches/patch-device-src_Makefile.am b/sysutils/amanda-common/patches/patch-device-src_Makefile.am new file mode 100644 index 00000000000..d2fa2d24d8c --- /dev/null +++ b/sysutils/amanda-common/patches/patch-device-src_Makefile.am @@ -0,0 +1,26 @@ +$NetBSD: patch-device-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Link with installed librarys from amanda-common. + +--- device-src/Makefile.am.orig 2012-02-21 11:36:44.000000000 +0000 ++++ device-src/Makefile.am +@@ -43,8 +43,8 @@ libamdevice_la_SOURCES = \ + xfer-dest-taper-splitter.c \ + xfer-source-recovery.c + libamdevice_la_LIBADD = \ +- ../common-src/libamanda.la \ +- ../xfer-src/libamxfer.la ++ -lamanda \ ++ -lamxfer + + if WANT_TAPE_DEVICE + libamdevice_la_SOURCES += tape-device.c +@@ -60,7 +60,7 @@ endif + + if WANT_NDMP_DEVICE + libamdevice_la_SOURCES += ndmp-device.c +-libamdevice_la_LIBADD += ../ndmp-src/libndmlib.la ++libamdevice_la_LIBADD += -lndmlib + endif + + ## automake-style tests diff --git a/sysutils/amanda-common/patches/patch-example_Makefile.am b/sysutils/amanda-common/patches/patch-example_Makefile.am new file mode 100644 index 00000000000..db121fc7942 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-example_Makefile.am @@ -0,0 +1,13 @@ +$NetBSD: patch-example_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +--- example/Makefile.am.orig 2012-02-21 11:36:41.000000000 +0000 ++++ example/Makefile.am +@@ -3,7 +3,7 @@ + include $(top_srcdir)/config/automake/vars.am + include $(top_srcdir)/config/automake/installperms.am + +-amanda_dir = $(amdatadir) ++amanda_dir = $(docdir) + templatedir = $(amanda_dir)/template.d + server_exampledir = $(amanda_dir)/example + client_exampledir = $(amanda_dir)/example diff --git a/sysutils/amanda-common/patches/patch-oldrecover-src_Makefile.am b/sysutils/amanda-common/patches/patch-oldrecover-src_Makefile.am new file mode 100644 index 00000000000..3b678392a23 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-oldrecover-src_Makefile.am @@ -0,0 +1,20 @@ +$NetBSD: patch-oldrecover-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Link with installed librarys from amanda-common. + +--- oldrecover-src/Makefile.am.orig 2012-02-21 11:36:41.000000000 +0000 ++++ oldrecover-src/Makefile.am +@@ -24,11 +24,11 @@ sbin_PROGRAMS = amoldrecover + # routines, and second to pick up any references in the other libraries. + ### + +-LDADD = ../common-src/libamanda.la \ ++LDADD = -lamanda \ + @LEXLIB@ \ + $(READLINE_LIBS) \ + ../client-src/libamclient.la \ +- ../common-src/libamanda.la ++ -lamanda + + amoldrecover_CSRC = amrecover.c \ + display_commands.c extract_list.c \ diff --git a/sysutils/amanda-common/patches/patch-perl_Makefile.am b/sysutils/amanda-common/patches/patch-perl_Makefile.am new file mode 100644 index 00000000000..2ccfc5ce78e --- /dev/null +++ b/sysutils/amanda-common/patches/patch-perl_Makefile.am @@ -0,0 +1,84 @@ +$NetBSD: patch-perl_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Link with installed librarys from amanda-common. + +--- perl/Makefile.am.orig 2012-02-21 11:36:47.000000000 +0000 ++++ perl/Makefile.am +@@ -135,9 +135,9 @@ libDevicedir = $(amperldir)/auto/Amanda/ + libDevice_LTLIBRARIES = libDevice.la + libDevice_la_SOURCES = Amanda/Device.c $(AMGLUE_SWG) + libDevice_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libDevice_la_LIBADD = amglue/libamglue.la \ ++libDevice_la_LIBADD = -lamglue \ + $(top_builddir)/device-src/libamdevice.la \ +- $(top_builddir)/common-src/libamanda.la ++ -lamanda + Amanda_DATA += Amanda/Device.pm + MAINTAINERCLEANFILES += Amanda/Device.c Amanda/Device.pm + endif +@@ -149,9 +149,9 @@ libLogfiledir = $(amperldir)/auto/Amanda + libLogfile_LTLIBRARIES = libLogfile.la + libLogfile_la_SOURCES = Amanda/Logfile.c $(AMGLUE_SWG) + libLogfile_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libLogfile_la_LIBADD = amglue/libamglue.la \ ++libLogfile_la_LIBADD = -lamglue \ + $(top_builddir)/server-src/libamserver.la \ +- $(top_builddir)/common-src/libamanda.la ++ -lamanda + Amanda_DATA += Amanda/Logfile.pm + MAINTAINERCLEANFILES += Amanda/Logfile.c Amanda/Logfile.pm + endif +@@ -163,9 +163,9 @@ libCmdlinedir = $(amperldir)/auto/Amanda + libCmdline_LTLIBRARIES = libCmdline.la + libCmdline_la_SOURCES = Amanda/Cmdline.c $(AMGLUE_SWG) + libCmdline_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libCmdline_la_LIBADD = amglue/libamglue.la \ ++libCmdline_la_LIBADD = -lamglue \ + $(top_builddir)/server-src/libamserver.la \ +- $(top_builddir)/common-src/libamanda.la ++ -lamanda + Amanda_DATA += Amanda/Cmdline.pm + MAINTAINERCLEANFILES += Amanda/Cmdline.c Amanda/Cmdline.pm + endif +@@ -177,9 +177,9 @@ libTapelistdir = $(amperldir)/auto/Amand + libTapelist_LTLIBRARIES = libTapelist.la + libTapelist_la_SOURCES = Amanda/Tapelist.c $(AMGLUE_SWG) + libTapelist_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libTapelist_la_LIBADD = amglue/libamglue.la \ ++libTapelist_la_LIBADD = -lamglue \ + $(top_builddir)/server-src/libamserver.la \ +- $(top_builddir)/common-src/libamanda.la ++ -lamanda + Amanda_DATA += Amanda/Tapelist.pm + MAINTAINERCLEANFILES += Amanda/Tapelist.c Amanda/Tapelist.pm + endif +@@ -191,9 +191,9 @@ libDisklistdir = $(amperldir)/auto/Amand + libDisklist_LTLIBRARIES = libDisklist.la + libDisklist_la_SOURCES = Amanda/Disklist.c $(AMGLUE_SWG) + libDisklist_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libDisklist_la_LIBADD = amglue/libamglue.la \ ++libDisklist_la_LIBADD = -lamglue \ + $(top_builddir)/server-src/libamserver.la \ +- $(top_builddir)/common-src/libamanda.la ++ -lamanda + Amanda_DATA += Amanda/Disklist.pm + MAINTAINERCLEANFILES += Amanda/Disklist.c Amanda/Disklist.pm + endif +@@ -359,7 +359,7 @@ libXferServerdir = $(amperldir)/auto/Ama + libXferServer_LTLIBRARIES = libXferServer.la + libXferServer_la_SOURCES = Amanda/XferServer.c $(AMGLUE_SWG) + libXferServer_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libXferServer_la_LIBADD = amglue/libamglue.la \ ++libXferServer_la_LIBADD = -lamglue \ + $(top_builddir)/server-src/libamserver.la + Amanda_DATA += Amanda/XferServer.pm + MAINTAINERCLEANFILES += Amanda/XferServer.c Amanda/XferServer.pm +@@ -502,7 +502,7 @@ libApplicationdir = $(amperldir)/auto/Am + libApplication_LTLIBRARIES = libApplication.la + libApplication_la_SOURCES = Amanda/Application.c $(AMGLUE_SWG) + libApplication_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libApplication_la_LIBADD = amglue/libamglue.la \ ++libApplication_la_LIBADD = -lamglue \ + $(top_builddir)/client-src/libamclient.la + Amanda_DATA += Amanda/Application.pm + MAINTAINERCLEANFILES += Amanda/Application.c Amanda/Application.pm diff --git a/sysutils/amanda-common/patches/patch-recover-src_Makefile.am b/sysutils/amanda-common/patches/patch-recover-src_Makefile.am new file mode 100644 index 00000000000..52c9b0706b8 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-recover-src_Makefile.am @@ -0,0 +1,20 @@ +$NetBSD: patch-recover-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Link with installed librarys from amanda-common. + +--- recover-src/Makefile.am.orig 2012-02-21 11:36:45.000000000 +0000 ++++ recover-src/Makefile.am +@@ -25,11 +25,11 @@ sbin_PROGRAMS = amrecover + # routines, and second to pick up any references in the other libraries. + ### + +-LDADD = ../common-src/libamanda.la \ ++LDADD = -lamanda \ + @LEXLIB@ \ + $(READLINE_LIBS) \ + ../client-src/libamclient.la \ +- ../common-src/libamanda.la ++ -lamanda + + amrecover_CSRC = amrecover.c \ + display_commands.c extract_list.c \ diff --git a/sysutils/amanda-common/patches/patch-server-src_Makefile.am b/sysutils/amanda-common/patches/patch-server-src_Makefile.am new file mode 100644 index 00000000000..9396284c6d6 --- /dev/null +++ b/sysutils/amanda-common/patches/patch-server-src_Makefile.am @@ -0,0 +1,32 @@ +$NetBSD: patch-server-src_Makefile.am,v 1.1 2012/07/30 07:21:11 sbd Exp $ + +Link with installed librarys from amanda-common. + +--- server-src/Makefile.am.orig 2012-02-21 11:36:46.000000000 +0000 ++++ server-src/Makefile.am +@@ -78,10 +78,10 @@ INSTALLPERMS_exec = \ + # routines, and second to pick up any references in the other libraries. + ### + +-LDADD = ../common-src/libamanda.la \ ++LDADD = -lamanda \ + libamserver.la \ + ../device-src/libamdevice.la \ +- ../common-src/libamanda.la ++ -lamanda + + libamserver_la_SOURCES= amindex.c \ + diskfile.c driverio.c cmdline.c \ +@@ -91,10 +91,10 @@ libamserver_la_SOURCES= amindex.c \ + + libamserver_la_LDFLAGS= -release $(VERSION) $(AS_NEEDED_FLAGS) + libamserver_la_LIBADD= ../device-src/libamdevice.la \ +- ../common-src/libamanda.la ++ -lamanda + + amindexd_LDADD = $(LDADD) \ +- ../amandad-src/libamandad.la ++ -lamandad + + # there are used for testing only: + TEST_PROGS = diskfile infofile diff --git a/sysutils/amanda-common/version.mk b/sysutils/amanda-common/version.mk index 2b6ec92d3e4..c1013243613 100644 --- a/sysutils/amanda-common/version.mk +++ b/sysutils/amanda-common/version.mk @@ -1,2 +1,2 @@ -# $NetBSD: version.mk,v 1.1 2012/07/30 06:57:21 sbd Exp $ -AMANDA_VERSION= 2.5.2p1 +# $NetBSD: version.mk,v 1.2 2012/07/30 07:21:11 sbd Exp $ +AMANDA_VERSION= 3.3.1 diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile index 957ef6e3e24..d7bd6e4484e 100644 --- a/sysutils/amanda-plot/Makefile +++ b/sysutils/amanda-plot/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2012/07/30 07:05:54 sbd Exp $ +# $NetBSD: Makefile,v 1.31 2012/07/30 07:21:11 sbd Exp $ # PKGNAME= amanda-plot-${AMANDA_VERSION} -PKGREVISION= 1 SVR4_PKGNAME= amapl COMMENT= Visualizes the behavior of Amanda, a network backup system @@ -12,6 +11,8 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot DEPENDS+= amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server +MANPAGES+= amplot.8 + .include "../../sysutils/amanda-common/Makefile.common" FIND_PREFIX:= GNUPLOT_PREFIX=gnuplot @@ -22,4 +23,6 @@ CONFIGURE_ARGS+= --without-restore CONFIGURE_ARGS+= --without-amrecover CONFIGURE_ENV+= GNUPLOT="${GNUPLOT_PREFIX}/bin/gnuplot" +BUILD_DIRS= amplot + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-plot/PLIST b/sysutils/amanda-plot/PLIST index 0d33d2b4d1e..5cba194d4ac 100644 --- a/sysutils/amanda-plot/PLIST +++ b/sysutils/amanda-plot/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:49 zuntum Exp $ -libexec/amcat.awk -libexec/amplot.awk -libexec/amplot.g -libexec/amplot.gp -man/man8/amplot.8 +@comment $NetBSD: PLIST,v 1.2 2012/07/30 07:21:11 sbd Exp $ +libexec/amanda/amcat.awk +libexec/amanda/amplot.awk +libexec/amanda/amplot.g +libexec/amanda/amplot.gp sbin/amplot +man/man8/amplot.8 diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo deleted file mode 100644 index 0225bcb09b6..00000000000 --- a/sysutils/amanda-plot/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.9 2008/02/15 16:23:09 gdt Exp $ - -SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2 -RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236 -Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes -SHA1 (patch-aa) = 7b041da3d60634c0741cb19a2ea296dfcdb88601 -SHA1 (patch-ab) = 33c7b2c3dbc21bd1fcfa490b0e9bb9fccaedb70c -SHA1 (patch-ac) = 066c93eeaba931cb04040f3f6859ffc7b9c81f29 diff --git a/sysutils/amanda-plot/patches/patch-aa b/sysutils/amanda-plot/patches/patch-aa deleted file mode 100644 index b0fb4e99cec..00000000000 --- a/sysutils/amanda-plot/patches/patch-aa +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2008/02/15 16:23:09 gdt Exp $ - ---- configure.orig 2008-02-08 16:34:38.000000000 -0500 -+++ configure -@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E - # now convert that to a comma-separated list of C strings - eval "set dummy ${SSH_OPTIONS}"; shift - SSH_OPTIONS='' -- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done -+ for i in "${@}"; do -+ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" -+ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; -+ done - echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 - echo "${ECHO_T}$SSH_OPTIONS" >&6 - -@@ -38647,8 +38650,10 @@ fi - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -+if false ; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi - - # Prevent multiple expansion - -@@ -62491,7 +62496,7 @@ fi; - # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. - if test "${with_xsltproc_flags+set}" = set; then - withval="$with_xsltproc_flags" -- if test "x$withval" == "xno"; then -+ if test "x$withval" = "xno"; then - XSLTPROC_FLAGS='' - else - if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab deleted file mode 100644 index 0761fd40dc4..00000000000 --- a/sysutils/amanda-plot/patches/patch-ab +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ - ---- Makefile.in.orig 2007-06-06 19:22:51.000000000 -0400 -+++ Makefile.in -@@ -380,21 +380,14 @@ ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACIN - @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot - # order is significant, don't change it arbitrarily - SUBDIRS = \ -- gnulib \ - config \ -- common-src \ -- amandad-src \ -- $(TAPE_SUBDIRS) \ - $(CLIENT_SUBDIRS) \ -- $(SERVER_SUBDIRS) \ - $(RESTORE_SUBDIRS) \ - $(RECOVER_SUBDIRS) \ - $(PLOT_SUBDIRS) \ -- man docs example -+ man - --pkgdata_DATA = \ -- ReleaseNotes \ -- COPYRIGHT -+pkgdata_DATA = - - EXTRA_DIST = $(SNAPSHOT_STAMP) \ - $(pkgdata_DATA) \ -@@ -775,7 +768,7 @@ install-data: install-data-recursive - uninstall: uninstall-recursive - - install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am - - installcheck: installcheck-recursive - install-strip: diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac deleted file mode 100644 index d96a6e6d482..00000000000 --- a/sysutils/amanda-plot/patches/patch-ac +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $ - ---- man/Makefile.in.orig 2007-06-06 19:22:52.000000000 -0400 -+++ man/Makefile.in -@@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \ - #endif - @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8 - @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8 --man8_pages = $(COMMON_MAN8_PAGES) \ -- $(AMPLOT_MAN8_PAGES) \ -- $(SERVER_MAN8_PAGES) \ -- $(RECOVER_MAN8_PAGES) \ -- $(RESTORE_MAN8_PAGES) -- --man5_pages = $(COMMON_MAN5_PAGES) --ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \ -- $(COMMON_MAN5_PAGES) \ -- $(COMMON_MAN8_PAGES) \ -- $(SERVER_MAN8_PAGES) \ -- $(RECOVER_MAN8_PAGES) \ -- $(RESTORE_MAN8_PAGES) -+man8_pages = $(AMPLOT_MAN8_PAGES) -+ -+man5_pages = -+ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) - - - # These lines are needed to force automake to set the $man<n>dir variables. diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index 73e7a6ac904..e0ed347cf19 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,38 +1,110 @@ -# $NetBSD: Makefile,v 1.52 2012/07/30 07:04:29 sbd Exp $ +# $NetBSD: Makefile,v 1.53 2012/07/30 07:21:12 sbd Exp $ PKGNAME= amanda-server-${AMANDA_VERSION} -PKGREVISION= 2 SVR4_PKGNAME= amase COMMENT= Server part of Amanda, a network backup system PKG_DESTDIR_SUPPORT= user-destdir -.include "../../sysutils/amanda-common/Makefile.common" +USE_TOOLS+= awk:run mail:run -USE_TOOLS+= awk:run perl:run mail:run +CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail} +CONFIGURE_ARGS+= --without-client --without-gnuplot -DEPENDS+= p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs +BUILD_DIRS= device-src server-src changer-src -# Prevent configure script from finding unnecessary libraries. -# -CONFIGURE_ENV+= ac_cv_lib_intl_main=no -CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no -CONFIGURE_ENV+= ac_cv_lib_readline_readline=no +MANPAGES+= amanda-devices.7 +MANPAGES+= amanda-compatibility.7 +MANPAGES+= amanda-changers.7 +MANPAGES+= amanda-interactivity.7 +MANPAGES+= amanda-taperscan.7 +MANPAGES+= amaddclient.8 +MANPAGES+= amadmin.8 +MANPAGES+= amaespipe.8 +MANPAGES+= amcheck.8 +MANPAGES+= amcheckdb.8 +MANPAGES+= amcheckdump.8 +MANPAGES+= amcleanup.8 +MANPAGES+= amcleanupdisk.8 +MANPAGES+= amcrypt-ossl-asym.8 +MANPAGES+= amcrypt-ossl.8 +MANPAGES+= amcrypt.8 +MANPAGES+= amcryptsimple.8 +MANPAGES+= amdevcheck.8 +MANPAGES+= amdump.8 +MANPAGES+= amflush.8 +MANPAGES+= amgetconf.8 +MANPAGES+= amgpgcrypt.8 +MANPAGES+= amlabel.8 +MANPAGES+= amoverview.8 +MANPAGES+= amreport.8 +MANPAGES+= amrmtape.8 +MANPAGES+= amserverconfig.8 +MANPAGES+= amstatus.8 +MANPAGES+= amtape.8 +MANPAGES+= amtapetype.8 +MANPAGES+= amtoc.8 +MANPAGES+= amvault.8 +MANPAGES+= disklist.5 +MANPAGES+= tapelist.5 +MANPAGES+= amrestore.8 +MANPAGES+= amfetchdump.8 -CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail} -CONFIGURE_ARGS+= --without-client --without-gnuplot +PERL5_MODS+= Amanda/Changer.pm +PERL5_MODS+= Amanda/Changer/aggregate.pm +PERL5_MODS+= Amanda/Changer/compat.pm +PERL5_MODS+= Amanda/Changer/disk.pm +PERL5_MODS+= Amanda/Changer/multi.pm +PERL5_MODS+= Amanda/Changer/ndmp.pm +PERL5_MODS+= Amanda/Changer/null.pm +PERL5_MODS+= Amanda/Changer/rait.pm +PERL5_MODS+= Amanda/Changer/robot.pm +PERL5_MODS+= Amanda/Changer/single.pm +PERL5_MODS+= Amanda/Cmdline.pm +PERL5_MODS+= Amanda/Curinfo.pm +PERL5_MODS+= Amanda/Curinfo/Info.pm +PERL5_MODS+= Amanda/DB/Catalog.pm +PERL5_MODS+= Amanda/Device.pm +PERL5_MODS+= Amanda/Disklist.pm +PERL5_MODS+= Amanda/Holding.pm +PERL5_MODS+= Amanda/Interactivity.pm +PERL5_MODS+= Amanda/Interactivity/email.pm +PERL5_MODS+= Amanda/Interactivity/stdin.pm +PERL5_MODS+= Amanda/Interactivity/tty.pm +PERL5_MODS+= Amanda/Interactivity/tty_email.pm +PERL5_MODS+= Amanda/Logfile.pm +PERL5_MODS+= Amanda/Recovery/Clerk.pm +PERL5_MODS+= Amanda/Recovery/Planner.pm +PERL5_MODS+= Amanda/Recovery/Scan.pm +PERL5_MODS+= Amanda/Report.pm +PERL5_MODS+= Amanda/Report/human.pm +PERL5_MODS+= Amanda/Report/postscript.pm +PERL5_MODS+= Amanda/Report/xml.pm +PERL5_MODS+= Amanda/ScanInventory.pm +PERL5_MODS+= Amanda/Tapelist.pm +PERL5_MODS+= Amanda/Taper/Controller.pm +PERL5_MODS+= Amanda/Taper/Protocol.pm +PERL5_MODS+= Amanda/Taper/Scan.pm +PERL5_MODS+= Amanda/Taper/Scan/lexical.pm +PERL5_MODS+= Amanda/Taper/Scan/oldest.pm +PERL5_MODS+= Amanda/Taper/Scan/traditional.pm +PERL5_MODS+= Amanda/Taper/Scribe.pm +PERL5_MODS+= Amanda/Taper/Worker.pm +PERL5_MODS+= Amanda/XferServer.pm + +PERL5_LIBS+= Cmdline +PERL5_LIBS+= Device +PERL5_LIBS+= Disklist +PERL5_LIBS+= Logfile +PERL5_LIBS+= Tapelist +PERL5_LIBS+= XferServer -PLIST_VARS+= scsi -.if ${OPSYS} != "SunOS" -PLIST.scsi= yes -.endif +.include "../../sysutils/amanda-common/Makefile.common" -SPECIAL_PERMS+= sbin/amcheck ${AM_PROG_PERMS} -SPECIAL_PERMS+= libexec/planner ${AM_PROG_PERMS} -SPECIAL_PERMS+= libexec/dumper ${AM_PROG_PERMS} +SPECIAL_PERMS+= sbin/amcheck ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/amanda/planner ${AM_PROG_PERMS} +SPECIAL_PERMS+= libexec/amanda/dumper ${AM_PROG_PERMS} .include "../../sysutils/amanda-common/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST index f19711ab608..a58201905f2 100644 --- a/sysutils/amanda-server/PLIST +++ b/sysutils/amanda-server/PLIST @@ -1,174 +1,125 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:16:00 joerg Exp $ -lib/libamserver.la -lib/libamtape.la -lib/librestore.la -libexec/amcleanupdisk -libexec/amidxtaped -libexec/amindexd -libexec/amlogroll -libexec/amtrmidx -libexec/amtrmlog -libexec/chg-chio -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 -libexec/chg-multi -libexec/chg-null -libexec/chg-rait -libexec/chg-rth -${PLIST.scsi}libexec/chg-scsi -libexec/chg-zd-mtx -libexec/chunker -libexec/driver -libexec/dumper -libexec/planner -libexec/taper +@comment $NetBSD: PLIST,v 1.8 2012/07/30 07:21:12 sbd Exp $ +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/aggregate.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/compat.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/disk.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/multi.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/ndmp.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/null.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/rait.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/robot.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Changer/single.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Cmdline.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Curinfo.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Curinfo/Info.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/DB/Catalog.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Device.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Disklist.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Holding.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Interactivity.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Interactivity/email.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Interactivity/stdin.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Interactivity/tty.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Interactivity/tty_email.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Logfile.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Recovery/Clerk.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Recovery/Planner.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Recovery/Scan.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Report.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Report/human.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Report/postscript.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Report/xml.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/ScanInventory.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Tapelist.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Controller.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Protocol.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Scan.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Scan/lexical.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Scan/oldest.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Scan/traditional.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Scribe.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/Taper/Worker.pm +${PERL5_SUB_INSTALLVENDORLIB}/Amanda/XferServer.pm +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Cmdline/libCmdline.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Device/libDevice.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Disklist/libDisklist.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Logfile/libLogfile.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/Tapelist/libTapelist.la +${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/XferServer/libXferServer.la +sbin/amcleanupdisk +sbin/amfetchdump +sbin/amdump +sbin/amcheckdb +sbin/amaddclient +sbin/amtapetype +sbin/amvault +sbin/amstatus +sbin/amdevcheck +sbin/amrestore +sbin/amoverview +sbin/amreport +sbin/amcheck +sbin/amrmtape +sbin/amlabel +sbin/amflush +sbin/amserverconfig +sbin/amcleanup +sbin/amcheckdump +sbin/amtape +sbin/amadmin +sbin/amtoc +libexec/amanda/amcheck-device +libexec/amanda/taper +libexec/amanda/amtrmidx +libexec/amanda/chg-lib.sh +libexec/amanda/amidxtaped +libexec/amanda/chg-manual +libexec/amanda/planner +libexec/amanda/chg-zd-mtx +libexec/amanda/amindexd +libexec/amanda/driver +libexec/amanda/chg-multi +libexec/amanda/dumper +libexec/amanda/amtrmlog +libexec/amanda/amlogroll +libexec/amanda/chg-disk +libexec/amanda/chunker +libexec/amanda/amdumpd +lib/amanda/libamserver.la +lib/amanda/libamdevice.la +man/man5/disklist.5 +man/man5/tapelist.5 +man/man7/amanda-changers.7 +man/man7/amanda-compatibility.7 +man/man7/amanda-devices.7 +man/man7/amanda-interactivity.7 +man/man7/amanda-taperscan.7 +man/man8/amaddclient.8 man/man8/amadmin.8 man/man8/amaespipe.8 man/man8/amcheck.8 man/man8/amcheckdb.8 +man/man8/amcheckdump.8 man/man8/amcleanup.8 +man/man8/amcleanupdisk.8 man/man8/amcrypt-ossl-asym.8 man/man8/amcrypt-ossl.8 man/man8/amcrypt.8 -man/man8/amdd.8 +man/man8/amcryptsimple.8 +man/man8/amdevcheck.8 man/man8/amdump.8 man/man8/amfetchdump.8 man/man8/amflush.8 man/man8/amgetconf.8 +man/man8/amgpgcrypt.8 man/man8/amlabel.8 -man/man8/ammt.8 man/man8/amoverview.8 man/man8/amreport.8 man/man8/amrestore.8 man/man8/amrmtape.8 +man/man8/amserverconfig.8 man/man8/amstatus.8 man/man8/amtape.8 man/man8/amtapetype.8 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 -sbin/ammt -sbin/amoverview -sbin/amreport -sbin/amrestore -sbin/amrmtape -sbin/amstatus -sbin/amtape -sbin/amtapetype -sbin/amtoc -sbin/amverify -sbin/amverifyrun -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/chg-mcutil.conf -share/examples/amanda/chg-multi.conf -share/examples/amanda/chg-scsi.conf -share/examples/amanda/config.site -share/examples/amanda/disklist +man/man8/amvault.8 diff --git a/sysutils/amanda-server/distinfo b/sysutils/amanda-server/distinfo deleted file mode 100644 index 2b039787f69..00000000000 --- a/sysutils/amanda-server/distinfo +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: distinfo,v 1.13 2012/01/22 21:10:18 hauke Exp $ - -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) = 2d2ada69e2876092194002edfde1795f77a20d82 -SHA1 (patch-ac) = 047647205258910f5b0ff7c04854816508e2d904 -SHA1 (patch-ad) = 374df6ccf94d6533166db6eb2468d555f4f52f39 -SHA1 (patch-ae) = 9ec981cae457668882bc280494145c8dc365b89d -SHA1 (patch-af) = bb261c9d74a9caab4864b943082143b0445aef5d -SHA1 (patch-ag) = 2256353832fef411fb2e0dab56a8d3aaa699da81 -SHA1 (patch-ah) = 52095cc6eab0ec49ada00df4291e9e96e3ff7514 -SHA1 (patch-ai) = a5d85a0b947926f84dab3d6826cdcc69d4709486 -SHA1 (patch-aj) = 63e3cb69b74fbe624c7777ae5515832aea9335ca -SHA1 (patch-ak) = 403ed50f3396198abab03cc06378030b605fff02 -SHA1 (patch-aq) = 5d0b287ef3271c0ffaa13f4841312859ffc34bf4 -SHA1 (patch-server-src_amstatus.pl.in) = 75cc66b2b27cb9a9170257d42079b9e140e0f3f0 diff --git a/sysutils/amanda-server/patches/patch-aa b/sysutils/amanda-server/patches/patch-aa deleted file mode 100644 index 9d8cbcd9e30..00000000000 --- a/sysutils/amanda-server/patches/patch-aa +++ /dev/null @@ -1,165 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2004/05/12 18:45:26 bouyer Exp $ - ---- 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) - { -+#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-ab b/sysutils/amanda-server/patches/patch-ab deleted file mode 100644 index f0bb8f28b39..00000000000 --- a/sysutils/amanda-server/patches/patch-ab +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $ - -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@ - VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdatadir = $(datadir)/doc/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . -@@ -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 - --pkgdata_DATA = \ -- ReleaseNotes \ -- COPYRIGHT -+pkgdata_DATA = - - EXTRA_DIST = $(SNAPSHOT_STAMP) \ - $(pkgdata_DATA) \ diff --git a/sysutils/amanda-server/patches/patch-ac b/sysutils/amanda-server/patches/patch-ac deleted file mode 100644 index 0307a0a96d7..00000000000 --- a/sysutils/amanda-server/patches/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:45 mjl Exp $ - ---- example/Makefile.in.orig 2004-10-22 15:12:40.000000000 +0200 -+++ example/Makefile.in 2004-11-08 00:55:34.000000000 +0100 -@@ -19,7 +19,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdatadir = $(datadir)/examples/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. -@@ -384,7 +384,16 @@ - - info-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-exec-am: - diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad deleted file mode 100644 index e2f8541f2f7..00000000000 --- a/sysutils/amanda-server/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.8 2004/11/12 12:13:45 mjl Exp $ - ---- docs/Makefile.in.orig 2004-10-22 15:12:40.000000000 +0200 -+++ docs/Makefile.in 2004-11-08 00:57:02.000000000 +0100 -@@ -17,7 +17,7 @@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ -+pkgdatadir = $(datadir)/doc/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. diff --git a/sysutils/amanda-server/patches/patch-ae b/sysutils/amanda-server/patches/patch-ae deleted file mode 100644 index 2feb21eeea8..00000000000 --- a/sysutils/amanda-server/patches/patch-ae +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-ae,v 1.8 2008/02/15 16:23:09 gdt Exp $ - ---- 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]", -+ DoNothing3, -+ DoNothing2, -+ DoNothing1, -+ DoNothing0, -+ DLT4000Eject, -+ GenericClean, -+ GenericRewind, -+ GenericBarCode, -+ GenericSearch, -+ GenericSenseHandler}, - {"DLT8000", - "DLT Tape [DLT8000]", - DoNothing3, -@@ -1488,13 +1500,14 @@ BarCode( - { - int ret; - extern OpenFiles_T *pDev; -+ extern changer_t chg; /* Needed for the infos about havebarcode */ - - DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### START BarCode\n"); - DebugPrint(DEBUG_INFO, SECTION_BARCODE,"%-20s : fd %d\n", "BarCode", fd); - - 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) | changer->havebarcode); - DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP BarCode (%d)\n",ret); - return(ret); - } -@@ -4068,7 +4081,7 @@ GetElementStatus( - (u_char)barcode, - V2(pEAAPage->MediumTransportElementAddress), - (MTE + (size_t)1), -- SIZEOF(MediumTransportElementDescriptor_T), -+ 0, /* let the buffer auto-size */ - &DataBuffer) != 0) - { - ChgExit("genericElementStatus","Can't read MTE status", FATAL); -@@ -4153,7 +4166,7 @@ GetElementStatus( - (u_char)barcode, - V2(pEAAPage->FirstStorageElementAddress), - STE, -- SIZEOF(StorageElementDescriptor_T), -+ 0, /* let the buffer auto-size */ - &DataBuffer) != 0) - { - ChgExit("GetElementStatus", "Can't read STE status", FATAL); -@@ -4239,7 +4252,7 @@ GetElementStatus( - (u_char)barcode, - V2(pEAAPage->FirstImportExportElementAddress), - IEE, -- SIZEOF(ImportExportElementDescriptor_T), -+ 0, /* let the buffer auto-size */ - &DataBuffer) != 0) - { - ChgExit("GetElementStatus", "Can't read IEE status", FATAL); -@@ -4323,7 +4336,7 @@ GetElementStatus( - (u_char)barcode, - V2(pEAAPage->FirstDataTransferElementAddress), - DTE, -- SIZEOF(DataTransferElementDescriptor_T), -+ 0, /* let the buffer auto-size */ - &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 deleted file mode 100644 index 848ddecbcd9..00000000000 --- a/sysutils/amanda-server/patches/patch-af +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-af,v 1.7 2008/02/15 16:23:09 gdt Exp $ - -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) - 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) - 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) - 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) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config - depcomp = $(SHELL) $(top_srcdir)/config/depcomp - am__depfiles_maybe = depfiles -@@ -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. - ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = libamtape.$(LIB_EXTENSION) -lamanda - - - # used for testing only -@@ -433,9 +423,7 @@ noinst_HEADERS = \ - tapeio.h - - amtapeio_SOURCES = amtapeio.test.c --amtapeio_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amtapeio_LDADD = libamtape.$(LIB_EXTENSION) -lamanda - - all: all-am - diff --git a/sysutils/amanda-server/patches/patch-ag b/sysutils/amanda-server/patches/patch-ag deleted file mode 100644 index 9141e5e46da..00000000000 --- a/sysutils/amanda-server/patches/patch-ag +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2004/11/12 12:13:45 mjl Exp $ - ---- common-src/Makefile.in.orig 2004-10-22 15:12:39.000000000 +0200 -+++ common-src/Makefile.in 2004-11-08 01:05:05.000000000 +0100 -@@ -624,25 +624,18 @@ - done - check-am: all-am - check: check-am --all-am: Makefile $(LTLIBRARIES) $(HEADERS) -+all-am: Makefile genversion.h - installdirs: -- for dir in "$(DESTDIR)$(libdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done -+ - install: install-am - install-exec: install-exec-am - install-data: install-data-am - uninstall: uninstall-am - --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+install-am: - - installcheck: installcheck-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install - mostlyclean-generic: - - clean-generic: -@@ -678,7 +671,7 @@ - - install-data-am: - --install-exec-am: install-libLTLIBRARIES -+install-exec-am: - - install-info: install-info-am - diff --git a/sysutils/amanda-server/patches/patch-ah b/sysutils/amanda-server/patches/patch-ah deleted file mode 100644 index 8c2447befe8..00000000000 --- a/sysutils/amanda-server/patches/patch-ah +++ /dev/null @@ -1,251 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2008/02/15 16:23:09 gdt Exp $ - -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) \ - ../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) \ - ../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) \ - ../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) \ - ../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) \ - ../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_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) \ - ../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) \ - ../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) \ - ../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) \ - ../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) \ - ../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) \ - ../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) \ - ../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) \ -+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) \ - ../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) \ - ../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) \ - ../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) \ - ../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) \ - ../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) \ - ../tape-src/libamtape.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) - sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) - SCRIPTS = $(sbin_SCRIPTS) -@@ -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) \ - ../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 deleted file mode 100644 index 34ccdb52bfa..00000000000 --- a/sysutils/amanda-server/patches/patch-ai +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ai,v 1.7 2008/02/15 16:23:09 gdt Exp $ - -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) \ -+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) \ -+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) -@@ -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) \ -+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 diff --git a/sysutils/amanda-server/patches/patch-aj b/sysutils/amanda-server/patches/patch-aj deleted file mode 100644 index b026c02a5ab..00000000000 --- a/sysutils/amanda-server/patches/patch-aj +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-aj,v 1.4 2008/02/15 16:23:09 gdt Exp $ - -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) - 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 = 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 -@@ -413,21 +408,20 @@ LIB_EXTENSION = la - # routines, and second to pick up any references in the other libraries. - ### - 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 - 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) \ -- ../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 deleted file mode 100644 index 3d393c793c8..00000000000 --- a/sysutils/amanda-server/patches/patch-ak +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ak,v 1.4 2008/02/15 16:23:09 gdt Exp $ - -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-aq b/sysutils/amanda-server/patches/patch-aq deleted file mode 100644 index cb0c044dc5c..00000000000 --- a/sysutils/amanda-server/patches/patch-aq +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2008/02/15 16:23:09 gdt Exp $ - ---- configure.orig 2007-06-06 19:22:45.000000000 -0400 -+++ configure -@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E - # now convert that to a comma-separated list of C strings - eval "set dummy ${SSH_OPTIONS}"; shift - SSH_OPTIONS='' -- for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done -+ for i in "${@}"; do -+ quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\"" -+ SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted"; -+ done - echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5 - echo "${ECHO_T}$SSH_OPTIONS" >&6 - -@@ -62491,7 +62494,7 @@ fi; - # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given. - if test "${with_xsltproc_flags+set}" = set; then - withval="$with_xsltproc_flags" -- if test "x$withval" == "xno"; then -+ if test "x$withval" = "xno"; then - XSLTPROC_FLAGS='' - else - if test "x$withval" != "xyes"; then diff --git a/sysutils/amanda-server/patches/patch-server-src_amstatus.pl.in b/sysutils/amanda-server/patches/patch-server-src_amstatus.pl.in deleted file mode 100644 index c4275caf91e..00000000000 --- a/sysutils/amanda-server/patches/patch-server-src_amstatus.pl.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-server-src_amstatus.pl.in,v 1.1 2012/01/22 21:08:00 hauke Exp $ - -Remove an over-zealous warning, which breaks the script for -Perl 5.14+. According to -<https://bugzilla.redhat.com/show_bug.cgi?id=512534>, -upstream did away with -T here in v2.6 - ---- server-src/amstatus.pl.in.orig 2007-06-04 12:37:38.000000000 +0000 -+++ server-src/amstatus.pl.in -@@ -1,4 +1,4 @@ --#!@PERL@ -Tw -+#!@PERL@ -w - # - - # Run perl. |