misc/128836: [UPDATE] misc/amanda-* to version 2.6.0p2

Goran Lowkrantz glz at hidden-powers.com
Thu Nov 13 00:10:07 PST 2008


>Number:         128836
>Category:       misc
>Synopsis:       [UPDATE] misc/amanda-* to version 2.6.0p2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 13 08:10:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Goran Lowkrantz
>Release:        6.3-STABLE, 7.1-PRERELEASE, 8.0-CURRENT
>Organization:
>Environment:
FreeBSD balder.glz.hidden-powers.com 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Wed Oct  8 12:06:03 CEST 2008     root at midgard.glz.hidden-powers.com:/usr/obj/usr/src/sys/BALDER  amd64

>Description:
Patches to current port of misc/amanda-server and misc/amanda-client to current stable from Amanda.
>How-To-Repeat:

>Fix:
Attached patch in shar format

Patch attached with submission follows:

# 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.0p2.diff
#
echo x - amanda-2.6.0p2.diff
sed 's/^X//' >amanda-2.6.0p2.diff << '09b76cd57b60565242d43c0a2a61bd1e'
Xdiff -ruN amanda-server.orig/Makefile amanda-server/Makefile
X--- amanda-server.orig/Makefile	2008-08-21 08:17:43.000000000 +0200
X+++ amanda-server/Makefile	2008-10-24 21:50:34.000000000 +0200
X@@ -6,13 +6,12 @@
X #
X 
X PORTNAME=	amanda
X-PORTVERSION=	2.5.1p3
X-PORTREVISION?=	5
X-PKGNAMESUFFIX?=	-server
X+PORTVERSION=	2.6.0p2
X PORTEPOCH=	1
X CATEGORIES=	misc
X MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
X MASTER_SITE_SUBDIR=	amanda
X+PKGNAMESUFFIX?=	-server
X 
X MAINTAINER=	kuriyama at FreeBSD.org
X COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
X@@ -21,15 +20,20 @@
X SLAVEDIRS=	misc/amanda-client
X 
X LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
X-USE_AUTOTOOLS=	autoconf:262
X+GNU_CONFIGURE=	yes
X+USE_GNOME=	pkgconfig glib20
X USE_GMAKE=	yes
X USE_OPENSSL=	yes
X PATCH_STRIP=
X CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
X+		--without-amlibexecdir \
X 		--with-amandahosts --with-fqdn \
X 		--with-dump-honor-nodump --with-buffered-dump \
X 		--disable-libtool --prefix=${PREFIX} \
X-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
X+		--disable-glibtest \
X+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
X+		--with-bsdtcp-security --with-bsdudp-security
X+
X USE_LDCONFIG=	yes
X WANT_PERL=	yes
X 
X@@ -61,10 +65,6 @@
X CONFIGURE_ARGS+=	--with-ssh-security
X .endif
X 
X-# AMANDA_PORTRANGE is obsoleted.  Use AMANDA_TCPPORTRANGE instead.
X-.if defined (AMANDA_PORTRANGE)
X-AMANDA_TCPPORTRANGE=	${AMANDA_PORTRANGE}
X-.endif
X .if defined (AMANDA_TCPPORTRANGE)
X CONFIGURE_ARGS+=	--with-tcpportrange=${AMANDA_TCPPORTRANGE}
X .endif
X@@ -103,24 +103,21 @@
X 	@${ECHO} "        The default is no restriction on UDP ports."
X 	@${ECHO} ""
X 
X-post-patch:
X-	@${REINPLACE_CMD} \
X-		-e 's|^OPENSSL=.*$$|OPENSSL=${OPENSSLBASE}/bin/openssl|' \
X-		${WRKSRC}/server-src/amcrypt-ossl.sh.in \
X-		${WRKSRC}/server-src/amcrypt-ossl-asym.sh.in
X-
X USE_PERL5=	yes
X 
X-BUILD_DEPENDS+=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
X-RUN_DEPENDS+=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
X+BUILD_DEPENDS+=	${PREFIX}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
X+RUN_DEPENDS+=	${PREFIX}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
X 
X CONFIGURE_ARGS+=--without-client
X 
X-MAN8=		amadmin.8 amaespipe.8 amcheck.8 \
X-		amcheckdb.8 amcleanup.8 \
X-		amcrypt.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 amdd.8 \
X-		amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
X-		amoverview.8 amreport.8 amrmtape.8 amstatus.8 \
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.8
X 
X OPTIONS+=	PLOT "enable ploting, requires X11 libraries" off\
X@@ -197,7 +194,7 @@
X CONFIGURE_ARGS+=--without-server
X 
X MAN5=		amanda.conf.5 amanda-client.conf.5
X-MAN8=		amanda.8 amrecover.8 amrestore.8
X+MAN8=		amanda.8 amrecover.8
X 
X OPTIONS+=	DUMP_SNAPSHOT "use snapshot by using dump -L" off
X 
X@@ -210,8 +207,8 @@
X 		${PREFIX}/share/examples/amanda
X 	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
X 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
X-	${TOUCH} /etc/amandates
X-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
X+	${TOUCH} ${PREFIX}/var/amanda/amandates
X+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/amandates
X 
X .if defined (WITH_DUMP_SNAPSHOT)
X EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
X@@ -222,5 +219,6 @@
X # Maintainer TODO:
X #   o amanda-server installs lib/libamandad.a which should be handled by
X #     amanda-client only.
X+#   o man pages have incorrect markups.
X 
X .include <bsd.port.post.mk>
Xdiff -ruN amanda-server.orig/distinfo amanda-server/distinfo
X--- amanda-server.orig/distinfo	2007-02-09 10:29:38.000000000 +0100
X+++ amanda-server/distinfo	2008-08-30 13:06:16.000000000 +0200
X@@ -1,3 +1,3 @@
X-MD5 (amanda-2.5.1p3.tar.gz) = 7232da6d43543f2c7dac2ded21c65ee9
X-SHA256 (amanda-2.5.1p3.tar.gz) = 64e60f323a89a8a064936334335cfde6cf41e6127f7f8b1c9b6de2d393de3f72
X-SIZE (amanda-2.5.1p3.tar.gz) = 1905664
X+MD5 (amanda-2.6.0p2.tar.gz) = 75dcba5a75327ebcd4f197a93b8e8c9c
X+SHA256 (amanda-2.6.0p2.tar.gz) = 3830d9c95cfe72e63aea5179208851a141481b037ec4060bf3d5829bf50e6ae3
X+SIZE (amanda-2.6.0p2.tar.gz) = 2402088
Xdiff -ruN amanda-server.orig/files/patch-aa amanda-server/files/patch-aa
X--- amanda-server.orig/files/patch-aa	2006-11-06 23:44:04.000000000 +0100
X+++ amanda-server/files/patch-aa	1970-01-01 01:00:00.000000000 +0100
X@@ -1,39 +0,0 @@
X---- man/Makefile.in.orig	Tue Sep  5 23:08:22 2006
X-+++ man/Makefile.in	Thu Sep  7 14:14:52 2006
X-@@ -193,8 +193,8 @@
X- WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@
X- WANT_RECOVER_FALSE = @WANT_RECOVER_FALSE@
X- WANT_RECOVER_TRUE = @WANT_RECOVER_TRUE@
X--WANT_RESTORE_FALSE = @WANT_RESTORE_FALSE@
X--WANT_RESTORE_TRUE = @WANT_RESTORE_TRUE@
X-+WANT_CLIENT_FALSE = @WANT_CLIENT_FALSE@
X-+WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@
X- WANT_RUNTIME_PSEUDO_RELOC_FALSE = @WANT_RUNTIME_PSEUDO_RELOC_FALSE@
X- WANT_RUNTIME_PSEUDO_RELOC_TRUE = @WANT_RUNTIME_PSEUDO_RELOC_TRUE@
X- WANT_SAMBA_FALSE = @WANT_SAMBA_FALSE@
X-@@ -261,13 +261,13 @@
X- target_os = @target_os@
X- target_vendor = @target_vendor@
X- @WANT_AMPLOT_TRUE at AMPLOT_MAN8_PAGES = amplot.8
X--COMMON_MAN8_PAGES = amanda.8
X--COMMON_MAN5_PAGES = amanda.conf.5 \
X-+ at WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8
X-+ at WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 \
X- 		    amanda-client.conf.5
X- 
X- 
X- #if WANT_SERVER
X--SERVER_MAN8_PAGES = amadmin.8 \
X-+ at WANT_SERVER_TRUE@SERVER_MAN8_PAGES = amadmin.8 \
X- 		    amcheck.8 \
X- 		    amcheckdb.8 \
X- 		    amcleanup.8 \
X-@@ -294,7 +294,7 @@
X- 
X- #endif
X- @WANT_RECOVER_TRUE at RECOVER_MAN8_PAGES = amrecover.8
X-- at WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8
X-+ at WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8
X- man8_MANS = $(COMMON_MAN8_PAGES) \
X- 	    $(AMPLOT_MAN8_PAGES) \
X- 	    $(SERVER_MAN8_PAGES) \
Xdiff -ruN amanda-server.orig/files/patch-ab amanda-server/files/patch-ab
X--- amanda-server.orig/files/patch-ab	2002-05-23 23:06:27.000000000 +0200
X+++ amanda-server/files/patch-ab	1970-01-01 01:00:00.000000000 +0100
X@@ -1,12 +0,0 @@
X---- common-src/Makefile.in	Fri Nov 30 11:33:48 2001
X-+++ common-src/Makefile.in.new	Fri Nov 30 18:03:29 2001
X-@@ -611,7 +611,8 @@
X- 
X- install-data-am:
X- 
X--install-exec-am: install-libLTLIBRARIES
X-+ at WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE at install-libLTLIBRARIES
X-+ at WANT_SERVER_TRUE@install-exec-am:
X- 
X- install-info:
X- 
Xdiff -ruN amanda-server.orig/files/patch-ac amanda-server/files/patch-ac
X--- amanda-server.orig/files/patch-ac	2006-03-22 04:56:12.000000000 +0100
X+++ amanda-server/files/patch-ac	1970-01-01 01:00:00.000000000 +0100
X@@ -1,11 +0,0 @@
X---- tape-src/Makefile.in.orig	Tue Oct 25 06:23:42 2005
X-+++ tape-src/Makefile.in	Wed Mar 22 12:10:00 2006
X-@@ -43,7 +43,7 @@
X- build_triplet = @build@
X- host_triplet = @host@
X- target_triplet = @target@
X--sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
X-+ at WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
X- EXTRA_PROGRAMS = $(am__EXEEXT_1)
X- subdir = tape-src
X- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
Xdiff -ruN amanda-server.orig/files/patch-ad amanda-server/files/patch-ad
X--- amanda-server.orig/files/patch-ad	2003-10-24 01:35:31.000000000 +0200
X+++ amanda-server/files/patch-ad	2008-08-30 13:12:20.000000000 +0200
X@@ -1,14 +1,14 @@
X---- client-src/calcsize.c.orig	Mon Nov  4 20:37:53 2002
X-+++ client-src/calcsize.c	Thu Oct 23 19:25:07 2003
X-@@ -130,7 +130,11 @@
X- 	dump_total += (ST_BLOCKS(finfo) + 1)/2 + 1;
X- 	gtar_total += ROUND(4,(ST_BLOCKS(finfo) + 1));
X+--- client-src/calcsize.c.orig	2008-01-18 09:31:16.000000000 +0900
X++++ client-src/calcsize.c	2008-08-30 20:11:59.000000000 +0900
X+@@ -160,7 +160,11 @@
X+ 	dump_total += (ST_BLOCKS(finfo) + (off_t)1) / (off_t)2 + (off_t)1;
X+ 	gtar_total += ROUND(4,(ST_BLOCKS(finfo) + (off_t)1));
X      }
X +#ifdef GNUTAR
X-+    printf("           GNUTAR           dump\n");
X++    g_printf("           GNUTAR           dump\n");
X +#else
X-     printf("           gtar           dump\n");
X+     g_printf("           gtar           dump\n");
X +#endif
X-     printf("total      %-9lu         %-9lu\n",gtar_total,dump_total);
X+     g_printf("total      %-9lu         %-9lu\n",gtar_total,dump_total);
X      return 0;
X  #else
Xdiff -ruN amanda-server.orig/files/patch-ae amanda-server/files/patch-ae
X--- amanda-server.orig/files/patch-ae	2006-11-06 23:44:04.000000000 +0100
X+++ amanda-server/files/patch-ae	1970-01-01 01:00:00.000000000 +0100
X@@ -1,14 +0,0 @@
X---- client-src/sendbackup-gnutar.c.orig	Wed Jul 26 03:35:21 2006
X-+++ client-src/sendbackup-gnutar.c	Thu Sep  7 12:13:59 2006
X-@@ -543,7 +543,11 @@
X- 	    my_argv[i++] = g_options->config;
X- 	else
X- 	    my_argv[i++] = "NOCONFIG";
X-+#ifdef GNUTAR
X-+	my_argv[i++] = "GNUTAR";
X-+#else
X- 	my_argv[i++] = "gtar";
X-+#endif
X- 	my_argv[i++] = "--create";
X- 	my_argv[i++] = "--file";
X- 	my_argv[i++] = "-";
Xdiff -ruN amanda-server.orig/files/patch-chg-zd-mtx.sh.in amanda-server/files/patch-chg-zd-mtx.sh.in
X--- amanda-server.orig/files/patch-chg-zd-mtx.sh.in	2006-03-22 04:56:12.000000000 +0100
X+++ amanda-server/files/patch-chg-zd-mtx.sh.in	2008-09-27 22:36:09.000000000 +0200
X@@ -1,6 +1,6 @@
X---- changer-src/chg-zd-mtx.sh.in.orig	Wed Feb  9 21:58:30 2005
X-+++ changer-src/chg-zd-mtx.sh.in	Wed Feb  9 21:58:49 2005
X-@@ -413,7 +413,7 @@
X+--- changer-src/chg-zd-mtx.sh.orig	2008-05-26 19:25:32.000000000 +0200
X++++ changer-src/chg-zd-mtx.sh	2008-09-27 22:33:35.000000000 +0200
X+@@ -411,7 +411,7 @@
X  
X  IsNumeric() {
X  	test -z "$1" && return 1
X@@ -9,3 +9,12 @@
X  	return `expr X"$1" != X"$x"`
X  }
X  
X+@@ -797,7 +797,7 @@
X+ max_drive_wait=${max_drive_wait:-'120'}			# default: two minutes
X+ 
X+ # check MT and MTX for sanity
X+-if test "${MTX:0:1}" = "/"; then
X++if test "${MTX%${MTX#?}}" = "/"; then
X+     if ! test -f "${MTX}"; then
X+ 	Exit 2 \
X+ 	    `_ '<none>'` \
Xdiff -ruN amanda-server.orig/files/patch-common-src::Makefile.in amanda-server/files/patch-common-src::Makefile.in
X--- amanda-server.orig/files/patch-common-src::Makefile.in	1970-01-01 01:00:00.000000000 +0100
X+++ amanda-server/files/patch-common-src::Makefile.in	2008-09-01 00:42:46.000000000 +0200
X@@ -0,0 +1,42 @@
X+--- common-src/Makefile.in.orig	2008-08-23 03:20:00.000000000 +0900
X++++ common-src/Makefile.in	2008-09-01 07:42:20.000000000 +0900
X+@@ -926,12 +926,14 @@
X+ sbin_SCRIPTS_PERL = \
X+ 	    amgpgcrypt \
X+ 	    amcryptsimple
X++ at WANT_SERVER_TRUE@sbin_SCRIPTS_PERL =
X+ 
X+ sbin_SCRIPTS_SHELL = \
X+ 	    amcrypt \
X+ 	    amaespipe \
X+ 	    amcrypt-ossl \
X+ 	    amcrypt-ossl-asym
X++ at 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.in
X+ 	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+-	done
X++ at WANT_CLIENT_TRUE@	@$(NORMAL_INSTALL)
X++ at WANT_CLIENT_TRUE@	test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
X++ at WANT_CLIENT_TRUE@	@list='$(amlib_LTLIBRARIES)'; for p in $$list; do \
X++ at WANT_CLIENT_TRUE@	  if test -f $$p; then \
X++ at WANT_CLIENT_TRUE@	    f=$(am__strip_dir) \
X++ at WANT_CLIENT_TRUE@	    echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
X++ at WANT_CLIENT_TRUE@	    $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
X++ at WANT_CLIENT_TRUE@	  else :; fi; \
X++ at WANT_CLIENT_TRUE@	done
X+ 
X+ uninstall-amlibLTLIBRARIES:
X+ 	@$(NORMAL_UNINSTALL)
Xdiff -ruN amanda-server.orig/files/patch-man::Makefile.in amanda-server/files/patch-man::Makefile.in
X--- amanda-server.orig/files/patch-man::Makefile.in	1970-01-01 01:00:00.000000000 +0100
X+++ amanda-server/files/patch-man::Makefile.in	2008-08-31 15:28:16.000000000 +0200
X@@ -0,0 +1,10 @@
X+--- man/Makefile.in.orig	2008-08-31 22:27:26.000000000 +0900
X++++ man/Makefile.in	2008-08-31 22:27:46.000000000 +0900
X+@@ -565,6 +565,7 @@
X+ COMMON_MAN_PAGES = amanda.8 \
X+ 		    amanda.conf.5 \
X+ 		    amanda-client.conf.5
X++ at 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.in
X--- amanda-server.orig/files/patch-perl::Makefile.in	1970-01-01 01:00:00.000000000 +0100
X+++ amanda-server/files/patch-perl::Makefile.in	2008-09-02 00:37:02.000000000 +0200
X@@ -0,0 +1,115 @@
X+--- perl/Makefile.in.orig	2008-08-23 03:20:01.000000000 +0900
X++++ perl/Makefile.in	2008-09-02 07:36:59.000000000 +0900
X+@@ -291,15 +291,15 @@
X+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
X+ 	$(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@
X+ @WANT_SERVER_TRUE at am_libCmdline_la_rpath = -rpath $(libCmdlinedir)
X+-libConfig_la_DEPENDENCIES = libamglue.la \
X+-	$(top_builddir)/common-src/libamanda.la
X++ at WANT_CLIENT_TRUE@libConfig_la_DEPENDENCIES = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X+ 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.la
X++ at WANT_CLIENT_TRUE@libDebug_la_DEPENDENCIES = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X+ 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 at am_libTapefile_la_rpath = -rpath $(libTapefiledir)
X+-libTypes_la_DEPENDENCIES = libamglue.la \
X+-	$(top_builddir)/common-src/libamanda.la
X++ at WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X+ 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.la
X+-am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
X++ at WANT_CLIENT_TRUE@libUtil_la_DEPENDENCIES = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X++ at 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.lo
X++ at WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo
X+ 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::Debug
X+-libDebugdir = $(amperldir)/auto/Amanda/Debug
X+-libDebug_LTLIBRARIES = libDebug.la
X+-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.la
X++ at WANT_CLIENT_TRUE@libDebugdir = $(amperldir)/auto/Amanda/Debug
X++ at WANT_CLIENT_TRUE@libDebug_LTLIBRARIES = libDebug.la
X++ at WANT_CLIENT_TRUE@libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
X++ at WANT_CLIENT_TRUE@libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X++ at WANT_CLIENT_TRUE@libDebug_la_LIBADD = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X+ 
X+ 
X+ # PACKAGE: Amanda::Config
X+-libConfigdir = $(amperldir)/auto/Amanda/Config
X+-libConfig_LTLIBRARIES = libConfig.la
X+-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.la
X++ at WANT_CLIENT_TRUE@libConfigdir = $(amperldir)/auto/Amanda/Config
X++ at WANT_CLIENT_TRUE@libConfig_LTLIBRARIES = libConfig.la
X++ at WANT_CLIENT_TRUE@libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
X++ at WANT_CLIENT_TRUE@libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X++ at WANT_CLIENT_TRUE@libConfig_la_LIBADD = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X+ 
X+ 
X+ # PACKAGE: Amanda::Util
X+-libUtildir = $(amperldir)/auto/Amanda/Util
X+-libUtil_LTLIBRARIES = libUtil.la
X+-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.la
X++ at WANT_CLIENT_TRUE@libUtildir = $(amperldir)/auto/Amanda/Util
X++ at WANT_CLIENT_TRUE@libUtil_LTLIBRARIES = libUtil.la
X++ at WANT_CLIENT_TRUE@libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
X++ at WANT_CLIENT_TRUE@libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X++ at WANT_CLIENT_TRUE@libUtil_la_LIBADD = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X+ 
X+ 
X+ # PACKAGE: Amanda::Types
X+-libTypesdir = $(amperldir)/auto/Amanda/Types
X+-libTypes_LTLIBRARIES = libTypes.la
X+-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.la
X++ at WANT_CLIENT_TRUE@libTypesdir = $(amperldir)/auto/Amanda/Types
X++ at WANT_CLIENT_TRUE@libTypes_LTLIBRARIES = libTypes.la
X++ at WANT_CLIENT_TRUE@libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
X++ at WANT_CLIENT_TRUE@libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
X++ at WANT_CLIENT_TRUE@libTypes_la_LIBADD = libamglue.la \
X++ at WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
X+ 
X+ 
X+ # perl doesn't use the cyg prefix and it doesn't search in the bin
Xdiff -ruN amanda-server.orig/files/patch-sendsize.c amanda-server/files/patch-sendsize.c
X--- amanda-server.orig/files/patch-sendsize.c	2007-02-15 03:18:38.000000000 +0100
X+++ amanda-server/files/patch-sendsize.c	1970-01-01 01:00:00.000000000 +0100
X@@ -1,11 +0,0 @@
X---- client-src/sendsize.c.orig	Thu Feb 15 11:11:39 2007
X-+++ client-src/sendsize.c	Thu Feb 15 11:12:03 2007
X-@@ -1190,7 +1190,7 @@
X- #  endif
X- 	dumpkeys = vstralloc(level_str,
X- 			     PARAM_DUMP_ESTIMATE,
X--			     PARAM_DUMP_ESTIMATE,
X-+			     PARAM_HONOR_NODUMP,
X- 			     "s", "f", NULL);
X- 
X- #  ifdef HAVE_DUMP_ESTIMATE
Xdiff -ruN amanda-server.orig/files/patch-server-src::amcleanup.sh amanda-server/files/patch-server-src::amcleanup.sh
X--- amanda-server.orig/files/patch-server-src::amcleanup.sh	1970-01-01 01:00:00.000000000 +0100
X+++ amanda-server/files/patch-server-src::amcleanup.sh	2008-09-28 08:24:38.000000000 +0200
X@@ -0,0 +1,11 @@
X+--- server-src/amcleanup.sh.orig	2008-09-28 08:21:09.000000000 +0200
X++++ server-src/amcleanup.sh	2008-09-28 08:21:22.000000000 +0200
X+@@ -75,7 +75,7 @@
X+ #   after receiving SIGTERM,  if yes send SIGKILL  
X+ #
X+ 
X+-function killpid() {
X++killpid() {
X+ 
X+ killPID=$1
X+ SIGTERM=15
Xdiff -ruN amanda-server.orig/files/patch-server-src::amcrypt-ossl-asym.sh.in amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
X--- amanda-server.orig/files/patch-server-src::amcrypt-ossl-asym.sh.in	2008-07-25 01:27:50.000000000 +0200
X+++ amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in	1970-01-01 01:00:00.000000000 +0100
X@@ -1,11 +0,0 @@
X---- server-src/amcrypt-ossl-asym.sh.in.orig	2006-07-04 13:28:47.000000000 +0200
X-+++ server-src/amcrypt-ossl-asym.sh.in	2008-07-12 12:11:30.000000000 +0200
X-@@ -36,7 +36,7 @@
X- # change these as needed
X- OPENSSL=			# whatever's in $PATH
X- CIPHER=aes-256-cbc		# see `openssl help` for more ciphers
X--AMANDA_HOME=~amandabackup
X-+AMANDA_HOME=~@CLIENT_LOGIN@
X- RANDFILE=$AMANDA_HOME/.rnd
X- export RANDFILE
X- PASSPHRASE=$AMANDA_HOME/.am_passphrase	# optional
Xdiff -ruN amanda-server.orig/files/patch-server-src::amcrypt-ossl.sh.in amanda-server/files/patch-server-src::amcrypt-ossl.sh.in
X--- amanda-server.orig/files/patch-server-src::amcrypt-ossl.sh.in	2008-07-25 01:27:50.000000000 +0200
X+++ amanda-server/files/patch-server-src::amcrypt-ossl.sh.in	1970-01-01 01:00:00.000000000 +0100
X@@ -1,11 +0,0 @@
X---- server-src/amcrypt-ossl.sh.in.orig	2006-07-04 13:28:47.000000000 +0200
X-+++ server-src/amcrypt-ossl.sh.in	2008-07-12 12:11:35.000000000 +0200
X-@@ -7,7 +7,7 @@
X- # change these as needed
X- OPENSSL=			# whatever's in $PATH
X- CIPHER=aes-256-cbc		# see `openssl help` for more ciphers
X--AMANDA_HOME=~amandabackup
X-+AMANDA_HOME=~@CLIENT_LOGIN@
X- RANDFILE=$AMANDA_HOME/.rnd
X- export RANDFILE
X- PASSPHRASE=$AMANDA_HOME/.am_passphrase	# required
Xdiff -ruN amanda-server.orig/pkg-plist amanda-server/pkg-plist
X--- amanda-server.orig/pkg-plist	2006-11-06 23:44:03.000000000 +0100
X+++ amanda-server/pkg-plist	2008-08-31 15:24:31.000000000 +0200
X@@ -1,15 +1,36 @@
X-lib/libamserver-%%SHLIBVER%%.so
X-lib/libamserver.so
X-lib/libamserver.la
X-lib/libamserver.a
X-lib/libamtape-%%SHLIBVER%%.so
X-lib/libamtape.so
X-lib/libamtape.la
X-lib/libamtape.a
X-lib/librestore-%%SHLIBVER%%.so
X-lib/librestore.a
X-lib/librestore.la
X-lib/librestore.so
X+lib/amanda/libamdevice-%%SHLIBVER%%.so
X+lib/amanda/libamdevice.a
X+lib/amanda/libamdevice.la
X+lib/amanda/libamdevice.so
X+lib/amanda/libamserver-%%SHLIBVER%%.so
X+lib/amanda/libamserver.a
X+lib/amanda/libamserver.la
X+lib/amanda/libamserver.so
X+lib/amanda/libamtape-%%SHLIBVER%%.so
X+lib/amanda/libamtape.a
X+lib/amanda/libamtape.la
X+lib/amanda/libamtape.so
X+lib/amanda/librestore-%%SHLIBVER%%.so
X+lib/amanda/librestore.a
X+lib/amanda/librestore.la
X+lib/amanda/librestore.so
X+%%SITE_PERL%%/Amanda/Changer.pm
X+%%SITE_PERL%%/Amanda/Cmdline.pm
X+%%SITE_PERL%%/Amanda/Device.pm
X+%%SITE_PERL%%/Amanda/Logfile.pm
X+%%SITE_PERL%%/Amanda/Tapefile.pm
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la
X+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.a
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.la
X+%%SITE_PERL%%/auto/Amanda/Device/libDevice.so
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la
X+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
X+%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.a
X+%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.la
X+%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.so
X %%PLOT%%libexec/amanda/amcat.awk
X libexec/amanda/amcleanupdisk
X libexec/amanda/amindexd
X@@ -24,6 +45,7 @@
X libexec/amanda/chg-disk
X libexec/amanda/chg-iomega
X libexec/amanda/chg-juke
X+libexec/amanda/chg-lib.sh
X libexec/amanda/chg-manual
X libexec/amanda/chg-mcutil
X libexec/amanda/chg-mtx
X@@ -39,15 +61,14 @@
X libexec/amanda/dumper
X libexec/amanda/planner
X libexec/amanda/taper
X+sbin/amaddclient
X sbin/amadmin
X-sbin/amaespipe
X sbin/amcheck
X sbin/amcheckdb
X+sbin/amcheckdump
X sbin/amcleanup
X-sbin/amcrypt
X-sbin/amcrypt-ossl
X-sbin/amcrypt-ossl-asym
X sbin/amdd
X+sbin/amdevcheck
X sbin/amdump
X sbin/amfetchdump
X sbin/amflush
X@@ -59,9 +80,15 @@
X sbin/amreport
X sbin/amrestore
X sbin/amrmtape
X+sbin/amserverconfig
X sbin/amstatus
X sbin/amtape
X sbin/amtapetype
X sbin/amtoc
X sbin/amverify
X sbin/amverifyrun
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Device
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Logfile
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Tapefile
X+ at dirrm include/amanda
Xdiff -ruN amanda-server.orig/pkg-plist.client amanda-server/pkg-plist.client
X--- amanda-server.orig/pkg-plist.client	2007-02-09 10:29:38.000000000 +0100
X+++ amanda-server/pkg-plist.client	2008-09-28 00:53:09.000000000 +0200
X@@ -1,19 +1,22 @@
X- at unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi
X-dumper/generic-dumper
X-dumper/gnutar
X-lib/libamandad-%%SHLIBVER%%.so
X-lib/libamandad.so
X-lib/libamandad.la
X-lib/libamandad.a
X-lib/libamanda-%%SHLIBVER%%.so
X-lib/libamanda.so
X-lib/libamanda.la
X-lib/libamanda.a
X-lib/libamclient-%%SHLIBVER%%.so
X-lib/libamclient.so
X-lib/libamclient.la
X-lib/libamclient.a
X+lib/amanda/libamanda-%%SHLIBVER%%.so
X+lib/amanda/libamanda.a
X+lib/amanda/libamanda.la
X+lib/amanda/libamanda.so
X+lib/amanda/libamandad-%%SHLIBVER%%.so
X+lib/amanda/libamandad.a
X+lib/amanda/libamandad.la
X+lib/amanda/libamandad.so
X+lib/amanda/libamclient-%%SHLIBVER%%.so
X+lib/amanda/libamclient.a
X+lib/amanda/libamclient.la
X+lib/amanda/libamclient.so
X+lib/amanda/libamglue.a
X+lib/amanda/libamglue.la
X+lib/amanda/libamglue.so
X+libexec/amanda/amanda-sh-lib.sh
X libexec/amanda/amandad
X+libexec/amanda/application/amgtar
X+libexec/amanda/application/generic-dumper
X libexec/amanda/calcsize
X libexec/amanda/killpgrp
X libexec/amanda/noop
X@@ -24,102 +27,77 @@
X libexec/amanda/sendbackup
X libexec/amanda/sendsize
X libexec/amanda/versionsuffix
X-sbin/amrecover
X+%%SITE_PERL%%/Amanda/Config.pm
X+%%SITE_PERL%%/Amanda/Debug.pm
X+%%SITE_PERL%%/Amanda/Paths.pm
X+%%SITE_PERL%%/Amanda/Types.pm
X+%%SITE_PERL%%/Amanda/Util.pm
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.a
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.la
X+%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.a
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
X+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.a
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.la
X+%%SITE_PERL%%/auto/Amanda/Types/libTypes.so
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.a
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.la
X+%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
X+sbin/amaespipe
X+sbin/amcrypt
X+sbin/amcrypt-ossl
X+sbin/amcrypt-ossl-asym
X+sbin/amcryptsimple
X+sbin/amgpgcrypt
X sbin/amoldrecover
X-share/amanda/Appendix.txt
X+sbin/amrecover
X share/amanda/COPYRIGHT
X-share/amanda/COPYRIGHT-APACHE
X-share/amanda/COPYRIGHT-REGEX
X+share/amanda/ChangeLog
X+share/amanda/NEWS
X share/amanda/ReleaseNotes
X-share/amanda/amadmin.8.txt
X-share/amanda/amaespipe.8.txt
X-share/amanda/amanda-client.conf.5.txt
X-share/amanda/amanda.8.txt
X-share/amanda/amanda.conf.5.txt
X-share/amanda/amcheck.8.txt
X-share/amanda/amcheckdb.8.txt
X-share/amanda/amcleanup.8.txt
X-share/amanda/amcrypt-asym-ossl.8.txt
X-share/amanda/amcrypt-ossl.8.txt
X-share/amanda/amcrypt.8.txt
X-share/amanda/amdd.8.txt
X-share/amanda/amdump.8.txt
X-share/amanda/amfetchdump.8.txt
X-share/amanda/amflush.8.txt
X-share/amanda/amgetconf.8.txt
X-share/amanda/amlabel.8.txt
X-share/amanda/ammt.8.txt
X-share/amanda/amoverview.8.txt
X-share/amanda/amplot.8.txt
X-share/amanda/amrecover.8.txt
X-share/amanda/amreport.8.txt
X-share/amanda/amrestore.8.txt
X-share/amanda/amrmtape.8.txt
X-share/amanda/amstatus.8.txt
X-share/amanda/amtape.8.txt
X-share/amanda/amtapetype.8.txt
X-share/amanda/amtoc.8.txt
X-share/amanda/amverify.8.txt
X-share/amanda/amverifyrun.8.txt
X-share/amanda/chgscsi.txt
X-share/amanda/dumperapi.txt
X-share/amanda/eventapi.txt
X-share/amanda/exclude.txt
X-share/amanda/faq.txt
X-share/amanda/historical.txt
X-share/amanda/howto-afs.txt
X-share/amanda/howto-auth.txt
X-share/amanda/howto-cygwin.txt
X-share/amanda/howto-filedriver.txt
X-share/amanda/howto-gpg.txt
X-share/amanda/howto-wrapper.txt
X-share/amanda/howtos.txt
X-share/amanda/index.txt
X-share/amanda/indexing.txt
X-share/amanda/install.txt
X-share/amanda/internals.txt
X-share/amanda/introduction.txt
X-share/amanda/ix01.txt
X-share/amanda/kerberos.txt
X-share/amanda/labelprinting.txt
X-share/amanda/links.txt
X-share/amanda/manpages.txt
X-share/amanda/multitape.txt
X-share/amanda/portusage.txt
X-share/amanda/pr01.txt
X-share/amanda/pr02.txt
X-share/amanda/pr03.txt
X-share/amanda/pr04.txt
X-share/amanda/rait.txt
X-share/amanda/references.txt
X-share/amanda/restore.txt
X-share/amanda/samba.txt
X-share/amanda/security-api.txt
X-share/amanda/security.txt
X-share/amanda/strategy-api.txt
X-share/amanda/survey.txt
X-share/amanda/systemnotes.txt
X-share/amanda/tapechangers.txt
X-share/amanda/tapesnchangers.txt
X-share/amanda/tapetypes.txt
X-share/amanda/technical.txt
X-share/amanda/topten.txt
X-share/amanda/upgrade.txt
X-share/amanda/using.txt
X-share/amanda/various.txt
X-share/amanda/vtape-api.txt
X-share/amanda/whatwasnew.txt
X-share/amanda/wishlist.txt
X-share/amanda/y2k.txt
X-share/amanda/zftape.txt
X share/examples/amanda/amanda.conf
X share/examples/amanda/chg-multi.conf
X share/examples/amanda/chg-scsi.conf
X share/examples/amanda/disklist
X+var/lib/amanda/example/amanda-client.conf
X+var/lib/amanda/example/amanda.conf
X+var/lib/amanda/example/inetd.conf.amandaclient
X+var/lib/amanda/example/label-templates/3hole.ps
X+var/lib/amanda/example/label-templates/8.5x11.ps
X+var/lib/amanda/example/label-templates/DIN-A4.ps
X+var/lib/amanda/example/label-templates/DLT-A4.ps
X+var/lib/amanda/example/label-templates/DLT.ps
X+var/lib/amanda/example/label-templates/EXB-8500.ps
X+var/lib/amanda/example/label-templates/HP-DAT.ps
X+var/lib/amanda/example/xinetd.amandaclient
X+var/lib/amanda/example/xinetd.amandaserver
X+var/lib/amanda/template.d/README
X+var/lib/amanda/template.d/advanced.conf
X+var/lib/amanda/template.d/amanda-S3.conf
X+var/lib/amanda/template.d/amanda-harddisk.conf
X+var/lib/amanda/template.d/amanda-single-tape.conf
X+var/lib/amanda/template.d/amanda-tape-changer.conf
X+var/lib/amanda/template.d/chg-manual.conf
X+var/lib/amanda/template.d/dumptypes
X+var/lib/amanda/template.d/tapetypes
X+var/amanda/amandates
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Util
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Types
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Debug
X+ at dirrm %%SITE_PERL%%/auto/Amanda/Config
X+ at dirrm %%SITE_PERL%%/auto/Amanda
X+ at dirrm %%SITE_PERL%%/Amanda
X+ at dirrm var/lib/amanda/template.d
X+ at dirrm var/lib/amanda/example/label-templates
X+ at dirrm var/lib/amanda/example
X+ at dirrm var/lib/amanda
X+ at dirrmtry var/lib
X @dirrmtry var/amanda/gnutar-lists
X @dirrmtry var/amanda
X @dirrmtry var
X @dirrm share/examples/amanda
X @dirrm share/amanda
X+ at dirrm libexec/amanda/application
X @dirrm libexec/amanda
X- at dirrm dumper
X+ at dirrm lib/amanda
Xdiff -ruN amanda-client.orig/Makefile amanda-client/Makefile
X--- amanda-client.orig/Makefile	2008-07-25 01:27:50.000000000 +0200
X+++ amanda-client/Makefile	2008-08-30 14:27:58.000000000 +0200
X@@ -6,7 +6,6 @@
X #
X 
X PKGNAMESUFFIX=	-client
X-PORTREVISION=	3
X 
X COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
X 
09b76cd57b60565242d43c0a2a61bd1e
exit



>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-bugs mailing list