diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 7f2f7fe..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -amanda-2.6.1p2.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..631bcd4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +results_amanda/ +amanda-*.*.*/ +/amanda-3.4.tar.gz +/amanda-3.4.1.tar.gz +/amanda-3.4.2.tar.gz +/amanda-3.4.3.tar.gz +/amanda-3.4.4.tar.gz +/amanda-3.4.5.tar.gz +/amanda-3.5.tar.gz +/amanda-3.5.1.tar.gz +/amanda-3.5.2.tar.gz +/amanda-3.5.3.tar.gz +/amanda-3.5.4.tar.gz diff --git a/270.patch b/270.patch new file mode 100644 index 0000000..15e043b --- /dev/null +++ b/270.patch @@ -0,0 +1,45 @@ +From bd9ef8e5c004911b529d55b521d18d4d66c4e9b7 Mon Sep 17 00:00:00 2001 +From: Peter Bieringer +Date: Tue, 29 Oct 2024 21:42:32 +0100 +Subject: [PATCH 1/2] fixes https://github.com/zmanda/amanda/issues/262 + +--- + perl/Amanda/Taper/Scribe.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/perl/Amanda/Taper/Scribe.pm b/perl/Amanda/Taper/Scribe.pm +index 8b21c77c0b..ecfd2a140a 100644 +--- a/perl/Amanda/Taper/Scribe.pm ++++ b/perl/Amanda/Taper/Scribe.pm +@@ -1116,7 +1116,7 @@ sub _xmsg_no_space { + if ($chg->{'global_space'}) { + $chg->inventory(inventory_cb => $steps->{'got_inventory'}); + } else { +- return $finished_cb(); ++ return $finished_cb->(); + } + }; + + +From e083df9afaad61fc8772765d132a93ec8bc7ae5e Mon Sep 17 00:00:00 2001 +From: Peter Bieringer +Date: Tue, 29 Oct 2024 21:43:18 +0100 +Subject: [PATCH 2/2] fix for https://github.com/zmanda/amanda/issues/262 + +--- + perl/Amanda/Tapelist.swg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/perl/Amanda/Tapelist.swg b/perl/Amanda/Tapelist.swg +index 9266961a4e..ba84c68ca0 100644 +--- a/perl/Amanda/Tapelist.swg ++++ b/perl/Amanda/Tapelist.swg +@@ -36,7 +36,7 @@ use Amanda::Debug qw(:logging); + use Amanda::Config qw( config_dir_relative ); + use File::Copy; + use Fcntl qw(:flock); # import LOCK_* constants +-use Amanda::Message qw( :severity ); ++use Amanda::Message; + + ## package functions + diff --git a/273.patch b/273.patch new file mode 100644 index 0000000..34a0a80 --- /dev/null +++ b/273.patch @@ -0,0 +1,36 @@ +From 403656a684d8c934866721ca0e1674997deb4eeb Mon Sep 17 00:00:00 2001 +From: Orion Poplawski +Date: Mon, 11 Nov 2024 21:19:54 -0700 +Subject: [PATCH] Drop non-existant -s option from amflush man page + +--- + man/xml-source/amflush.8.xml | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/man/xml-source/amflush.8.xml b/man/xml-source/amflush.8.xml +index e3b1360afd..f09f4a46b6 100644 +--- a/man/xml-source/amflush.8.xml ++++ b/man/xml-source/amflush.8.xml +@@ -32,7 +32,6 @@ + -b + -f + --exact-match +- -s + -D datestamp + &configoverride.synopsis; + config +@@ -90,14 +89,6 @@ This is useful if + amflush + is run as part of another script that, for example, advances the tape + after the flush is completed. +- +- +- +- +- +-Write log to stdout/stderr instead of the amflush log file. Requires the +- +-option. + + + diff --git a/Makefile b/Makefile deleted file mode 100644 index 3a9749d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: amanda -# $Id: Makefile,v 1.2 2007/10/15 18:35:37 notting Exp $ -NAME := amanda -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/README-rpm b/README-rpm deleted file mode 100644 index ae1475c..0000000 --- a/README-rpm +++ /dev/null @@ -1,12 +0,0 @@ -New user name was introduced in 2.5.2.p1-9. -See https://bugzilla.redhat.com/124510 for details. - -Amanda's RPMs contain scriptlets for automatic -transition to new 'amandabackup' user name. -Update of files /etc/amanda/*/amanda.conf, -/var/lib/amanda/.amandahosts, /etc/xinetd.d/amanda -as well as renaming /var/spool/cron/amanda -is handled by these scriptlets. Original files -are backed up with .usernameupdate extension. - -Other needed changes must be done manually... diff --git a/activate-devpay.1.gz b/activate-devpay.1.gz new file mode 100644 index 0000000..b791af3 Binary files /dev/null and b/activate-devpay.1.gz differ diff --git a/amanda-2.5.2p1-configure.patch b/amanda-2.5.2p1-configure.patch deleted file mode 100644 index ec0439b..0000000 --- a/amanda-2.5.2p1-configure.patch +++ /dev/null @@ -1,23 +0,0 @@ -2008-08-27 Stepan Kasal - - * config/gnulib/extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): - Require Autoconf 2.61. - (AC_USE_SYSTEM_EXTENSIONS): Do not redefine. - ---- amanda/config/gnulib/extensions.m4.orig 2008-08-27 10:11:24.000000000 +0200 -+++ amanda/config/gnulib/extensions.m4 2008-08-27 10:16:13.000000000 +0200 -@@ -16,7 +16,7 @@ - # ------------------------ - # Enable extensions on systems that normally disable them, - # typically due to standards-conformance issues. --AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], -+AC_DEFUN([do_not_redefine_AC_USE_SYSTEM_EXTENSIONS], - [ - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) - AC_BEFORE([$0], [AC_RUN_IFELSE]) -@@ -55,4 +55,4 @@ - # Enable extensions on systems that normally disable them, - # typically due to standards-conformance issues. - AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], -- [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) -+ [AC_PREREQ(2.61) AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) diff --git a/amanda-2.5.2p1-pie.patch b/amanda-2.5.2p1-pie.patch deleted file mode 100644 index 09cf07e..0000000 --- a/amanda-2.5.2p1-pie.patch +++ /dev/null @@ -1,199 +0,0 @@ ---- amanda-2.5.2p1/client-src/Makefile.am.pie 2007-05-04 13:39:05.000000000 +0200 -+++ amanda-2.5.2p1/client-src/Makefile.am 2007-06-22 13:50:23.000000000 +0200 -@@ -13,6 +13,25 @@ LIB_EXTENSION = la - - libexec_PROGRAMS = noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix - -+noop_CFLAGS = -fPIE $(AM_CFLAGS) -+noop_LDFLAGS = -pie $(AM_LDFLAGS) -+calcsize_CFLAGS = -fPIE $(AM_CFLAGS) -+calcsize_LDFLAGS = -pie $(AM_LDFLAGS) -+killpgrp_CFLAGS = -fPIE $(AM_CFLAGS) -+killpgrp_LDFLAGS = -pie $(AM_LDFLAGS) -+rundump_CFLAGS = -fPIE $(AM_CFLAGS) -+rundump_LDFLAGS = -pie $(AM_LDFLAGS) -+runtar_CFLAGS = -fPIE $(AM_CFLAGS) -+runtar_LDFLAGS = -pie $(AM_LDFLAGS) -+selfcheck_CFLAGS = -fPIE $(AM_CFLAGS) -+selfcheck_LDFLAGS = -pie $(AM_LDFLAGS) -+sendbackup_CFLAGS = -fPIE $(AM_CFLAGS) -+sendbackup_LDFLAGS = -pie $(AM_LDFLAGS) -+sendsize_CFLAGS = -fPIE $(AM_CFLAGS) -+sendsize_LDFLAGS = -pie $(AM_LDFLAGS) -+versionsuffix_CFLAGS = -fPIE $(AM_CFLAGS) -+versionsuffix_LDFLAGS = -pie $(AM_LDFLAGS) -+ - sbin_SCRIPTS = @CLIENT_SCRIPTS_OPT@ - - libexec_SCRIPTS = patch-system ---- amanda-2.5.2p1/restore-src/Makefile.am.pie 2007-05-04 13:39:06.000000000 +0200 -+++ amanda-2.5.2p1/restore-src/Makefile.am 2007-06-22 13:42:42.000000000 +0200 -@@ -43,6 +43,13 @@ librestore_la_LIBADD = ../common-src/lib - ../tape-src/libamtape.$(LIB_EXTENSION) \ - ../server-src/libamserver.$(LIB_EXTENSION) - -+amidxtaped_CFLAGS = -fPIE $(AM_CFLAGS) -+amidxtaped_LDFLAGS = -pie $(AM_LDFLAGS) -+amrestore_CFLAGS = -fPIE $(AM_CFLAGS) -+amrestore_LDFLAGS = -pie $(AM_LDFLAGS) -+amfetchdump_CFLAGS = -fPIE $(AM_CFLAGS) -+amfetchdump_LDFLAGS = -pie $(AM_LDFLAGS) -+ - noinst_HEADERS = restore.h - - install-exec-hook: ---- amanda-2.5.2p1/amandad-src/Makefile.am.pie 2007-05-04 13:39:06.000000000 +0200 -+++ amanda-2.5.2p1/amandad-src/Makefile.am 2007-06-22 14:01:31.000000000 +0200 -@@ -12,6 +12,9 @@ LIB_EXTENSION = la - - libexec_PROGRAMS = amandad - -+amandad_CFLAGS = -fPIE $(AM_CFLAGS) -+amandad_LDFLAGS = -pie $(AM_LDFLAGS) -+ - if WANT_RUNTIME_PSEUDO_RELOC - AM_LDFLAGS = -Wl,-enable-runtime-pseudo-reloc - endif ---- amanda-2.5.2p1/tape-src/Makefile.am.pie 2007-05-04 13:39:08.000000000 +0200 -+++ amanda-2.5.2p1/tape-src/Makefile.am 2007-06-22 13:42:42.000000000 +0200 -@@ -12,6 +12,13 @@ LIB_EXTENSION = la - - sbin_PROGRAMS= ammt amdd amtapetype - -+amdd_CFLAGS = -fPIE $(AM_CFLAGS) -+amdd_LDFLAGS = -pie $(AM_LDFLAGS) -+ammt_CFLAGS = -fPIE $(AM_CFLAGS) -+ammt_LDFLAGS = -pie $(AM_LDFLAGS) -+amtapetype_CFLAGS = -fPIE $(AM_CFLAGS) -+amtapetype_LDFLAGS = -pie $(AM_LDFLAGS) -+ - libamtape_la_SOURCES = output-file.c \ - output-null.c \ - output-rait.c \ ---- amanda-2.5.2p1/changer-src/Makefile.am.pie 2007-05-04 13:39:04.000000000 +0200 -+++ amanda-2.5.2p1/changer-src/Makefile.am 2007-06-22 13:42:42.000000000 +0200 -@@ -13,10 +13,14 @@ LIB_EXTENSION = la - - if WANT_CHIO_SCSI - CHIO_SCSI = chg-scsi-chio -+chg_scsi_chio_CFLAGS = -fPIE $(AM_CFLAGS) -+chg_scsi_chio_LDFLAGS = -pie $(AM_LDFLAGS) - endif - - if WANT_CHG_SCSI - CHG_SCSI = chg-scsi -+chg_scsi_CFLAGS = -fPIE $(AM_CFLAGS) -+chg_scsi_LDFLAGS = -pie $(AM_LDFLAGS) - endif - - libexec_PROGRAMS = $(CHG_SCSI) ---- /dev/null 2007-06-20 09:13:44.480310269 +0200 -+++ amanda-2.5.2p1/config/compile 2007-06-22 13:42:42.000000000 +0200 -@@ -0,0 +1 @@ -+# Dummy compile for configure ---- amanda-2.5.2p1/configure.in.pie 2007-06-07 01:22:24.000000000 +0200 -+++ amanda-2.5.2p1/configure.in 2007-06-22 13:42:42.000000000 +0200 -@@ -2920,6 +2920,52 @@ ICE_CHECK_DECL(strcasecmp,string.h strin - AC_CHECK_FUNCS(fnmatch) - - -+AC_MSG_CHECKING([for Position Independent Executable support]) -+save_CFLAGS="$CFLAGS" -+save_LDFLAGS="$LDFLAGS" -+CFLAGS="$CFLAGS -fpie" -+LDFLAGS="$LDFLAGS -pie" -+AC_TRY_RUN( -+ [ -+int foo () __attribute__((visibility ("hidden"))); -+int foo () { return 0; } -+int main () { return foo (); } -+ ], -+ [ -+ ac_cv_pie_support=yes -+ ], -+ [ -+ ac_cv_pie_support=no -+ ], -+ [ -+ ac_cv_pie_support=no -+ ] -+) -+CFLAGS="$save_CFLAGS" -+LDFLAGS="$save_LDFLAGS" -+AC_MSG_RESULT($ac_cv_pie_support) -+if test $ac_cv_pie_support = no; then -+ AC_DEFINE(hidden,, -+ [Define as `__attribute__((visibility ("hidden")))' if the C compiler supports it, -+ or to nothing if it is not supported.]) -+ PIE_LDFLAGS= -+ PIE_SED_CMD= -+ COMPILE_PIE= -+ EXIT0_IF_NO_PIE='exit 0' -+else -+ AC_DEFINE_UNQUOTED(hidden, __attribute__((visibility ("hidden")))) -+ PIE_LDFLAGS="-pie -L.pie/ -Lopenbsd-compat/.pie/" -+changequote(<<, >>)dnl -+ PIE_SED_CMD='s_[ ]\([^ ]\)_ .pie/\1_g' -+changequote([, ])dnl -+ COMPILE_PIE=' && mkdir -p .pie && $(COMPILE) -c -fpie -o .pie/$@ \`test -f '"'"'$<'"'"' || echo '"'"'$(srcdir)/'"'"'\`$<' -+ EXIT0_IF_NO_PIE=: -+fi -+AC_SUBST(PIE_LDFLAGS) -+AC_SUBST(PIE_SED_CMD) -+AC_SUBST(COMPILE_PIE) -+AC_SUBST(EXIT0_IF_NO_PIE) -+ - dnl disk device prefixes - AC_MSG_CHECKING(disk device prefixes) - dnl Use df to find the mount point for the root filesystem. Use ---- amanda-2.5.2p1/server-src/Makefile.am.pie 2007-05-04 13:39:04.000000000 +0200 -+++ amanda-2.5.2p1/server-src/Makefile.am 2007-06-22 13:52:15.000000000 +0200 -@@ -17,11 +17,48 @@ sbin_PROGRAMS = amadmin amcheck amflu - amgetconf amlabel amtape \ - amreport - -+amadmin_CFLAGS = -fPIE $(AM_CFLAGS) -+amadmin_LDFLAGS = -pie $(AM_LDFLAGS) -+amcheck_CFLAGS = -fPIE $(AM_CFLAGS) -+amcheck_LDFLAGS = -pie $(AM_LDFLAGS) -+amflush_CFLAGS = -fPIE $(AM_CFLAGS) -+amflush_LDFLAGS = -pie $(AM_LDFLAGS) -+amgetconf_CFLAGS = -fPIE $(AM_CFLAGS) -+amgetconf_LDFLAGS = -pie $(AM_LDFLAGS) -+amlabel_CFLAGS = -fPIE $(AM_CFLAGS) -+amlabel_LDFLAGS = -pie $(AM_LDFLAGS) -+amreport_CFLAGS = -fPIE $(AM_CFLAGS) -+amreport_LDFLAGS = -pie $(AM_LDFLAGS) -+amtape_CFLAGS = -fPIE $(AM_CFLAGS) -+amtape_LDFLAGS = -pie $(AM_LDFLAGS) -+ - libexec_PROGRAMS = amindexd amlogroll amtrmidx \ - amtrmlog driver dumper \ - planner taper amcleanupdisk \ - chunker - -+ -+amindexd_CFLAGS = -fPIE $(AM_CFLAGS) -+amindexd_LDFLAGS = -pie $(AM_LDFLAGS) -+amlogroll_CFLAGS = -fPIE $(AM_CFLAGS) -+amlogroll_LDFLAGS = -pie $(AM_LDFLAGS) -+amtrmidx_CFLAGS = -fPIE $(AM_CFLAGS) -+amtrmidx_LDFLAGS = -pie $(AM_LDFLAGS) -+amtrmlog_CFLAGS = -fPIE $(AM_CFLAGS) -+amtrmlog_LDFLAGS = -pie $(AM_LDFLAGS) -+driver_CFLAGS = -fPIE $(AM_CFLAGS) -+driver_LDFLAGS = -pie $(AM_LDFLAGS) -+dumper_CFLAGS = -fPIE $(AM_CFLAGS) -+dumper_LDFLAGS = -pie $(AM_LDFLAGS) -+planner_CFLAGS = -fPIE $(AM_CFLAGS) -+planner_LDFLAGS = -pie $(AM_LDFLAGS) -+taper_CFLAGS = -fPIE $(AM_CFLAGS) -+taper_LDFLAGS = -pie $(AM_LDFLAGS) -+chunker_CFLAGS = -fPIE $(AM_CFLAGS) -+chunker_LDFLAGS = -pie $(AM_LDFLAGS) -+amcleanupdisk_CFLAGS = -fPIE $(AM_CFLAGS) -+amcleanupdisk_LDFLAGS = -pie $(AM_LDFLAGS) -+ - sbin_SCRIPTS = amcheckdb amcleanup amdump \ - amoverview amrmtape amtoc \ - amverify amverifyrun amstatus \ diff --git a/amanda-2.5.2p1-tcpport.patch b/amanda-2.5.2p1-tcpport.patch deleted file mode 100644 index e41fad1..0000000 --- a/amanda-2.5.2p1-tcpport.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up amanda-2.5.2p1/example/amanda.conf.in.orig example/amanda.conf.in ---- amanda-2.5.2p1/example/amanda.conf.in.orig 2007-05-04 13:38:58.000000000 +0200 -+++ amanda-2.5.2p1/example/amanda.conf.in 2008-09-19 15:22:17.000000000 +0200 -@@ -70,6 +70,9 @@ tapebufs 20 # A positive int - # edition 2.5 - usetimestamps yes - -+#resolves "resource temporarily unavailable" bug -+unreserved-tcp-port 1025,65535 -+ - - # Specify tape device and/or tape changer. If you don't have a tape - # changer, and you don't want to use more than one tape per run of diff --git a/amanda-2.5.2p1-typo_chg_multi.patch b/amanda-2.5.2p1-typo_chg_multi.patch deleted file mode 100644 index a106180..0000000 --- a/amanda-2.5.2p1-typo_chg_multi.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- amanda-2.5.2p1/changer-src/chg-multi.sh.in.typo_chg_multi 2007-05-17 19:38:34.000000000 +0200 -+++ amanda-2.5.2p1/changer-src/chg-multi.sh.in 2007-08-09 14:34:21.000000000 +0200 -@@ -325,7 +325,7 @@ then - echo $answer - exit 2 - fi -- echo `_ ' -> offline'` "$device"` >> $logfile -+ echo `_ ' -> offline'` "$device" >> $logfile - $MT $MTF $device offline >> $logfile 2>&1 - if [ $? -ne 0 ]; then - answer=`_ '%s %s: %s: unable to change to slot %s' "$newslot" "$pname" "$device" "$curslot"` -@@ -404,7 +404,7 @@ if [ $loadslot -eq 1 ]; then # load the - # try to rewind the device - device=`awk '$1 == "slot" && $2 == '$curslot' {print $3}' $ourconf 2>/dev/null` - if [ "$device" = "" ]; then -- answer=`_ "%s %s: slot %s device not specified in %s' "$curslot" "$pname" "$curslot" "$ourconf"` -+ answer=`_ '%s %s: slot %s device not specified in %s' "$curslot" "$pname" "$curslot" "$ourconf"` - echo `_ 'Exit ->'` $answer >> $logfile - echo $answer - exit 2 diff --git a/amanda-2.5.2p1-undefSymbols.patch b/amanda-2.5.2p1-undefSymbols.patch deleted file mode 100644 index 7ca6e61..0000000 --- a/amanda-2.5.2p1-undefSymbols.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- amanda-2.5.2p1/client-src/Makefile.am.undefSymbols 2007-06-25 14:46:08.000000000 +0200 -+++ amanda-2.5.2p1/client-src/Makefile.am 2007-06-25 14:46:08.000000000 +0200 -@@ -50,6 +50,8 @@ libamclient_la_SOURCES= amandates.c get - - libamclient_la_LDFLAGS = -release $(VERSION) - -+libamclient_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) -+ - ### - # Because libamanda includes routines (e.g. regex) provided by some system - # libraries, and because of the way libtool sets up the command line, we ---- amanda-2.5.2p1/amandad-src/Makefile.am.undefSymbols 2007-06-25 14:46:08.000000000 +0200 -+++ amanda-2.5.2p1/amandad-src/Makefile.am 2007-06-25 14:46:08.000000000 +0200 -@@ -22,6 +22,8 @@ endif - libamandad_la_SOURCES= amandad_util.c - libamandad_la_LDFLAGS = -release $(VERSION) - -+libamandad_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) -+ - noinst_HEADERS = amandad.h - - ### ---- amanda-2.5.2p1/tape-src/Makefile.am.undefSymbols 2007-06-25 14:46:08.000000000 +0200 -+++ amanda-2.5.2p1/tape-src/Makefile.am 2007-06-25 14:53:16.000000000 +0200 -@@ -27,6 +27,8 @@ libamtape_la_SOURCES = output-file.c \ - - libamtape_la_LDFLAGS = -release $(VERSION) - -+libamtape_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) -+ - ### - # Because libamanda includes routines (e.g. regex) provided by some system - # libraries, and because of the way libtool sets up the command line, we ---- amanda-2.5.2p1/server-src/Makefile.am.undefSymbols 2007-06-25 14:46:08.000000000 +0200 -+++ amanda-2.5.2p1/server-src/Makefile.am 2007-06-25 14:46:08.000000000 +0200 -@@ -98,6 +98,9 @@ amindexd_LDADD = ../common-src/libamanda - ../common-src/libamanda.$(LIB_EXTENSION) \ - ../gnulib/libgnu.$(LIB_EXTENSION) - -+libamserver_la_LIBADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -+ ../tape-src/libamtape.$(LIB_EXTENSION) -+ - SUFFIXES = .sh .pl - - .pl: diff --git a/amanda-2.5.2p1-xattrs.patch b/amanda-2.5.2p1-xattrs.patch deleted file mode 100644 index 1535aa2..0000000 --- a/amanda-2.5.2p1-xattrs.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- amanda-2.5.2p1/client-src/sendsize.c.xattrs 2007-05-15 20:14:58.000000000 +0200 -+++ amanda-2.5.2p1/client-src/sendsize.c 2007-07-12 13:45:29.000000000 +0200 -@@ -1863,7 +1863,7 @@ getsize_gnutar( - if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0); - if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0); - -- my_argv = alloc(SIZEOF(char *) * 22); -+ my_argv = alloc(SIZEOF(char *) * 23); - i = 0; - - gnutar_list_dir = getconf_str(CNF_GNUTAR_LIST_DIR); -@@ -2006,6 +2006,7 @@ getsize_gnutar( - my_argv[i++] = "--atime-preserve"; - #endif - my_argv[i++] = "--sparse"; -+ my_argv[i++] = "--xattrs"; - my_argv[i++] = "--ignore-failed-read"; - my_argv[i++] = "--totals"; - ---- amanda-2.5.2p1/client-src/sendbackup-gnutar.c.xattrs 2007-07-12 13:43:28.000000000 +0200 -+++ amanda-2.5.2p1/client-src/sendbackup-gnutar.c 2007-07-12 13:45:35.000000000 +0200 -@@ -532,7 +532,7 @@ start_backup( - if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0); - if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0); - -- my_argv = alloc(SIZEOF(char *) * (22 + (nb_exclude*2)+(nb_include*2))); -+ my_argv = alloc(SIZEOF(char *) * (23 + (nb_exclude*2)+(nb_include*2))); - - cmd = vstralloc(libexecdir, "/", "runtar", versionsuffix(), NULL); - info_tapeheader(); -@@ -568,6 +568,7 @@ start_backup( - my_argv[i++] = "--atime-preserve"; - #endif - my_argv[i++] = "--sparse"; -+ my_argv[i++] = "--xattrs"; - my_argv[i++] = "--ignore-failed-read"; - my_argv[i++] = "--totals"; - ---- amanda-2.5.2p1/dumper-src/amgtar.pl.in.xattrs 2007-05-04 13:38:51.000000000 +0200 -+++ amanda-2.5.2p1/dumper-src/amgtar.pl.in 2007-07-12 12:33:42.000000000 +0200 -@@ -150,7 +150,7 @@ sub command_estimate { - sub command_estimate_opt_direct { - my($config, $host, $disk, $device, $level, $listdir) = @_; - my($size) = -1; -- my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); -+ my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); - #my(@cmd) = ($gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); - print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1); - open3(\*WTRFH, '>&STDOUT', \*ESTIMATE, @cmd); -@@ -215,7 +215,7 @@ print DEBUG "level =" . $level . "\n" - if(defined($opt_index)) { - $verbose = "--verbose"; - } -- my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); -+ my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); - #my(@cmd) = ($gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); - - print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1); diff --git a/amanda-2.5.2p1-ylwrapNotFound.patch b/amanda-2.5.2p1-ylwrapNotFound.patch deleted file mode 100644 index 25cd042..0000000 --- a/amanda-2.5.2p1-ylwrapNotFound.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- amanda-2.5.2p1/autogen.ylwrapNotFound 2007-05-04 13:39:08.000000000 +0200 -+++ amanda-2.5.2p1/autogen 2007-06-21 11:59:53.000000000 +0200 -@@ -16,4 +16,4 @@ if test x`ls -1t acinclude.m4 2>/dev/nul - cat config/libtool.m4i config/gnulib.m4i config/acinclude.m4i > acinclude.m4 - fi - --autoreconf --warning=syntax --warning=no-portability --force ${1+"$@"} || exit 1 -+autoreconf --install --warning=syntax --warning=no-portability --force ${1+"$@"} || exit 1 diff --git a/amanda-2.6.0b2-xattrs.patch b/amanda-2.6.0b2-xattrs.patch deleted file mode 100644 index 0eb8e1f..0000000 --- a/amanda-2.6.0b2-xattrs.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- amanda-2.6.0b2/dumper-src/amgtar.pl.xattrs 2008-01-17 17:31:20.000000000 -0700 -+++ amanda-2.6.0b2/dumper-src/amgtar.pl 2008-02-18 16:09:26.000000000 -0700 -@@ -150,7 +150,7 @@ - sub command_estimate_opt_direct { - my($config, $host, $disk, $device, $level, $listdir) = @_; - my($size) = -1; -- my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); -+ my(@cmd) = ($runtar, $config, $gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); - #my(@cmd) = ($gnutar, "--create", "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); - print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1); - open3(\*WTRFH, '>&STDOUT', \*ESTIMATE, @cmd); -@@ -215,7 +215,7 @@ - if(defined($opt_index)) { - $verbose = "--verbose"; - } -- my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); -+ my(@cmd) = ($runtar, $config, $gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); - #my(@cmd) = ($gnutar, "--create", $verbose, "--directory", $device, "--listed-incremental", "${gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); - - print DEBUG "cmd:" , join(" ", @cmd), "\n" if ($debug == 1); ---- amanda-2.6.0b2/client-src/sendsize.c.xattrs 2008-01-29 07:43:12.000000000 -0700 -+++ amanda-2.6.0b2/client-src/sendsize.c 2008-02-18 16:11:20.000000000 -0700 -@@ -1820,7 +1820,7 @@ - if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0); - if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0); - -- my_argv = alloc(SIZEOF(char *) * 22); -+ my_argv = alloc(SIZEOF(char *) * 23); - i = 0; - - gnutar_list_dir = getconf_str(CNF_GNUTAR_LIST_DIR); -@@ -1956,6 +1956,7 @@ - my_argv[i++] = "--atime-preserve"; - #endif - my_argv[i++] = "--sparse"; -+ my_argv[i++] = "--xattrs"; - my_argv[i++] = "--ignore-failed-read"; - my_argv[i++] = "--totals"; - ---- amanda-2.6.0b2/client-src/sendbackup-gnutar.c.xattrs 2008-01-17 17:31:16.000000000 -0700 -+++ amanda-2.6.0b2/client-src/sendbackup-gnutar.c 2008-02-18 16:12:46.000000000 -0700 -@@ -524,7 +524,7 @@ - if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0); - if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0); - -- my_argv = alloc(SIZEOF(char *) * (22 + (nb_exclude*2)+(nb_include*2))); -+ my_argv = alloc(SIZEOF(char *) * (23 + (nb_exclude*2)+(nb_include*2))); - - cmd = vstralloc(amlibexecdir, "/", "runtar", versionsuffix(), NULL); - info_tapeheader(); -@@ -565,6 +565,7 @@ - my_argv[i++] = "--atime-preserve"; - #endif - my_argv[i++] = "--sparse"; -+ my_argv[i++] = "--xattrs"; - my_argv[i++] = "--ignore-failed-read"; - my_argv[i++] = "--totals"; - diff --git a/amanda-2.6.0b3-example.patch b/amanda-2.6.0b3-example.patch deleted file mode 100644 index 65cec8d..0000000 --- a/amanda-2.6.0b3-example.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- amanda-2.6.0b3-20080310/example/Makefile.am.exampledir 2008-03-07 11:06:00.000000000 -0700 -+++ amanda-2.6.0b3-20080310/example/Makefile.am 2008-03-11 21:57:06.000000000 -0600 -@@ -4,8 +4,8 @@ - - amanda_dir = $(localstatedir)/lib/amanda - templatedir = $(amanda_dir)/template.d --exampledir = $(amanda_dir)/example --lbltempldir = $(amanda_dir)/example/label-templates -+exampledir = $(sysconfdir)/amanda/example -+lbltempldir = $(sysconfdir)/amanda/example/label-templates - - EXTRA_DIST = chg-multi.conf \ - chg-scsi.conf \ diff --git a/amanda-2.6.0b3-lib.patch b/amanda-2.6.0b3-lib.patch deleted file mode 100644 index d3c5f93..0000000 --- a/amanda-2.6.0b3-lib.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- amanda-2.6.0b3-20080314/config/amanda/krb4-security.m4.lib 2008-01-17 17:31:33.000000000 -0700 -+++ amanda-2.6.0b3-20080314/config/amanda/krb4-security.m4 2008-03-27 14:36:27.000000000 -0600 -@@ -181,7 +181,7 @@ - else - AMANDA_ADD_CPPFLAGS([-I$dir/include]) - fi -- AMANDA_ADD_LDFLAGS([-L$dir/lib]) -+ #AMANDA_ADD_LDFLAGS([-L$dir/lib]) - AMANDA_ADD_LIBS([-lkrb -ldes]) - if test -f ${dir}/lib/libcom_err.a; then - AMANDA_ADD_LIBS([-lcom_err]) -@@ -196,7 +196,7 @@ - AC_MSG_RESULT(found in $dir) - found="yes" - AMANDA_ADD_CPPFLAGS([-I$dir/include -I$dir/include/kerberosIV]) -- AMANDA_ADD_LDFLAGS([-L$dir/lib]) -+ #AMANDA_ADD_LDFLAGS([-L$dir/lib]) - if test \( -f ${dir}/lib/libkrb5.a -o -f ${dir}/lib/libkrb5.so \) && - test \( -f ${dir}/lib/libcom_err.a -o -f ${dir}/lib/libcom_err.so \) ; then - AMANDA_ADD_LIBS([-lkrb4 -lkrb5 -lcrypto -ldes425 -lcom_err]) ---- amanda-2.6.0b3-20080314/config/amanda/krb5-security.m4.lib 2008-01-17 17:31:33.000000000 -0700 -+++ amanda-2.6.0b3-20080314/config/amanda/krb5-security.m4 2008-03-27 14:37:25.000000000 -0600 -@@ -90,7 +90,7 @@ - AMANDA_ADD_CPPFLAGS([-I$KRB5_DIR_FOUND/include]) - fi - AC_CHECK_LIB(krb5support,main) -- AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND]) -+ #AMANDA_ADD_LDFLAGS([-L$KRB5_LIBDIR_FOUND]) - - AC_DEFINE(KRB5_SECURITY,1, - [Define if Kerberos 5 security is to be enabled. ]) diff --git a/amanda-2.6.0p2-builderr.patch b/amanda-2.6.0p2-builderr.patch deleted file mode 100644 index 83b6278..0000000 --- a/amanda-2.6.0p2-builderr.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up amanda-2.6.0p2/man/Makefile.am.builderr amanda-2.6.0p2/man/Makefile.am ---- amanda-2.6.0p2/man/Makefile.am.builderr 2009-07-22 12:09:46.000000000 +0200 -+++ amanda-2.6.0p2/man/Makefile.am 2009-07-22 12:10:03.000000000 +0200 -@@ -31,7 +31,6 @@ SERVER_MAN_PAGES = amadmin.8 \ - amverifyrun.8 \ - amserverconfig.8 \ - amaddclient.8 \ -- amcheckdump.8 \ - amcrypt.8 \ - amaespipe.8 \ - amgpgcrypt.8 \ diff --git a/amanda-2.6.0p2-insec.patch b/amanda-2.6.0p2-insec.patch deleted file mode 100644 index 306d9e4..0000000 --- a/amanda-2.6.0p2-insec.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up amanda-2.6.0p2/server-src/amstatus.pl.insec amanda-2.6.0p2/server-src/amstatus.pl ---- amanda-2.6.0p2/server-src/amstatus.pl.insec 2009-08-04 15:17:13.000000000 +0200 -+++ amanda-2.6.0p2/server-src/amstatus.pl 2009-08-04 15:17:31.000000000 +0200 -@@ -1,4 +1,4 @@ --#!@PERL@ -Tw -+#!@PERL@ -w - # - - # Run perl. diff --git a/amanda-2.6.0p2-pie.patch b/amanda-2.6.0p2-pie.patch deleted file mode 100644 index 15f0681..0000000 --- a/amanda-2.6.0p2-pie.patch +++ /dev/null @@ -1,179 +0,0 @@ ---- amanda-2.6.0p2/amandad-src/Makefile.am.pie 2008-03-25 14:23:05.000000000 -0600 -+++ amanda-2.6.0p2/amandad-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -18,6 +18,9 @@ - - amlibexec_PROGRAMS = amandad - -+amandad_CFLAGS = -fPIE $(AM_CFLAGS) -+amandad_LDFLAGS = -pie $(AM_LDFLAGS) -+ - libamandad_la_SOURCES= amandad_util.c - libamandad_la_LDFLAGS = -release $(VERSION) - libamandad_la_LIBADD = ../common-src/libamanda.la ---- amanda-2.6.0p2/changer-src/Makefile.am.pie 2008-03-06 05:26:45.000000000 -0700 -+++ amanda-2.6.0p2/changer-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -18,10 +18,14 @@ - - if WANT_CHG_SCSI_CHIO - CHIO_SCSI = chg-scsi-chio -+chg_scsi_chio_CFLAGS = -fPIE $(AM_CFLAGS) -+chg_scsi_chio_LDFLAGS = -pie $(AM_LDFLAGS) - endif - - if WANT_CHG_SCSI - CHG_SCSI = chg-scsi -+chg_scsi_CFLAGS = -fPIE $(AM_CFLAGS) -+chg_scsi_LDFLAGS = -pie $(AM_LDFLAGS) - endif - - amlibexec_PROGRAMS = $(CHG_SCSI) ---- amanda-2.6.0p2/client-src/Makefile.am.pie 2008-05-20 11:02:07.000000000 -0600 -+++ amanda-2.6.0p2/client-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -20,6 +20,25 @@ - - amlibexec_PROGRAMS = noop calcsize killpgrp rundump runtar selfcheck sendbackup sendsize versionsuffix - -+noop_CFLAGS = -fPIE $(AM_CFLAGS) -+noop_LDFLAGS = -pie $(AM_LDFLAGS) -+calcsize_CFLAGS = -fPIE $(AM_CFLAGS) -+calcsize_LDFLAGS = -pie $(AM_LDFLAGS) -+killpgrp_CFLAGS = -fPIE $(AM_CFLAGS) -+killpgrp_LDFLAGS = -pie $(AM_LDFLAGS) -+rundump_CFLAGS = -fPIE $(AM_CFLAGS) -+rundump_LDFLAGS = -pie $(AM_LDFLAGS) -+runtar_CFLAGS = -fPIE $(AM_CFLAGS) -+runtar_LDFLAGS = -pie $(AM_LDFLAGS) -+selfcheck_CFLAGS = -fPIE $(AM_CFLAGS) -+selfcheck_LDFLAGS = -pie $(AM_LDFLAGS) -+sendbackup_CFLAGS = -fPIE $(AM_CFLAGS) -+sendbackup_LDFLAGS = -pie $(AM_LDFLAGS) -+sendsize_CFLAGS = -fPIE $(AM_CFLAGS) -+sendsize_LDFLAGS = -pie $(AM_LDFLAGS) -+versionsuffix_CFLAGS = -fPIE $(AM_CFLAGS) -+versionsuffix_LDFLAGS = -pie $(AM_LDFLAGS) -+ - amlibexec_SCRIPTS = patch-system - - CHECK_PERL = $(sbin_SCRIPTS) ---- amanda-2.6.0p2/device-src/Makefile.am.pie 2008-03-25 14:23:05.000000000 -0600 -+++ amanda-2.6.0p2/device-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -52,6 +52,8 @@ - if WANT_DEVPAY - sbin_PROGRAMS += activate-devpay - activate_devpay_SOURCES = activate-devpay.c -+activate_devpay_CFLAGS = -fPIE $(AM_CFLAGS) -+activate_devpay_LDFLAGS = -pie $(AM_LDFLAGS) - endif - - ## headers ---- amanda-2.6.0p2/oldrecover-src/Makefile.am.pie 2008-03-25 14:23:05.000000000 -0600 -+++ amanda-2.6.0p2/oldrecover-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -18,6 +18,9 @@ - - sbin_PROGRAMS = amoldrecover - -+amoldrecover_CFLAGS = -fPIE $(AM_CFLAGS) -+amoldrecover_LDFLAGS = -pie $(AM_LDFLAGS) -+ - ### - # Because libamanda includes routines (e.g. regex) provided by some system - # libraries, and because of the way libtool sets up the command line, we ---- amanda-2.6.0p2/recover-src/Makefile.am.pie 2008-03-25 14:23:05.000000000 -0600 -+++ amanda-2.6.0p2/recover-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -18,6 +18,9 @@ - - sbin_PROGRAMS = amrecover - -+amrecover_CFLAGS = -fPIE $(AM_CFLAGS) -+amrecover_LDFLAGS = -pie $(AM_LDFLAGS) -+ - ### - # Because libamanda includes routines (e.g. regex) provided by some system - # libraries, and because of the way libtool sets up the command line, we ---- amanda-2.6.0p2/restore-src/Makefile.am.pie 2008-01-17 17:31:34.000000000 -0700 -+++ amanda-2.6.0p2/restore-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -21,8 +21,16 @@ - - sbin_PROGRAMS = amrestore amfetchdump - -+amrestore_CFLAGS = -fPIE $(AM_CFLAGS) -+amrestore_LDFLAGS = -pie $(AM_LDFLAGS) -+amfetchdump_CFLAGS = -fPIE $(AM_CFLAGS) -+amfetchdump_LDFLAGS = -pie $(AM_LDFLAGS) -+ - amlibexec_PROGRAMS = amidxtaped - -+amidxtaped_CFLAGS = -fPIE $(AM_CFLAGS) -+amidxtaped_LDFLAGS = -pie $(AM_LDFLAGS) -+ - ### - # Because libamanda includes routines (e.g. regex) provided by some system - # libraries, and because of the way libtool sets up the command line, we ---- amanda-2.6.0p2/server-src/Makefile.am.pie 2008-03-25 14:23:05.000000000 -0600 -+++ amanda-2.6.0p2/server-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -24,6 +24,21 @@ - amflush amgetconf amlabel \ - amtape amreport - -+amadmin_CFLAGS = -fPIE $(AM_CFLAGS) -+amadmin_LDFLAGS = -pie $(AM_LDFLAGS) -+amcheck_CFLAGS = -fPIE $(AM_CFLAGS) -+amcheck_LDFLAGS = -pie $(AM_LDFLAGS) -+amflush_CFLAGS = -fPIE $(AM_CFLAGS) -+amflush_LDFLAGS = -pie $(AM_LDFLAGS) -+amgetconf_CFLAGS = -fPIE $(AM_CFLAGS) -+amgetconf_LDFLAGS = -pie $(AM_LDFLAGS) -+amlabel_CFLAGS = -fPIE $(AM_CFLAGS) -+amlabel_LDFLAGS = -pie $(AM_LDFLAGS) -+amtape_CFLAGS = -fPIE $(AM_CFLAGS) -+amtape_LDFLAGS = -pie $(AM_LDFLAGS) -+amreport_CFLAGS = -fPIE $(AM_CFLAGS) -+amreport_LDFLAGS = -pie $(AM_LDFLAGS) -+ - noinst_PROGRAMS = taper_source_test - - amlibexec_PROGRAMS = amindexd amlogroll amtrmidx \ -@@ -31,6 +46,27 @@ - planner taper amcleanupdisk \ - chunker - -+amindexd_CFLAGS = -fPIE $(AM_CFLAGS) -+amindexd_LDFLAGS = -pie $(AM_LDFLAGS) -+amlogroll_CFLAGS = -fPIE $(AM_CFLAGS) -+amlogroll_LDFLAGS = -pie $(AM_LDFLAGS) -+amtrmidx_CFLAGS = -fPIE $(AM_CFLAGS) -+amtrmidx_LDFLAGS = -pie $(AM_LDFLAGS) -+amtrmlog_CFLAGS = -fPIE $(AM_CFLAGS) -+amtrmlog_LDFLAGS = -pie $(AM_LDFLAGS) -+driver_CFLAGS = -fPIE $(AM_CFLAGS) -+driver_LDFLAGS = -pie $(AM_LDFLAGS) -+dumper_CFLAGS = -fPIE $(AM_CFLAGS) -+dumper_LDFLAGS = -pie $(AM_LDFLAGS) -+planner_CFLAGS = -fPIE $(AM_CFLAGS) -+planner_LDFLAGS = -pie $(AM_LDFLAGS) -+taper_CFLAGS = -fPIE $(AM_CFLAGS) -+taper_LDFLAGS = -pie $(AM_LDFLAGS) -+amclenupdisk_CFLAGS = -fPIE $(AM_CFLAGS) -+amclenupdisk_LDFLAGS = -pie $(AM_LDFLAGS) -+chunker_CFLAGS = -fPIE $(AM_CFLAGS) -+chunker_LDFLAGS = -pie $(AM_LDFLAGS) -+ - # Exclude scripts which depend on perl extension modules from the syntax checks - CHECK_PERL = \ - amaddclient \ ---- amanda-2.6.0p2/tape-src/Makefile.am.pie 2008-03-25 14:23:05.000000000 -0600 -+++ amanda-2.6.0p2/tape-src/Makefile.am 2008-10-10 10:45:11.000000000 -0600 -@@ -17,6 +17,13 @@ - - sbin_PROGRAMS= ammt amdd amtapetype - -+ammt_CFLAGS = -fPIE $(AM_CFLAGS) -+ammt_LDFLAGS = -pie $(AM_LDFLAGS) -+amdd_CFLAGS = -fPIE $(AM_CFLAGS) -+amdd_LDFLAGS = -pie $(AM_LDFLAGS) -+amtapetype_CFLAGS = -fPIE $(AM_CFLAGS) -+amtapetype_LDFLAGS = -pie $(AM_LDFLAGS) -+ - libamtape_la_SOURCES = output-file.c \ - output-null.c \ - output-rait.c \ diff --git a/amanda-2.6.0p2-tcpport.patch b/amanda-2.6.0p2-tcpport.patch deleted file mode 100644 index 3ade508..0000000 --- a/amanda-2.6.0p2-tcpport.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up amanda-2.6.0p2/example/amanda-client.conf.in.tcpp amanda-2.6.0p2/example/amanda-client.conf.in ---- amanda-2.6.0p2/example/amanda-client.conf.in.tcpp 2009-04-06 16:46:35.000000000 +0200 -+++ amanda-2.6.0p2/example/amanda-client.conf.in 2009-04-06 16:46:51.000000000 +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 -\ No newline at end of file -diff -up amanda-2.6.0p2/example/amanda.conf.in.tcpp amanda-2.6.0p2/example/amanda.conf.in ---- amanda-2.6.0p2/example/amanda.conf.in.tcpp 2009-04-06 16:46:19.000000000 +0200 -+++ amanda-2.6.0p2/example/amanda.conf.in 2009-04-06 16:47:10.000000000 +0200 -@@ -730,3 +730,6 @@ define interface local { - # configurations. - - #includefile "@CONFIG_DIR@/amanda.conf.main" -+ -+#resolves "resource temporarily unavailable" bug -+unreserved-tcp-port 1025,65535 -\ No newline at end of file diff --git a/amanda-2.6.1p2-example.patch b/amanda-2.6.1p2-example.patch deleted file mode 100644 index 788712b..0000000 --- a/amanda-2.6.1p2-example.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up amanda-2.6.1p2/example/Makefile.am.example amanda-2.6.1p2/example/Makefile.am ---- amanda-2.6.1p2/example/Makefile.am.example 2008-12-22 19:13:55.000000000 +0100 -+++ amanda-2.6.1p2/example/Makefile.am 2010-01-20 13:47:02.000000000 +0100 -@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va - include $(top_srcdir)/config/automake/installperms.am - - amanda_dir = $(amdatadir) --templatedir = $(amanda_dir)/template.d --exampledir = $(amanda_dir)/example --lbltempldir = $(amanda_dir)/example/label-templates -+templatedir = $(localstatedir)/lib/amanda/template.d -+exampledir = $(sysconfdir)/amanda/example -+lbltempldir = $(sysconfdir)/amanda/example/label-templates - - EXTRA_DIST += chg-multi.conf \ - chg-scsi.conf \ diff --git a/amanda-2.6.1p2-ftbfs.patch b/amanda-2.6.1p2-ftbfs.patch deleted file mode 100644 index 433ee97..0000000 --- a/amanda-2.6.1p2-ftbfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up amanda-2.6.1p2/common-src/glib-util.c.ftbfs amanda-2.6.1p2/common-src/glib-util.c ---- amanda-2.6.1p2/common-src/glib-util.c.ftbfs 2010-02-16 13:06:25.000000000 +0100 -+++ amanda-2.6.1p2/common-src/glib-util.c 2010-02-16 13:06:52.000000000 +0100 -@@ -45,7 +45,7 @@ glib_init(void) { - * is initialized) */ - #ifdef HAVE_LIBCURL - # ifdef G_THREADS_ENABLED -- g_assert(!g_thread_supported()); -+/* g_assert(!g_thread_supported()); */ - # endif - g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); - #endif diff --git a/amanda-2.6.1p2-xattrs.patch b/amanda-2.6.1p2-xattrs.patch deleted file mode 100644 index b970538..0000000 --- a/amanda-2.6.1p2-xattrs.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up amanda-2.6.1p2/application-src/amgtar_perl.pl.xattrs amanda-2.6.1p2/application-src/amgtar_perl.pl ---- amanda-2.6.1p2/application-src/amgtar_perl.pl.xattrs 2010-01-20 16:25:16.000000000 +0100 -+++ amanda-2.6.1p2/application-src/amgtar_perl.pl 2010-01-20 16:26:54.000000000 +0100 -@@ -114,7 +114,7 @@ sub command_estimate { - } - } - my($size) = -1; -- my(@cmd) = ($self->{runtar}, $self->{'config'}, $self->{'gnutar'}, "--create", "--directory", $self->{'device'}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); -+ my(@cmd) = ($self->{runtar}, $self->{'config'}, $self->{'gnutar'}, "--create", "--directory", $self->{'device'}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "/dev/null", "."); - debug("cmd:" . join(" ", @cmd)); - my $wtrfh; - my $estimate_fd = Symbol::gensym; -@@ -180,7 +180,7 @@ sub command_backup { - if(defined($self->{index})) { - $verbose = "--verbose"; - } -- my(@cmd) = ($self->{runtar}, $self->{config}, $self->{gnutar}, "--create", $verbose, "--directory", $self->{device}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); -+ my(@cmd) = ($self->{runtar}, $self->{config}, $self->{gnutar}, "--create", $verbose, "--directory", $self->{device}, "--listed-incremental", "$self->{gnulist}/${listdir}_${level}.new", "--sparse", "--xattrs", "--one-file-system", "--ignore-failed-read", "--totals", "--file", "-", "."); - - debug("cmd:" . join(" ", @cmd)); - -diff -up amanda-2.6.1p2/client-src/sendbackup-gnutar.c.xattrs amanda-2.6.1p2/client-src/sendbackup-gnutar.c ---- amanda-2.6.1p2/client-src/sendbackup-gnutar.c.xattrs 2008-12-01 22:17:16.000000000 +0100 -+++ amanda-2.6.1p2/client-src/sendbackup-gnutar.c 2010-01-20 16:23:17.000000000 +0100 -@@ -520,7 +520,7 @@ start_backup( - if (nb_exclude > 0) file_exclude = build_exclude(dle, 0); - if (nb_include > 0) file_include = build_include(dle, 0); - -- my_argv = alloc(SIZEOF(char *) * (22 + (nb_exclude*2)+(nb_include*2))); -+ my_argv = alloc(SIZEOF(char *) * (23 + (nb_exclude*2)+(nb_include*2))); - - cmd = vstralloc(amlibexecdir, "/", "runtar", versionsuffix(), NULL); - info_tapeheader(dle); -@@ -561,6 +561,7 @@ start_backup( - my_argv[i++] = "--atime-preserve"; - #endif - my_argv[i++] = "--sparse"; -+ my_argv[i++] = "--xattrs"; - my_argv[i++] = "--ignore-failed-read"; - my_argv[i++] = "--totals"; - -diff -up amanda-2.6.1p2/client-src/sendsize.c.xattrs amanda-2.6.1p2/client-src/sendsize.c ---- amanda-2.6.1p2/client-src/sendsize.c.xattrs 2009-11-05 20:57:09.000000000 +0100 -+++ amanda-2.6.1p2/client-src/sendsize.c 2010-01-20 16:23:17.000000000 +0100 -@@ -1931,7 +1931,7 @@ getsize_gnutar( - if(nb_exclude > 0) file_exclude = build_exclude(dle, 0); - if(nb_include > 0) file_include = build_include(dle, 0); - -- my_argv = alloc(SIZEOF(char *) * 22); -+ my_argv = alloc(SIZEOF(char *) * 23); - i = 0; - - gnutar_list_dir = getconf_str(CNF_GNUTAR_LIST_DIR); -@@ -2070,6 +2070,7 @@ getsize_gnutar( - my_argv[i++] = "--atime-preserve"; - #endif - my_argv[i++] = "--sparse"; -+ my_argv[i++] = "--xattrs"; - my_argv[i++] = "--ignore-failed-read"; - my_argv[i++] = "--totals"; - diff --git a/amanda-3.1.1-tcpport.patch b/amanda-3.1.1-tcpport.patch new file mode 100644 index 0000000..dbdbed0 --- /dev/null +++ b/amanda-3.1.1-tcpport.patch @@ -0,0 +1,29 @@ +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 diff --git a/amanda-3.1.1-xattrs.patch b/amanda-3.1.1-xattrs.patch new file mode 100644 index 0000000..62cc855 --- /dev/null +++ b/amanda-3.1.1-xattrs.patch @@ -0,0 +1,55 @@ +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" + } diff --git a/amanda-3.2.0-config-dir.patch b/amanda-3.2.0-config-dir.patch new file mode 100644 index 0000000..1237799 --- /dev/null +++ b/amanda-3.2.0-config-dir.patch @@ -0,0 +1,19 @@ +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 diff --git a/amanda-3.3.0-glib.patch b/amanda-3.3.0-glib.patch new file mode 100644 index 0000000..f4c73ac --- /dev/null +++ b/amanda-3.3.0-glib.patch @@ -0,0 +1,42 @@ +--- amanda/trunk/common-src/glib-util.c 2012/03/09 21:13:00 4591 ++++ amanda/trunk/common-src/glib-util.c 2012/03/10 13:43:44 4592 +@@ -120,15 +120,6 @@ + } + #endif + +-void g_queue_free_full(GQueue * queue) { +- while (!g_queue_is_empty(queue)) { +- gpointer data; +- data = g_queue_pop_head(queue); +- amfree(data); +- } +- g_queue_free(queue); +-} +- + void g_ptr_array_free_full(GPtrArray * array) { + size_t i; + +--- amanda/trunk/common-src/glib-util.h 2012/03/09 21:13:00 4591 ++++ amanda/trunk/common-src/glib-util.h 2012/03/10 13:43:44 4592 +@@ -72,7 +72,6 @@ + + /* These functions all take a GLib container, and call free() on all the + * pointers in the container before free()ing the container itself. */ +-void g_queue_free_full(GQueue * queue); + void g_ptr_array_free_full(GPtrArray * array); + + /* g_value_compare() does what you expect. It returns TRUE if and + +--- amanda/trunk/common-src/glib-util.c 2012/03/10 13:43:52 4593 ++++ amanda/trunk/common-src/glib-util.c 2012/03/11 16:27:35 4594 +@@ -42,7 +42,9 @@ + * is initialized) */ + #ifdef HAVE_LIBCURL + # ifdef G_THREADS_ENABLED ++# if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31)) + g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ ++# endif + # endif + g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); + #endif + diff --git a/amanda-3.3.9-hash-permission.patch b/amanda-3.3.9-hash-permission.patch new file mode 100644 index 0000000..3612aa4 --- /dev/null +++ b/amanda-3.3.9-hash-permission.patch @@ -0,0 +1,13 @@ +diff --git a/perl/Amanda/Config/FoldingHash.pm b/perl/Amanda/Config/FoldingHash.pm +index 49c278d..db11e81 100644 +--- a/perl/Amanda/Config/FoldingHash.pm ++++ b/perl/Amanda/Config/FoldingHash.pm +@@ -1,6 +1,7 @@ + package Amanda::Config::FoldingHash; + use Tie::Hash; +-use base 'Tie::StdHash'; ++eval {require 'Tie::StdHash';}; ++our @ISA = 'Tie::StdHash'; + require Amanda::Config; + require Amanda::Debug; + diff --git a/amanda-3.4.5-no-xinetd.patch b/amanda-3.4.5-no-xinetd.patch new file mode 100644 index 0000000..bc42047 --- /dev/null +++ b/amanda-3.4.5-no-xinetd.patch @@ -0,0 +1,12 @@ +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 ) { diff --git a/amanda-c99.patch b/amanda-c99.patch new file mode 100644 index 0000000..6db3c84 --- /dev/null +++ b/amanda-c99.patch @@ -0,0 +1,30 @@ +Fix C type safety issue in CVE-2023-30547 change + +The types char ** and const char ** are distinct according to the +C language. Future compilers will treat pointer type mismatches +as errors. + +Submitted upstream: + +diff --git a/client-src/runtar.c b/client-src/runtar.c +index 454e9b9a9b96449b..4d2451dc84840fa9 100644 +--- a/client-src/runtar.c ++++ b/client-src/runtar.c +@@ -54,7 +54,7 @@ main( + { + #ifdef GNUTAR + int i; +- char **j; ++ const char **j; + char *e; + char *dbf; + char *cmdline; +@@ -255,7 +255,7 @@ check_whitelist( + gchar* option) + { + bool result = TRUE; +- char** i; ++ const char** i; + + for(i=whitelisted_args; *i; i++) { + if (g_str_has_prefix(option, *i)) { diff --git a/amanda-configure-c99.patch b/amanda-configure-c99.patch new file mode 100644 index 0000000..bee76fb --- /dev/null +++ b/amanda-configure-c99.patch @@ -0,0 +1,19 @@ +Avoid an implicit int. Otherwise, the test fails unconditionally with +compilers that do not support implicit ints (a language feature that +was removed with the C99 language revision). + +Submitted upstream: + +diff --git a/config/amanda/ipv6.m4 b/config/amanda/ipv6.m4 +index 9d76979339fee75a..d91ab95ab97e4ec1 100644 +--- a/config/amanda/ipv6.m4 ++++ b/config/amanda/ipv6.m4 +@@ -85,7 +85,7 @@ AC_DEFUN([AMANDA_CHECK_IPV6], + #include + #include + +-main() ++int main(void) + { + int aa; + aa = socket(AF_INET6, SOCK_STREAM, 0); diff --git a/amanda-udp.service b/amanda-udp.service new file mode 100644 index 0000000..e749c81 --- /dev/null +++ b/amanda-udp.service @@ -0,0 +1,9 @@ +[Unit] +Description=Amanda Backup System +After=local-fs.target + +[Service] +User=amandabackup +Group=disk +ExecStart=/usr/sbin/amandad -auth=bsd amdump amindexd amidxtaped +StandardInput=socket diff --git a/amanda-udp.socket b/amanda-udp.socket new file mode 100644 index 0000000..6d94ebe --- /dev/null +++ b/amanda-udp.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Amanda Activation Socket + +[Socket] +Service=amanda-udp.service +ListenDatagram=10080 + +[Install] +WantedBy=sockets.target diff --git a/amanda-xinetd b/amanda-xinetd deleted file mode 100644 index 4574e8c..0000000 --- a/amanda-xinetd +++ /dev/null @@ -1,23 +0,0 @@ -# default: off -# description: The client for the Amanda backup system.\ -# This must be on for systems being backed up\ -# by Amanda. - -service amanda -{ - socket_type = dgram - protocol = udp - wait = yes - user = amandabackup - group = disk - server = @LIBEXECDIR@/amanda/amandad -# Configure server_args for the authentication type you will be using, -# and the services you wish to allow the amanda server and/or recovery -# clients to use. -# -# Change the -auth= entry to reflect the authentication type you use. -# Add amindexd to allow recovery clients to access the index database. -# Add amidxtaped to allow recovery clients to access the tape device. - server_args = -auth=bsd amdump - disable = yes -} diff --git a/amanda.socket b/amanda.socket new file mode 100644 index 0000000..136d00f --- /dev/null +++ b/amanda.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Amanda Activation Socket + +[Socket] +ListenStream=10080 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/amanda.spec b/amanda.spec index e916435..73f8e9c 100644 --- a/amanda.spec +++ b/amanda.spec @@ -1,43 +1,84 @@ -%{!?defconfig:%define defconfig DailySet1} -%{!?indexserver:%define indexserver amandahost} -%{!?tapeserver:%define tapeserver %{indexserver}} -%{!?amanda_user:%define amanda_user amandabackup} -%{!?amanda_group:%define amanda_group disk} +%if 0%{?rhel} >= 9 +%bcond_with gnuplot +%else +%bcond_without gnuplot +%endif -Summary: A network-capable tape backup solution -Name: amanda -Version: 2.6.1p2 -Release: 2%{?dist} -Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz -#Source: http://www.zmanda.com/downloads/community/community-builds/amanda-%{version}.tar.gz -Source1: amanda.crontab -Source4: disklist -Source5: amanda-xinetd -Source8: amandahosts -Source9: README-rpm -Patch1: amanda-2.6.1p2-example.patch -Patch2: amanda-2.6.1p2-xattrs.patch -Patch3: amanda-2.6.0p2-tcpport.patch -Patch4: amanda-2.6.0b3-lib.patch -Patch5: amanda-2.6.0p2-pie.patch -Patch6: amanda-2.6.1p2-ftbfs.patch -License: BSD -Group: Applications/System -URL: http://www.amanda.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define _libexecdir %{_libdir} +%define defconfig DailySet1 +%define indexserver amandahost +%define tapeserver %{indexserver} +%define amanda_user amandabackup +%define amanda_group disk + +%global _hardened_build 1 + +Summary: A network-capable tape backup solution +Name: amanda +Version: 3.5.4 +Release: %autorelease +Source: https://github.com/zmanda/amanda/archive/tag-community-%{version}/amanda-%{version}.tar.gz +Source1: amanda.crontab +Source4: disklist +Source8: amandahosts +Source9: amanda.socket +Source10: amanda@.service +Source11: activate-devpay.1.gz +Source12: killpgrp.8 +Source13: amanda-udp.socket +Source14: amanda-udp.service +Source15: kamanda.socket +Source16: kamanda@.service +Patch1: amanda-3.1.1-xattrs.patch +Patch2: amanda-3.1.1-tcpport.patch +Patch3: amanda-3.2.0-config-dir.patch +# Don't mention xinetd files in amserverconfig (#1460763) +Patch4: amanda-3.4.5-no-xinetd.patch +# Support tirpc +Patch5: patch-tirpc +# Specify the location or the xfs housekeeping directory +# https://bugzilla.redhat.com/show_bug.cgi?id=1671117 +Patch6: patch-xfsrestore-housekeeping +Patch7: amanda-configure-c99.patch +Patch8: amanda-c99.patch +# Drop nonexistent -s option from aflush man page (#1943909) +Patch9: https://github.com/zmanda/amanda/pull/273.patch +# Perl 5.40 support (rhbz#2322518) +Patch10: https://github.com/zmanda/amanda/pull/270.patch + +License: BSD-3-Clause AND GPL-3.0-or-later AND GPL-2.0-or-later AND GPL-2.0-only +URL: http://www.amanda.org BuildRequires: automake autoconf libtool -BuildRequires: dump gnuplot cups samba-client tar grep fileutils -BuildRequires: gcc-c++ readline-devel -BuildRequires: krb5-devel rsh openssh-clients ncompress mtx mt-st -BuildRequires: perl-devel perl(ExtUtils::Embed) +BuildRequires: xfsdump +%if %{with gnuplot} +BuildRequires: gnuplot +%endif +BuildRequires: cups samba-client tar grep +BuildRequires: gcc-c++ readline-devel libtirpc-devel +BuildRequires: krb5-devel rsh openssh-clients +BuildRequires: mtx mt-st +BuildRequires: perl-devel perl-generators perl(ExtUtils::Embed) perl(Test::Simple) BuildRequires: glib2-devel openssl-devel swig bison flex -BuildRequires: libcurl-devel -Requires(pre): shadow-utils -Requires(post): grep sed -Requires: fileutils grep initscripts tar /bin/mail xinetd -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: libcurl-devel procps-ng systemd +BuildRequires: make +BuildRequires: rpcgen +BuildRequires: libxslt docbook-dtds docbook-style-xsl +Requires: grep tar /usr/bin/mail +Requires: amanda-libs%{?_isa} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +%{?systemd_requires} -%description +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Math::BigInt\\) + +# Filter bogus libArchive.so() etc. Provides, this is intentional rpm-build +# feature, bug #1309664 +%global __provides_exclude_from %{?__provides_exclude_from:%{__provides_exclude_from}|}^%{perl_vendorarch}/auto/.*\\.so$ + +#exclude Dancer2 module +%global __requires_exclude ^perl\\(Dancer2\\) + +%description AMANDA, the Advanced Maryland Automatic Network Disk Archiver, is a backup system that allows the administrator of a LAN to set up a single master backup server to back up multiple hosts to one or more @@ -50,12 +91,19 @@ be installed on both AMANDA clients and AMANDA servers. Note that you will have to install the amanda-client and/or amanda-server packages as well. +%package libs +Summary: Amanda libraries +Requires: grep + +%description libs +This package contains basic Amanda libraries, which are used by all +Amanda programs. + %package client -Summary: The client component of the AMANDA tape backup system -Group: Applications/System -Requires: fileutils grep /sbin/service +Summary: The client component of the AMANDA tape backup system +Requires: grep Requires(pre): amanda = %{version}-%{release} -Requires(post): grep sed +Requires: amanda-libs%{?_isa} = %{version}-%{release} %description client The Amanda-client package should be installed on any machine that will @@ -64,11 +112,11 @@ backed up). You will also need to install the amanda package on each AMANDA client machine. %package server -Summary: The server side of the AMANDA tape backup system -Group: Applications/System -Requires: fileutils grep /sbin/service +Summary: The server side of the AMANDA tape backup system +Requires: grep +Requires: perl(Amanda::DB) perl(Amanda::Recovery) perl(Amanda::Service) Requires(pre): amanda = %{version}-%{release} -Requires(post): grep sed findutils +Requires: amanda-libs%{?_isa} = %{version}-%{release} %description server The amanda-server package should be installed on the AMANDA server, @@ -77,81 +125,81 @@ will be written. You will also need to install the amanda package on the AMANDA server machine. And, if the server is also to be backed up, the server also needs to have the amanda-client package installed. -%package devel -Summary: Libraries and documentation of the AMANDA tape backup system -Group: Development/Libraries -Requires(pre): amanda = %{version}-%{release} - -%description devel -The amanda-devel package should be installed on any machine that will -be used to develop amanda applications. - -#%%define _default_patch_fuzz 3 - %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 -b .example -%patch2 -p1 -b .xattrs -%patch3 -p1 -b .tcpport -%patch4 -p1 -b .lib -#%%patch5 -p1 -b .pie -%patch6 -p1 -b .ftbfs -./autogen +%autosetup -p1 -n %{name}-tag-community-%{version} + +# Create a sysusers.d config file +cat >amanda.sysusers.conf < $RPM_BUILD_ROOT/etc/xinetd.d/amanda -chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amanda -mkdir -p $RPM_BUILD_ROOT/var/log/amanda +mkdir -p $RPM_BUILD_ROOT/etc/amanda +mkdir -p $RPM_BUILD_ROOT/var/log/amanda/amandad mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda install -m 600 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/lib/amanda/.amandahosts - -cp %SOURCE9 . - -#pushd tape-src/.libs -#install -m 755 amtapetype $RPM_BUILD_ROOT/%{_sbindir} -#popd +install -p -m 644 -D %{SOURCE9} %{buildroot}%{_unitdir}/amanda.socket +install -p -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/amanda@.service +install -p -m 644 -D %{SOURCE13} %{buildroot}%{_unitdir}/amanda-udp.socket +install -p -m 644 -D %{SOURCE14} %{buildroot}%{_unitdir}/amanda-udp.service +install -p -m 644 -D %{SOURCE15} %{buildroot}%{_unitdir}/kamanda.socket +install -p -m 644 -D %{SOURCE16} %{buildroot}%{_unitdir}/kamanda@.service +install -D %{SOURCE11} %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz +install -D %{SOURCE12} %{buildroot}/%{_mandir}/man8/killpgrp.8 +install -m 644 %{buildroot}/etc/amanda/amanda-security.conf %{buildroot}/etc/amanda-security.conf +ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad +ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8 pushd ${RPM_BUILD_ROOT} - mv .%{_sysconfdir}/amanda/example .%{_sysconfdir}/amanda/%defconfig + 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 mkdir -p .%{_localstatedir}/lib/amanda/%defconfig/index @@ -160,705 +208,264 @@ popd rm -rf $RPM_BUILD_ROOT/usr/share/amanda find $RPM_BUILD_ROOT -name \*.la | xargs rm +pushd $RPM_BUILD_ROOT/usr/bin +rm amandad +ln -s ../%_lib/amanda/amandad +popd + +install -m0644 -D amanda.sysusers.conf %{buildroot}%{_sysusersdir}/amanda.conf + %check make check -%clean -rm -rf ${RPM_BUILD_ROOT} - -%pre -# look for user 'amanda' with uid 33, if exists, rename to new %amanda_user -getent passwd 'amanda' | grep ':33:' >/dev/null && -usermod -l %amanda_user amanda >/dev/null 2>&1 && -mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null - -/usr/sbin/useradd -M -N -g %amanda_group -o -r -d %{_localstatedir}/lib/amanda -s /bin/bash \ - -c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || : -/usr/bin/gpasswd -a %amanda_user tape >/dev/null 2>&1 || : %post -/sbin/ldconfig -# when upgrading and /etc/xinet.d/amanda contains obsolete user name, update it -[ $1 -eq 2 ] && - grep -E '^[[:blank:]]*user[[:blank:]]*=[[:blank:]]*amanda[[:blank:]]*$' /etc/xinetd.d/amanda &>/dev/null && - sed -i.rpmsave -r -e 's/^([[:blank:]]*user[[:blank:]]*=[[:blank:]]*)amanda([[:blank:]]*)$/\1%amanda_user\2/' /etc/xinetd.d/amanda || : +%{?ldconfig} +%systemd_post amanda.socket amanda-udp.socket kamanda.socket -[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : -# when upgrading and .amandahosts contains obsolete user name, update it -#[ $1 -eq 2 ] && -#grep -E '^[^[:blank:]]+[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null && -# sed -i.usernameupdate -r -e 's/^([^[:blank:]]+[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || : +%preun +%systemd_preun amanda.socket amanda-udp.socket kamanda.socket %postun -/sbin/ldconfig -[ -f /var/lock/subsys/xinetd ] && /sbin/service xinetd reload > /dev/null 2>&1 || : +%{?ldconfig} +%systemd_postun_with_restart amanda.socket amanda-udp.socket kamanda.socket -%pre client -# when upgrading, move /etc/amandates to /var/lib/amanda/amandates -[ -f /etc/amandates ] && - mv /etc/amandates /var/lib/amanda/amandates || : - -%post client -p /sbin/ldconfig - -%post server -/sbin/ldconfig -# when upgrading, check amanda.conf in all configurations -# if it contains obsolete user name, update it -[ $1 -eq 2 ] && -grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | - xargs sed -i.usernameupdate -r -e 's/^(dumpuser[[:blank:]]*)"amanda"/\1"%amanda_user"/' &>/dev/null || : - -%postun client -p /sbin/ldconfig - -%postun server -p /sbin/ldconfig +%ldconfig_scriptlets client +%ldconfig_scriptlets server %files -%defattr(-,root,root) - %config(noreplace) /etc/xinetd.d/amanda -%attr(-,%amanda_user,%amanda_group) %{_libdir}/libamanda-*.so - %{_libdir}/libamdevice-*.so - %{_libdir}/libamglue.so -# %{_libdir}/libamtape-*.so - %{_libdir}/libamserver-*.so - %{_libdir}/librestore-*.so - %{_libdir}/libamclient-*.so - %{_libdir}/libamandad-*.so - %{_libdir}/libamar-*.so - %{_libdir}/libamxfer-*.so -%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/amanda -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amanda-sh-lib.sh -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-glue -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/auto/Amanda/ -%attr(-,%amanda_user,%amanda_group) %{perl_vendorarch}/Amanda/ -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amarchiver - %{_mandir}/man8/amrestore.8* - %{_mandir}/man8/amarchiver.8* - %{_mandir}/man8/script-email.8* - %{_mandir}/man5/amanda-archive-format.5* - %{_mandir}/man7/amanda-auth.7* - %{_mandir}/man7/amanda-scripts.7* -%attr(600,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/.amandahosts +%license COPYRIGHT COPYRIGHT.BSD +%doc ChangeLog NEWS README.md ReleaseNotes +%{_unitdir}/amanda@.service +%{_unitdir}/amanda.socket +%{_unitdir}/amanda-udp.service +%{_unitdir}/amanda-udp.socket +%{_unitdir}/kamanda@.service +%{_unitdir}/kamanda.socket -%attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda -%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/ -%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/ -%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/%defconfig -%doc README-rpm +%dir %{_libexecdir}/amanda +%{_libexecdir}/amanda/amandad +%{_libexecdir}/amanda/amanda-sh-lib.sh +%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/ambind +%{_libexecdir}/amanda/amndmjob +%if %{with gnuplot} +%{_libexecdir}/amanda/amcat.awk +%{_libexecdir}/amanda/amplot.awk +%{_libexecdir}/amanda/amplot.g +%{_libexecdir}/amanda/amplot.gp +%endif +%{_libexecdir}/amanda/ndmjob +%{_sbindir}/amandad +%{_sbindir}/amaespipe +%{_sbindir}/amarchiver +%{_sbindir}/amcrypt +%{_sbindir}/amcrypt-ossl +%{_sbindir}/amcrypt-ossl-asym +%{_sbindir}/amcryptsimple +%{_sbindir}/amgetconf +%{_sbindir}/amgpgcrypt +%if %{with gnuplot} +%{_sbindir}/amplot +%endif +%{_sbindir}/amssl + +%{perl_vendorarch}/Amanda/ +%{perl_vendorarch}/auto/Amanda/ + +%{_mandir}/man5/amanda-archive-format.5* +%{_mandir}/man7/amanda-compatibility.7* %{_mandir}/man5/amanda.conf* +%{_mandir}/man7/amanda-auth.7* +%{_mandir}/man7/amanda-match.7* +%{_mandir}/man7/amanda-scripts.7* +%{_mandir}/man8/amanda.8* +%{_mandir}/man8/amarchiver.8* +%if %{with gnuplot} +%{_mandir}/man8/amplot.8* +%endif +%{_mandir}/man8/script-email.8* +%{_mandir}/man8/amaespipe.8* +%{_mandir}/man8/amcrypt-ossl-asym.8* +%{_mandir}/man8/amcrypt-ossl.8* +%{_mandir}/man8/amcryptsimple.8* +%{_mandir}/man8/amcrypt.8* +%{_mandir}/man8/amgpgcrypt.8* +%{_mandir}/man8/amgetconf.8* +%{_mandir}/man8/amcleanupdisk.8* +%{_mandir}/man7/amanda-auth-ssl.7.* +%{_mandir}/man8/amssl.8.* + +%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 +%{_sysusersdir}/amanda.conf + +%files libs +%{_libdir}/libamdevice*.so +%{_libdir}/libamserver*.so +%{_libdir}/libamclient*.so +%{_libdir}/libamanda-*.so +%{_libdir}/libamanda.so +%{_libdir}/libamandad*.so +%{_libdir}/libamar*.so +%{_libdir}/libamglue*.so +%{_libdir}/libamxfer*.so +%{_libdir}/libndmjob*.so +%{_libdir}/libndmlib*.so %files server -%defattr(-,root,root) -%doc COPYRIGHT* NEWS README -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amidxtaped -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amindexd -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amlogroll -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmidx -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amtrmlog -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/driver -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/dumper -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/planner -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/taper -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chunker -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcleanupdisk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chio -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-chs -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-juke -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-manual -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mcutil -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-mtx -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-multi -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-null -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rait -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-rth -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-scsi -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-zd-mtx -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-disk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-iomega -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/chg-lib.sh -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amcat.awk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.awk -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.g -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amplot.gp +%{_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 -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaespipe -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amaddclient -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin -%attr(4750,root,%amanda_group) %{_sbindir}/amcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcryptsimple -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcrypt-ossl-asym -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdevcheck -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgpgcrypt -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amverify -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amserverconfig -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amservice -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amvault -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/activate-devpay -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdd -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/ammt -#%%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amverifyrun +%{_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 -%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 %{_sysconfdir}/amanda -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/* -%exclude %{_sysconfdir}/amanda/%defconfig/amanda-client.conf -%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/lib/amanda/template.d -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/template.d/* - -%{_mandir}/man8/amadmin.8* -%{_mandir}/man8/amaespipe.8* -%{_mandir}/man8/amaddclient.8* -%{_mandir}/man8/amanda.8* -%{_mandir}/man8/amcheck.8* -%{_mandir}/man8/amcheckdb.8* -%{_mandir}/man8/amcheckdump.8* -%{_mandir}/man8/amcleanup.8* -%{_mandir}/man8/amcrypt.8* -%{_mandir}/man8/amcryptsimple.8* -#%%{_mandir}/man8/amdd.8* -%{_mandir}/man8/amdevcheck.8* -%{_mandir}/man8/amdump.8* -%{_mandir}/man8/amflush.8* -%{_mandir}/man8/amgetconf.8* -%{_mandir}/man8/amgpgcrypt.8* -%{_mandir}/man8/amlabel.8* -%{_mandir}/man8/amservice.8* -%{_mandir}/man8/amvault.8* -#%%{_mandir}/man8/ammt.8* -%{_mandir}/man8/amoverview.8* -%{_mandir}/man8/amplot.8* -%{_mandir}/man8/amreport.8* -%{_mandir}/man8/amrmtape.8* -%{_mandir}/man8/amserverconfig.8* -%{_mandir}/man8/amstatus.8* -%{_mandir}/man8/amtape.8* -%{_mandir}/man8/amtapetype.8* -%{_mandir}/man8/amtoc.8* -#%%{_mandir}/man8/amverify.8* -#%%{_mandir}/man8/amverifyrun.8* -%{_mandir}/man8/amcrypt-ossl.8* -%{_mandir}/man8/amcrypt-ossl-asym.8* -%{_mandir}/man7/amanda-changers.7* -%{_mandir}/man7/amanda-devices.7* %{_mandir}/man5/disklist.5* %{_mandir}/man5/tapelist.5* +%{_mandir}/man5/amanda-command-file.5* +%{_mandir}/man7/amanda-devices.7* +%{_mandir}/man7/amanda-changers.7* +%{_mandir}/man7/amanda-interactivity.7* +%{_mandir}/man7/amanda-taperscan.7* +%{_mandir}/man8/amaddclient.8* +%{_mandir}/man8/amadmin.8* +%{_mandir}/man8/amcleanup.8* +%{_mandir}/man8/amdevcheck.8* +%{_mandir}/man8/amdump.8* +%{_mandir}/man8/amfetchdump.8* +%{_mandir}/man8/amflush.8* +%{_mandir}/man8/amcheckdb.8* +%{_mandir}/man8/amcheckdump.8* +%{_mandir}/man8/amcheck.8* +%{_mandir}/man8/amlabel.8* +%{_mandir}/man8/amoverview.8* +%{_mandir}/man8/amreport.8* +%{_mandir}/man8/amrestore.8* +%{_mandir}/man8/amrmtape.8* +%{_mandir}/man8/amserverconfig.8* +%{_mandir}/man8/amservice.8* +%{_mandir}/man8/amstatus.8* +%{_mandir}/man8/amtapetype.8* +%{_mandir}/man8/amtape.8* +%{_mandir}/man8/amtoc.8* +%{_mandir}/man8/amvault.8* +%{_mandir}/man8/amanda-rest-server.8.* +%{_mandir}/man8/amreindex.8.* +%{_mandir}/man1/activate-devpay.1* + +%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/* %files client - %defattr(-,root,root) -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/amandad -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/application/ -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/calcsize -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/killpgrp -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/noop -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/patch-system -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/rundump -%attr(4750,root,%amanda_group) %{_libexecdir}/amanda/runtar -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/selfcheck -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendbackup -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/sendsize -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/versionsuffix -%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amanda/teecount -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amfetchdump - %{_mandir}/man8/amfetchdump.8* -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover -%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoldrecover - %{_mandir}/man8/amrecover.8* - %{_mandir}/man8/amgtar.8* - %{_mandir}/man8/amsamba.8* - %{_mandir}/man8/amstar.8* - %{_mandir}/man8/amzfs-sendrecv.8* - %{_mandir}/man8/amzfs-snapshot.8* - %{_mandir}/man5/amanda-client.conf.5* - %{_mandir}/man7/amanda-applications.7* -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/lib/amanda/amandates -%attr(-,%amanda_user,%amanda_group) %{_localstatedir}/lib/amanda/gnutar-lists/ -%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda-client.conf +%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 + +%{_mandir}/man7/amanda-applications.7* +%{_mandir}/man8/amdump_client.8* +%{_mandir}/man5/amanda-client.conf.5* +%{_mandir}/man5/amanda-security.conf.5* +%{_mandir}/man8/ambsdtar.8* +%{_mandir}/man8/amgtar.8* +%{_mandir}/man8/ampgsql.8* +%{_mandir}/man8/amraw.8* +%{_mandir}/man8/amrecover.8* +%{_mandir}/man8/amoldrecover.8* +%{_mandir}/man8/amsamba.8* +%{_mandir}/man8/amstar.8* +%{_mandir}/man8/amsuntar.8* +%{_mandir}/man8/amzfs-sendrecv.8* +%{_mandir}/man8/amzfs-snapshot.8* +%{_mandir}/man8/killpgrp.8* +%{_mandir}/man8/ambackup.8.* + +%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 devel -%defattr(-,root,root) -%{_includedir}/amanda/ -%{_libdir}/libamanda.so -%{_libdir}/libamdevice.so -#%%{_libdir}/libamtape.so -%{_libdir}/libamclient.so -%{_libdir}/libamserver.so -%{_libdir}/librestore.so -%{_libdir}/libamandad.so -%{_libdir}/libamar.so -%{_libdir}/libamxfer.so %changelog -* Tue Feb 16 2010 Daniel Novotny 2.6.1p2-2 -- fix #564935 - FTBFS amanda-2.6.1p2-1.fc13 - -* Thu Jan 21 2010 Daniel Novotny 2.6.1p2-1 -- upgrade to 2.6.1p2, drop upstreamed patches, rebase remaining patches - -* Fri Dec 4 2009 Stepan Kasal - 2.6.0p2-15 -- rebuild against perl 5.10.1 - -* Thu Oct 15 2009 Daniel Novotny 2.6.0p2-14 -- add amanda user to group "tape" (#529159) - -* Fri Aug 21 2009 Tomas Mraz - 2.6.0p2-13 -- rebuilt with new openssl - -* Tue Aug 04 2009 Daniel Novotny 2.6.0p2-12 --fix #512534 - amstatus outputs "Insecure dependency in printf ..." - -* Fri Jul 24 2009 Fedora Release Engineering - 2.6.0p2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Daniel Novotny 2.6.0p2-10 -- fix #510961 - FTBFS: amanda-2.6.0p2-9 - -* Fri Apr 24 2009 Daniel Novotny 2.6.0p2-9 -- fix #497488 - amanda subpackages require only a specific version of amanda, - not also release - -* Tue Apr 14 2009 Daniel Novotny 2.6.0p2-8 -- fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") - -* Wed Apr 08 2009 Daniel Novotny 2.6.0p2-7 -- the tcpport patch was lost after rebase, adding again - (#448071, #462681) - -* Mon Feb 23 2009 Fedora Release Engineering - 2.6.0p2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Jan 15 2009 Tomas Mraz 2.6.0p2-5 -- rebuild with new openssl - -* Thu Nov 20 2008 Daniel Novotny 2.6.0p2-4 - .usernameupdate extension changed to .rpmsave (#472349) - -* Thu Oct 23 2008 Daniel Novotny 2.6.0p2-3 -- added trailing || : in the %%pre client script - -* Fri Oct 10 2008 Orion Poplawski 2.6.0p2-2 -- Drop duplicated libamglue.so from -devel -- Update -pie patch -- Fix Source typo -- Move xinetd to main package - used by both client and server -- Move %{_libexecdir}/amanda/amanda-sh-lib.sh to main package -- LIBEXECDIR is used in xinetd template -- Make calcsize setuid root - -* Wed Oct 01 2008 Daniel Novotny 2.6.0p2-1 -- Update to 2.6.0p2 -- perl-ExtUtils-Embed added to BuildRequires -- perl patch dropped (upstreamed) -- library name change from libamglue.so.* to libamglue.so - -* Thu Mar 27 2008 Orion Poplawski 2.6.0-0.b3_20080314.1 -- Update to 2.6.0b3_20080314 -- New -lib patch that patches the autotool source files - -* Tue Mar 11 2008 Orion Poplawski 2.6.0-0.b3_20080310.1 -- Update to 2.6.0b3_20080310 -- Re-add updated pie patch, re-add autogen -- Update example patch to modify Makefile.am, leave template.d in - /var/lib/amanda for now - -* Wed Feb 20 2008 Orion Poplawski 2.6.0-0.b2_20080220.1 -- Update to 2.6.0b2-20080220 -- Drop libdir patch, use --with-libdir instead -- Move perl modules to %%{perl_vendorarch} and add perl Requires - -* Wed Feb 20 2008 Orion Poplawski 2.6.0-0.b2 -- Update to 2.6.0b2, drop upstreamed patches -- Update xattrs patch -- Add patches to fix install locations -- Add -fPIE/-pie to CFLAGS/LDFLAGS, drop pie patch -- Drop autotools BR -- Drop /usr/bin/Mail BR and specify mailer as /bin/mail -- Add %%check section -- Move /etc/amanda/amandates to /var/lib/amanda/amandates -- Remove ending . from summaries - -* Mon Feb 18 2008 Radek Brich 2.5.2.p1-10 -- do not require gnuplot by -server subpackage (bz#433101) - -* Thu Nov 22 2007 Radek Brich 2.5.2.p1-9 -- Change default amanda user name to 'amandabackup' (#124510). - This should not break upgrades as config files are checked for - old user name and updated. -- Add some explaining comments to .amandahosts (#153749) - -* Tue Aug 28 2007 Radek Brich 2.5.2.p1-8 -- rebuild - -* Fri Aug 17 2007 Radek Brich 2.5.2.p1-7 -- BuildRequires mtx and mt-st (#251690). - -* Fri Aug 10 2007 Radek Brich 2.5.2.p1-6 -- Included upstream patch for chg-multi.sh (#251316). - -* Wed Aug 08 2007 Radek Brich 2.5.2.p1-5 -- Added ssh and ncompress to BuildRequires (#250730). -- Removed some obsolete makes from build section. - -* Thu Jul 12 2007 Radek Brich 2.5.2.p1-4 -- Enable backing up ACL/SElinux xattrs with tar (#201916). -- Removed obsolete patches and sources. - -* Mon Jun 25 2007 Radek Brich 2.5.2.p1-3 -- Update -undefSymbols patch. All undefined symbols reported by - 'ldd -r' should now be fixed (#198178). - -* Fri Jun 22 2007 Radek Brich 2.5.2.p1-2 -- Fix undefined symbols in libamserver.so. -- Fix ./autogen so it automatically installs ylwrap (bug 224143). -- Run ./autogen in prep section (otherwise the -pie patch had no effect). -- Update -pie patch. - -* Thu Jun 21 2007 Radek Brich 2.5.2.p1-1 -- New upstream version. -- Client rpm now installs amanda-client.conf. -- Removed obsolete patches -bug18322 and -rsh. -- Clean up spec file (non-utf8 error and some warnings from rpmlint). - -* Mon Feb 19 2007 Jay Fenlason 2.5.1p3-1%{?dist} -- Upgrade to new upstream release, now that 2.5.1 is somewhat stable. -- Note that this requires changing the xinetd configuration and amanda.conf - because of the new authentication mechanism. -- -server subpackage does not require xinetd. -- -server scriptlets do not need to reload xinetd. - -* Mon Sep 25 2006 Jay Fenlason 2.5.0p2-4 -- Include my -dump_size patch to close - bz#206129: Dump output size determined incorrectly -- Clean up the spec file, following some suggestions in - bz#185659: amanda 2.5.0 -- Use a tarball without the problematic contrib/sst directory. -- Include my new_gnutar (based on a patch by Orion Poplawski - ) to work around changed incremental file format - in newer (>1.15.1) versions of gnutar. -- include my -wildcards patch to turn on wildcards with new versions of tar. - -* Tue Sep 5 2006 Jay Fenlason 2.5.0p2-3 -- move libamclient-*.so to the base rpm, so that multilib support works. - This fixes - bz#205202 File conflicts - -* Wed Jul 12 2006 Jesse Keating - 2.5.0p2-2.1 -- rebuild - -* Thu Jun 8 2006 Jay Fenlason 2.5.0p2-2 -- New upstream version -- Make the BuildRequires on /usr/bin/Mail rather than mailx, because we - don't really care where the Mail command comes from. -- include the amcheck_badtape patch by Paul Bijnens - to fix a problem where amcheck doesn't - realize the wrong tape is in the drive. -- include the error_msg patch from Jean-Louis Martineau - to fix a double-free problem -- include the restore patch from Jean-Louis Martineau - to fix an error in amrestore -- include a slightly modified form of the big_holding_disk patch from - Andrej Filipcic to fix a problem with holding - disks bigger than 4tb - -* Mon May 22 2006 Jesse Keating 2.5.0-3 -- Fix BuildReqs - -* Fri Apr 7 2006 Jay Fenlason 2.5.0-2 -- New upstream release: 2.5.0, with new features -- Do not include our own amanda.conf anymore, use the one from the - tarball. -- Remove the static libraries. -- Update the -pie patch -- Turn on the new -with-ssh-security option. -- Change the mode of ~amanda/.amandahosts to 600, since 2.5.0 requires - it. -- actually use the defconfig macro it this spec file. -- Change the name of the index server to "amandahost" from localhost. - Users should ensure that "amandahost.their-domain" points to their - Amanda server. -- Change amandahosts likewise. -- Add dependency on /usr/bin/Mail -- Ensure unversioned .so files are only in the -devel rpm. -- Remove DUMPER_DIR and the files in it, as nothing seems to actually - use them. -- Include the -overflow patch from Jean-Louis Martineau - - -* Fri Feb 10 2006 Jesse Keating - 2.4.5p1-3.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 2.4.5p1-3.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Wed Jan 18 2006 Jay Fenlason 2.4.5p1-3 -- Fix spec file to use %%{_localstatedir} instead of hardcoding /var/lib -- Add amanda_user and amanda_group defines, to make changing the username - easier. -- Add a BuildRequires on /usr/bin/Mail - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Fri Nov 4 2005 Jay Fenlason -- New upstream release. - -* Sun Jul 31 2005 Florian La Roche -- make sure amanda builds with newest rpm - -* Wed Apr 20 2005 Jay Fenlason 2.4.5-2 -- New upstream release. This obsoletes the -bug144052 patch. -- Reorg this spec file slightly to allow someone to specify - index server, tape server and default configuration when - rebuilding the rpms via something like - 'rpmbuild -ba --define "indexserver foo.fqdn.com" amanda.spec' - This change suggested by Matt Hyclak . - -* Tue Apr 5 2005 Jay Fenlason 2.4.4p4-4 -- Add -bug144052 patch to close - bz#144052 amverifyrun sometimes verifies the wrong tapes - -* Tue Mar 8 2005 Jay Fenlason 2.4.4p4-3 -- rebuild with gcc4 - -* Wed Jan 12 2005 Tim Waugh 2.4.4p4-2 -- Rebuilt for new readline. - -* Mon Oct 25 2004 Jay Fenlason 2.4.4p4-1 -- New upstream version -- Turn on --disable-dependency-tracking to work around an automake bug. - -* Fri Jun 28 2004 Jay Fenlason 2.4.4p3-1 -- New upstream version - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Mar 19 2004 Jay Fenlason 2.4.4p2-3 -- make a few more programs PIE by updating the amanda-2.4.4p2-pie.path - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Jan 13 2004 Jay Fenlason 2.4.4p2-1 -- New upstream version, includes the -sigchld and -client-utils - patches. Also includes a new chg-disk changer script and a new - amqde "quick-and-dirty estimate" program (called from sendsize--not - a user command. - -* Wed Jul 23 2003 Jay Fenlason 2.4.4p1-1 -- Merge from 2.4.4p1-0.3E - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Feb 26 2003 Jay Fenlason 2.4.4-0 -- New upstream version. - -* Thu Feb 13 2003 Jay Fenlason 2.4.3-3 -- Removed call to signal(SIGCHLD, SIG_IGN) which prevents wait...() - from working on newer Red Hat systems. This fixes bug #84092. - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Wed Dec 11 2002 Jay Fenlason 2.4.3-2 -- Add spec file entry for /usr/lib/amanda so owner/group set - correctly Fixes bugs 74025 and 73379. - -* Wed Nov 20 2002 Elliot Lee 2.4.3-1 -- Update to version 2.4.3, rebuild -- Update patch for bug18322 to match - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Tue Apr 2 2002 Trond Eivind Glomsrød 2.4.2p2-7 -- Don't strip explicitly -- Require samba-client instead of /usr/bin/smbclient - -* Thu Feb 21 2002 Trond Eivind Glomsrød 2.4.2p2-6 -- Rebuild - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Fri Jul 13 2001 Trond Eivind Glomsrød -- Build and install the "tapetype" utility program, for - tape size identification (#48745) - -* Tue Jun 19 2001 Trond Eivind Glomsrød -- don't use %%configure, to make it build - -* Mon Apr 9 2001 Bill Nottingham -- include ia64 again - -* Wed Apr 4 2001 Trond Eivind Glomsrød -- 2.4.2p2 - fixes problems with amrecover (#26567) -- made config files noreplace -- don't build on IA64 right now, amanda doesn't like - the dump there: It segfaults. - -* Fri Mar 16 2001 Trond Eivind Glomsrød -- Add /usr/bin/smbclient to buildprereq (#31996), to - avoid samba being built without such support - -* Thu Feb 22 2001 Trond Eivind Glomsrød -- Use %%{version} in source URL, and thus actually use - 2.4.2p1 instead of 2.4.2 (doh! # 28759) -- add patch to handle bogus /dev/root entries (#28759) - -* Fri Feb 16 2001 Trond Eivind Glomsrød -- 2.4.2p1 bugfix release -- move amandaixd and amidxtape to the server package (#28037) - -* Wed Jan 31 2001 Trond Eivind Glomsrød -- move /etc/xinetd.d/amanda to the client subpackage (#25430) - -* Tue Jan 30 2001 Trond Eivind Glomsrød -- don't have "chunksize -1" as the default, as it's no longer - supported -- make it uid amanda, with home /var/lib/amada - so programs can actually access it (#20510) -- make .amandahosts a config file (#18322) - -* Tue Jan 23 2001 Trond Eivind Glomsrød -- 2.4.2 -- make the UDP service "wait" (#23047) - -* Tue Oct 10 2000 Jeff Johnson -- build with shared libraries. -- add amanda-devel package to contain static libraries. -- update to 2.4.2-19991216-beta1 (#16818). -- sort out client-server file confusions (#17232). -- amandaidx-xinetd should have "wait = no" (#17551). -- /var/lib/amanda needs operator.disk ownership (17913). -- /etc/xinetd.d/amanda added to the amanda-server package (#18112). -- ignore socket error message (#18322). - -* Sun Sep 3 2000 Florian La Roche -- do not include /etc/xinetd.d/amandaidx in the server rpm - -* Mon Aug 21 2000 Trond Eivind Glomsrød -- only do reload of xinetd if xinetd is running (#16653) -- don't show output of reload command to STDOUT (#16653) -- don't use /usr/sbin/tcpd in amidx, xinetd is linked - with tcp_wrappers -- prereq initscripts (fixes #14572 and duplicates) - -* Tue Aug 1 2000 Bill Nottingham -- turn off amandaidx by default (#14937) -- fix some binary permissions (#14938) - -* Tue Aug 1 2000 Matt Wilson -- added Prereq: /sbin/service xinetd to client and server subpackages - -* Tue Jul 18 2000 Trond Eivind Glomsrød -- xinetd support - -* Wed Jul 12 2000 Prospector -- automatic rebuild - -* Sun Jun 18 2000 Jeff Johnson -- add prereqs for scriptlets, requires for common package. - -* Sat Jun 10 2000 Jeff Johnson -- FHS packaging. -- move to 7.0 distro. - -* Tue May 23 2000 Tim Powers -- built for 7.0 -- man pages in /usr/share/man - -* Thu Apr 27 2000 Tim Powers -- added usr/lib/amanda/chg-zd-mtx to the client RPM to fix bug #8282 - -* Wed Mar 8 2000 Tim Powers -- fixed files/dirs ending up in the wrong packages. -- last time it wasn't built with dump (doh!), this time it is. Now has a - BuildRequires for dump. - -* Thu Feb 10 2000 Tim Powers -- strip binaries - -* Fri Jan 21 2000 TIm Powers -- added chown lines to post section - -* Tue Jan 11 2000 Tim Powers -- make sure the man pages are gzipped in each subpackage, overriding the build - system spec_install_post macro. -- using mega spec file changes from Marc Merlin since - the package we were shipping in the past had some major issues (not in - Marc's words ;) -- using Marc's added README and modified config files. -- adapted patches written by Alexandre Oliva from Marc - Merlin's package so that the patch matches the source version (the patches - are the glibc2.1 and glibc2.2 patches) - -* Mon Jan 3 2000 Tim Powers -- fix so configure doesn't crap out (libtoolize --force) -- gzip man pages, strip binaries -- rebuilt for 6.2 - -* Thu Aug 5 1999 Tim Powers -- applied patch so that it reports the available holding disk space correctly - -* Thu Jul 8 1999 Tim Powers -- added %%defattr lines -- rebuilt for 6.1 - -* Wed May 05 1999 Bill Nottingham -- update to 2.4.1p1 - -* Tue Oct 27 1998 Cristian Gafton -- version 2.4.1 - -* Tue May 19 1998 Cristian Gafton -- upgraded to full 2.4.0 release - -* Thu Feb 19 1998 Otto Hammersmith -- fixed group for -client and -server packages (Network->Networking) - -* Wed Feb 11 1998 Otto Hammersmith -- updated to 2.4.0b6, fixes security hole among other things - (as well as finally got the glibc patch in the main source.) - -* Tue Jan 27 1998 Otto Hammersmith -- moved versionsuffix to client package to remove dependency of amanda on amanda-client - -* Mon Jan 26 1998 Otto Hammersmith -- fixed libexec garbage. - -* Wed Jan 21 1998 Otto Hammersmith -- split into three packages amanda, amanda-client, and amanda-server - -* Fri Jan 9 1998 Otto Hammersmith -- updated to latest beta... builds much cleaner now. - -* Thu Jan 8 1998 Otto Hammersmith -- created the package - +%autochangelog diff --git a/amanda@.service b/amanda@.service new file mode 100644 index 0000000..dd94de8 --- /dev/null +++ b/amanda@.service @@ -0,0 +1,9 @@ +[Unit] +Description=Amanda Backup System +After=local-fs.target + +[Service] +User=amandabackup +Group=disk +ExecStart=/usr/sbin/amandad -auth=bsdtcp amdump amindexd amidxtaped +StandardInput=socket diff --git a/changelog b/changelog new file mode 100644 index 0000000..e6e7eff --- /dev/null +++ b/changelog @@ -0,0 +1,891 @@ +* Wed Jul 19 2023 Fedora Release Engineering - 3.5.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 3.5.3-4 +- Perl 5.38 rebuild + +* Tue May 02 2023 Josef Ridky - 3.5.3-3 +- move to SPDX license format + +* Fri Apr 14 2023 Florian Weimer - 3.5.3-2 +- Port configure script to C99 + +* Thu Mar 16 2023 Orion Poplawski - 3.5.3-1 +- Update to 3.5.3 +- Fixes CVE-2022-37703 (bz#2126849) CVE-2022-37704 (bz#2168789) CVE-2022-37705 (bz#2168797) + +* Wed Jan 18 2023 Fedora Release Engineering - 3.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 30 2022 Orion Poplawski - 3.5.2-1 +- Update to 3.5.2 + +* Wed Jul 20 2022 Fedora Release Engineering - 3.5.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jul 07 2022 Jason L Tibbitts III - 3.5.1-36 +- Add patch to fix bug which caused a failing test. Thanks to Peter Bieringer + for the patch. + +* Wed Jun 01 2022 Jitka Plesnikova - 3.5.1-35 +- Perl 5.36 rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 3.5.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 14 2021 Sahana Prasad - 3.5.1-33 +- Rebuilt with OpenSSL 3.0.0 + +* Wed Jul 21 2021 Fedora Release Engineering - 3.5.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 3.5.1-31 +- Perl 5.34 rebuild + +* Wed Mar 03 2021 Nikola Forró - 3.5.1-30 +- Use /usr/bin/mail as mailer + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.5.1-29 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Feb 9 2021 Pavel Cahyna - 3.5.1-28 +- Make the gnuplot dependency together with building of amplot optional. + +* Tue Jan 26 2021 Fedora Release Engineering - 3.5.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jul 31 2020 Fedora Release Engineering - 3.5.1-26 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.5.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 3.5.1-24 +- Perl 5.32 rebuild + +* Mon Feb 17 2020 Václav Doležal - 3.5.1-23 +- Drop support for 'dump' backend. + +* Tue Jan 28 2020 Fedora Release Engineering - 3.5.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 21 2020 Václav Doležal - 3.5.1-21 +- Fix FTBFS caused by missing 'extern' on global variable (#1793391) + +* Wed Jul 24 2019 Fedora Release Engineering - 3.5.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jun 13 2019 Orion Poplawski - 3.5.1-19 +- Move ambind to amanda package (bug #1710147) + +* Thu May 30 2019 Jitka Plesnikova - 3.5.1-18 +- Perl 5.30 rebuild + +* Sun Feb 17 2019 Igor Gnatenko - 3.5.1-17 +- Rebuild for readline 8.0 + +* Fri Feb 01 2019 Jason L Tibbitts III - 3.5.1-16 +- Add patch to specify xfsrestore housekeeping dir during index generation + (#1671117) + +* Thu Jan 31 2019 Fedora Release Engineering - 3.5.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Aug 02 2018 Vaclav Dolezal - 3.5.1-14 +- modify permissions of /var/log/amanda/amandad directory due to SELinux issues + +* Thu Jul 12 2018 Fedora Release Engineering - 3.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Jitka Plesnikova - 3.5.1-12 +- Perl 5.28 rebuild + +* Mon Apr 30 2018 Josef Ridky - 3.5.1-11 +- change /var/log/amanda directory permission due SELinux issues + +* Thu Apr 12 2018 Josef Ridky - 3.5.1-10 +- remove perl(Dancer2) requirements + +* Wed Feb 21 2018 Josef Ridky - 3.5.1-9 +- add RPM_LD_FLAGS to build section (#1547499) + +* Thu Feb 15 2018 Jason L Tibbitts III - 3.5.1-8 +- Fix embarrassing typo. + +* Wed Feb 14 2018 Jason L Tibbitts III - 3.5.1-7 +- Convert to ldconfig macros. + +* Wed Feb 14 2018 Josef Ridky - 3.5.1-6 +- Remove Group tag + +* Wed Feb 07 2018 Fedora Release Engineering - 3.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 28 2018 Jason L Tibbitts III - 3.5.1-4 +- Assign setuid permissions properly. + +* Fri Jan 26 2018 Jason L Tibbitts III - 3.5.1-3 +- Add patch to support tirpc and re-enable ndmp support. + +* Thu Jan 25 2018 Jason L Tibbitts III - 3.5.1-2 +- Use proper systemd package dependencies. +- Remove Obsoletes: for ancient amanda version. +- Remove obsolete Requires(post): dependencies. + +* Mon Jan 08 2018 Jason L Tibbitts III - 3.5.1-1 +- Update to 3.5.1. +- Pass --without-ndmp and remove ndmp-related files until we can get the ndmp + code to use libtirpc. + +* Tue Nov 07 2017 Igor Gnatenko - 3.5-2 +- Remove old crufty coreutils requires + +* Thu Sep 28 2017 Jason L Tibbitts III - 3.5-1 +- Update to 3.5. + +* Wed Aug 02 2017 Fedora Release Engineering - 3.4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.4.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jun 13 2017 Jason L Tibbitts III - 3.4.5-3 +- Modify amserverconfig to not mention xinetd (#1460763) + +* Fri Jun 09 2017 Jitka Plesnikova - 3.4.5-2 +- Perl 5.26 rebuild + +* Thu Jun 08 2017 Jason L Tibbitts III - 3.4.5-1 +- New upstream release 3.4.5. + +* Sun Jun 04 2017 Jitka Plesnikova - 3.4.4-2 +- Perl 5.26 rebuild + +* Wed May 03 2017 Jason L Tibbitts III - 3.4.4-1 +- New upstream relase 3.4.4. + +* Thu Mar 02 2017 Josef Ridky - 3.4.3-1 +- New upstream release 3.4.3 (#1428185) + +* Wed Mar 1 2017 Josef Ridky - 3.4.2-4 +- Fix issue with local authentication (#1427775) + +* Mon Feb 20 2017 Jason L Tibbitts III - 3.4.2-3 +- Add patch from upstream to fix a segfault in planner. Hopefully fixes + https://bugzilla.redhat.com/show_bug.cgi?id=1423471 + +* Fri Feb 10 2017 Fedora Release Engineering - 3.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 31 2017 Jason L Tibbitts III - 3.4.2-1 +- Update to 3.4.2. +- Remove upstreamed patches. +- Add patch to allow builds on non-x86 arches. +- Move autogen call from %%prep to %%build. +- Remove some specfile cruft. +- Use %%license. + +* Tue Jan 31 2017 Josef Ridky - 3.4.1-4 +- Fix warning with checking return value from setreuid in krb5-security.c (#1417828) + +* Fri Jan 13 2017 Jason L Tibbitts III - 3.4.1-3 +- Add patch to avoid breakage with RHEL5 clients. + +* Thu Jan 12 2017 Igor Gnatenko - 3.4.1-2 +- Rebuild for readline 7.x + +* Tue Dec 06 2016 Josef Ridky - 3.4.1-1 +- New upstream release 3.4.1 (#1398045) + +* Wed Nov 16 2016 Josef Ridky - 3.4-5 +- add BuildRequires dependency for dump and xfsdump - (#1395445) + +* Thu Nov 10 2016 Josef Ridky - 3.4-4 +- Update amanda spec file (thanks Jason Tibbitts for optimalization) - (#1386434) + +* Wed Oct 26 2016 Josef Ridky - 3.4-3 +- Upstream fix of broken dependencies + +* Mon Oct 24 2016 Josef Ridky - 3.4-2 +- Add Requires for server package + +* Wed Oct 19 2016 Josef Ridky - 3.4-1 +- New upstream release 3.4 (#1386434) - resolves (#1384065) + +* Thu Aug 18 2016 Josef Ridky - 3.3.9-3 +- Add security configuration file into /etc folder (#1368021) + +* Thu Aug 4 2016 Josef Ridky - 3.3.9-2 +- Fix Tie::StdHash permission problem (#1257686) + +* Wed Jul 27 2016 Josef Ridky - 3.3.9-1 +- New upstream release 3.3.9 (#1360703) +- Remove Require(pre) from .spec file (unimportant here) (#1319129) + +* Sun May 15 2016 Jitka Plesnikova - 3.3.8-3 +- Perl 5.24 rebuild + +* Fri Mar 11 2016 Petr Pisar - 3.3.8-2 +- Do not provide private libraries (bug #1309664) + +* Tue Feb 09 2016 Petr Hracek - 3.3.8-1 +- New upstream release 3.3.8 + +* Wed Feb 03 2016 Fedora Release Engineering - 3.3.7p1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jun 22 2015 Petr Hracek - 3.3.7p1-1 +- Update to 3.3.7p1 version +- fixed bug (#1225841) + +* Tue Jun 16 2015 Fedora Release Engineering - 3.3.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jun 03 2015 Jitka Plesnikova - 3.3.6-11 +- Perl 5.22 rebuild + +* Fri Feb 27 2015 Petr Hracek - 3.3.6-10 +- Fix for Swig-3.0.5 (#1195297) + +* Fri Nov 21 2014 Petr Hracek - 3.3.6-9 +- inlude unit files for systemd + +* Fri Nov 21 2014 Petr Hracek - 3.3.6-8 +- add kamanda unit files (#1077642) + +* Tue Nov 11 2014 Petr Hracek - 3.3.6-7 +- Resolves #1033896 Add amindexd as argument to amandad + +* Wed Sep 03 2014 Jitka Plesnikova - 3.3.6-6 +- Perl 5.20 rebuild + +* Wed Sep 03 2014 Petr Hracek - 3.3.6-5 +- FTBFS with perl 5.20 (#1134732) + +* Wed Aug 27 2014 Jitka Plesnikova - 3.3.6-4 +- Perl 5.20 rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 3.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 28 2014 Petr Hracek - 3.3.6-2 +- amstatus perl script is broken due to misconfiguration of $PS (#1074216) + +* Thu Jul 10 2014 Orion Poplawski - 3.3.6-1 +- Update to 3.3.6 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 Orion Poplawski - 3.3.5-1 +- Update to 3.3.5 +- Drop stdio patch, fixed upstream + +* Tue Apr 08 2014 Petr Hracek - 3.3.3-11 +- Remove initscripts from dependencies (#1081399) + +* Fri Jan 31 2014 Petr Hracek - 3.3.3-10 +- Fix: #1056675 systemd file incorrectly named (missing file in install section) + +* Fri Jan 31 2014 Petr Hracek - 3.3.3-9 +- Fix: #1056675 systemd file incorrectly named + +* Mon Oct 21 2013 Petr Hracek - 3.3.3-8 +- Moved all dynamic libraries to amanda-libs (#881128) +- Added dependencies to client and server on amanda-libs + +* Mon Oct 21 2013 Petr Hracek - 3.3.3-7 +- package amanda-libs introduced because of multilib issue + +* Sat Aug 03 2013 Fedora Release Engineering - 3.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jul 18 2013 Petr Pisar - 3.3.3-5 +- Perl 5.18 rebuild + +* Tue Jul 16 2013 Petr Hracek - 3.3.3-4 +- Correct problem with man page killpgrp (#881128) + +* Tue Jun 25 2013 Petr Hracek - 3.3.3-3 +- Remove dependency on dump in RHEL-7 + +* Tue Jun 18 2013 Petr Hracek - 3.3.3-2 +- Added systemd udp unit files + +* Fri Mar 22 2013 Petr Hracek - 3.3.3-1 +- New upstream version +- Dependecy to /usr/sbin/service was removed. + Instead of /usr/sbin/service systemd files are used. + +* Thu Mar 21 2013 Petr Hracek - 3.3.2-5 +- Fix (#924326) Requires /sbin/service was changed to /usr/sbin/service + +* Thu Jan 31 2013 Petr Hracek - 3.3.2-4 +- fix (#858703) add killpgrp(8) man page to the amanda-client package + (killpgrp will be removed from man-pages package) +- Fix autogen for parallel tests. + +* Thu Dec 06 2012 Lukáš Nykrýn - 3.3.2-3 +- Fix group ownership +- Add manpage for activate-devpay + +* Tue Sep 18 2012 Petr Pisar - 3.3.2-2 +- Do not provide perl(Math::BigInt) (bug #648321) + +* Wed Aug 15 2012 Lukáš Nykrýn - 3.3.2-1 +- upgrade to new upstream release +- convert to systemd + +* Wed Jul 18 2012 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 27 2012 Petr Pisar - 3.3.1-2 +- Perl 5.16 rebuild + +* Wed Jun 20 2012 Lukáš Nykrýn - 3.3.1-1 +- upgrade to new upstream release + +* Mon Jun 11 2012 Petr Pisar - 3.3.0-6 +- Perl 5.16 rebuild + +* Wed Apr 18 2012 Lukáš Nykrýn > - 3.3.0-5 +- Fix building issues with newer glib + +* Thu Jan 12 2012 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 28 2011 Lukáš Nykrýn - 3.3.0-3 +- fix #757618 - Use of qw(...) as parentheses is deprecated +- fix #752253 - Using functions in amanda-client which are provided by server + +* Thu Jun 16 2011 Marcela Mašláňová - 3.3.0-2 +- Perl mass rebuild + +* Wed Jun 08 2011 Jan Görig - 3.3.0-1 +- upgrade to new upstream release +- uses bsdtcp authentication by default +- dropped amanda-3.1.1-bsd.patch +- modified example directory handling and dropped amanda-3.1.0-example.patch + +* Wed May 4 2011 Jan Görig - 3.3.0-0.1.beta1 +- update to new upstream beta release +- removed merged patch amanda-3.2.2-krb5-libs.patch + +* Wed Apr 27 2011 Jan Görig - 3.2.2-2 +- amgtar, amstar and amservice must have setuid flag (#697933) + +* Wed Mar 16 2011 Jan Görig - 3.2.2-1 +- upgrade to new upstream release +- removed merged patch amanda-3.1-amrestore.patch +- fixed build on system with amanda installed + +* Mon Feb 07 2011 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 31 2011 Jan Görig - 3.2.1-2 +- fix #666968 - amrestore should restore one file when outputting to a pipe + +* Wed Dec 15 2010 Jan Görig - 3.2.1-1 +- upgrade to new upstream release +- removed unneeded patches + +* Thu Nov 4 2010 Jan Görig - 3.2.0-1 +- upgrade to new upstream release +- fixed build with new glib +- changed owner of the most files to root +- moved variable files from /etc/amanda to /var/lib/amanda +- spec cleanups +- fix #648321 - amanda rpm should not provide the perl(Math::BigInt) + +* Thu Oct 7 2010 Jan Görig - 3.1.3-1 +- upstream security update + +* Wed Aug 18 2010 Jan Görig - 3.1.2-1 +- upgraded to new upstream bugfix version + +* Tue Aug 10 2010 Jan Görig - 3.1.1-2 +- removed obsolete README-rpm +- modified client configuration to match xinetd one +- modified tcpport patch to include postgresql sample configuration + +* Tue Aug 03 2010 Jan Görig - 3.1.1-1 +- upgraded to new upstream bugfix version +- dropped old upgrade scriptlets +- spec cleanups +- created symlink to manpage for amoldrecover +- default configuration now backups extended attributes +- fix #610169 - fixed build flags +- fix #600552 - corrected amdatadir path, updated example patch + +* Mon Jun 28 2010 Jan Görig - 3.1.0-1 +- upgraded to new upstream version +- documentation moved to main package +- fixed license tag +- moved files from libexecdir to libdir to avoid multilib conflict +- moved files between subpackages +- updated path in xinetd config +- added -fPIE to CFLAGS and -pie to LDFLAGS +- removed unused patches +- removed obsolete devel subpackage + +* Tue Jun 01 2010 Marcela Maslanova - 2.6.1p2-4 +- Mass rebuild with perl-5.12.0 + +* Thu Apr 22 2010 Daniel Novotny 2.6.1p2-3 +- fix #584774 - PIE patch disabled in amanda 2.6.1p2-2 + +* Tue Feb 16 2010 Daniel Novotny 2.6.1p2-2 +- fix #564935 - FTBFS amanda-2.6.1p2-1.fc13 + +* Thu Jan 21 2010 Daniel Novotny 2.6.1p2-1 +- upgrade to 2.6.1p2, drop upstreamed patches, rebase remaining patches + +* Fri Dec 4 2009 Stepan Kasal - 2.6.0p2-15 +- rebuild against perl 5.10.1 + +* Thu Oct 15 2009 Daniel Novotny 2.6.0p2-14 +- add amanda user to group "tape" (#529159) + +* Fri Aug 21 2009 Tomas Mraz - 2.6.0p2-13 +- rebuilt with new openssl + +* Tue Aug 04 2009 Daniel Novotny 2.6.0p2-12 +-fix #512534 - amstatus outputs "Insecure dependency in printf ..." + +* Fri Jul 24 2009 Fedora Release Engineering - 2.6.0p2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Daniel Novotny 2.6.0p2-10 +- fix #510961 - FTBFS: amanda-2.6.0p2-9 + +* Fri Apr 24 2009 Daniel Novotny 2.6.0p2-9 +- fix #497488 - amanda subpackages require only a specific version of amanda, + not also release + +* Tue Apr 14 2009 Daniel Novotny 2.6.0p2-8 +- fix #495724 (spec file fix, use "useradd -N" instead of "useradd -n") + +* Wed Apr 08 2009 Daniel Novotny 2.6.0p2-7 +- the tcpport patch was lost after rebase, adding again + (#448071, #462681) + +* Mon Feb 23 2009 Fedora Release Engineering - 2.6.0p2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 15 2009 Tomas Mraz 2.6.0p2-5 +- rebuild with new openssl + +* Thu Nov 20 2008 Daniel Novotny 2.6.0p2-4 + .usernameupdate extension changed to .rpmsave (#472349) + +* Thu Oct 23 2008 Daniel Novotny 2.6.0p2-3 +- added trailing || : in the %%pre client script + +* Fri Oct 10 2008 Orion Poplawski 2.6.0p2-2 +- Drop duplicated libamglue.so from -devel +- Update -pie patch +- Fix Source typo +- Move xinetd to main package - used by both client and server +- Move %%{_libexecdir}/amanda/amanda-sh-lib.sh to main package +- LIBEXECDIR is used in xinetd template +- Make calcsize setuid root + +* Wed Oct 01 2008 Daniel Novotny 2.6.0p2-1 +- Update to 2.6.0p2 +- perl-ExtUtils-Embed added to BuildRequires +- perl patch dropped (upstreamed) +- library name change from libamglue.so.* to libamglue.so + +* Thu Mar 27 2008 Orion Poplawski 2.6.0-0.b3_20080314.1 +- Update to 2.6.0b3_20080314 +- New -lib patch that patches the autotool source files + +* Tue Mar 11 2008 Orion Poplawski 2.6.0-0.b3_20080310.1 +- Update to 2.6.0b3_20080310 +- Re-add updated pie patch, re-add autogen +- Update example patch to modify Makefile.am, leave template.d in + /var/lib/amanda for now + +* Wed Feb 20 2008 Orion Poplawski 2.6.0-0.b2_20080220.1 +- Update to 2.6.0b2-20080220 +- Drop libdir patch, use --with-libdir instead +- Move perl modules to %%{perl_vendorarch} and add perl Requires + +* Wed Feb 20 2008 Orion Poplawski 2.6.0-0.b2 +- Update to 2.6.0b2, drop upstreamed patches +- Update xattrs patch +- Add patches to fix install locations +- Add -fPIE/-pie to CFLAGS/LDFLAGS, drop pie patch +- Drop autotools BR +- Drop /usr/bin/Mail BR and specify mailer as /bin/mail +- Add %%check section +- Move /etc/amanda/amandates to /var/lib/amanda/amandates +- Remove ending . from summaries + +* Mon Feb 18 2008 Radek Brich 2.5.2.p1-10 +- do not require gnuplot by -server subpackage (bz#433101) + +* Thu Nov 22 2007 Radek Brich 2.5.2.p1-9 +- Change default amanda user name to 'amandabackup' (#124510). + This should not break upgrades as config files are checked for + old user name and updated. +- Add some explaining comments to .amandahosts (#153749) + +* Tue Aug 28 2007 Radek Brich 2.5.2.p1-8 +- rebuild + +* Fri Aug 17 2007 Radek Brich 2.5.2.p1-7 +- BuildRequires mtx and mt-st (#251690). + +* Fri Aug 10 2007 Radek Brich 2.5.2.p1-6 +- Included upstream patch for chg-multi.sh (#251316). + +* Wed Aug 08 2007 Radek Brich 2.5.2.p1-5 +- Added ssh and ncompress to BuildRequires (#250730). +- Removed some obsolete makes from build section. + +* Thu Jul 12 2007 Radek Brich 2.5.2.p1-4 +- Enable backing up ACL/SElinux xattrs with tar (#201916). +- Removed obsolete patches and sources. + +* Mon Jun 25 2007 Radek Brich 2.5.2.p1-3 +- Update -undefSymbols patch. All undefined symbols reported by + 'ldd -r' should now be fixed (#198178). + +* Fri Jun 22 2007 Radek Brich 2.5.2.p1-2 +- Fix undefined symbols in libamserver.so. +- Fix ./autogen so it automatically installs ylwrap (bug 224143). +- Run ./autogen in prep section (otherwise the -pie patch had no effect). +- Update -pie patch. + +* Thu Jun 21 2007 Radek Brich 2.5.2.p1-1 +- New upstream version. +- Client rpm now installs amanda-client.conf. +- Removed obsolete patches -bug18322 and -rsh. +- Clean up spec file (non-utf8 error and some warnings from rpmlint). + +* Mon Feb 19 2007 Jay Fenlason 2.5.1p3-1%{?dist} +- Upgrade to new upstream release, now that 2.5.1 is somewhat stable. +- Note that this requires changing the xinetd configuration and amanda.conf + because of the new authentication mechanism. +- -server subpackage does not require xinetd. +- -server scriptlets do not need to reload xinetd. + +* Mon Sep 25 2006 Jay Fenlason 2.5.0p2-4 +- Include my -dump_size patch to close + bz#206129: Dump output size determined incorrectly +- Clean up the spec file, following some suggestions in + bz#185659: amanda 2.5.0 +- Use a tarball without the problematic contrib/sst directory. +- Include my new_gnutar (based on a patch by Orion Poplawski + ) to work around changed incremental file format + in newer (>1.15.1) versions of gnutar. +- include my -wildcards patch to turn on wildcards with new versions of tar. + +* Tue Sep 5 2006 Jay Fenlason 2.5.0p2-3 +- move libamclient-*.so to the base rpm, so that multilib support works. + This fixes + bz#205202 File conflicts + +* Wed Jul 12 2006 Jesse Keating - 2.5.0p2-2.1 +- rebuild + +* Thu Jun 8 2006 Jay Fenlason 2.5.0p2-2 +- New upstream version +- Make the BuildRequires on /usr/bin/Mail rather than mailx, because we + don't really care where the Mail command comes from. +- include the amcheck_badtape patch by Paul Bijnens + to fix a problem where amcheck doesn't + realize the wrong tape is in the drive. +- include the error_msg patch from Jean-Louis Martineau + to fix a double-free problem +- include the restore patch from Jean-Louis Martineau + to fix an error in amrestore +- include a slightly modified form of the big_holding_disk patch from + Andrej Filipcic to fix a problem with holding + disks bigger than 4tb + +* Mon May 22 2006 Jesse Keating 2.5.0-3 +- Fix BuildReqs + +* Fri Apr 7 2006 Jay Fenlason 2.5.0-2 +- New upstream release: 2.5.0, with new features +- Do not include our own amanda.conf anymore, use the one from the + tarball. +- Remove the static libraries. +- Update the -pie patch +- Turn on the new -with-ssh-security option. +- Change the mode of ~amanda/.amandahosts to 600, since 2.5.0 requires + it. +- actually use the defconfig macro it this spec file. +- Change the name of the index server to "amandahost" from localhost. + Users should ensure that "amandahost.their-domain" points to their + Amanda server. +- Change amandahosts likewise. +- Add dependency on /usr/bin/Mail +- Ensure unversioned .so files are only in the -devel rpm. +- Remove DUMPER_DIR and the files in it, as nothing seems to actually + use them. +- Include the -overflow patch from Jean-Louis Martineau + + +* Fri Feb 10 2006 Jesse Keating - 2.4.5p1-3.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.4.5p1-3.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 18 2006 Jay Fenlason 2.4.5p1-3 +- Fix spec file to use %%{_localstatedir} instead of hardcoding /var/lib +- Add amanda_user and amanda_group defines, to make changing the username + easier. +- Add a BuildRequires on /usr/bin/Mail + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Nov 4 2005 Jay Fenlason +- New upstream release. + +* Sun Jul 31 2005 Florian La Roche +- make sure amanda builds with newest rpm + +* Wed Apr 20 2005 Jay Fenlason 2.4.5-2 +- New upstream release. This obsoletes the -bug144052 patch. +- Reorg this spec file slightly to allow someone to specify + index server, tape server and default configuration when + rebuilding the rpms via something like + 'rpmbuild -ba --define "indexserver foo.fqdn.com" amanda.spec' + This change suggested by Matt Hyclak . + +* Tue Apr 5 2005 Jay Fenlason 2.4.4p4-4 +- Add -bug144052 patch to close + bz#144052 amverifyrun sometimes verifies the wrong tapes + +* Tue Mar 8 2005 Jay Fenlason 2.4.4p4-3 +- rebuild with gcc4 + +* Wed Jan 12 2005 Tim Waugh 2.4.4p4-2 +- Rebuilt for new readline. + +* Mon Oct 25 2004 Jay Fenlason 2.4.4p4-1 +- New upstream version +- Turn on --disable-dependency-tracking to work around an automake bug. + +* Mon Jun 28 2004 Jay Fenlason 2.4.4p3-1 +- New upstream version + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Jay Fenlason 2.4.4p2-3 +- make a few more programs PIE by updating the amanda-2.4.4p2-pie.path + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jan 13 2004 Jay Fenlason 2.4.4p2-1 +- New upstream version, includes the -sigchld and -client-utils + patches. Also includes a new chg-disk changer script and a new + amqde "quick-and-dirty estimate" program (called from sendsize--not + a user command. + +* Wed Jul 23 2003 Jay Fenlason 2.4.4p1-1 +- Merge from 2.4.4p1-0.3E + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Feb 26 2003 Jay Fenlason 2.4.4-0 +- New upstream version. + +* Thu Feb 13 2003 Jay Fenlason 2.4.3-3 +- Removed call to signal(SIGCHLD, SIG_IGN) which prevents wait...() + from working on newer Red Hat systems. This fixes bug #84092. + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Jay Fenlason 2.4.3-2 +- Add spec file entry for /usr/lib/amanda so owner/group set + correctly Fixes bugs 74025 and 73379. + +* Wed Nov 20 2002 Elliot Lee 2.4.3-1 +- Update to version 2.4.3, rebuild +- Update patch for bug18322 to match + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Tue Apr 2 2002 Trond Eivind Glomsrød 2.4.2p2-7 +- Don't strip explicitly +- Require samba-client instead of /usr/bin/smbclient + +* Thu Feb 21 2002 Trond Eivind Glomsrød 2.4.2p2-6 +- Rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Jul 13 2001 Trond Eivind Glomsrød +- Build and install the "tapetype" utility program, for + tape size identification (#48745) + +* Tue Jun 19 2001 Trond Eivind Glomsrød +- don't use %%configure, to make it build + +* Mon Apr 9 2001 Bill Nottingham +- include ia64 again + +* Wed Apr 4 2001 Trond Eivind Glomsrød +- 2.4.2p2 - fixes problems with amrecover (#26567) +- made config files noreplace +- don't build on IA64 right now, amanda doesn't like + the dump there: It segfaults. + +* Fri Mar 16 2001 Trond Eivind Glomsrød +- Add /usr/bin/smbclient to buildprereq (#31996), to + avoid samba being built without such support + +* Thu Feb 22 2001 Trond Eivind Glomsrød +- Use %%{version} in source URL, and thus actually use + 2.4.2p1 instead of 2.4.2 (doh! # 28759) +- add patch to handle bogus /dev/root entries (#28759) + +* Fri Feb 16 2001 Trond Eivind Glomsrød +- 2.4.2p1 bugfix release +- move amandaixd and amidxtape to the server package (#28037) + +* Wed Jan 31 2001 Trond Eivind Glomsrød +- move /etc/xinetd.d/amanda to the client subpackage (#25430) + +* Tue Jan 30 2001 Trond Eivind Glomsrød +- don't have "chunksize -1" as the default, as it's no longer + supported +- make it uid amanda, with home /var/lib/amada + so programs can actually access it (#20510) +- make .amandahosts a config file (#18322) + +* Tue Jan 23 2001 Trond Eivind Glomsrød +- 2.4.2 +- make the UDP service "wait" (#23047) + +* Tue Oct 10 2000 Jeff Johnson +- build with shared libraries. +- add amanda-devel package to contain static libraries. +- update to 2.4.2-19991216-beta1 (#16818). +- sort out client-server file confusions (#17232). +- amandaidx-xinetd should have "wait = no" (#17551). +- /var/lib/amanda needs operator.disk ownership (17913). +- /etc/xinetd.d/amanda added to the amanda-server package (#18112). +- ignore socket error message (#18322). + +* Sun Sep 3 2000 Florian La Roche +- do not include /etc/xinetd.d/amandaidx in the server rpm + +* Mon Aug 21 2000 Trond Eivind Glomsrød +- only do reload of xinetd if xinetd is running (#16653) +- don't show output of reload command to STDOUT (#16653) +- don't use /usr/sbin/tcpd in amidx, xinetd is linked + with tcp_wrappers +- prereq initscripts (fixes #14572 and duplicates) + +* Tue Aug 1 2000 Bill Nottingham +- turn off amandaidx by default (#14937) +- fix some binary permissions (#14938) + +* Tue Aug 1 2000 Matt Wilson +- added Prereq: /sbin/service xinetd to client and server subpackages + +* Tue Jul 18 2000 Trond Eivind Glomsrød +- xinetd support + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jun 18 2000 Jeff Johnson +- add prereqs for scriptlets, requires for common package. + +* Sat Jun 10 2000 Jeff Johnson +- FHS packaging. +- move to 7.0 distro. + +* Tue May 23 2000 Tim Powers +- built for 7.0 +- man pages in /usr/share/man + +* Thu Apr 27 2000 Tim Powers +- added usr/lib/amanda/chg-zd-mtx to the client RPM to fix bug #8282 + +* Wed Mar 8 2000 Tim Powers +- fixed files/dirs ending up in the wrong packages. +- last time it wasn't built with dump (doh!), this time it is. Now has a + BuildRequires for dump. + +* Thu Feb 10 2000 Tim Powers +- strip binaries + +* Fri Jan 21 2000 TIm Powers +- added chown lines to post section + +* Tue Jan 11 2000 Tim Powers +- make sure the man pages are gzipped in each subpackage, overriding the build + system spec_install_post macro. +- using mega spec file changes from Marc Merlin since + the package we were shipping in the past had some major issues (not in + Marc's words ;) +- using Marc's added README and modified config files. +- adapted patches written by Alexandre Oliva from Marc + Merlin's package so that the patch matches the source version (the patches + are the glibc2.1 and glibc2.2 patches) + +* Mon Jan 3 2000 Tim Powers +- fix so configure doesn't crap out (libtoolize --force) +- gzip man pages, strip binaries +- rebuilt for 6.2 + +* Thu Aug 5 1999 Tim Powers +- applied patch so that it reports the available holding disk space correctly + +* Thu Jul 8 1999 Tim Powers +- added %%defattr lines +- rebuilt for 6.1 + +* Wed May 05 1999 Bill Nottingham +- update to 2.4.1p1 + +* Tue Oct 27 1998 Cristian Gafton +- version 2.4.1 + +* Tue May 19 1998 Cristian Gafton +- upgraded to full 2.4.0 release + +* Thu Feb 19 1998 Otto Hammersmith +- fixed group for -client and -server packages (Network->Networking) + +* Wed Feb 11 1998 Otto Hammersmith +- updated to 2.4.0b6, fixes security hole among other things + (as well as finally got the glibc patch in the main source.) + +* Tue Jan 27 1998 Otto Hammersmith +- moved versionsuffix to client package to remove dependency of amanda on amanda-client + +* Mon Jan 26 1998 Otto Hammersmith +- fixed libexec garbage. + +* Wed Jan 21 1998 Otto Hammersmith +- split into three packages amanda, amanda-client, and amanda-server + +* Fri Jan 9 1998 Otto Hammersmith +- updated to latest beta... builds much cleaner now. + +* Thu Jan 8 1998 Otto Hammersmith +- created the package diff --git a/fix-amanda-tarball.sh b/fix-amanda-tarball.sh deleted file mode 100755 index 8d9b25c..0000000 --- a/fix-amanda-tarball.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -e -# -# See http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz -# - -tmppath=`mktemp -d ${TMPDIR:-/tmp}/fix-amanda-tarball-XXXXXX` -if test -z "$tmppath" ; then - echo Error creating temporary directory. - exit 1 -fi -trap "rm -fr $tmppath" EXIT - -initialdir=`pwd` - -for tarball in ${initialdir}/amanda-*.tar.{gz,bz2} ; do - if ! test -s "$tarball" ; then - continue - fi - rm -fr $tmppath/* - pushd $tmppath > /dev/null - case "$tarball" in - *nosst*) - : Do nothing. - ;; - *.gz) - gzip -dc "$tarball" | tar xf - - rm -fr amanda*/contrib/sst - tar cf - * | gzip -9c > \ - $initialdir/`basename $tarball .tar.gz`-nosst.tar.gz - ;; - *.bz2) - bzip2 -dc "$tarball" | tar xf - - rm -fr amanda*/contrib/sst - tar cf - * | bzip2 -9c > \ - $initialdir/`basename $tarball .tar.bz2`-nosst.tar.bz2 - ;; - esac - popd > /dev/null -done diff --git a/kamanda.socket b/kamanda.socket new file mode 100644 index 0000000..13b786b --- /dev/null +++ b/kamanda.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Amanda Kerberos Activation Socket + +[Socket] +ListenStream=10082 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/kamanda@.service b/kamanda@.service new file mode 100644 index 0000000..50007de --- /dev/null +++ b/kamanda@.service @@ -0,0 +1,9 @@ +[Unit] +Description=Amanda Backup System +After=local-fs.target + +[Service] +User=root +Group=disk +ExecStart=/usr/sbin/amandad -auth=krb5 amdump amindexd amidxtaped +StandardInput=socket diff --git a/killpgrp.8 b/killpgrp.8 new file mode 100644 index 0000000..9745d3d --- /dev/null +++ b/killpgrp.8 @@ -0,0 +1,36 @@ +.\" This file is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +.\" the GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this file; if not, write to the Free Software +.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, +.\" MA 02111-1307 USA +.\" +.\" HISTORY: +.\" 2006-05-16, created by Rodrigo Rubira Branco +.TH killpgrp 8 "May 16, 2006" "User Manuals" "User Manuals" +.SH NAME +killpgrp \- kill all processes in the same process group +.SH SYNOPSIS +.nf +.fam C +\fBkillpgrp\fP +.fam T +.fi +.SH DESCRIPTION +Kills all processes in its process group when a process group leader is killed. +.PP +This program needs to be called by the client uid defined in amanda, and is used to kill VDUMP, VXDUMP, and XFSDUMP in a safe manner. It is called by sendsize, the amanda client software. +.PP +killpgrp send a SIGTERM to all processes in its process group. If a process in the group does not exit after three seconds +and does not answer, killpgp will send a SIGKILL. +.SH OPTIONS +\fBkillpgrp\fP takes no arguments. +.SH SECURITY +\fBkillpgrp\fP needs to be setuid root unless amanda is compiled with DONT_SUID_ROOT. +.SH SEE ALSO +\fBamanda\fP(8) +.SH AUTHOR +Manpage written by Rodrigo Rubira Branco diff --git a/patch-tirpc b/patch-tirpc new file mode 100644 index 0000000..11d3480 --- /dev/null +++ b/patch-tirpc @@ -0,0 +1,100 @@ +diff --git a/config/amanda/amanda_configure.m4 b/config/amanda/amanda_configure.m4 +index 5b427ae..f90810f 100644 +--- a/config/amanda/amanda_configure.m4 ++++ b/config/amanda/amanda_configure.m4 +@@ -18,7 +18,6 @@ AC_PREREQ(2.64) + # Take care of some early Amanda-specific setup + # + AMANDA_CONFIGURE_ARGS +-AMANDA_INIT_SUMMARY + AMANDA_SNAPSHOT_STAMP + AMANDA_SPLIT_VERSION + AMANDA_CONFIG_LOCAL +diff --git a/config/amanda/components.m4 b/config/amanda/components.m4 +index f2a07db..7628453 100644 +--- a/config/amanda/components.m4 ++++ b/config/amanda/components.m4 +@@ -186,7 +186,21 @@ AC_DEFUN([AMANDA_WITHOUT_NDMP], [ + n | no) WANT_NDMP=false;; + *) AC_MSG_ERROR([You must not supply an argument to --with-ndmp option.]) ;; + esac +- ]) ++ ]) ++ AC_CHECK_HEADERS(rpc/rpc.h, HAVE_RPC_RPC_H=1) ++ if test x"$WANT_NDMP" = x"true"; then ++ if test x"$HAVE_RPC_RPC_H" = x"1"; then ++ WANT_NDMP=true ++ else ++ AMANDA_CHECK_TIRPC ++ if test x"$HAVE_RPC_RPC_H" = x"1"; then ++ WANT_NDMP=true ++ else ++ WANT_NDMP=false ++ AMANDA_MSG_WARN([Disabling NDMP because rpc/rpc.h is not found]) ++ fi ++ fi ++ fi + ]) + + # SYNOPSIS +diff --git a/config/amanda/libs.m4 b/config/amanda/libs.m4 +index 0388c9b..a640557 100644 +--- a/config/amanda/libs.m4 ++++ b/config/amanda/libs.m4 +@@ -183,6 +183,44 @@ AC_DEFUN([AMANDA_CHECK_GLIB], [ + AMANDA_ADD_LIBS($GLIB_LIBS) + ]) + ++# SYNOPSIS ++# ++# AMANDA_CHECK_TIRPC ++# ++# OVERVIEW ++# ++# Search for tirpc. ++# ++AC_DEFUN([AMANDA_CHECK_TIRPC], ++[ ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, [], $LOCSYSPATH:/opt/csw/bin:/usr/local/bin:/opt/local/bin) ++ ++ tirpc_ld_flags=`$PKG_CONFIG libtirpc --libs-only-L 2>/dev/null` ++ tirpc_lib_flags=`$PKG_CONFIG libtirpc --libs-only-l --libs-only-other 2>/dev/null` ++ tirpc_cppflags=`$PKG_CONFIG libtirpc --cflags-only-I 2>/dev/null` ++ tirpc_cflags=`$PKG_CONFIG libtirpc --cflags-only-other 2>/dev/null` ++ ++ _libtirpc_save_cppflags=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $tirpc_cppflags" ++ _libtirpc_save_libs=$LIBS ++ LIBS="$LIBS $tirpc_lib_flags" ++ ++ unset HAVE_RPC_RPC_H ++ unset ac_cv_header_rpc_rpc_h ++ AC_CHECK_HEADERS(rpc/rpc.h, HAVE_RPC_RPC_H=1) ++ ++ CPPFLAGS=$_libtirpc_save_cppflags ++ LIBS=$_libtirpc_save_libs ++ ++ if test x"$HAVE_RPC_RPC_H" = x"1"; then ++ AMANDA_ADD_LDFLAGS($tirpc_ld_flags) ++ AMANDA_ADD_LIBS($tirpc_lib_flags) ++ ++ AMANDA_ADD_CPPFLAGS($tirpc_cppflags) ++ AMANDA_ADD_CFLAGS($tirpc_cflags) ++ fi ++]) ++ + # LIBCURL_CHECK_CONFIG is from the libcurl + # distribution and licensed under the BSD license: + # Copyright (c) 1996 - 2007, Daniel Stenberg, . +diff --git a/configure.ac b/configure.ac +index 89c4890..8d325b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,6 +13,7 @@ AMANDA_VERSION + gl_EARLY + gl_INIT + ++AMANDA_INIT_SUMMARY + AMANDA_CONFIGURE + + AC_DEFINE([USE_GETTEXT], 1, [Define to 1 if files will be processed with gettextize]) diff --git a/patch-xfsrestore-housekeeping b/patch-xfsrestore-housekeeping new file mode 100644 index 0000000..a9907ae --- /dev/null +++ b/patch-xfsrestore-housekeeping @@ -0,0 +1,13 @@ +diff --git a/client-src/sendbackup-dump.c b/client-src/sendbackup-dump.c +index 1ff1223..ce0c47d 100644 +--- a/client-src/sendbackup-dump.c ++++ b/client-src/sendbackup-dump.c +@@ -292,7 +292,7 @@ start_backup( + program->backup_name = XFSDUMP; + program->restore_name = XFSRESTORE; + +- indexcmd = g_strjoin(NULL, XFSRESTORE, " -t", " -v", " silent", " -", ++ indexcmd = g_strjoin(NULL, XFSRESTORE, " -a /var/lib/amanda -t", " -v", " silent", " -", + " 2>/dev/null", " | sed", " -e", " \'s/^/\\//\'", NULL); + + info_tapeheader(dle); diff --git a/sources b/sources index 7bfe76a..08b3a3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -816ef0101b6d968c5df7d7d7e793caed amanda-2.6.1p2.tar.gz +SHA512 (amanda-3.5.4.tar.gz) = 748491e36776a02a1497ce061588d40dfe6eceb6967b7ea7505c086e084aa1d6f69d8a581b46aa305d17c4e6eba28ba746aa178cb6ab97e1fd96ccdad5910824