misc/amanda-server: update to 3.5.1

 - define LICENSE
 - simplify handling of USERS and GROUPS
 - reorder make variables in accordance with policy
 - regenerate patches
 - harden amstatus against task death

Changelog: https://www.zmanda.com/amanda-community/?ss360SearchTerm=3.5.1

PR:		264714
Approved by:	fbsd@dylanleigh.net (maintainer timeout)

15 files changed, 220 insertions, 135 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 6d5d710d6016..44d507c91215 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	amanda
-PORTVERSION=	3.3.9
-PORTREVISION=	4
+PORTVERSION=	3.5.1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
@@ -10,16 +9,19 @@ MAINTAINER=	fbsd@dylanleigh.net
 COMMENT?=	Advanced Maryland Automatic Network Disk Archiver (server)
 WWW=		https://sourceforge.net/projects/amanda/
 
-RUN_DEPENDS=	perl-amanda:misc/amanda-perl-wrapper
-BUILD_DEPENDS=	perl-amanda:misc/amanda-perl-wrapper
+LICENSE=	UMD
+LICENSE_NAME=	University of Maryland License
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
+BUILD_DEPENDS=	perl-amanda:misc/amanda-perl-wrapper
+RUN_DEPENDS=	perl-amanda:misc/amanda-perl-wrapper
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 USES=		charsetfix cpe gmake gnome libtool perl5 pkgconfig ssl
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--without-amlibexecdir \
 		--with-amandahosts --with-fqdn \
@@ -31,27 +33,27 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-ssh-security \
 		--disable-installperms --with-security-file=${ETCDIR}/amanda-security.conf
 CONFIGURE_ENV=	PERL=${LOCALBASE}/bin/perl-amanda
-SUB_FILES=	pkg-message
-SUB_LIST=	PORTSDIR=${PORTSDIR}
+
+MAKE_JOBS_UNSAFE=	yes
+INSTALL_TARGET=	install-strip
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
-MAKE_JOBS_UNSAFE=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTSDIR=${PORTSDIR}
+
+WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
+
+AMANDA_USER?=	amanda
+USERS?=		${AMANDA_USER}
+AMANDA_GROUP?=	amanda
+GROUPS?=	operator ${AMANDA_GROUP}
 
 OPTIONS_DEFINE=	GNUTAR
 OPTIONS_DEFAULT=	GNUTAR
 GNUTAR_DESC=	use GNU tar
 
-.if defined(AMANDA_USER)
-USERS=		${AMANDA_USER}
-.else
-USERS?=		amanda
-.endif
-.if !defined(AMANDA_GROUP)
-AMANDA_GROUP=	amanda
-.endif
-GROUPS?=	operator amanda
-
 AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
 AMANDA_DATES?=		${PREFIX}/var/amanda/amandates
 PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_GROUP=${AMANDA_GROUP}
@@ -64,7 +66,7 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 
 .if !defined(CLIENT_ONLY)
 OPTIONS_DEFINE+=	PLOT SAMBA S3
-PLOT_DESC=	Enable ploting, requires X11 libraries
+PLOT_DESC=	Enable plotting, requires X11 libraries
 SAMBA_DESC=	Enable the use of smbclient
 S3_DESC=	Enable Amazon S3 device support
 .endif
@@ -104,6 +106,7 @@ CONFLICTS=	amanda-server-2.* amanda-server-3.2.* amanda2[56]-server
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client
 RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client \
+		p5-JSON>=0:converters/p5-JSON \
 		p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 CONFIGURE_ARGS+=--without-client
@@ -162,7 +165,7 @@ pre-fetch:
 CONFLICTS=	amanda-client-2.* amanda-client-3.2.* amanda2[56]-client-*
 CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
 .if defined(AMANDA_NO_SNAPSHOT_DUMP)
