FreeBSD Bugzilla – Attachment 93313 Details for
Bug 131193
[UPDATE] misc/amanda-* to version 2.6.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
amanda-2.6.1.shar
amanda-2.6.1.shar (text/plain; charset=utf-8), 41.90 KB, created by
glz
on 2009-01-31 11:43:00 UTC
(
hide
)
Description:
amanda-2.6.1.shar
Filename:
MIME Type:
Creator:
glz
Created:
2009-01-31 11:43:00 UTC
Size:
41.90 KB
patch
obsolete
># This is a shell archive. Save it in a file, remove anything before# this line, and then unpack it by entering "sh file". Note, it may# create directories; files and directories will be owned by you and# have default permissions.## This archive contains:## amanda-2.6.1.diff#echo x - amanda-2.6.1.diffsed 's/^X//' >amanda-2.6.1.diff << 'e97ad6bb25843b8253e9fde628cbbdc8'Xdiff -ruN amanda-server.orig/Makefile amanda-server/MakefileX--- amanda-server.orig/Makefile 2009-01-09 05:56:06.735269902 +0100X+++ amanda-server/Makefile 2009-01-31 12:32:50.993982867 +0100X@@ -2,23 +2,23 @@X # Date created: 28th Feb 1995X # Whom: gpalmerX #X-# $FreeBSD: ports/misc/amanda-server/Makefile,v 1.111 2009/01/09 01:48:48 kuriyama Exp $X+# $FreeBSD:$X #X X PORTNAME= amandaX-PORTVERSION= 2.6.0p2X-PORTEPOCH= 1X+PORTVERSION= ${AMANDA_VERSION}X CATEGORIES= miscX MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}X MASTER_SITE_SUBDIR= amandaX PKGNAMESUFFIX?= -serverX X MAINTAINER= kuriyama@FreeBSD.orgX-COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)X+COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server and client)X X-WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}X SLAVEDIRS= misc/amanda-clientX X+AMANDA_VERSION=2.6.1X+X LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}X GNU_CONFIGURE= yesX USE_GNOME= pkgconfig glib20X@@ -37,18 +37,38 @@X USE_LDCONFIG= yesX WANT_PERL= yesX X+CONFLICTS?= amanda-server-2.5.* amanda-client-*X+X OPTIONS= GNUTAR "use GNU tar" on \X SSH "enable ssh-auth" offX+.if !defined (CLIENT_ONLY)X+OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\X+ SAMBA "enable the use of smbclient" off \X+ MTX "enable the use of mtx changer scripts" off \X+ AESPIPE "enable encryption. Needed by amcrypt" offX+.endifX+OPTIONS+= ZFSCOMP "accurate estimation of compressed ZFS filesystems" offX X .include <bsd.port.pre.mk>X X AMANDA_USER?= operatorX AMANDA_GROUP?= operatorX AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-listsX-AMANDA_DATES?= ${PREFIX}/var/amanda/amandadatesX-PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadatesX+AMANDA_DATES?= ${PREFIX}/var/amanda/amandatesX+PLIST_SUB= SHLIBVER=${AMANDA_VERSION} AMANDATES=${AMANDA_DATES}X X-# amanda-server/amanda-client common partX+.if defined (WITH_SSH)X+CONFIGURE_ARGS+= --with-ssh-securityX+.endifX+X+.if !defined(WITHOUT_GNUTAR)X+CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \X+ --with-gnutar=${LOCALBASE}/bin/gtarX+BUILD_DEPENDS= gtar:${PORTSDIR}/archivers/gtarX+RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtarX+.endifX+X+# amanda/manda-server/amanda-client common partX .if defined (AMANDA_SERVER)X CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER}X CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER}X@@ -62,24 +82,11 @@X CONFIGURE_ARGS+= --with-udpportrange=${AMANDA_UDPPORTRANGE}X .endifX X-.if defined (WITH_SSH)X-CONFIGURE_ARGS+= --with-ssh-securityX-.endifX-X .if defined (AMANDA_TCPPORTRANGE)X CONFIGURE_ARGS+= --with-tcpportrange=${AMANDA_TCPPORTRANGE}X .endifX X-.if !defined(WITHOUT_GNUTAR)X-CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \X- --with-gnutar=${LOCALBASE}/bin/gtarX-BUILD_DEPENDS= gtar:${PORTSDIR}/archivers/gtarX-RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtarX-.endifX-X-# amanda-server partX-.if !defined(CLIENT_ONLY)X-X+# Amnada server and clientX pre-fetch:X @${ECHO} ""X @${ECHO} "You may use the following build options:"X@@ -102,30 +109,22 @@X @${ECHO} " between low and high when connecting from the client"X @${ECHO} " to the server. Use ports below 1024."X @${ECHO} " The default is no restriction on UDP ports."X+ @${ECHO} " AMANDA_DATES=path to client amandates file"X @${ECHO} ""X X USE_PERL5= yesX-CONFLICTS= amanda-server-2.5.*X-X-BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-clientX-RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-clientX-X-CONFIGURE_ARGS+=--without-clientX X-MAN8= amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \X- amcheckdb.8 amcheckdump.8 amcleanup.8 \X- amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \X- amdd.8 amdevcheck.8 \X- amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \X- amlabel.8 ammt.8 \X- amoverview.8 amreport.8 amrestore.8 amrmtape.8 \X- amserverconfig.8 amstatus.8 \X- amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8X+# install both client and serverX+.if !defined (CLIENT_ONLY)X X-OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\X- SAMBA "enable the use of smbclient" off \X- MTX "enable the use of mtx changer scripts" off \X- AESPIPE "enable encryption. Needed by amcrypt" offX+MAN5= tapelist.5 disklist.5 amanda.conf.5 amanda-client.conf.5 amanda-archive-format.5X+MAN7= amanda-scripts.7 amanda-devices.7 amanda-changers.7 amanda-auth.7 amanda-applications.7X+MAN8= script-email.8 amzfs-snapshot.8 amzfs-sendrecv.8 amvault.8 amtoc.8 amtapetype.8 \X+ amtape.8 amstatus.8 amstar.8 amservice.8 amserverconfig.8 amsamba.8 amrmtape.8 \X+ amrestore.8 amreport.8 amrecover.8 amoverview.8 amlabel.8 amgtar.8 amgpgcrypt.8 \X+ amgetconf.8 amflush.8 amfetchdump.8 amdump.8 amdevcheck.8 amcryptsimple.8 amcrypt.8 \X+ amcrypt-ossl.8 amcrypt-ossl-asym.8 amcleanup.8 amcheckdump.8 amcheckdb.8 amcheck.8 \X+ amarchiver.8 amanda.8 amaespipe.8 amadmin.8 amaddclient.8X X .if defined (WITH_PLOT)X BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplotX@@ -149,71 +148,52 @@X X .if defined (WITH_AESPIPE)X RUN_DEPENDS+= aespipe:${PORTSDIR}/security/aespipeX+PLIST_SUB+= AESPIPE=''X+.elseX+PLIST_SUB+= AESPIPE='@comment 'X .endifX X .if defined (AMANDA_TAPE)X CONFIGURE_ARGS+= --with-tape-device=${AMANDA_TAPE}X .endifX X-# amanda-client partX-.elseX+# server side definesX+.endifX X-pre-fetch:X- @${ECHO} ""X- @${ECHO} "You may use the following build options:"X- @${ECHO} ""X- @${ECHO} " AMANDA_SERVER=server to specify a server name"X- @${ECHO} " The default is `uname -n`"X- @${ECHO} " AMANDA_CONFIG=config to specify the default configuation"X- @${ECHO} " The default is user"X- @${ECHO} " AMANDA_GNUTAR_LISTDIR=dir to specify the directory that"X- @${ECHO} " the gnutar index files should live in"X- @${ECHO} " The default is /var/amanda/gnutar-lists"X- @${ECHO} " AMANDA_USER=user to specify the default user"X- @${ECHO} " The default is operator"X- @${ECHO} " AMANDA_GROUP=group to specify the default group"X- @${ECHO} " The default is operator"X- @${ECHO} " AMANDA_TCPPORTRANGE=low,high to restrict Amanda to TCP ports"X- @${ECHO} " between low and high when connecting from the server"X- @${ECHO} " to the client for data, messages, and indexing."X- @${ECHO} " The default is no restriction on TCP ports."X- @${ECHO} " AMANDA_UDPPORTRANGE=low,high to restrict Amanda to UDP ports"X- @${ECHO} " between low and high when connecting from the client"X- @${ECHO} " to the server. Use ports below 1024."X- @${ECHO} " The default is no restriction on UDP ports."X- @${ECHO} " AMANDA_DATES=path to client amandates file"X- @${ECHO} ""X+# client only installX+.if defined(CLIENT_ONLY)X X-CONFLICTS= amanda-client-2.5.*X-CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}X+CONFIGURE_ARGS+=--without-serverX X-MAN5= amanda.conf.5 amanda-client.conf.5X-MAN8= amanda.8 amrecover.8X+MAN5= amanda.conf.5 amanda-client.conf.5 amanda-archive-format.5X+MAN7= amanda-scripts.7 amanda-auth.7 amanda-applications.7X+MAN8= script-email.8 amzfs-snapshot.8 amzfs-sendrecv.8 amstar.8 amsamba.8 \X+ amrecover.8 amgtar.8 amarchiver.8 amanda.8X X-OPTIONS+= DUMP_SNAPSHOT "use snapshot by using dump -L" offX+# end client onlyX+.endifX X post-install:X- ${MKDIR} ${PREFIX}/share/examples/amandaX+.if !defined (CLIENT_ONLY)X+.ifndef(NOPORTDOCS)X+ ${MKDIR} ${EXAMPLESDIR}X ${CP} -R ${WRKSRC}/example/amanda.conf \X ${WRKSRC}/example/chg-multi.conf \X ${WRKSRC}/example/chg-scsi.conf \X ${WRKSRC}/example/disklist \X- ${PREFIX}/share/examples/amandaX+ ${EXAMPLESDIR}X+.endifX+.endifX ${MKDIR} ${AMANDA_GNUTAR_LISTDIR}X ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}X ${TOUCH} ${AMANDA_DATES}X ${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES}X X-.if defined (WITH_DUMP_SNAPSHOT)X-EXTRA_PATCHES= ${FILESDIR}/extra-patch-sendbackup-dump.cX-.endifX-X+.if defined (WITH_ZFSCOMP)X+EXTRA_PATCHES= ${FILESDIR}/extra-patch-application-src::amzfs-sendrecv.plX .endifX X # Maintainer TODO:X-# o amanda-server installs lib/libamandad.a which should be handled byX-# amanda-client only.X # o man pages have incorrect markups.X-# o pthread issue: http://wiki.zmanda.com/index.php/Installation/OS_Specific_Notes/Installing_Amanda_on_FreeBSD#Threading_and_-pthreadX X .include <bsd.port.post.mk>Xdiff -ruN amanda-server.orig/distinfo amanda-server/distinfoX--- amanda-server.orig/distinfo 2009-01-06 05:55:58.658341771 +0100X+++ amanda-server/distinfo 2009-01-31 11:14:26.000000000 +0100X@@ -1,3 +1,3 @@X-MD5 (amanda-2.6.0p2.tar.gz) = 75dcba5a75327ebcd4f197a93b8e8c9cX-SHA256 (amanda-2.6.0p2.tar.gz) = 3830d9c95cfe72e63aea5179208851a141481b037ec4060bf3d5829bf50e6ae3X-SIZE (amanda-2.6.0p2.tar.gz) = 2402088X+SIZE (amanda-2.6.1.tar.gz) = 2850868X+MD5 (amanda-2.6.1.tar.gz) = cf084afc6fd993f088c91c3ba5062b40X+SHA256 (amanda-2.6.1.tar.gz) = a7eb2874129e9289600a5fa46a27fe3b17f078977818df07cc41ac6614c4a4ffXdiff -ruN amanda-server.orig/files/extra-patch-application-src::amzfs-sendrecv.pl amanda-server/files/extra-patch-application-src::amzfs-sendrecv.plX--- amanda-server.orig/files/extra-patch-application-src::amzfs-sendrecv.pl 1970-01-01 01:00:00.000000000 +0100X+++ amanda-server/files/extra-patch-application-src::amzfs-sendrecv.pl 2009-01-31 10:39:17.000000000 +0100X@@ -0,0 +1,52 @@X+--- application-src/amzfs-sendrecv.pl.orig 2009-01-22 02:35:38.000000000 +0100X++++ application-src/amzfs-sendrecv.pl 2009-01-31 10:37:59.495534563 +0100X+@@ -235,13 +235,48 @@X+ } elsif (defined $errmsg) {X+ $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);X+ } else {X+- $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);X++ $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);X+ }X+ }X++ if ($level == 0) {X++ my $compratio = $self->get_compratio();X++ $msg *= int $compratio;X++ }X+ X+ return $msg;X+ }X+ X++sub get_compratioX++{X++ my $self = shift;X++ my $action = shift;X++X++ my $cmd;X++ $cmd = "$self->{pfexec_cmd} $self->{zfs_path} get -Hp -o value compressratio $self->{filesystem}\@$self->{snapshot}";X++ debug "running (get-compression): $cmd";X++ my($wtr, $rdr, $err, $pid);X++ $err = Symbol::gensym;X++ $pid = open3($wtr, $rdr, $err, $cmd);X++ close $wtr;X++ my ($msg) = <$rdr>;X++ my ($errmsg) = <$err>;X++ waitpid $pid, 0;X++ close $rdr;X++ close $err;X++ if ($? != 0) {X++ if (defined $msg && defined $errmsg) {X++ $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR);X++ } elsif (defined $msg) {X++ $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR);X++ } elsif (defined $errmsg) {X++ $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);X++ } else {X++ $self->print_to_server_and_die($action, "cannot read compression ratio '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);X++ }X++ }X++ return $msgX++}X++X+ sub command_index_from_output {X+ }X+ Xdiff -ruN amanda-server.orig/files/extra-patch-sendbackup-dump.c amanda-server/files/extra-patch-sendbackup-dump.cX--- amanda-server.orig/files/extra-patch-sendbackup-dump.c 2006-11-06 23:44:04.000000000 +0100X+++ amanda-server/files/extra-patch-sendbackup-dump.c 1970-01-01 01:00:00.000000000 +0100X@@ -1,36 +0,0 @@X---- client-src/sendbackup-dump.c.orig Fri Sep 8 13:09:14 2006X-+++ client-src/sendbackup-dump.c Fri Sep 8 13:15:44 2006X-@@ -35,6 +35,10 @@X- #include "clock.h"X- #include "version.h"X- X-+#ifdef __FreeBSD__X-+#include <sys/param.h>X-+#endifX-+X- #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\'"X- X- static amregex_t re_table[] = {X-@@ -370,6 +374,12 @@X- X- dumpkeys = vstralloc(level_str,X- options->no_record ? "" : "u",X-+#ifdef __FreeBSD__X-+ "b",X-+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043)X-+ "L",X-+#endifX-+#endifX- "s",X- #ifdef HAVE_HONOR_NODUMPX- "h",X-@@ -392,6 +402,9 @@X- &dumpin, &dumpout, &mesgf, X- cmd, config,X- dumpkeys,X-+#ifdef __FreeBSD__X-+ "64",X-+#endifX- "1048576",X- #ifdef HAVE_HONOR_NODUMPX- "0",Xdiff -ruN amanda-server.orig/files/patch-chg-zd-mtx.sh.in amanda-server/files/patch-chg-zd-mtx.sh.inX--- amanda-server.orig/files/patch-chg-zd-mtx.sh.in 2009-01-06 05:55:58.659342417 +0100X+++ amanda-server/files/patch-chg-zd-mtx.sh.in 1970-01-01 01:00:00.000000000 +0100X@@ -1,20 +0,0 @@X---- changer-src/chg-zd-mtx.sh.orig 2008-05-27 02:25:32.000000000 +0900X-+++ changer-src/chg-zd-mtx.sh 2009-01-05 07:34:15.000000000 +0900X-@@ -411,7 +411,7 @@X- X- IsNumeric() {X- test -z "$1" && return 1X-- x="`expr "$1" : '\([-0-9][0-9]*\)' 2>/dev/null`"X-+ x="`expr -- "$1" : "\([-0-9][0-9]*\)" 2>/dev/null`"X- return `expr X"$1" != X"$x"`X- }X- X-@@ -797,7 +797,7 @@X- max_drive_wait=${max_drive_wait:-'120'} # default: two minutesX- X- # check MT and MTX for sanityX--if test "${MTX:0:1}" = "/"; thenX-+if test "${MTX%${MTX#?}}" = "/"; thenX- if ! test -f "${MTX}"; thenX- Exit 2 \X- `_ '<none>'` \Xdiff -ruN amanda-server.orig/files/patch-common-src::Makefile.in amanda-server/files/patch-common-src::Makefile.inX--- amanda-server.orig/files/patch-common-src::Makefile.in 2008-09-01 00:42:46.000000000 +0200X+++ amanda-server/files/patch-common-src::Makefile.in 1970-01-01 01:00:00.000000000 +0100X@@ -1,42 +0,0 @@X---- common-src/Makefile.in.orig 2008-08-23 03:20:00.000000000 +0900X-+++ common-src/Makefile.in 2008-09-01 07:42:20.000000000 +0900X-@@ -926,12 +926,14 @@X- sbin_SCRIPTS_PERL = \X- amgpgcrypt \X- amcryptsimpleX-+@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL =X- X- sbin_SCRIPTS_SHELL = \X- amcrypt \X- amaespipe \X- amcrypt-ossl \X- amcrypt-ossl-asymX-+@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL =X- X- amlibexec_SCRIPTS_PERL = X- SCRIPTS_INCLUDE = \X-@@ -985,15 +987,15 @@X- versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.inX- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@X- install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES)X-- @$(NORMAL_INSTALL)X-- test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"X-- @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \X-- if test -f $$p; then \X-- f=$(am__strip_dir) \X-- echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \X-- $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \X-- else :; fi; \X-- doneX-+@WANT_CLIENT_TRUE@ @$(NORMAL_INSTALL)X-+@WANT_CLIENT_TRUE@ test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"X-+@WANT_CLIENT_TRUE@ @list='$(amlib_LTLIBRARIES)'; for p in $$list; do \X-+@WANT_CLIENT_TRUE@ if test -f $$p; then \X-+@WANT_CLIENT_TRUE@ f=$(am__strip_dir) \X-+@WANT_CLIENT_TRUE@ echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \X-+@WANT_CLIENT_TRUE@ $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \X-+@WANT_CLIENT_TRUE@ else :; fi; \X-+@WANT_CLIENT_TRUE@ doneX- X- uninstall-amlibLTLIBRARIES:X- @$(NORMAL_UNINSTALL)Xdiff -ruN amanda-server.orig/files/patch-man::Makefile.in amanda-server/files/patch-man::Makefile.inX--- amanda-server.orig/files/patch-man::Makefile.in 2008-08-31 15:28:16.000000000 +0200X+++ amanda-server/files/patch-man::Makefile.in 1970-01-01 01:00:00.000000000 +0100X@@ -1,10 +0,0 @@X---- man/Makefile.in.orig 2008-08-31 22:27:26.000000000 +0900X-+++ man/Makefile.in 2008-08-31 22:27:46.000000000 +0900X-@@ -565,6 +565,7 @@X- COMMON_MAN_PAGES = amanda.8 \X- amanda.conf.5 \X- amanda-client.conf.5X-+@WANT_SERVER_TRUE@COMMON_MAN_PAGES =X- X- SERVER_MAN_PAGES = amadmin.8 \X- amcheck.8 \Xdiff -ruN amanda-server.orig/files/patch-perl::Makefile.in amanda-server/files/patch-perl::Makefile.inX--- amanda-server.orig/files/patch-perl::Makefile.in 2008-09-02 00:37:02.000000000 +0200X+++ amanda-server/files/patch-perl::Makefile.in 1970-01-01 01:00:00.000000000 +0100X@@ -1,115 +0,0 @@X---- perl/Makefile.in.orig 2008-08-23 03:20:01.000000000 +0900X-+++ perl/Makefile.in 2008-09-02 07:36:59.000000000 +0900X-@@ -291,15 +291,15 @@X- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \X- $(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@X- @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir)X--libConfig_la_DEPENDENCIES = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@libConfig_la_DEPENDENCIES = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX- am_libConfig_la_OBJECTS = Config.lo $(am__objects_1)X- libConfig_la_OBJECTS = $(am_libConfig_la_OBJECTS)X- libConfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \X- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \X- $(libConfig_la_LDFLAGS) $(LDFLAGS) -o $@X--libDebug_la_DEPENDENCIES = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@libDebug_la_DEPENDENCIES = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX- am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1)X- libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS)X- libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \X-@@ -343,22 +343,22 @@X- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \X- $(libTapefile_la_LDFLAGS) $(LDFLAGS) -o $@X- @WANT_SERVER_TRUE@am_libTapefile_la_rpath = -rpath $(libTapefiledir)X--libTypes_la_DEPENDENCIES = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX- am_libTypes_la_OBJECTS = Types.lo $(am__objects_1)X- libTypes_la_OBJECTS = $(am_libTypes_la_OBJECTS)X- libTypes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \X- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \X- $(libTypes_la_LDFLAGS) $(LDFLAGS) -o $@X--libUtil_la_DEPENDENCIES = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX--am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)X-+@WANT_CLIENT_TRUE@libUtil_la_DEPENDENCIES = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)X- libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS)X- libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \X- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \X- $(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@X- libamglue_la_LIBADD =X--am_libamglue_la_OBJECTS = ghashtable.lo bigint.loX-+@WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.loX- libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS)X- libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \X- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \X-@@ -914,39 +914,39 @@X- X- X- # PACKAGE: Amanda::DebugX--libDebugdir = $(amperldir)/auto/Amanda/DebugX--libDebug_LTLIBRARIES = libDebug.laX--libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)X--libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X--libDebug_la_LIBADD = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@libDebugdir = $(amperldir)/auto/Amanda/DebugX-+@WANT_CLIENT_TRUE@libDebug_LTLIBRARIES = libDebug.laX-+@WANT_CLIENT_TRUE@libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)X-+@WANT_CLIENT_TRUE@libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X-+@WANT_CLIENT_TRUE@libDebug_la_LIBADD = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX- X- X- # PACKAGE: Amanda::ConfigX--libConfigdir = $(amperldir)/auto/Amanda/ConfigX--libConfig_LTLIBRARIES = libConfig.laX--libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)X--libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X--libConfig_la_LIBADD = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@libConfigdir = $(amperldir)/auto/Amanda/ConfigX-+@WANT_CLIENT_TRUE@libConfig_LTLIBRARIES = libConfig.laX-+@WANT_CLIENT_TRUE@libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)X-+@WANT_CLIENT_TRUE@libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X-+@WANT_CLIENT_TRUE@libConfig_la_LIBADD = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX- X- X- # PACKAGE: Amanda::UtilX--libUtildir = $(amperldir)/auto/Amanda/UtilX--libUtil_LTLIBRARIES = libUtil.laX--libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)X--libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X--libUtil_la_LIBADD = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@libUtildir = $(amperldir)/auto/Amanda/UtilX-+@WANT_CLIENT_TRUE@libUtil_LTLIBRARIES = libUtil.laX-+@WANT_CLIENT_TRUE@libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)X-+@WANT_CLIENT_TRUE@libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X-+@WANT_CLIENT_TRUE@libUtil_la_LIBADD = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX- X- X- # PACKAGE: Amanda::TypesX--libTypesdir = $(amperldir)/auto/Amanda/TypesX--libTypes_LTLIBRARIES = libTypes.laX--libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)X--libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X--libTypes_la_LIBADD = libamglue.la \X-- $(top_builddir)/common-src/libamanda.laX-+@WANT_CLIENT_TRUE@libTypesdir = $(amperldir)/auto/Amanda/TypesX-+@WANT_CLIENT_TRUE@libTypes_LTLIBRARIES = libTypes.laX-+@WANT_CLIENT_TRUE@libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)X-+@WANT_CLIENT_TRUE@libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)X-+@WANT_CLIENT_TRUE@libTypes_la_LIBADD = libamglue.la \X-+@WANT_CLIENT_TRUE@ $(top_builddir)/common-src/libamanda.laX- X- X- # perl doesn't use the cyg prefix and it doesn't search in the binXdiff -ruN amanda-server.orig/files/patch-server-src::amcleanup.sh amanda-server/files/patch-server-src::amcleanup.shX--- amanda-server.orig/files/patch-server-src::amcleanup.sh 2009-01-05 05:59:06.000000000 +0100X+++ amanda-server/files/patch-server-src::amcleanup.sh 1970-01-01 01:00:00.000000000 +0100X@@ -1,11 +0,0 @@X---- server-src/amcleanup.sh.orig 2009-01-05 07:37:09.000000000 +0900X-+++ server-src/amcleanup.sh 2009-01-05 07:37:26.000000000 +0900X-@@ -75,7 +75,7 @@X- # after receiving SIGTERM, if yes send SIGKILL X- #X- X--function killpid() {X-+killpid() {X- X- killPID=$1X- SIGTERM=15Xdiff -ruN amanda-server.orig/pkg-plist amanda-server/pkg-plistX--- amanda-server.orig/pkg-plist 2009-01-06 05:55:58.660342225 +0100X+++ amanda-server/pkg-plist 2009-01-31 12:30:19.936956534 +0100X@@ -1,93 +1,246 @@X-lib/amanda/libamdevice-%%SHLIBVER%%.soX-lib/amanda/libamdevice.aX-lib/amanda/libamdevice.laX-lib/amanda/libamdevice.soX-lib/amanda/libamserver-%%SHLIBVER%%.soX-lib/amanda/libamserver.aX-lib/amanda/libamserver.laX-lib/amanda/libamserver.soX-lib/amanda/libamtape-%%SHLIBVER%%.soX-lib/amanda/libamtape.aX-lib/amanda/libamtape.laX-lib/amanda/libamtape.soX-lib/amanda/librestore-%%SHLIBVER%%.soX-lib/amanda/librestore.aX-lib/amanda/librestore.laX-lib/amanda/librestore.soX-%%SITE_PERL%%/Amanda/Changer.pmX-%%SITE_PERL%%/Amanda/Cmdline.pmX-%%SITE_PERL%%/Amanda/Device.pmX-%%SITE_PERL%%/Amanda/Logfile.pmX-%%SITE_PERL%%/Amanda/Tapefile.pmX-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.aX-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.laX-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.soX-%%SITE_PERL%%/auto/Amanda/Device/libDevice.aX-%%SITE_PERL%%/auto/Amanda/Device/libDevice.laX-%%SITE_PERL%%/auto/Amanda/Device/libDevice.soX-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.aX-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.laX-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.soX-%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.aX-%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.laX-%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.soX-%%PLOT%%libexec/amanda/amcat.awkX-libexec/amanda/amcleanupdiskX-libexec/amanda/amindexdX-libexec/amanda/amlogrollX-%%PLOT%%libexec/amanda/amplot.awkX-%%PLOT%%libexec/amanda/amplot.gX-%%PLOT%%libexec/amanda/amplot.gpX-libexec/amanda/amtrmidxX-libexec/amanda/amtrmlogX-libexec/amanda/chg-chioX-libexec/amanda/chg-chsX-libexec/amanda/chg-diskX-libexec/amanda/chg-iomegaX-libexec/amanda/chg-jukeX-libexec/amanda/chg-lib.shX-libexec/amanda/chg-manualX-libexec/amanda/chg-mcutilX-libexec/amanda/chg-mtxX-libexec/amanda/chg-multiX-libexec/amanda/chg-nullX-libexec/amanda/chg-raitX-libexec/amanda/chg-rthX-libexec/amanda/chg-zd-mtxX+@unexec if cmp -s %%AMANDATESi%% /dev/null; then rm -f %%AMANDATES%%; fiX+%%PORTDOCS%%%%EXAMPLESDIR%%/disklistX+%%PORTDOCS%%%%EXAMPLESDIR%%/chg-scsi.confX+%%PORTDOCS%%%%EXAMPLESDIR%%/chg-multi.confX+%%PORTDOCS%%%%EXAMPLESDIR%%/amanda.confX+share/amanda/template.d/tapetypesX+share/amanda/template.d/dumptypesX+share/amanda/template.d/chg-manual.confX+share/amanda/template.d/amanda-tape-changer.confX+share/amanda/template.d/amanda-single-tape.confX+share/amanda/template.d/amanda-harddisk.confX+share/amanda/template.d/amanda-S3.confX+share/amanda/template.d/advanced.confX+share/amanda/template.d/READMEX+share/amanda/example/xinetd.amandaserverX+share/amanda/example/xinetd.amandaclientX+share/amanda/example/label-templates/HP-DAT.psX+share/amanda/example/label-templates/EXB-8500.psX+share/amanda/example/label-templates/DLT.psX+share/amanda/example/label-templates/DLT-A4.psX+share/amanda/example/label-templates/DIN-A4.psX+share/amanda/example/label-templates/8.5x11.psX+share/amanda/example/label-templates/3hole.psX+share/amanda/example/inetd.conf.amandaserverX+share/amanda/example/inetd.conf.amandaclientX+share/amanda/example/amanda.confX+share/amanda/example/amanda-client.confX+share/amanda/ReleaseNotesX+share/amanda/NEWSX+share/amanda/ChangeLogX+share/amanda/COPYRIGHTX+sbin/amvaultX+sbin/amtocX+sbin/amtapetypeX+sbin/amtapeX+sbin/amstatusX+sbin/amserviceX+sbin/amserverconfigX+sbin/amrmtapeX+sbin/amrestoreX+sbin/amreportX+sbin/amrecoverX+%%PLOT%%sbin/amplotX+sbin/amoverviewX+sbin/amoldrecoverX+sbin/amlabelX+sbin/amgpgcryptX+sbin/amgetconfX+sbin/amflushX+sbin/amfetchdumpX+sbin/amdumpX+sbin/amdevcheckX+sbin/amcryptsimpleX+sbin/amcrypt-ossl-asymX+sbin/amcrypt-osslX+sbin/amcryptX+sbin/amcleanupX+sbin/amcheckdumpX+sbin/amcheckdbX+sbin/amcheckX+sbin/amarchiverX+sbin/amaespipeX+sbin/amadminX+sbin/amaddclientX+%%AESPIPE%%sbin/activate-devpayX+libexec/amanda/versionsuffixX+libexec/amanda/teecountX+libexec/amanda/taperX+libexec/amanda/sendsizeX+libexec/amanda/sendbackupX+libexec/amanda/selfcheckX+libexec/amanda/runtarX+libexec/amanda/rundumpX+libexec/amanda/plannerX+libexec/amanda/patch-systemX+libexec/amanda/noopX+libexec/amanda/killpgrpX+libexec/amanda/dumperX+libexec/amanda/driverX libexec/amanda/chunkerX+libexec/amanda/chg-zd-mtxX+libexec/amanda/chg-rthX+libexec/amanda/chg-raitX+libexec/amanda/chg-nullX+libexec/amanda/chg-multiX+libexec/amanda/chg-mtxX+libexec/amanda/chg-mcutilX+libexec/amanda/chg-manualX+libexec/amanda/chg-lib.shX+libexec/amanda/chg-jukeX+libexec/amanda/chg-iomegaX+libexec/amanda/chg-glueX+libexec/amanda/chg-diskX+libexec/amanda/chg-chsX+libexec/amanda/chg-chioX+libexec/amanda/calcsizeX+libexec/amanda/application/script-emailX+libexec/amanda/application/amzfs-snapshotX+libexec/amanda/application/amzfs-sendrecvX+libexec/amanda/application/amstarX+libexec/amanda/application/amsambaX+libexec/amanda/application/amlog-scriptX+libexec/amanda/application/amgtar_perlX+libexec/amanda/application/amgtarX+libexec/amanda/amtrmlogX+libexec/amanda/amtrmidxX+%%PLOT%%libexec/amanda/amplot.gpX+%%PLOT%%libexec/amanda/amplot.gX+%%PLOT%%libexec/amanda/amplot.awkX+libexec/amanda/amlogrollX+libexec/amanda/amindexdX libexec/amanda/amidxtapedX-libexec/amanda/driverX-libexec/amanda/dumperX-libexec/amanda/plannerX-libexec/amanda/taperX-sbin/amaddclientX-sbin/amadminX-sbin/amcheckX-sbin/amcheckdbX-sbin/amcheckdumpX-sbin/amcleanupX-sbin/amddX-sbin/amdevcheckX-sbin/amdumpX-sbin/amfetchdumpX-sbin/amflushX-sbin/amgetconfX-sbin/amlabelX-sbin/ammtX-sbin/amoverviewX-%%PLOT%%sbin/amplotX-sbin/amreportX-sbin/amrestoreX-sbin/amrmtapeX-sbin/amserverconfigX-sbin/amstatusX-sbin/amtapeX-sbin/amtapetypeX-sbin/amtocX-sbin/amverifyX-sbin/amverifyrunX-@dirrm %%SITE_PERL%%/auto/Amanda/CmdlineX-@dirrm %%SITE_PERL%%/auto/Amanda/DeviceX+libexec/amanda/amcleanupdiskX+%%PLOT%%libexec/amanda/amcat.awkX+libexec/amanda/amandadX+libexec/amanda/amanda-sh-lib.shX+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.soX+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.laX+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.aX+%%SITE_PERL%%/auto/Amanda/Util/libUtil.soX+%%SITE_PERL%%/auto/Amanda/Util/libUtil.laX+%%SITE_PERL%%/auto/Amanda/Util/libUtil.aX+%%SITE_PERL%%/auto/Amanda/Types/libTypes.soX+%%SITE_PERL%%/auto/Amanda/Types/libTypes.laX+%%SITE_PERL%%/auto/Amanda/Types/libTypes.aX+%%SITE_PERL%%/auto/Amanda/Tests/libTests.soX+%%SITE_PERL%%/auto/Amanda/Tests/libTests.laX+%%SITE_PERL%%/auto/Amanda/Tests/libTests.aX+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.soX+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.laX+%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.aX+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.soX+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.laX+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.aX+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.soX+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.laX+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.aX+%%SITE_PERL%%/auto/Amanda/Device/libDevice.soX+%%SITE_PERL%%/auto/Amanda/Device/libDevice.laX+%%SITE_PERL%%/auto/Amanda/Device/libDevice.aX+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.soX+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.laX+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.aX+%%SITE_PERL%%/auto/Amanda/Config/libConfig.soX+%%SITE_PERL%%/auto/Amanda/Config/libConfig.laX+%%SITE_PERL%%/auto/Amanda/Config/libConfig.aX+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.soX+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.laX+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.aX+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.soX+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.laX+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.aX+%%SITE_PERL%%/auto/Amanda/Application/libApplication.soX+%%SITE_PERL%%/auto/Amanda/Application/libApplication.laX+%%SITE_PERL%%/auto/Amanda/Application/libApplication.aX+%%SITE_PERL%%/Amanda/Xfer.pmX+%%SITE_PERL%%/Amanda/Util.pmX+%%SITE_PERL%%/Amanda/Types.pmX+%%SITE_PERL%%/Amanda/Tests.pmX+%%SITE_PERL%%/Amanda/Tapelist.pmX+%%SITE_PERL%%/Amanda/Script_App.pmX+%%SITE_PERL%%/Amanda/Script.pmX+%%SITE_PERL%%/Amanda/Process.pmX+%%SITE_PERL%%/Amanda/Paths.pmX+%%SITE_PERL%%/Amanda/MainLoop.pmX+%%SITE_PERL%%/Amanda/Logfile.pmX+%%SITE_PERL%%/Amanda/Device.pmX+%%SITE_PERL%%/Amanda/Debug.pmX+%%SITE_PERL%%/Amanda/DB/Catalog.pmX+%%SITE_PERL%%/Amanda/Constants.pmX+%%SITE_PERL%%/Amanda/Config.pmX+%%SITE_PERL%%/Amanda/Cmdline.pmX+%%SITE_PERL%%/Amanda/Changer/single.pmX+%%SITE_PERL%%/Amanda/Changer/disk.pmX+%%SITE_PERL%%/Amanda/Changer/compat.pmX+%%SITE_PERL%%/Amanda/Changer.pmX+%%SITE_PERL%%/Amanda/BigIntCompat.pmX+%%SITE_PERL%%/Amanda/Archive.pmX+%%SITE_PERL%%/Amanda/Application/Zfs.pmX+%%SITE_PERL%%/Amanda/Application.pmX+lib/amanda/librestore.soX+lib/amanda/librestore.laX+lib/amanda/librestore.aX+lib/amanda/librestore-%%SHLIBVER%%.soX+lib/amanda/libamxfer.so.0X+lib/amanda/libamxfer.soX+lib/amanda/libamxfer.laX+lib/amanda/libamxfer.aX+lib/amanda/libamserver.soX+lib/amanda/libamserver.laX+lib/amanda/libamserver.aX+lib/amanda/libamserver-%%SHLIBVER%%.soX+lib/amanda/libamglue.soX+lib/amanda/libamglue.laX+lib/amanda/libamglue.aX+lib/amanda/libamdevice.soX+lib/amanda/libamdevice.laX+lib/amanda/libamdevice.aX+lib/amanda/libamdevice-%%SHLIBVER%%.soX+lib/amanda/libamclient.soX+lib/amanda/libamclient.laX+lib/amanda/libamclient.aX+lib/amanda/libamclient-%%SHLIBVER%%.soX+lib/amanda/libamar.soX+lib/amanda/libamar.laX+lib/amanda/libamar.aX+lib/amanda/libamar-%%SHLIBVER%%.soX+lib/amanda/libamandad.soX+lib/amanda/libamandad.laX+lib/amanda/libamandad.aX+lib/amanda/libamandad-%%SHLIBVER%%.soX+lib/amanda/libamanda.soX+lib/amanda/libamanda.laX+lib/amanda/libamanda.aX+lib/amanda/libamanda-%%SHLIBVER%%.soX+@dirrmtry var/amanda/gnutar-listsX+@dirrmtry var/amandaX+@dirrmtry varX+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%X+@dirrm share/amanda/template.dX+@dirrm share/amanda/example/label-templatesX+@dirrm share/amanda/exampleX+@dirrm share/amandaX+@dirrm libexec/amanda/applicationX+@dirrm libexec/amandaX+@dirrm %%SITE_PERL%%/auto/Amanda/XferX+@dirrm %%SITE_PERL%%/auto/Amanda/UtilX+@dirrm %%SITE_PERL%%/auto/Amanda/TypesX+@dirrm %%SITE_PERL%%/auto/Amanda/TestsX+@dirrm %%SITE_PERL%%/auto/Amanda/TapelistX+@dirrm %%SITE_PERL%%/auto/Amanda/MainLoopX @dirrm %%SITE_PERL%%/auto/Amanda/LogfileX-@dirrm %%SITE_PERL%%/auto/Amanda/TapefileX+@dirrm %%SITE_PERL%%/auto/Amanda/DeviceX+@dirrm %%SITE_PERL%%/auto/Amanda/DebugX+@dirrm %%SITE_PERL%%/auto/Amanda/ConfigX+@dirrm %%SITE_PERL%%/auto/Amanda/CmdlineX+@dirrm %%SITE_PERL%%/auto/Amanda/ArchiveX+@dirrm %%SITE_PERL%%/auto/Amanda/ApplicationX+@dirrm %%SITE_PERL%%/auto/AmandaX+@dirrmtry %%SITE_PERL%%/autoX+@dirrm %%SITE_PERL%%/Amanda/DBX+@dirrm %%SITE_PERL%%/Amanda/ChangerX+@dirrm %%SITE_PERL%%/Amanda/ApplicationX+@dirrm %%SITE_PERL%%/AmandaX+@dirrm lib/amandaX @dirrm include/amandaXdiff -ruN amanda-server.orig/pkg-plist.client amanda-server/pkg-plist.clientX--- amanda-server.orig/pkg-plist.client 2009-01-09 05:56:06.736270546 +0100X+++ amanda-server/pkg-plist.client 2009-01-31 12:31:16.290816187 +0100X@@ -1,103 +1,137 @@X-@unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fiX-lib/amanda/libamanda-%%SHLIBVER%%.soX-lib/amanda/libamanda.aX-lib/amanda/libamanda.laX-lib/amanda/libamanda.soX-lib/amanda/libamandad-%%SHLIBVER%%.soX-lib/amanda/libamandad.aX-lib/amanda/libamandad.laX-lib/amanda/libamandad.soX-lib/amanda/libamclient-%%SHLIBVER%%.soX-lib/amanda/libamclient.aX-lib/amanda/libamclient.laX-lib/amanda/libamclient.soX-lib/amanda/libamglue.aX-lib/amanda/libamglue.laX-lib/amanda/libamglue.soX-libexec/amanda/amanda-sh-lib.shX-libexec/amanda/amandadX-libexec/amanda/application/amgtarX-libexec/amanda/application/generic-dumperX-libexec/amanda/calcsizeX-libexec/amanda/killpgrpX-libexec/amanda/noopX-libexec/amanda/patch-systemX-libexec/amanda/rundumpX-libexec/amanda/runtarX-libexec/amanda/selfcheckX-libexec/amanda/sendbackupX-libexec/amanda/sendsizeX+@unexec if cmp -s %%AMANDATES%% /dev/null; then rm -f %%AMANDATES%%; fiX+share/amanda/template.d/tapetypesX+share/amanda/template.d/dumptypesX+share/amanda/template.d/chg-manual.confX+share/amanda/template.d/amanda-tape-changer.confX+share/amanda/template.d/amanda-single-tape.confX+share/amanda/template.d/amanda-harddisk.confX+share/amanda/template.d/amanda-S3.confX+share/amanda/template.d/advanced.confX+share/amanda/template.d/READMEX+share/amanda/example/xinetd.amandaserverX+share/amanda/example/xinetd.amandaclientX+share/amanda/example/label-templates/HP-DAT.psX+share/amanda/example/label-templates/EXB-8500.psX+share/amanda/example/label-templates/DLT.psX+share/amanda/example/label-templates/DLT-A4.psX+share/amanda/example/label-templates/DIN-A4.psX+share/amanda/example/label-templates/8.5x11.psX+share/amanda/example/label-templates/3hole.psX+share/amanda/example/inetd.conf.amandaserverX+share/amanda/example/inetd.conf.amandaclientX+share/amanda/example/amanda.confX+share/amanda/example/amanda-client.confX+share/amanda/ReleaseNotesX+share/amanda/NEWSX+share/amanda/ChangeLogX+share/amanda/COPYRIGHTX+sbin/amrecoverX+sbin/amoldrecoverX+sbin/amgpgcryptX+sbin/amgetconfX+sbin/amcryptsimpleX+sbin/amcrypt-ossl-asymX+sbin/amcrypt-osslX+sbin/amcryptX+sbin/amarchiverX+sbin/amaespipeX libexec/amanda/versionsuffixX-%%SITE_PERL%%/Amanda/Config.pmX-%%SITE_PERL%%/Amanda/Debug.pmX-%%SITE_PERL%%/Amanda/Paths.pmX-%%SITE_PERL%%/Amanda/Types.pmX-%%SITE_PERL%%/Amanda/Util.pmX-%%SITE_PERL%%/auto/Amanda/Config/libConfig.aX-%%SITE_PERL%%/auto/Amanda/Config/libConfig.laX-%%SITE_PERL%%/auto/Amanda/Config/libConfig.soX-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.aX-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.laX-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.soX-%%SITE_PERL%%/auto/Amanda/Types/libTypes.aX-%%SITE_PERL%%/auto/Amanda/Types/libTypes.laX-%%SITE_PERL%%/auto/Amanda/Types/libTypes.soX-%%SITE_PERL%%/auto/Amanda/Util/libUtil.aX-%%SITE_PERL%%/auto/Amanda/Util/libUtil.laX+libexec/amanda/teecountX+libexec/amanda/sendsizeX+libexec/amanda/sendbackupX+libexec/amanda/selfcheckX+libexec/amanda/runtarX+libexec/amanda/rundumpX+libexec/amanda/patch-systemX+libexec/amanda/noopX+libexec/amanda/killpgrpX+libexec/amanda/calcsizeX+libexec/amanda/application/script-emailX+libexec/amanda/application/amzfs-snapshotX+libexec/amanda/application/amzfs-sendrecvX+libexec/amanda/application/amstarX+libexec/amanda/application/amsambaX+libexec/amanda/application/amlog-scriptX+libexec/amanda/application/amgtar_perlX+libexec/amanda/application/amgtarX+libexec/amanda/amandadX+libexec/amanda/amanda-sh-lib.shX %%SITE_PERL%%/auto/Amanda/Util/libUtil.soX-sbin/amaespipeX-sbin/amcryptX-sbin/amcrypt-osslX-sbin/amcrypt-ossl-asymX-sbin/amcryptsimpleX-sbin/amgpgcryptX-sbin/amoldrecoverX-sbin/amrecoverX-share/amanda/COPYRIGHTX-share/amanda/ChangeLogX-share/amanda/NEWSX-share/amanda/ReleaseNotesX-share/examples/amanda/amanda.confX-share/examples/amanda/chg-multi.confX-share/examples/amanda/chg-scsi.confX-share/examples/amanda/disklistX-var/lib/amanda/example/amanda-client.confX-var/lib/amanda/example/amanda.confX-var/lib/amanda/example/inetd.conf.amandaclientX-var/lib/amanda/example/label-templates/3hole.psX-var/lib/amanda/example/label-templates/8.5x11.psX-var/lib/amanda/example/label-templates/DIN-A4.psX-var/lib/amanda/example/label-templates/DLT-A4.psX-var/lib/amanda/example/label-templates/DLT.psX-var/lib/amanda/example/label-templates/EXB-8500.psX-var/lib/amanda/example/label-templates/HP-DAT.psX-var/lib/amanda/example/xinetd.amandaclientX-var/lib/amanda/example/xinetd.amandaserverX-var/lib/amanda/template.d/READMEX-var/lib/amanda/template.d/advanced.confX-var/lib/amanda/template.d/amanda-S3.confX-var/lib/amanda/template.d/amanda-harddisk.confX-var/lib/amanda/template.d/amanda-single-tape.confX-var/lib/amanda/template.d/amanda-tape-changer.confX-var/lib/amanda/template.d/chg-manual.confX-var/lib/amanda/template.d/dumptypesX-var/lib/amanda/template.d/tapetypesX-@dirrm %%SITE_PERL%%/auto/Amanda/UtilX-@dirrm %%SITE_PERL%%/auto/Amanda/TypesX-@dirrm %%SITE_PERL%%/auto/Amanda/DebugX-@dirrm %%SITE_PERL%%/auto/Amanda/ConfigX-@dirrm %%SITE_PERL%%/auto/AmandaX-@dirrm %%SITE_PERL%%/AmandaX-@dirrm var/lib/amanda/template.dX-@dirrm var/lib/amanda/example/label-templatesX-@dirrm var/lib/amanda/exampleX-@dirrm var/lib/amandaX-@dirrmtry var/libX+%%SITE_PERL%%/auto/Amanda/Util/libUtil.laX+%%SITE_PERL%%/auto/Amanda/Util/libUtil.aX+%%SITE_PERL%%/auto/Amanda/Types/libTypes.soX+%%SITE_PERL%%/auto/Amanda/Types/libTypes.laX+%%SITE_PERL%%/auto/Amanda/Types/libTypes.aX+%%SITE_PERL%%/auto/Amanda/Tests/libTests.soX+%%SITE_PERL%%/auto/Amanda/Tests/libTests.laX+%%SITE_PERL%%/auto/Amanda/Tests/libTests.aX+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.soX+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.laX+%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.aX+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.soX+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.laX+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.aX+%%SITE_PERL%%/auto/Amanda/Config/libConfig.soX+%%SITE_PERL%%/auto/Amanda/Config/libConfig.laX+%%SITE_PERL%%/auto/Amanda/Config/libConfig.aX+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.soX+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.laX+%%SITE_PERL%%/auto/Amanda/Archive/libArchive.aX+%%SITE_PERL%%/auto/Amanda/Application/libApplication.soX+%%SITE_PERL%%/auto/Amanda/Application/libApplication.laX+%%SITE_PERL%%/auto/Amanda/Application/libApplication.aX+%%SITE_PERL%%/Amanda/Util.pmX+%%SITE_PERL%%/Amanda/Types.pmX+%%SITE_PERL%%/Amanda/Tests.pmX+%%SITE_PERL%%/Amanda/Script_App.pmX+%%SITE_PERL%%/Amanda/Script.pmX+%%SITE_PERL%%/Amanda/Paths.pmX+%%SITE_PERL%%/Amanda/MainLoop.pmX+%%SITE_PERL%%/Amanda/Debug.pmX+%%SITE_PERL%%/Amanda/Constants.pmX+%%SITE_PERL%%/Amanda/Config.pmX+%%SITE_PERL%%/Amanda/BigIntCompat.pmX+%%SITE_PERL%%/Amanda/Archive.pmX+%%SITE_PERL%%/Amanda/Application/Zfs.pmX+%%SITE_PERL%%/Amanda/Application.pmX+lib/amanda/libamglue.soX+lib/amanda/libamglue.laX+lib/amanda/libamglue.aX+lib/amanda/libamclient.soX+lib/amanda/libamclient.laX+lib/amanda/libamclient.aX+lib/amanda/libamclient-%%SHLIBVER%%.soX+lib/amanda/libamar.soX+lib/amanda/libamar.laX+lib/amanda/libamar.aX+lib/amanda/libamar-%%SHLIBVER%%.soX+lib/amanda/libamandad.soX+lib/amanda/libamandad.laX+lib/amanda/libamandad.aX+lib/amanda/libamandad-%%SHLIBVER%%.soX+lib/amanda/libamanda.soX+lib/amanda/libamanda.laX+lib/amanda/libamanda.aX+lib/amanda/libamanda-%%SHLIBVER%%.soX @dirrmtry var/amanda/gnutar-listsX @dirrmtry var/amandaX @dirrmtry varX-@dirrm share/examples/amandaX+@dirrm share/amanda/template.dX+@dirrm share/amanda/example/label-templatesX+@dirrm share/amanda/exampleX @dirrm share/amandaX @dirrm libexec/amanda/applicationX @dirrm libexec/amandaX+@dirrm %%SITE_PERL%%/auto/Amanda/UtilX+@dirrm %%SITE_PERL%%/auto/Amanda/TypesX+@dirrm %%SITE_PERL%%/auto/Amanda/TestsX+@dirrm %%SITE_PERL%%/auto/Amanda/MainLoopX+@dirrm %%SITE_PERL%%/auto/Amanda/DebugX+@dirrm %%SITE_PERL%%/auto/Amanda/ConfigX+@dirrm %%SITE_PERL%%/auto/Amanda/ArchiveX+@dirrm %%SITE_PERL%%/auto/Amanda/ApplicationX+@dirrm %%SITE_PERL%%/auto/AmandaX+@dirrmtry %%SITE_PERL%%/autoX+@dirrm %%SITE_PERL%%/Amanda/ApplicationX+@dirrm %%SITE_PERL%%/AmandaX @dirrm lib/amandaXdiff -ruN amanda-client.orig/Makefile amanda-client/MakefileX--- amanda-client.orig/Makefile 2009-01-09 05:56:06.734270097 +0100X+++ amanda-client/Makefile 2009-01-31 12:23:34.193970795 +0100X@@ -2,17 +2,18 @@X # Date created: 28th Feb 1995X # Whom: gpalmerX #X-# $FreeBSD: ports/misc/amanda-client/Makefile,v 1.63 2009/01/09 01:48:48 kuriyama Exp $X+# $FreeBSD: $X #X X PKGNAMESUFFIX= -clientX-PORTREVISION= 1X X COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)X X-MASTERDIR= ${.CURDIR}/../amanda-serverX+MASTERDIR= ${.CURDIR}/../amandaX PKGINSTALL= mustnotexistX X+CONFLICTS= amanda-server-*X+X PLIST= ${PKGDIR}/pkg-plist.clientX X CLIENT_ONLY= yese97ad6bb25843b8253e9fde628cbbdc8exit
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=93313">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 131193
:
93312
| 93313