diff options
| author | kuriyama <kuriyama@FreeBSD.org> | 2009-02-04 22:55:46 +0000 |
|---|---|---|
| committer | kuriyama <kuriyama@FreeBSD.org> | 2009-02-04 22:55:46 +0000 |
| commit | ed5e8719bc793ed0dd14171e254d343b52e68052 (patch) | |
| tree | 1baa65135f31136b258c9362fcf71279c97461ad | |
| parent | 2796e839327e4b38711aeae4e475f049dcc02f0f (diff) | |
| download | FreeBSD-ports-ed5e8719bc793ed0dd14171e254d343b52e68052.zip FreeBSD-ports-ed5e8719bc793ed0dd14171e254d343b52e68052.tar.gz | |
- Upgrade to 2.6.1.
- Turn on SSH auth by default.
- Sorry, previous default path of $AMANDA_DATES was typo. Fixed here
it should be. Please take care when upgrading.
PR: ports/131193 (partially merged to my update modifications) [1]
Submitted by: Goran Lowkrantz <glz@hidden-powers.com> [1]
33 files changed, 873 insertions, 540 deletions
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile index 4e059af..03f4f04 100644 --- a/misc/amanda-client/Makefile +++ b/misc/amanda-client/Makefile @@ -6,7 +6,6 @@ # PKGNAMESUFFIX= -client -PORTREVISION= 1 COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 070b4ab..0240b86 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amanda -PORTVERSION= 2.6.0p2 +PORTVERSION= 2.6.1 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,24 +29,24 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --without-amlibexecdir \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ - --disable-libtool --prefix=${PREFIX} \ + --prefix=${PREFIX} \ --disable-glibtest \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-bsdtcp-security --with-bsdudp-security + --with-bsdtcp-security --with-bsdudp-security \ + --with-ssh-security USE_LDCONFIG= yes -WANT_PERL= yes +USE_PERL5= yes -OPTIONS= GNUTAR "use GNU tar" on \ - SSH "enable ssh-auth" off +OPTIONS= GNUTAR "use GNU tar" on .include <bsd.port.pre.mk> AMANDA_USER?= operator AMANDA_GROUP?= operator AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists -AMANDA_DATES?= ${PREFIX}/var/amanda/amandadates -PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadates +AMANDA_DATES?= ${PREFIX}/var/amanda/amandates +PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${AMANDA_DATES} # amanda-server/amanda-client common part .if defined (AMANDA_SERVER) @@ -62,10 +62,6 @@ CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} .endif -.if defined (WITH_SSH) -CONFIGURE_ARGS+= --with-ssh-security -.endif - .if defined (AMANDA_TCPPORTRANGE) CONFIGURE_ARGS+= --with-tcpportrange=${AMANDA_TCPPORTRANGE} .endif @@ -89,7 +85,7 @@ pre-fetch: @${ECHO} " AMANDA_TAPE=tape to specify the default tape device" @${ECHO} " The default is /dev/nrsa0" @${ECHO} " AMANDA_CONFIG=config to specify the default configuration" - @${ECHO} " The default is user" + @${ECHO} " The default is DailySet1" @${ECHO} " AMANDA_USER=user to specify the default user" @${ECHO} " The default is operator" @${ECHO} " AMANDA_GROUP=group to specify the default group" @@ -102,9 +98,9 @@ pre-fetch: @${ECHO} " between low and high when connecting from the client" @${ECHO} " to the server. Use ports below 1024." @${ECHO} " The default is no restriction on UDP ports." + @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -USE_PERL5= yes CONFLICTS= amanda-server-2.5.* BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client @@ -112,28 +108,36 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/m CONFIGURE_ARGS+=--without-client +MAN5= disklist.5 \ + tapelist.5 +MAN7= amanda-changers.7 \ + amanda-devices.7 MAN8= amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \ amcheckdb.8 amcheckdump.8 amcleanup.8 \ amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \ - amdd.8 amdevcheck.8 \ + amdevcheck.8 \ amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \ - amlabel.8 ammt.8 \ + amlabel.8 \ amoverview.8 amreport.8 amrestore.8 amrmtape.8 \ - amserverconfig.8 amstatus.8 \ - amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8 + amserverconfig.8 amservice.8 amstatus.8 \ + amtape.8 amtoc.8 amtapetype.8 \ + amvault.8 OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\ SAMBA "enable the use of smbclient" off \ MTX "enable the use of mtx changer scripts" off \ - AESPIPE "enable encryption. Needed by amcrypt" off + AESPIPE "enable encryption. Needed by amcrypt" off \ + S3 "enable Amazon S3 device support" off .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot MAN8+= amplot.8 PLIST_SUB+= PLOT='' +CONFIGURE_ARGS+= --with-gnuplot=${LOCALBASE}/bin/gnuplot .else PLIST_SUB+= PLOT='@comment ' +CONFIGURE_ARGS+= --without-gnuplot .endif .if defined (WITH_SAMBA) @@ -149,6 +153,17 @@ RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx .if defined (WITH_AESPIPE) RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipe +.else +.endif + +# If configure founds libcurl, automatically enabled it (with plist change). +.if defined(WITH_S3) +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +CONFIGURE_ARGS+= --enable-s3-device +PLIST_SUB+= S3DEVICE='' +.else +CONFIGURE_ARGS+= --disable-s3-device +PLIST_SUB+= S3DEVICE='@comment ' .endif .if defined (AMANDA_TAPE) @@ -165,10 +180,10 @@ pre-fetch: @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_CONFIG=config to specify the default configuation" - @${ECHO} " The default is user" + @${ECHO} " The default is DailySet1" @${ECHO} " AMANDA_GNUTAR_LISTDIR=dir to specify the directory that" @${ECHO} " the gnutar index files should live in" - @${ECHO} " The default is /var/amanda/gnutar-lists" + @${ECHO} " The default is ${PREFIX}/var/amanda/gnutar-lists" @${ECHO} " AMANDA_USER=user to specify the default user" @${ECHO} " The default is operator" @${ECHO} " AMANDA_GROUP=group to specify the default group" @@ -184,36 +199,52 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" +OPTIONS+= ZFSCOMP "accurate estimation of compressed ZFS filesystems" off + CONFLICTS= amanda-client-2.5.* CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES} -MAN5= amanda.conf.5 amanda-client.conf.5 -MAN8= amanda.8 amrecover.8 - -OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" off +MAN5= amanda-archive-format.5 \ + amanda-client.conf.5 \ + amanda.conf.5 +MAN7= amanda-applications.7 \ + amanda-auth.7 \ + amanda-scripts.7 +MAN8= amanda.8 \ + amarchiver.8 \ + amgtar.8 \ + amrecover.8 \ + amsamba.8 \ + amstar.8 \ + amzfs-sendrecv.8 \ + amzfs-snapshot.8 \ + script-email.8 post-install: - ${MKDIR} ${PREFIX}/share/examples/amanda - ${CP} -R ${WRKSRC}/example/amanda.conf \ - ${WRKSRC}/example/chg-multi.conf \ +.ifndef(NOPORTDOCS) + ${MKDIR} ${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/example/chg-multi.conf \ ${WRKSRC}/example/chg-scsi.conf \ ${WRKSRC}/example/disklist \ - ${PREFIX}/share/examples/amanda + ${EXAMPLESDIR} +.endif ${MKDIR} ${AMANDA_GNUTAR_LISTDIR} ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR} ${TOUCH} ${AMANDA_DATES} ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES} -.if defined (WITH_DUMP_SNAPSHOT) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c .endif +.if defined(WITH_ZFSCOMP) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-application-src::amzfs-sendrecv.pl .endif +# MEMO: +# Prefix @WANT_SERVER_TRUE@ for server only files. +# Prefix @WANT_CLIENT_TRUE@ for client only files. # Maintainer TODO: -# o amanda-server installs lib/libamandad.a which should be handled by -# amanda-client only. -# o man pages have incorrect markups. +# o amanda-server installs libexec/amanda/amandad, sbin/amarchiver +# which should be handled by amanda-client only. # o pthread issue: http://wiki.zmanda.com/index.php/Installation/OS_Specific_Notes/Installing_Amanda_on_FreeBSD#Threading_and_-pthread .include <bsd.port.post.mk> diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo index dba0b6f..07347bd 100644 --- a/misc/amanda-server/distinfo +++ b/misc/amanda-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.6.0p2.tar.gz) = 75dcba5a75327ebcd4f197a93b8e8c9c -SHA256 (amanda-2.6.0p2.tar.gz) = 3830d9c95cfe72e63aea5179208851a141481b037ec4060bf3d5829bf50e6ae3 -SIZE (amanda-2.6.0p2.tar.gz) = 2402088 +MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40 +SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ff +SIZE (amanda-2.6.1.tar.gz) = 2850868 diff --git a/misc/amanda-server/files/extra-patch-sendbackup-dump.c b/misc/amanda-server/files/extra-patch-sendbackup-dump.c index 79764a1..3a232d1 100644 --- a/misc/amanda-server/files/extra-patch-sendbackup-dump.c +++ b/misc/amanda-server/files/extra-patch-sendbackup-dump.c @@ -1,5 +1,5 @@ ---- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006 -+++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006 +--- client-src/sendbackup-dump.c.orig 2008-12-13 04:18:11.000000000 +0900 ++++ client-src/sendbackup-dump.c 2009-01-27 07:30:40.000000000 +0900 @@ -35,6 +35,10 @@ #include "clock.h" #include "version.h" @@ -11,26 +11,13 @@ #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" static amregex_t re_table[] = { -@@ -370,6 +374,12 @@ - - dumpkeys = vstralloc(level_str, - options->no_record ? "" : "u", -+#ifdef __FreeBSD__ -+ "b", -+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) -+ "L", -+#endif -+#endif - "s", - #ifdef HAVE_HONOR_NODUMP - "h", -@@ -392,6 +402,9 @@ - &dumpin, &dumpout, &mesgf, - cmd, config, +@@ -310,6 +314,9 @@ + cmdX, config, + "vxdump", dumpkeys, +#ifdef __FreeBSD__ + "64", +#endif "1048576", - #ifdef HAVE_HONOR_NODUMP - "0", + "-", + device, diff --git a/misc/amanda-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda-server/files/patch-chg-zd-mtx.sh.in deleted file mode 100644 index 589218b..0000000 --- a/misc/amanda-server/files/patch-chg-zd-mtx.sh.in +++ /dev/null @@ -1,20 +0,0 @@ ---- changer-src/chg-zd-mtx.sh.orig 2008-05-27 02:25:32.000000000 +0900 -+++ changer-src/chg-zd-mtx.sh 2009-01-05 07:34:15.000000000 +0900 -@@ -411,7 +411,7 @@ - - IsNumeric() { - test -z "$1" && return 1 -- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`" -+ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`" - return `expr X"$1" != X"$x"` - } - -@@ -797,7 +797,7 @@ - max_drive_wait=${max_drive_wait:-'120'} # default: two minutes - - # check MT and MTX for sanity --if test "${MTX:0:1}" = "/"; then -+if test "${MTX%${MTX#?}}" = "/"; then - if ! test -f "${MTX}"; then - Exit 2 \ - `_ '<none>'` \ diff --git a/misc/amanda-server/files/patch-common-src::Makefile.in b/misc/amanda-server/files/patch-common-src::Makefile.in index 099a8ff..0f26a0f 100644 --- a/misc/amanda-server/files/patch-common-src::Makefile.in +++ b/misc/amanda-server/files/patch-common-src::Makefile.in @@ -1,21 +1,22 @@ ---- common-src/Makefile.in.orig 2008-08-23 03:20:00.000000000 +0900 -+++ common-src/Makefile.in 2008-09-01 07:42:20.000000000 +0900 -@@ -926,12 +926,14 @@ +--- common-src/Makefile.in.orig 2009-01-22 22:51:24.000000000 +0900 ++++ common-src/Makefile.in 2009-01-27 07:25:59.000000000 +0900 +@@ -1074,6 +1074,7 @@ + sbin_SCRIPTS_PERL = \ - amgpgcrypt \ - amcryptsimple + $(sbin_CHECK_PERL) +@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL = - sbin_SCRIPTS_SHELL = \ - amcrypt \ + amlibexec_CHECK_PERL = + amlibexec_SCRIPTS_PERL = \ +@@ -1084,6 +1085,7 @@ amaespipe \ amcrypt-ossl \ amcrypt-ossl-asym +@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL = - amlibexec_SCRIPTS_PERL = + amlibexec_SCRIPTS_SHELL = SCRIPTS_INCLUDE = \ -@@ -985,15 +987,15 @@ +@@ -1137,15 +1139,15 @@ versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES) @@ -24,8 +25,8 @@ - @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ - else :; fi; \ - done +@WANT_CLIENT_TRUE@ @$(NORMAL_INSTALL) @@ -33,8 +34,8 @@ +@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ +@WANT_CLIENT_TRUE@ if test -f $$p; then \ +@WANT_CLIENT_TRUE@ f=$(am__strip_dir) \ -+@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ -+@WANT_CLIENT_TRUE@ $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ ++@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ ++@WANT_CLIENT_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ +@WANT_CLIENT_TRUE@ else :; fi; \ +@WANT_CLIENT_TRUE@ done diff --git a/misc/amanda-server/files/patch-man::Makefile.in b/misc/amanda-server/files/patch-man::Makefile.in index 5f44834..daeea07 100644 --- a/misc/amanda-server/files/patch-man::Makefile.in +++ b/misc/amanda-server/files/patch-man::Makefile.in @@ -1,10 +1,10 @@ ---- man/Makefile.in.orig 2008-08-31 22:27:26.000000000 +0900 -+++ man/Makefile.in 2008-08-31 22:27:46.000000000 +0900 -@@ -565,6 +565,7 @@ - COMMON_MAN_PAGES = amanda.8 \ - amanda.conf.5 \ - amanda-client.conf.5 +--- man/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 ++++ man/Makefile.in 2009-01-27 07:27:10.000000000 +0900 +@@ -640,6 +640,7 @@ + amanda-auth.7 \ + amarchiver.8 \ + script-email.8 +@WANT_SERVER_TRUE@COMMON_MAN_PAGES = - SERVER_MAN_PAGES = amadmin.8 \ - amcheck.8 \ + CLIENT_MAN_PAGES = \ + amanda-applications.7 \ diff --git a/misc/amanda-server/files/patch-perl::Makefile.in b/misc/amanda-server/files/patch-perl::Makefile.in index 49f6a8c..b32626c 100644 --- a/misc/amanda-server/files/patch-perl::Makefile.in +++ b/misc/amanda-server/files/patch-perl::Makefile.in @@ -1,6 +1,19 @@ ---- perl/Makefile.in.orig 2008-08-23 03:20:01.000000000 +0900 -+++ perl/Makefile.in 2008-09-02 07:36:59.000000000 +0900 -@@ -291,15 +291,15 @@ +--- perl/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 ++++ perl/Makefile.in 2009-01-27 16:15:23.000000000 +0900 +@@ -316,9 +316,9 @@ + $(libApplication_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_CLIENT_TRUE@am_libApplication_la_rpath = -rpath \ + @WANT_CLIENT_TRUE@ $(libApplicationdir) +-libArchive_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/amar-src/libamar.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libArchive_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/amar-src/libamar.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libArchive_la_OBJECTS = Archive.lo $(am__objects_1) + libArchive_la_OBJECTS = $(am_libArchive_la_OBJECTS) + libArchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -337,15 +337,15 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@ @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir) @@ -20,10 +33,30 @@ am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1) libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS) libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -343,22 +343,22 @@ +@@ -376,8 +376,8 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libLogfile_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_SERVER_TRUE@am_libLogfile_la_rpath = -rpath $(libLogfiledir) +-libMainLoop_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libMainLoop_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libMainLoop_la_OBJECTS = MainLoop.lo $(am__objects_1) + libMainLoop_la_OBJECTS = $(am_libMainLoop_la_OBJECTS) + libMainLoop_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -396,23 +396,23 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libTapefile_la_LDFLAGS) $(LDFLAGS) -o $@ - @WANT_SERVER_TRUE@am_libTapefile_la_rpath = -rpath $(libTapefiledir) + $(libTapelist_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_SERVER_TRUE@am_libTapelist_la_rpath = -rpath $(libTapelistdir) +-libTests_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libTests_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libTests_la_OBJECTS = Tests.lo $(am__objects_1) + libTests_la_OBJECTS = $(am_libTests_la_OBJECTS) + libTests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libTests_la_LDFLAGS) $(LDFLAGS) -o $@ -libTypes_la_DEPENDENCIES = libamglue.la \ - $(top_builddir)/common-src/libamanda.la +@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \ @@ -42,14 +75,31 @@ libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS) libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@ - libamglue_la_LIBADD = --am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo -+@WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo - libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS) - libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -914,39 +914,39 @@ +@@ -984,7 +984,8 @@ + $(am__append_2) $(am__append_3) $(am__append_4) + + # (amplot has a conditional, but doesn't have any header files) +-amlib_LTLIBRARIES = libamglue.la ++@WANT_SERVER_TRUE@amlib_LTLIBRARIES = ++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamglue.la + libamglue_la_SOURCES = \ + amglue/ghashtable.c \ + amglue/bigint.c \ +@@ -1042,10 +1043,11 @@ + Amanda/Types.pm Amanda/Tests.pm Amanda/MainLoop.pm \ + Amanda/Paths.pm Amanda/Constants.pm Amanda/Script_App.pm \ + $(am__append_8) Amanda/Script.pm ++@WANT_SERVER_TRUE@Amanda_DATA = $(am__append_5) + + # PACKAGE: Amanda::Archive +-libArchivedir = $(amperldir)/auto/Amanda/Archive +-libArchive_LTLIBRARIES = libArchive.la ++@WANT_CLIENT_TRUE@libArchivedir = $(amperldir)/auto/Amanda/Archive ++@WANT_CLIENT_TRUE@libArchive_LTLIBRARIES = libArchive.la + libArchive_la_SOURCES = Amanda/Archive.c $(AMGLUE_SWG) + libArchive_la_LDFLAGS = $(PERL_EXT_LDFLAGS) + libArchive_la_LIBADD = libamglue.la \ +@@ -1118,57 +1120,57 @@ # PACKAGE: Amanda::Debug @@ -112,4 +162,34 @@ +@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - # perl doesn't use the cyg prefix and it doesn't search in the bin + # PACKAGE: Amanda::Tests +-libTestsdir = $(amperldir)/auto/Amanda/Tests +-libTests_LTLIBRARIES = libTests.la +-libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) +-libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libTests_la_LIBADD = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libTestsdir = $(amperldir)/auto/Amanda/Tests ++@WANT_CLIENT_TRUE@libTests_LTLIBRARIES = libTests.la ++@WANT_CLIENT_TRUE@libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) ++@WANT_CLIENT_TRUE@libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) ++@WANT_CLIENT_TRUE@libTests_la_LIBADD = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + + + # PACKAGE: Amanda::MainLoop +-libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop +-libMainLoop_LTLIBRARIES = libMainLoop.la +-libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) +-libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libMainLoop_la_LIBADD = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop ++@WANT_CLIENT_TRUE@libMainLoop_LTLIBRARIES = libMainLoop.la ++@WANT_CLIENT_TRUE@libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) ++@WANT_CLIENT_TRUE@libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) ++@WANT_CLIENT_TRUE@libMainLoop_la_LIBADD = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + + + # PACKAGE: Amanda::Application diff --git a/misc/amanda-server/files/patch-server-src::amcleanup.sh b/misc/amanda-server/files/patch-server-src::amcleanup.sh deleted file mode 100644 index f566f64..0000000 --- a/misc/amanda-server/files/patch-server-src::amcleanup.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/amcleanup.sh.orig 2009-01-05 07:37:09.000000000 +0900 -+++ server-src/amcleanup.sh 2009-01-05 07:37:26.000000000 +0900 -@@ -75,7 +75,7 @@ - # after receiving SIGTERM, if yes send SIGKILL - # - --function killpid() { -+killpid() { - - killPID=$1 - SIGTERM=15 diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist index 9fc973b..f18f1c8 100644 --- a/misc/amanda-server/pkg-plist +++ b/misc/amanda-server/pkg-plist @@ -6,19 +6,25 @@ lib/amanda/libamserver-%%SHLIBVER%%.so lib/amanda/libamserver.a lib/amanda/libamserver.la lib/amanda/libamserver.so -lib/amanda/libamtape-%%SHLIBVER%%.so -lib/amanda/libamtape.a -lib/amanda/libamtape.la -lib/amanda/libamtape.so +lib/amanda/libamxfer.a +lib/amanda/libamxfer.la +lib/amanda/libamxfer.so +lib/amanda/libamxfer.so.0 lib/amanda/librestore-%%SHLIBVER%%.so lib/amanda/librestore.a lib/amanda/librestore.la lib/amanda/librestore.so %%SITE_PERL%%/Amanda/Changer.pm +%%SITE_PERL%%/Amanda/Changer/compat.pm +%%SITE_PERL%%/Amanda/Changer/disk.pm +%%SITE_PERL%%/Amanda/Changer/single.pm %%SITE_PERL%%/Amanda/Cmdline.pm +%%SITE_PERL%%/Amanda/DB/Catalog.pm %%SITE_PERL%%/Amanda/Device.pm %%SITE_PERL%%/Amanda/Logfile.pm -%%SITE_PERL%%/Amanda/Tapefile.pm +%%SITE_PERL%%/Amanda/Process.pm +%%SITE_PERL%%/Amanda/Tapelist.pm +%%SITE_PERL%%/Amanda/Xfer.pm %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so @@ -28,9 +34,12 @@ lib/amanda/librestore.so %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.a -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.la -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.so +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.a +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.la +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.a +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so %%PLOT%%libexec/amanda/amcat.awk libexec/amanda/amcleanupdisk libexec/amanda/amindexd @@ -43,6 +52,7 @@ libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-disk +libexec/amanda/chg-glue libexec/amanda/chg-iomega libexec/amanda/chg-juke libexec/amanda/chg-lib.sh @@ -60,34 +70,35 @@ libexec/amanda/driver libexec/amanda/dumper libexec/amanda/planner libexec/amanda/taper +%%S3DEVICE%%sbin/activate-devpay sbin/amaddclient sbin/amadmin sbin/amcheck sbin/amcheckdb sbin/amcheckdump sbin/amcleanup -sbin/amdd sbin/amdevcheck sbin/amdump sbin/amfetchdump sbin/amflush -sbin/amgetconf sbin/amlabel -sbin/ammt sbin/amoverview %%PLOT%%sbin/amplot sbin/amreport sbin/amrestore sbin/amrmtape sbin/amserverconfig +sbin/amservice sbin/amstatus sbin/amtape sbin/amtapetype sbin/amtoc -sbin/amverify -sbin/amverifyrun +sbin/amvault @dirrm %%SITE_PERL%%/auto/Amanda/Cmdline @dirrm %%SITE_PERL%%/auto/Amanda/Device @dirrm %%SITE_PERL%%/auto/Amanda/Logfile -@dirrm %%SITE_PERL%%/auto/Amanda/Tapefile +@dirrm %%SITE_PERL%%/auto/Amanda/Tapelist +@dirrm %%SITE_PERL%%/auto/Amanda/Xfer +@dirrm %%SITE_PERL%%/Amanda/DB +@dirrm %%SITE_PERL%%/Amanda/Changer @dirrm include/amanda diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client index a061aee..428adc9 100644 --- a/misc/amanda-server/pkg-plist.client +++ b/misc/amanda-server/pkg-plist.client @@ -1,4 +1,3 @@ -@unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fi lib/amanda/libamanda-%%SHLIBVER%%.so lib/amanda/libamanda.a lib/amanda/libamanda.la @@ -7,6 +6,10 @@ lib/amanda/libamandad-%%SHLIBVER%%.so lib/amanda/libamandad.a lib/amanda/libamandad.la lib/amanda/libamandad.so +lib/amanda/libamar-%%SHLIBVER%%.so +lib/amanda/libamar.a +lib/amanda/libamar.la +lib/amanda/libamar.so lib/amanda/libamclient-%%SHLIBVER%%.so lib/amanda/libamclient.a lib/amanda/libamclient.la @@ -17,7 +20,13 @@ lib/amanda/libamglue.so libexec/amanda/amanda-sh-lib.sh libexec/amanda/amandad libexec/amanda/application/amgtar -libexec/amanda/application/generic-dumper +libexec/amanda/application/amgtar_perl +libexec/amanda/application/amlog-script +libexec/amanda/application/amsamba +libexec/amanda/application/amstar +libexec/amanda/application/amzfs-sendrecv +libexec/amanda/application/amzfs-snapshot +libexec/amanda/application/script-email libexec/amanda/calcsize libexec/amanda/killpgrp libexec/amanda/noop @@ -27,18 +36,40 @@ libexec/amanda/runtar libexec/amanda/selfcheck libexec/amanda/sendbackup libexec/amanda/sendsize +libexec/amanda/teecount libexec/amanda/versionsuffix +%%SITE_PERL%%/Amanda/Application.pm +%%SITE_PERL%%/Amanda/Application/Zfs.pm +%%SITE_PERL%%/Amanda/Archive.pm +%%SITE_PERL%%/Amanda/BigIntCompat.pm %%SITE_PERL%%/Amanda/Config.pm +%%SITE_PERL%%/Amanda/Constants.pm %%SITE_PERL%%/Amanda/Debug.pm +%%SITE_PERL%%/Amanda/MainLoop.pm %%SITE_PERL%%/Amanda/Paths.pm +%%SITE_PERL%%/Amanda/Script.pm +%%SITE_PERL%%/Amanda/Script_App.pm +%%SITE_PERL%%/Amanda/Tests.pm %%SITE_PERL%%/Amanda/Types.pm %%SITE_PERL%%/Amanda/Util.pm +%%SITE_PERL%%/auto/Amanda/Application/libApplication.a +%%SITE_PERL%%/auto/Amanda/Application/libApplication.la +%%SITE_PERL%%/auto/Amanda/Application/libApplication.so +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.a +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.la +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so %%SITE_PERL%%/auto/Amanda/Config/libConfig.a %%SITE_PERL%%/auto/Amanda/Config/libConfig.la %%SITE_PERL%%/auto/Amanda/Config/libConfig.so %%SITE_PERL%%/auto/Amanda/Debug/libDebug.a %%SITE_PERL%%/auto/Amanda/Debug/libDebug.la %%SITE_PERL%%/auto/Amanda/Debug/libDebug.so +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.a +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so +%%SITE_PERL%%/auto/Amanda/Tests/libTests.a +%%SITE_PERL%%/auto/Amanda/Tests/libTests.la +%%SITE_PERL%%/auto/Amanda/Tests/libTests.so %%SITE_PERL%%/auto/Amanda/Types/libTypes.a %%SITE_PERL%%/auto/Amanda/Types/libTypes.la %%SITE_PERL%%/auto/Amanda/Types/libTypes.so @@ -46,58 +77,60 @@ libexec/amanda/versionsuffix %%SITE_PERL%%/auto/Amanda/Util/libUtil.la %%SITE_PERL%%/auto/Amanda/Util/libUtil.so sbin/amaespipe +sbin/amarchiver sbin/amcrypt sbin/amcrypt-ossl sbin/amcrypt-ossl-asym sbin/amcryptsimple +sbin/amgetconf sbin/amgpgcrypt sbin/amoldrecover sbin/amrecover -share/amanda/COPYRIGHT -share/amanda/ChangeLog -share/amanda/NEWS -share/amanda/ReleaseNotes -share/examples/amanda/amanda.conf -share/examples/amanda/chg-multi.conf -share/examples/amanda/chg-scsi.conf -share/examples/amanda/disklist -var/lib/amanda/example/amanda-client.conf -var/lib/amanda/example/amanda.conf -var/lib/amanda/example/inetd.conf.amandaclient -var/lib/amanda/example/label-templates/3hole.ps -var/lib/amanda/example/label-templates/8.5x11.ps -var/lib/amanda/example/label-templates/DIN-A4.ps -var/lib/amanda/example/label-templates/DLT-A4.ps -var/lib/amanda/example/label-templates/DLT.ps -var/lib/amanda/example/label-templates/EXB-8500.ps -var/lib/amanda/example/label-templates/HP-DAT.ps -var/lib/amanda/example/xinetd.amandaclient -var/lib/amanda/example/xinetd.amandaserver -var/lib/amanda/template.d/README -var/lib/amanda/template.d/advanced.conf -var/lib/amanda/template.d/amanda-S3.conf -var/lib/amanda/template.d/amanda-harddisk.conf -var/lib/amanda/template.d/amanda-single-tape.conf -var/lib/amanda/template.d/amanda-tape-changer.conf -var/lib/amanda/template.d/chg-manual.conf -var/lib/amanda/template.d/dumptypes -var/lib/amanda/template.d/tapetypes +%%DATADIR%%/COPYRIGHT +%%DATADIR%%/ChangeLog +%%DATADIR%%/NEWS +%%DATADIR%%/ReleaseNotes +%%PORTDOCS%%%%EXAMPLESDIR%%/disklist +%%PORTDOCS%%%%EXAMPLESDIR%%/chg-scsi.conf +%%PORTDOCS%%%%EXAMPLESDIR%%/chg-multi.conf +%%DATADIR%%/example/amanda.conf +%%DATADIR%%/example/amanda-client.conf +%%DATADIR%%/example/inetd.conf.amandaclient +%%DATADIR%%/example/inetd.conf.amandaserver +%%DATADIR%%/example/label-templates/3hole.ps +%%DATADIR%%/example/label-templates/8.5x11.ps +%%DATADIR%%/example/label-templates/DIN-A4.ps +%%DATADIR%%/example/label-templates/DLT-A4.ps +%%DATADIR%%/example/label-templates/DLT.ps +%%DATADIR%%/example/label-templates/EXB-8500.ps +%%DATADIR%%/example/label-templates/HP-DAT.ps +%%DATADIR%%/example/xinetd.amandaclient +%%DATADIR%%/example/xinetd.amandaserver +%%DATADIR%%/template.d/advanced.conf +%%DATADIR%%/template.d/amanda-harddisk.conf +%%DATADIR%%/template.d/amanda-single-tape.conf +%%DATADIR%%/template.d/amanda-tape-changer.conf +%%DATADIR%%/template.d/amanda-S3.conf +%%DATADIR%%/template.d/dumptypes +%%DATADIR%%/template.d/tapetypes +%%DATADIR%%/template.d/README +%%DATADIR%%/template.d/chg-manual.conf @dirrm %%SITE_PERL%%/auto/Amanda/Util @dirrm %%SITE_PERL%%/auto/Amanda/Types +@dirrm %%SITE_PERL%%/auto/Amanda/Tests +@dirrm %%SITE_PERL%%/auto/Amanda/MainLoop @dirrm %%SITE_PERL%%/auto/Amanda/Debug @dirrm %%SITE_PERL%%/auto/Amanda/Config +@dirrm %%SITE_PERL%%/auto/Amanda/Archive +@dirrm %%SITE_PERL%%/auto/Amanda/Application @dirrm %%SITE_PERL%%/auto/Amanda +@dirrm %%SITE_PERL%%/Amanda/Application @dirrm %%SITE_PERL%%/Amanda -@dirrm var/lib/amanda/template.d -@dirrm var/lib/amanda/example/label-templates -@dirrm var/lib/amanda/example -@dirrm var/lib/amanda -@dirrmtry var/lib -@dirrmtry var/amanda/gnutar-lists -@dirrmtry var/amanda -@dirrmtry var -@dirrm share/examples/amanda -@dirrm share/amanda +@dirrm %%DATADIR%%/template.d +@dirrm %%DATADIR%%/example/label-templates +@dirrm %%DATADIR%%/example +@dirrm %%DATADIR%% @dirrm libexec/amanda/application @dirrm libexec/amanda @dirrm lib/amanda +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile index 4e059af..03f4f04 100644 --- a/misc/amanda26-client/Makefile +++ b/misc/amanda26-client/Makefile @@ -6,7 +6,6 @@ # PKGNAMESUFFIX= -client -PORTREVISION= 1 COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile index 070b4ab..0240b86 100644 --- a/misc/amanda26-server/Makefile +++ b/misc/amanda26-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amanda -PORTVERSION= 2.6.0p2 +PORTVERSION= 2.6.1 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,24 +29,24 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --without-amlibexecdir \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ - --disable-libtool --prefix=${PREFIX} \ + --prefix=${PREFIX} \ --disable-glibtest \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-bsdtcp-security --with-bsdudp-security + --with-bsdtcp-security --with-bsdudp-security \ + --with-ssh-security USE_LDCONFIG= yes -WANT_PERL= yes +USE_PERL5= yes -OPTIONS= GNUTAR "use GNU tar" on \ - SSH "enable ssh-auth" off +OPTIONS= GNUTAR "use GNU tar" on .include <bsd.port.pre.mk> AMANDA_USER?= operator AMANDA_GROUP?= operator AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists -AMANDA_DATES?= ${PREFIX}/var/amanda/amandadates -PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadates +AMANDA_DATES?= ${PREFIX}/var/amanda/amandates +PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${AMANDA_DATES} # amanda-server/amanda-client common part .if defined (AMANDA_SERVER) @@ -62,10 +62,6 @@ CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} .endif -.if defined (WITH_SSH) -CONFIGURE_ARGS+= --with-ssh-security -.endif - .if defined (AMANDA_TCPPORTRANGE) CONFIGURE_ARGS+= --with-tcpportrange=${AMANDA_TCPPORTRANGE} .endif @@ -89,7 +85,7 @@ pre-fetch: @${ECHO} " AMANDA_TAPE=tape to specify the default tape device" @${ECHO} " The default is /dev/nrsa0" @${ECHO} " AMANDA_CONFIG=config to specify the default configuration" - @${ECHO} " The default is user" + @${ECHO} " The default is DailySet1" @${ECHO} " AMANDA_USER=user to specify the default user" @${ECHO} " The default is operator" @${ECHO} " AMANDA_GROUP=group to specify the default group" @@ -102,9 +98,9 @@ pre-fetch: @${ECHO} " between low and high when connecting from the client" @${ECHO} " to the server. Use ports below 1024." @${ECHO} " The default is no restriction on UDP ports." + @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -USE_PERL5= yes CONFLICTS= amanda-server-2.5.* BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client @@ -112,28 +108,36 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/m CONFIGURE_ARGS+=--without-client +MAN5= disklist.5 \ + tapelist.5 +MAN7= amanda-changers.7 \ + amanda-devices.7 MAN8= amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \ amcheckdb.8 amcheckdump.8 amcleanup.8 \ amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \ - amdd.8 amdevcheck.8 \ + amdevcheck.8 \ amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \ - amlabel.8 ammt.8 \ + amlabel.8 \ amoverview.8 amreport.8 amrestore.8 amrmtape.8 \ - amserverconfig.8 amstatus.8 \ - amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8 + amserverconfig.8 amservice.8 amstatus.8 \ + amtape.8 amtoc.8 amtapetype.8 \ + amvault.8 OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\ SAMBA "enable the use of smbclient" off \ MTX "enable the use of mtx changer scripts" off \ - AESPIPE "enable encryption. Needed by amcrypt" off + AESPIPE "enable encryption. Needed by amcrypt" off \ + S3 "enable Amazon S3 device support" off .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot MAN8+= amplot.8 PLIST_SUB+= PLOT='' +CONFIGURE_ARGS+= --with-gnuplot=${LOCALBASE}/bin/gnuplot .else PLIST_SUB+= PLOT='@comment ' +CONFIGURE_ARGS+= --without-gnuplot .endif .if defined (WITH_SAMBA) @@ -149,6 +153,17 @@ RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx .if defined (WITH_AESPIPE) RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipe +.else +.endif + +# If configure founds libcurl, automatically enabled it (with plist change). +.if defined(WITH_S3) +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +CONFIGURE_ARGS+= --enable-s3-device +PLIST_SUB+= S3DEVICE='' +.else +CONFIGURE_ARGS+= --disable-s3-device +PLIST_SUB+= S3DEVICE='@comment ' .endif .if defined (AMANDA_TAPE) @@ -165,10 +180,10 @@ pre-fetch: @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_CONFIG=config to specify the default configuation" - @${ECHO} " The default is user" + @${ECHO} " The default is DailySet1" @${ECHO} " AMANDA_GNUTAR_LISTDIR=dir to specify the directory that" @${ECHO} " the gnutar index files should live in" - @${ECHO} " The default is /var/amanda/gnutar-lists" + @${ECHO} " The default is ${PREFIX}/var/amanda/gnutar-lists" @${ECHO} " AMANDA_USER=user to specify the default user" @${ECHO} " The default is operator" @${ECHO} " AMANDA_GROUP=group to specify the default group" @@ -184,36 +199,52 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" +OPTIONS+= ZFSCOMP "accurate estimation of compressed ZFS filesystems" off + CONFLICTS= amanda-client-2.5.* CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES} -MAN5= amanda.conf.5 amanda-client.conf.5 -MAN8= amanda.8 amrecover.8 - -OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" off +MAN5= amanda-archive-format.5 \ + amanda-client.conf.5 \ + amanda.conf.5 +MAN7= amanda-applications.7 \ + amanda-auth.7 \ + amanda-scripts.7 +MAN8= amanda.8 \ + amarchiver.8 \ + amgtar.8 \ + amrecover.8 \ + amsamba.8 \ + amstar.8 \ + amzfs-sendrecv.8 \ + amzfs-snapshot.8 \ + script-email.8 post-install: - ${MKDIR} ${PREFIX}/share/examples/amanda - ${CP} -R ${WRKSRC}/example/amanda.conf \ - ${WRKSRC}/example/chg-multi.conf \ +.ifndef(NOPORTDOCS) + ${MKDIR} ${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/example/chg-multi.conf \ ${WRKSRC}/example/chg-scsi.conf \ ${WRKSRC}/example/disklist \ - ${PREFIX}/share/examples/amanda + ${EXAMPLESDIR} +.endif ${MKDIR} ${AMANDA_GNUTAR_LISTDIR} ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR} ${TOUCH} ${AMANDA_DATES} ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES} -.if defined (WITH_DUMP_SNAPSHOT) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c .endif +.if defined(WITH_ZFSCOMP) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-application-src::amzfs-sendrecv.pl .endif +# MEMO: +# Prefix @WANT_SERVER_TRUE@ for server only files. +# Prefix @WANT_CLIENT_TRUE@ for client only files. # Maintainer TODO: -# o amanda-server installs lib/libamandad.a which should be handled by -# amanda-client only. -# o man pages have incorrect markups. +# o amanda-server installs libexec/amanda/amandad, sbin/amarchiver +# which should be handled by amanda-client only. # o pthread issue: http://wiki.zmanda.com/index.php/Installation/OS_Specific_Notes/Installing_Amanda_on_FreeBSD#Threading_and_-pthread .include <bsd.port.post.mk> diff --git a/misc/amanda26-server/distinfo b/misc/amanda26-server/distinfo index dba0b6f..07347bd 100644 --- a/misc/amanda26-server/distinfo +++ b/misc/amanda26-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.6.0p2.tar.gz) = 75dcba5a75327ebcd4f197a93b8e8c9c -SHA256 (amanda-2.6.0p2.tar.gz) = 3830d9c95cfe72e63aea5179208851a141481b037ec4060bf3d5829bf50e6ae3 -SIZE (amanda-2.6.0p2.tar.gz) = 2402088 +MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40 +SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ff +SIZE (amanda-2.6.1.tar.gz) = 2850868 diff --git a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c index 79764a1..3a232d1 100644 --- a/misc/amanda26-server/files/extra-patch-sendbackup-dump.c +++ b/misc/amanda26-server/files/extra-patch-sendbackup-dump.c @@ -1,5 +1,5 @@ ---- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006 -+++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006 +--- client-src/sendbackup-dump.c.orig 2008-12-13 04:18:11.000000000 +0900 ++++ client-src/sendbackup-dump.c 2009-01-27 07:30:40.000000000 +0900 @@ -35,6 +35,10 @@ #include "clock.h" #include "version.h" @@ -11,26 +11,13 @@ #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" static amregex_t re_table[] = { -@@ -370,6 +374,12 @@ - - dumpkeys = vstralloc(level_str, - options->no_record ? "" : "u", -+#ifdef __FreeBSD__ -+ "b", -+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) -+ "L", -+#endif -+#endif - "s", - #ifdef HAVE_HONOR_NODUMP - "h", -@@ -392,6 +402,9 @@ - &dumpin, &dumpout, &mesgf, - cmd, config, +@@ -310,6 +314,9 @@ + cmdX, config, + "vxdump", dumpkeys, +#ifdef __FreeBSD__ + "64", +#endif "1048576", - #ifdef HAVE_HONOR_NODUMP - "0", + "-", + device, diff --git a/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in deleted file mode 100644 index 589218b..0000000 --- a/misc/amanda26-server/files/patch-chg-zd-mtx.sh.in +++ /dev/null @@ -1,20 +0,0 @@ ---- changer-src/chg-zd-mtx.sh.orig 2008-05-27 02:25:32.000000000 +0900 -+++ changer-src/chg-zd-mtx.sh 2009-01-05 07:34:15.000000000 +0900 -@@ -411,7 +411,7 @@ - - IsNumeric() { - test -z "$1" && return 1 -- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`" -+ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`" - return `expr X"$1" != X"$x"` - } - -@@ -797,7 +797,7 @@ - max_drive_wait=${max_drive_wait:-'120'} # default: two minutes - - # check MT and MTX for sanity --if test "${MTX:0:1}" = "/"; then -+if test "${MTX%${MTX#?}}" = "/"; then - if ! test -f "${MTX}"; then - Exit 2 \ - `_ '<none>'` \ diff --git a/misc/amanda26-server/files/patch-common-src::Makefile.in b/misc/amanda26-server/files/patch-common-src::Makefile.in index 099a8ff..0f26a0f 100644 --- a/misc/amanda26-server/files/patch-common-src::Makefile.in +++ b/misc/amanda26-server/files/patch-common-src::Makefile.in @@ -1,21 +1,22 @@ ---- common-src/Makefile.in.orig 2008-08-23 03:20:00.000000000 +0900 -+++ common-src/Makefile.in 2008-09-01 07:42:20.000000000 +0900 -@@ -926,12 +926,14 @@ +--- common-src/Makefile.in.orig 2009-01-22 22:51:24.000000000 +0900 ++++ common-src/Makefile.in 2009-01-27 07:25:59.000000000 +0900 +@@ -1074,6 +1074,7 @@ + sbin_SCRIPTS_PERL = \ - amgpgcrypt \ - amcryptsimple + $(sbin_CHECK_PERL) +@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL = - sbin_SCRIPTS_SHELL = \ - amcrypt \ + amlibexec_CHECK_PERL = + amlibexec_SCRIPTS_PERL = \ +@@ -1084,6 +1085,7 @@ amaespipe \ amcrypt-ossl \ amcrypt-ossl-asym +@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL = - amlibexec_SCRIPTS_PERL = + amlibexec_SCRIPTS_SHELL = SCRIPTS_INCLUDE = \ -@@ -985,15 +987,15 @@ +@@ -1137,15 +1139,15 @@ versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES) @@ -24,8 +25,8 @@ - @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ - else :; fi; \ - done +@WANT_CLIENT_TRUE@ @$(NORMAL_INSTALL) @@ -33,8 +34,8 @@ +@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ +@WANT_CLIENT_TRUE@ if test -f $$p; then \ +@WANT_CLIENT_TRUE@ f=$(am__strip_dir) \ -+@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ -+@WANT_CLIENT_TRUE@ $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ ++@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ ++@WANT_CLIENT_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ +@WANT_CLIENT_TRUE@ else :; fi; \ +@WANT_CLIENT_TRUE@ done diff --git a/misc/amanda26-server/files/patch-man::Makefile.in b/misc/amanda26-server/files/patch-man::Makefile.in index 5f44834..daeea07 100644 --- a/misc/amanda26-server/files/patch-man::Makefile.in +++ b/misc/amanda26-server/files/patch-man::Makefile.in @@ -1,10 +1,10 @@ ---- man/Makefile.in.orig 2008-08-31 22:27:26.000000000 +0900 -+++ man/Makefile.in 2008-08-31 22:27:46.000000000 +0900 -@@ -565,6 +565,7 @@ - COMMON_MAN_PAGES = amanda.8 \ - amanda.conf.5 \ - amanda-client.conf.5 +--- man/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 ++++ man/Makefile.in 2009-01-27 07:27:10.000000000 +0900 +@@ -640,6 +640,7 @@ + amanda-auth.7 \ + amarchiver.8 \ + script-email.8 +@WANT_SERVER_TRUE@COMMON_MAN_PAGES = - SERVER_MAN_PAGES = amadmin.8 \ - amcheck.8 \ + CLIENT_MAN_PAGES = \ + amanda-applications.7 \ diff --git a/misc/amanda26-server/files/patch-perl::Makefile.in b/misc/amanda26-server/files/patch-perl::Makefile.in index 49f6a8c..b32626c 100644 --- a/misc/amanda26-server/files/patch-perl::Makefile.in +++ b/misc/amanda26-server/files/patch-perl::Makefile.in @@ -1,6 +1,19 @@ ---- perl/Makefile.in.orig 2008-08-23 03:20:01.000000000 +0900 -+++ perl/Makefile.in 2008-09-02 07:36:59.000000000 +0900 -@@ -291,15 +291,15 @@ +--- perl/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 ++++ perl/Makefile.in 2009-01-27 16:15:23.000000000 +0900 +@@ -316,9 +316,9 @@ + $(libApplication_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_CLIENT_TRUE@am_libApplication_la_rpath = -rpath \ + @WANT_CLIENT_TRUE@ $(libApplicationdir) +-libArchive_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/amar-src/libamar.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libArchive_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/amar-src/libamar.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libArchive_la_OBJECTS = Archive.lo $(am__objects_1) + libArchive_la_OBJECTS = $(am_libArchive_la_OBJECTS) + libArchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -337,15 +337,15 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@ @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir) @@ -20,10 +33,30 @@ am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1) libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS) libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -343,22 +343,22 @@ +@@ -376,8 +376,8 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libLogfile_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_SERVER_TRUE@am_libLogfile_la_rpath = -rpath $(libLogfiledir) +-libMainLoop_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libMainLoop_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libMainLoop_la_OBJECTS = MainLoop.lo $(am__objects_1) + libMainLoop_la_OBJECTS = $(am_libMainLoop_la_OBJECTS) + libMainLoop_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -396,23 +396,23 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libTapefile_la_LDFLAGS) $(LDFLAGS) -o $@ - @WANT_SERVER_TRUE@am_libTapefile_la_rpath = -rpath $(libTapefiledir) + $(libTapelist_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_SERVER_TRUE@am_libTapelist_la_rpath = -rpath $(libTapelistdir) +-libTests_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libTests_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libTests_la_OBJECTS = Tests.lo $(am__objects_1) + libTests_la_OBJECTS = $(am_libTests_la_OBJECTS) + libTests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libTests_la_LDFLAGS) $(LDFLAGS) -o $@ -libTypes_la_DEPENDENCIES = libamglue.la \ - $(top_builddir)/common-src/libamanda.la +@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \ @@ -42,14 +75,31 @@ libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS) libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@ - libamglue_la_LIBADD = --am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo -+@WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo - libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS) - libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -914,39 +914,39 @@ +@@ -984,7 +984,8 @@ + $(am__append_2) $(am__append_3) $(am__append_4) + + # (amplot has a conditional, but doesn't have any header files) +-amlib_LTLIBRARIES = libamglue.la ++@WANT_SERVER_TRUE@amlib_LTLIBRARIES = ++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamglue.la + libamglue_la_SOURCES = \ + amglue/ghashtable.c \ + amglue/bigint.c \ +@@ -1042,10 +1043,11 @@ + Amanda/Types.pm Amanda/Tests.pm Amanda/MainLoop.pm \ + Amanda/Paths.pm Amanda/Constants.pm Amanda/Script_App.pm \ + $(am__append_8) Amanda/Script.pm ++@WANT_SERVER_TRUE@Amanda_DATA = $(am__append_5) + + # PACKAGE: Amanda::Archive +-libArchivedir = $(amperldir)/auto/Amanda/Archive +-libArchive_LTLIBRARIES = libArchive.la ++@WANT_CLIENT_TRUE@libArchivedir = $(amperldir)/auto/Amanda/Archive ++@WANT_CLIENT_TRUE@libArchive_LTLIBRARIES = libArchive.la + libArchive_la_SOURCES = Amanda/Archive.c $(AMGLUE_SWG) + libArchive_la_LDFLAGS = $(PERL_EXT_LDFLAGS) + libArchive_la_LIBADD = libamglue.la \ +@@ -1118,57 +1120,57 @@ # PACKAGE: Amanda::Debug @@ -112,4 +162,34 @@ +@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - # perl doesn't use the cyg prefix and it doesn't search in the bin + # PACKAGE: Amanda::Tests +-libTestsdir = $(amperldir)/auto/Amanda/Tests +-libTests_LTLIBRARIES = libTests.la +-libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) +-libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libTests_la_LIBADD = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libTestsdir = $(amperldir)/auto/Amanda/Tests ++@WANT_CLIENT_TRUE@libTests_LTLIBRARIES = libTests.la ++@WANT_CLIENT_TRUE@libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) ++@WANT_CLIENT_TRUE@libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) ++@WANT_CLIENT_TRUE@libTests_la_LIBADD = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + + + # PACKAGE: Amanda::MainLoop +-libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop +-libMainLoop_LTLIBRARIES = libMainLoop.la +-libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) +-libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libMainLoop_la_LIBADD = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop ++@WANT_CLIENT_TRUE@libMainLoop_LTLIBRARIES = libMainLoop.la ++@WANT_CLIENT_TRUE@libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) ++@WANT_CLIENT_TRUE@libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) ++@WANT_CLIENT_TRUE@libMainLoop_la_LIBADD = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + + + # PACKAGE: Amanda::Application diff --git a/misc/amanda26-server/files/patch-server-src::amcleanup.sh b/misc/amanda26-server/files/patch-server-src::amcleanup.sh deleted file mode 100644 index f566f64..0000000 --- a/misc/amanda26-server/files/patch-server-src::amcleanup.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/amcleanup.sh.orig 2009-01-05 07:37:09.000000000 +0900 -+++ server-src/amcleanup.sh 2009-01-05 07:37:26.000000000 +0900 -@@ -75,7 +75,7 @@ - # after receiving SIGTERM, if yes send SIGKILL - # - --function killpid() { -+killpid() { - - killPID=$1 - SIGTERM=15 diff --git a/misc/amanda26-server/pkg-plist b/misc/amanda26-server/pkg-plist index 9fc973b..f18f1c8 100644 --- a/misc/amanda26-server/pkg-plist +++ b/misc/amanda26-server/pkg-plist @@ -6,19 +6,25 @@ lib/amanda/libamserver-%%SHLIBVER%%.so lib/amanda/libamserver.a lib/amanda/libamserver.la lib/amanda/libamserver.so -lib/amanda/libamtape-%%SHLIBVER%%.so -lib/amanda/libamtape.a -lib/amanda/libamtape.la -lib/amanda/libamtape.so +lib/amanda/libamxfer.a +lib/amanda/libamxfer.la +lib/amanda/libamxfer.so +lib/amanda/libamxfer.so.0 lib/amanda/librestore-%%SHLIBVER%%.so lib/amanda/librestore.a lib/amanda/librestore.la lib/amanda/librestore.so %%SITE_PERL%%/Amanda/Changer.pm +%%SITE_PERL%%/Amanda/Changer/compat.pm +%%SITE_PERL%%/Amanda/Changer/disk.pm +%%SITE_PERL%%/Amanda/Changer/single.pm %%SITE_PERL%%/Amanda/Cmdline.pm +%%SITE_PERL%%/Amanda/DB/Catalog.pm %%SITE_PERL%%/Amanda/Device.pm %%SITE_PERL%%/Amanda/Logfile.pm -%%SITE_PERL%%/Amanda/Tapefile.pm +%%SITE_PERL%%/Amanda/Process.pm +%%SITE_PERL%%/Amanda/Tapelist.pm +%%SITE_PERL%%/Amanda/Xfer.pm %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so @@ -28,9 +34,12 @@ lib/amanda/librestore.so %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.a -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.la -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.so +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.a +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.la +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.a +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so %%PLOT%%libexec/amanda/amcat.awk libexec/amanda/amcleanupdisk libexec/amanda/amindexd @@ -43,6 +52,7 @@ libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-disk +libexec/amanda/chg-glue libexec/amanda/chg-iomega libexec/amanda/chg-juke libexec/amanda/chg-lib.sh @@ -60,34 +70,35 @@ libexec/amanda/driver libexec/amanda/dumper libexec/amanda/planner libexec/amanda/taper +%%S3DEVICE%%sbin/activate-devpay sbin/amaddclient sbin/amadmin sbin/amcheck sbin/amcheckdb sbin/amcheckdump sbin/amcleanup -sbin/amdd sbin/amdevcheck sbin/amdump sbin/amfetchdump sbin/amflush -sbin/amgetconf sbin/amlabel -sbin/ammt sbin/amoverview %%PLOT%%sbin/amplot sbin/amreport sbin/amrestore sbin/amrmtape sbin/amserverconfig +sbin/amservice sbin/amstatus sbin/amtape sbin/amtapetype sbin/amtoc -sbin/amverify -sbin/amverifyrun +sbin/amvault @dirrm %%SITE_PERL%%/auto/Amanda/Cmdline @dirrm %%SITE_PERL%%/auto/Amanda/Device @dirrm %%SITE_PERL%%/auto/Amanda/Logfile -@dirrm %%SITE_PERL%%/auto/Amanda/Tapefile +@dirrm %%SITE_PERL%%/auto/Amanda/Tapelist +@dirrm %%SITE_PERL%%/auto/Amanda/Xfer +@dirrm %%SITE_PERL%%/Amanda/DB +@dirrm %%SITE_PERL%%/Amanda/Changer @dirrm include/amanda diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client index a061aee..428adc9 100644 --- a/misc/amanda26-server/pkg-plist.client +++ b/misc/amanda26-server/pkg-plist.client @@ -1,4 +1,3 @@ -@unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fi lib/amanda/libamanda-%%SHLIBVER%%.so lib/amanda/libamanda.a lib/amanda/libamanda.la @@ -7,6 +6,10 @@ lib/amanda/libamandad-%%SHLIBVER%%.so lib/amanda/libamandad.a lib/amanda/libamandad.la lib/amanda/libamandad.so +lib/amanda/libamar-%%SHLIBVER%%.so +lib/amanda/libamar.a +lib/amanda/libamar.la +lib/amanda/libamar.so lib/amanda/libamclient-%%SHLIBVER%%.so lib/amanda/libamclient.a lib/amanda/libamclient.la @@ -17,7 +20,13 @@ lib/amanda/libamglue.so libexec/amanda/amanda-sh-lib.sh libexec/amanda/amandad libexec/amanda/application/amgtar -libexec/amanda/application/generic-dumper +libexec/amanda/application/amgtar_perl +libexec/amanda/application/amlog-script +libexec/amanda/application/amsamba +libexec/amanda/application/amstar +libexec/amanda/application/amzfs-sendrecv +libexec/amanda/application/amzfs-snapshot +libexec/amanda/application/script-email libexec/amanda/calcsize libexec/amanda/killpgrp libexec/amanda/noop @@ -27,18 +36,40 @@ libexec/amanda/runtar libexec/amanda/selfcheck libexec/amanda/sendbackup libexec/amanda/sendsize +libexec/amanda/teecount libexec/amanda/versionsuffix +%%SITE_PERL%%/Amanda/Application.pm +%%SITE_PERL%%/Amanda/Application/Zfs.pm +%%SITE_PERL%%/Amanda/Archive.pm +%%SITE_PERL%%/Amanda/BigIntCompat.pm %%SITE_PERL%%/Amanda/Config.pm +%%SITE_PERL%%/Amanda/Constants.pm %%SITE_PERL%%/Amanda/Debug.pm +%%SITE_PERL%%/Amanda/MainLoop.pm %%SITE_PERL%%/Amanda/Paths.pm +%%SITE_PERL%%/Amanda/Script.pm +%%SITE_PERL%%/Amanda/Script_App.pm +%%SITE_PERL%%/Amanda/Tests.pm %%SITE_PERL%%/Amanda/Types.pm %%SITE_PERL%%/Amanda/Util.pm +%%SITE_PERL%%/auto/Amanda/Application/libApplication.a +%%SITE_PERL%%/auto/Amanda/Application/libApplication.la +%%SITE_PERL%%/auto/Amanda/Application/libApplication.so +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.a +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.la +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so %%SITE_PERL%%/auto/Amanda/Config/libConfig.a %%SITE_PERL%%/auto/Amanda/Config/libConfig.la %%SITE_PERL%%/auto/Amanda/Config/libConfig.so %%SITE_PERL%%/auto/Amanda/Debug/libDebug.a %%SITE_PERL%%/auto/Amanda/Debug/libDebug.la %%SITE_PERL%%/auto/Amanda/Debug/libDebug.so +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.a +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so +%%SITE_PERL%%/auto/Amanda/Tests/libTests.a +%%SITE_PERL%%/auto/Amanda/Tests/libTests.la +%%SITE_PERL%%/auto/Amanda/Tests/libTests.so %%SITE_PERL%%/auto/Amanda/Types/libTypes.a %%SITE_PERL%%/auto/Amanda/Types/libTypes.la %%SITE_PERL%%/auto/Amanda/Types/libTypes.so @@ -46,58 +77,60 @@ libexec/amanda/versionsuffix %%SITE_PERL%%/auto/Amanda/Util/libUtil.la %%SITE_PERL%%/auto/Amanda/Util/libUtil.so sbin/amaespipe +sbin/amarchiver sbin/amcrypt sbin/amcrypt-ossl sbin/amcrypt-ossl-asym sbin/amcryptsimple +sbin/amgetconf sbin/amgpgcrypt sbin/amoldrecover sbin/amrecover -share/amanda/COPYRIGHT -share/amanda/ChangeLog -share/amanda/NEWS -share/amanda/ReleaseNotes -share/examples/amanda/amanda.conf -share/examples/amanda/chg-multi.conf -share/examples/amanda/chg-scsi.conf -share/examples/amanda/disklist -var/lib/amanda/example/amanda-client.conf -var/lib/amanda/example/amanda.conf -var/lib/amanda/example/inetd.conf.amandaclient -var/lib/amanda/example/label-templates/3hole.ps -var/lib/amanda/example/label-templates/8.5x11.ps -var/lib/amanda/example/label-templates/DIN-A4.ps -var/lib/amanda/example/label-templates/DLT-A4.ps -var/lib/amanda/example/label-templates/DLT.ps -var/lib/amanda/example/label-templates/EXB-8500.ps -var/lib/amanda/example/label-templates/HP-DAT.ps -var/lib/amanda/example/xinetd.amandaclient -var/lib/amanda/example/xinetd.amandaserver -var/lib/amanda/template.d/README -var/lib/amanda/template.d/advanced.conf -var/lib/amanda/template.d/amanda-S3.conf -var/lib/amanda/template.d/amanda-harddisk.conf -var/lib/amanda/template.d/amanda-single-tape.conf -var/lib/amanda/template.d/amanda-tape-changer.conf -var/lib/amanda/template.d/chg-manual.conf -var/lib/amanda/template.d/dumptypes -var/lib/amanda/template.d/tapetypes +%%DATADIR%%/COPYRIGHT +%%DATADIR%%/ChangeLog +%%DATADIR%%/NEWS +%%DATADIR%%/ReleaseNotes +%%PORTDOCS%%%%EXAMPLESDIR%%/disklist +%%PORTDOCS%%%%EXAMPLESDIR%%/chg-scsi.conf +%%PORTDOCS%%%%EXAMPLESDIR%%/chg-multi.conf +%%DATADIR%%/example/amanda.conf +%%DATADIR%%/example/amanda-client.conf +%%DATADIR%%/example/inetd.conf.amandaclient +%%DATADIR%%/example/inetd.conf.amandaserver +%%DATADIR%%/example/label-templates/3hole.ps +%%DATADIR%%/example/label-templates/8.5x11.ps +%%DATADIR%%/example/label-templates/DIN-A4.ps +%%DATADIR%%/example/label-templates/DLT-A4.ps +%%DATADIR%%/example/label-templates/DLT.ps +%%DATADIR%%/example/label-templates/EXB-8500.ps +%%DATADIR%%/example/label-templates/HP-DAT.ps +%%DATADIR%%/example/xinetd.amandaclient +%%DATADIR%%/example/xinetd.amandaserver +%%DATADIR%%/template.d/advanced.conf +%%DATADIR%%/template.d/amanda-harddisk.conf +%%DATADIR%%/template.d/amanda-single-tape.conf +%%DATADIR%%/template.d/amanda-tape-changer.conf +%%DATADIR%%/template.d/amanda-S3.conf +%%DATADIR%%/template.d/dumptypes +%%DATADIR%%/template.d/tapetypes +%%DATADIR%%/template.d/README +%%DATADIR%%/template.d/chg-manual.conf @dirrm %%SITE_PERL%%/auto/Amanda/Util @dirrm %%SITE_PERL%%/auto/Amanda/Types +@dirrm %%SITE_PERL%%/auto/Amanda/Tests +@dirrm %%SITE_PERL%%/auto/Amanda/MainLoop @dirrm %%SITE_PERL%%/auto/Amanda/Debug @dirrm %%SITE_PERL%%/auto/Amanda/Config +@dirrm %%SITE_PERL%%/auto/Amanda/Archive +@dirrm %%SITE_PERL%%/auto/Amanda/Application @dirrm %%SITE_PERL%%/auto/Amanda +@dirrm %%SITE_PERL%%/Amanda/Application @dirrm %%SITE_PERL%%/Amanda -@dirrm var/lib/amanda/template.d -@dirrm var/lib/amanda/example/label-templates -@dirrm var/lib/amanda/example -@dirrm var/lib/amanda -@dirrmtry var/lib -@dirrmtry var/amanda/gnutar-lists -@dirrmtry var/amanda -@dirrmtry var -@dirrm share/examples/amanda -@dirrm share/amanda +@dirrm %%DATADIR%%/template.d +@dirrm %%DATADIR%%/example/label-templates +@dirrm %%DATADIR%%/example +@dirrm %%DATADIR%% @dirrm libexec/amanda/application @dirrm libexec/amanda @dirrm lib/amanda +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile index 4e059af..03f4f04 100644 --- a/misc/amanda32-client/Makefile +++ b/misc/amanda32-client/Makefile @@ -6,7 +6,6 @@ # PKGNAMESUFFIX= -client -PORTREVISION= 1 COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile index 070b4ab..0240b86 100644 --- a/misc/amanda32-server/Makefile +++ b/misc/amanda32-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= amanda -PORTVERSION= 2.6.0p2 +PORTVERSION= 2.6.1 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -29,24 +29,24 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --without-amlibexecdir \ --with-amandahosts --with-fqdn \ --with-dump-honor-nodump --with-buffered-dump \ - --disable-libtool --prefix=${PREFIX} \ + --prefix=${PREFIX} \ --disable-glibtest \ --with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \ - --with-bsdtcp-security --with-bsdudp-security + --with-bsdtcp-security --with-bsdudp-security \ + --with-ssh-security USE_LDCONFIG= yes -WANT_PERL= yes +USE_PERL5= yes -OPTIONS= GNUTAR "use GNU tar" on \ - SSH "enable ssh-auth" off +OPTIONS= GNUTAR "use GNU tar" on .include <bsd.port.pre.mk> AMANDA_USER?= operator AMANDA_GROUP?= operator AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists -AMANDA_DATES?= ${PREFIX}/var/amanda/amandadates -PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadates +AMANDA_DATES?= ${PREFIX}/var/amanda/amandates +PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${AMANDA_DATES} # amanda-server/amanda-client common part .if defined (AMANDA_SERVER) @@ -62,10 +62,6 @@ CONFIGURE_ARGS+= --with-config=${AMANDA_CONFIG} CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE} .endif -.if defined (WITH_SSH) -CONFIGURE_ARGS+= --with-ssh-security -.endif - .if defined (AMANDA_TCPPORTRANGE) CONFIGURE_ARGS+= --with-tcpportrange=${AMANDA_TCPPORTRANGE} .endif @@ -89,7 +85,7 @@ pre-fetch: @${ECHO} " AMANDA_TAPE=tape to specify the default tape device" @${ECHO} " The default is /dev/nrsa0" @${ECHO} " AMANDA_CONFIG=config to specify the default configuration" - @${ECHO} " The default is user" + @${ECHO} " The default is DailySet1" @${ECHO} " AMANDA_USER=user to specify the default user" @${ECHO} " The default is operator" @${ECHO} " AMANDA_GROUP=group to specify the default group" @@ -102,9 +98,9 @@ pre-fetch: @${ECHO} " between low and high when connecting from the client" @${ECHO} " to the server. Use ports below 1024." @${ECHO} " The default is no restriction on UDP ports." + @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -USE_PERL5= yes CONFLICTS= amanda-server-2.5.* BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client @@ -112,28 +108,36 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/m CONFIGURE_ARGS+=--without-client +MAN5= disklist.5 \ + tapelist.5 +MAN7= amanda-changers.7 \ + amanda-devices.7 MAN8= amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \ amcheckdb.8 amcheckdump.8 amcleanup.8 \ amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \ - amdd.8 amdevcheck.8 \ + amdevcheck.8 \ amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \ - amlabel.8 ammt.8 \ + amlabel.8 \ amoverview.8 amreport.8 amrestore.8 amrmtape.8 \ - amserverconfig.8 amstatus.8 \ - amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8 + amserverconfig.8 amservice.8 amstatus.8 \ + amtape.8 amtoc.8 amtapetype.8 \ + amvault.8 OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\ SAMBA "enable the use of smbclient" off \ MTX "enable the use of mtx changer scripts" off \ - AESPIPE "enable encryption. Needed by amcrypt" off + AESPIPE "enable encryption. Needed by amcrypt" off \ + S3 "enable Amazon S3 device support" off .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot MAN8+= amplot.8 PLIST_SUB+= PLOT='' +CONFIGURE_ARGS+= --with-gnuplot=${LOCALBASE}/bin/gnuplot .else PLIST_SUB+= PLOT='@comment ' +CONFIGURE_ARGS+= --without-gnuplot .endif .if defined (WITH_SAMBA) @@ -149,6 +153,17 @@ RUN_DEPENDS+= mtx:${PORTSDIR}/misc/mtx .if defined (WITH_AESPIPE) RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipe +.else +.endif + +# If configure founds libcurl, automatically enabled it (with plist change). +.if defined(WITH_S3) +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +CONFIGURE_ARGS+= --enable-s3-device +PLIST_SUB+= S3DEVICE='' +.else +CONFIGURE_ARGS+= --disable-s3-device +PLIST_SUB+= S3DEVICE='@comment ' .endif .if defined (AMANDA_TAPE) @@ -165,10 +180,10 @@ pre-fetch: @${ECHO} " AMANDA_SERVER=server to specify a server name" @${ECHO} " The default is `uname -n`" @${ECHO} " AMANDA_CONFIG=config to specify the default configuation" - @${ECHO} " The default is user" + @${ECHO} " The default is DailySet1" @${ECHO} " AMANDA_GNUTAR_LISTDIR=dir to specify the directory that" @${ECHO} " the gnutar index files should live in" - @${ECHO} " The default is /var/amanda/gnutar-lists" + @${ECHO} " The default is ${PREFIX}/var/amanda/gnutar-lists" @${ECHO} " AMANDA_USER=user to specify the default user" @${ECHO} " The default is operator" @${ECHO} " AMANDA_GROUP=group to specify the default group" @@ -184,36 +199,52 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" +OPTIONS+= ZFSCOMP "accurate estimation of compressed ZFS filesystems" off + CONFLICTS= amanda-client-2.5.* CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES} -MAN5= amanda.conf.5 amanda-client.conf.5 -MAN8= amanda.8 amrecover.8 - -OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" off +MAN5= amanda-archive-format.5 \ + amanda-client.conf.5 \ + amanda.conf.5 +MAN7= amanda-applications.7 \ + amanda-auth.7 \ + amanda-scripts.7 +MAN8= amanda.8 \ + amarchiver.8 \ + amgtar.8 \ + amrecover.8 \ + amsamba.8 \ + amstar.8 \ + amzfs-sendrecv.8 \ + amzfs-snapshot.8 \ + script-email.8 post-install: - ${MKDIR} ${PREFIX}/share/examples/amanda - ${CP} -R ${WRKSRC}/example/amanda.conf \ - ${WRKSRC}/example/chg-multi.conf \ +.ifndef(NOPORTDOCS) + ${MKDIR} ${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/example/chg-multi.conf \ ${WRKSRC}/example/chg-scsi.conf \ ${WRKSRC}/example/disklist \ - ${PREFIX}/share/examples/amanda + ${EXAMPLESDIR} +.endif ${MKDIR} ${AMANDA_GNUTAR_LISTDIR} ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR} ${TOUCH} ${AMANDA_DATES} ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES} -.if defined (WITH_DUMP_SNAPSHOT) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.c .endif +.if defined(WITH_ZFSCOMP) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-application-src::amzfs-sendrecv.pl .endif +# MEMO: +# Prefix @WANT_SERVER_TRUE@ for server only files. +# Prefix @WANT_CLIENT_TRUE@ for client only files. # Maintainer TODO: -# o amanda-server installs lib/libamandad.a which should be handled by -# amanda-client only. -# o man pages have incorrect markups. +# o amanda-server installs libexec/amanda/amandad, sbin/amarchiver +# which should be handled by amanda-client only. # o pthread issue: http://wiki.zmanda.com/index.php/Installation/OS_Specific_Notes/Installing_Amanda_on_FreeBSD#Threading_and_-pthread .include <bsd.port.post.mk> diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo index dba0b6f..07347bd 100644 --- a/misc/amanda32-server/distinfo +++ b/misc/amanda32-server/distinfo @@ -1,3 +1,3 @@ -MD5 (amanda-2.6.0p2.tar.gz) = 75dcba5a75327ebcd4f197a93b8e8c9c -SHA256 (amanda-2.6.0p2.tar.gz) = 3830d9c95cfe72e63aea5179208851a141481b037ec4060bf3d5829bf50e6ae3 -SIZE (amanda-2.6.0p2.tar.gz) = 2402088 +MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40 +SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ff +SIZE (amanda-2.6.1.tar.gz) = 2850868 diff --git a/misc/amanda32-server/files/extra-patch-sendbackup-dump.c b/misc/amanda32-server/files/extra-patch-sendbackup-dump.c index 79764a1..3a232d1 100644 --- a/misc/amanda32-server/files/extra-patch-sendbackup-dump.c +++ b/misc/amanda32-server/files/extra-patch-sendbackup-dump.c @@ -1,5 +1,5 @@ ---- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006 -+++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006 +--- client-src/sendbackup-dump.c.orig 2008-12-13 04:18:11.000000000 +0900 ++++ client-src/sendbackup-dump.c 2009-01-27 07:30:40.000000000 +0900 @@ -35,6 +35,10 @@ #include "clock.h" #include "version.h" @@ -11,26 +11,13 @@ #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'" static amregex_t re_table[] = { -@@ -370,6 +374,12 @@ - - dumpkeys = vstralloc(level_str, - options->no_record ? "" : "u", -+#ifdef __FreeBSD__ -+ "b", -+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) -+ "L", -+#endif -+#endif - "s", - #ifdef HAVE_HONOR_NODUMP - "h", -@@ -392,6 +402,9 @@ - &dumpin, &dumpout, &mesgf, - cmd, config, +@@ -310,6 +314,9 @@ + cmdX, config, + "vxdump", dumpkeys, +#ifdef __FreeBSD__ + "64", +#endif "1048576", - #ifdef HAVE_HONOR_NODUMP - "0", + "-", + device, diff --git a/misc/amanda32-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda32-server/files/patch-chg-zd-mtx.sh.in deleted file mode 100644 index 589218b..0000000 --- a/misc/amanda32-server/files/patch-chg-zd-mtx.sh.in +++ /dev/null @@ -1,20 +0,0 @@ ---- changer-src/chg-zd-mtx.sh.orig 2008-05-27 02:25:32.000000000 +0900 -+++ changer-src/chg-zd-mtx.sh 2009-01-05 07:34:15.000000000 +0900 -@@ -411,7 +411,7 @@ - - IsNumeric() { - test -z "$1" && return 1 -- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`" -+ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`" - return `expr X"$1" != X"$x"` - } - -@@ -797,7 +797,7 @@ - max_drive_wait=${max_drive_wait:-'120'} # default: two minutes - - # check MT and MTX for sanity --if test "${MTX:0:1}" = "/"; then -+if test "${MTX%${MTX#?}}" = "/"; then - if ! test -f "${MTX}"; then - Exit 2 \ - `_ '<none>'` \ diff --git a/misc/amanda32-server/files/patch-common-src::Makefile.in b/misc/amanda32-server/files/patch-common-src::Makefile.in index 099a8ff..0f26a0f 100644 --- a/misc/amanda32-server/files/patch-common-src::Makefile.in +++ b/misc/amanda32-server/files/patch-common-src::Makefile.in @@ -1,21 +1,22 @@ ---- common-src/Makefile.in.orig 2008-08-23 03:20:00.000000000 +0900 -+++ common-src/Makefile.in 2008-09-01 07:42:20.000000000 +0900 -@@ -926,12 +926,14 @@ +--- common-src/Makefile.in.orig 2009-01-22 22:51:24.000000000 +0900 ++++ common-src/Makefile.in 2009-01-27 07:25:59.000000000 +0900 +@@ -1074,6 +1074,7 @@ + sbin_SCRIPTS_PERL = \ - amgpgcrypt \ - amcryptsimple + $(sbin_CHECK_PERL) +@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL = - sbin_SCRIPTS_SHELL = \ - amcrypt \ + amlibexec_CHECK_PERL = + amlibexec_SCRIPTS_PERL = \ +@@ -1084,6 +1085,7 @@ amaespipe \ amcrypt-ossl \ amcrypt-ossl-asym +@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL = - amlibexec_SCRIPTS_PERL = + amlibexec_SCRIPTS_SHELL = SCRIPTS_INCLUDE = \ -@@ -985,15 +987,15 @@ +@@ -1137,15 +1139,15 @@ versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES) @@ -24,8 +25,8 @@ - @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ - else :; fi; \ - done +@WANT_CLIENT_TRUE@ @$(NORMAL_INSTALL) @@ -33,8 +34,8 @@ +@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \ +@WANT_CLIENT_TRUE@ if test -f $$p; then \ +@WANT_CLIENT_TRUE@ f=$(am__strip_dir) \ -+@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ -+@WANT_CLIENT_TRUE@ $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ ++@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \ ++@WANT_CLIENT_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \ +@WANT_CLIENT_TRUE@ else :; fi; \ +@WANT_CLIENT_TRUE@ done diff --git a/misc/amanda32-server/files/patch-man::Makefile.in b/misc/amanda32-server/files/patch-man::Makefile.in index 5f44834..daeea07 100644 --- a/misc/amanda32-server/files/patch-man::Makefile.in +++ b/misc/amanda32-server/files/patch-man::Makefile.in @@ -1,10 +1,10 @@ ---- man/Makefile.in.orig 2008-08-31 22:27:26.000000000 +0900 -+++ man/Makefile.in 2008-08-31 22:27:46.000000000 +0900 -@@ -565,6 +565,7 @@ - COMMON_MAN_PAGES = amanda.8 \ - amanda.conf.5 \ - amanda-client.conf.5 +--- man/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 ++++ man/Makefile.in 2009-01-27 07:27:10.000000000 +0900 +@@ -640,6 +640,7 @@ + amanda-auth.7 \ + amarchiver.8 \ + script-email.8 +@WANT_SERVER_TRUE@COMMON_MAN_PAGES = - SERVER_MAN_PAGES = amadmin.8 \ - amcheck.8 \ + CLIENT_MAN_PAGES = \ + amanda-applications.7 \ diff --git a/misc/amanda32-server/files/patch-perl::Makefile.in b/misc/amanda32-server/files/patch-perl::Makefile.in index 49f6a8c..b32626c 100644 --- a/misc/amanda32-server/files/patch-perl::Makefile.in +++ b/misc/amanda32-server/files/patch-perl::Makefile.in @@ -1,6 +1,19 @@ ---- perl/Makefile.in.orig 2008-08-23 03:20:01.000000000 +0900 -+++ perl/Makefile.in 2008-09-02 07:36:59.000000000 +0900 -@@ -291,15 +291,15 @@ +--- perl/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900 ++++ perl/Makefile.in 2009-01-27 16:15:23.000000000 +0900 +@@ -316,9 +316,9 @@ + $(libApplication_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_CLIENT_TRUE@am_libApplication_la_rpath = -rpath \ + @WANT_CLIENT_TRUE@ $(libApplicationdir) +-libArchive_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/amar-src/libamar.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libArchive_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/amar-src/libamar.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libArchive_la_OBJECTS = Archive.lo $(am__objects_1) + libArchive_la_OBJECTS = $(am_libArchive_la_OBJECTS) + libArchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -337,15 +337,15 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@ @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir) @@ -20,10 +33,30 @@ am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1) libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS) libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -343,22 +343,22 @@ +@@ -376,8 +376,8 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libLogfile_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_SERVER_TRUE@am_libLogfile_la_rpath = -rpath $(libLogfiledir) +-libMainLoop_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libMainLoop_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libMainLoop_la_OBJECTS = MainLoop.lo $(am__objects_1) + libMainLoop_la_OBJECTS = $(am_libMainLoop_la_OBJECTS) + libMainLoop_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -396,23 +396,23 @@ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libTapefile_la_LDFLAGS) $(LDFLAGS) -o $@ - @WANT_SERVER_TRUE@am_libTapefile_la_rpath = -rpath $(libTapefiledir) + $(libTapelist_la_LDFLAGS) $(LDFLAGS) -o $@ + @WANT_SERVER_TRUE@am_libTapelist_la_rpath = -rpath $(libTapelistdir) +-libTests_la_DEPENDENCIES = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libTests_la_DEPENDENCIES = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + am_libTests_la_OBJECTS = Tests.lo $(am__objects_1) + libTests_la_OBJECTS = $(am_libTests_la_OBJECTS) + libTests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libTests_la_LDFLAGS) $(LDFLAGS) -o $@ -libTypes_la_DEPENDENCIES = libamglue.la \ - $(top_builddir)/common-src/libamanda.la +@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \ @@ -42,14 +75,31 @@ libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS) libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@ - libamglue_la_LIBADD = --am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo -+@WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo - libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS) - libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -914,39 +914,39 @@ +@@ -984,7 +984,8 @@ + $(am__append_2) $(am__append_3) $(am__append_4) + + # (amplot has a conditional, but doesn't have any header files) +-amlib_LTLIBRARIES = libamglue.la ++@WANT_SERVER_TRUE@amlib_LTLIBRARIES = ++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamglue.la + libamglue_la_SOURCES = \ + amglue/ghashtable.c \ + amglue/bigint.c \ +@@ -1042,10 +1043,11 @@ + Amanda/Types.pm Amanda/Tests.pm Amanda/MainLoop.pm \ + Amanda/Paths.pm Amanda/Constants.pm Amanda/Script_App.pm \ + $(am__append_8) Amanda/Script.pm ++@WANT_SERVER_TRUE@Amanda_DATA = $(am__append_5) + + # PACKAGE: Amanda::Archive +-libArchivedir = $(amperldir)/auto/Amanda/Archive +-libArchive_LTLIBRARIES = libArchive.la ++@WANT_CLIENT_TRUE@libArchivedir = $(amperldir)/auto/Amanda/Archive ++@WANT_CLIENT_TRUE@libArchive_LTLIBRARIES = libArchive.la + libArchive_la_SOURCES = Amanda/Archive.c $(AMGLUE_SWG) + libArchive_la_LDFLAGS = $(PERL_EXT_LDFLAGS) + libArchive_la_LIBADD = libamglue.la \ +@@ -1118,57 +1120,57 @@ # PACKAGE: Amanda::Debug @@ -112,4 +162,34 @@ +@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la - # perl doesn't use the cyg prefix and it doesn't search in the bin + # PACKAGE: Amanda::Tests +-libTestsdir = $(amperldir)/auto/Amanda/Tests +-libTests_LTLIBRARIES = libTests.la +-libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) +-libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libTests_la_LIBADD = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libTestsdir = $(amperldir)/auto/Amanda/Tests ++@WANT_CLIENT_TRUE@libTests_LTLIBRARIES = libTests.la ++@WANT_CLIENT_TRUE@libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG) ++@WANT_CLIENT_TRUE@libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS) ++@WANT_CLIENT_TRUE@libTests_la_LIBADD = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + + + # PACKAGE: Amanda::MainLoop +-libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop +-libMainLoop_LTLIBRARIES = libMainLoop.la +-libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) +-libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) +-libMainLoop_la_LIBADD = libamglue.la \ +- $(top_builddir)/common-src/libamanda.la ++@WANT_CLIENT_TRUE@libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop ++@WANT_CLIENT_TRUE@libMainLoop_LTLIBRARIES = libMainLoop.la ++@WANT_CLIENT_TRUE@libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG) ++@WANT_CLIENT_TRUE@libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS) ++@WANT_CLIENT_TRUE@libMainLoop_la_LIBADD = libamglue.la \ ++@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.la + + + # PACKAGE: Amanda::Application diff --git a/misc/amanda32-server/files/patch-server-src::amcleanup.sh b/misc/amanda32-server/files/patch-server-src::amcleanup.sh deleted file mode 100644 index f566f64..0000000 --- a/misc/amanda32-server/files/patch-server-src::amcleanup.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- server-src/amcleanup.sh.orig 2009-01-05 07:37:09.000000000 +0900 -+++ server-src/amcleanup.sh 2009-01-05 07:37:26.000000000 +0900 -@@ -75,7 +75,7 @@ - # after receiving SIGTERM, if yes send SIGKILL - # - --function killpid() { -+killpid() { - - killPID=$1 - SIGTERM=15 diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist index 9fc973b..f18f1c8 100644 --- a/misc/amanda32-server/pkg-plist +++ b/misc/amanda32-server/pkg-plist @@ -6,19 +6,25 @@ lib/amanda/libamserver-%%SHLIBVER%%.so lib/amanda/libamserver.a lib/amanda/libamserver.la lib/amanda/libamserver.so -lib/amanda/libamtape-%%SHLIBVER%%.so -lib/amanda/libamtape.a -lib/amanda/libamtape.la -lib/amanda/libamtape.so +lib/amanda/libamxfer.a +lib/amanda/libamxfer.la +lib/amanda/libamxfer.so +lib/amanda/libamxfer.so.0 lib/amanda/librestore-%%SHLIBVER%%.so lib/amanda/librestore.a lib/amanda/librestore.la lib/amanda/librestore.so %%SITE_PERL%%/Amanda/Changer.pm +%%SITE_PERL%%/Amanda/Changer/compat.pm +%%SITE_PERL%%/Amanda/Changer/disk.pm +%%SITE_PERL%%/Amanda/Changer/single.pm %%SITE_PERL%%/Amanda/Cmdline.pm +%%SITE_PERL%%/Amanda/DB/Catalog.pm %%SITE_PERL%%/Amanda/Device.pm %%SITE_PERL%%/Amanda/Logfile.pm -%%SITE_PERL%%/Amanda/Tapefile.pm +%%SITE_PERL%%/Amanda/Process.pm +%%SITE_PERL%%/Amanda/Tapelist.pm +%%SITE_PERL%%/Amanda/Xfer.pm %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so @@ -28,9 +34,12 @@ lib/amanda/librestore.so %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.a -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.la -%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.so +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.a +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.la +%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.a +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la +%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so %%PLOT%%libexec/amanda/amcat.awk libexec/amanda/amcleanupdisk libexec/amanda/amindexd @@ -43,6 +52,7 @@ libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-disk +libexec/amanda/chg-glue libexec/amanda/chg-iomega libexec/amanda/chg-juke libexec/amanda/chg-lib.sh @@ -60,34 +70,35 @@ libexec/amanda/driver libexec/amanda/dumper libexec/amanda/planner libexec/amanda/taper +%%S3DEVICE%%sbin/activate-devpay sbin/amaddclient sbin/amadmin sbin/amcheck sbin/amcheckdb sbin/amcheckdump sbin/amcleanup -sbin/amdd sbin/amdevcheck sbin/amdump sbin/amfetchdump sbin/amflush -sbin/amgetconf sbin/amlabel -sbin/ammt sbin/amoverview %%PLOT%%sbin/amplot sbin/amreport sbin/amrestore sbin/amrmtape sbin/amserverconfig +sbin/amservice sbin/amstatus sbin/amtape sbin/amtapetype sbin/amtoc -sbin/amverify -sbin/amverifyrun +sbin/amvault @dirrm %%SITE_PERL%%/auto/Amanda/Cmdline @dirrm %%SITE_PERL%%/auto/Amanda/Device @dirrm %%SITE_PERL%%/auto/Amanda/Logfile -@dirrm %%SITE_PERL%%/auto/Amanda/Tapefile +@dirrm %%SITE_PERL%%/auto/Amanda/Tapelist +@dirrm %%SITE_PERL%%/auto/Amanda/Xfer +@dirrm %%SITE_PERL%%/Amanda/DB +@dirrm %%SITE_PERL%%/Amanda/Changer @dirrm include/amanda diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client index a061aee..428adc9 100644 --- a/misc/amanda32-server/pkg-plist.client +++ b/misc/amanda32-server/pkg-plist.client @@ -1,4 +1,3 @@ -@unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fi lib/amanda/libamanda-%%SHLIBVER%%.so lib/amanda/libamanda.a lib/amanda/libamanda.la @@ -7,6 +6,10 @@ lib/amanda/libamandad-%%SHLIBVER%%.so lib/amanda/libamandad.a lib/amanda/libamandad.la lib/amanda/libamandad.so +lib/amanda/libamar-%%SHLIBVER%%.so +lib/amanda/libamar.a +lib/amanda/libamar.la +lib/amanda/libamar.so lib/amanda/libamclient-%%SHLIBVER%%.so lib/amanda/libamclient.a lib/amanda/libamclient.la @@ -17,7 +20,13 @@ lib/amanda/libamglue.so libexec/amanda/amanda-sh-lib.sh libexec/amanda/amandad libexec/amanda/application/amgtar -libexec/amanda/application/generic-dumper +libexec/amanda/application/amgtar_perl +libexec/amanda/application/amlog-script +libexec/amanda/application/amsamba +libexec/amanda/application/amstar +libexec/amanda/application/amzfs-sendrecv +libexec/amanda/application/amzfs-snapshot +libexec/amanda/application/script-email libexec/amanda/calcsize libexec/amanda/killpgrp libexec/amanda/noop @@ -27,18 +36,40 @@ libexec/amanda/runtar libexec/amanda/selfcheck libexec/amanda/sendbackup libexec/amanda/sendsize +libexec/amanda/teecount libexec/amanda/versionsuffix +%%SITE_PERL%%/Amanda/Application.pm +%%SITE_PERL%%/Amanda/Application/Zfs.pm +%%SITE_PERL%%/Amanda/Archive.pm +%%SITE_PERL%%/Amanda/BigIntCompat.pm %%SITE_PERL%%/Amanda/Config.pm +%%SITE_PERL%%/Amanda/Constants.pm %%SITE_PERL%%/Amanda/Debug.pm +%%SITE_PERL%%/Amanda/MainLoop.pm %%SITE_PERL%%/Amanda/Paths.pm +%%SITE_PERL%%/Amanda/Script.pm +%%SITE_PERL%%/Amanda/Script_App.pm +%%SITE_PERL%%/Amanda/Tests.pm %%SITE_PERL%%/Amanda/Types.pm %%SITE_PERL%%/Amanda/Util.pm +%%SITE_PERL%%/auto/Amanda/Application/libApplication.a +%%SITE_PERL%%/auto/Amanda/Application/libApplication.la +%%SITE_PERL%%/auto/Amanda/Application/libApplication.so +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.a +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.la +%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so %%SITE_PERL%%/auto/Amanda/Config/libConfig.a %%SITE_PERL%%/auto/Amanda/Config/libConfig.la %%SITE_PERL%%/auto/Amanda/Config/libConfig.so %%SITE_PERL%%/auto/Amanda/Debug/libDebug.a %%SITE_PERL%%/auto/Amanda/Debug/libDebug.la %%SITE_PERL%%/auto/Amanda/Debug/libDebug.so +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.a +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la +%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so +%%SITE_PERL%%/auto/Amanda/Tests/libTests.a +%%SITE_PERL%%/auto/Amanda/Tests/libTests.la +%%SITE_PERL%%/auto/Amanda/Tests/libTests.so %%SITE_PERL%%/auto/Amanda/Types/libTypes.a %%SITE_PERL%%/auto/Amanda/Types/libTypes.la %%SITE_PERL%%/auto/Amanda/Types/libTypes.so @@ -46,58 +77,60 @@ libexec/amanda/versionsuffix %%SITE_PERL%%/auto/Amanda/Util/libUtil.la %%SITE_PERL%%/auto/Amanda/Util/libUtil.so sbin/amaespipe +sbin/amarchiver sbin/amcrypt sbin/amcrypt-ossl sbin/amcrypt-ossl-asym sbin/amcryptsimple +sbin/amgetconf sbin/amgpgcrypt sbin/amoldrecover sbin/amrecover -share/amanda/COPYRIGHT -share/amanda/ChangeLog -share/amanda/NEWS -share/amanda/ReleaseNotes -share/examples/amanda/amanda.conf -share/examples/amanda/chg-multi.conf -share/examples/amanda/chg-scsi.conf -share/examples/amanda/disklist -var/lib/amanda/example/amanda-client.conf -var/lib/amanda/example/amanda.conf -var/lib/amanda/example/inetd.conf.amandaclient -var/lib/amanda/example/label-templates/3hole.ps -var/lib/amanda/example/label-templates/8.5x11.ps -var/lib/amanda/example/label-templates/DIN-A4.ps -var/lib/amanda/example/label-templates/DLT-A4.ps -var/lib/amanda/example/label-templates/DLT.ps -var/lib/amanda/example/label-templates/EXB-8500.ps -var/lib/amanda/example/label-templates/HP-DAT.ps -var/lib/amanda/example/xinetd.amandaclient -var/lib/amanda/example/xinetd.amandaserver -var/lib/amanda/template.d/README -var/lib/amanda/template.d/advanced.conf -var/lib/amanda/template.d/amanda-S3.conf -var/lib/amanda/template.d/amanda-harddisk.conf -var/lib/amanda/template.d/amanda-single-tape.conf -var/lib/amanda/template.d/amanda-tape-changer.conf -var/lib/amanda/template.d/chg-manual.conf -var/lib/amanda/template.d/dumptypes -var/lib/amanda/template.d/tapetypes +%%DATADIR%%/COPYRIGHT +%%DATADIR%%/ChangeLog +%%DATADIR%%/NEWS +%%DATADIR%%/ReleaseNotes +%%PORTDOCS%%%%EXAMPLESDIR%%/disklist +%%PORTDOCS%%%%EXAMPLESDIR%%/chg-scsi.conf +%%PORTDOCS%%%%EXAMPLESDIR%%/chg-multi.conf +%%DATADIR%%/example/amanda.conf +%%DATADIR%%/example/amanda-client.conf +%%DATADIR%%/example/inetd.conf.amandaclient +%%DATADIR%%/example/inetd.conf.amandaserver +%%DATADIR%%/example/label-templates/3hole.ps +%%DATADIR%%/example/label-templates/8.5x11.ps +%%DATADIR%%/example/label-templates/DIN-A4.ps +%%DATADIR%%/example/label-templates/DLT-A4.ps +%%DATADIR%%/example/label-templates/DLT.ps +%%DATADIR%%/example/label-templates/EXB-8500.ps +%%DATADIR%%/example/label-templates/HP-DAT.ps +%%DATADIR%%/example/xinetd.amandaclient +%%DATADIR%%/example/xinetd.amandaserver +%%DATADIR%%/template.d/advanced.conf +%%DATADIR%%/template.d/amanda-harddisk.conf +%%DATADIR%%/template.d/amanda-single-tape.conf +%%DATADIR%%/template.d/amanda-tape-changer.conf +%%DATADIR%%/template.d/amanda-S3.conf +%%DATADIR%%/template.d/dumptypes +%%DATADIR%%/template.d/tapetypes +%%DATADIR%%/template.d/README +%%DATADIR%%/template.d/chg-manual.conf @dirrm %%SITE_PERL%%/auto/Amanda/Util @dirrm %%SITE_PERL%%/auto/Amanda/Types +@dirrm %%SITE_PERL%%/auto/Amanda/Tests +@dirrm %%SITE_PERL%%/auto/Amanda/MainLoop @dirrm %%SITE_PERL%%/auto/Amanda/Debug @dirrm %%SITE_PERL%%/auto/Amanda/Config +@dirrm %%SITE_PERL%%/auto/Amanda/Archive +@dirrm %%SITE_PERL%%/auto/Amanda/Application @dirrm %%SITE_PERL%%/auto/Amanda +@dirrm %%SITE_PERL%%/Amanda/Application @dirrm %%SITE_PERL%%/Amanda -@dirrm var/lib/amanda/template.d -@dirrm var/lib/amanda/example/label-templates -@dirrm var/lib/amanda/example -@dirrm var/lib/amanda -@dirrmtry var/lib -@dirrmtry var/amanda/gnutar-lists -@dirrmtry var/amanda -@dirrmtry var -@dirrm share/examples/amanda -@dirrm share/amanda +@dirrm %%DATADIR%%/template.d +@dirrm %%DATADIR%%/example/label-templates +@dirrm %%DATADIR%%/example +@dirrm %%DATADIR%% @dirrm libexec/amanda/application @dirrm libexec/amanda @dirrm lib/amanda +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% |