-CFLAGS=		-DFreeBSD_NO_SNAPSHOT_DUMP=t
+CFLAGS+=	-DFreeBSD_NO_SNAPSHOT_DUMP=t
 .endif
 
 .endif
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index a9792b4e5cb0..9b92c69a124d 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495955665
-SHA256 (amanda-3.3.9.tar.gz) = 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41
-SIZE (amanda-3.3.9.tar.gz) = 4673301
+TIMESTAMP = 1655362009
+SHA256 (amanda-3.5.1.tar.gz) = 88ce1ac62f8c30b8d607786a3ca335444a4249ae976baf083956e943b3b409f1
+SIZE (amanda-3.5.1.tar.gz) = 5402093
diff --git a/misc/amanda-server/files/patch-amandad-src__Makefile.in b/misc/amanda-server/files/patch-amandad-src__Makefile.in
index 0e3a9389165b..f5f907c23dda 100644
--- a/misc/amanda-server/files/patch-amandad-src__Makefile.in
+++ b/misc/amanda-server/files/patch-amandad-src__Makefile.in
@@ -1,11 +1,11 @@
---- amandad-src/Makefile.in.orig	2010-10-16 18:41:37.735202558 +0900
-+++ amandad-src/Makefile.in	2010-10-16 18:42:00.351165593 +0900
-@@ -1171,7 +1171,7 @@
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+--- amandad-src/Makefile.in.orig	2017-12-01 13:26:53 UTC
++++ amandad-src/Makefile.in
+@@ -1573,7 +1573,7 @@ AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) $(AMANDA_FILE_CFL
+ AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
  LINT = $(AMLINT)
  LINTFLAGS = $(AMLINTFLAGS)
 -amlib_LTLIBRARIES = libamandad.la
 +@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamandad.la
  libamandad_la_SOURCES = amandad_util.c
- libamandad_la_LDFLAGS = -release $(VERSION)
+ libamandad_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS)
  libamandad_la_LIBADD = ../common-src/libamanda.la
diff --git a/misc/amanda-server/files/patch-amar-src__Makefile.in b/misc/amanda-server/files/patch-amar-src__Makefile.in
index c7941f44904e..59cd5b569a80 100644
--- a/misc/amanda-server/files/patch-amar-src__Makefile.in
+++ b/misc/amanda-server/files/patch-amar-src__Makefile.in
@@ -1,12 +1,12 @@
---- amar-src/Makefile.in.orig	2009-01-27 14:01:04.000000000 +0900
-+++ amar-src/Makefile.in	2009-01-27 14:01:36.000000000 +0900
-@@ -856,7 +856,8 @@
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+--- amar-src/Makefile.in.orig	2017-12-01 13:26:54 UTC
++++ amar-src/Makefile.in
+@@ -1757,7 +1757,8 @@ AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) $(AMANDA_FILE_CFL
+ AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
  LINT = @AMLINT@
  LINTFLAGS = @AMLINTFLAGS@
 -amlib_LTLIBRARIES = libamar.la
 +@WANT_SERVER_TRUE@amlib_LTLIBRARIES = 
 +@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamar.la
  libamar_la_SOURCES = amar.c
- libamar_la_LDFLAGS = -release $(VERSION)
+ libamar_la_LDFLAGS = -release $(VERSION) $(AS_NEEDED_FLAGS)
  libamar_la_LIBADD = ../common-src/libamanda.la
diff --git a/misc/amanda-server/files/patch-client-src__sendbackup-dump.c b/misc/amanda-server/files/patch-client-src__sendbackup-dump.c
index 5df8dc8b57e8..a7260a4aab86 100644
--- a/misc/amanda-server/files/patch-client-src__sendbackup-dump.c
+++ b/misc/amanda-server/files/patch-client-src__sendbackup-dump.c
@@ -1,6 +1,6 @@
---- client-src/sendbackup-dump.c.orig	2011-04-24 16:41:40.874642189 +0900
-+++ client-src/sendbackup-dump.c	2011-04-24 16:42:28.215501968 +0900
-@@ -377,7 +377,7 @@
+--- client-src/sendbackup-dump.c.orig	2017-12-01 13:26:32 UTC
++++ client-src/sendbackup-dump.c
+@@ -428,7 +428,7 @@ char *progname;
  #endif
  
  #ifdef __FreeBSD__
diff --git a/misc/amanda-server/files/patch-ad b/misc/amanda-server/files/patch-client-src_calcsize.c
index 3fff9c551c52..e8ea45a8e68a 100644
--- a/misc/amanda-server/files/patch-ad
+++ b/misc/amanda-server/files/patch-client-src_calcsize.c
@@ -1,6 +1,6 @@
---- client-src/calcsize.c.orig	2008-01-18 09:31:16.000000000 +0900
-+++ client-src/calcsize.c	2008-08-30 20:11:59.000000000 +0900
-@@ -160,7 +160,11 @@
+--- client-src/calcsize.c.orig	2017-12-01 13:26:32 UTC
++++ client-src/calcsize.c
+@@ -166,7 +166,11 @@ main(
  	dump_total += (ST_BLOCKS(finfo) + (off_t)1) / (off_t)2 + (off_t)1;
  	gtar_total += ROUND(4,(ST_BLOCKS(finfo) + (off_t)1));
      }
diff --git a/misc/amanda-server/files/patch-common-src__Makefile.in b/misc/amanda-server/files/patch-common-src__Makefile.in
index 0cb609a3a730..9685d051efa5 100644
--- a/misc/amanda-server/files/patch-common-src__Makefile.in
+++ b/misc/amanda-server/files/patch-common-src__Makefile.in
@@ -1,11 +1,20 @@
---- common-src/Makefile.in.orig	2012-02-21 20:37:54.000000000 +0900
-+++ common-src/Makefile.in	2012-05-08 11:49:17.145335897 +0900
-@@ -1363,7 +1363,7 @@
- INCLUDES = -I$(top_srcdir)/gnulib   
- AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+--- common-src/Makefile.in.orig	2017-12-01 13:26:54 UTC
++++ common-src/Makefile.in
+@@ -1506,7 +1506,7 @@ LIBINTL = @LIBINTL@
+ LIBMULTITHREAD = @LIBMULTITHREAD@
+ LIBOBJS = @LIBOBJS@
+ LIBPTH = @LIBPTH@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lssl
+ LIBSOCKET = @LIBSOCKET@
+ LIBTHREAD = @LIBTHREAD@
+ LIBTOOL = @LIBTOOL@
+@@ -1960,7 +1960,7 @@ do_installperms = dest=; chown=; chmod=; \
+ AM_CPPFLAGS = -I$(top_srcdir)/gnulib -I$(top_builddir)/common-src
+ AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) $(AMANDA_FILE_CFLAGS)
  AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 -amlib_LTLIBRARIES = libamanda.la
 +@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamanda.la
  LINT = $(AMLINT)
  LINTFLAGS = $(AMLINTFLAGS)
