Skip-hexencode-test-case-as-it-fails-with-new-glib2.patch

@@ -0,0 +1,12 @@
+diff -Nur a/common-src/Makefile.am b/common-src/Makefile.am
+--- a/common-src/Makefile.am	2017-12-01 21:26:28.000000000 +0800
++++ b/common-src/Makefile.am	2022-06-20 11:30:35.792590848 +0800
+@@ -246,7 +246,7 @@
+ # automake-style tests
+ 
+ TESTS = amflock-test event-test amsemaphore-test crc32-test quoting-test \
+-	ipc-binary-test hexencode-test fileheader-test match-test
++	ipc-binary-test  fileheader-test match-test
+ noinst_PROGRAMS = $(TESTS)
+ 
+ amflock_test_SOURCES = amflock-test.c

amanda-3.1.1-tcpport.patch

@@ -1,29 +0,0 @@
-diff -up amanda-3.1.1/example/amanda-client.conf.in.tcpport amanda-3.1.1/example/amanda-client.conf.in
---- amanda-3.1.1/example/amanda-client.conf.in.tcpport	2010-06-29 19:09:55.000000000 +0200
-+++ amanda-3.1.1/example/amanda-client.conf.in	2010-08-10 14:44:32.372879810 +0200
-@@ -22,3 +22,5 @@ auth "bsdtcp"
- 
- ssh_keys ""			# your ssh keys file if you use ssh auth
- 
-+#resolves "resource temporarily unavailable" bug
-+unreserved-tcp-port 1025,65535
-diff -up amanda-3.1.1/example/amanda-client-postgresql.conf.in.tcpport amanda-3.1.1/example/amanda-client-postgresql.conf.in
---- amanda-3.1.1/example/amanda-client-postgresql.conf.in.tcpport	2010-06-29 19:09:55.000000000 +0200
-+++ amanda-3.1.1/example/amanda-client-postgresql.conf.in	2010-08-10 14:44:41.423755630 +0200
-@@ -44,3 +44,6 @@ property "foo-PG-DATADIR" "/var/postgres
- #   For this example:
- #   archive_command = 'test ! -f /var/postgresql/archive/%f && cp %p /var/postgresql/archive/%f'
- property "foo-PG-ARCHIVEDIR" "/var/postgresql/archive"
-+
-+#resolves "resource temporarily unavailable" bug
-+unreserved-tcp-port 1025,65535
-diff -up amanda-3.1.1/example/amanda.conf.in.tcpport amanda-3.1.1/example/amanda.conf.in
---- amanda-3.1.1/example/amanda.conf.in.tcpport	2010-08-10 14:43:55.640754722 +0200
-+++ amanda-3.1.1/example/amanda.conf.in	2010-08-10 14:44:50.760880089 +0200
-@@ -761,3 +761,6 @@ define script-tool sc-email {
- # configurations.
- 
- #includefile "@CONFIG_DIR@/amanda.conf.main"
-+
-+#resolves "resource temporarily unavailable" bug
-+unreserved-tcp-port 1025,65535

amanda-3.1.1-xattrs.patch

@@ -1,55 +0,0 @@
-diff -up amanda-3.1.1/example/amanda.conf.in.xattrs amanda-3.1.1/example/amanda.conf.in
---- amanda-3.1.1/example/amanda.conf.in.xattrs	2010-08-03 14:45:25.000000000 +0200
-+++ amanda-3.1.1/example/amanda.conf.in	2010-08-03 14:47:42.516753010 +0200
-@@ -718,6 +718,7 @@ define interface local {
- define application-tool app_amgtar {
-     comment "amgtar"
-     plugin  "amgtar"
-+    property "XATTRS" "YES"
-     #property "GNUTAR-PATH" "/path/to/gtar"
-     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
-                     #default from gnutar_list_dir setting in amanda-client.conf
-diff -up amanda-3.1.1/example/template.d/amanda-harddisk.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-harddisk.conf.in
---- amanda-3.1.1/example/template.d/amanda-harddisk.conf.in.xattrs	2010-06-29 19:09:55.000000000 +0200
-+++ amanda-3.1.1/example/template.d/amanda-harddisk.conf.in	2010-08-03 14:47:17.027752940 +0200
-@@ -30,6 +30,7 @@ define dumptype global {
- define application-tool app_amgtar {
-     comment "amgtar"
-     plugin  "amgtar"
-+    property "XATTRS" "YES"
-     #property "GNUTAR-PATH" "/path/to/gtar"
-     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
- }
-diff -up amanda-3.1.1/example/template.d/amanda-single-tape.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-single-tape.conf.in
---- amanda-3.1.1/example/template.d/amanda-single-tape.conf.in.xattrs	2010-06-29 19:09:55.000000000 +0200
-+++ amanda-3.1.1/example/template.d/amanda-single-tape.conf.in	2010-08-03 14:47:21.307753002 +0200
-@@ -37,6 +37,7 @@ define dumptype global {
- define application-tool app_amgtar {
-     comment "amgtar"
-     plugin  "amgtar"
-+    property "XATTRS" "YES"
-     #property "GNUTAR-PATH" "/path/to/gtar"
-     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
- }
-diff -up amanda-3.1.1/example/template.d/amanda-S3.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-S3.conf.in
---- amanda-3.1.1/example/template.d/amanda-S3.conf.in.xattrs	2010-06-29 19:09:55.000000000 +0200
-+++ amanda-3.1.1/example/template.d/amanda-S3.conf.in	2010-08-03 14:47:26.723752659 +0200
-@@ -38,6 +38,7 @@ define dumptype global {
- define application-tool app_amgtar {
-     comment "amgtar"
-     plugin  "amgtar"
-+    property "XATTRS" "YES"
-     #property "GNUTAR-PATH" "/path/to/gtar"
-     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
- }
-diff -up amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in.xattrs amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in
---- amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in.xattrs	2010-06-29 19:09:55.000000000 +0200
-+++ amanda-3.1.1/example/template.d/amanda-tape-changer.conf.in	2010-08-03 14:47:30.827752997 +0200
-@@ -37,6 +37,7 @@ define dumptype global {
- define application-tool app_amgtar {
-     comment "amgtar"
-     plugin  "amgtar"
-+    property "XATTRS" "YES"
-     #property "GNUTAR-PATH" "/path/to/gtar"
-     #property "GNUTAR-LISTDIR" "/path/to/gnutar_list_dir"
- }

amanda-3.2.0-config-dir.patch

@@ -1,19 +0,0 @@
-diff --git a/example/amanda.conf.in b/example/amanda.conf.in
-index 5c6ced7..721d683 100644
---- a/example/amanda.conf.in
-+++ b/example/amanda.conf.in
-@@ -225,10 +225,10 @@ holdingdisk hd1 {
- # Note that, although the keyword below is infofile, it is only so for
- # historic reasons, since now it is supposed to be a directory (unless
- # you have selected some database format other than the `text' default)
--infofile "@CONFIG_DIR@/@DEFAULT_CONFIG@/curinfo"	# database DIRECTORY
--logdir   "@CONFIG_DIR@/@DEFAULT_CONFIG@"		# log directory
--indexdir "@CONFIG_DIR@/@DEFAULT_CONFIG@/index"		# index directory
--#tapelist "@CONFIG_DIR@/@DEFAULT_CONFIG@/tapelist"	# list of used tapes
-+infofile "/var/lib/amanda/@DEFAULT_CONFIG@/curinfo"	# database DIRECTORY
-+logdir   "/var/lib/amanda/@DEFAULT_CONFIG@"		# log directory
-+indexdir "/var/lib/amanda/@DEFAULT_CONFIG@/index"	# index directory
-+tapelist "/var/lib/amanda/@DEFAULT_CONFIG@/tapelist"	# list of used tapes
- # tapelist is stored, by default, in the directory that contains amanda.conf
- 
- # tapetypes

amanda-3.4.5-no-xinetd.patch

@@ -1,12 +0,0 @@
-diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl
-index 5748dfc..18f59f0 100755
---- a/server-src/amserverconfig.pl
-+++ b/server-src/amserverconfig.pl
-@@ -656,7 +656,6 @@ if ( defined $template ) {
- &create_customconf;
- }
- 
--&check_xinetd;
- &build_amanda_ssh_key;
- 
- if ( $vtape_err ) {

amanda.crontab

@@ -1,9 +0,0 @@
-# This is an example for a crontab entry for automated backup with amanda       
-# With these cron lines, Amanda will check that the correct tape is in          
-# the drive every weekday afternoon at 4pm (if it isn't, all the                
-# operators will get mail).  At 12:45am that night the dumps will be run.       
-#
-# This should be put in user operator's crontab
-#
-0 16 * * 1-5    /usr/sbin/amcheck -m DailySet1                                  
-45 0 * * 2-6    /usr/sbin/amdump DailySet1

amanda.spec

@@ -8,15 +8,12 @@
 %define amanda_group disk
 
 Name:          amanda
-Version:       3.5.4
+Version:       3.5.1
-Release:       1
+Release:       20
 Summary:       A backup solution over network to disk
 License:       BSD and GPLv3+ and GPLv2+ and GPLv2
 URL:           http://www.amanda.org
-Source0:       https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz
+Source:        http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
-Source1:       amanda.crontab
-Source4:       disklist
-Source8:       amandahosts
 Source9:       amanda.socket
 Source10:      amanda@.service
 Source11:      activate-devpay.1.gz
@@ -26,21 +23,17 @@ Source14:      amanda-udp.service
 Source15:      kamanda.socket
 Source16:      kamanda@.service
 
-Patch1:        amanda-3.1.1-xattrs.patch
+Patch5:        patch-tirpc
-Patch2:        amanda-3.1.1-tcpport.patch
+Patch6:        fix-multiple-definition.patch
-Patch3:        amanda-3.2.0-config-dir.patch
+Patch7:        Skip-hexencode-test-case-as-it-fails-with-new-glib2.patch
-# Don't mention xinetd files in amserverconfig (#1460763)
-Patch4:        amanda-3.4.5-no-xinetd.patch
-# Support tirpc
-Patch5:        patch-tirpc.patch
 
 BuildRequires: automake autoconf libtool dump xfsdump cups
 BuildRequires: samba-client tar grep gcc-c++ readline-devel libtirpc-devel
 BuildRequires: krb5-devel openssh-clients ncompress mtx mt-st
 BuildRequires: perl-devel perl-generators perl perl-Test-Simple
 BuildRequires: glib2-devel openssl-devel swig bison flex
-BuildRequires: libcurl-devel procps-ng systemd rpcgen gnuplot
+BuildRequires: libcurl-devel procps-ng systemd
-Requires:      grep tar /bin/mail perl sharutils
+Requires:      grep tar /bin/mail perl
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -70,8 +63,7 @@ versions of Unix/Mac OS X/Linux/Windows.
 %package_help
 
 %prep
-%autosetup -p1 -n %{name}-tag-community-%{version}
+%autosetup -p1 -n %{name}-%{version}
-sed -i "s/3.5.2/3.5.3/g" VERSION
 
 %build
 ./autogen
@@ -94,8 +86,6 @@ export MAILER=/bin/mail CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_LD_FLAGS -pi
            --with-group=%amanda_group \
            --with-tmpdir=/var/log/amanda \
            --with-gnutar=/bin/tar \
-           --disable-static \
-	   --with-amandahosts \
            --with-ssh-security \
            --with-rsh-security \
            --with-bsdtcp-security \
@@ -115,7 +105,7 @@ pushd %{buildroot}
 mkdir -p ./%{_sysconfdir}/amanda
 mkdir -p ./var/log/amanda/amandad
 mkdir -p ./%{_localstatedir}/lib/amanda
-install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts
+
 install -p -m 644 -D %{SOURCE9} ./%{_unitdir}/amanda.socket
 install -p -m 644 -D %{SOURCE10} ./%{_unitdir}/amanda@.service
 install -p -m 644 -D %{SOURCE13} ./%{_unitdir}/amanda-udp.socket
@@ -132,9 +122,6 @@ ln -s amrecover.8.gz %{buildroot}%{_mandir}/man8/amoldrecover.8
 
 pushd %{buildroot}
 mv .%{_localstatedir}/lib/amanda/example .%{_sysconfdir}/amanda/%defconfig
-cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample
-cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
-cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
 rm -f .%{_sysconfdir}/amanda/%defconfig/xinetd*
 rm -f .%{_sysconfdir}/amanda/%defconfig/inetd*
 mkdir -p .%{_localstatedir}/lib/amanda/gnutar-lists
@@ -166,158 +153,41 @@ make check
 %ldconfig_scriptlets client server
 
 %files
-					 
+%defattr(-,root,root)
-%license COPYRIGHT COPYRIGHT.BSD
+%license COPYRIGHT
-%doc ChangeLog README.md ReleaseNotes
+%doc AUTHORS README
-%{_unitdir}/amanda@.service
+%dir %{_sysconfdir}/amanda/
-%{_unitdir}/amanda.socket
+%{_sysconfdir}/amanda/amanda-security.conf
-%{_unitdir}/amanda-udp.service
+%config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
-%{_unitdir}/amanda-udp.socket
+%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/amanda-security.conf
-%{_unitdir}/kamanda@.service
-%{_unitdir}/kamanda.socket
 
-			 
+%{_sbindir}/*
-			   
+%{_libdir}/*.so
 %dir %{_libexecdir}/amanda
-%{_libexecdir}/amanda/amandad
+%{_libexecdir}/amanda/*
-%{_libexecdir}/amanda/amanda-sh-lib.sh
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar
 %attr(4750,root,%amanda_group) %{_libexecdir}/amanda/ambind
-%{_libexecdir}/amanda/amndmjob
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump
-%{_libexecdir}/amanda/amcat.awk
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize
-%{_libexecdir}/amanda/amplot.awk
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp
-%{_libexecdir}/amanda/amplot.g
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amgtar
-%{_libexecdir}/amanda/amplot.gp
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amstar
-%{_libexecdir}/amanda/ndmjob
+%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/ambsdtar
-
-%{_sbindir}/amandad
-%{_sbindir}/amaespipe
-%{_sbindir}/amarchiver
-%{_sbindir}/amcrypt
-%{_sbindir}/amcrypt-ossl
-%{_sbindir}/amcrypt-ossl-asym
-%{_sbindir}/amcryptsimple
-%{_sbindir}/amgetconf
-%{_sbindir}/amgpgcrypt
-%{_sbindir}/amplot
-%{_sbindir}/amssl
 
+%{_unitdir}/*.socket
+%{_unitdir}/*.service
 %{perl_vendorarch}/Amanda/
 %{perl_vendorarch}/auto/Amanda/
 
-%dir %{_sysconfdir}/amanda/
-%dir %{_sysconfdir}/amanda/%defconfig
-
-%attr(-,%amanda_user,%amanda_group)     %dir %{_localstatedir}/lib/amanda/
-%attr(600,%amanda_user,%amanda_group)   %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts
 %attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda
 %attr(02770,%amanda_user,%amanda_group) %dir /var/log/amanda/amandad
-
+%attr(-,%amanda_user,%amanda_group)     %dir %{_localstatedir}/lib/amanda/
-%{_libdir}/libamdevice*.so
+%attr(-,%amanda_user,%amanda_group)     %dir %{_localstatedir}/lib/amanda/%defconfig/
-%{_libdir}/libamserver*.so
+%attr(-,%amanda_user,%amanda_group)     %dir %{_localstatedir}/lib/amanda/%defconfig/index
-%{_libdir}/libamclient*.so
+%attr(-,%amanda_user,%amanda_group)     %dir %{_localstatedir}/lib/amanda/template.d
-%{_libdir}/libamanda-*.so
+%attr(-,%amanda_user,%amanda_group)     %config(noreplace) %{_localstatedir}/lib/amanda/template.d/*
-%{_libdir}/libamanda.so
+%attr(-,%amanda_user,%amanda_group)     %{_localstatedir}/lib/amanda/gnutar-lists/
-%{_libdir}/libamandad*.so
+%attr(-,%amanda_user,%amanda_group)     %config(noreplace) %{_localstatedir}/lib/amanda/amandates
-%{_libdir}/libamar*.so
-%{_libdir}/libamglue*.so
-%{_libdir}/libamxfer*.so
-%{_libdir}/libndmjob*.so
-%{_libdir}/libndmlib*.so
-
-%{_libexecdir}/amanda/amdumpd
-%{_libexecdir}/amanda/amcheck-device
-%{_libexecdir}/amanda/amidxtaped
-%{_libexecdir}/amanda/amindexd
-%{_libexecdir}/amanda/amlogroll
-%{_libexecdir}/amanda/amtrmidx
-%{_libexecdir}/amanda/amtrmlog
-%{_libexecdir}/amanda/driver
-%{_libexecdir}/amanda/amadmin_perl
-%{_libexecdir}/amanda/ambackupd
-%{_libexecdir}/amanda/rest-server/
-%{_libexecdir}/amanda/dumper
-%{_libexecdir}/amanda/chunker
-%{_libexecdir}/amanda/planner
-%{_libexecdir}/amanda/taper
-
-%{_sbindir}/activate-devpay
-%{_sbindir}/amaddclient
-%{_sbindir}/amadmin
-%{_sbindir}/amcleanup
-%{_sbindir}/amcleanupdisk
-%{_sbindir}/amdevcheck
-%{_sbindir}/amdump
-%{_sbindir}/amfetchdump
-%{_sbindir}/amflush
-%{_sbindir}/amcheck
-%{_sbindir}/amcheckdb
-%{_sbindir}/amcheckdump
-%{_sbindir}/amlabel
-%{_sbindir}/amoverview
-%{_sbindir}/amreport
-%{_sbindir}/amrestore
-%{_sbindir}/amrmtape
-%{_sbindir}/amserverconfig
-%{_sbindir}/amservice
-%{_sbindir}/amstatus
-%{_sbindir}/amtape
-%{_sbindir}/amtapetype
-%{_sbindir}/amtoc
-%{_sbindir}/amvault
-%{_sbindir}/amanda-rest-server
-%{_sbindir}/amreindex
-
-%config(noreplace) %{_sysconfdir}/amanda/crontab.sample
-%config(noreplace) %{_sysconfdir}/amanda/%defconfig/*
-%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
-%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
-
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/%defconfig/index
-%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/*
-
-%dir %{_libexecdir}/amanda/application/
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/ambsdtar
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amgtar
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/application/amstar
-%{_libexecdir}/amanda/application/amlog-script
-%{_libexecdir}/amanda/application/ampgsql
-%{_libexecdir}/amanda/application/amraw
-%{_libexecdir}/amanda/application/amsamba
-%{_libexecdir}/amanda/application/amsuntar
-%{_libexecdir}/amanda/application/amzfs-sendrecv
-%{_libexecdir}/amanda/application/amzfs-snapshot
-%{_libexecdir}/amanda/application/script-email
-%{_libexecdir}/amanda/application/amrandom
-%{_libexecdir}/amanda/application/script-fail
-%{_libexecdir}/amanda/restore
-%{_libexecdir}/amanda/senddiscover
-
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp
-%{_libexecdir}/amanda/noop
-%{_libexecdir}/amanda/patch-system
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump
-%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar
-%{_libexecdir}/amanda/selfcheck
-%{_libexecdir}/amanda/sendbackup
-%{_libexecdir}/amanda/sendsize
-%{_libexecdir}/amanda/teecount
-
-%{_sbindir}/amdump_client
-%{_sbindir}/amoldrecover
-%{_sbindir}/amrecover
-%{_sbindir}/ambackup
-
-%{_sysconfdir}/amanda/amanda-security.conf
-
-%config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf
-%config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client-postgresql.conf
-
-%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/amandates
-%attr(-,%amanda_user,%amanda_group) %{_localstatedir}/lib/amanda/gnutar-lists/
-%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/amanda-security.conf
 
 %files help
 %defattr(-,root,root)
@@ -325,21 +195,6 @@ make check
 %{_mandir}/man*
 
 %changelog
-* Tue Aug 08 2023 wangkai <13474090681@163.com> - 3.5.4-1
-- Update to version 3.5.4 for fix CVE-2023-30577
-
-* Mon May 08 2023 chenchen <chen_aka_jan@163.com> - 3.5.3-1
-- Update to version 3.5.3
-
-* Thu Mar 2 2023 caodongxia <caodongxia@h-partners.com> - 3.5.1-23
-- Add install require sharutils 
-
-* Tue Feb 28 2023 luopihui <luopihui@ncti-gba.cn> - 3.5.1-22
-- Fix CVE-2022-37704 CVE-2022-37705
-
-* Fri Nov 11 2022 caodongxia <caodongxia@h-partners.com> - 3.5.1-21
-- fix hexencode test failed
-
 * Mon Jun 20 2022 liyanan <liyanan32@h-partners.com> - 3.5.1-20
 - Skip hexencode test case as it fails with new glib2
 

amandahosts

@@ -1,29 +0,0 @@
-# Allow access to amanda over the network. See 'man amanda'
-
-# 'ambackup' connects to 'amandad'. If your 'disklist' is correctly
-# set up, i.e. if it does not use 'localhost' but the fully qualified
-# domain name (FQDN) of the target machine, then you must put
-# the FQDN here. 'ambackup' must be run by user 'amandabackup', so we allow
-# access by user 'amandabackup'. Do not forget to add an 'only_from' line to
-# '/etc/xinet.d/amanda' to allow access to 'amandad' only from known
-# IP addresses.
-
-# replace mymachine.mydomain by the correct value and uncomment
-# mymachine.mydomain amandabackup
-
-
-# 'amrecover' connects to 'amandaidx', which uses the fully qualified
-# domain name when access is done from another machine. 'amrecover'
-# must be run by user 'root', so we allow access by user 'root'.
-
-# replace mymachine.mydomain by the correct value and uncomment
-# mymachine.mydomain root
-
-
-# 'amrecover' connects to 'amandaidx', which uses the bare machine
-# name w/o domain name when access is done from the same machine.
-# 'amrecover' must be run by user 'root', so we allow access by user
-# 'root'.
-
-# replace mymachine by the correct value and uncomment
-# mymachine root

disklist

@@ -1,69 +0,0 @@
-# sample Amanda2 disklist file, derived from CS.UMD.EDU's disklist
-#
-# If your configuration is called, say, "csd2", then this file normally goes
-# in /etc/amanda/csd2/disklist.
-#
-# File format is:
-#
-#	hostname diskdev dumptype
-#
-# where the dumptypes are defined by you in amanda.conf.
-
-
-# At our site, root partitions have a different dumptype because they
-# are of lower priority; they don't contain user data, and don't change
-# much from the department prototype.  In a crunch, they can be left for
-# last or skipped.
-
-## A SPARCstation 1+
-#salty sd0a comp-root
-#salty sd0g comp-user
-#salty sd1g comp-user
-#salty sd2a comp-root
-#salty sd2g comp-user
-#salty sd3c comp-user
-#
-## A DECstation 3100
-#slithy rz1a comp-root
-#slithy rz1g comp-user
-#slithy rz3a comp-root
-#slithy rz3g comp-user
-#
-## We don't run compression on the master host since it is going to be
-## busy enough running amanda.
-#master sd0a nocomp-root -1 local
-#master sd0g nocomp-user -1 local
-## note: -1 is a placeholder for the spindle number
-## the holding disk can't be dumped to itself, it uses a disktype that
-## specifies the "no-hold" option (see amanda.conf).
-#master sd1c holding-disk -1 local
-#
-## The chairman's disk is high priority to make sure it gets done.
-#bigwig	sd0a comp-root
-#bigwig	sd0g comp-high
-## Likewise the named databases in the root partition on our primary
-## nameserver.  Also, compression is turned off because we don't want
-## to create any unnecessary load on this baby (it's only a Sun3).
-#bozo        sd0a nocomp-high
-#bozo        sd0g nocomp-user
-#bozo        sd4c nocomp-user
-#
-## Dump Joe's NetBSD machine, with the mounted MS-DOS partition dumped
-## using tar.
-#joespc  wd0a comp-root
-#joespc  wd0e comp-user
-#joespc	/msdos comp-user-tar
-#
-## Some really slow machines, like Sun2's and some Vaxstations, take
-## forever to compress their dumps: it's just not worth it.
-#
-## A Sun2
-#cleo     sd0a nocomp-root
-#cleo     sd0g nocomp-user
-## A VaxStation
-#susie         rz8a nocomp-root
-#susie         rz8g nocomp-user
-#
-## and so on ... well, you get the idea
-
-localhost /etc comp-root-tar

fix-multiple-definition.patch

@@ -0,0 +1,14 @@
+diff --git a/common-src/testutils.h b/common-src/testutils.h
+index 31f8973..3bb376f 100644
+--- a/common-src/testutils.h
++++ b/common-src/testutils.h
+@@ -75,7 +75,7 @@ typedef struct TestUtilsTest {
+ #define tu_dbg(...) if (tu_debugging_enabled) { g_fprintf(stderr, __VA_ARGS__); }
+
+ /* Is debugging enabled for this test run? (set internally) */
+-int tu_debugging_enabled;
++extern int tu_debugging_enabled;
+
+ /*
+  * Main loop
+