- libamanda_la_SOURCES = alloc.c amfeatures.c amflock.c ipc-binary.c \
+ libamanda_la_SOURCES = alloc.c am_sl.c amfeatures.c amflock.c amjson.c \
diff --git a/misc/amanda-server/files/patch-man__Makefile.in b/misc/amanda-server/files/patch-man__Makefile.in
index daeea0759ce8..258686b8f9fb 100644
--- a/misc/amanda-server/files/patch-man__Makefile.in
+++ b/misc/amanda-server/files/patch-man__Makefile.in
@@ -1,8 +1,8 @@
---- 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 \
+--- man/Makefile.in.orig	2017-12-01 13:26:55 UTC
++++ man/Makefile.in
+@@ -1406,6 +1406,7 @@ COMMON_MAN_PAGES = amanda.8 \
+ 		    amservice.8 \
+ 		    amssl.8 \
  		    script-email.8
 +@WANT_SERVER_TRUE@COMMON_MAN_PAGES =
  
diff --git a/misc/amanda-server/files/patch-ndmp-src__Makefile.in b/misc/amanda-server/files/patch-ndmp-src__Makefile.in
index 2dd3f4b9f32d..a184747a0bb0 100644
--- a/misc/amanda-server/files/patch-ndmp-src__Makefile.in
+++ b/misc/amanda-server/files/patch-ndmp-src__Makefile.in
@@ -1,6 +1,6 @@
---- ndmp-src/Makefile.in.orig	2010-10-16 18:45:40.253086014 +0900
-+++ ndmp-src/Makefile.in	2010-10-16 18:46:36.949487552 +0900
-@@ -1289,9 +1289,9 @@
+--- ndmp-src/Makefile.in.orig	2017-12-01 13:26:55 UTC
++++ ndmp-src/Makefile.in
+@@ -1691,9 +1691,9 @@ AM_CFLAGS = -DNDMOS_CONST_NDMJOBLIB_REVISION='"amanda-
  # Divide the library up into the library side and down (libndmlib.la),
  # and the full set of rules, agents, and so on required to build ndmjob
  # (libndmjob.la).
diff --git a/misc/amanda-server/files/patch-perl__Amanda__Process.pm b/misc/amanda-server/files/patch-perl__Amanda__Process.pm
index 806659b3f979..0152034e5f54 100644
--- a/misc/amanda-server/files/patch-perl__Amanda__Process.pm
+++ b/misc/amanda-server/files/patch-perl__Amanda__Process.pm
@@ -1,6 +1,6 @@
---- perl/Amanda/Process.pm.orig	2009-01-28 13:57:55.000000000 +0900
-+++ perl/Amanda/Process.pm	2009-01-28 13:58:19.000000000 +0900
-@@ -155,7 +155,7 @@
+--- perl/Amanda/Process.pm.orig	2017-12-01 13:26:29 UTC
++++ perl/Amanda/Process.pm
+@@ -184,7 +184,7 @@ sub load_ps_table() {
      $self->{ppid} = ();
      my $ps_argument = $Amanda::Constants::PS_ARGUMENT;
      if ($ps_argument eq "CYGWIN") {
diff --git a/misc/amanda-server/files/patch-perl__Amanda__Status.pm b/misc/amanda-server/files/patch-perl__Amanda__Status.pm
new file mode 100644
index 000000000000..406f8689603c
--- /dev/null
+++ b/misc/amanda-server/files/patch-perl__Amanda__Status.pm
@@ -0,0 +1,11 @@
+--- perl/Amanda/Status.pm.orig	2017-12-01 13:26:29 UTC
++++ perl/Amanda/Status.pm
+@@ -890,7 +890,7 @@ REREAD:
+ 			    if (defined $dlet->{'status'} and 
+ 				($dlet->{'status'} != $WAIT_FOR_WRITING &&
+ 				 $dlet->{'status'} != $WRITE_FAILED)) {
+-				die ("bad status on taper FILE-WRITE (writing): $dlet->{'status'}");
++				#die ("bad status on taper FILE-WRITE (writing): $dlet->{'status'}");
+ 			    }
+ 			    $dlet->{'status'} = $WRITING;
+ 			}
diff --git a/misc/amanda-server/files/patch-perl__amglue__Makefile.in b/misc/amanda-server/files/patch-perl__amglue__Makefile.in
deleted file mode 100644
index 96d2bc290602..000000000000
--- a/misc/amanda-server/files/patch-perl__amglue__Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- perl/amglue/Makefile.in	2010-10-16 19:29:45.554806332 +0900
-+++ perl/amglue/Makefile.in.orig	2010-10-07 03:58:28.000000000 +0900
-@@ -1212,6 +1212,7 @@
- 	    list2="$$list2 $$p"; \
- 	  else :; fi; \
- 	done; \
-+@WANT_CLIENT_FALSE@	list2=; \
- 	test -z "$$list2" || { \
- 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \
- 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \
diff --git a/misc/amanda-server/files/patch-perl_amglue_Makefile.in b/misc/amanda-server/files/patch-perl_amglue_Makefile.in
new file mode 100644
index 000000000000..2c0ffd7e5439
--- /dev/null
+++ b/misc/amanda-server/files/patch-perl_amglue_Makefile.in
@@ -0,0 +1,10 @@
+--- perl/amglue/Makefile.in.orig	2017-12-01 13:26:55 UTC
++++ perl/amglue/Makefile.in
+@@ -1618,6 +1618,7 @@ install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES)
+ 	    list2="$$list2 $$p"; \
+ 	  else :; fi; \
+ 	done; \
++@WANT_CLIENT_FALSE@	list2=; \
+ 	test -z "$$list2" || { \
+ 	  echo " $(MKDIR_P) '$(DESTDIR)$(amlibdir)'"; \
+ 	  $(MKDIR_P) "$(DESTDIR)$(amlibdir)" || exit 1; \
diff --git a/misc/amanda-server/files/patch-xfer-src__Makefile.in b/misc/amanda-server/files/patch-xfer-src__Makefile.in
index cb48325de180..0b49ec668992 100644
--- a/misc/amanda-server/files/patch-xfer-src__Makefile.in
+++ b/misc/amanda-server/files/patch-xfer-src__Makefile.in
@@ -1,8 +1,8 @@
---- xfer-src/Makefile.in.orig	2012-02-21 20:37:55.000000000 +0900
-+++ xfer-src/Makefile.in	2012-05-08 11:54:46.833498833 +0900
-@@ -1187,7 +1187,7 @@
+--- xfer-src/Makefile.in.orig	2017-12-01 13:26:56 UTC
++++ xfer-src/Makefile.in
+@@ -1755,7 +1755,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gnulib \
  
- AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+ AM_CFLAGS = $(AMANDA_WARNING_CFLAGS) $(AMANDA_FILE_CFLAGS)
  AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 -amlib_LTLIBRARIES = libamxfer.la
 +@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamxfer.la
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index d69ead4e2d2b..facc2c9f5994 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -3,48 +3,71 @@
 @comment
 @comment plist for misc/amanda-server below
 @comment
-%%SERVER_ONLY%%%%ETCDIR%%/amanda-security.conf
+@comment %%SERVER_ONLY%%%%ETCDIR%%/amanda-security.conf
 %%SERVER_ONLY%%lib/amanda/libamdevice-%%SHLIBVER%%.so
 %%SERVER_ONLY%%lib/amanda/libamdevice.a
 %%SERVER_ONLY%%lib/amanda/libamdevice.so
 %%SERVER_ONLY%%lib/amanda/libamserver-%%SHLIBVER%%.so
 %%SERVER_ONLY%%lib/amanda/libamserver.a
 %%SERVER_ONLY%%lib/amanda/libamserver.so
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Amdump.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Amflush.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/aggregate.pm
-%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/compat.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/disk.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/diskflat.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/multi.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/ndmp.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/null.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/rait.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/robot.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Changer/single.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/CheckDump.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Chunker/Controller.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Chunker/Protocol.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Chunker/Scribe.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Cleanup.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Cmdfile.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Cmdline.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Curinfo.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Curinfo/Info.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/DB.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/DB/Catalog.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Device.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Disklist.pm
-%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Extract.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Holding.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Index.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/email.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/stdin.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Label.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Logfile.pm
-%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Message.pm
-%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
-%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Planner.pm
-%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Policy.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/human.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/json.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/json_raw.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/postscript.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/xml.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Amcheck.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Configs.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Dles.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Dumps.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Labels.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Report.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Runs.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Services.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Status.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Storages.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Storages/Labels.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Rest/Version.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/ScanInventory.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Service/Amidxtaped.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Status.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Storage.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Tapelist.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Taper/Controller.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Taper/Protocol.pm
@@ -54,16 +77,21 @@
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Taper/Scan/traditional.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Taper/Scribe.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Taper/Worker.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Vault.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/XferServer.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/auto/Amanda/Cmdfile/libCmdfile.so
 %%SERVER_ONLY%%%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
 %%SERVER_ONLY%%%%SITE_PERL%%/auto/Amanda/Device/libDevice.so
 %%SERVER_ONLY%%%%SITE_PERL%%/auto/Amanda/Disklist/libDisklist.so
 %%SERVER_ONLY%%%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
 %%SERVER_ONLY%%%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so
 %%SERVER_ONLY%%%%SITE_PERL%%/auto/Amanda/XferServer/libXferServer.so
+%%SERVER_ONLY%%libexec/amanda/amadmin_perl
+%%SERVER_ONLY%%libexec/amanda/ambackupd
 %%SERVER_ONLY%%%%PLOT%%libexec/amanda/amcat.awk
 %%SERVER_ONLY%%libexec/amanda/amcheck-device
 %%SERVER_ONLY%%libexec/amanda/amdumpd
+%%SERVER_ONLY%%libexec/amanda/amidxtaped
 %%SERVER_ONLY%%libexec/amanda/amindexd
 %%SERVER_ONLY%%libexec/amanda/amlogroll
 %%SERVER_ONLY%%%%PLOT%%libexec/amanda/amplot.awk
@@ -71,21 +99,31 @@
 %%SERVER_ONLY%%%%PLOT%%libexec/amanda/amplot.gp
 %%SERVER_ONLY%%libexec/amanda/amtrmidx
 %%SERVER_ONLY%%libexec/amanda/amtrmlog
-%%SERVER_ONLY%%libexec/amanda/chg-disk
-%%SERVER_ONLY%%libexec/amanda/chg-lib.sh
-%%SERVER_ONLY%%libexec/amanda/chg-manual
-%%SERVER_ONLY%%libexec/amanda/chg-multi
-%%SERVER_ONLY%%libexec/amanda/chg-zd-mtx
 %%SERVER_ONLY%%libexec/amanda/chunker
-%%SERVER_ONLY%%libexec/amanda/amidxtaped
 %%SERVER_ONLY%%libexec/amanda/driver
-%%SERVER_ONLY%%@mode 4750
-%%SERVER_ONLY%%@group %%AMANDA_GROUP%%
 %%SERVER_ONLY%%libexec/amanda/dumper
 %%SERVER_ONLY%%libexec/amanda/planner
-%%SERVER_ONLY%%@mode
-%%SERVER_ONLY%%@group
+%%SERVER_ONLY%%libexec/amanda/rest-server/bin/app-dancer2.pl
+%%SERVER_ONLY%%libexec/amanda/rest-server/bin/app.pl
+%%SERVER_ONLY%%libexec/amanda/rest-server/config-dancer/config.yml
+%%SERVER_ONLY%%libexec/amanda/rest-server/config.yml
+%%SERVER_ONLY%%libexec/amanda/rest-server/environments/development.yml
+%%SERVER_ONLY%%libexec/amanda/rest-server/environments/production.yml
+%%SERVER_ONLY%%libexec/amanda/rest-server/lib/Amanda/Rest.pm
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/404.html
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/500.html
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/css/error.css
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/css/style.css
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/dispatch.cgi
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/dispatch.fcgi
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/favicon.ico
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/images/perldancer-bg.jpg
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/images/perldancer.jpg
+%%SERVER_ONLY%%libexec/amanda/rest-server/public/javascripts/jquery.js
+%%SERVER_ONLY%%libexec/amanda/rest-server/views/index.tt
+%%SERVER_ONLY%%libexec/amanda/rest-server/views/layout/main.tt
 %%SERVER_ONLY%%libexec/amanda/taper
+%%SERVER_ONLY%%man/man5/amanda-command-file.5.gz
 %%SERVER_ONLY%%man/man5/disklist.5.gz
 %%SERVER_ONLY%%man/man5/tapelist.5.gz
 %%SERVER_ONLY%%man/man7/amanda-changers.7.gz
@@ -96,6 +134,7 @@
 %%SERVER_ONLY%%man/man8/amaddclient.8.gz
 %%SERVER_ONLY%%man/man8/amadmin.8.gz
 %%SERVER_ONLY%%man/man8/amaespipe.8.gz
+%%SERVER_ONLY%%man/man8/amanda-rest-server.8.gz
 %%SERVER_ONLY%%man/man8/amcheck.8.gz
 %%SERVER_ONLY%%man/man8/amcheckdb.8.gz
 %%SERVER_ONLY%%man/man8/amcheckdump.8.gz
@@ -109,11 +148,11 @@
 %%SERVER_ONLY%%man/man8/amdump.8.gz
 %%SERVER_ONLY%%man/man8/amfetchdump.8.gz
 %%SERVER_ONLY%%man/man8/amflush.8.gz
-%%SERVER_ONLY%%man/man8/amgetconf.8.gz
 %%SERVER_ONLY%%man/man8/amgpgcrypt.8.gz
 %%SERVER_ONLY%%man/man8/amlabel.8.gz
 %%SERVER_ONLY%%man/man8/amoverview.8.gz
 %%SERVER_ONLY%%%%PLOT%%man/man8/amplot.8.gz
+%%SERVER_ONLY%%man/man8/amreindex.8.gz
 %%SERVER_ONLY%%man/man8/amreport.8.gz
 %%SERVER_ONLY%%man/man8/amrestore.8.gz
 %%SERVER_ONLY%%man/man8/amrmtape.8.gz
@@ -128,9 +167,10 @@
 %%SERVER_ONLY%%sbin/amadmin
 %%SERVER_ONLY%%@mode 4750
 %%SERVER_ONLY%%@group %%AMANDA_GROUP%%
-%%SERVER_ONLY%%sbin/amcheck
+%%SERVER_ONLY%%sbin/amanda-rest-server
 %%SERVER_ONLY%%@mode
 %%SERVER_ONLY%%@group
+%%SERVER_ONLY%%sbin/amcheck
 %%SERVER_ONLY%%sbin/amcheckdb
 %%SERVER_ONLY%%sbin/amcheckdump
 %%SERVER_ONLY%%sbin/amcleanup
@@ -142,6 +182,7 @@
 %%SERVER_ONLY%%sbin/amlabel
 %%SERVER_ONLY%%sbin/amoverview
 %%SERVER_ONLY%%%%PLOT%%sbin/amplot
+%%SERVER_ONLY%%sbin/amreindex
 %%SERVER_ONLY%%sbin/amreport
 %%SERVER_ONLY%%sbin/amrestore
 %%SERVER_ONLY%%sbin/amrmtape
@@ -178,21 +219,70 @@
 %%CLIENT_ONLY%%lib/amanda/libndmlib-%%SHLIBVER%%.so
 %%CLIENT_ONLY%%lib/amanda/libndmlib.a
 %%CLIENT_ONLY%%lib/amanda/libndmlib.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Amservice.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Application.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Application/Zfs.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Archive.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/BigIntCompat.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/ClientService.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Config.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Config/FoldingHash.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Constants.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Debug.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Extract.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Feature.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/FetchDump.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/FetchDump/Application.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/FetchDump/ClientApplication.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/FetchDump/Local.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Header.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/IPC/Binary.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/IPC/LineProtocol.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/MainLoop.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Message.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/NDMP.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Paths.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Process.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Planner.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Restore.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Script.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Script_App.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Service.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Service/Restore.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Tests.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Util.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Xfer.pm
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Application/libApplication.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Feature/libFeature.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Header/libHeader.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/IPC/Binary/libBinary.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/NDMP/libNDMP.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Tests/libTests.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
+%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so
 %%CLIENT_ONLY%%libexec/amanda/amanda-sh-lib.sh
 %%CLIENT_ONLY%%libexec/amanda/amandad
-%%CLIENT_ONLY%%libexec/amanda/amndmjob
 %%CLIENT_ONLY%%@mode 4750
 %%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
-%%CLIENT_ONLY%%libexec/amanda/application/ambsdtar
+%%CLIENT_ONLY%%libexec/amanda/ambind
 %%CLIENT_ONLY%%@mode
 %%CLIENT_ONLY%%@group
+%%CLIENT_ONLY%%libexec/amanda/amndmjob
 %%CLIENT_ONLY%%@mode 4750
 %%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
+%%CLIENT_ONLY%%libexec/amanda/application/ambsdtar
 %%CLIENT_ONLY%%libexec/amanda/application/amgtar
 %%CLIENT_ONLY%%@mode
 %%CLIENT_ONLY%%@group
 %%CLIENT_ONLY%%libexec/amanda/application/amlog-script
 %%CLIENT_ONLY%%libexec/amanda/application/ampgsql
+%%CLIENT_ONLY%%libexec/amanda/application/amrandom
 %%CLIENT_ONLY%%libexec/amanda/application/amraw
 %%CLIENT_ONLY%%libexec/amanda/application/amsamba
 %%CLIENT_ONLY%%@mode 4750
@@ -204,6 +294,7 @@
 %%CLIENT_ONLY%%libexec/amanda/application/amzfs-sendrecv
 %%CLIENT_ONLY%%libexec/amanda/application/amzfs-snapshot
 %%CLIENT_ONLY%%libexec/amanda/application/script-email
+%%CLIENT_ONLY%%libexec/amanda/application/script-fail
 %%CLIENT_ONLY%%@mode 4750
 %%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
 %%CLIENT_ONLY%%libexec/amanda/calcsize
@@ -213,6 +304,7 @@
 %%CLIENT_ONLY%%libexec/amanda/ndmjob
 %%CLIENT_ONLY%%libexec/amanda/noop
 %%CLIENT_ONLY%%libexec/amanda/patch-system
+%%CLIENT_ONLY%%libexec/amanda/restore
 %%CLIENT_ONLY%%@mode 4750
 %%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
 %%CLIENT_ONLY%%libexec/amanda/rundump
@@ -221,60 +313,31 @@
 %%CLIENT_ONLY%%@group
 %%CLIENT_ONLY%%libexec/amanda/selfcheck
 %%CLIENT_ONLY%%libexec/amanda/sendbackup
+%%CLIENT_ONLY%%libexec/amanda/senddiscover
 %%CLIENT_ONLY%%libexec/amanda/sendsize
 %%CLIENT_ONLY%%libexec/amanda/teecount
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Application.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Application/Zfs.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Archive.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/BigIntCompat.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/ClientService.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Config.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Config/FoldingHash.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Constants.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Debug.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Feature.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Header.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/IPC/Binary.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/IPC/LineProtocol.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/MainLoop.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/NDMP.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Paths.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Process.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Script.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Script_App.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Tests.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Util.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/Amanda/Xfer.pm
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Application/libApplication.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Feature/libFeature.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Header/libHeader.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/IPC/Binary/libBinary.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/NDMP/libNDMP.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Tests/libTests.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
-%%CLIENT_ONLY%%%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so
 %%CLIENT_ONLY%%man/man5/amanda-archive-format.5.gz
 %%CLIENT_ONLY%%man/man5/amanda-client.conf.5.gz
-%%CLIENT_ONLY%%man/man5/amanda.conf.5.gz
 %%CLIENT_ONLY%%man/man5/amanda-security.conf.5.gz
+%%CLIENT_ONLY%%man/man5/amanda.conf.5.gz
 %%CLIENT_ONLY%%man/man7/amanda-applications.7.gz
+%%CLIENT_ONLY%%man/man7/amanda-auth-ssl.7.gz
 %%CLIENT_ONLY%%man/man7/amanda-auth.7.gz
 %%CLIENT_ONLY%%man/man7/amanda-match.7.gz
 %%CLIENT_ONLY%%man/man7/amanda-scripts.7.gz
 %%CLIENT_ONLY%%man/man8/amanda.8.gz
 %%CLIENT_ONLY%%man/man8/amarchiver.8.gz
+%%CLIENT_ONLY%%man/man8/ambackup.8.gz
 %%CLIENT_ONLY%%man/man8/ambsdtar.8.gz
 %%CLIENT_ONLY%%man/man8/amdump_client.8.gz
+%%CLIENT_ONLY%%man/man8/amgetconf.8.gz
 %%CLIENT_ONLY%%man/man8/amgtar.8.gz
 %%CLIENT_ONLY%%man/man8/ampgsql.8.gz
 %%CLIENT_ONLY%%man/man8/amraw.8.gz
 %%CLIENT_ONLY%%man/man8/amrecover.8.gz
 %%CLIENT_ONLY%%man/man8/amsamba.8.gz
 %%CLIENT_ONLY%%man/man8/amservice.8.gz
+%%CLIENT_ONLY%%man/man8/amssl.8.gz
 %%CLIENT_ONLY%%man/man8/amstar.8.gz
 %%CLIENT_ONLY%%man/man8/amsuntar.8.gz
 %%CLIENT_ONLY%%man/man8/amzfs-sendrecv.8.gz
@@ -282,6 +345,7 @@
 %%CLIENT_ONLY%%man/man8/script-email.8.gz
 %%CLIENT_ONLY%%sbin/amaespipe
 %%CLIENT_ONLY%%sbin/amarchiver
+%%CLIENT_ONLY%%sbin/ambackup
 %%CLIENT_ONLY%%sbin/amcrypt
 %%CLIENT_ONLY%%sbin/amcrypt-ossl
 %%CLIENT_ONLY%%sbin/amcrypt-ossl-asym
@@ -291,11 +355,8 @@
 %%CLIENT_ONLY%%sbin/amgpgcrypt
 %%CLIENT_ONLY%%sbin/amoldrecover
 %%CLIENT_ONLY%%sbin/amrecover
-%%CLIENT_ONLY%%@mode 4750
-%%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
 %%CLIENT_ONLY%%sbin/amservice
-%%CLIENT_ONLY%%@mode
-%%CLIENT_ONLY%%@group
+%%CLIENT_ONLY%%sbin/amssl
 %%CLIENT_ONLY%%%%DATADIR%%/COPYRIGHT
 %%CLIENT_ONLY%%%%DATADIR%%/ChangeLog
 %%CLIENT_ONLY%%%%DATADIR%%/NEWS
@@ -319,12 +380,13 @@
 %%CLIENT_ONLY%%%%DATADIR%%/example/label-templates/HP-DAT.ps
 %%CLIENT_ONLY%%%%DATADIR%%/example/xinetd.amandaclient
 %%CLIENT_ONLY%%%%DATADIR%%/example/xinetd.amandaserver
+%%CLIENT_ONLY%%%%DATADIR%%/template.d/README
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/advanced.conf
+%%CLIENT_ONLY%%%%DATADIR%%/template.d/amanda-CAStor.conf
+%%CLIENT_ONLY%%%%DATADIR%%/template.d/amanda-S3.conf
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/amanda-harddisk.conf
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/amanda-single-tape.conf
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/amanda-tape-changer.conf
-%%CLIENT_ONLY%%%%DATADIR%%/template.d/amanda-S3.conf
+%%CLIENT_ONLY%%%%DATADIR%%/template.d/chg-manual.conf
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/dumptypes
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/tapetypes
-%%CLIENT_ONLY%%%%DATADIR%%/template.d/README
-%%CLIENT_ONLY%%%%DATADIR%%/template.d/chg-manual.conf